Skip to content

Revert "winerypage" #32

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
Anieto86 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "winerypage" #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"development": {
"username": "root",
"password": null,

"database": "Platform",
"host": "127.0.0.1",
"dialect": "mysql"
Expand Down
5 changes: 0 additions & 5 deletions public/js/vendor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand All @@ -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();

});


Expand Down
8 changes: 8 additions & 0 deletions public/stylesheets/m-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
padding-bottom: 2%;
padding-top: 2%;



}


.jumbotron-fluid {


background-color: black;
color: white;
text-align: center;
Expand All @@ -30,12 +34,15 @@
text-align: center;
font-weight: bold;
opacity: 80%;


}




#footer{

color: black;
text-align: center;
text-size-adjust: 50%;
Expand All @@ -53,6 +60,7 @@
}

#paca{

width: 10%;
height: 10%;
}
Expand Down
2 changes: 0 additions & 2 deletions routes/html-routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module.exports = function (app) {
res.render("vendor")
});


app.get("/winerypage/:id", isAuthenticated, function (req, res) {
db.Wineries.findAll({
where: {
Expand All @@ -46,5 +45,4 @@ module.exports = function (app) {
})
})
})

};
26 changes: 14 additions & 12 deletions views/layouts/main.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@


<body>

<nav class="navbar navbar-light bg-light" id="w-nav">
<a class="navbar-brand" href="#">
<img src="./old/assets/img/logo-T.png" width="200" height="50" alt="" loading="lazy">
<th class="align-right">
<ul class="navbar-nav ml-auto">
<img src="https://img.icons8.com/ios-filled/50/000000/twitter.png" class="img-fluid" alt="Responsive image">
<img src="https://img.icons8.com/ios-filled/50/000000/facebook-new.png"class="img-fluid" alt="Responsive image">
<img src="https://img.icons8.com/ios-glyphs/50/000000/github.png" class="img-fluid" alt="Responsive image">
</a>
</nav>

<nav class="navbar navbar-light bg-light" id="w-nav">
<a class="navbar-brand" href="#">

<img src="./old/assets/img/logo-T.png" width="200" height="50" alt="" loading="lazy">
<th class="align-right">
<ul class="navbar-nav ml-auto">
<img src="https://img.icons8.com/ios-filled/50/000000/twitter.png" class="img-fluid"
alt="Responsive image">
<img src="https://img.icons8.com/ios-filled/50/000000/facebook-new.png" class="img-fluid"
alt="Responsive image">
<img src="https://img.icons8.com/ios-glyphs/50/000000/github.png" class="img-fluid"
alt="Responsive image">
</a>
</nav>

{{{ body }}}

Expand Down
80 changes: 1 addition & 79 deletions views/winerypage.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,3 @@

<br>
<div class="container">
<h2>This is Barossa Wine</h2>
<br>
<div class="row">
<div class="col-7">
<h3>Wine Selection</h3>
</div>
<div class="col-4">
<h3> User Name : </h3>
<h5>Winery Name :</h5>
<h5>Street Name :</h5>
</div>
</div>

<div class="row">
<div class="col-7">
<div class="card mb-3" style="max-width: 540px;">
<div class="row no-gutters">
<div class="col-md-4">
<img src="..." class="card-img" alt="...">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">This is a wider card with supporting text below as a natural
lead-in to additional content. This content is a little bit longer.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
</div>
<div class="card mb-3" style="max-width: 540px;">
<div class="row no-gutters">
<div class="col-md-4">
<img src="..." class="card-img" alt="...">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">This is a wider card with supporting text below as a natural
lead-in to additional content. This content is a little bit longer.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
</div>
<div class="card mb-3" style="max-width: 540px;">
<div class="row no-gutters">
<div class="col-md-4">
<img src="..." class="card-img" alt="...">
</div>
<div class="col-md-8">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">This is a wider card with supporting text below as a natural
lead-in to additional content. This content is a little bit longer.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
</div>
</div>
</div>

<div class="col-5">
<ul class="list-group list-group-flush">
<li class="list-group-item">Events</li>
<li class="list-group-item">Barosa</li>
<li class="list-group-item">aaaaaaa</li>
<li class="list-group-item">vvvvvvv</li>
<li class="list-group-item">bbbbbbbbbbb</li>
</ul>
</div>
</div>
</div>
<br>
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
Expand All @@ -84,5 +7,4 @@
<h1>This is working</h1>

<h2>{{data.wineryname}}</h2>
<h2>{{data.id}}</h2>

<h2>{{data.id}}</h2>