diff --git a/app.js b/app.js index 43aee02..5d204c4 100644 --- a/app.js +++ b/app.js @@ -12,6 +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") let app = express(); const sessionMiddleware = session({ @@ -42,6 +44,8 @@ app.use("/edt", edtRouter); app.use("/home", homeRouter); app.use("/marks", marksRouter); app.use('/register', registerRouter); +app.use('/viescol', viescolRouter); +app.use('/profil', profilRouter); // catch 404 and forward to error handler app.use((req, res) => { diff --git a/routes/profil.js b/routes/profil.js new file mode 100644 index 0000000..529ff2b --- /dev/null +++ b/routes/profil.js @@ -0,0 +1,8 @@ +let express = require("express"); +let router = express.Router(); + +router.get("/", (req, res) => { + res.render("pages/profil", { title: "L'ETU" }); +}); + +module.exports = router; \ No newline at end of file diff --git a/routes/utils/profile.js b/routes/utils/profile.js new file mode 100644 index 0000000..e69de29 diff --git a/routes/viescol.js b/routes/viescol.js new file mode 100644 index 0000000..bc0c341 --- /dev/null +++ b/routes/viescol.js @@ -0,0 +1,8 @@ +let express = require("express"); +let router = express.Router(); + +router.get("/", (req, res) => { + res.render("pages/viescol", { title: "L'ETU" }); +}); + +module.exports = router; \ No newline at end of file diff --git a/sass/style.sass b/sass/style.sass index 4ff8617..c0593fc 100644 --- a/sass/style.sass +++ b/sass/style.sass @@ -120,6 +120,7 @@ i padding-bottom: 1vh margin: 0 text-align: center + cursor: pointer p margin-top: 1vh @@ -387,4 +388,103 @@ div#visible + div font-size: 22px padding: 15px cursor: pointer - margin-bottom: 50px \ No newline at end of file + margin-bottom: 50px + +#absences + padding: 50px + .abshead + background-color: $secondary + font-size: 25px + text-align: center + p + padding: 5px + margin: 0 + + .abscont + p + background-color: $dark2 + font-size: 15px + transition-duration: 0.2s + margin: 0 + padding: 10px + p:hover + background-color: $light3 + +#btmviescol + #events, #objtrouv + padding: 50px + .eventhead, .objtrouvhead + background-color: $secondary + font-size: 25px + text-align: center + p + padding: 5px + margin: 0 + + .eventcont, .objtrouvcont + p + background-color: $dark2 + font-size: 15px + transition-duration: 0.2s + margin: 0 + padding: 10px + + p:hover + background-color: $light3 + +.abogest + margin: auto + display: block + background-color: $secondary + color: white + padding: 10px + border-radius: 2px + border: none + font-size: 20px + margin-top: 30px + +.managesub + z-index: 1 + display: none + width: 50% + position: fixed + top: 30% + left: 30% + background-color: $dark2 + .topicname + background-color: $secondary + font-size: 20px + margin: 0 + padding: 10px + + form + font-size: 15px + padding: 15px + + input[type='submit'] + display: block + margin: auto + padding: 10px + font-size: 20px + border: none + border-radius: 2px + background-color: $secondary + color: white + cursor: pointer + +#editprofil + padding-left: 70px + padding-right: 70px + input + color: white + + input[type='submit'] + color: white + background: $secondary + padding: 10px + font-size: 20px + border: none + border-radius: 2px + display: block + margin: auto + cursor: pointer \ No newline at end of file diff --git a/views/pages/home.pug b/views/pages/home.pug index a7c7b02..98c4c47 100644 --- a/views/pages/home.pug +++ b/views/pages/home.pug @@ -7,7 +7,7 @@ block content div(class="col s12 m6" id="filactu") div(class="col s10 offset-s1 actuflex") div(class="actuhead") - p Fil d'actualité + p News feed div(class="actucontent") div p Nouvelle note : @@ -24,7 +24,7 @@ block content div(class="col s12 m6" id="edtjour") div(class="col s10 offset-s1 edtflex") div(class="edthead") - p EDT du jour + p Time Schedule div p Maths p S26 diff --git a/views/pages/marks.pug b/views/pages/marks.pug index 592674b..d6cc47a 100644 --- a/views/pages/marks.pug +++ b/views/pages/marks.pug @@ -109,7 +109,7 @@ block content if teacher === true div(class="row") div(class="col s12 m10 offset-m1 marksgroup") - h3 Selectionnez un groupe + h3 Select a group div(id="flexgroup") p G1S1 p G2S2 @@ -119,11 +119,11 @@ block content table(id="markstable") thead tr - th Noms + th Name th input(type="text" value="DS1") th - input(type="text" placeholder="Ajouter une note") + input(type="text" placeholder="Add a test") tbody tr td Test diff --git a/views/pages/profil.pug b/views/pages/profil.pug new file mode 100644 index 0000000..8dea7a6 --- /dev/null +++ b/views/pages/profil.pug @@ -0,0 +1,27 @@ +extends ../template/navbar + +block content + .row + h1 Edit your profile + form.col.s12#editprofil + .row + div(class="input-field col s6") + i(class="material-icons prefix") portrait + input(type="text" id="firstname-input" class="autocomplete") + label(for="firstname-input") First Name + + div(class="input-field col s6") + input(type="text" id="lastname-input" class="autocomplete") + label(for="lastname-input") Last Name + + div(class="input-field col s12") + i(class="material-icons prefix") lock + input(type="password" id="new-password" class="autocomplete") + label(for="new-password") New password + + div(class="input-field col s12") + i(class="material-icons prefix") lock + input(type="password" id="password" class="autocomplete") + label(for="password") Current password + + input(type='submit' value='Save') \ No newline at end of file diff --git a/views/pages/viescol.pug b/views/pages/viescol.pug index f18a27a..e3efa17 100644 --- a/views/pages/viescol.pug +++ b/views/pages/viescol.pug @@ -1,33 +1,61 @@ extends ../template/navbar block content - div.row - if student === true - div.col.s12.m6#absences - div.abshead - p Absences - div.abscont - p Absent le 14/03 de 16h à 18h - div.abscont - p Absent le 15/03 de 16h à 18h - div.abscont - p Absent le 16/03 de 16h à 18h + div.managesub#visible + p.topicname Tick the topics you would like to see in your news feed + form + p + label + input.filled-in(type='checkbox' checked='checked') + span Absences + p + label + input.filled-in(type='checkbox' checked='checked') + span Events + + p + label + input.filled-in(type='checkbox' checked='checked') + span Property Lost + + p + label + input.filled-in(type='checkbox' checked='checked') + span Marks + + p + input(type='submit' value="Submit") + + div + div.row + if student === true + div.col.s12.m6#absences + div.abshead + p Absences + div.abscont + p Absent le 14/03 de 16h à 18h + p Absent le 15/03 de 16h à 18h + p Absent le 16/03 de 16h à 18h + + div.col.s12.m6 + button.abogest Manage your subscriptions + + if student === false + div.col.s12 + button.abogest Add an absence + + div.row#btmviescol + div.col.s12.m6#events + div.eventhead + p Events + div.eventcont + p Repas raclette organisé par le BDE le 24/02 à 12H30 en S26 + + div.col.s12.m6#objtrouv + div.objtrouvhead + p Lost Property + div.objtrouvcont + p Ordinateur HP trouvé retourné au secrétariat - div.col.s12.m6 - button Gérer vos abonnements - if student === false - div.col.s12 - button Ajouter une absence - div.row - div.col.s12.m6#events - div.eventhead - p Evenements - div.eventcont - p Repas raclette organisé par le BDE le 24/02 à 12H30 en S26 - div.col.s12.m6#objtrouv - div.objtrouvhead - p Objets Trouvés - div.objtrouvcont - p Ordinateur HP trouvé retourné au secrétariat diff --git a/views/template/navbar.pug b/views/template/navbar.pug index 0071658..d738661 100644 --- a/views/template/navbar.pug +++ b/views/template/navbar.pug @@ -29,7 +29,7 @@ block navbar li a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline li - a School and student life + a(href="/viescol") School and student life if teacher === true li(class="active") a(href="/") Home @@ -40,7 +40,9 @@ block navbar li a(href="https://mail.univ-lyon1.fr/owa/") Mail li - a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline + a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline Connect + li + a(href="/viescol") School and student life if admin === true li(class="active") a Accueil