diff --git a/frontend/.env b/frontend/.env index 30a348dd01b618dc7730ebcbc5ca173fa9db1cdf..10e8a83f3e013f8471deb95602057993ec773606 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.ProductionConfig" +CONFIGURATION_SETUP="config.DevelopmentConfig" diff --git a/frontend/application/frontend/views.py b/frontend/application/frontend/views.py index 12f2bc72a617b95f0c742b80e481f6ab067126c3..dc957e4225926f698900049a58f9e2a18fed0e55 100644 --- a/frontend/application/frontend/views.py +++ b/frontend/application/frontend/views.py @@ -431,6 +431,8 @@ def display_user(user_id): user_posts = [] posts = PostClient.get_user_posts(response['id']) + if posts == 404: + posts = [] content = { 'name': response['full_name'], @@ -449,6 +451,8 @@ def display_currentuser(): user_posts = [] posts = PostClient.get_user_posts(session['user']['id']) + if posts == 404: + posts = [] form = forms.AccountUpdateForm() if request.method == "POST": diff --git a/frontend/application/static/images/b41980b54453e845.jpg b/frontend/application/static/images/b41980b54453e845.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b7f5716ea81e9977059833080a716ed0a84e799d Binary files /dev/null and b/frontend/application/static/images/b41980b54453e845.jpg differ diff --git a/frontend/application/static/images/c07cf9f51e13ab05.jpg b/frontend/application/static/images/c07cf9f51e13ab05.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b7f5716ea81e9977059833080a716ed0a84e799d Binary files /dev/null and b/frontend/application/static/images/c07cf9f51e13ab05.jpg differ diff --git a/frontend/application/static/images/f9920f8f90370c6c.png b/frontend/application/static/images/f9920f8f90370c6c.png new file mode 100644 index 0000000000000000000000000000000000000000..c4dfadc67da69aa2a3c75c5235142329e18c5ac9 Binary files /dev/null and b/frontend/application/static/images/f9920f8f90370c6c.png differ diff --git a/frontend/application/static/images/ffcd21586c41848d.jpg b/frontend/application/static/images/ffcd21586c41848d.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b7f5716ea81e9977059833080a716ed0a84e799d Binary files /dev/null and b/frontend/application/static/images/ffcd21586c41848d.jpg differ diff --git a/frontend/application/static/images/users/56eefb2038de3543.png b/frontend/application/static/images/users/56eefb2038de3543.png new file mode 100644 index 0000000000000000000000000000000000000000..0072163bdb83d1591ddd3e55cf955c375902d644 Binary files /dev/null and b/frontend/application/static/images/users/56eefb2038de3543.png differ diff --git a/frontend/application/static/images/users/703cf30e47e99dba.jpg b/frontend/application/static/images/users/703cf30e47e99dba.jpg new file mode 100644 index 0000000000000000000000000000000000000000..88138f054c3dceabede0508508a813d15cc1bcb5 Binary files /dev/null and b/frontend/application/static/images/users/703cf30e47e99dba.jpg differ diff --git a/frontend/application/static/images/users/afa6bae8f5ef1d3a.png b/frontend/application/static/images/users/afa6bae8f5ef1d3a.png new file mode 100644 index 0000000000000000000000000000000000000000..0072163bdb83d1591ddd3e55cf955c375902d644 Binary files /dev/null and b/frontend/application/static/images/users/afa6bae8f5ef1d3a.png differ diff --git a/frontend/application/static/images/users/ea9bb8471be05de6.png b/frontend/application/static/images/users/ea9bb8471be05de6.png new file mode 100644 index 0000000000000000000000000000000000000000..0072163bdb83d1591ddd3e55cf955c375902d644 Binary files /dev/null and b/frontend/application/static/images/users/ea9bb8471be05de6.png differ diff --git a/frontend/application/templates/forum/post.html b/frontend/application/templates/forum/post.html index 5c50ab80a5dbdab8bd33d950f55399fff7802930..1a55e311be616766b35b15fcf1bd231fc6e83f19 100644 --- a/frontend/application/templates/forum/post.html +++ b/frontend/application/templates/forum/post.html @@ -32,7 +32,8 @@ <!-- START posts --> <div class="col-md-8"> - <div class="post-container"> + <div class="post-container" style="height: 400px; width: 100%; overflow: auto; + word-wrap: break-word; white-space: normal"> <div class="tile__author"> <img class="profile-image" src="images/users/{{ owner_image }}"> <h2 ><a href="{{ url_for('frontend.display_user', user_id=post.user_id) }}">{{ post['user_name'] }}</a></h2> @@ -58,7 +59,7 @@ <!-- START comments --> - <div class="comment-container" style="overflow-y: auto; height: 300px;"> + <div class="comment-container" style="overflow-y: auto; height: 600px; width: 100%"> <h3 class="comment__title">COMMENTS</h3> {% if comments %} {% for comment, image in comments %} diff --git a/post-service/.env b/post-service/.env index 30a348dd01b618dc7730ebcbc5ca173fa9db1cdf..10e8a83f3e013f8471deb95602057993ec773606 100644 --- a/post-service/.env +++ b/post-service/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.ProductionConfig" +CONFIGURATION_SETUP="config.DevelopmentConfig" diff --git a/post-service/instance/posts-service.db b/post-service/instance/posts-service.db index 9ab4f800813bd86bd6b451732a725bbdb6cfb68d..4093f5fde0bcab101216b089f66979fefc2e5cba 100644 Binary files a/post-service/instance/posts-service.db and b/post-service/instance/posts-service.db differ diff --git a/user-service/.env b/user-service/.env index 30a348dd01b618dc7730ebcbc5ca173fa9db1cdf..10e8a83f3e013f8471deb95602057993ec773606 100644 --- a/user-service/.env +++ b/user-service/.env @@ -1 +1 @@ -CONFIGURATION_SETUP="config.ProductionConfig" +CONFIGURATION_SETUP="config.DevelopmentConfig" diff --git a/user-service/instance/users-service.db b/user-service/instance/users-service.db index 9448302443290a84e12677b4ba7be83e2aaea46d..b2df22b256e888cef75d66e164d4116dac58be42 100644 Binary files a/user-service/instance/users-service.db and b/user-service/instance/users-service.db differ