Refactoring of message requesthandler to async

index.js

@@ -25,26 +25,50 @@ app.get('/login', login.loginFormRender)
 app.post('/login', login.loginFormSubmit)
 app.get('/logout', login.renderLogout)
 
-app.get('/', (req, res) => {
+const renderMessages = async (req, res) => {
+  console.log('session', req.session)
   if (req.session.user) {
+    const messages = await knex('messages')
+      .join('users', 'messages.user_id', '=', 'users.id')
+      .orderBy('timestamp', 'desc')
+
+    const messagesHtml = messages
+      .map(message => `<li>${message.timestamp} [${message.name}]: ${message.text}</li>`)
+      .join('')
+
     res.send(`
             <h1>${req.session.user.name} Vitaj!</h1>
             <a href="/logout" >odhlas sa</a>
-        `)
-  } else {
+                <h1>Zatiaľ napíš čo sťeš</h1>
+                <h2>Ale nemusíš napísať ňišt</h2>
+                <form method="post">
+
+                    <input name="message" placeholder="Správa"/>
+                    <input type="submit"/>
+                    <ul>
+                        ${messagesHtml}
+                    </ul>
+                </form>
+                `)} else {
     res.send(`
-            <h1>Nazdar neni si prihlaseny!/prihlasena!</h1>
-            <a href="/login" >Prihlas sa</a>
-            <div>alebo sa</div>
-            <a href="/signup">zaregistruj</a>.
-        `)
+                        <h1>Nazdar neni si prihlaseny!/prihlasena!</h1>
+                        <a href="/login" >Prihlas sa</a>
+                        <div>alebo sa</div>
+                        <a href="/signup">zaregistruj</a>.
+                    `)
   }
-})
+
+}
+
+app.get('/', renderMessages)
+
+
+
 
 
 app.post('/', (req, res) => {
   knex('users')
-    .where({name: req.body.userName})
+    .where({name: req.session.user.name})
     .first()
     .then(user => {
       if (!user) {
@@ -58,5 +82,8 @@ app.post('/', (req, res) => {
     })
 })
 
+
+
+
 app.listen(8080, '0.0.0.0') 
 console.log('listeing on http://localhost:8080')