Skip to content
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

Finished hw #6

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+266 −9
Open

Finished hw #6

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7a409f
Commit 1 - My server is set up and running
LehmanBrother Oct 9, 2018
d5260bc
Commit 2 - Connected my database, can see json in the browser
LehmanBrother Oct 10, 2018
a6c5927
Commit 3 - index.ejs view rendered at pokemon route
LehmanBrother Oct 10, 2018
6e045de
Commit 4 - show view shows pokemon details
LehmanBrother Oct 10, 2018
b2c331d
Commits 6 and 7 - set up serving of static files, styled app
LehmanBrother Oct 10, 2018
6e13433
reconfigured to use controller format
LehmanBrother Oct 10, 2018
e466761
new pokemon
LehmanBrother Oct 11, 2018
3e96355
edit and delete
LehmanBrother Oct 11, 2018
154d38a
added delete to show page
LehmanBrother Oct 11, 2018
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
Prev Previous commit
Next Next commit
Commit 3 - index.ejs view rendered at pokemon route
@LehmanBrother
LehmanBrother committed Oct 10, 2018
commit a6c59277c57ab9778b33ae53399bc7d87ccb5f5e
4 changes: 3 additions & 1 deletion server.js
View file
Original file line number Diff line number Diff line change
@@ -14,5 +14,7 @@ app.use(bodyParser.json());

//index route
app.get('/pokemon', (req,res) => {
res.send(Pokemon);
res.render('index.ejs', {
pokemon: Pokemon
});
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'd recommend organizing this file a little more carefully. have a separate section for controllers and put all your controller stuff there (even though they are implemented the same way middleware is). example:

const express = require('express');
const app = express();
const bodyParser = require('body-parser');
const methodOverride = require('method-override');

//middleware
app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json());
app.use(methodOverride('_method'));
app.use(express.static('public'));

// controllers
app.use('/pokemon', pokemonController);
const pokemonController = require('./controllers/pokemon');

app.get('/',(req, res) => {
	res.send('This is the server responding to a get request')
})

app.listen(3000, () => {
	console.log('server is listening on port 3000');
})

20 changes: 20 additions & 0 deletions views/index.ejs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<title>Pokemon Index</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<style>
li {font-family: roboto;}
</style>
</head>
<body>
<h1>Pokemon Index</h1>
<ul class="pokemon">
<% for(let i = 0; i < pokemon.length; i++) {%>
<li>
<a href='/pokemon/<%=i%>'><%= pokemon[i].name %></a>
</li>
<% }%>
</ul>
</body>
</html>