1
0
Fork 0

Fix semicolons

This commit is contained in:
Ethanell 2020-12-12 18:20:02 +01:00
parent d361e7c516
commit fdfbcceb01
16 changed files with 23 additions and 23 deletions

4
app.js
View file

@ -12,8 +12,8 @@ const edtRouter = require("./routes/edt");
const homeRouter = require("./routes/home"); const homeRouter = require("./routes/home");
const marksRouter = require("./routes/marks"); const marksRouter = require("./routes/marks");
const registerRouter = require("./routes/register"); const registerRouter = require("./routes/register");
const viescolRouter = require("./routes/viescol") const viescolRouter = require("./routes/viescol");
const profilRouter = require("./routes/profil") const profilRouter = require("./routes/profil");
let app = express(); let app = express();
const sessionMiddleware = session({ const sessionMiddleware = session({

View file

@ -19,7 +19,7 @@ module.exports = (sequelize, DataTypes) => {
class User extends Model { class User extends Model {
static associate(models) { static associate(models) {
User.belongsToMany(models.Group, {through: "UserGroup"}); User.belongsToMany(models.Group, {through: "UserGroup"});
User.belongsToMany(models.Event, {through: "EventTeacher"}) User.belongsToMany(models.Event, {through: "EventTeacher"});
User.belongsToMany(models.UE, {through: "UEUser"}); User.belongsToMany(models.UE, {through: "UEUser"});
} }

View file

@ -11,7 +11,7 @@ document.getElementById("login").addEventListener("submit", e=>{
alert('Format d\'email incorrect.'); alert('Format d\'email incorrect.');
} }
return false; return false;
}) });
socket.on("login", data=>{ socket.on("login", data=>{
if(data.error){ if(data.error){
@ -19,4 +19,4 @@ socket.on("login", data=>{
}else{ }else{
window.location.href = "/"; window.location.href = "/";
} }
}) });

View file

@ -18,7 +18,7 @@ socket.on("logout", data=>{
}else{ }else{
window.location.href = "/"; window.location.href = "/";
} }
}) });
function profilRedirect(){ function profilRedirect(){

View file

@ -18,4 +18,4 @@ socket.on("profileEdit", data=>{
}else{ }else{
window.location.href = "/"; window.location.href = "/";
} }
}) });

View file

@ -20,4 +20,4 @@ socket.on("register", data=>{
}else{ }else{
window.location.href = "/"; window.location.href = "/";
} }
}) });

View file

@ -11,4 +11,4 @@ module.exports = socket => {
else else
await emailCheck(socket, user, null); await emailCheck(socket, user, null);
} }
} };

View file

@ -10,4 +10,4 @@ module.exports = socket => {
else else
await emailPassword(socket, user, null); await emailPassword(socket, user, null);
} }
} };

View file

@ -5,7 +5,7 @@ module.exports = socket => {
return async (data) => { return async (data) => {
let user = await models.User.findOne({where: {passwordToken: data.token}}); let user = await models.User.findOne({where: {passwordToken: data.token}});
if (!user) if (!user)
socket.emit("setPassword", {error: {message: "invalid_token"}}) socket.emit("setPassword", {error: {message: "invalid_token"}});
else if (user.passwordTokenDate && ((new Date().getTime() - user.passwordTokenDate.getTime()) / 1000 > 3600)) else if (user.passwordTokenDate && ((new Date().getTime() - user.passwordTokenDate.getTime()) / 1000 > 3600))
socket.emit("setPassword", {error: {message: "expired_token"}}); socket.emit("setPassword", {error: {message: "expired_token"}});
else { else {
@ -16,4 +16,4 @@ module.exports = socket => {
socket.emit("setPassword", true); socket.emit("setPassword", true);
} }
} }
} };

View file

@ -15,4 +15,4 @@ module.exports = socket => {
socket.emit("login", user) socket.emit("login", user)
} }
} }
} };

View file

@ -7,4 +7,4 @@ module.exports = socket => {
socket.emit("logout", {error: { message: "not_logged_in"}}); socket.emit("logout", {error: { message: "not_logged_in"}});
} }
} }
} };

View file

@ -6,7 +6,7 @@ module.exports = socket => {
if (!user) if (!user)
socket.emit("profileEdit", {error: {message: "not_found"}}); socket.emit("profileEdit", {error: {message: "not_found"}});
else if (!user.checkPassword(data.oldPassword)) else if (!user.checkPassword(data.oldPassword))
socket.emit("profileEdit", {error: {message: "invalid_password"}}) socket.emit("profileEdit", {error: {message: "invalid_password"}});
else { else {
if (data.firstName !== user.firstName) if (data.firstName !== user.firstName)
user.firstName = data.firstName; user.firstName = data.firstName;
@ -14,10 +14,10 @@ module.exports = socket => {
user.lastName = data.lastName; user.lastName = data.lastName;
user.newPassword = data.newPassword; user.newPassword = data.newPassword;
if (data.password && !user.checkPassword(data.password)) if (data.password && !user.checkPassword(data.password))
user.passwordHash = data.password user.passwordHash = data.password;
socket.request.session.user = user; socket.request.session.user = user;
socket.request.session.save(); socket.request.session.save();
socket.emit("profileEdit", user) socket.emit("profileEdit", user)
} }
} }
} };

View file

@ -18,4 +18,4 @@ module.exports = socket => {
await emailCheck(socket, user, null); await emailCheck(socket, user, null);
} }
} }
} };

View file

@ -16,7 +16,7 @@ module.exports = async (socket, user, callBack) => {
subject: "forgot password" subject: "forgot password"
}), async (err, message) => { }), async (err, message) => {
if (err) if (err)
socket.emit("forgotPassword", {error: {message: "fail_send_mail"}}) socket.emit("forgotPassword", {error: {message: "fail_send_mail"}});
else { else {
user.passwordToken = token; user.passwordToken = token;
user.passwordTokenDate = new Date(); user.passwordTokenDate = new Date();

View file

@ -20,7 +20,7 @@ async function clean() {
before(async () => { before(async () => {
[app, models] = await setup(); [app, models] = await setup();
}) });
it("Main page content", async () => { it("Main page content", async () => {
await request(app) await request(app)

View file

@ -7,9 +7,9 @@ html
link(rel="stylesheet", href="/stylesheets/style.css") link(rel="stylesheet", href="/stylesheets/style.css")
script(src="/socket.io/socket.io.js") script(src="/socket.io/socket.io.js")
body body
- var student = false - let student = false
- var teacher = true - let teacher = true
- var admin = false - let admin = false
div(class="row" id="page") div(class="row" id="page")
div(class="col s2" id="panel") div(class="col s2" id="panel")
block navbar block navbar