From 84db67dccd36025be5df1d5a779a2668b4b70146 Mon Sep 17 00:00:00 2001
From: Janis M <janis.meister87@gmail.com>
Date: Wed, 30 Mar 2022 11:02:31 +0200
Subject: [PATCH] login fix

---
 index.js                | 41 +++++++++++++++---------
 static/css/account.css  |  5 ++-
 static/css/style.css    |  1 -
 views/account.ejs       | 70 ++++++++++++++++++++++-------------------
 views/order.ejs         |  5 +--
 views/order_success.ejs |  6 ++--
 views/search.ejs        |  4 +--
 7 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/index.js b/index.js
index a82d855..3e002f0 100644
--- a/index.js
+++ b/index.js
@@ -36,17 +36,25 @@ function authNoRedirectHandler(req, res, next){
         } else if(data.user){ // If authcookie is valid
             req.user = data.user; // Set user to data.user
             mysql_handler.con.query(`SELECT * FROM users WHERE id = "${req.user}"`, (err, result) => { // Get user from database
+
                 if(err) console.log(err);
                 let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database
-                if(user.id){
-                    // Set user to req.user
-                    req.isAdmin = user.isAdmin;
-                    req.username = user.username;
-                    req.firstname = user.firstname;
-                    req.lastname = user.lastname;
-                    req.email = user.email;
+                console.log("Moin3")
+                try{
+                    if(user.id){
+                        console.log("Moin4")
+                        // Set user to req.user
+                        req.isAdmin = user.isAdmin;
+                        req.username = user.username;
+                        req.firstname = user.firstname;
+                        req.lastname = user.lastname;
+                        req.email = user.email;
+                    }
+                }catch{
+                    res.redirect('/logout')
+                    return;
                 }
-               
+                console.log("Moin5")
                 next(); // Continue to next handler
             });
         }
@@ -66,13 +74,16 @@ function authenticatedHandler(req, res, next){
             req.user = data.user; // Set user to data.user
             mysql_handler.con.query(`SELECT * FROM users LEFT JOIN userinfos ON users.id=userinfos.userId WHERE users.id = "${req.user}"`, (err, result) => { // Get user from database
                 if(err) console.log(err);
-                let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database
-                // Set user to req.user
-                req.isAdmin = user.isAdmin;
-                req.username = user.username;
-                req.firstname = user.firstname;
-                req.lastname = user.lastname;
-                req.email = user.email;
+                if(result.length > 0){
+                    let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database
+                    // Set user to req.user
+                    req.isAdmin = user.isAdmin;
+                    req.username = user.username;
+                    req.firstname = user.firstname;
+                    req.lastname = user.lastname;
+                    req.email = user.email;
+                    
+                }
                 next(); // Continue to next handler
             });
         }
diff --git a/static/css/account.css b/static/css/account.css
index 567f3f4..09719ba 100644
--- a/static/css/account.css
+++ b/static/css/account.css
@@ -2,10 +2,10 @@
     display: block;
     margin-left: auto;
     margin-right: auto;
-    width: 600px;
     margin-top: 60px;
     margin-bottom: 60px;
-    border-bottom: 2px solid rgb(104, 117, 151);;
+    border-bottom: 2px solid rgb(104, 117, 151);
+    padding-left: 20px;
 }
 
 #account-info p{
