Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

amundsf-p4
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a4e1b79c

Commit a4e1b79c authored 3 years ago by Amund Skuggevik Foss

Downloads
- Plain Diff

Merge branch '(#3)Add_search/filtering_option' into 'master'

(#3)add search/filtering option

See merge request !3

parents 89cdf061 e9ebdace

No related branches found

No related tags found

1 merge request!3(#3)add search/filtering option

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

App.tsx 20 additions, 13 deletions

App.tsx
atoms/atoms.ts 16 additions, 0 deletions

atoms/atoms.ts
containers/Header.tsx 135 additions, 0 deletions

containers/Header.tsx
containers/PokemonsContainer.tsx 11 additions, 4 deletions

containers/PokemonsContainer.tsx
containers/SearchBar.tsx 46 additions, 0 deletions

containers/SearchBar.tsx
img/amund ig pb.jpg 0 additions, 0 deletions

img/amund ig pb.jpg
img/kris.PNG 0 additions, 0 deletions

img/kris.PNG
package-lock.json 18 additions, 0 deletions

package-lock.json
package.json 2 additions, 0 deletions

package.json
resources/button.png 0 additions, 0 deletions

resources/button.png
resources/pokemonLogo.png 0 additions, 0 deletions

resources/pokemonLogo.png

with 248 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment