diff --git a/app.js b/app.js index f85c186..68d8010 100644 --- a/app.js +++ b/app.js @@ -25,6 +25,7 @@ app.set('view engine', 'ejs'); app.set('views',path.join(__dirname, 'src/views')); app.use(express.urlencoded({ extended: true })); app.use("/static", express.static("./src/public")); +app.use("/images", express.static("./src/public/images")); /*** Database ***/ const { connectMongo, getCollection } = require("./src/database/connection"); @@ -41,11 +42,6 @@ async function initDatabase() { app.get('/', (req, res) => { if (!req.session.errMessage) req.session.errMessage = ""; - res.render('index'); - return res.status(status.Ok); -}); - -app.get('/landing', (req, res) => { res.render('landing'); return res.status(status.Ok); }); @@ -64,6 +60,11 @@ app.get('/login', (req, res) => { return res.status(status.Ok); }); +app.get('/home', (req, res) => { + res.render('home'); + return res.status(status.Ok); +}); + app.get('/aboutUs', (req, res) => { res.render('aboutUs'); return res.status(status.Ok); diff --git a/src/views/aboutUs.ejs b/src/views/aboutUs.ejs index 63108a0..e5979bd 100644 --- a/src/views/aboutUs.ejs +++ b/src/views/aboutUs.ejs @@ -5,37 +5,8 @@ -
- -
+ <%- include("./partials/headerStart") %>
-

About RCalculator

@@ -69,12 +40,17 @@
-