Merge branch 'back' into 'master'

Back

See merge request LETU/LETU!20

agenda/worker.js

@@ -4,6 +4,7 @@ const models = require("../models");
 
 const reg_event = /(?:(?:BEGIN:VEVENT\nDTSTAMP:(?:[A-Z0-9]*?)\nDTSTART:([A-Z0-9]*?)\nDTEND:([A-Z0-9]*?)\nSUMMARY: {0,}([a-zéèàA-Z0-9-. \, \\/ô]*?)\nLOCATION:([a-zA-Zéèà0-9-. \,\\]*?)\nDESCRIPTION:(?:\\n){0,}(LP(?:[ a-zA-Z0-9]*))\\n((?:(?:[A-Z]*) (?:[A-Z]*)(?: (?:[A-Z]*)){0,}\\n){0,})(?:.*?)\nEND:VEVENT)|(?:BEGIN:VEVENT\nDTSTAMP:(?:[A-Z0-9]*?)\nDTSTART:([A-Z0-9]*?)\nDTEND:([A-Z0-9]*?)\nSUMMARY: {0,}((?:S(?:[A-Z0-9-]*)|M(?:[A-Z0-9-]*)(?:\/M(?:[A-Z0-9-]*)){0,}|Conférence)[a-zéèàA-Z0-9-. \, \\/]*?)\nLOCATION:([a-zA-Zéèà0-9-. \,\\]*?)\nDESCRIPTION:(?:\\n){0,}((?:(?:G[0-9]S[0-9]|S[0-9]|ASPE)\\n){0,})((?:(?:[A-Z]*) (?:[A-Z]*)(?: (?:[A-Z]*)){0,}\\n){0,})(?:.*?)\nEND:VEVENT))/gs;
 const reg_location = /((?:[SH0-9][0-9]{2})|(?:(?:Préfa |Amphi)[0-9]))/g;
