diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..b8031acd26d033aaf08b74a2d31ef3c888d78f3f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,74 @@ +version: '3' +volumes: + post_mysql: + user_mysql: + +services: + + user-service: + build: ./user-service + ports: + - "5001:5001" + volumes: + - ./user-service:/user-service + depends_on: + - user-db + networks: + - service-network + + user-db: + image: mysql + restart: always + environment: + MYSQL_DATABASE: user + MYSQL_USER: user-service + MYSQL_PASSWORD: pass1234 + MYSQL_ROOT_PASSWORD: pass1234 + MYSQL_HOST: "%" + volumes: + - user_mysql:/var/lib/mysql + ports: + - 3307:3306 + networks: + - service-network + + post-service: + build: ./post-service + ports: + - "5002:5002" + volumes: + - ./post-service:/post-service + depends_on: + - post-db + networks: + - service-network + + post-db: + image: mysql + restart: always + environment: + MYSQL_DATABASE: post + MYSQL_USER: post-service + MYSQL_PASSWORD: pass1234 + MYSQL_ROOT_PASSWORD: pass1234 + MYSQL_HOST: "%" + volumes: + - post_mysql:/var/lib/mysql + ports: + - 3308:3306 + networks: + - service-network + + frontend: + build: ./frontend + ports: + - "5003:5003" + restart: always + volumes: + - ./frontend:/frontend + networks: + - service-network + +networks: + service-network: + name: service-network 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/frontend/views.py b/frontend/application/frontend/views.py index 590c413c0841fe9721a76e3b42e5770332ef76b7..7f1e51c83e1d15427fd1aea90879f7e0566a64d7 100644 --- a/frontend/application/frontend/views.py +++ b/frontend/application/frontend/views.py @@ -127,6 +127,10 @@ def categories(category = None): image_urls = [] posts = PostClient.get_posts() + if posts == 404: + flash('No post found in the category', 'fail') + return render_template('forum/index.html') + for post in posts: if post['category'] == category: category_posts.append(post) @@ -354,9 +358,10 @@ def display_user(user_id): user_posts = [] posts = PostClient.get_posts() - for post in posts: - if post['user_id'] == int(response['id']): - user_posts.append(post) + if posts != 404: + for post in posts: + if post['user_id'] == int(response['id']): + user_posts.append(post) content = { 'name': response['full_name'], @@ -375,9 +380,10 @@ def display_currentuser(): user_posts = [] posts = PostClient.get_posts() - for post in posts: - if post['user_id'] == session['user']['id']: - user_posts.append(post) + if posts != 404: + for post in posts: + if post['user_id'] == session['user']['id']: + user_posts.append(post) form = forms.AccountUpdateForm() if request.method == "POST": diff --git a/frontend/application/static/images/1984a21b73b88524.jpeg b/frontend/application/static/images/1984a21b73b88524.jpeg deleted file mode 100644 index be7f0ac7a09746d836ec73d0287de197af66c15c..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/1984a21b73b88524.jpeg and /dev/null differ diff --git a/frontend/application/static/images/39d716a66c512499.png b/frontend/application/static/images/39d716a66c512499.png deleted file mode 100644 index 69de6f9c57ec8bd67bbedd7b34b806c61ca72182..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/39d716a66c512499.png and /dev/null differ diff --git a/frontend/application/static/images/722d7684936cf20d.jpeg b/frontend/application/static/images/722d7684936cf20d.jpeg deleted file mode 100644 index a6289b8b0e59ca11c677765248e1e11ec2096543..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/722d7684936cf20d.jpeg and /dev/null differ diff --git a/frontend/application/static/images/users/4a52b61da594027f.jpg b/frontend/application/static/images/users/4a52b61da594027f.jpg deleted file mode 100644 index d918cbbe80beb5f3509787ff252b91a3e103c1d0..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/users/4a52b61da594027f.jpg and /dev/null differ diff --git a/frontend/application/static/images/users/a7674577287ec3b2.jpg b/frontend/application/static/images/users/a7674577287ec3b2.jpg deleted file mode 100644 index d918cbbe80beb5f3509787ff252b91a3e103c1d0..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/users/a7674577287ec3b2.jpg and /dev/null differ diff --git a/frontend/application/static/images/users/e1f20076328bbebd.jpeg b/frontend/application/static/images/users/e1f20076328bbebd.jpeg deleted file mode 100644 index 26db3bcd59a30039285eee69ecc46a9225a853a0..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/users/e1f20076328bbebd.jpeg and /dev/null differ diff --git a/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg b/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg deleted file mode 100644 index be7f0ac7a09746d836ec73d0287de197af66c15c..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/users/e6be63b80a5b9efe.jpeg and /dev/null differ diff --git a/frontend/application/static/images/users/eda01672470e1477.png b/frontend/application/static/images/users/eda01672470e1477.png deleted file mode 100644 index a4b262436cb660d3307b02572bc56682ef663685..0000000000000000000000000000000000000000 Binary files a/frontend/application/static/images/users/eda01672470e1477.png and /dev/null differ diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml deleted file mode 100644 index d6e1bfc0e0d41daf77fe01204e2af456fa74e660..0000000000000000000000000000000000000000 --- a/frontend/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ - -services: - frontend: - build: - context: . - dockerfile: Dockerfile - ports: - - "5003:5003" - restart: always - volumes: - - .:/frontend - networks: - - service-network - -networks: - service-network: - name: service-network - 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/docker-compose.yml b/post-service/docker-compose.yml deleted file mode 100644 index 56a58d6d3d7903711cd688591b95c79467cebea9..0000000000000000000000000000000000000000 --- a/post-service/docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -volumes: - post_mysql: - -services: - post-service: - build: - context: . - dockerfile: Dockerfile - ports: - - "5002:5002" - volumes: - - .:/post-service - depends_on: - - post-db - networks: - - service-network - - post-db: - image: mysql - restart: always - environment: - MYSQL_DATABASE: post - MYSQL_USER: post-service - MYSQL_PASSWORD: pass1234 - MYSQL_ROOT_PASSWORD: pass1234 - MYSQL_HOST: "%" - volumes: - - post_mysql:/var/lib/mysql - ports: - - 3308:3306 - networks: - - service-network - -networks: - service-network: - name: service-network - diff --git a/run.sh b/run.sh index c55fb2782a9816093453231ad2cd8d98efb36d36..0c06d93ac714a0a4b81dc1a638d7560851ed0f7b 100644 --- a/run.sh +++ b/run.sh @@ -1,21 +1,4 @@ #!/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 +sudo docker-compose build +sudo docker-compose up diff --git a/runcloud.sh b/runcloud.sh index 1050d9b7ffc05bbc1c938454c2ab12dd3d1b83f9..03ecc6a5ab5dd68224d57b285a9b5e30b2f24e13 100644 --- a/runcloud.sh +++ b/runcloud.sh @@ -7,3 +7,5 @@ sudo mv /usr/local/bin/docker-compose /usr/bin/docker-compose sudo chmod +x /usr/bin/docker-compose sudo service docker start + +sudo bash run.sh 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 42bf485bf36976cde51988ddb6b524f9a58b192d..d48b4b359b59ffbd28614d97acf5452300d77f5e 100644 --- a/user-service/application/models.py +++ b/user-service/application/models.py @@ -17,7 +17,6 @@ class User(db.Model, UserMixin): image_url = db.Column(db.String(255), nullable=False) api_key = db.Column(db.String(255), unique=True, nullable=True) date_added = db.Column(db.DateTime, default=datetime.utcnow) - # date_updated = db.Column(db.DateTime, onupdate=datetime.utcnow) def encode_api_key(self): self.api_key = sha256_crypt.hash(self.email + str(datetime.utcnow)) diff --git a/user-service/docker-compose.yml b/user-service/docker-compose.yml deleted file mode 100644 index bf023c2adb082818b78a7c28861644c092be4a4f..0000000000000000000000000000000000000000 --- a/user-service/docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -volumes: - user_mysql: - -services: - user-service: - build: - context: . - dockerfile: Dockerfile - ports: - - "5001:5001" - volumes: - - .:/user-service - depends_on: - - user-db - networks: - - service-network - - user-db: - image: mysql - restart: always - environment: - MYSQL_DATABASE: user - MYSQL_USER: user-service - MYSQL_PASSWORD: pass1234 - MYSQL_ROOT_PASSWORD: pass1234 - MYSQL_HOST: "%" - volumes: - - user_mysql:/var/lib/mysql - ports: - - 3307:3306 - networks: - - service-network - -networks: - service-network: - name: service-network - diff --git a/user-service/instance/users-service.db b/user-service/instance/users-service.db index 7498427f3d6593a7b74a91c1c61ad9d06d90e25d..2fb85d47485846915ff70bdb7ede625883a8c540 100644 Binary files a/user-service/instance/users-service.db and b/user-service/instance/users-service.db differ