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

Jump to bottom

Add content to home page #25

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Add content to home page #25

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Pokemon</title>
<link rel="icon" href="32d7036b771b4f36ba0b.png">
<link href="https://fonts.googleapis.com/css2?family=Oxanium:wght@500&display=swap" rel="stylesheet">
<script defer src="runtime.js"></script><script defer src="main.js"></script></head>
<script defer src="main.js"></script></head>
<body>
<nav>
<div id="nav-bar">
Expand All @@ -26,7 +26,11 @@
</div>
</div>
</nav>

<main id="main" class="main">
<div id="poke-container" class="poke-container">

</div>
</main>
<footer class="footer">
<p class="footerTopText">Created by Microverse under CC license</p>
</footer>
Expand Down
179 changes: 169 additions & 10 deletions dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file removed src/images/background.jpg
View file
Open in desktop
Binary file not shown.
Binary file added src/images/background.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 60 additions & 13 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

body {
background-image: url('./images/background.jpg');
background-image: url('./images/background.png');
background-repeat: no-repeat;
background-size: cover;
}
Expand All @@ -19,7 +18,7 @@ a {
flex-direction: row;
justify-content: space-around;
width: 85%;
background-color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0.95);
border-width: 5px;
border-radius: 0 0 14px 14px;
margin: 0 auto;
Expand All @@ -38,7 +37,7 @@ a {
align-items: center;
flex-direction: column;
justify-content: space-around;
background-color: rgba(235, 111, 111, 0.3);
background-color: rgba(68, 137, 201, 0.7);
border-radius: 10%;
}

Expand All @@ -60,20 +59,12 @@ a {
text-transform: uppercase;
}

.main {
display: none;
background-color: rgba(255, 255, 255, 0.4);
width: 85%;
margin: 25px auto;
border-radius: 14px 14px 0 0;
}

.footer {
display: flex;
align-items: center;
justify-content: center;
width: 85%;
background-color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0.8);
border-width: 5px;
border-radius: 0 0 14px 14px;
margin: 0 auto;
Expand All @@ -83,3 +74,59 @@ a {
font-family: 'Oxanium', cursive;
font-size: 18px;
}

.poke-container {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin: 0 auto;
max-width: 80%;
}

.pokemon {
background-color: rgba(255, 255, 255, 0.8);
border-radius: 10px;
box-shadow: 0 3px 15px rgba(255, 255, 255, 0.4);
margin: 10px;
padding: 20px;
text-align: center;
}

.img-container {
background-color: rgba(68, 137, 201, 0.2);
border-radius: 10%;
width: 120px;
height: 120px;
display: block;
margin: auto;
}

.poke-img {
display: block;
margin: auto;
height: 90%;
max-width: 90%;
}

.poke-name {
margin: 15px 0 7px;
letter-spacing: 1px;
font-family: 'Oxanium', cursive;
font-size: 20px;
}

.info {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
}

.comments-btn {
font-family: 'Oxanium', cursive;
font-size: 20px;
background-color: rgba(255, 255, 255, 0.5);
border-radius: 0 0 14px 14px;
width: 180px;
height: 50px;
}
5 changes: 4 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<title>Pokemon</title>
<link rel="icon" href="./images/pokeball.png">
<link href="https://fonts.googleapis.com/css2?family=Oxanium:wght@500&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
</head>
<body>
<nav>
Expand All @@ -27,7 +28,9 @@
</div>
</nav>
<main id="main" class="main">
<a href="#" class="click">Clicke Me!</a>
<div id="poke-container" class="poke-container">

</div>
</main>
<footer class="footer">
<p class="footerTopText">Created by Microverse under CC license</p>
Expand Down
13 changes: 13 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
import './index.css';
import getPokemon from './modules/pokeapi.js';

// function to fetch pokemon

const pokemonNumber = 20;
const fetchPokemons = async () => {
// eslint-disable-next-line no-plusplus
for (let i = 1; i <= pokemonNumber; i++) {
getPokemon(i);
}
};

fetchPokemons();
27 changes: 27 additions & 0 deletions src/modules/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// populating the html container for the pokemon

const createPokemonCard = (pokemon) => {
const pokeContainer = document.getElementById('poke-container');
const pokemonEl = document.createElement('div');
pokemonEl.classList.add('pokemon');

const name = pokemon.name[0].toUpperCase() + pokemon.name.slice(1);

const pokeInnerHTML = `
<div class="img-container">
<img class="poke-img" src="https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/back/${pokemon.id}.png">
</div>
<div class="info">
<h3 class="poke-name">${name} <span class="material-symbols-outlined">
favorite
</span> </h3>
<button id="comments" class="comments-btn">Comments</buttons>
</div>
`;

pokemonEl.innerHTML = pokeInnerHTML;

pokeContainer.appendChild(pokemonEl);
};

export default createPokemonCard;
14 changes: 14 additions & 0 deletions src/modules/pokeapi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// function to get pokemon
import createPokemonCard from './content.js';

const getPokemon = async (id) => {
// base for the api to get the pokemon
const url = `https://pokeapi.co/api/v2/pokemon/${id}`;

// fetch data
const res = await fetch(url);
const pokemon = await res.json();
createPokemonCard(pokemon);
};

export default getPokemon;
2 changes: 2 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
mode: 'development',
entry: './src/index.js',
output: {
filename: '[name].js',
path: path.resolve(__dirname, 'dist'),
},

Expand All @@ -22,6 +23,7 @@ module.exports = {
test: /\.html$/,
loader: 'html-loader',
},
{ test: /\.txt$/, use: 'raw-loader' },
],
},

Expand Down