Archived
1
0
Fork 0

Add profile to routes

This commit is contained in:
Ethanell 2020-08-17 17:58:55 +02:00
parent 3e3765b724
commit 52d5e4d75a
6 changed files with 114 additions and 2 deletions

2
app.js
View file

@ -12,6 +12,7 @@ let logoutRouter = require("./routes/logout");
let commandRouter = require("./routes/command");
let ordersRouter = require("./routes/orders");
let sandwichesRouter = require("./routes/sandwiches");
let profileRouter = require("./routes/profile");
let adminRouter = require("./routes/admin");
let app = express();
@ -43,6 +44,7 @@ app.use("/logout", logoutRouter);
app.use("/command", commandRouter);
app.use("/orders", ordersRouter);
app.use("/sandwiches", sandwichesRouter);
app.use("/profile", profileRouter);
app.use("/admin", adminRouter);
// catch 404 and forward to error handler

View file

@ -185,6 +185,11 @@ p.before-link a::before {
color: black;
}
#userCommandList {
max-height: 90%;
overflow-y: auto;
}
@media (hover: none) and (pointer: coarse) {
body {
font-size: xx-large;

66
routes/profile.js Normal file
View file

@ -0,0 +1,66 @@
let express = require("express");
let router = express.Router();
let sessionCheck = require("../middlewares/sessionCheck");
let models = require("../models");
router.get("/", sessionCheck(0), async (req, res) => {
res.render("profile", {
title: "SOD",
user: req.session.user,
departments: await models.Department.findAll(),
commands: await models.Command.findAll({
where: {UserUsername: req.session.user.username},
include: models.Sandwich,
order: ["date"]
})
});
}).post("/", sessionCheck(0), async (req, res) => {
let user = await models.User.findByPk(req.session.user.username);
/*if (req.body.username && req.body.username !== user.username)
if (await models.User.findByPk(req.body.username))
res.render("error", {message: "Invalid profile update !",
error: {status: "Username already taken"}});
else
user.username = req.body.username;*/
if (req.body.email && req.body.email !== user.email)
if (await models.User.findOne({where: {email: req.body.email}}))
res.render("error", {message: "Invalid profile update !",
error: {status: "Email already used"}});
else
user.email = req.body.email;
if (req.body.firstName && req.body.lastName &&
(req.body.firstName !== user.firstName || req.body.lastName !== user.lastName))
if (await models.User.findOne({where: {firstName: req.body.firstName, lastName: req.body.lastName}}))
res.render("error", {message: "Invalid profile update !",
error: {status: "First & last name already register"}});
else {
user.firstName = req.body.firstName;
user.lastName = req.body.lastName;
for (let c of await models.Command.findAll({where: {
firstName: req.session.user.firstName,
lastName: req.session.user.lastName}})) {
c.firstName = user.firstName;
c.lastName = user.lastName;
await c.save()
}
}
if (req.body.department && req.body.department !== user.DepartmentName)
if (!await models.Department.findByPk(req.body.department))
res.render("error", {message: "Invalid profile update !",
error: {status: "Invalid department"}});
else
user.DepartmentName = req.body.department;
if (req.body.password && !user.checkPassword(req.body.password))
user.passwordHash = req.body.password;
await user.save();
req.session.user = user;
res.redirect("/profile");
});
module.exports = router;

View file

@ -8,7 +8,7 @@ html
div#user
if user
p=user.username
a(href="/profile")=user.username
a(href="/logout") Logout
else
a(href="/login") Login

39
views/profile.pug Normal file
View file

@ -0,0 +1,39 @@
extends layout
block content
div.card
h1 Profile
form(action="/profile" method="POST")
h2 Infos
div.field
label(for="username") Username:
input#username(type="text" name="username" value=user.username disabled required)
div.field
label(for="email") Email:
input#email(type="email" name="email" value=user.email required)
div.field
label(for="firstName") First name:
input#firstName(type="text" name="firstName" value=user.firstName required)
div.field
label(for="lastName") Last name:
input#lastName(type="text" name="lastName" value=user.lastName required)
div.field
label(for="department") Department:
input#department(type="list" list="department-list" name="department" value=user.DepartmentName required)
div.field
label(for="password") Password:
input#password(type="password" name="password")
div.field
input(type="submit" value="Save")
datalist#department-list
each department in departments
option(value=department.name)
div.card#userCommandList
h1 Commands
each command in commands
div
h2=command.id
each sandwich in command.Sandwiches
p #{sandwich.name} - #{sandwich.SandwichCommand.date}

View file

@ -17,7 +17,7 @@ block content
input#lastName(type="text" name="lastName" required)
div.field
label(for="department") Department:
input#department(type="list" list="department-list" name="department" required=)
input#department(type="list" list="department-list" name="department" required)
div.field
label(for="password") Password:
input#password(type="password" name="password" required)