Skip to content

Arya #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arya-Shah wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Arya #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c85f79b
Adding Updated Files
Arya-Shah Oct 22, 2020
32ac0d0
Updated Tables and Input Fields
Arya-Shah Nov 1, 2020
34a6604
Update README.md
Arya-Shah Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions Forntend/templates/Faculty.html
View file
Open in desktop

This file was deleted.

0 Forntend/forntend.py → Frontend/forntend.py
View file
Open in desktop
File renamed without changes.
0 Forntend/static/logo.jpg → Frontend/static/logo.jpg
View file
Open in desktop
File renamed without changes
24 changes: 3 additions & 21 deletions Forntend/static/style.css → Frontend/static/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
174 changes: 167 additions & 7 deletions Forntend/templates/AddGrade.html → Frontend/templates/AddGrade.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
Expand All @@ -26,9 +26,7 @@
<span class="icon-bar"></span>
</button> -->
<a class="navbar-brand" href="#myPage">
<img src="{{url_for('static', filename='logo.jpg')}}" style="
width: 150px;
">
<img src="{{url_for('static', filename='logo.jpg')}}" style="width: 150px;">
</a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
Expand All @@ -51,6 +49,8 @@ <h3 class="text-center">Add Grades</h3>
</div>
</section>



<!-- Container (Contact Section) -->
<div id="contact" class="container-fluid">

Expand All @@ -66,10 +66,170 @@ <h2 class="text-center">Add Grade</h2>
<div class="col-sm-12 form-group">
<input class="form-control" id="semno" placeholder="1 or 2 .." type="text">
</div>
<div class="col-sm-12 form-group">
<input class="form-control" id="dict" placeholder="Json" type="text">
</div>
<div class="dropdown" align="center" id="Subjects">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">No:of subjects to enter.
<span class="caret"></span></button>
<ul class="dropdown-menu" id="Subjects">
<li> <span id="sp1">1<br></span></li>
<li> <span id="sp2">2<br></span></li>
<li> <span id="sp3">3<br></span></li>
<li> <span id="sp4">4<br></span></li>
<li> <span id="sp5">5<br></span></li>
</ul>
</div>

<style type="text/css">
table {
margin-top: 20px;
margin-bottom: 20px;
font-family: arial, sans-serif;
border-collapse: collapse;
display: none;
}


td, th {
text-align: left;
padding: 10px;
width: 60%;
}

</style>



<table id="t1">
<tr>
<th>Subject</th>
<th>Marks</th>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
</table>


<table id="t2">
<tr>
<th>Subject</th>
<th>Marks</th>
</tr>
<tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
</table>


<table id="t3">
<tr>
<th>Subject</th>
<th>Marks</th>
</tr>
<tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
</table>


<table id="t4">
<tr>
<th>Subject</th>
<th>Marks</th>
</tr>
<tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
</table>


<table id="t5">
<tr>
<th>Subject</th>
<th>Marks</th>
</tr>
<tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
<tr>
<td><input class="form-control" id="Subject" type="text"></td>
<td><input class="form-control" id="Marks" type="text"></td>
</tr>
</table>


<script type="text/javascript">
document.getElementById('sp1').addEventListener("click",function(){
showTable('t1');
});

document.getElementById('sp2').addEventListener("click",function(){
showTable('t2');
});
document.getElementById('sp3').addEventListener("click",function(){
showTable('t3');
});
document.getElementById('sp4').addEventListener("click",function(){
showTable('t4');
});
document.getElementById('sp5').addEventListener("click",function(){
showTable('t5');
});

function showTable(table){
var tables =['t1','t2','t3','t4','t5'];
for(var i=0;i<5;i++){
document.getElementById(tables[i]).style.display = "none";
}
document.getElementById(table).style.display = "block";
}
</script>

