Skip to content

Order confirmation #5

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.

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
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e59624b
Name Change
Xilonen Mar 18, 2021
db52b8a
Merge pull request #1 from awatterson22/Xilonen-menu-pages
awatterson22 Mar 20, 2021
5d3f532
Add menu items
Xilonen Mar 20, 2021
c32f7ab
Grill Menu updates
Xilonen Mar 20, 2021
c83bbcf
Sign in
Vicann Mar 22, 2021
69fe057
menu1 css changes
sabrynm98 Mar 22, 2021
7f7c7d8
Merge pull request #3 from awatterson22/Victoria's-sign-in-page-creation
Vicann Mar 22, 2021
3e53f3a
menu pages changes
sabrynm98 Mar 22, 2021
66a181e
Merge pull request #4 from awatterson22/Sabryn-menu-pages
awatterson22 Mar 22, 2021
4fb67a2
css menu pages
sabrynm98 Mar 22, 2021
198290b
Merge pull request #5 from awatterson22/Sabryn-menu-pages
Xilonen Mar 22, 2021
57c1b1f
adding initial contact page(html,css, and js) and updating index.html…
awatterson22 Mar 22, 2021
427b607
menu 1&2 changes
sabrynm98 Mar 22, 2021
c2dd3ff
Merge pull request #6 from awatterson22/Abby-contact-page
awatterson22 Mar 22, 2021
cf2b64d
Merge pull request #7 from awatterson22/Sabryn-menu-pages
sabrynm98 Mar 22, 2021
024940d
Delete umass_cicle_logo.png
sabrynm98 Mar 22, 2021
8648a49
Merge pull request #8 from awatterson22/Sabryn-menu-pages
sabrynm98 Mar 22, 2021
234fb58
Menu 3 and 4
Xilonen Mar 22, 2021
993f5de
Merge pull request #9 from awatterson22/Xilonens-2-other-Menu-Pages
Xilonen Mar 22, 2021
749ae19
move images folder to public folder
awatterson22 Mar 22, 2021
027b4c8
changed Signin directory to lowercase to match others
awatterson22 Mar 22, 2021
3c22b69
change Signin folder to lowercase to match other directories
awatterson22 Mar 22, 2021
f52d62c
merge master into sign-in branch
awatterson22 Mar 22, 2021
9e8ccfa
Merge pull request #11 from awatterson22/Victoria's-sign-in-page-crea…
awatterson22 Mar 22, 2021
ab8440d
update file path for images
awatterson22 Mar 22, 2021
907bb31
adding restaurant folder and corresponding html,css,and js files
awatterson22 Mar 22, 2021
8e0ad53
adding corresponding menu folders to menu dir and change path to images
awatterson22 Mar 22, 2021
510ac65
initial html skeleton for restaurant directory page
awatterson22 Mar 22, 2021
4ba7630
merge master into Abby-restaurant-dir
awatterson22 Mar 22, 2021
881bbec
add skeleton contact information - using Blue Wall Contact Information
awatterson22 Mar 22, 2021
0cccdfd
change color scheme to match other pages
awatterson22 Mar 22, 2021
109794b
change color scheme to match other pages
awatterson22 Mar 22, 2021
22cd61f
Merge pull request #12 from awatterson22/Abby-contact-page
awatterson22 Mar 22, 2021
733ae30
merge master into restaurant directory branch
awatterson22 Mar 22, 2021
673c66c
adding restaurant html and css
awatterson22 Mar 23, 2021
9bd9820
Merge pull request #13 from awatterson22/Abby-restaurant-dir
awatterson22 Mar 23, 2021
6388055
reformating
awatterson22 Mar 23, 2021
938967d
adding icon to browser tab and adding a folder for js validation
awatterson22 Mar 23, 2021
38680c0
Order Confirmation Page
Vicann Mar 23, 2021
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions public/Order Confirmation/orderConfirmation.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
body {
background-image: linear-gradient(-225deg, brown 0%, peru 100%);
background-image: linear-gradient(to top, brown 0%, peru 100%);
background-attachment: fixed;
background-repeat: no-repeat;
height: 100%;
}
.box1 {
border: 5px solid white;
width: 300px;
height: 100px;
text-align: center;
position: relative;
margin: auto;
bottom: -400px;
font-size: 30px;
}
.box2 {
border: 5px solid white;
width: 300px;
height: 100px;
text-align: center;
position: relative;
margin: auto;
bottom: -600px;
left: -200px;
font-size: 30px;
}
.box3 {
border: 5px solid white;
width: 300px;
height: 100px;
text-align: center;
position: relative;
margin: auto;
bottom: -600px;
left: 200px;
top: 491px;
font-size: 30px;
}
h1 {
position: relative;
color: white;
text-align: center;
}
img {
position: absolute;
height: 100px;
left: 20px;
}
18 changes: 18 additions & 0 deletions public/Order Confirmation/orderConfirmation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" href="orderConfirmation.css" />

