Skip to content

Commit 2c36c5e

Browse files
author
Shreya Sharma
committed
added php files for database
initiated checks on data entries
1 parent 466e7b0 commit 2c36c5e

34 files changed

+629
-127
lines changed

‎HTML/registrationcanteen.html

-30
This file was deleted.

‎HTML/registrationuser.html

-36
This file was deleted.

‎HTML/userhomepage.html

-26
This file was deleted.

‎css/bootstrap.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/canteenhomepage.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ body {
3434
.sidebar {
3535
margin: 0;
3636
padding: 0;
37-
width: 30%;
37+
width: 20%;
3838
background-color: #e7e7e7;
3939
position: fixed;
4040
height: 100%;
@@ -121,12 +121,12 @@ div.content {
121121
}
122122

123123
.orders {
124-
width: 70%;
124+
width: 80%;
125125
height: 100%;
126126
font-family: Solway;
127127
text-align: center;
128128
font-size: 40px;
129-
margin-left: 30%;
129+
margin-left: 20%;
130130
display: flex;
131131
flex-direction: column;
132132
padding: 20px 0;

‎css/login.css

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ body {
5151
padding-left: 25px !important;
5252
}
5353

54+
input[type="email"],
5455
input[type="text"],
5556
input[type="password"] {
5657
width: 150px !important;

‎css/userhomepage.css

+13-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ body {
3333
.sidebar {
3434
margin: 0;
3535
padding: 0;
36-
width: 30%;
36+
width: 20%;
3737
background-color: #e7e7e7;
3838
position: fixed;
3939
height: 100%;
@@ -126,8 +126,8 @@ body {
126126
}
127127

128128
.orders {
129-
width: 70%;
130-
margin-left: 30%;
129+
width: 80%;
130+
margin-left: 20%;
131131
display: flex;
132132
flex-direction: column;
133133
}
@@ -191,6 +191,16 @@ body {
191191
border-radius: 8px;
192192
}
193193

194+
hr {
195+
display: block;
196+
margin-top: 0.5cm;
197+
margin-bottom: 0.5cm;
198+
border-style: inset;
199+
border-width: 1px;
200+
margin-left: auto;
201+
margin-right: auto;
202+
}
203+
194204
.viewcart {
195205
background-color: #e7e7e7;
196206
color: black;

‎HTML/README.md ‎html/README.md

File renamed without changes.

‎HTML/allorder.html ‎html/allorder.html

File renamed without changes.

‎HTML/canteenhomepage.html ‎html/canteenhomepage.html

File renamed without changes.

‎HTML/homepage.html ‎html/homepage.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</div>
1515
<div><img class="logo" src="/Images/images.jpeg" alt="" /></div>
1616
<div class="login">
17-
<a href="/HTML/login.html">
17+
<a href="../html/login.html">
1818
<button class="button">LOGIN</button>
1919
</a>
20-
<a href="/HTML/registration.html">
20+
<a href="../html/registration.html">
2121
<button class="button">REGISTER</button>
2222
</a>
2323
</div>

‎HTML/login.html ‎html/login.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
<div class="body">
1313
<div><img class="logo" src="/Images/images.jpeg" alt="" /></div>
1414
<div class="login">
15-
<form method="post" class="login-form-container">
16-
Name: <input type="text" name="fname" /><br />
15+
<form method="post" class="login-form-container" action="/php/login.php">
16+
Email: <input type="email" name="email" /><br />
1717
Password: <input type="password" name="password" /><br />
1818
Are you a canteen manager or a student?<br />
1919
<input type="radio" name="classification" value="canteen" />Canteen
2020
manager<br />
2121
<input type="radio" name="classification" value="student" />Student
22-
<br /><br /><input type="submit" value=" Login " formaction="" />
22+
<br /><br /><input type="submit" value=" Login " />
2323
</form>
24-
<a href="/HTML/registration.html"
24+
<a href="/html/registration.html"
2525
>Don't have an account? Register now.</a
2626
>
2727
</div>

‎HTML/menu.html ‎html/menu.html

File renamed without changes.

‎HTML/order.html ‎html/order.html

File renamed without changes.

‎HTML/ordermenu.html ‎html/ordermenu.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<div class="body">
1313
<div class="sidebar">
1414
<div class="header">Rassasy<br></div>
15-
<a href="userhomepage.html">Ongoing Orders</a>
16-
<a href="ordernow.html">Order Now</a>
17-
<a href="pastorder.html">Past Orders</a>
18-
<a href="userprofile.html">Profile</a>
15+
<a href="userhomepage.php">Ongoing Orders</a>
16+
<a href="ordernow.php">Order Now</a>
17+
<a href="pastorder.php">Past Orders</a>
18+
<a href="userprofile.php">Profile</a>
1919
</div>
2020
<div class="orders">
2121
<div class="content">

‎HTML/ordernow.html ‎html/ordernow.php

+10-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@
1212
<div class="body">
1313
<div class="sidebar">
1414
<div class="header">Rassasy<br></div>
15-
<a href="userhomepage.html">Ongoing Orders</a>
16-
<a href="ordernow.html">Order Now</a>
17-
<a href="pastorder.html">Past Orders</a>
18-
<a href="userprofile.html">Profile</a>
15+
<?php
16+
session_start();
17+
echo "Hey, ".$_SESSION[username];
18+
?> </u>
19+
<hr>
20+
21+
<a href="userhomepage.php">Ongoing Orders</a>
22+
<a href="ordernow.php">Order Now</a>
23+
<a href="pastorder.php">Past Orders</a>
24+
<a href="userprofile.php">Profile</a>
1925
</div>
2026
<div class="orders">
2127
<div class="content"> A list of canteens open at that

‎HTML/ordersummary.html ‎html/ordersummary.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<div class="body">
1313
<div class="sidebar">
1414
<div class="header">Rassasy<br></div>
15-
<a href="userhomepage.html">Ongoing Orders</a>
16-
<a href="ordernow.html">Order Now</a>
17-
<a href="pastorder.html">Past Orders</a>
18-
<a href="userprofile.html">Profile</a>
15+
<a href="userhomepage.php">Ongoing Orders</a>
16+
<a href="ordernow.php">Order Now</a>
17+
<a href="pastorder.php">Past Orders</a>
18+
<a href="userprofile.php">Profile</a>
1919
</div>
2020
<div class="orders">
2121
<div class="content">
@@ -38,7 +38,7 @@
3838
<br>
3939
Total Sum:15
4040
<br> <br>
41-
<a href="userhomepage.html">
41+
<a href="userhomepage.php">
4242
<button class="paynow">Pay Now</button></a>
4343
</div>
4444
</div>

‎HTML/pastorder.html ‎html/pastorder.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<div class="body">
1313
<div class="sidebar">
1414
<div class="header">Rassasy<br></div>
15-
<a href="userhomepage.html">Ongoing Orders</a>
16-
<a href="ordernow.html">Order Now</a>
17-
<a href="pastorder.html">Past Orders</a>
18-
<a href="userprofile.html">Profile</a>
15+
<a href="userhomepage.php">Ongoing Orders</a>
16+
<a href="ordernow.php">Order Now</a>
17+
<a href="pastorder.php">Past Orders</a>
18+
<a href="userprofile.php">Profile</a>
1919
</div>
2020
<div class="orders">
2121
<div class="content">Past orders are displayed here.</div>

‎HTML/registration.html ‎html/registration.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<div><img class="logo" src="/Images/images.jpeg" alt=""></div>
1919

2020
<div class="registration-button-container">
21-
<a href="/HTML/registrationuser.html">
21+
<a href="../html/registrationuser.html">
2222
<button class="button">STUDENT</button>
2323
</a>
24-
<a href="/HTML/registrationcanteen.html">
24+
<a href="../html/registrationcanteen.html">
2525
<button class="button">CANTEEN MANAGER</button>
2626
</a>
2727
</div>

0 commit comments

Comments
 (0)