From c85f79bcea1f050ee4034addff119725418cbe2c Mon Sep 17 00:00:00 2001 From: Arya-Shah Date: Thu, 22 Oct 2020 14:19:15 +0530 Subject: [PATCH 1/3] Adding Updated Files --- Forntend/templates/Faculty.html | 17 ------ {Forntend => Frontend}/forntend.py | 0 {Forntend => Frontend}/static/logo.jpg | Bin {Forntend => Frontend}/static/style.css | 24 ++------- .../templates/AddGrade.html | 50 +++++++++++++++--- {Forntend => Frontend}/templates/Admin.html | 26 ++++++++- .../templates/AdmitAStudent.html | 0 Frontend/templates/Faculty.html | 50 ++++++++++++++++++ {Forntend => Frontend}/templates/GetInfo.html | 0 {Forntend => Frontend}/templates/Student.html | 0 {Forntend => Frontend}/templates/index.html | 11 ++-- {Forntend => Frontend}/templates/login.html | 35 +++++++----- .../templates/type_login.html | 2 +- 13 files changed, 150 insertions(+), 65 deletions(-) delete mode 100644 Forntend/templates/Faculty.html rename {Forntend => Frontend}/forntend.py (100%) rename {Forntend => Frontend}/static/logo.jpg (100%) rename {Forntend => Frontend}/static/style.css (92%) rename {Forntend => Frontend}/templates/AddGrade.html (81%) rename {Forntend => Frontend}/templates/Admin.html (50%) rename {Forntend => Frontend}/templates/AdmitAStudent.html (100%) create mode 100644 Frontend/templates/Faculty.html rename {Forntend => Frontend}/templates/GetInfo.html (100%) rename {Forntend => Frontend}/templates/Student.html (100%) rename {Forntend => Frontend}/templates/index.html (96%) rename {Forntend => Frontend}/templates/login.html (83%) rename {Forntend => Frontend}/templates/type_login.html (88%) diff --git a/Forntend/templates/Faculty.html b/Forntend/templates/Faculty.html deleted file mode 100644 index dd8ae89..0000000 --- a/Forntend/templates/Faculty.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - Faculty DashBoard - - - - - - -
- -
- - - - \ No newline at end of file diff --git a/Forntend/forntend.py b/Frontend/forntend.py similarity index 100% rename from Forntend/forntend.py rename to Frontend/forntend.py diff --git a/Forntend/static/logo.jpg b/Frontend/static/logo.jpg similarity index 100% rename from Forntend/static/logo.jpg rename to Frontend/static/logo.jpg diff --git a/Forntend/static/style.css b/Frontend/static/style.css similarity index 92% rename from Forntend/static/style.css rename to Frontend/static/style.css index 0c53dea..e24bb00 100644 --- a/Forntend/static/style.css +++ b/Frontend/static/style.css @@ -10,20 +10,12 @@ - - - - - - - - - - body { font: 400 15px Lato, sans-serif; line-height: 1.8; color: #818181; + background: rgb(0,220,255); + background: linear-gradient(45deg, rgba(0,220,255,1) 0%, rgba(0,181,255,0.9839286056219363) 100%); } h2 { font-size: 24px; @@ -130,17 +122,7 @@ .navbar-brand { height: 124px; } - .navbar { - margin-bottom: 0; - background-color: #e6e6e6 - z-index: 9999; - border: 0; - font-size: 12px !important; - line-height: 1.42857143 !important; - letter-spacing: 4px; - border-radius: 0; - font-family: Montserrat, sans-serif; - } + .navbar li a, .navbar .navbar-brand { color: #9d005c !important; font-size: 14px; diff --git a/Forntend/templates/AddGrade.html b/Frontend/templates/AddGrade.html similarity index 81% rename from Forntend/templates/AddGrade.html rename to Frontend/templates/AddGrade.html index 3b5c4b7..b497f60 100644 --- a/Forntend/templates/AddGrade.html +++ b/Frontend/templates/AddGrade.html @@ -4,7 +4,7 @@ - + @@ -27,8 +27,7 @@ --> + width: 150px;"> + +
@@ -66,9 +67,46 @@

Add Grade

-
- -
+
+ + +
+ + + + + + + + + + + +
SubjectMarks
diff --git a/Forntend/templates/Admin.html b/Frontend/templates/Admin.html similarity index 50% rename from Forntend/templates/Admin.html rename to Frontend/templates/Admin.html index 52cc333..c849592 100644 --- a/Forntend/templates/Admin.html +++ b/Frontend/templates/Admin.html @@ -4,10 +4,34 @@ Faculty DashBoard - + + +
diff --git a/Forntend/templates/AdmitAStudent.html b/Frontend/templates/AdmitAStudent.html similarity index 100% rename from Forntend/templates/AdmitAStudent.html rename to Frontend/templates/AdmitAStudent.html diff --git a/Frontend/templates/Faculty.html b/Frontend/templates/Faculty.html new file mode 100644 index 0000000..0927880 --- /dev/null +++ b/Frontend/templates/Faculty.html @@ -0,0 +1,50 @@ + + + + Faculty DashBoard + + + + + + + + + + +
+

+ Click Here to Add Student's grades. +

+
+ +
+ + + + \ No newline at end of file diff --git a/Forntend/templates/GetInfo.html b/Frontend/templates/GetInfo.html similarity index 100% rename from Forntend/templates/GetInfo.html rename to Frontend/templates/GetInfo.html diff --git a/Forntend/templates/Student.html b/Frontend/templates/Student.html similarity index 100% rename from Forntend/templates/Student.html rename to Frontend/templates/Student.html diff --git a/Forntend/templates/index.html b/Frontend/templates/index.html similarity index 96% rename from Forntend/templates/index.html rename to Frontend/templates/index.html index b582eaa..f545a0b 100644 --- a/Forntend/templates/index.html +++ b/Frontend/templates/index.html @@ -1,16 +1,13 @@ - MEDIACHAIN + Charusat - - +
-

{{post['usertype'] }} Login

+

{{post['usertype']}} Login



diff --git a/Forntend/templates/type_login.html b/Frontend/templates/type_login.html similarity index 88% rename from Forntend/templates/type_login.html rename to Frontend/templates/type_login.html index c04ab74..2a5da2e 100644 --- a/Forntend/templates/type_login.html +++ b/Frontend/templates/type_login.html @@ -4,7 +4,7 @@ Charusat University - + From 32ac0d0628fe0098780544a4aef84eca976fdcd5 Mon Sep 17 00:00:00 2001 From: Arya-Shah Date: Sun, 1 Nov 2020 20:45:40 +0530 Subject: [PATCH 2/3] Updated Tables and Input Fields --- Frontend/templates/AddGrade.html | 164 +++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 21 deletions(-) diff --git a/Frontend/templates/AddGrade.html b/Frontend/templates/AddGrade.html index b497f60..2017d57 100644 --- a/Frontend/templates/AddGrade.html +++ b/Frontend/templates/AddGrade.html @@ -26,8 +26,7 @@ --> - +