<title>Umass Pick Up Service Website</title>
</head>
<body>
<h1>Order Confirmation Page</h1>
<img src="images/umass_cicle_logo.png" alt="Umass Logo" />
<div class="box1">Order Status</div>
<div class="box2">Order Number</div>
<div class="box3">Order Estimate</div>
</body>
</html>
81 changes: 42 additions & 39 deletions public/confirmation.html
Original file line number Diff line number Diff line change
@@ -1,44 +1,47 @@
<html lang="en">
<link href="restaurant.css" rel="stylesheet">
<meta charset="UTF-8">
<head>
<title>Chez 326 - Order Confirmation</title>
</head>
<body>
<h1>Chez 326 - Order Confirmation</h1>
<form action="/confirm" method="POST">
<h2>Customer Name</h2>
<div class=customer>
<div>
<label for="first">First Name:</label>
<input type="text" name="first" id="first" value="Peter" readonly>
</div>
<div>
<label for="last">Last Name:</label>
<input type="text" name="last" id="last" value="Klemperer" readonly>
</div>
</div>
<h2>Customer Address</h2>
<p>Please enter your delivery address.</p>
<div class=rightalign>
<label for="streetaddress">Street Address:</label>
<input type="text" name="streetaddress" id="streetaddress">
</div>
<div class=rightalign>
<label for="cityaddress">City, State:</label>
<input type="text" name="cityaddress" id="cityaddress">
</div>
<link href="restaurant.css" rel="stylesheet">
<meta charset="UTF-8">

<head>
<title>Chez 326 - Order Confirmation</title>
</head>

<body>
<h1>Chez 326 - Order Confirmation</h1>
<form action="/confirm" method="POST">
<h2>Customer Name</h2>
<div class=customer>
<div>
<h2>Order</h2>
<label for="order">Order:</label>
<textarea type="text" name="order" id="order" rows="4" cols="25" readonly>Chicken Fried Steak with Corn Bread, Green Beans, Baked Beans.
</textarea>
<label for="first">First Name:</label>
<input type="text" name="first" id="first" value="Peter" readonly>
</div>
<div>
<label for="time">Order Time:</label>
<input type="datetime-local" name="time" id="time" readonly>
<label for="last">Last Name:</label>
<input type="text" name="last" id="last" value="Klemperer" readonly>
</div>
<input type="submit">
</form>
</body>
</html>
</div>
<h2>Customer Address</h2>
<p>Please enter your delivery address.</p>
<div class=rightalign>
<label for="streetaddress">Street Address:</label>
<input type="text" name="streetaddress" id="streetaddress">
</div>
<div class=rightalign>
<label for="cityaddress">City, State:</label>
<input type="text" name="cityaddress" id="cityaddress">
</div>
<div>
<h2>Order</h2>
<label for="order">Order:</label>
<textarea type="text" name="order" id="order" rows="4" cols="25" readonly>Chicken Fried Steak with Corn Bread, Green Beans, Baked Beans.
</textarea>
</div>
<div>
<label for="time">Order Time:</label>
<input type="datetime-local" name="time" id="time" readonly>
</div>
<input type="submit">
</form>
</body>

</html>
55 changes: 55 additions & 0 deletions public/contact/contact.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
* {
font-family: Verdana, Geneva, Tahoma, sans-serif;
}

body {
background-image: linear-gradient(-225deg, brown 0%, peru 100%);
background-image: linear-gradient(to top, brown 0%, peru 100%);
background-attachment: fixed;
background-repeat: no-repeat;
color: white
}

#iframe {
display: block;
text-align: center;
}

iframe {
border: 5px solid rgb(177, 174, 174);
border-radius: 10px;
width: 700px;
height: 500px;
}

