diff --git a/frontend/.env b/frontend/.env index 10e8a83f3e013f8471deb95602057993ec773606..30a348dd01b618dc7730ebcbc5ca173fa9db1cdf 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.DevelopmentConfig" +CONFIGURATION_SETUP="config.ProductionConfig" diff --git a/frontend/application/__init__.py b/frontend/application/__init__.py index 62853509280db22038f5339c1589d67989f900ad..a84f862921cb07236a382824e4c227470858314f 100644 --- a/frontend/application/__init__.py +++ b/frontend/application/__init__.py @@ -6,7 +6,6 @@ from flask_login import LoginManager from flask_ckeditor import CKEditor login_manager = LoginManager() -UPLOAD_FOLDER = os.path.join('static', 'images') app = None def create_app(): @@ -17,7 +16,6 @@ def create_app(): return app app = Flask(__name__) - app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER # Load environment variables load_dotenv() diff --git a/frontend/application/static/images/1984a21b73b88524.jpeg b/frontend/application/static/images/1984a21b73b88524.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..be7f0ac7a09746d836ec73d0287de197af66c15c Binary files /dev/null and b/frontend/application/static/images/1984a21b73b88524.jpeg differ diff --git a/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg b/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..be7f0ac7a09746d836ec73d0287de197af66c15c Binary files /dev/null and b/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg differ diff --git a/frontend/requirements.txt b/frontend/requirements.txt index 72f368aa380b84946fb036e2cbef4039a7422717..6b61adb83c0d0ce9905a38881491d28ad1394f58 100644 --- a/frontend/requirements.txt +++ b/frontend/requirements.txt @@ -35,4 +35,4 @@ urllib3==1.26.15 visitor==0.1.3 Werkzeug==2.2.3 WTForms==3.0.1 - +Pillow==9.0.1 diff --git a/post-service/.env b/post-service/.env index 10e8a83f3e013f8471deb95602057993ec773606..30a348dd01b618dc7730ebcbc5ca173fa9db1cdf 100644 --- a/post-service/.env +++ b/post-service/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.DevelopmentConfig" +CONFIGURATION_SETUP="config.ProductionConfig" diff --git a/post-service/Dockerfile b/post-service/Dockerfile index d5515d3a935bcf6d843046c95d4f40966d60dc83..4b680f206ae1494761b2dd7f10fffa17bf38b31d 100644 --- a/post-service/Dockerfile +++ b/post-service/Dockerfile @@ -16,4 +16,4 @@ RUN pip3 install -r requirements.txt COPY . /post-service -CMD [ "./wait-for-it.sh", "user-db:3306", "--timeout=0" ,"--","python3", "run.py"] +CMD [ "./wait-for-it.sh", "post-db:3306", "--timeout=0" ,"--","python3", "run.py"] diff --git a/post-service/application/__init__.py b/post-service/application/__init__.py index 07d9c0c3a6d7ac8ae45aeb56f6ce1c4e9618d594..b356bebbc7af177b9491c2eaf916d77f2357824b 100644 --- a/post-service/application/__init__.py +++ b/post-service/application/__init__.py @@ -7,8 +7,15 @@ from flask_login import LoginManager from flask_sqlalchemy import SQLAlchemy db = SQLAlchemy() +app = None def create_app(): + + global app + + if app is not None: + return app + app = Flask(__name__) # Load environment variables diff --git a/post-service/application/post_api/api/UserClient.py b/post-service/application/post_api/api/UserClient.py index 18ed05dfb859224f226ee35ccc8cdf9edc6fa998..0507cb6a2d61ddad94ceaa8b1625c00328390ddc 100644 --- a/post-service/application/post_api/api/UserClient.py +++ b/post-service/application/post_api/api/UserClient.py @@ -1,10 +1,14 @@ # application/post_api/api/UserClient.py import requests +from application import app class UserClient: + + user_service = app.config['USER_SERVICE'] + @staticmethod def get_username(user_id): - url='http://localhost:5001/api/' + str(user_id) + '/username' + url='http://'+ UserClient.user_service +'/api/' + str(user_id) + '/username' response = requests.request(method="GET", url=url) response = response.json() @@ -19,7 +23,8 @@ class UserClient: headers = { 'Authorization': api_key } - response = requests.request(method="GET", url='http://localhost:5001/api/user', headers=headers) + url='http://'+ UserClient.user_service +'/api/user' + response = requests.request(method="GET", url=url, headers=headers) if response.status_code == 401: return False user = response.json() diff --git a/post-service/config.py b/post-service/config.py index 88575bfb826f39c3d0623600a6b5b829d953bab4..1825bcae0d5c649feb231db62f72a099345edc49 100644 --- a/post-service/config.py +++ b/post-service/config.py @@ -15,6 +15,7 @@ class Config: class DevelopmentConfig(Config): ENV = "development" DEBUG = True + USER_SERVICE = "localhost:5001" SQLALCHEMY_DATABASE_URI = 'sqlite:///posts-service.db' SQLALCHEMY_ECHO = True @@ -22,5 +23,6 @@ class DevelopmentConfig(Config): class ProductionConfig(Config): ENV = "production" DEBUG = True + USER_SERVICE = "user-service:5001" SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://post-service:pass1234@post-db:3306/post' SQLALCHEMY_ECHO = False diff --git a/run.sh b/run.sh new file mode 100644 index 0000000000000000000000000000000000000000..c55fb2782a9816093453231ad2cd8d98efb36d36 --- /dev/null +++ b/run.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +sudo apt-get install dbus-x11 + +# user-service'i baÅŸlat +cd user-service +docker-compose build +gnome-terminal -- docker-compose up +cd .. + +# post-service'i baÅŸlat +cd post-service +docker-compose build +gnome-terminal -- docker-compose up +cd .. + +# frontend'i baÅŸlat +cd frontend +docker-compose build +gnome-terminal -- docker-compose up +cd .. \ No newline at end of file diff --git a/user-service/.env b/user-service/.env index 10e8a83f3e013f8471deb95602057993ec773606..30a348dd01b618dc7730ebcbc5ca173fa9db1cdf 100644 --- a/user-service/.env +++ b/user-service/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.DevelopmentConfig" +CONFIGURATION_SETUP="config.ProductionConfig" diff --git a/user-service/application/models.py b/user-service/application/models.py index 2372270037d8376d6983283b866c9eff62ee8836..42bf485bf36976cde51988ddb6b524f9a58b192d 100644 --- a/user-service/application/models.py +++ b/user-service/application/models.py @@ -8,7 +8,7 @@ class User(db.Model, UserMixin): id = db.Column(db.Integer, primary_key=True) email = db.Column(db.String(255), unique=True, nullable=False) phone_number = db.Column(db.String(255), unique=False, nullable=True) - uni_number = db.Column(db.Integer, unique=False, nullable=True) + uni_number = db.Column(db.String(255), unique=False, nullable=True) user_role = db.Column(db.String(255), unique=False, nullable=False) first_name = db.Column(db.String(255), unique=False, nullable=False) last_name = db.Column(db.String(255), unique=False, nullable=False) diff --git a/user-service/application/user_api/routes.py b/user-service/application/user_api/routes.py index b9229df0a39e54ae5a17fe25e11418bcaa724310..acde432c6c019033e204adec115883c15745bbf0 100644 --- a/user-service/application/user_api/routes.py +++ b/user-service/application/user_api/routes.py @@ -53,7 +53,6 @@ def get_users(): response = jsonify(data) return response - @user_api_blueprint.route('/api/user/create', methods=['POST']) def post_register(): first_name = request.form['first_name']