+const reg_teachers = /^(?:((?:[a-zA-Z]*[ -]{0,}){0,}) ([a-zA-Z]*))$/m;
 const reg_date = /([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z/;
 const reg_classe = /(?:(LP)[ -]{0,}(.*)|(?:(G[0-9])(S[0-9])))/;
 const base_url = config["edt"];
@@ -82,8 +83,14 @@ function fetchEvents(days = 1, TS_Start = new Date()) {
                     /*
                     Teachers
                      */
-                    event["teachers"] = m[6].split("\\n");
-                    event["teachers"].pop();
+                    event['teachers'] = []
+                    let fullTeachers = m[6].split('\\n');
+                    fullTeachers.forEach(e => {
+                        if(e !== ""){
+                            let splittedTeachers = reg_teachers.exec(e);
+                            event['teachers'].push([splittedTeachers[1],splittedTeachers[2]]);
+                        }
+                    });
                     output.push(event);
                 }
                 resolve(output);

app.js

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

bin/www

@@ -30,7 +30,7 @@ fs.writeFileSync("public/stylesheets/style.css", css.css);
  * Get port from environment and store in Express.
  */
 
-let port = normalizePort(process.env.PORT || "3000");
+const port = normalizePort(process.env.PORT || "3000");
 app.set("port", port);
 app.set("mailClient", mailClient);
 
@@ -38,7 +38,7 @@ app.set("mailClient", mailClient);
  * Create HTTP server.
  */
 
-let server = http.createServer(app);
+const server = http.createServer(app);
 
 /**
  * Create socket.io server
@@ -66,7 +66,7 @@ models.sequelize.sync().then(() => {
  */
 
 function normalizePort(val) {
-  let port = parseInt(val, 10);
+  const port = parseInt(val, 10);
 
   if (isNaN(port)) {
     // named pipe
@@ -90,7 +90,7 @@ function onError(error) {
     throw error;
   }
 
-  let bind = typeof port === "string"
+  const bind = typeof port === "string"
     ? "Pipe " + port
     : "Port " + port;
 
@@ -114,8 +114,8 @@ function onError(error) {
  */
 
 function onListening() {
-  let addr = server.address();
-  let bind = typeof addr === "string"
+  const addr = server.address();
+  const bind = typeof addr === "string"
     ? "pipe " + addr
     : "port " + addr.port;
   debug("Listening on " + bind);

models/user.js

@@ -8,7 +8,7 @@ const {
 } = require("sequelize");
 module.exports = (sequelize, DataTypes) => {
     function hash(password, email) {
-        let cipher = crypto.createCipheriv(
+        const cipher = crypto.createCipheriv(
             "aes-256-cbc",
             privateKey,
             crypto.createHash("md5").update(email).digest("base64").slice(0, 16)
@@ -19,7 +19,7 @@ module.exports = (sequelize, DataTypes) => {
     class User extends Model {
         static associate(models) {
             User.belongsToMany(models.Group, {through: "UserGroup"});
-            User.belongsToMany(models.Event, {through: "EventTeacher"})
+            User.belongsToMany(models.Event, {through: "EventTeacher"});
             User.belongsToMany(models.UE, {through: "UEUser"});
         }
 

public/javascripts/login.js

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

public/javascripts/main.js

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

public/javascripts/profil.js

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

public/javascripts/register.js

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

routes/edt.js

@@ -1,8 +1,8 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 
 router.get("/", (req, res) => {
     res.render("pages/edt", { title: "L'ETU" });
 });
 
-module.exports = router;
+module.exports = router;

routes/email.js

@@ -8,7 +8,7 @@ const sessionCheck = require("./utils/sessionCheck");
 router.get("/check", async (req, res) => {
     if (!req.query.token)
         return error(req, res, "Missing argument", 400);
-    let user = await models.User.findOne({where: {emailToken: req.query.token}});
+    const user = await models.User.findOne({where: {emailToken: req.query.token}});
     if (user) {
         user.emailVerified = true;
         if (user.email.endsWith("@etu.univ-lyon1.fr"))
@@ -25,7 +25,7 @@ router.get("/forget", sessionCheck(-1), async (req, res) => {
     if (!req.query.token)
         res.render("forget", {title: "L'ETU"});
     else {
-        let user = await models.User.findOne({where: {passwordToken: data.token}});
+        const user = await models.User.findOne({where: {passwordToken: data.token}});
         if (!user)
             return error(req, res, "Invalid token", 400);
         else if (user.passwordTokenDate && ((new Date().getTime() - user.passwordTokenDate.getTime()) / 1000 > 3600))

routes/home.js

@@ -1,9 +1,9 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 
 /* GET home page. */
 router.get("/", (req, res) => {
     res.render("pages/home", { title: "L'ETU" });
 });
 
-module.exports = router;
+module.exports = router;

routes/index.js

@@ -1,5 +1,5 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 const sessionCheck = require("./utils/sessionCheck");
 
 router.get("/", sessionCheck(1), (req, res) => {

routes/login.js

@@ -1,5 +1,5 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 const sessionCheck = require("./utils/sessionCheck");
 
 router.get("/",sessionCheck(-1), (req, res) => {

routes/marks.js

@@ -1,5 +1,5 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 
 router.get("/", (req, res) => {
     res.render("pages/marks", { title: "L'ETU" });

routes/profil.js

@@ -1,5 +1,5 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 
 router.get("/", (req, res) => {
     res.render("pages/profil", { title: "L'ETU" });

routes/register.js

@@ -1,5 +1,5 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 const sessionCheck = require("./utils/sessionCheck");
 
 router.get("/",sessionCheck(-1), (req, res) => {

routes/utils/sessionCheck.js

@@ -1,4 +1,4 @@
-let error = require("./error");
+const error = require("./error");
 
 function sessionCheck(permission) {
     return (req, res, next) => {

routes/viescol.js

@@ -1,8 +1,8 @@
-let express = require("express");
-let router = express.Router();
+const express = require("express");
+const router = express.Router();
 
 router.get("/", (req, res) => {
     res.render("pages/viescol", { title: "L'ETU" });
 });
 
-module.exports = router;
+module.exports = router;

sockets/email/checkResend.js

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

sockets/email/forgotPassword.js

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

sockets/email/setPassword.js

@@ -5,7 +5,7 @@ module.exports = socket => {
     return async (data) => {
         let user = await models.User.findOne({where: {passwordToken: data.token}});
         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))
             socket.emit("setPassword", {error: {message: "expired_token"}});
         else {
@@ -16,4 +16,4 @@ module.exports = socket => {
             socket.emit("setPassword", true);
         }
     }
-}
+};

sockets/login.js

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

sockets/logout.js

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

sockets/profile/edit.js

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

sockets/register.js

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

sockets/utils/emailPassword.js

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

test/test-pages.js

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

views/template/layout.pug

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