<br><br>
<div class="col-sm-12 form-group">
<button class="btn btn-primary" type="submit" style="width: 100%" onclick="sendJSON()">Submit</button>
<p class="result" style="color:green"></p>
Expand Down
26 changes: 25 additions & 1 deletion Forntend/templates/Admin.html → Frontend/templates/Admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,34 @@
<title>Faculty DashBoard</title>
<link rel="shortcut icon" href="https://lh3.googleusercontent.com/MpnmfR3zYPTojA03QbhGgwIHucmH5s4G2vbIlADYhODL488MQt_BuVztv9LYmJbhwkScYN0DIXuh4d10YMsLbWXT">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.turbo360-dev.com/admin/assets/scaffold/css/style.min.css" />

</head>
<body>
<style type="text/css">

body{
background: rgb(0,220,255);
background: linear-gradient(45deg, rgba(0,220,255,1) 0%, rgba(0,181,255,0.9839286056219363) 100%);
}

button {
color: #fff;
background-color: #337ab7;
border-color: #2e6da4;
display: inline-block;
margin-top: 371px;
font-weight: 400;
text-align: center;
padding: 6px 12px;
font-size: 28px;
line-height: 1.42857143;
border-radius: 4px;
user-select: none;
}

</style>
<div align="center">
<button onclick="location.href=window.location.href+'/AdmitAStudent';">Add Student</button>
</div>
Expand Down
0 Forntend/templates/AdmitAStudent.html → Frontend/templates/AdmitAStudent.html
View file
Open in desktop
File renamed without changes.
50 changes: 50 additions & 0 deletions Frontend/templates/Faculty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html>
<head>
<title>Faculty DashBoard</title>
<link rel="shortcut icon" href="https://lh3.googleusercontent.com/MpnmfR3zYPTojA03QbhGgwIHucmH5s4G2vbIlADYhODL488MQt_BuVztv9LYmJbhwkScYN0DIXuh4d10YMsLbWXT">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.turbo360-dev.com/admin/assets/scaffold/css/style.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
</head>
<body>
<style type="text/css">

h1{

color: #fff;
}

body{
background: rgb(0,220,255);
background: linear-gradient(45deg, rgba(0,220,255,1) 0%, rgba(0,181,255,0.9839286056219363) 100%);
}
button {
color: #fff;
background-color: #337ab7;
border-color: #2e6da4;
display: inline-block;
margin-top: 180px;
font-weight: 400;
text-align: center;
padding: 6px 12px;
font-size: 28px;
line-height: 1.42857143;
border-radius: 4px;
user-select: none;
}
</style>
<div align="center">
<h1>
Click Here to Add Student's grades.
</h1>
<div align="center">
<button onclick="location.href=window.location.href+'/AddGrade';">AddGrade</button>
</div>


</body>
</html>
0 Forntend/templates/GetInfo.html → Frontend/templates/GetInfo.html
View file
Open in desktop
File renamed without changes.
0 Forntend/templates/Student.html → Frontend/templates/Student.html
View file
Open in desktop
File renamed without changes.
11 changes: 5 additions & 6 deletions Forntend/templates/index.html → Frontend/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<html lang="en"><head>
<!-- Theme Made By www.w3schools.com -->
<title>MEDIACHAIN</title>
<title>Charusat</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<style>


.pagenm{
background: #da5131;
padding: 15px;
Expand All @@ -25,6 +22,8 @@
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;
Expand Down Expand Up @@ -224,7 +223,7 @@
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav navbar-right">
<h2 style=" margin-top: 35px; font-size: 31px; color: #9d005c; text-shadow: -1px 1px orange;">WELCOME TO MEDIACHAIN</h2>
<h2 style=" margin-top: 35px; font-size: 31px; color: #9d005c; text-shadow: -1px 1px orange;">WELCOME TO Charusat</h2>
<!-- <li><a href="#about">ABOUT</a></li>
<li><a href="#services">SERVICES</a></li>
<li><a href="#portfolio">PORTFOLIO</a></li>
Expand Down
Loading