adding front end

vsteere · Oct 10, 2020 · d3370a7 · d3370a7
1 parent beb9b56
commit d3370a7
Show file tree

Hide file tree

Showing 24 changed files with 306 additions and 129 deletions.
diff --git a/controllers/meally_controller.js b/controllers/meally_controller.js
@@ -20,7 +20,7 @@ router.get("/", function (req, res) {
     });
   });
 
-  //this will write the new burger to the database
+  //this will write the new order to the database
   router.post("/api/orders", function (req, res) {
     db.exportsmeally.createOne([
       "new_order"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "bcryptjs": "2.4.3",
     "express": "^4.17.0",
+    "express-handlebars": "^5.1.0",
     "express-session": "^1.16.1",
     "mysql2": "^1.6.5",
     "passport": "^0.4.0",

diff --git a/public/images/meal.ly.png b/public/images/meal.ly.png
diff --git a/public/images/onepage_restaurant.jpg b/public/images/onepage_restaurant.jpg
diff --git a/public/js/login.js b/public/js/login.js
@@ -22,14 +22,14 @@ $(document).ready(() => {
     passwordInput.val("");
   });
 
-  // loginUser does a post to our "api/login" route and if successful, redirects us the the members page
+  // loginUser does a post to our "api/login" route and if successful, redirects us the the orders page
   function loginUser(email, password) {
     $.post("/api/login", {
       email: email,
       password: password
     })
       .then(() => {
-        window.location.replace("/members");
+        window.location.replace("/orders");
         // If there's an error, log the error
       })
       .catch(err => {

diff --git a/public/js/moment.min.js b/public/js/moment.min.js
diff --git a/public/js/members.js → public/js/orders.js b/public/js/members.js → public/js/orders.js
diff --git a/public/js/signup.js b/public/js/signup.js
@@ -29,7 +29,7 @@ $(document).ready(() => {
       password: password
     })
       .then(() => {
-        window.location.replace("/members");
+        window.location.replace("/orders");
         // If there's an error, handle it by throwing up a bootstrap alert
       })
       .catch(handleLoginErr);

diff --git a/public/login.html b/public/login.html
diff --git a/public/members.html b/public/members.html
diff --git a/public/stylesheets/index.css b/public/stylesheets/index.css
@@ -0,0 +1,5 @@
+
+
+h1 {
+    color: red;
+}
diff --git a/public/stylesheets/index.html b/public/stylesheets/index.html
@@ -0,0 +1,23 @@
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <link rel="stylesheet" href="/index.css">
+    <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+</head>
+
+<body>
+    <h1>Hello</h1>
+    <div class="list-group">
+        <a href="#" class="list-group-item list-group-item-action active">
+          Cras justo odio
+        </a>
+        <a href="#" class="list-group-item list-group-item-action">Dapibus ac facilisis in</a>
+        <a href="#" class="list-group-item list-group-item-action">Morbi leo risus</a>
+        <a href="#" class="list-group-item list-group-item-action">Porta ac consectetur ac</a>
+        <a href="#" class="list-group-item list-group-item-action disabled" tabindex="-1" aria-disabled="true">Vestibulum at eros</a>
+      </div>
+</body>
+
+</html>
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -2,3 +2,23 @@ form.signup,
 form.login {
   margin-top: 50px;
 }
+
+body,h1,h5 {font-family: "Raleway", sans-serif}
+body, html {height: 100%}
+.bgimg {
+  background-image: url('/Images/onepage_restaurant.jpg');
+  min-height: 100%;
+  background-position: center;
+  background-size: cover;
+}
+
+#btn-form {
+ display: inline-block;
+}
+
+.para-place-order {
+  padding-top: 15px;
+}
+
+
+