diff --git a/backend/comment/__pycache__/__init__.cpython-310.pyc b/backend/comment/__pycache__/__init__.cpython-310.pyc index f52c777..facdc4e 100644 Binary files a/backend/comment/__pycache__/__init__.cpython-310.pyc and b/backend/comment/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/admin.cpython-310.pyc b/backend/comment/__pycache__/admin.cpython-310.pyc index a8c6723..f5ae241 100644 Binary files a/backend/comment/__pycache__/admin.cpython-310.pyc and b/backend/comment/__pycache__/admin.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/apps.cpython-310.pyc b/backend/comment/__pycache__/apps.cpython-310.pyc index 65f5698..79f5cb5 100644 Binary files a/backend/comment/__pycache__/apps.cpython-310.pyc and b/backend/comment/__pycache__/apps.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/models.cpython-310.pyc b/backend/comment/__pycache__/models.cpython-310.pyc index 5be6077..f9499e9 100644 Binary files a/backend/comment/__pycache__/models.cpython-310.pyc and b/backend/comment/__pycache__/models.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/serializers.cpython-310.pyc b/backend/comment/__pycache__/serializers.cpython-310.pyc index 8a1087b..d9d3ece 100644 Binary files a/backend/comment/__pycache__/serializers.cpython-310.pyc and b/backend/comment/__pycache__/serializers.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/urls.cpython-310.pyc b/backend/comment/__pycache__/urls.cpython-310.pyc index b0e6d8b..4aeb345 100644 Binary files a/backend/comment/__pycache__/urls.cpython-310.pyc and b/backend/comment/__pycache__/urls.cpython-310.pyc differ diff --git a/backend/comment/__pycache__/views.cpython-310.pyc b/backend/comment/__pycache__/views.cpython-310.pyc index f986317..9e0ad38 100644 Binary files a/backend/comment/__pycache__/views.cpython-310.pyc and b/backend/comment/__pycache__/views.cpython-310.pyc differ diff --git a/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc index 6d0ba0c..3f69f32 100644 Binary files a/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc and b/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc b/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc index 8ecffa4..7b13c7b 100644 Binary files a/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc and b/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/__init__.cpython-310.pyc b/backend/friendship/__pycache__/__init__.cpython-310.pyc index ab28f3e..49519a2 100644 Binary files a/backend/friendship/__pycache__/__init__.cpython-310.pyc and b/backend/friendship/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/admin.cpython-310.pyc b/backend/friendship/__pycache__/admin.cpython-310.pyc index ce2bad1..328a32a 100644 Binary files a/backend/friendship/__pycache__/admin.cpython-310.pyc and b/backend/friendship/__pycache__/admin.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/apps.cpython-310.pyc b/backend/friendship/__pycache__/apps.cpython-310.pyc index 6a99b0d..8ad6697 100644 Binary files a/backend/friendship/__pycache__/apps.cpython-310.pyc and b/backend/friendship/__pycache__/apps.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/models.cpython-310.pyc b/backend/friendship/__pycache__/models.cpython-310.pyc index 8265f06..d7b8ef6 100644 Binary files a/backend/friendship/__pycache__/models.cpython-310.pyc and b/backend/friendship/__pycache__/models.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/serializers.cpython-310.pyc b/backend/friendship/__pycache__/serializers.cpython-310.pyc index 962265f..643bc32 100644 Binary files a/backend/friendship/__pycache__/serializers.cpython-310.pyc and b/backend/friendship/__pycache__/serializers.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/urls.cpython-310.pyc b/backend/friendship/__pycache__/urls.cpython-310.pyc index 9ca0fce..afd062e 100644 Binary files a/backend/friendship/__pycache__/urls.cpython-310.pyc and b/backend/friendship/__pycache__/urls.cpython-310.pyc differ diff --git a/backend/friendship/__pycache__/views.cpython-310.pyc b/backend/friendship/__pycache__/views.cpython-310.pyc index b324b17..6851243 100644 Binary files a/backend/friendship/__pycache__/views.cpython-310.pyc and b/backend/friendship/__pycache__/views.cpython-310.pyc differ diff --git a/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc index 50fe68f..412475f 100644 Binary files a/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc and b/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc b/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc index d916af3..b03066c 100644 Binary files a/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc and b/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/post/__pycache__/__init__.cpython-310.pyc b/backend/post/__pycache__/__init__.cpython-310.pyc index f924d23..260eb75 100644 Binary files a/backend/post/__pycache__/__init__.cpython-310.pyc and b/backend/post/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/post/__pycache__/admin.cpython-310.pyc b/backend/post/__pycache__/admin.cpython-310.pyc index a4bded5..e9619ca 100644 Binary files a/backend/post/__pycache__/admin.cpython-310.pyc and b/backend/post/__pycache__/admin.cpython-310.pyc differ diff --git a/backend/post/__pycache__/apps.cpython-310.pyc b/backend/post/__pycache__/apps.cpython-310.pyc index cc3fe54..fcba421 100644 Binary files a/backend/post/__pycache__/apps.cpython-310.pyc and b/backend/post/__pycache__/apps.cpython-310.pyc differ diff --git a/backend/post/__pycache__/models.cpython-310.pyc b/backend/post/__pycache__/models.cpython-310.pyc index b40008b..97ffd1b 100644 Binary files a/backend/post/__pycache__/models.cpython-310.pyc and b/backend/post/__pycache__/models.cpython-310.pyc differ diff --git a/backend/post/__pycache__/serializers.cpython-310.pyc b/backend/post/__pycache__/serializers.cpython-310.pyc index 3241e0d..b3c2d24 100644 Binary files a/backend/post/__pycache__/serializers.cpython-310.pyc and b/backend/post/__pycache__/serializers.cpython-310.pyc differ diff --git a/backend/post/__pycache__/urls.cpython-310.pyc b/backend/post/__pycache__/urls.cpython-310.pyc index f0bd3a7..2ec7ac7 100644 Binary files a/backend/post/__pycache__/urls.cpython-310.pyc and b/backend/post/__pycache__/urls.cpython-310.pyc differ diff --git a/backend/post/__pycache__/views.cpython-310.pyc b/backend/post/__pycache__/views.cpython-310.pyc index bb17350..036ad00 100644 Binary files a/backend/post/__pycache__/views.cpython-310.pyc and b/backend/post/__pycache__/views.cpython-310.pyc differ diff --git a/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc index 0f571fc..ceeabe7 100644 Binary files a/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc and b/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/backend/post/migrations/__pycache__/__init__.cpython-310.pyc b/backend/post/migrations/__pycache__/__init__.cpython-310.pyc index 6902c5b..c8be0f9 100644 Binary files a/backend/post/migrations/__pycache__/__init__.cpython-310.pyc and b/backend/post/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/social/__pycache__/__init__.cpython-310.pyc b/backend/social/__pycache__/__init__.cpython-310.pyc index 95f54e2..ee60ea3 100644 Binary files a/backend/social/__pycache__/__init__.cpython-310.pyc and b/backend/social/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/social/__pycache__/settings.cpython-310.pyc b/backend/social/__pycache__/settings.cpython-310.pyc index 50dc66e..8dee5d8 100644 Binary files a/backend/social/__pycache__/settings.cpython-310.pyc and b/backend/social/__pycache__/settings.cpython-310.pyc differ diff --git a/backend/social/__pycache__/urls.cpython-310.pyc b/backend/social/__pycache__/urls.cpython-310.pyc index ed7111a..b626276 100644 Binary files a/backend/social/__pycache__/urls.cpython-310.pyc and b/backend/social/__pycache__/urls.cpython-310.pyc differ diff --git a/backend/social/__pycache__/views.cpython-310.pyc b/backend/social/__pycache__/views.cpython-310.pyc index b1fd166..deeada9 100644 Binary files a/backend/social/__pycache__/views.cpython-310.pyc and b/backend/social/__pycache__/views.cpython-310.pyc differ diff --git a/backend/user/__pycache__/__init__.cpython-310.pyc b/backend/user/__pycache__/__init__.cpython-310.pyc index 25c1fac..a2a5350 100644 Binary files a/backend/user/__pycache__/__init__.cpython-310.pyc and b/backend/user/__pycache__/__init__.cpython-310.pyc differ diff --git a/backend/user/__pycache__/admin.cpython-310.pyc b/backend/user/__pycache__/admin.cpython-310.pyc index 0759a81..7ec65ab 100644 Binary files a/backend/user/__pycache__/admin.cpython-310.pyc and b/backend/user/__pycache__/admin.cpython-310.pyc differ diff --git a/backend/user/__pycache__/apps.cpython-310.pyc b/backend/user/__pycache__/apps.cpython-310.pyc index 7653be1..d13042e 100644 Binary files a/backend/user/__pycache__/apps.cpython-310.pyc and b/backend/user/__pycache__/apps.cpython-310.pyc differ diff --git a/backend/user/__pycache__/models.cpython-310.pyc b/backend/user/__pycache__/models.cpython-310.pyc index e7e39c2..7030bbe 100644 Binary files a/backend/user/__pycache__/models.cpython-310.pyc and b/backend/user/__pycache__/models.cpython-310.pyc differ diff --git a/backend/user/__pycache__/serializers.cpython-310.pyc b/backend/user/__pycache__/serializers.cpython-310.pyc index 1aa227b..e926fe4 100644 Binary files a/backend/user/__pycache__/serializers.cpython-310.pyc and b/backend/user/__pycache__/serializers.cpython-310.pyc differ diff --git a/backend/user/__pycache__/urls.cpython-310.pyc b/backend/user/__pycache__/urls.cpython-310.pyc index d10d957..80e2560 100644 Binary files a/backend/user/__pycache__/urls.cpython-310.pyc and b/backend/user/__pycache__/urls.cpython-310.pyc differ diff --git a/backend/user/__pycache__/views.cpython-310.pyc b/backend/user/__pycache__/views.cpython-310.pyc index 8bb7f1d..0d911bd 100644 Binary files a/backend/user/__pycache__/views.cpython-310.pyc and b/backend/user/__pycache__/views.cpython-310.pyc differ diff --git a/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc index 5101a6a..57f3bd2 100644 Binary files a/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc and b/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/backend/user/migrations/__pycache__/__init__.cpython-310.pyc b/backend/user/migrations/__pycache__/__init__.cpython-310.pyc index 12c74d2..a0fd222 100644 Binary files a/backend/user/migrations/__pycache__/__init__.cpython-310.pyc and b/backend/user/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/frontend/pages/AdminPage.html b/frontend/pages/AdminPage.html index 236f82e..d8c87b7 100644 --- a/frontend/pages/AdminPage.html +++ b/frontend/pages/AdminPage.html @@ -9,6 +9,7 @@ +

