Merge pull request #26 from Ghalia98/styleUpdate

Style update
Ghalia98 · Feb 18, 2022 · 2b5a00b · 2b5a00b
2 parents 8d6ce98 + cb7bed9
commit 2b5a00b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -471,16 +471,33 @@ input.search-input-field {
 }
 
 .profile-img {
-    width: 150px;
-    height: 150px;
-    object-fit: cover;
-    border-radius: 50%;
+  width: 150px;
+  height: 150px;
+  object-fit: cover;
+  border-radius: 50%;
+  border: 3px solid white;
+}
+
+.user-info{
+    display: flex;
+    background-color: #000000cf;
+    height: 120px;
+    padding: 20px 30px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+    margin-bottom: 80px;
+    color: #fff;
+}
+
+.user-info-sub-div{
+    padding: 30px;
 }
 
 .profile-body {
-    margin: 0px 90px;
-    padding: 0px 120px;
-    background-color: bisque;
+    font-family: "Marcellus", serif;
+    margin: 60px 170px 0px;
+    border: 2px solid black;
+    border-radius: 10px;
 }
 
 #image-container-login {

diff --git a/routes/recipes.js b/routes/recipes.js
@@ -52,7 +52,8 @@ router.get("/:id", (req, res, next) => {
             let showDelete;
             if (!req.session.user) {
                 showDelete = false
-            } else {
+            }
+            else {
                 showDelete = req.session.user._id == recipe.creater._id
                 console.log(showDelete)
             }

diff --git a/views/event/details.hbs b/views/event/details.hbs
@@ -8,9 +8,8 @@
             <div>
                 <p>⏰{{startDate}}, {{startTime}} - {{endTime}}</p>
                 <h1>{{title}}</h1>
-                <p>Created by {{creater.name}}</p>
+                <span>-By <a href="/profile/{{creater._id}}">{{creater.name}}</a></span>
                 <button type="submit" class="read-more-event">Join this event</button>
-                <p class="participant">{{participant}} people are going</p>
             </div>
         </div>
 

diff --git a/views/user/profile.hbs b/views/user/profile.hbs
@@ -1,17 +1,20 @@
 
 <div class="profile-body">
-    <h1>Profile</h1>
-
+
     {{#with user}}
-        <img src="{{imageUrl}}" alt="Picture of {{name}}" class="profile-img" >
-        <h3 class="user-name">{{name}}</h3>
-        <h3>{{city}}</h3>
-        <h3>{{age}}</h3>
-        <p>{{intro}}</p>
+        <div class="user-info">
+            <img src="{{imageUrl}}" alt="Picture of {{name}}" class="profile-img" >
+
+            <div class="user-info-sub-div">
+                <h4 class="user-name">{{name}}</h4>
+                <h5>{{city}}</h5>
+                <p>{{intro}}</p>
+            </div>
+        </div>
+
     {{/with}}
 
-
-    <h2>My Recipes</h2>
+    <h4 class="text-center">Check out my recipes below!</h4>
     <div class="recipes-collection-div">
     {{#each recipe}}
 
@@ -23,7 +26,7 @@
     {{/each}}
     </div>
 
-     <h2>My Events</h2>
+    <h4 class="text-center">Events Hosted</h4>
     <div class="recipes-collection-div">
     {{#each event}}
         <div class="recipe-info-box">