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

Pokemon CRUD homework is done #4

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

Pokemon CRUD homework is done #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1318ee
Commit 1 - My server is set up and running
FilTatarnik Oct 9, 2018
dda0dce
Commit -2 Connected my database. Commit 3 - index.ejs view rendered a…
FilTatarnik Oct 10, 2018
ff22154
Commit 4- show view shows pokemon details, Commit -5 added dynamic an…
FilTatarnik Oct 10, 2018
12576d1
Commit 6 - set up serving of static files so we can add css, my commi…
FilTatarnik Oct 10, 2018
b8145bc
Commit 7 - The app is styled
FilTatarnik Oct 10, 2018
6e4037c
added a box shadow
FilTatarnik Oct 10, 2018
59eccdf
added new pokemon button, GET new, just need to test it w internet
FilTatarnik Oct 10, 2018
a9d0487
everything works but edit. idk why i'm blanking. i've been coding too…
FilTatarnik Oct 11, 2018
d11ab3b
finished homework , ughhh
FilTatarnik 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
51 changes: 51 additions & 0 deletions assets/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
h1 {
font-family: 'Sniglet', cursive;
color: lightblue;
padding-left: 10px;
}

body{
background-color:#bae1ff;
}

div{
position: absolute;
max-width: relative;
max-height: relative;
margin: auto;
font-family: 'Sniglet', cursive;
width: 400px;
height: 500px;
overflow:auto;
/*word-wrap:break-word*/

background-color:#ffdfba;
border-radius: 10px;
box-shadow: 0px 0px 150px 15px #99828F;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.pokemon{
font-family: 'Sniglet', cursive;
list-style-type: none;
text-decoration: none;
}

img{
margin-left: 23px;
max-width: relative;
max-height: relative;
border-radius: 10px;

}
a{
font-family: 'Sniglet', cursive;
text-decoration: none;
color:black;
}
button{
margin-left: 50%;

}
32 changes: 32 additions & 0 deletions models/pokemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
const pokemon = [
{
name: "Bulbasaur",
img: "http://img.pokemondb.net/artwork/bulbasaur.jpg"
},
{
name: "Ivysaur",
img: "http://img.pokemondb.net/artwork/ivysaur.jpg"
},
{
name: "Venusaur",
img: "http://img.pokemondb.net/artwork/venusaur.jpg"
},
{
name: "Charmander",
img: "http://img.pokemondb.net/artwork/charmander.jpg"
},
{
name: "Charizard",
img: "http://img.pokemondb.net/artwork/charizard.jpg"
},
{
name: "Squirtle",
img: "http://img.pokemondb.net/artwork/squirtle.jpg"
},
{
name: "Wartortle",
img: "http://img.pokemondb.net/artwork/wartortle.jpg"
}
];

module.exports = pokemon;
Loading