Inactive Users

diff --git a/frontend/pages/notificationPage.html b/frontend/pages/notificationPage.html index fa94ace..945eed3 100644 --- a/frontend/pages/notificationPage.html +++ b/frontend/pages/notificationPage.html @@ -33,19 +33,19 @@

Friend Requests

-
+ -

Notifications

-
+ + -
+
diff --git a/frontend/pages/userProfile.html b/frontend/pages/userProfile.html index dbc8c65..15a9484 100644 --- a/frontend/pages/userProfile.html +++ b/frontend/pages/userProfile.html @@ -62,9 +62,7 @@
-
-

< Can put other content here >

-
+
diff --git a/frontend/static/social/stylesheets/adminPage.css b/frontend/static/social/stylesheets/adminPage.css index 78703c1..bddeaa7 100644 --- a/frontend/static/social/stylesheets/adminPage.css +++ b/frontend/static/social/stylesheets/adminPage.css @@ -1,13 +1,19 @@ .container { display: flex; - justify-content: space-between; + justify-content: space-around; } .user-list { width: 45%; + flex: 0 0 40%; + border: 1px solid black; + padding: 12px; + border-radius: 8px; } .active-users { border-right: 2px solid #000; + flex: 0 0 40%; + height: 80vh; } .user-item { padding: 10px; @@ -15,7 +21,8 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: 10px; + margin-bottom: 2rem; + } .button-container { @@ -62,3 +69,21 @@ margin-bottom: 10px; } +#backButton{ + cursor: pointer; + outline: 0; + display: inline-block; + font-weight: 400; + line-height: 1.5; + text-align: center; + background-color: transparent; + border: 2px solid transparent; + padding: 6px 12px; + font-size: 1.5rem; + border-radius: .25rem; + margin-bottom: 1rem; + + color: #0d6efd; + border-color: #0d6efd; +} + diff --git a/frontend/static/social/stylesheets/homepage.css b/frontend/static/social/stylesheets/homepage.css index 61e82db..3eb810f 100644 --- a/frontend/static/social/stylesheets/homepage.css +++ b/frontend/static/social/stylesheets/homepage.css @@ -467,10 +467,11 @@ dialog::backdrop{ transform: translate(-50%, -50%); z-index: 10; position: fixed; - width: 550px; + width: 450px; height: fit-content; margin-top: 10px; border-radius: 12px; + border: 2px solid var(--darkText); display: none; } .select-btn{ @@ -511,6 +512,26 @@ dialog::backdrop{ padding: 16px; background-color: #fff; box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1); + border: 1px solid var(--niceGray); +} + +.list-items .share-posts-btn{ + + display: inline-block; + outline: none; + cursor: pointer; + font-weight: 500; + border-radius: 3px; + padding: 0 15px; + border-radius: 4px; + color: #6200ee; + background: transparent; + line-height: 1.15; + height: 36px; + min-width: 64px; + border: 1px solid #6200ee; + text-align: center; + } .select-btn.open ~ .list-items{ display: block; diff --git a/frontend/static/social/stylesheets/myProfile.css b/frontend/static/social/stylesheets/myProfile.css index 89a4bad..62f96ba 100644 --- a/frontend/static/social/stylesheets/myProfile.css +++ b/frontend/static/social/stylesheets/myProfile.css @@ -23,6 +23,9 @@ body{ .content .stream{ padding-top: 5rem; align-items: center; + flex-direction: column; + border-radius: 12px; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); } hr.divider { diff --git a/frontend/static/social/stylesheets/notificationPage.css b/frontend/static/social/stylesheets/notificationPage.css index f6e0912..a27f0f4 100644 --- a/frontend/static/social/stylesheets/notificationPage.css +++ b/frontend/static/social/stylesheets/notificationPage.css @@ -32,6 +32,7 @@ .content{ overflow: auto; /* make it so when content goes out of each column, it adds a scrollbar */ padding: 1rem; + justify-content: space-around; } .content h1{ @@ -50,7 +51,7 @@ /* Structure */ display: flex; flex-direction: column; - flex: 0 0 33%; + flex: 0 0 40%; border: 1px solid black; border-radius: 12px; box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; @@ -62,8 +63,7 @@ padding: 1rem; } -.likedCommentedStream{ - /* Structure */ +/* .likedCommentedStream{ display: flex; flex-direction: column; flex: 0 0 33%; @@ -73,16 +73,15 @@ overflow-y: auto; min-height: min-content; - /* Styling */ - gap: 1rem; /* Gap between nodes */ + gap: 1rem; padding: 1rem; -} +} */ .inboxStream{ /* Structure */ display: flex; flex-direction: column; - flex: 0 0 33%; + flex: 0 0 40%; border: 1px solid black; border-radius: 12px; box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;