Merge pull request #75 from uofa-cmput404/dec_5

Dec 5
uofa-cmput404 · Dec 6, 2023 · 1815cfb · 1815cfb
2 parents d54cb11 + eaeb5d8
commit 1815cfb
Show file tree

Hide file tree

Showing 47 changed files with 66 additions and 19 deletions.
diff --git a/backend/comment/__pycache__/__init__.cpython-310.pyc b/backend/comment/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/comment/__pycache__/admin.cpython-310.pyc b/backend/comment/__pycache__/admin.cpython-310.pyc
diff --git a/backend/comment/__pycache__/apps.cpython-310.pyc b/backend/comment/__pycache__/apps.cpython-310.pyc
diff --git a/backend/comment/__pycache__/models.cpython-310.pyc b/backend/comment/__pycache__/models.cpython-310.pyc
diff --git a/backend/comment/__pycache__/serializers.cpython-310.pyc b/backend/comment/__pycache__/serializers.cpython-310.pyc
diff --git a/backend/comment/__pycache__/urls.cpython-310.pyc b/backend/comment/__pycache__/urls.cpython-310.pyc
diff --git a/backend/comment/__pycache__/views.cpython-310.pyc b/backend/comment/__pycache__/views.cpython-310.pyc
diff --git a/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/comment/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc b/backend/comment/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/__init__.cpython-310.pyc b/backend/friendship/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/admin.cpython-310.pyc b/backend/friendship/__pycache__/admin.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/apps.cpython-310.pyc b/backend/friendship/__pycache__/apps.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/models.cpython-310.pyc b/backend/friendship/__pycache__/models.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/serializers.cpython-310.pyc b/backend/friendship/__pycache__/serializers.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/urls.cpython-310.pyc b/backend/friendship/__pycache__/urls.cpython-310.pyc
diff --git a/backend/friendship/__pycache__/views.cpython-310.pyc b/backend/friendship/__pycache__/views.cpython-310.pyc
diff --git a/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/friendship/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc b/backend/friendship/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/post/__pycache__/__init__.cpython-310.pyc b/backend/post/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/post/__pycache__/admin.cpython-310.pyc b/backend/post/__pycache__/admin.cpython-310.pyc
diff --git a/backend/post/__pycache__/apps.cpython-310.pyc b/backend/post/__pycache__/apps.cpython-310.pyc
diff --git a/backend/post/__pycache__/models.cpython-310.pyc b/backend/post/__pycache__/models.cpython-310.pyc
diff --git a/backend/post/__pycache__/serializers.cpython-310.pyc b/backend/post/__pycache__/serializers.cpython-310.pyc
diff --git a/backend/post/__pycache__/urls.cpython-310.pyc b/backend/post/__pycache__/urls.cpython-310.pyc
diff --git a/backend/post/__pycache__/views.cpython-310.pyc b/backend/post/__pycache__/views.cpython-310.pyc
diff --git a/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/post/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/backend/post/migrations/__pycache__/__init__.cpython-310.pyc b/backend/post/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/social/__pycache__/__init__.cpython-310.pyc b/backend/social/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/social/__pycache__/settings.cpython-310.pyc b/backend/social/__pycache__/settings.cpython-310.pyc
diff --git a/backend/social/__pycache__/urls.cpython-310.pyc b/backend/social/__pycache__/urls.cpython-310.pyc
diff --git a/backend/social/__pycache__/views.cpython-310.pyc b/backend/social/__pycache__/views.cpython-310.pyc
diff --git a/backend/user/__pycache__/__init__.cpython-310.pyc b/backend/user/__pycache__/__init__.cpython-310.pyc
diff --git a/backend/user/__pycache__/admin.cpython-310.pyc b/backend/user/__pycache__/admin.cpython-310.pyc
diff --git a/backend/user/__pycache__/apps.cpython-310.pyc b/backend/user/__pycache__/apps.cpython-310.pyc
diff --git a/backend/user/__pycache__/models.cpython-310.pyc b/backend/user/__pycache__/models.cpython-310.pyc
diff --git a/backend/user/__pycache__/serializers.cpython-310.pyc b/backend/user/__pycache__/serializers.cpython-310.pyc
diff --git a/backend/user/__pycache__/urls.cpython-310.pyc b/backend/user/__pycache__/urls.cpython-310.pyc
diff --git a/backend/user/__pycache__/views.cpython-310.pyc b/backend/user/__pycache__/views.cpython-310.pyc
diff --git a/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/user/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/backend/user/migrations/__pycache__/__init__.cpython-310.pyc b/backend/user/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/frontend/pages/AdminPage.html b/frontend/pages/AdminPage.html
@@ -9,6 +9,7 @@
     <script type="module" src="../scripts/adminPage.js"></script>
 </head>
 <body>
+    <button id="backButton">Back to Dashboard</button>
     <div class="container">
         <div class="user-list inactive-users">
             <h2>Inactive Users</h2>

diff --git a/frontend/pages/notificationPage.html b/frontend/pages/notificationPage.html
@@ -33,19 +33,19 @@ <h1>Friend Requests</h1> <!-- List of friend requests -->
         </div>
 
         <!-- Either someone has liked your post, or commented on your post. Depending on which one, add in the appropriate node. EACH NODE IS CLICKABLE TO TAKE YOU TO THE POST.-->        
-        <div class="likedCommentedStream">
+        <!-- <div class="likedCommentedStream"> -->
 
-            <h1>Notifications</h1> <!-- Someone has liked your post, someone has commented: ... -->
-            <div id="likedNode">
+            <!-- <h1>Notifications</h1> <!-- Someone has liked your post, someone has commented: ... -->
+            <!-- <div id="likedNode">
                 <div class="sender">"XYZ" Liked your post</div>
                 <img id="likedIcon" src="../images/likedIcon.png" alt="">
-            </div>
+            </div> -->
 
-            <div id="commentedNode">
+            <!-- <div id="commentedNode">
                 <div class="sender">"XYZ" Commented: "......................"</div>
                 <img src="../images/commentIcon.png" alt="" id="commentedIcon">
             </div>
-        </div>
+        </div> -->
 
         <!-- This one is super simple. Just 1 div where you replace the "XYZ" with user, and make it clickable to the post link. -->
         <div class="inboxStream">

diff --git a/frontend/pages/userProfile.html b/frontend/pages/userProfile.html
@@ -62,9 +62,7 @@
             <hr class="divider">
 
             <!-- 3) Other Content -->
-            <div class="userContent">
-                <p>< Can put other content here ></p>
-            </div>
+
 
         </div>
 

diff --git a/frontend/static/social/stylesheets/adminPage.css b/frontend/static/social/stylesheets/adminPage.css
@@ -1,21 +1,28 @@
 
 .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;
     border-bottom: 1px solid #ccc;
     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
@@ -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
@@ -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
@@ -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;