@@ -22,7 +22,6 @@ h4{
     display: block;
     margin-left: auto;
     margin-right: auto;
-    width: 600px;
     margin-top: 60px;
     margin-bottom: 60px;
     border-bottom: 2px solid rgb(104, 117, 151);;
diff --git a/static/css/style.css b/static/css/style.css
index 70c6a7d..1a25b05 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -30,7 +30,6 @@ h1, h2{
     margin-right: auto;
     width: 100%;
     display:block;
-    text-align: left;
 }
 
 .text-redirect{
diff --git a/views/account.ejs b/views/account.ejs
index 045bd7f..040d9df 100644
--- a/views/account.ejs
+++ b/views/account.ejs
@@ -6,41 +6,47 @@
 </head>
 <body>
     <%- include('partials/header'); %>
-    <h1>Ihr Konto</h1>
-    <div id="account-info">
-        <h3>Persönliche Informationen</h3>
-        <p><b>Vorname:</b> <%= firstname %></p>
-        <p><b>Nachname:</b> <%= lastname %></p>
-        <p><b>Benutzername: </b><%= username %></p>
-        <p><b>E-Mail: </b><%= email.substring(0,email.length/3) %><% for(var i = 0; i < email.length - email.length/4; i++){ %>*<% } %>
-        </p>
-    </div>
-
-    <div id="order-info">
-        <h3>Ihre Bestellungen</h3>
-        <table>
-            <thead>
-                <tr>
-                    <th>Bestellnummer</th>
-                    <th>Produktname</th>
-                    <th>Anzahl</th>
-                    <th>Stückpreis</th>
-                    <th>Gesamtpreis</th>
-                </tr>
-            </thead>
-            <tbody>
-                <% for(var i = 0; i < orders.length; i++){ %>
+    <div class="content">
+        <h1 class="text-center">Ihr Konto</h1>
+        <div id="account-info">
+            <h3>Persönliche Informationen</h3><br>
+            <p><b>Vorname:</b> <%= firstname %></p>
+            <p><b>Nachname:</b> <%= lastname %></p>
+            <p><b>Benutzername: </b><%= username %></p>
+            <p><b>E-Mail: </b><%= email.substring(0,email.length/3) %><% for(var i = 0; i < email.length - email.length/4; i++){ %>*<% } %>
+            <p><b>Adresse: </b></p>
+            </p>
+        </div>
+    
+        <div id="order-info">
+            <h3>Ihre Bestellungen</h3>
+            <table>
+                <thead>
                     <tr>
-                        <td><%= orders[i].id %></td>
-                        <td><%= orders[i].name %></td>
-                        <td><%= orders[i].quantity %></td>
-                        <td><%= orders[i].price %></td>
-                        <td><%= orders[i].price *  orders[i].quantity%> €</td>
+                        <th>Bestellnummer</th>
+                        <th>Produktname</th>
+                        <th>Status</th>
+                        <th>Anzahl</th>
+                        <th>Stückpreis</th>
+                        <th>Gesamtpreis</th>
                     </tr>
-                <% } %>
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                    <% for(var i = 0; i < orders.length; i++){ %>
+                        <tr>
+                            <td><%= orders[i].id %></td>
+                            <td><%= orders[i].name %></td>
+                            <td>In Progress</td>
+                            <td><%= orders[i].quantity %></td>
+                            <td><%= orders[i].price %></td>
+                            <td><%= orders[i].price *  orders[i].quantity%> €</td>
+                        </tr>
+                    <% } %>
+                </tbody>
+            </table>
+        </div>
     </div>
+   
 </body>
 
 </html>
\ No newline at end of file
diff --git a/views/order.ejs b/views/order.ejs
index 27e34ad..1716f9c 100644
--- a/views/order.ejs
+++ b/views/order.ejs
@@ -6,8 +6,9 @@
 </head>
 <body>
     <%- include('partials/header'); %>
-    <h1>Ihre Bestellung</h1>
-    <p id="error-text"><%- error %></p>
+    <br>
+    <h1 class="text-center">Ihre Bestellung</h1>
+    <p style="width:100%; display:block;"class="error-text text-center"><%- error %></p>
 
     <div id="order-info">
         <p><b>Produktname:</b> <%= product.name %></p>
diff --git a/views/order_success.ejs b/views/order_success.ejs
index c4328d9..a67f80a 100644
--- a/views/order_success.ejs
+++ b/views/order_success.ejs
@@ -5,8 +5,8 @@
     <link rel="stylesheet" href="/css/order.css">
 </head>
 <body>
-    <h1 style="color:rgb(6, 170, 6)">Ihre Bestellung wurde in Auftrag gegeben!</h1>
-    <h3>Trackingnummer: <label style="color:rgb(6, 156, 170)"><%= trackingnumber %></label></h3>
-    <a class="text-redirect" href="/">Zurück zur Startseite</a>
+    <h1 style="color:rgb(6, 170, 6)" class="text-center">Ihre Bestellung wurde in Auftrag gegeben!</h1>
+    <h3 class="text-center">Trackingnummer: <label style="color:rgb(6, 156, 170)"><%= trackingnumber %></label></h3>
+    <a class="text-redirect text-center" href="/">Zurück zur Startseite</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/views/search.ejs b/views/search.ejs
index 0fd95c3..8a24a8e 100644
--- a/views/search.ejs
+++ b/views/search.ejs
@@ -8,9 +8,9 @@
        <%- include('partials/header'); %>
     </header>
 
-    <div class="filtersDIV">
+    <div class="filtersDIV" style="display:none">
         <br/>
-        <h3 style="text-align: center;"> FILTER COMMING SOON </h3>
+        <h3 style="text-align: center; "> FILTER COMMING SOON </h3>
     </div>
         
     <% if (products.length == 0) { %>