#description {
/* font-family: "system-ui"; */
font-size: large;
display: block;
text-align: center;
width: 800px;
height: 20px;
background-color: rgb(110, 110, 110);
border-radius: 10px;
padding: 10px;
margin: auto;
}

#contact-info address {
display: block;
border: 5px solid rgb(177, 174, 174);
border-radius: 10px;
padding: 10px;
width: 700px;
height: 175px;
margin: auto;
text-align: left;
}

#contact-info address ul li {
list-style-type: none;
}

a {
color: black;
}
33 changes: 33 additions & 0 deletions public/contact/contact.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!DOCTYPE html>

<html lang="en">

<head>
<meta charset="utf-8">
<title>Contact Page</title>
<link rel="shortcut icon" href="images/umass_circle_logo.png" type="image/x-icon">
<link rel="stylesheet" href="contact.css">
<script src="contact.js"></script>
</head>

<body>
<p id="description">Map of Blue Wall</p>
<br>
<div id="iframe">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2946.688498400298!2d-72.52919278454607!3d42.3917819410902!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x89e6d270c7fe958d%3A0xaa4b7f1d8344b53e!2sBlue%20Wall!5e0!3m2!1sen!2sus!4v1616207483814!5m2!1sen!2sus"
allowfullscreen="" loading="lazy" title="Blue Wall Map"></iframe>
</div>
<br>
<p id="description">Contact</p>
<br>
<div id="contact-info">
<address>
<p><strong>Located in:</strong> University of Massachusetts Amherst</p>
<p><strong>Address:</strong> 1 Campus Center Way, Amherst, MA 01003</p>
<p><strong>Hours:</strong> 11 AM - 9 PM (All Week)</p>
<p><strong>Phone:</strong> <a href="tel:+14135778114">(413) 577-8114</a></p>
</address>
</div>
</body>

</html>
Empty file added public/contact/contact.js
Empty file.
Binary file added public/images/chefs-table.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/deli_delish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/green_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/harvest_market.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/paciugo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/peoples_organic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/star_ginger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/tamales.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/tavola.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/the_grill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/umass_circle_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/wasabi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/yum_bakery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions public/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
* {
font-family: Verdana, Geneva, Tahoma, sans-serif;
}

body {
background-image: linear-gradient(-225deg, brown 0%, peru 100%);
background-image: linear-gradient(to top, brown 0%, peru 100%);
background-attachment: fixed;
background-repeat: no-repeat;
}

ul.icon-and-title {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
}

ul.icon-and-title li {
float: left;
}

ul.icon-and-title li img,
ul.icon-and-title li h1 {
display: block;
padding: 14px 16px;
}

img {
height: 100px;
}

#title {
color: rgb(75, 77, 75);
font-size: 40pt;
}

ul.topnav {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: rgb(168, 165, 165);
}

ul.topnav li {
float: left;
}

ul.topnav li a {
display: block;
color: white;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 25px;
}

li:last-child {
border-right: none;
}

ul.topnav li a:hover:not(.active) {
background-color: rgb(168, 165, 165);
}

ul.topnav li a.active {
background-color: rgb(75, 77, 75);
}

@media screen and (max-width: 600px) {
ul.topnav,
ul.topnav li {
float: none;
}
}
43 changes: 31 additions & 12 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
<html>
<head>
<title>326 Base Project</title>
</head>
<body>
<h1>326 Base Project</h1>
<p>You have successfully opened your Heroku project.
Feel free to replace this file with the first page of your
web site.
</p>
</body>
</html>
<!DOCTYPE html>

<html lang="en">

<head>
<meta charset="utf-8">
<title>Umass Pick-Up</title>
<link rel="shortcut icon" href="images/umass_circle_logo.png" type="image/x-icon">
<link rel="stylesheet" href="index.css">
<script src="index.js"></script>
</head>

<body>
<ul class="icon-and-title">
<li><img src="images/umass_circle_logo.png" alt="Umass Amherst Logo"></li>
<li>
<h1 id="title">Umass Pick-Up</h1>
</li>
</ul>

<div>
<ul class="topnav">
<li><a class="active" href="#home">Home</a></li>
<li><a routerLink="/orders" href="#orders">Orders</a></li>
<li><a routerLink="/contact" href="#contact">Contact</a></li>
</ul>
</div>
<router-outlet></router-outlet>
</body>

</html>
Loading