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.

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

Microverse: Open a PR in existing repo #49

Open
wants to merge 43 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a035d22
Setup project
jaflih Feb 4, 2022
de298ba
Remove linters
jaflih Feb 4, 2022
75fa9d1
Add linter
jaflih Feb 4, 2022
341576b
Add App.js the entry point of the project
jaflih Feb 4, 2022
49d03b0
Update link to App
jaflih Feb 4, 2022
ef9ff50
Create const for nb pokemon loaded
jaflih Feb 4, 2022
d0acccf
Comment temporary non use code
jaflih Feb 4, 2022
ff0acae
Add style for loaded pokemon
jaflih Feb 4, 2022
f092958
Add comment button on homepage
jaflih Feb 4, 2022
ef2f963
Add style for pokemon name and comment button
jaflih Feb 4, 2022
95d71a5
Active popup
jaflih Feb 4, 2022
f2a14c9
Desactivate comments
jaflih Feb 4, 2022
716a436
Desactivate comments
jaflih Feb 4, 2022
10154dc
Activate popup and add style
jaflih Feb 4, 2022
84524f2
Update popup style
jaflih Feb 4, 2022
9cf0960
Update comment form style
jaflih Feb 4, 2022
fb32045
Add left comment box
jaflih Feb 4, 2022
3b87a4c
Add new comment
jaflih Feb 4, 2022
43a7fd4
Desactivate count pokemon
jaflih Feb 4, 2022
c2f6340
Activate like
jaflih Feb 4, 2022
9acff9c
refactor
jaflih Feb 4, 2022
dfdfc8f
update h2, h3, h4
jaflih Feb 4, 2022
58ea959
Desactivate effet when popup open
jaflih Feb 4, 2022
dec6bea
Update media query style
jaflih Feb 4, 2022
63aa4c3
Add timer before display html
jaflih Feb 4, 2022
391cd36
Fix linter
jaflih Feb 4, 2022
e5855d0
Fix update image
jaflih Feb 4, 2022
bd943b5
Update readme
jaflih Feb 4, 2022
6108102
Update readme
jaflih Feb 4, 2022
16e30f3
Update readme
jaflih Feb 4, 2022
c454af7
Update readme
jaflih Feb 4, 2022
9ad3be2
Update README.md
jaflih Feb 4, 2022
46e8001
Update README.md
jaflih Feb 4, 2022
f732520
Update README.md
jaflih Feb 4, 2022
5524a55
Deploy project
jaflih Feb 4, 2022
1d82d1d
Fix bug
jaflih Feb 4, 2022
1d51b8c
Fix bug comment box
jaflih Feb 4, 2022
9c05d1b
Fix bug comment box
jaflih Feb 4, 2022
4a1902e
fix chrom scroll bug
jaflih Feb 4, 2022
f5bb615
deploy
jaflih Feb 4, 2022
7182194
Merge pull request #1 from jihaneH/feature/design
jaflih Feb 4, 2022
dab92db
Update README.md
jaflih Feb 18, 2022
e04e79b
Update README.md
jaflih Apr 8, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ jobs:
npm install --save-dev [email protected] [email protected] [email protected] [email protected]
[ -f .eslintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/html-css-js/.eslintrc.json
- name: ESLint Report
run: npx eslint .
run: npx eslint .
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
![](https://img.shields.io/badge/Microverse-blueviolet)

# Pokemon

This is an app that displays pokemons using a remote API.

![screenshot](./assets/screen1.png)
![screenshot](./assets/pokemon.gif)

<img src="./assets/screen1.png" width="300">
<img src="./assets/screen2.png" width="300">
<img src="./assets/screen3.png" width="300">
<img src="./assets/screen4.png" width="300">
<img src="./assets/screen5.png" width="300">


This project shows pokemon characters.

Expand All @@ -19,13 +24,7 @@ This project shows pokemon characters.

This project is deployed on a github page on the link below:

- https://matovu-farid.github.io/pokemon/

## Video Demo

[Video](https://www.loom.com/share/2a3bc2add93044a0bc4735dd45d48b63)


- https://jaflih.github.io/pokemon/

## Getting Started

Expand All @@ -34,7 +33,7 @@ This project is deployed on a github page on the link below:
To get the content of this project locally you need to run this command in your terminal:

```
- git clone your https://github.com/matovu-farid/pokemon.git
- git clone your https://github.com/jaflih/pokemon.git
- cd project pokemon
- npm install
- npm start
Expand All @@ -48,17 +47,18 @@ To get the content of this project locally you need to run this command in your

## Author

👤 **Jaflih**

- GitHub: [@githubhandle](https://github.com/jaflih)
- LinkedIn: [LinkedIn](https://www.linkedin.com/in/jaflih/)


👤 **Matovu Farid Nkoba**

- GitHub: [@matovu-farid](https://github.com/matovu-farid)
- Twitter: [@matovu100](https://twitter.com/matovu100)
- LinkedIn: [matovu-farid](https://www.linkedin.com/in/matovu-farid-48b80257)

👤 **JihaneH**

- GitHub: [@githubhandle](https://github.com/jihaneH)
- LinkedIn: [LinkedIn](https://www.linkedin.com/in/jihanne/)

## 📝 License

This project is [MIT](./MIT.md) licensed.
Binary file added assets/pokemon.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screen1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screen2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screen3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screen4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screen5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading