IUT_Informatique/letu
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into 'back'

Browse source 
# Conflicts:
#   views/template/navbar.pug
This commit is contained in:
Ethanell 2020-12-14 23:19:07 +01:00
commit 2e54f7b4ad
5 changed files with 204 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
sass/style.sass
View file

@ -71,16 +71,8 @@ h2
i i
color: $primary color: $primary
#panel
background-color: $dark2
height: 100vh
border-right: 2px solid $light3
padding: 0
position: fixed
#main #main
background-color: $dark1 background-color: $dark1
margin-left: 16vw
#navtop #navtop
font-size: 22px font-size: 22px
@ -130,11 +122,11 @@ i
cursor: pointer cursor: pointer
.student .student
background: radial-gradient(circle, rgb(1, 79, 116) 20%, rgb(15, 15, 99) 100%) background-image: linear-gradient(to top, #4481eb 0%, #04befe 100%)
.teacher .teacher
background: radial-gradient(circle, rgb(5, 116, 1) 20%, rgb(11, 68, 10) 100%) background-image: radial-gradient( circle farthest-corner at -1% 57.5%, rgba(19,170,82,1) 0%, rgba(0,102,43,1) 90% )
.admin .admin
background: radial-gradient(circle, rgb(116, 74, 1) 20%, rgb(99, 42, 15) 100%) background-image: radial-gradient( circle farthest-corner at 7.2% 19%, rgba(120,0,0,1) 0%, rgba(239,75,75,1) 100.2% )
#page #page
margin: 0 margin: 0
@ -219,6 +211,7 @@ h3
.midi .midi
td td
height: 10vh height: 10vh
cursor: auto
th th
background-color: $secondary background-color: $secondary
text-align: center text-align: center
@ -234,6 +227,7 @@ h3
td td
border-bottom: 1px solid white border-bottom: 1px solid white
td td
cursor: pointer
text-align: center text-align: center
font-size: 15px font-size: 15px
background-color: $medium background-color: $medium
@ -489,6 +483,37 @@ div#visible + div
margin: auto margin: auto
cursor: pointer cursor: pointer
.detailsedt
z-index: 1
display: none
position: fixed
top: 20vh
left: 30%
background-color: $dark2
width: 40%
border-radius: 50px
border: 1px solid $light3
p
font-size: 20px
padding: 5px
color: white
margin: 0
text-align: center
p:first-child
font-size: 25px
background-color: $secondary
border-top-right-radius: 50px
border-top-left-radius: 50px
#slide-out
background-color: $dark2
a
color: white
font-size: 20px
#hamburger
position: fixed
#notvisible #notvisible
display: none display: none

181
views/pages/edt.pug
View file

@ -1,87 +1,100 @@
extends ../template/navbar extends ../template/navbar
block content block content
table(id="edttable") - let variable = [{name:"",ue:{id:0,name:""},teachers:[{id:0,firstName:"",lastName:""}],location:[""],dateStart:Date,dateEnd:Date,group:{id:0,number:0,promotion:{id:0,name:""}},promotion:{id:0,name:""}}];
tr div.detailsedt#visibl
th Monday p Maths
th Tuesday p S26
th Wednesday p Mr. Jaloux
th Thursday p G4S3
th Friday p 08h à 10h
tr p UE------------
td
p Maths div
p S26 table(id="edttable")
td tr
p Maths th Monday
p S26 th Tuesday
td th Wednesday
p Maths th Thursday
p S26 th Friday
td tr
p Maths td
p S26 p Maths
td p S26
p Maths td
p S26 p Maths
tr p S26
td td
p Maths p Maths
p S26 p S26
td td
p Maths p Maths
p S26 p S26
td td
p Maths p Maths
p S26 p S26
td tr
p Maths td
p S26 p Maths
td p S26
p Maths td
p S26 p Maths
tr(class="midi") p S26
td td
td p Maths
td p S26
td td
td p Maths
tr p S26
td td
p Maths p Maths
p S26 p S26
td tr(class="midi")
p Maths td
p S26 td
td td
p Maths td
p S26 td
td tr
p Maths td
p S26 p Maths
td p S26
p Maths td
p S26 p Maths
tr p S26
td td
p Maths p Maths
p S26 p S26
td td
p Maths p Maths
p S26 p S26
td td
p Maths p Maths
p S26 p S26
td tr
p Maths td
p S26 p Maths
td p S26
p Maths td
p S26 p Maths
div(class="row" id="edtweek") p S26
div(class="col s3 offset-s1") td
i(class="large material-icons") fast_rewind p Maths
div(class="col s4") p S26
h3 Week of the 02/11/2020 td
div(class="col s3") p Maths
i(class="large material-icons") fast_forward 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

2
views/pages/viescol.pug
View file

@ -1,7 +1,7 @@
extends ../template/navbar extends ../template/navbar
block content block content
div.managesub#visible div.managesub#visibl
p.topicname Tick the topics you would like to see in your news feed p.topicname Tick the topics you would like to see in your news feed
form form
p p

11
views/template/layout.pug
View file

@ -7,13 +7,14 @@ 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
- let student = false - let student = true
- let teacher = true - let teacher = false
- let admin = false - let admin = false
div(class="row" id="page") div(class="row" id="page")
div(class="col s2" id="panel") block navbar
block navbar div(class="col s12" id="main")
div(class="col s10" id="main")
block content block content
script(src="/javascripts/main.js") script(src="/javascripts/main.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js") script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js")
script.
M.AutoInit();

117
views/template/navbar.pug
View file

@ -1,57 +1,68 @@
extends layout extends layout
block navbar block navbar
if session.user.permissions === 1 ul#slide-out.sidenav
div(id="navprofile" class="student" onclick="profilRedirect()") if student === true
p=session.user.firstName + " " + session.user.lastName li
if session.user.Groups[session.user.Groups.length-1].number.startsWith("G") .user-view.student
p=session.user.Groups[session.user.Groups.length-1].number + session.user.Groups[session.user.Groups.length-1].Semester.name p
else span.white-text.name=session.user.firstName + " " + session.user.lastName
p=session.user.Groups[session.user.Groups.length-1].Semester.name + " " + session.user.Groups[session.user.Groups.length-1].number p
a(id="logout") Logout if session.user.Groups[session.user.Groups.length-1].number.startsWith("G")
if session.user.permissions === 2 span.white-text.name=session.user.Groups[session.user.Groups.length-1].number + session.user.Groups[session.user.Groups.length-1].Semester.name
div(id="navprofile" class="teacher" onclick="profilRedirect()") else
p=session.user.firstName + " " + session.user.lastName span.white-text.name=session.user.Groups[session.user.Groups.length-1].Semester.name + " " + session.user.Groups[session.user.Groups.length-1].number
a(id="logout") Logout p
if session.user.permissions === 3 span.white-text.email=session.user.email
div(id="navprofile" class="admin" onclick="profilRedirect()")
p=session.user.firstName + " " + session.user.lastName
a(id="logout") Logout
div(id="navtop") li
ul a(href="/" class="waves-effect") Home
if student === true li
li(class="active") a(href="/edt" class="waves-effect") Planning
a(href="/") Home li(class="active")
li a(href="/marks" class="waves-effect") Marks
a(href="/edt") Planning li
li a(href="https://mail.univ-lyon1.fr/owa/" class="waves-effect") Mail
a(href="/marks") Marks li
li a(href="https://clarolineconnect.univ-lyon1.fr/" class="waves-effect") Claroline
a(href="https://mail.univ-lyon1.fr/owa/") Mail li
li a(href="/viescol" class="waves-effect") School and student life
a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline
li if teacher === true
a(href="/viescol") School and student life li
if teacher === true .user-view.teacher
li(class="active") p(href='#name')
a(href="/") Home span.white-text.name=session.user.firstName + " " + session.user.lastName
li p(href='#email')
a(href="/edt") Planning span.white-text.email=session.user.email
li li
a(href="/marks") Marks a(href="/" class="waves-effect") Home
li li
a(href="https://mail.univ-lyon1.fr/owa/") Mail a(href="/edt" class="waves-effect") Planning
li li(class="active")
a(href="https://clarolineconnect.univ-lyon1.fr/") Claroline Connect a(href="/marks" class="waves-effect") Marks
li li
a(href="/viescol") School and student life a(href="https://mail.univ-lyon1.fr/owa/" class="waves-effect") Mail
if admin === true li
li(class="active") a(href="https://clarolineconnect.univ-lyon1.fr/" class="waves-effect") Claroline
a Accueil li
li a(href="/viescol" class="waves-effect") School and student life
a Notes
li if admin === true
a Vie scolaire et étudiante li
li .user-view.admin
a Gestion des profils p(href='#name')
span.white-text.name=session.user.firstName + " " + session.user.lastName
p(href='#email')
span.white-text.email=session.user.email
li
a(href="/" class="waves-effect") Home
li(class="active")
a(href="/marks" class="waves-effect") Marks
li
a(href="/viescol" class="waves-effect") School and student life
li
a(href="/viescol" class="waves-effect") Profil Edition
a.sidenav-trigger(href='#' data-target='slide-out')#hamburger
i.material-icons.medium menu