Large diffs are not rendered by default.

@@ -3,16 +3,18 @@
"version": "0.0.0",
"private": true,
"scripts": {
"start": "node ./bin/www"
"start": "node ./bin/www",
"dev": "nodemon ./bin/www"
},
"dependencies": {
"cookie-parser": "~1.4.3",
"cookie-parser": "^1.4.3",
"debug": "~2.6.9",
"express": "~4.16.0",
"express-session": "^1.15.6",
"hbs": "~4.0.1",
"hbs": "^4.0.1",
"http-errors": "~1.6.2",
"morgan": "~1.9.0",
"morgan": "^1.9.0",
"nodemon": "^1.17.5",
"passport": "^0.4.0",
"passport-github": "^1.1.0",
"pg": "^7.4.3",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,18 @@
const express = require('express');
var ba = require('beeradvocate-api');
const app = express();


app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
next();
});

app.get('/beers', function(req, res) {
ba.beerSearch(req.query.search, function(beers) {
res.send(beers);
});
});

app.listen(3000, () => console.log('Beer API listening on localhost:3000/beers'))
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -2,6 +2,10 @@ html, body {
height: 100%;
}

body.page-app {
background-image: none;
}

.beer {
margin-top: 1rem;
}
@@ -22,7 +22,7 @@

body {
color: white;
background-image: url(./img/beerbackground.jpg);
background-image: url('/img/beerbackground.jpg');
background-position: center top;
background-repeat: no-repeat;
}

This file was deleted.

@@ -1,5 +1,5 @@
body {
background-image: url("img/beerbackground.jpg");
background-image: url("/img/beerbackground.jpg");
background-size: cover;
background-repeat: no-repeat;
background-color: lightslategray;
@@ -1,18 +1,12 @@
const express = require('express');
var ba = require('beeradvocate-api');
const app = express();


app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
next();
});

app.get('/beers', function(req, res) {
ba.beerSearch(req.query.search, function(beers) {
res.send(beers);
});
var express = require('express');
var router = express.Router();

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('app', {
title: 'BeerMe',
bodyclass: 'app'
});
});

app.listen(3000, () => console.log('Beer API listening on localhost:3000/beers'))
module.exports = router;
@@ -3,7 +3,10 @@ var router = express.Router();

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'Express' });
res.render('index', {
title: 'Express',
bodyclass: 'home'
});
});

module.exports = router;
@@ -2,8 +2,10 @@ var express = require('express');
var router = express.Router();

/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
router.get('/login', function(req, res, next) {
res.render('login', {
bodyclass: 'login'
});
});

module.exports = router;
@@ -1,28 +1,4 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="app.css">
<title>BeerMe!</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAZ7pKU7qzipzlkNjcXGeFh6ATwK_1Ccu4&libraries=places"></script>
<!-- <script type="text/javascript" src="Map.js"></script> -->
<script type="text/javascript" src="Map.js"></script>
<script type="text/javascript" src="Api.js"></script>
<script type="text/javascript" src="beers.js"></script>
<script type="text/javascript" src="sidebar.js"></script>

<script type="text/javascript" src="script.js"></script>

</head>

<body>
<nav class="navbar fixed-top navbar-expand-sm navbar-dark bg-dark">
<nav class="navbar fixed-top navbar-expand-sm navbar-dark bg-dark">
<a class="navbar-brand p-0 text-warning" href="#"><img src="img/beerpint.png" width="50" height="50" alt="BeerMe! logo"><span class="p-3" style="font-size: 1.5rem;">BeerMe!</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@@ -79,7 +55,4 @@
};
</script>
</body>

</html>
</script>
@@ -1,2 +1,66 @@
<h1>{{title}}</h1>
<p>Welcome to {{title}}</p>

<nav class="navbar navbar-expand-md navbar-dark bg-dark">

<button class="navbar-toggler" data-toggle="collapse" data-target="#collapse_target">
<span class="navbar-toggler-icon"></span>
</button>

<a class="navbar-brand" href="./">
<img src="/img/beerpint.png">
</a>

<div class="collapse navbar-collapse" id="collapse_target">


<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="login.html">LOG IN</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./SignUp/index.html">SIGN UP</a>
</li>
</ul>
</div>
</nav>
<header>
<div class="row">
<div class="col-12 text-white">
<p>BeerMe</p>
</div>
</div>
</header>
<div class="container">
<div class="row">
<div class="col-12 text-white">
<img src="/img/beerlogo2.png" id="craft-beer" />
<p>FINDING YOU THE BEST CRAFT BEER ATLANTA HAS TO OFFER
<br /> ONE BREWERY AT A TIME</p>
</div>
</div>
<div class="row">
<div class="col-2">
<img src="/img/jekyll_logo.png" id="beer-logo" />
</div>
<div class="col-2">
<img src="/img/mondaynight.jpg" id="beer-logo" />
</div>
<div class="col-2">
<img src="/img/Red-brick-brewing-logo.png" id="beer-logo" />
</div>
<div class="col-2">
<img src="/img/scofflaw.jpg" id="beer-logo" />
</div>
<div class="col-2">
<img src="/img/sweetwaterbrewing.png" id="beer-logo" />
</div>
<div class="col-2">
<img src="/img/threetaverns.png" id="beer-logo" />
</div>
</div>
</div>
<footer>
<div class="footer text-white">
<p>© 2018 BeerMe, Inc.</p>
</div>
</footer>
</body>

This file was deleted.

@@ -2,9 +2,21 @@
<html>
<head>
<title>{{title}}</title>
<link rel='stylesheet' href='/stylesheets/style.css' />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="/stylesheets/styles.css">
<link rel="stylesheet" href="/stylesheets/app.css">
<link rel="stylesheet" href="/stylesheets/login.css">
<!-- <script type="text/javascript" src="Map.js"></script> -->
<script type="text/javascript" src="/js/Map.js"></script>
<script type="text/javascript" src="/js/Api.js"></script>
<script type="text/javascript" src="/js/beers.js"></script>
<script type="text/javascript" src="/js/sidebar.js"></script>
<script type="text/javascript" src="/js/script.js"></script>
</head>
<body>
<body class="page-{{bodyclass}}">
{{{body}}}
</body>
</html>
@@ -0,0 +1,59 @@
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
<button class="navbar-toggler" data-toggle="collapse" data-target="#collapse_target">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="collapse_target">
<a class="navbar-brand" href="./">
<img src="img/beerpint.png">
</a>

<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="index.html">HOME</a>
</li>
</ul>
</div>
</nav>

<!-- Login form -->

<div class="container login">
<h1>Log in</h1>
<div class="login-form">
<form>
<div class="form-group">
<label for="exampleInputEmail1">Email address</label>
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Enter email">
</div>
<div class="form-group">
<label for="exampleInputPassword1">Password</label>
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" id="exampleCheck1">
<label class="form-check-label" for="exampleCheck1">Remember me</label>
</div>
<a href="app.html">
<button type="button" class="btn btn-primary btn-submit">Submit</button>
</a>
</form>
</div>

<!-- Other logins -->

<div class="other-logins">
<div class="facebook">
<a href="app.html">
<button type="button" class="btn btn-lg">Login with Facebook</button>
</a>
</div>

<div class="google">
<a href="app.html">
<button type="button" class="btn btn-lg">Login with Google</button>
</a>
</div>

</div>
</div>

This file was deleted.