From 9b4f770ac62d57156c37d2f6382da2e5f9365060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 17 Jan 2020 16:32:56 +0100 Subject: [PATCH] Tingy --- api/login.js | 14 ++++++---- public/index.html | 68 ++++++++++++++++++++++++++++++++++++++--------- server.js | 4 --- 3 files changed, 65 insertions(+), 21 deletions(-) diff --git a/api/login.js b/api/login.js index ede21d7..b37348c 100644 --- a/api/login.js +++ b/api/login.js @@ -4,11 +4,16 @@ const User = require(path.join(__dirname + "/../schemas/User")); const router = require("express").Router(); router.get("/", function(req, res) { - res.render("index", { user: req.user }); + console.log("here", req.isAuthenticated()); + if (!req.isAuthenticated()) { + res.sendFile(path.join(__dirname + "/../public/login.html")); + return; + } + res.sendFile(path.join(__dirname + "/../public/index.html")); }); router.get("/register", function(req, res) { - res.render("register", {}); + res.sendFile(path.join(__dirname + "/../public/register.html")); }); router.post("/register", function(req, res, next) { @@ -30,14 +35,13 @@ router.post("/register", function(req, res, next) { }); router.get("/login", function(req, res) { - res.render("login", { user: req.user, message: req.flash("error") }); + res.sendFile(path.join(__dirname + "/../public/login.html")); }); router.post( "/login", passport.authenticate("local", { - failureRedirect: "/login", - failureFlash: true + failureRedirect: "/login" }), function(req, res) { res.redirect("/"); diff --git a/public/index.html b/public/index.html index d03fdaa..ae0241a 100644 --- a/public/index.html +++ b/public/index.html @@ -1,15 +1,59 @@ - - Vinlottis - - - -

Official vin lottis homepage

- + + Vinlottis + + + +

Official vin lottis homepage

+ + + + - + + + + diff --git a/server.js b/server.js index 92d2d60..715f90c 100644 --- a/server.js +++ b/server.js @@ -41,10 +41,6 @@ passport.use(new LocalStrategy(User.authenticate())); passport.serializeUser(User.serializeUser()); passport.deserializeUser(User.deserializeUser()); -app.get("/", function(req, res) { - res.sendFile(path.join(__dirname + "/public/index.html")); -}); - app.use("/", loginApi); app.use("/api/", updateApi); app.use("/api/", retrieveApi);