flash to session controller

pik-nik · Mar 16, 2023 · efec3bc · efec3bc
1 parent 4a13bc7
commit efec3bc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/controllers/session_controller.js b/controllers/session_controller.js
@@ -9,7 +9,7 @@ router.get("/", (req, res) => {
 
 router.get("/login", (req, res) => {
     const unsuccessfulString = ""
-    res.render("login", { unsuccessfulString })
+    res.render("login", { message: req.flash('info') })
 }) 
 
 router.post("/sessions", (req, res) => {
@@ -20,8 +20,8 @@ router.post("/sessions", (req, res) => {
         const sql = `SELECT * FROM users WHERE email = '${email}'`
         db.query(sql, (err, dbRes) => {
             if (dbRes.rows.length === 0) { // if no user exists
-                const unsuccessfulString = "Account does not exist with this email"
-                res.render("login", { unsuccessfulString })
+                req.flash("info", "Account does not exist with this email")
+                res.redirect("/login")
                 return 
             }
             const user = dbRes.rows[0]
@@ -32,8 +32,8 @@ router.post("/sessions", (req, res) => {
                     console.log(req.session);
                     res.redirect(`/users/${user.user_id}`)
                 } else {
-                    const unsuccessfulString = "Incorrect password, please try again"
-                    res.render("login", { unsuccessfulString })
+                    req.flash("info", "Incorrect password, please try again")
+                    res.redirect("/login")
                 }
             });
         })

diff --git a/public/css/home.css b/public/css/home.css
@@ -50,10 +50,12 @@ p {
 
 .already_member a {
     color: #fff;
+    font-size: 20px;
 }
 
 .already_member span {
     color: #9500ff;
+    font-family: 'Bebas Neue', cursive;
 }
 
 #features ul {

diff --git a/public/css/style.css b/public/css/style.css
@@ -1,6 +1,6 @@
 * {
     box-sizing: border-box;
-    font-family: Arial, Helvetica, sans-serif;
+    font-family: 'Abel', sans-serif;
     margin: 0;
 }
 

diff --git a/views/layout.ejs b/views/layout.ejs
@@ -6,9 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Fortis</title>
     <link rel="stylesheet" href="/css/style.css">
+    <!-- <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@1,900&display=swap" rel="stylesheet"> -->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@1,900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Abel&family=Barlow:ital,wght@1,900&family=Bebas+Neue&display=swap" rel="stylesheet">
 </head>
 <body>
 
@@ -29,6 +32,7 @@
                     <li><a href="/users/workouts"><p class="workouts">My Workouts</p></a></li>
                     <% if(isLoggedIn()) { %>
                         <li>
+                            <img src="<%=currentUser.profile_photo%>" alt="">
                             <p><a href="/users/<%=currentUser.user_id%>"><%=currentUser.username%></a></p>     
                             <form action="/sessions" method="post">
                                 <input type="hidden" name="_method" value="delete"/>

diff --git a/views/login.ejs b/views/login.ejs
@@ -4,7 +4,9 @@
 <body>
     <section class="form_container">
         <h2>Login</h2>
-        <p> <%= unsuccessfulString %> </p>
+        <% if (message) { %>
+            <p><%= message %></p>
+            <% } %>
         <form action="/sessions" method="post">
             <ul>
                 <li>