diff --git a/app.js b/app.js index cfc8175..a6ed064 100644 --- a/app.js +++ b/app.js @@ -9,6 +9,9 @@ let config = process.env.NODE_ENV === "test" ? {} : require("./config/config.jso let indexRouter = require("./routes/index"); const loginRouter = require("./routes/login"); +const edtRouter = require("./routes/edt"); +const homeRouter = require("./routes/home"); +const marksRouter = require("./routes/marks"); let app = express(); const sessionMiddleware = session({ @@ -40,6 +43,9 @@ app.use((req, res, next) => { app.use("/", indexRouter); app.use("/login", loginRouter); +app.use("/edt", edtRouter); +app.use("/home", homeRouter); +app.use("/marks", marksRouter); // catch 404 and forward to error handler app.use((req, res, next) => { diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 537a95d..2388b7e 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -21,10 +21,6 @@ h2 { margin-top: 15vh; background-color: #2a2a2a; border-radius: 2vw; } - .signinup img { - width: 20%; - display: block; - margin: auto; } .signinup form input { color: #e0e0e0; margin-bottom: 4vh; @@ -74,13 +70,15 @@ i { #navtop ul li.active a { color: black; } #navtop ul li { - padding: 1.3vw; border-top: 1px solid #101010; background: linear-gradient(to right, #2a2a2a 50%, #00c0ff 50%) left; background-size: 200%; transition: .3s ease-out; } #navtop ul li a { + padding: 1.3vw; color: #C5C6C7; + display: block; + width: 100%; transition-duration: 0.3s; } #navtop ul li:hover { background-position: right; @@ -90,19 +88,178 @@ i { #navprofile { font-size: 25px; - padding-top: 4vh; - padding-bottom: 4vh; - margin: 0; } - #navprofile img { - width: 100%; - display: block; - margin: auto; - padding: 0.5vw; } + padding-top: 1vh; + padding-bottom: 1vh; + margin: 0; + background: radial-gradient(circle, #014f74 20%, #0f0f63 100%); + text-align: center; } #navprofile p { margin-top: 1vh; margin-bottom: 0; } + #navprofile a { + cursor: pointer; } #page { margin: 0; } +#edtjour .edtflex { + display: flex; + flex-direction: column; } + #edtjour .edtflex div:last-child { + border: none; } + #edtjour .edtflex div { + text-align: center; + font-size: 20px; + background-color: #2a2a2a; + padding: 0 10px; + border-bottom: 2px solid #a1a1a1; } + #edtjour .edtflex .edthead { + border: none; + font-size: 30px; + background-color: #0099ff; } + #edtjour .edtflex .edtmidi { + height: 100px; + background-color: #1f1f1f; } + +#filactu .actuflex { + background-color: #1f1f1f; + padding: 0; + height: 700px; + display: flex; + flex-direction: column; } + #filactu .actuflex div:last-child { + border: none; } + #filactu .actuflex .actucontent { + overflow-y: scroll; + padding: 0; + height: 700px; + cursor: auto; } + #filactu .actuflex .actucontent div:hover { + background-color: #686868; } + #filactu .actuflex div { + text-align: left; + cursor: pointer; + font-size: 20px; + background-color: #2a2a2a; + padding: 0 10px; + border-bottom: 2px solid #a1a1a1; } + #filactu .actuflex p { + margin: 0; + padding: 10px; } + #filactu .actuflex .actuhead { + border: none; + cursor: auto; + font-size: 30px; + background-color: #0099ff; + text-align: center; } + #filactu .actuflex .actuhead p { + padding: 30px; } + #filactu .actuflex .actuhead:hover { + background-color: #0099ff; } + +#welcome { + padding-bottom: 20px; } + +h3 { + font-size: 30px; + text-align: center; } + +#edttable { + margin-top: 100px; + border-collapse: collapse; + border: 1px solid white; + width: 90%; + margin-left: auto; + margin-right: auto; } + #edttable .midi td { + height: 109px; } + #edttable th { + background-color: #0099ff; + text-align: center; + border-radius: 0; + border: 1px solid white; + font-size: 25px; } + #edttable tr td:first-child { + border-left: 1px solid white; } + #edttable tr td:last-child { + border-right: 1px solid white; } + #edttable tr:last-child td { + border-bottom: 1px solid white; } + #edttable td { + text-align: center; + font-size: 20px; + background-color: #686868; + padding: 0; + border-radius: 0; + border: 1px solid black; } + #edttable td:nth-child(even) { + background-color: #2a2a2a; } + +#edtweek i { + cursor: pointer; } + +#edtweek div:nth-child(1) { + text-align: right; } + +#edtweek div:nth-child(3) { + text-align: left; } + +#marks table { + border: 1px solid white; + margin-top: 80px; + width: 80%; + margin-left: auto; + margin-right: auto; + table-layout: fixed; + border-collapse: collapse; } + #marks table tbody { + display: block; + height: 270px; + overflow: auto; } + #marks table thead, #marks table tbody tr { + display: table; + width: 100%; + table-layout: fixed; } + #marks table th { + border: 1px solid white; + background-color: #0099ff; + text-align: center; + font-size: 30px; } + #marks table td { + font-size: 25px; + padding: 0; + text-align: center; + background-color: #2a2a2a; + border-radius: 0; + border: 1px solid #686868; } + +.marksdetails { + display: none; + z-index: 1; + position: fixed; + left: 40%; + top: 20%; + width: 30%; } + .marksdetails table { + border-collapse: collapse; + border: 1px solid white; } + .marksdetails th { + text-align: center; + font-size: 25px; + border: 1px solid white; + background-color: #0099ff; } + .marksdetails td { + text-align: center; + background-color: #2a2a2a; + border: none; + font-size: 25px; } + .marksdetails tr:last-child td { + border-bottom: 1px solid white; } + +div#visible { + display: block; } + +div#visible + div { + filter: blur(4px); } + /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/public/stylesheets/style.css.map b/public/stylesheets/style.css.map index c3ad89b..d08575c 100644 --- a/public/stylesheets/style.css.map +++ b/public/stylesheets/style.css.map @@ -5,5 +5,5 @@ "style.sass" ], "names": [], - "mappings": "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" + "mappings": "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" } \ No newline at end of file diff --git a/public/stylesheets/style.sass b/public/stylesheets/style.sass index 64e2e56..f618647 100644 --- a/public/stylesheets/style.sass +++ b/public/stylesheets/style.sass @@ -2,11 +2,12 @@ $primary: #00c0ff; $secondary: #0099ff; $dark1: #101010; $dark2: #2a2a2a; +$dark3: #1f1f1f; +$medium: #686868; $light: #e0e0e0; $light2: #C5C6C7; $light3: #a1a1a1; - body padding: 50px font: 14px "Lucida Grande", Helvetica, Arial, sans-serif @@ -30,11 +31,6 @@ h2 margin-top: 15vh; background-color: $dark2; border-radius: 2vw; - img - width: 20%; - display: block; - margin: auto; - form input color: $light; @@ -85,14 +81,16 @@ i a color: black; li - padding: 1.3vw; border-top: 1px solid $dark1; background: linear-gradient(to right, $dark2 50%, $primary 50%) left; background-size: 200%; transition: .3s ease-out; a + padding: 1.3vw; color: $light2; + display: block; + width: 100%; transition-duration: 0.3s; li:hover background-position: right; @@ -102,20 +100,185 @@ i #navprofile font-size: 25px; - padding-top: 4vh; - padding-bottom: 4vh; + padding-top: 1vh; + padding-bottom: 1vh; margin: 0; - - img - width: 100%; - display: block; - margin: auto; - padding: 0.5vw; + background: radial-gradient(circle, rgb(1, 79, 116) 20%, rgb(15, 15, 99) 100%); + text-align: center; p margin-top: 1vh; margin-bottom: 0; + a + cursor: pointer; + #page margin: 0; +#edtjour + .edtflex + display: flex; + flex-direction: column; + div:last-child + border: none; + div + text-align: center; + font-size: 20px; + background-color: $dark2; + padding: 0 10px; + border-bottom: 2px solid $light3; + .edthead + border: none; + font-size: 30px; + background-color: $secondary; + .edtmidi + height: 100px; + background-color: $dark3; + +#filactu + .actuflex + background-color: $dark3; + padding: 0; + height: 700px; + display: flex; + flex-direction: column; + div:last-child + border: none; + .actucontent + overflow-y: scroll; + padding: 0; + height: 700px; + cursor: auto; + div:hover + background-color: $medium; + div + text-align: left; + cursor: pointer; + font-size: 20px; + background-color: $dark2; + padding: 0 10px; + border-bottom: 2px solid $light3; + p + margin: 0; + padding: 10px; + .actuhead + border: none; + cursor: auto; + font-size: 30px; + background-color: $secondary; + text-align: center; + p + padding: 30px; + .actuhead:hover + background-color: $secondary; + +#welcome + padding-bottom: 20px; + +h3 + font-size: 30px; + text-align: center; + +#edttable + margin-top: 100px; + border-collapse: collapse; + border: 1px solid white; + width: 90%; + margin-left: auto; + margin-right: auto; + .midi + td + height: 109px; + th + background-color: $secondary; + text-align: center; + border-radius: 0; + border: 1px solid white; + font-size: 25px; + tr + td:first-child + border-left: 1px solid white; + td:last-child + border-right: 1px solid white; + tr:last-child + td + border-bottom: 1px solid white; + td + text-align: center; + font-size: 20px; + background-color: $medium; + padding: 0; + border-radius: 0; + border: 1px solid black; + td:nth-child(even) + background-color: $dark2; + +#edtweek + i + cursor: pointer; + div:nth-child(1) + text-align: right; + div:nth-child(3) + text-align: left; + + +#marks + table + border: 1px solid white; + margin-top: 80px; + width: 80%; + margin-left: auto; + margin-right: auto; + table-layout: fixed; + border-collapse: collapse; + tbody + display: block; + height: 270px; + overflow: auto; + thead, tbody tr + display: table; + width: 100%; + table-layout: fixed; + th + border: 1px solid white; + background-color: $secondary; + text-align: center; + font-size: 30px; + td + font-size: 25px; + padding: 0; + text-align: center; + background-color: $dark2; + border-radius: 0; + border: 1px solid $medium; + +.marksdetails + display: none; + z-index: 1; + position: fixed; + left: 40% + top: 20%; + width: 30%; + table + border-collapse: collapse; + border: 1px solid white; + th + text-align: center; + font-size: 25px; + border: 1px solid white; + background-color: $secondary; + td + text-align: center; + background-color: $dark2; + border: none; + font-size: 25px; + tr:last-child + td + border-bottom: 1px solid white; + +div#visible + display: block; + +div#visible + div + filter: blur(4px); \ No newline at end of file diff --git a/routes/edt.js b/routes/edt.js new file mode 100644 index 0000000..c7144fb --- /dev/null +++ b/routes/edt.js @@ -0,0 +1,8 @@ +let express = require("express"); +let router = express.Router(); + +router.get("/", (req, res) => { + res.render("edt", { title: "L'ETU" }); +}); + +module.exports = router; \ No newline at end of file diff --git a/routes/home.js b/routes/home.js new file mode 100644 index 0000000..7c6fb3c --- /dev/null +++ b/routes/home.js @@ -0,0 +1,9 @@ +let express = require("express"); +let router = express.Router(); + +/* GET home page. */ +router.get("/", (req, res) => { + res.render("home", { title: "L'ETU" }); +}); + +module.exports = router; \ No newline at end of file diff --git a/routes/marks.js b/routes/marks.js new file mode 100644 index 0000000..4723389 --- /dev/null +++ b/routes/marks.js @@ -0,0 +1,8 @@ +let express = require("express"); +let router = express.Router(); + +router.get("/", (req, res) => { + res.render("marks", { title: "L'ETU" }); +}); + +module.exports = router; \ No newline at end of file diff --git a/views/edt.pug b/views/edt.pug new file mode 100644 index 0000000..7e79aa3 --- /dev/null +++ b/views/edt.pug @@ -0,0 +1,84 @@ +table(id="edttable") + tr + th Monday + th Tuesday + th Wednesday + th Thursday + th Friday + tr + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + tr + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + tr(class="midi") + td + td + td + td + td + tr + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + tr + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 + td + p Maths + p S26 +div(class="row" id="edtweek") + div(class="col s3 offset-s1") + i(class="large material-icons") fast_rewind + div(class="col s4") + h3 Week of the 02/11/2020 + div(class="col s3") + i(class="large material-icons") fast_forward \ No newline at end of file diff --git a/views/home.pug b/views/home.pug new file mode 100644 index 0000000..24bafdf --- /dev/null +++ b/views/home.pug @@ -0,0 +1,40 @@ +extends index + +block home + h1(id="welcome") Welcome Back Benoit ! + div(class="row home") + if admin === false + div(class="col s12 m6" id="filactu") + div(class="col s10 offset-s1 actuflex") + div(class="actuhead") + p Fil d'actualité + div(class="actucontent") + div + p Nouvelle note : + p 18/20 Anglais + div + p Maths + p S26 + div + p Maths + p S26 + div + p Maths + p S26 + div(class="col s12 m6" id="edtjour") + div(class="col s10 offset-s1 edtflex") + div(class="edthead") + p EDT du jour + div + p Maths + p S26 + div + p Maths + p S26 + div(class="edtmidi") + div + p Maths + p S26 + div + p Maths + p S26 \ No newline at end of file diff --git a/views/index.pug b/views/index.pug index 2b7f82c..1f93f4c 100644 --- a/views/index.pug +++ b/views/index.pug @@ -1,32 +1,142 @@ extends layout block content + - var student = true + - var teacher = false + - var admin = false div(class="row" id="page") - - div(class="col m2" id="panel") - div(class="row" id="navprofile") - div(class="col s4") - img(src="images/avatar-bk.png") - div(class="col s8") - p Kezel Benoit - p G4S3 + div(class="col s2" id="panel") + div(id="navprofile") + p Kezel Benoit + p G4S3 + a Logout div(id="navtop") ul - li(class="active") - a Accueil - li - a Emploi du temps - li - a Notes - li - a Mail - li - a Claroline - li - a Vie scolaire et étudiante - + if student === true + li + a Home + li + a Planning + li(class="active") + a Marks + li + a(href="https://mail.univ-lyon1.fr/owa/") Mail + li + a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline + li + a School and student life + if admin === true + li(class="active") + a Accueil + li + a Notes + li + a Vie scolaire et étudiante + li + a Gestion des profils div(class="col s10 main") - h1 Welcome Back Benoit ! - div(class="home") + div(class="marksdetails") + table + tr + th(colspan="2") Details + tr + td DS 1 + tr + td Rang : 10/29 + tr + td Coeff : 1.5 + tr + td Moyenne de classe : 12 + div(class="row" id="marks") + div(class="col s12 m6 l4") + table + thead + tr + th(colspan="2") Maths + tbody + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + + div(class="col s12 m6 l4") + table + thead + tr + th(colspan="2") TP SE + tbody + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + + div(class="col s12 m6 l4") + table + thead + tr + th(colspan="2") PHP + tbody + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + + div(class="col s12 m6 l4") + table + thead + tr + th(colspan="2") Anglais + tbody + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 + tr + td + p DS 1 + p 18/20 + td + p DS 2 + p 16/20 diff --git a/views/marks.pug b/views/marks.pug new file mode 100644 index 0000000..e69de29