From 729a55c3e3e6f882eec1dc0ae193591aa9a38ce9 Mon Sep 17 00:00:00 2001 From: Alvaro Nieto <60838509+Anieto86@users.noreply.github.com> Date: Wed, 10 Jun 2020 15:23:20 +0930 Subject: [PATCH] Revert "winerypage" --- config/config.json | 1 - public/js/vendor.js | 5 --- public/stylesheets/m-style.css | 8 ++++ routes/html-routes.js | 2 - views/layouts/main.handlebars | 26 ++++++----- views/winerypage.handlebars | 80 +--------------------------------- 6 files changed, 23 insertions(+), 99 deletions(-) diff --git a/config/config.json b/config/config.json index 768eb38..3099106 100644 --- a/config/config.json +++ b/config/config.json @@ -2,7 +2,6 @@ "development": { "username": "root", "password": null, - "database": "Platform", "host": "127.0.0.1", "dialect": "mysql" diff --git a/public/js/vendor.js b/public/js/vendor.js index 3ae1b92..ee79ec4 100644 --- a/public/js/vendor.js +++ b/public/js/vendor.js @@ -12,12 +12,9 @@ $(document).ready(function () { - //Adding Event handlers for adding of wines,wineries and events modals. $('body').on('click', '.wine-input', function () { let wineryID = ($(this).attr("data")); - - $('#wine-modal')[0].style.display = "block"; wineSubmit(wineryID); }); @@ -31,10 +28,8 @@ $(document).ready(function () { $('body').on('click', '.winery-addition', function () { $('#winery-modal')[0].style.display = "block"; }); - $('body').on('click', '#reload-page', function () { location.reload(); - }); diff --git a/public/stylesheets/m-style.css b/public/stylesheets/m-style.css index d2b5d49..46386dc 100644 --- a/public/stylesheets/m-style.css +++ b/public/stylesheets/m-style.css @@ -6,10 +6,14 @@ padding-bottom: 2%; padding-top: 2%; + + } .jumbotron-fluid { + + background-color: black; color: white; text-align: center; @@ -30,12 +34,15 @@ text-align: center; font-weight: bold; opacity: 80%; + + } #footer{ + color: black; text-align: center; text-size-adjust: 50%; @@ -53,6 +60,7 @@ } #paca{ + width: 10%; height: 10%; } diff --git a/routes/html-routes.js b/routes/html-routes.js index 0b299a2..28584da 100644 --- a/routes/html-routes.js +++ b/routes/html-routes.js @@ -33,7 +33,6 @@ module.exports = function (app) { res.render("vendor") }); - app.get("/winerypage/:id", isAuthenticated, function (req, res) { db.Wineries.findAll({ where: { @@ -46,5 +45,4 @@ module.exports = function (app) { }) }) }) - }; \ No newline at end of file diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index f9b40f4..c5243f6 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -19,18 +19,20 @@ - - - + {{{ body }}} diff --git a/views/winerypage.handlebars b/views/winerypage.handlebars index 783ec52..c55cda6 100644 --- a/views/winerypage.handlebars +++ b/views/winerypage.handlebars @@ -1,80 +1,3 @@ - -
-
-

This is Barossa Wine

-
-
-
-

Wine Selection

-
-
-

User Name :

-
Winery Name :
-
Street Name :
-
-
- -
-
-
-
-
- ... -
-
-
-
Card title
-

This is a wider card with supporting text below as a natural - lead-in to additional content. This content is a little bit longer.

-

Last updated 3 mins ago

-
-
-
-
-
-
-
- ... -
-
-
-
Card title
-

This is a wider card with supporting text below as a natural - lead-in to additional content. This content is a little bit longer.

-

Last updated 3 mins ago

-
-
-
-
-
-
-
- ... -
-
-
-
Card title
-

This is a wider card with supporting text below as a natural - lead-in to additional content. This content is a little bit longer.

-

Last updated 3 mins ago

-
-
-
-
-
- -
-
    -
  • Events
    • -
  • Barosa
    • -
  • aaaaaaa
    • -
  • vvvvvvv
    • -
  • bbbbbbbbbbb
    • -
-
-
-
-