Compare commits
No commits in common. "master" and "3ccf4bdd615e6ed143a74510f30d6846f203f75b" have entirely different histories.
master
...
3ccf4bdd61
29
.eslintrc
29
.eslintrc
|
|
@ -1,29 +0,0 @@
|
||||||
{
|
|
||||||
"parser": "@typescript-eslint/parser",
|
|
||||||
"extends": [
|
|
||||||
"eslint:recommended",
|
|
||||||
"plugin:react/recommended",
|
|
||||||
"plugin:@typescript-eslint/recommended",
|
|
||||||
"plugin:react-hooks/recommended",
|
|
||||||
"plugin:prettier/recommended"
|
|
||||||
],
|
|
||||||
"plugins": ["react", "@typescript-eslint", "prettier"],
|
|
||||||
"env": {
|
|
||||||
"browser": true,
|
|
||||||
"node": true,
|
|
||||||
"es2021": true
|
|
||||||
},
|
|
||||||
"settings": {
|
|
||||||
"react": {
|
|
||||||
"version": "detect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rules": {
|
|
||||||
"react/react-in-jsx-scope": "off",
|
|
||||||
"react/prop-types": "off",
|
|
||||||
"@typescript-eslint/explicit-module-boundary-types": "off",
|
|
||||||
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }],
|
|
||||||
"prettier/prettier": "error",
|
|
||||||
"@typescript-eslint/no-empty-function": "off"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -21,6 +21,3 @@
|
||||||
npm-debug.log*
|
npm-debug.log*
|
||||||
yarn-debug.log*
|
yarn-debug.log*
|
||||||
yarn-error.log*
|
yarn-error.log*
|
||||||
|
|
||||||
*.log
|
|
||||||
*.tsbuildinfo
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
#!/usr/bin/env sh
|
|
||||||
. "$(dirname -- "$0")/_/husky.sh"
|
|
||||||
|
|
||||||
npx lint-staged
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<HTMLCodeStyleSettings>
|
|
||||||
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
||||||
<option name="HTML_QUOTE_STYLE" value="Single" />
|
|
||||||
<option name="HTML_ENFORCE_QUOTES" value="true" />
|
|
||||||
</HTMLCodeStyleSettings>
|
|
||||||
<JSCodeStyleSettings version="0">
|
|
||||||
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
||||||
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
||||||
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
||||||
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
||||||
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
||||||
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
||||||
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
||||||
</JSCodeStyleSettings>
|
|
||||||
<TypeScriptCodeStyleSettings version="0">
|
|
||||||
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
||||||
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
||||||
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
||||||
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
||||||
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
||||||
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
||||||
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
||||||
</TypeScriptCodeStyleSettings>
|
|
||||||
<VueCodeStyleSettings>
|
|
||||||
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
||||||
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
||||||
</VueCodeStyleSettings>
|
|
||||||
<codeStyleSettings language="HTML">
|
|
||||||
<option name="SOFT_MARGINS" value="80" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="JavaScript">
|
|
||||||
<option name="SOFT_MARGINS" value="80" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="TypeScript">
|
|
||||||
<option name="SOFT_MARGINS" value="80" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="Vue">
|
|
||||||
<option name="SOFT_MARGINS" value="80" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<state>
|
|
||||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
|
||||||
</state>
|
|
||||||
</component>
|
|
||||||
|
|
@ -2,6 +2,5 @@
|
||||||
<profile version="1.0">
|
<profile version="1.0">
|
||||||
<option name="myName" value="Project Default" />
|
<option name="myName" value="Project Default" />
|
||||||
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
|
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||||
<inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" />
|
|
||||||
</profile>
|
</profile>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="EslintConfiguration">
|
|
||||||
<option name="fix-on-save" value="true" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
import { StorybookConfig } from '@storybook/react-webpack5';
|
|
||||||
|
|
||||||
const path = require('path');
|
|
||||||
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
|
|
||||||
|
|
||||||
const config: StorybookConfig = {
|
|
||||||
stories: ['../src/**/*.stories.tsx'],
|
|
||||||
addons: [
|
|
||||||
'@storybook/addon-links',
|
|
||||||
'@storybook/addon-essentials',
|
|
||||||
'@storybook/addon-interactions',
|
|
||||||
'@storybook/preset-create-react-app',
|
|
||||||
],
|
|
||||||
framework: {
|
|
||||||
name: '@storybook/react-webpack5',
|
|
||||||
options: {},
|
|
||||||
},
|
|
||||||
webpackFinal: async config => {
|
|
||||||
if (!config.resolve) {
|
|
||||||
config.resolve = {};
|
|
||||||
}
|
|
||||||
config.resolve.plugins = config.resolve.plugins || [];
|
|
||||||
config.resolve.plugins.push(
|
|
||||||
new TsconfigPathsPlugin({
|
|
||||||
configFile: path.resolve(__dirname, '../tsconfig.json'),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
return config;
|
|
||||||
},
|
|
||||||
docs: {
|
|
||||||
autodocs: true,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default config;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import 'index.css';
|
|
||||||
|
|
||||||
import { Preview } from '@storybook/react';
|
|
||||||
|
|
||||||
const preview: Preview = {};
|
|
||||||
|
|
||||||
export default preview;
|
|
||||||
72
README.md
72
README.md
|
|
@ -1,47 +1,51 @@
|
||||||
# PokeRtk = Pokedex + Redux-Toolkit
|
# Getting Started with Create React App
|
||||||
|
|
||||||
A simple PokemonCard catalogue frontend app, build with React, Redux-Toolkit, Material-UI. It uses backend powered by [PokeAPI](https://pokeapi.co/).
|
A simple Pokemon catalogue app, build with React, Redux-Toolkit, Material-UI and PokeAPI.
|
||||||
|
|
||||||
It's a learning project following [pokedex](https://github.com/s1varam/pokedex). In this project, I practised following skills:
|
It's a learning project following [pokedex](https://github.com/s1varam/pokedex). In this project, I practised following skills:
|
||||||
* Use React to create View for FE
|
* Use React to create View for FE
|
||||||
* Use redux, react-redux, redux-toolkit (RTK) for state management
|
* Use redux, react-redux, redux-toolkit (RTK) for state management
|
||||||
* Use storybook to design component
|
* Use storybook to design component
|
||||||
* Use [RTK Query](https://redux-toolkit.js.org/rtk-query/overview) for fetching
|
|
||||||
|
|
||||||
Feature of the pokedex application:
|
|
||||||
|
|
||||||
* Display list of pokemon cards
|
|
||||||
* Fetching pokemon cards by region
|
|
||||||
|
|
||||||
* Filter pokemon cards by type
|
|
||||||
|
|
||||||
* Sort pokemon cards by name or ID
|
|
||||||
|
|
||||||
* Filter pokemon cards by search naming
|
|
||||||
|
|
||||||
* Show pokemon card detail
|
|
||||||
|
|
||||||
|
|
||||||
Deployed on [Netlify](https://pokedex-rtk.netlify.app/)
|
|
||||||
|
|
||||||
Storybook builds on [Chromatic](https://www.chromatic.com/builds?appId=645cedbb11414edc1f2eb16c)
|
|
||||||
|
|
||||||
## Available Scripts
|
## Available Scripts
|
||||||
|
|
||||||
In the project directory, you can run:
|
In the project directory, you can run:
|
||||||
|
|
||||||
* `nvm use`: use node version according to `.nvmrc`
|
### `npm start`
|
||||||
* `yarn start`: run the development server
|
|
||||||
* `yarn storybook`: start storybook server to check component rendering
|
|
||||||
* `yarn build`: build the app for production
|
|
||||||
|
|
||||||
## TODO
|
Runs the app in the development mode.\
|
||||||
|
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
||||||
|
|
||||||
* [ ] Fix css of Filter component
|
The page will reload if you make edits.\
|
||||||
* [ ] Fix Poke logo size via css
|
You will also see any lint errors in the console.
|
||||||
* [ ] Add day/night toggle in header
|
|
||||||
* [ ] Add github icon in header
|
### `npm test`
|
||||||
* [ ] Use material.ui to display pokemon cards
|
|
||||||
* [ ] Fix round corner of InfoDialog component
|
Launches the test runner in the interactive watch mode.\
|
||||||
* [ ] Add error handling for data fetching across app
|
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||||
* [x] Deploy through netlify
|
|
||||||
|
### `npm run build`
|
||||||
|
|
||||||
|
Builds the app for production to the `build` folder.\
|
||||||
|
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||||
|
|
||||||
|
The build is minified and the filenames include the hashes.\
|
||||||
|
Your app is ready to be deployed!
|
||||||
|
|
||||||
|
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||||
|
|
||||||
|
### `npm run eject`
|
||||||
|
|
||||||
|
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
||||||
|
|
||||||
|
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||||
|
|
||||||
|
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
||||||
|
|
||||||
|
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
||||||
|
|
||||||
|
## Learn More
|
||||||
|
|
||||||
|
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||||
|
|
||||||
|
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 48 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 MiB |
|
|
@ -1,8 +0,0 @@
|
||||||
module.exports = {
|
|
||||||
'*.json': ['npm run format:check'],
|
|
||||||
'*.{ts,tsx,js,jsx}': [
|
|
||||||
'npm run lint',
|
|
||||||
"bash -c 'npm run types:check'",
|
|
||||||
'npm run format:check',
|
|
||||||
],
|
|
||||||
};
|
|
||||||
File diff suppressed because it is too large
Load Diff
80
package.json
80
package.json
|
|
@ -3,15 +3,16 @@
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.11.0",
|
"@reduxjs/toolkit": "^1.9.3",
|
||||||
"@emotion/styled": "^11.11.0",
|
"@testing-library/jest-dom": "^5.16.5",
|
||||||
"@mui/icons-material": "^5.11.16",
|
"@testing-library/react": "^13.4.0",
|
||||||
"@mui/material": "^5.13.1",
|
"@testing-library/user-event": "^13.5.0",
|
||||||
"@reduxjs/toolkit": "^1.9.5",
|
"@types/jest": "^27.5.2",
|
||||||
"framer-motion": "^10.12.12",
|
"@types/node": "^16.18.14",
|
||||||
|
"@types/react": "^18.0.28",
|
||||||
|
"@types/react-dom": "^18.0.11",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-lazy-load-image-component": "^1.5.6",
|
|
||||||
"react-redux": "^8.0.5",
|
"react-redux": "^8.0.5",
|
||||||
"react-scripts": "5.0.1",
|
"react-scripts": "5.0.1",
|
||||||
"typescript": "^4.9.5",
|
"typescript": "^4.9.5",
|
||||||
|
|
@ -21,33 +22,12 @@
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"test:watchAll": "react-scripts test --watchAll",
|
"eject": "react-scripts eject"
|
||||||
"eject": "react-scripts eject",
|
|
||||||
"prettier": "prettier \"src/**/*.{js,jsx,ts,tsx,css,scss,md}\" --write",
|
|
||||||
"format:check": "yarn prettier -- --check",
|
|
||||||
"format:write": "yarn prettier -- --write",
|
|
||||||
"types:check": "tsc --noEmit --pretty",
|
|
||||||
"lint": "eslint --ext .js,.jsx,.ts,.tsx src --no-error-on-unmatched-pattern",
|
|
||||||
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx src --fix --no-error-on-unmatched-pattern",
|
|
||||||
"fix": "yarn format:write && yarn lint:fix",
|
|
||||||
"storybook": "storybook dev -p 6006 -s public",
|
|
||||||
"build-storybook": "storybook build -s public",
|
|
||||||
"chromatic": "npx chromatic --project-token=chpt_df2240e310a4eff"
|
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": [
|
"extends": [
|
||||||
"react-app",
|
"react-app",
|
||||||
"react-app/jest"
|
"react-app/jest"
|
||||||
],
|
|
||||||
"overrides": [
|
|
||||||
{
|
|
||||||
"files": [
|
|
||||||
"**/*.stories.*"
|
|
||||||
],
|
|
||||||
"rules": {
|
|
||||||
"import/no-anonymous-default-export": "off"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"browserslist": {
|
"browserslist": {
|
||||||
|
|
@ -63,44 +43,6 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@storybook/addon-actions": "^7.0.12",
|
"prettier": "^2.8.4"
|
||||||
"@storybook/addon-essentials": "^7.0.12",
|
}
|
||||||
"@storybook/addon-interactions": "^7.0.12",
|
|
||||||
"@storybook/addon-links": "^7.0.12",
|
|
||||||
"@storybook/node-logger": "^7.0.12",
|
|
||||||
"@storybook/preset-create-react-app": "^7.0.12",
|
|
||||||
"@storybook/react": "^7.0.12",
|
|
||||||
"@storybook/react-webpack5": "^7.0.12",
|
|
||||||
"@storybook/testing-library": "^0.1.1-future.2",
|
|
||||||
"@testing-library/jest-dom": "^5.16.5",
|
|
||||||
"@testing-library/react": "^13.4.0",
|
|
||||||
"@testing-library/user-event": "^13.5.0",
|
|
||||||
"@types/jest": "^27.5.2",
|
|
||||||
"@types/node": "^16.18.31",
|
|
||||||
"@types/react": "^18.2.6",
|
|
||||||
"@types/react-dom": "^18.2.4",
|
|
||||||
"@types/react-lazy-load-image-component": "^1.5.3",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^5.59.8",
|
|
||||||
"@typescript-eslint/parser": "^5.59.8",
|
|
||||||
"babel-plugin-named-exports-order": "^0.0.2",
|
|
||||||
"chromatic": "^6.17.4",
|
|
||||||
"eslint": "^8.41.0",
|
|
||||||
"eslint-config-airbnb": "^19.0.4",
|
|
||||||
"eslint-config-prettier": "^8.8.0",
|
|
||||||
"eslint-plugin-import": "^2.27.5",
|
|
||||||
"eslint-plugin-jsx-a11y": "^6.7.1",
|
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
|
||||||
"eslint-plugin-react": "^7.32.2",
|
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
|
||||||
"husky": "^8.0.3",
|
|
||||||
"lint-staged": "^13.2.2",
|
|
||||||
"msw": "^1.2.1",
|
|
||||||
"prettier": "^2.8.8",
|
|
||||||
"prop-types": "^15.8.1",
|
|
||||||
"storybook": "^7.0.12",
|
|
||||||
"tsconfig-paths-webpack-plugin": "^4.0.1",
|
|
||||||
"webpack": "^5.83.1"
|
|
||||||
},
|
|
||||||
"readme": "ERROR: No README data found!",
|
|
||||||
"_id": "pokertk@0.1.0"
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
work correctly both with client-side routing and a non-root public URL.
|
work correctly both with client-side routing and a non-root public URL.
|
||||||
Learn how to configure a non-root public URL by running `npm run build`.
|
Learn how to configure a non-root public URL by running `npm run build`.
|
||||||
-->
|
-->
|
||||||
<title>PokeRTK</title>
|
<title>React App</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
|
|
|
||||||
36
src/App.css
36
src/App.css
|
|
@ -1,32 +1,32 @@
|
||||||
.App {
|
.App {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.App-logo {
|
.App-logo {
|
||||||
height: 40vmin;
|
height: 40vmin;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.App-header {
|
.App-header {
|
||||||
background-color: #282c34;
|
background-color: #282c34;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
font-size: calc(10px + 2vmin);
|
font-size: calc(10px + 2vmin);
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.App-link {
|
.App-link {
|
||||||
color: #61dafb;
|
color: #61dafb;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes App-logo-spin {
|
@keyframes App-logo-spin {
|
||||||
from {
|
from {
|
||||||
transform: rotate(0deg);
|
transform: rotate(0deg);
|
||||||
}
|
}
|
||||||
to {
|
to {
|
||||||
transform: rotate(360deg);
|
transform: rotate(360deg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import App from './App';
|
||||||
|
|
||||||
|
test('renders learn react link', () => {
|
||||||
|
render(<App />);
|
||||||
|
const linkElement = screen.getByText(/learn react/i);
|
||||||
|
expect(linkElement).toBeInTheDocument();
|
||||||
|
});
|
||||||
11
src/App.tsx
11
src/App.tsx
|
|
@ -1,20 +1,13 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import './App.css';
|
import './App.css';
|
||||||
import Header from 'components/Header/Header';
|
import { Header } from './Header';
|
||||||
import Pokedex from 'features/Pokedex';
|
import { Filters } from './Filters';
|
||||||
import Filters from 'features/Filters';
|
|
||||||
import InfoDialog from 'features/InfoDialog';
|
|
||||||
import { useAppSelector } from 'app/hooks';
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const selectedRegion = useAppSelector(state => state.filter.selectedRegion);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="App app_container">
|
<div className="App app_container">
|
||||||
<Header />
|
<Header />
|
||||||
<Filters />
|
<Filters />
|
||||||
<Pokedex selectedRegion={selectedRegion} />
|
|
||||||
<InfoDialog />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
export function Filters() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="filter__container">
|
||||||
|
<div className="filter__items">
|
||||||
|
<div>
|
||||||
|
<div>REGION</div>
|
||||||
|
<select name="regionSelect">
|
||||||
|
<option value="Johto (152-251)">Johto (152-251)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="filter__items">
|
||||||
|
<div>
|
||||||
|
<div>TYPE</div>
|
||||||
|
<select name="typeSelect">
|
||||||
|
<option value="all">all types</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="filter__items">
|
||||||
|
<div>
|
||||||
|
<div>SORT BY</div>
|
||||||
|
<select name="sortSelect">
|
||||||
|
<option value="name">Name</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export {};
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
import React from 'react';
|
||||||
|
import logo from './assets/poke_logo.png';
|
||||||
|
|
||||||
|
export function Header() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div className="poke__logos">
|
||||||
|
<img src={logo} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
|
||||||
import type { TypedUseSelectorHook } from 'react-redux';
|
|
||||||
import type { RootState, AppDispatch } from './store';
|
|
||||||
|
|
||||||
export const useAppDispatch: () => AppDispatch = useDispatch;
|
|
||||||
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
{
|
|
||||||
"baby_trigger_item": null,
|
|
||||||
"chain": {
|
|
||||||
"evolution_details": [],
|
|
||||||
"evolves_to": [
|
|
||||||
{
|
|
||||||
"evolution_details": [
|
|
||||||
{
|
|
||||||
"gender": null,
|
|
||||||
"held_item": null,
|
|
||||||
"item": null,
|
|
||||||
"known_move": null,
|
|
||||||
"known_move_type": null,
|
|
||||||
"location": null,
|
|
||||||
"min_affection": null,
|
|
||||||
"min_beauty": null,
|
|
||||||
"min_happiness": null,
|
|
||||||
"min_level": 16,
|
|
||||||
"needs_overworld_rain": false,
|
|
||||||
"party_species": null,
|
|
||||||
"party_type": null,
|
|
||||||
"relative_physical_stats": null,
|
|
||||||
"time_of_day": "",
|
|
||||||
"trade_species": null,
|
|
||||||
"trigger": {
|
|
||||||
"name": "level-up",
|
|
||||||
"url": "https://pokeapi.co/api/v2/evolution-trigger/1/"
|
|
||||||
},
|
|
||||||
"turn_upside_down": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"evolves_to": [
|
|
||||||
{
|
|
||||||
"evolution_details": [
|
|
||||||
{
|
|
||||||
"gender": null,
|
|
||||||
"held_item": null,
|
|
||||||
"item": null,
|
|
||||||
"known_move": null,
|
|
||||||
"known_move_type": null,
|
|
||||||
"location": null,
|
|
||||||
"min_affection": null,
|
|
||||||
"min_beauty": null,
|
|
||||||
"min_happiness": null,
|
|
||||||
"min_level": 36,
|
|
||||||
"needs_overworld_rain": false,
|
|
||||||
"party_species": null,
|
|
||||||
"party_type": null,
|
|
||||||
"relative_physical_stats": null,
|
|
||||||
"time_of_day": "",
|
|
||||||
"trade_species": null,
|
|
||||||
"trigger": {
|
|
||||||
"name": "level-up",
|
|
||||||
"url": "https://pokeapi.co/api/v2/evolution-trigger/1/"
|
|
||||||
},
|
|
||||||
"turn_upside_down": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"evolves_to": [],
|
|
||||||
"is_baby": false,
|
|
||||||
"species": {
|
|
||||||
"name": "charizard",
|
|
||||||
"url": "https://pokeapi.co/api/v2/pokemon-species/6/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"is_baby": false,
|
|
||||||
"species": {
|
|
||||||
"name": "charmeleon",
|
|
||||||
"url": "https://pokeapi.co/api/v2/pokemon-species/5/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"is_baby": false,
|
|
||||||
"species": {
|
|
||||||
"name": "charmander",
|
|
||||||
"url": "https://pokeapi.co/api/v2/pokemon-species/4/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"id": 2
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,152 +0,0 @@
|
||||||
import { pokedexSlice } from 'features/Pokedex/pokedexSlice';
|
|
||||||
import { pokeRestApi } from 'app/services/pokeRestApi';
|
|
||||||
import { filterSlice } from 'features/Filters/filterSlice';
|
|
||||||
import { getIdFromUrl } from 'app/services/pokeRestApi';
|
|
||||||
|
|
||||||
import { configureStore } from '@reduxjs/toolkit';
|
|
||||||
|
|
||||||
import { AppStore } from 'app/store';
|
|
||||||
import {
|
|
||||||
EvolutionChainResponseData,
|
|
||||||
PokemonResponseData,
|
|
||||||
PokemonSpeciesResponseData,
|
|
||||||
TypeListResponseData,
|
|
||||||
} from 'types/api';
|
|
||||||
|
|
||||||
let store: AppStore;
|
|
||||||
|
|
||||||
describe('pokeRestApi', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
store = configureStore({
|
|
||||||
reducer: {
|
|
||||||
pokedex: pokedexSlice.reducer,
|
|
||||||
filter: filterSlice.reducer,
|
|
||||||
[pokeRestApi.reducerPath]: pokeRestApi.reducer,
|
|
||||||
},
|
|
||||||
middleware: getDefaultMiddleware =>
|
|
||||||
getDefaultMiddleware().concat(pokeRestApi.middleware),
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('JEST test against mock API', () => {
|
|
||||||
describe('test getPokemon query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/pokemon/85 returns Dodrio', async () => {
|
|
||||||
await store.dispatch(pokeRestApi.endpoints.getPokemon.initiate(85));
|
|
||||||
|
|
||||||
const pokemon = pokeRestApi.endpoints.getPokemon.select(85)(
|
|
||||||
store.getState(),
|
|
||||||
).data as PokemonResponseData;
|
|
||||||
expect(pokemon?.name).toBe('dodrio');
|
|
||||||
expect(pokemon?.types).toHaveLength(2);
|
|
||||||
expect(pokemon?.types[0].type.name).toBe('normal');
|
|
||||||
expect(pokemon?.types[1].type.name).toBe('flying');
|
|
||||||
expect(pokemon?.sprites.other.dream_world.front_default).toBe(
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/85.svg',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test getPokemonSpecies query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/pokemon-species/6/', async () => {
|
|
||||||
await store.dispatch(
|
|
||||||
pokeRestApi.endpoints.getPokemonSpecies.initiate(6),
|
|
||||||
);
|
|
||||||
|
|
||||||
const pokemonSpecies = pokeRestApi.endpoints.getPokemonSpecies.select(
|
|
||||||
6,
|
|
||||||
)(store.getState()).data as PokemonSpeciesResponseData;
|
|
||||||
expect(pokemonSpecies?.evolution_chain.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/evolution-chain/2/',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test getPokemonSpecies query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/pokemon-species/6/', async () => {
|
|
||||||
await store.dispatch(
|
|
||||||
pokeRestApi.endpoints.getPokemonSpeciesFromUrl.initiate(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/6/',
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const pokemonSpecies =
|
|
||||||
pokeRestApi.endpoints.getPokemonSpeciesFromUrl.select(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/6/',
|
|
||||||
)(store.getState()).data as PokemonSpeciesResponseData;
|
|
||||||
expect(pokemonSpecies?.evolution_chain.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/evolution-chain/2/',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test getTypeList query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/type should return correct data in list', async () => {
|
|
||||||
await store.dispatch(pokeRestApi.endpoints.getTypeList.initiate());
|
|
||||||
|
|
||||||
const typeListData = pokeRestApi.endpoints.getTypeList.select()(
|
|
||||||
store.getState(),
|
|
||||||
).data as TypeListResponseData;
|
|
||||||
expect(typeListData?.results).toHaveLength(typeListData.count + 1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test getEvolutionChain query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/evolution-chain/2/', async () => {
|
|
||||||
await store.dispatch(
|
|
||||||
pokeRestApi.endpoints.getEvolutionChain.initiate(2),
|
|
||||||
);
|
|
||||||
|
|
||||||
const evolutionChainData =
|
|
||||||
pokeRestApi.endpoints.getEvolutionChain.select(2)(store.getState())
|
|
||||||
.data as EvolutionChainResponseData;
|
|
||||||
expect(evolutionChainData?.chain.species.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/4/',
|
|
||||||
);
|
|
||||||
expect(evolutionChainData?.chain.evolves_to[0].species.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/5/',
|
|
||||||
);
|
|
||||||
expect(
|
|
||||||
evolutionChainData?.chain.evolves_to[0].evolves_to[0].species.url,
|
|
||||||
).toBe('https://pokeapi.co/api/v2/pokemon-species/6/');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test getEvolutionChainFromUrl query', () => {
|
|
||||||
test('visit https://pokeapi.co/api/v2/evolution-chain/2/', async () => {
|
|
||||||
await store.dispatch(
|
|
||||||
pokeRestApi.endpoints.getEvolutionChainFromUrl.initiate(
|
|
||||||
'https://pokeapi.co/api/v2/evolution-chain/2/',
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const evolutionChainData =
|
|
||||||
pokeRestApi.endpoints.getEvolutionChainFromUrl.select(
|
|
||||||
'https://pokeapi.co/api/v2/evolution-chain/2/',
|
|
||||||
)(store.getState()).data as EvolutionChainResponseData;
|
|
||||||
expect(evolutionChainData?.chain.species.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/4/',
|
|
||||||
);
|
|
||||||
expect(evolutionChainData?.chain.evolves_to[0].species.url).toBe(
|
|
||||||
'https://pokeapi.co/api/v2/pokemon-species/5/',
|
|
||||||
);
|
|
||||||
expect(
|
|
||||||
evolutionChainData?.chain.evolves_to[0].evolves_to[0].species.url,
|
|
||||||
).toBe('https://pokeapi.co/api/v2/pokemon-species/6/');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('test helper functions', () => {
|
|
||||||
test('getIdFromUrl works correctly for PokemonSpecies', () => {
|
|
||||||
const url = 'https://pokeapi.co/api/v2/pokemon-species/6/';
|
|
||||||
const id = getIdFromUrl(url);
|
|
||||||
expect(id).toBe(6);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('getIdFromUrl works correctly for evolution-chain', () => {
|
|
||||||
const url = 'https://pokeapi.co/api/v2/evolution-chain/2/';
|
|
||||||
const id = getIdFromUrl(url);
|
|
||||||
expect(id).toBe(2);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
import { fetchBaseQuery, createApi } from '@reduxjs/toolkit/query/react';
|
|
||||||
import {
|
|
||||||
RegionListResponseData,
|
|
||||||
TypeListResponseData,
|
|
||||||
PokemonResponseData,
|
|
||||||
EvolutionChainResponseData,
|
|
||||||
PokemonSpeciesResponseData,
|
|
||||||
} from 'types/api';
|
|
||||||
|
|
||||||
export const getIdFromUrl = (url: string) => {
|
|
||||||
const urlParts = url.split('/');
|
|
||||||
return parseInt(urlParts[urlParts.length - 2]);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const pokeRestApi = createApi({
|
|
||||||
reducerPath: 'pokeRestApi',
|
|
||||||
baseQuery: fetchBaseQuery({ baseUrl: 'https://pokeapi.co/api/v2/' }),
|
|
||||||
endpoints: builder => ({
|
|
||||||
getTypeList: builder.query<TypeListResponseData, void>({
|
|
||||||
query: () => ({ url: 'type' }),
|
|
||||||
transformResponse: (response: RegionListResponseData) => {
|
|
||||||
return {
|
|
||||||
...response,
|
|
||||||
results: [{ name: 'All Types', url: '' }, ...response.results],
|
|
||||||
};
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
getPokemon: builder.query<PokemonResponseData, string | number>({
|
|
||||||
query: IdOrName => ({ url: `pokemon/${IdOrName}` }),
|
|
||||||
}),
|
|
||||||
getPokemonSpecies: builder.query<PokemonSpeciesResponseData, number>({
|
|
||||||
query: Id => ({ url: `pokemon-species/${Id}` }),
|
|
||||||
}),
|
|
||||||
getPokemonSpeciesFromUrl: builder.query<PokemonSpeciesResponseData, string>(
|
|
||||||
{
|
|
||||||
query: url => ({ url: `pokemon-species/${getIdFromUrl(url)}` }),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
getEvolutionChain: builder.query<EvolutionChainResponseData, number>({
|
|
||||||
query: Id => ({ url: `evolution-chain/${Id}` }),
|
|
||||||
}),
|
|
||||||
getEvolutionChainFromUrl: builder.query<EvolutionChainResponseData, string>(
|
|
||||||
{
|
|
||||||
query: url => ({ url: `evolution-chain/${getIdFromUrl(url)}` }),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const {
|
|
||||||
useGetTypeListQuery,
|
|
||||||
useGetPokemonQuery,
|
|
||||||
useGetPokemonSpeciesQuery,
|
|
||||||
useGetPokemonSpeciesFromUrlQuery,
|
|
||||||
useGetEvolutionChainQuery,
|
|
||||||
useGetEvolutionChainFromUrlQuery,
|
|
||||||
} = pokeRestApi;
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { configureStore } from '@reduxjs/toolkit';
|
|
||||||
import { pokedexSlice } from 'features/Pokedex/pokedexSlice';
|
|
||||||
import { filterSlice } from 'features/Filters/filterSlice';
|
|
||||||
import { infoDialogSlice } from 'features/InfoDialog/infoDialogSlice';
|
|
||||||
import { pokeRestApi } from './services/pokeRestApi';
|
|
||||||
|
|
||||||
export const store = configureStore({
|
|
||||||
reducer: {
|
|
||||||
// component slices
|
|
||||||
pokedex: pokedexSlice.reducer,
|
|
||||||
filter: filterSlice.reducer,
|
|
||||||
infoDialog: infoDialogSlice.reducer,
|
|
||||||
|
|
||||||
// api slices
|
|
||||||
[pokeRestApi.reducerPath]: pokeRestApi.reducer,
|
|
||||||
},
|
|
||||||
middleware: getDefaultMiddleware =>
|
|
||||||
getDefaultMiddleware().concat(pokeRestApi.middleware),
|
|
||||||
devTools: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
export type RootState = ReturnType<typeof store.getState>;
|
|
||||||
export type AppDispatch = typeof store.dispatch;
|
|
||||||
export type AppStore = typeof store;
|
|
||||||
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 318 B |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB |
|
|
@ -1,18 +0,0 @@
|
||||||
export { default as pokeType_bug } from './bug.png';
|
|
||||||
export { default as pokeType_dark } from './dark.png';
|
|
||||||
export { default as pokeType_dragon } from './dragon.png';
|
|
||||||
export { default as pokeType_electric } from './electric.png';
|
|
||||||
export { default as pokeType_fairy } from './fairy.png';
|
|
||||||
export { default as pokeType_fighting } from './fighting.png';
|
|
||||||
export { default as pokeType_fire } from './fire.png';
|
|
||||||
export { default as pokeType_flying } from './flying.png';
|
|
||||||
export { default as pokeType_ghost } from './ghost.png';
|
|
||||||
export { default as pokeType_grass } from './grass.png';
|
|
||||||
export { default as pokeType_ground } from './ground.png';
|
|
||||||
export { default as pokeType_ice } from './ice.png';
|
|
||||||
export { default as pokeType_normal } from './normal.png';
|
|
||||||
export { default as pokeType_poison } from './poison.png';
|
|
||||||
export { default as pokeType_psychic } from './psychic.png';
|
|
||||||
export { default as pokeType_rock } from './rock.png';
|
|
||||||
export { default as pokeType_steel } from './steel.png';
|
|
||||||
export { default as pokeType_water } from './water.png';
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.0 KiB |
|
|
@ -1,20 +0,0 @@
|
||||||
import React, { useState, useEffect } from 'react';
|
|
||||||
|
|
||||||
type DelayedProps = {
|
|
||||||
waitBeforeShow: number;
|
|
||||||
children: React.ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const Delayed = ({ waitBeforeShow, children }: DelayedProps) => {
|
|
||||||
const [isShown, setIsShown] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setTimeout(() => {
|
|
||||||
setIsShown(true);
|
|
||||||
}, waitBeforeShow);
|
|
||||||
}, [waitBeforeShow]);
|
|
||||||
|
|
||||||
return <>{isShown ? children : null}</>;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Delayed;
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
.evolution__sub__box {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.evolution__box .evo_img {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
margin: auto;
|
|
||||||
display: flex;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* .evolution__img__div:hover {
|
|
||||||
transform: scale(1.05);
|
|
||||||
} */
|
|
||||||
|
|
||||||
.evolution__img__div {
|
|
||||||
height: 113px;
|
|
||||||
width: 113px;
|
|
||||||
display: flex;
|
|
||||||
border-radius: 50%;
|
|
||||||
box-shadow: 0 5px 15px 4px rgb(0 0 0 / 30%);
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
transition: all 0.35s;
|
|
||||||
margin-top: 3vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
.evolution__poke__name {
|
|
||||||
text-transform: capitalize;
|
|
||||||
margin: 10px 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
import { Provider } from 'react-redux';
|
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
|
||||||
|
|
||||||
import EvolutionSpecies from './EvolutionSpecies';
|
|
||||||
import {
|
|
||||||
MockedState,
|
|
||||||
MockStoreProps,
|
|
||||||
mockStore,
|
|
||||||
} from 'features/InfoDialog/infoDialogSlice.storybook';
|
|
||||||
|
|
||||||
const Mockstore: React.FC<MockStoreProps> = ({ InfoDialogState, children }) => (
|
|
||||||
<Provider store={mockStore({ InfoDialogState })}>{children}</Provider>
|
|
||||||
);
|
|
||||||
|
|
||||||
const meta: Meta<typeof EvolutionSpecies> = {
|
|
||||||
title: 'Component/EvolutionSpecies',
|
|
||||||
component: EvolutionSpecies,
|
|
||||||
decorators: [
|
|
||||||
(story: () => React.ReactNode) => (
|
|
||||||
<div style={{ padding: '3rem' }}>{story()}</div>
|
|
||||||
),
|
|
||||||
],
|
|
||||||
tags: ['autodocs'],
|
|
||||||
excludeStories: /.*MockedState$/,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default meta;
|
|
||||||
type Story = StoryObj<typeof EvolutionSpecies>;
|
|
||||||
|
|
||||||
export const Bulbasaur: Story = {
|
|
||||||
decorators: [
|
|
||||||
(story: () => React.ReactNode) => (
|
|
||||||
<Mockstore InfoDialogState={MockedState.infoDialog}>{story()}</Mockstore>
|
|
||||||
),
|
|
||||||
],
|
|
||||||
args: {
|
|
||||||
types: ['grass', 'poison'],
|
|
||||||
image_url:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/1.svg',
|
|
||||||
name: 'Bulbasaur',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Magneton: Story = {
|
|
||||||
decorators: [
|
|
||||||
(story: () => React.ReactNode) => (
|
|
||||||
<Mockstore InfoDialogState={MockedState.infoDialog}>{story()}</Mockstore>
|
|
||||||
),
|
|
||||||
],
|
|
||||||
args: {
|
|
||||||
types: ['electric', 'steel'],
|
|
||||||
image_url:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/82.svg',
|
|
||||||
name: 'Magneton',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
import { motion } from 'framer-motion';
|
|
||||||
|
|
||||||
import './EvolutionSpecies.css';
|
|
||||||
import { LazyLoadImage } from 'react-lazy-load-image-component';
|
|
||||||
import { colorTypeGradients } from 'components/utils';
|
|
||||||
import { useAppDispatch } from 'app/hooks';
|
|
||||||
import { fetchSelectedPokemonInfo } from 'features/InfoDialog/infoDialogSlice';
|
|
||||||
|
|
||||||
export type EvolutionSpeciesProps = {
|
|
||||||
types: string[];
|
|
||||||
name: string;
|
|
||||||
image_url: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
const EvolutionSpecies = ({
|
|
||||||
types,
|
|
||||||
name,
|
|
||||||
image_url,
|
|
||||||
}: EvolutionSpeciesProps) => {
|
|
||||||
const dispatch = useAppDispatch();
|
|
||||||
|
|
||||||
const finalColor = colorTypeGradients(types);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className={'evolution__sub__box'}>
|
|
||||||
<div>
|
|
||||||
<motion.div
|
|
||||||
animate={{ rotate: 360 }}
|
|
||||||
transition={{
|
|
||||||
duration: 2,
|
|
||||||
ease: 'easeOut',
|
|
||||||
type: 'spring',
|
|
||||||
bounce: 0.65,
|
|
||||||
damping: 25,
|
|
||||||
}}
|
|
||||||
whileHover={{ scale: 1.05 }}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="evolution__img__div"
|
|
||||||
style={{
|
|
||||||
background: `linear-gradient(${finalColor[0]}, ${finalColor[1]})`,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div className={'transparency__div'}>
|
|
||||||
<LazyLoadImage
|
|
||||||
alt={'image-pokemon'}
|
|
||||||
height={80}
|
|
||||||
width={80}
|
|
||||||
src={image_url}
|
|
||||||
visibleByDefault={false}
|
|
||||||
delayMethod={'debounce'}
|
|
||||||
effect={'blur'}
|
|
||||||
className={'evo_img'}
|
|
||||||
onClick={() => dispatch(fetchSelectedPokemonInfo(name))}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</motion.div>
|
|
||||||
<div className={'evolution__poke__name'}>{name}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default EvolutionSpecies;
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
export { default } from './EvolutionSpecies';
|
|
||||||
export * from './EvolutionSpecies';
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
.fa-mars {
|
|
||||||
color: #7070ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fa-venus {
|
|
||||||
color: rgb(224, 61, 88);
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
|
||||||
|
|
||||||
import GenderRate from './GenderRate';
|
|
||||||
|
|
||||||
const meta: Meta<typeof GenderRate> = {
|
|
||||||
title: 'Component/GenderRate',
|
|
||||||
component: GenderRate,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default meta;
|
|
||||||
type Story = StoryObj<typeof GenderRate>;
|
|
||||||
|
|
||||||
export const Option1: Story = {
|
|
||||||
args: {
|
|
||||||
genderRatio: 1,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Option2: Story = {
|
|
||||||
args: {
|
|
||||||
genderRatio: 2,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@ -1,122 +0,0 @@
|
||||||
import './GenderRate.css';
|
|
||||||
|
|
||||||
export interface GenderRateProps {
|
|
||||||
genderRatio: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
const GenderRate = ({ genderRatio }: GenderRateProps) => {
|
|
||||||
switch (genderRatio) {
|
|
||||||
case 0:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span className="gender-male">
|
|
||||||
100% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
0% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 1:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
87.5% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
12.5% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 2:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
75% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
25% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 3:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
62.5% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
37.5% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 4:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
50% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
50% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 5:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
37.5% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
62.5% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 6:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
25% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
75% <i className="fa fa-venus">♀</i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 7:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
12.5% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
87.5% <i className="fa fa-venus"></i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
case 8:
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
0% <i className="fa fa-mars">♂</i>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
{' '}
|
|
||||||
100% <i className="fa fa-venus"></i>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
default:
|
|
||||||
return <span>Loading...</span>;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default GenderRate;
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
export { default } from './GenderRate';
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
.poke__logos {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__logo {
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 15vw;
|
|
||||||
-webkit-filter: drop-shadow(5px 0px 0px rgba(0, 0, 0, 0.6));
|
|
||||||
filter: drop-shadow(5px 0px 0px rgba(0, 0, 0, 0.6));
|
|
||||||
}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
|
|
||||||
import logo from 'assets/images/pokedex.png';
|
|
||||||
import './Header.css';
|
|
||||||
|
|
||||||
const Header = () => {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<div className="app__header">
|
|
||||||
<div className="poke__logo noselect">
|
|
||||||
<img src={logo} alt="Poke Logo" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Header;
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
export { default } from './Header';
|
|
||||||
|
|
@ -1,325 +0,0 @@
|
||||||
html {
|
|
||||||
--pokename: #000;
|
|
||||||
--cardborder: #fff;
|
|
||||||
--pokenumber: hsl(228, 28%, 20%);
|
|
||||||
--info: #fff;
|
|
||||||
--bggradient: url('assets/images/bg.png');
|
|
||||||
--bgcolor: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
html[data-theme='dark'] {
|
|
||||||
--pokename: hsl(228, 28%, 20%);
|
|
||||||
--cardborder: hsl(228, 28%, 20%);
|
|
||||||
--pokenumber: hsl(228, 28%, 20%);
|
|
||||||
--info: hsl(228, 28%, 20%);
|
|
||||||
--bggradient: none;
|
|
||||||
--bgcolor: #16171f;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Teko';
|
|
||||||
src: url('assets/fonts/Teko-Regular.ttf');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'VT323';
|
|
||||||
src: url('assets/fonts/VT323-Regular.ttf');
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container {
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
width: 100%;
|
|
||||||
margin-left: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__img {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: space-evenly;
|
|
||||||
align-items: center;
|
|
||||||
border-radius: 1rem;
|
|
||||||
background: #ffffff78;
|
|
||||||
padding: 20px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__img img {
|
|
||||||
width: 120px;
|
|
||||||
height: 147px;
|
|
||||||
padding: 1rem 1rem;
|
|
||||||
margin: 0.3rem;
|
|
||||||
border-radius: 1.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pokemon__name {
|
|
||||||
font-size: 22px;
|
|
||||||
text-transform: capitalize;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pokemon__id {
|
|
||||||
color: var(--pokenumber);
|
|
||||||
font-family: 'Teko', sans-serif;
|
|
||||||
font-weight: 400;
|
|
||||||
font-size: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__header {
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__type {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__type img {
|
|
||||||
height: 20px;
|
|
||||||
width: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__headings {
|
|
||||||
font-family: 'VT323', monospace;
|
|
||||||
font-size: 27px;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__abilities {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: flex-start;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__data {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
grid-gap: 0px 15px;
|
|
||||||
gap: 0px 15px;
|
|
||||||
align-items: center;
|
|
||||||
margin: 0px 0;
|
|
||||||
justify-content: space-between;
|
|
||||||
background-color: #ffffff40;
|
|
||||||
padding: 10px;
|
|
||||||
border-radius: 1rem;
|
|
||||||
margin-top: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__stat__columns {
|
|
||||||
width: 135px;
|
|
||||||
margin-right: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiDialog-paperFullWidth {
|
|
||||||
width: 63%;
|
|
||||||
border-radius: 1rem;
|
|
||||||
box-shadow: 0 10px 20px rgba(175, 136, 136, 0.29),
|
|
||||||
0 6px 6px rgba(0, 0, 0, 0.43);
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiDialog-container {
|
|
||||||
background-color: var(--bgcolor);
|
|
||||||
background-image: var(--bggradient);
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiBackdrop-root {
|
|
||||||
background-color: rgba(0, 0, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__data__dimensions {
|
|
||||||
display: flex;
|
|
||||||
gap: 0 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__container__stat__columns__name {
|
|
||||||
text-transform: uppercase;
|
|
||||||
color: crimson;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog__bg {
|
|
||||||
background-image: url('assets/images/bg.png');
|
|
||||||
background-repeat: repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog__content {
|
|
||||||
font-family: 'VT323', monospace;
|
|
||||||
font-size: 21px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pokemon__name {
|
|
||||||
font-family: 'Press Start 2P', cursive;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close__btn {
|
|
||||||
width: 30px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ability {
|
|
||||||
text-transform: capitalize;
|
|
||||||
}
|
|
||||||
|
|
||||||
.right__box {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
height: -webkit-fill-available;
|
|
||||||
justify-content: space-evenly;
|
|
||||||
gap: 3px 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.noselect {
|
|
||||||
-webkit-touch-callout: none;
|
|
||||||
-webkit-user-select: none;
|
|
||||||
-khtml-user-select: none;
|
|
||||||
-moz-user-select: none;
|
|
||||||
-ms-user-select: none;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.evolution__box {
|
|
||||||
display: flex;
|
|
||||||
gap: 0 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow__right {
|
|
||||||
font-size: 1.75rem;
|
|
||||||
margin: 0 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiDialogContent-root:first-child {
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ability__list {
|
|
||||||
display: flex;
|
|
||||||
gap: 0 30px;
|
|
||||||
padding-inline-start: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ability__list__bg {
|
|
||||||
background-color: #ffffff40;
|
|
||||||
padding: 5px;
|
|
||||||
border-radius: 1rem;
|
|
||||||
margin-top: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiTooltip-tooltip {
|
|
||||||
font-size: 15px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.separator {
|
|
||||||
border: 0;
|
|
||||||
border-radius: 20px;
|
|
||||||
height: 80;
|
|
||||||
background-image: linear-gradient(
|
|
||||||
to bottom,
|
|
||||||
rgb(77, 77, 77),
|
|
||||||
rgb(77, 77, 77)
|
|
||||||
);
|
|
||||||
width: 1%;
|
|
||||||
margin-left: 2vw;
|
|
||||||
margin-right: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.transparency__div {
|
|
||||||
background: #ffffff40;
|
|
||||||
height: 113px;
|
|
||||||
width: 113px;
|
|
||||||
border-radius: 50%;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.desc {
|
|
||||||
background-color: #ffffff40;
|
|
||||||
padding: 10px;
|
|
||||||
border-radius: 1rem;
|
|
||||||
margin-top: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fa-mars {
|
|
||||||
color: #7070ff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fa-venus {
|
|
||||||
color: rgb(224, 61, 88);
|
|
||||||
}
|
|
||||||
|
|
||||||
.dimensions {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pokemon__genera {
|
|
||||||
padding: 3px 10px;
|
|
||||||
border-radius: 10px;
|
|
||||||
margin-top: 1.5vh;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* phone */
|
|
||||||
|
|
||||||
@media screen and (max-width: 767px) {
|
|
||||||
.MuiDialog-paperFullWidth {
|
|
||||||
width: 75%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
.info__container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
.info__container__img {
|
|
||||||
margin-left: 0px;
|
|
||||||
}
|
|
||||||
.info__container__data {
|
|
||||||
margin-left: 0px;
|
|
||||||
}
|
|
||||||
.right__box {
|
|
||||||
margin-top: 20px;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
.info__container__data__data {
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
.info__container__stat__columns__name,
|
|
||||||
.info__container__stat__columns__val,
|
|
||||||
.stats,
|
|
||||||
.dimensions,
|
|
||||||
.ability {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
.info__container__data__abilities {
|
|
||||||
margin-top: 20px;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0px;
|
|
||||||
}
|
|
||||||
.right__box .desc {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
.info__container__headings {
|
|
||||||
text-align: center;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
.evolution__box {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
.evolution__sub__box {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
.arrow__right {
|
|
||||||
transform: rotate(90deg);
|
|
||||||
}
|
|
||||||
.evolution__poke__name {
|
|
||||||
margin: 12px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
import { Provider } from 'react-redux';
|
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
|
||||||
|
|
||||||
import InfoDialogComponent from './InfoDialogComponent';
|
|
||||||
import {
|
|
||||||
MockedState,
|
|
||||||
MockStoreProps,
|
|
||||||
mockStore,
|
|
||||||
} from 'features/InfoDialog/infoDialogSlice.storybook';
|
|
||||||
|
|
||||||
const Mockstore: React.FC<MockStoreProps> = ({ InfoDialogState, children }) => (
|
|
||||||
<Provider store={mockStore({ InfoDialogState })}>{children}</Provider>
|
|
||||||
);
|
|
||||||
|
|
||||||
const meta: Meta<typeof InfoDialogComponent> = {
|
|
||||||
title: 'Component/InfoDialogComponent',
|
|
||||||
component: InfoDialogComponent,
|
|
||||||
decorators: [
|
|
||||||
(story: () => React.ReactNode) => (
|
|
||||||
<div style={{ padding: '3rem' }}>{story()}</div>
|
|
||||||
),
|
|
||||||
],
|
|
||||||
tags: ['autodocs'],
|
|
||||||
excludeStories: /.*MockedState$/,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default meta;
|
|
||||||
type Story = StoryObj<typeof InfoDialogComponent>;
|
|
||||||
|
|
||||||
export const Duduo: Story = {
|
|
||||||
decorators: [
|
|
||||||
(story: () => React.ReactNode) => (
|
|
||||||
<Mockstore InfoDialogState={MockedState.infoDialog}>{story()}</Mockstore>
|
|
||||||
),
|
|
||||||
],
|
|
||||||
args: {
|
|
||||||
openDialog: true,
|
|
||||||
id: 84,
|
|
||||||
name: 'Doduo',
|
|
||||||
genera: 'Twin Bird Pokémon',
|
|
||||||
image:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/84.svg',
|
|
||||||
types: ['normal', 'flying'],
|
|
||||||
height: 14,
|
|
||||||
weight: 392,
|
|
||||||
genderRatio: 4,
|
|
||||||
description:
|
|
||||||
'A bird that makes up for its poor flying with its fast foot speed. Leaves giant footprints.',
|
|
||||||
abilities: ['run-away', 'early-bird', 'tangled-feet'],
|
|
||||||
stats: [
|
|
||||||
{ stat__name: 'hp', stat__value: 35 },
|
|
||||||
{ stat__name: 'attack', stat__value: 85 },
|
|
||||||
{ stat__name: 'defense', stat__value: 45 },
|
|
||||||
{ stat__name: 'special-attack', stat__value: 35 },
|
|
||||||
{ stat__name: 'special-defense', stat__value: 35 },
|
|
||||||
{ stat__name: 'speed', stat__value: 75 },
|
|
||||||
],
|
|
||||||
evolutionChain: [
|
|
||||||
{
|
|
||||||
types: ['normal', 'flying'],
|
|
||||||
image_url:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/84.svg',
|
|
||||||
name: 'Doduo',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Dodrio',
|
|
||||||
types: ['normal', 'flying'],
|
|
||||||
image_url:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/85.svg',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@ -1,191 +0,0 @@
|
||||||
import { Dialog, DialogContent, Tooltip, Zoom } from '@mui/material';
|
|
||||||
import ArrowRightAltIcon from '@mui/icons-material/ArrowRightAlt';
|
|
||||||
|
|
||||||
import './InfoDialogComponent.css';
|
|
||||||
|
|
||||||
import { findPokeTypeAsset } from 'components/PokemonTypes';
|
|
||||||
import { colorTypeGradients } from 'components/utils';
|
|
||||||
import GenderRate from 'components/GenderRate';
|
|
||||||
import Delayed from 'components/Delayed';
|
|
||||||
import EvolutionSpecies from 'components/EvolutionSpecies';
|
|
||||||
import { InfoDialogDetails } from 'features/InfoDialog/infoDialogSlice';
|
|
||||||
|
|
||||||
export interface Stat {
|
|
||||||
stat__name: string;
|
|
||||||
stat__value: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type InfoDialogComponentProps = InfoDialogDetails & {
|
|
||||||
openDialog: boolean;
|
|
||||||
closeDialog: () => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
const InfoDialog = ({
|
|
||||||
openDialog,
|
|
||||||
closeDialog,
|
|
||||||
id,
|
|
||||||
name,
|
|
||||||
types,
|
|
||||||
genera,
|
|
||||||
image,
|
|
||||||
height,
|
|
||||||
weight,
|
|
||||||
genderRatio,
|
|
||||||
description,
|
|
||||||
abilities,
|
|
||||||
stats,
|
|
||||||
evolutionChain,
|
|
||||||
}: InfoDialogComponentProps) => {
|
|
||||||
const finalColor = colorTypeGradients(types);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<Dialog
|
|
||||||
aria-labelledby="customized-dialog-title"
|
|
||||||
open={openDialog}
|
|
||||||
onClose={closeDialog}
|
|
||||||
fullWidth
|
|
||||||
maxWidth="md"
|
|
||||||
className="dialog__bg noselect"
|
|
||||||
>
|
|
||||||
<DialogContent
|
|
||||||
style={{
|
|
||||||
background: `linear-gradient(${finalColor[0]}, ${finalColor[1]})`,
|
|
||||||
}}
|
|
||||||
className="dialog__content"
|
|
||||||
>
|
|
||||||
<div className="info__container">
|
|
||||||
<div className="info__container__img">
|
|
||||||
<div className="pokemon__id">#{String(id).padStart(3, '0')}</div>
|
|
||||||
<div className="pokemon__name">{name}</div>
|
|
||||||
<div
|
|
||||||
className="pokemon__genera"
|
|
||||||
style={{ background: finalColor[0] }}
|
|
||||||
>
|
|
||||||
{genera}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<img src={image} alt="poke-img" />
|
|
||||||
</div>
|
|
||||||
<div className="info__container__data__type">
|
|
||||||
{types.map(type => (
|
|
||||||
<Tooltip
|
|
||||||
title={type}
|
|
||||||
key={type}
|
|
||||||
TransitionComponent={Zoom}
|
|
||||||
arrow
|
|
||||||
>
|
|
||||||
<div className={`poke__type__bg ${type}`}>
|
|
||||||
<img src={findPokeTypeAsset(type)} alt="poke-type" />
|
|
||||||
</div>
|
|
||||||
</Tooltip>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className="dimensions">
|
|
||||||
<p>
|
|
||||||
<span
|
|
||||||
className="info__container__headings"
|
|
||||||
style={{ fontSize: '20px' }}
|
|
||||||
>
|
|
||||||
Height
|
|
||||||
</span>
|
|
||||||
{`${height / 10} m/${`${Math.floor(
|
|
||||||
(height / 10) * 3.28,
|
|
||||||
)}'${Math.round((((height / 10) * 3.28) % 1) * 12)}"`} `}
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<span
|
|
||||||
className="info__container__headings"
|
|
||||||
style={{ fontSize: '20px' }}
|
|
||||||
>
|
|
||||||
Weight
|
|
||||||
</span>
|
|
||||||
{` ${(weight / 10).toFixed(1)} kg/${(weight * 0.2205).toFixed(
|
|
||||||
1,
|
|
||||||
)} lbs`}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="gender__container">
|
|
||||||
{genderRatio === -1 ? (
|
|
||||||
'Genderless'
|
|
||||||
) : (
|
|
||||||
<GenderRate genderRatio={genderRatio} />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="info__container__data">
|
|
||||||
<div className={'right__box'}>
|
|
||||||
<div>
|
|
||||||
<div className={'info__container__headings'}>About</div>
|
|
||||||
<div className={'desc'}>{description}</div>
|
|
||||||
</div>
|
|
||||||
<div className={'info__container__data__header'}>
|
|
||||||
<div className={'info__container__data__abilities'}>
|
|
||||||
<div className={'info__container__headings'}>Abilities</div>
|
|
||||||
<div className={'ability__list__bg'}>
|
|
||||||
<ul className={'ability__list'}>
|
|
||||||
{abilities.map(ability => (
|
|
||||||
<li key={ability}>
|
|
||||||
<div className={'ability'}>{ability} </div>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div className={'info__container__headings stats'}>
|
|
||||||
Base Stats
|
|
||||||
</div>
|
|
||||||
<div className={'info__container__data__data'}>
|
|
||||||
{stats.map(stat => (
|
|
||||||
<div
|
|
||||||
key={stat['stat__name']}
|
|
||||||
className="info__container__stat__columns"
|
|
||||||
>
|
|
||||||
<div className="info__container__stat__columns__name">
|
|
||||||
{stat.stat__name}
|
|
||||||
</div>
|
|
||||||
<div className="info__container__stat__columns__val">
|
|
||||||
{stat.stat__value}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div className={'info__container__headings'}>Evolution</div>
|
|
||||||
<div className={'evolution__box'}>
|
|
||||||
{evolutionChain.map(evo => (
|
|
||||||
<Delayed
|
|
||||||
waitBeforeShow={evolutionChain.indexOf(evo) * 500}
|
|
||||||
key={evo.name}
|
|
||||||
>
|
|
||||||
<EvolutionSpecies
|
|
||||||
types={evo.types}
|
|
||||||
image_url={evo.image_url}
|
|
||||||
name={evo.name}
|
|
||||||
/>
|
|
||||||
{evolutionChain.indexOf(evo) + 1 &&
|
|
||||||
evolutionChain.indexOf(evo) <
|
|
||||||
evolutionChain.length - 1 && (
|
|
||||||
<div className={'evolution__sub__box'}>
|
|
||||||
<ArrowRightAltIcon
|
|
||||||
className={'arrow__right'}
|
|
||||||
></ArrowRightAltIcon>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Delayed>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default InfoDialog;
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
export { default } from './InfoDialogComponent';
|
|
||||||
export * from './InfoDialogComponent';
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
@font-face {
|
|
||||||
font-family: 'Press Start 2P';
|
|
||||||
src: url('assets/fonts/PressStart2P-Regular.ttf') format('truetype');
|
|
||||||
}
|
|
||||||
|
|
||||||
.app__container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
min-height: 100vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
.app__container .loading__text {
|
|
||||||
font-family: 'Press Start 2P', cursive;
|
|
||||||
color: var(--colorPrimary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.app__container .loading__text {
|
|
||||||
font-family: 'Press Start 2P', cursive;
|
|
||||||
color: var(--colorPrimary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.loading__gif {
|
|
||||||
width: 15%;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 767px) {
|
|
||||||
.loading__gif {
|
|
||||||
width: 35%;
|
|
||||||
}
|
|
||||||
.poke__logo {
|
|
||||||
width: 35vw;
|
|
||||||
}
|
|
||||||
.filter__container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
width: 100vw;
|
|
||||||
align-items: center;
|
|
||||||
margin: 7vh 0 5vh 0;
|
|
||||||
gap: 2vh 2vw;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
select,
|
|
||||||
.filter__items > input {
|
|
||||||
width: 40vw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
|
|
||||||
import './Loading.css';
|
|
||||||
|
|
||||||
const Loading = () => {
|
|
||||||
return (
|
|
||||||
<div className="loading">
|
|
||||||
<div className="loading__container">
|
|
||||||
<div className="loading__text">Loading...</div>
|
|
||||||
<div className="gif_container">
|
|
||||||
<img
|
|
||||||
src="http://i.gifer.com/VgI.gif"
|
|
||||||
alt="loading gif"
|
|
||||||
className="loading__gif noselect"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Loading;
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
export { default } from './Loading';
|
|
||||||
|
|
@ -1,251 +0,0 @@
|
||||||
:root {
|
|
||||||
--grass: #5fbd58;
|
|
||||||
--bug: #92bc2c;
|
|
||||||
--dark: #595761;
|
|
||||||
--dragon: #0c69c8;
|
|
||||||
--electric: #f2d94e;
|
|
||||||
--fairy: #ee90e6;
|
|
||||||
--fighting: #d3425f;
|
|
||||||
--fire: #dc872f;
|
|
||||||
--flying: #a1bbec;
|
|
||||||
--ghost: #5f6dbc;
|
|
||||||
--ground: #da7c4d;
|
|
||||||
--ice: #75d0c1;
|
|
||||||
--normal: #a0a29f;
|
|
||||||
--poison: #b763cf;
|
|
||||||
--psychic: #ff2ca8;
|
|
||||||
--rock: #a38c21;
|
|
||||||
--steel: #5695a3;
|
|
||||||
--water: #539ddf;
|
|
||||||
}
|
|
||||||
|
|
||||||
html {
|
|
||||||
--pokename: #000;
|
|
||||||
--cardborder: #fff;
|
|
||||||
--pokenumber: hsl(228, 28%, 20%);
|
|
||||||
--info: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Press Start 2P';
|
|
||||||
src: url('assets/fonts/PressStart2P-Regular.ttf') format('truetype');
|
|
||||||
}
|
|
||||||
|
|
||||||
.thumbnail__container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding: 1.5rem 0;
|
|
||||||
margin: 2rem;
|
|
||||||
/* border: 15px solid var(--cardborder); */
|
|
||||||
border-radius: 1rem;
|
|
||||||
width: 220px;
|
|
||||||
height: 285px;
|
|
||||||
text-align: center;
|
|
||||||
/* box-shadow: 0 5px 25px 1px rgb(0 0 0 / 50%); */
|
|
||||||
box-shadow: 0 1.6px 1.6px rgba(0, 0, 0, 0.023),
|
|
||||||
0 3.8px 3.8px rgba(0, 0, 0, 0.034), 0 6.9px 6.9px rgba(0, 0, 0, 0.041),
|
|
||||||
0 11.4px 11.4px rgba(0, 0, 0, 0.049), 0 18.8px 18.8px rgba(0, 0, 0, 0.056),
|
|
||||||
0 32.8px 32.8px rgba(0, 0, 0, 0.067), 0 71px 71px rgba(0, 0, 0, 0.09);
|
|
||||||
transition: all 0.2s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.thumbnail__container:hover {
|
|
||||||
transform: scale(1.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__icon {
|
|
||||||
margin-right: 15px;
|
|
||||||
margin-top: -4px;
|
|
||||||
font-size: 25px;
|
|
||||||
color: var(--info);
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.info__icon:hover {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-family: 'Press Start 2P', cursive;
|
|
||||||
margin-bottom: 0.2rem;
|
|
||||||
color: var(--pokename);
|
|
||||||
}
|
|
||||||
|
|
||||||
.thumbnail__container .poke__number {
|
|
||||||
border-radius: 1rem;
|
|
||||||
padding: 0.2rem 0.4rem;
|
|
||||||
font-weight: 400;
|
|
||||||
font-size: 35px;
|
|
||||||
font-family: 'Teko', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.thumbnail__container img {
|
|
||||||
width: 120px;
|
|
||||||
height: 120px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.thumbnail__container small {
|
|
||||||
text-transform: capitalize;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card__header {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__type {
|
|
||||||
display: flex;
|
|
||||||
grid-gap: 0 10px;
|
|
||||||
gap: 0 20px;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
margin-top: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__type__bg > img {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__type__bg {
|
|
||||||
width: 40px;
|
|
||||||
height: 40px;
|
|
||||||
border-radius: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-content: center;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.grass {
|
|
||||||
background: var(--grass);
|
|
||||||
box-shadow: 0 0 20px var(--grass);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bug {
|
|
||||||
background: var(--bug);
|
|
||||||
box-shadow: 0 0 20px var(--bug);
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark {
|
|
||||||
background: var(--dark);
|
|
||||||
box-shadow: 0 0 20px var(--dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
.dragon {
|
|
||||||
background: var(--dragon);
|
|
||||||
box-shadow: 0 0 20px var(--dragon);
|
|
||||||
}
|
|
||||||
|
|
||||||
.electric {
|
|
||||||
background: var(--electric);
|
|
||||||
box-shadow: 0 0 20px #796d26;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fairy {
|
|
||||||
background: var(--fairy);
|
|
||||||
box-shadow: 0 0 20px var(--fairy);
|
|
||||||
}
|
|
||||||
|
|
||||||
.fighting {
|
|
||||||
background: var(--fighting);
|
|
||||||
box-shadow: 0 0 20px var(--fighting);
|
|
||||||
}
|
|
||||||
|
|
||||||
.flying {
|
|
||||||
background: var(--flying);
|
|
||||||
box-shadow: 0 0 20px var(--flying);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ghost {
|
|
||||||
background: var(--ghost);
|
|
||||||
box-shadow: 0 0 20px var(--ghost);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ground {
|
|
||||||
background: var(--ground);
|
|
||||||
box-shadow: 0 0 20px var(--ground);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ice {
|
|
||||||
background: var(--ice);
|
|
||||||
box-shadow: 0 0 20px var(--ice);
|
|
||||||
}
|
|
||||||
|
|
||||||
.normal {
|
|
||||||
background: var(--normal);
|
|
||||||
box-shadow: 0 0 20px var(--normal);
|
|
||||||
}
|
|
||||||
|
|
||||||
.poison {
|
|
||||||
background: var(--poison);
|
|
||||||
box-shadow: 0 0 20px var(--poison);
|
|
||||||
}
|
|
||||||
|
|
||||||
.psychic {
|
|
||||||
background: var(--psychic);
|
|
||||||
box-shadow: 0 0 20px var(--psychic);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rock {
|
|
||||||
background: var(--rock);
|
|
||||||
box-shadow: 0 0 20px var(--rock);
|
|
||||||
}
|
|
||||||
|
|
||||||
.steel {
|
|
||||||
background: var(--steel);
|
|
||||||
box-shadow: 0 0 20px var(--steel);
|
|
||||||
}
|
|
||||||
|
|
||||||
.water {
|
|
||||||
background: var(--water);
|
|
||||||
box-shadow: 0 0 20px var(--water);
|
|
||||||
}
|
|
||||||
|
|
||||||
.fire {
|
|
||||||
background: var(--fire);
|
|
||||||
box-shadow: 0 0 20px var(--fire);
|
|
||||||
}
|
|
||||||
|
|
||||||
.image__container {
|
|
||||||
height: 150px;
|
|
||||||
width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__name h3 {
|
|
||||||
margin-top: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.MuiTooltip-tooltip {
|
|
||||||
font-size: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 767px) {
|
|
||||||
.thumbnail__container .img__thumbnail {
|
|
||||||
width: 90px;
|
|
||||||
height: 90px;
|
|
||||||
}
|
|
||||||
.thumbnail__container {
|
|
||||||
min-width: 175px;
|
|
||||||
height: 225px;
|
|
||||||
margin: 1.25rem 0.75rem;
|
|
||||||
padding: 1.25rem 0;
|
|
||||||
}
|
|
||||||
.image__container {
|
|
||||||
height: 90px;
|
|
||||||
width: 90px;
|
|
||||||
}
|
|
||||||
.thumbnail__container .poke__number {
|
|
||||||
font-size: 1.75em;
|
|
||||||
}
|
|
||||||
.poke__name h3 {
|
|
||||||
margin-top: 20px;
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
.poke__type {
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
|
||||||
|
|
||||||
import PokemonCard from './PokemonCard';
|
|
||||||
|
|
||||||
import charizard_svg from './assets/stories/charizard.svg';
|
|
||||||
import charizard_info from './assets/stories/charizard.json';
|
|
||||||
|
|
||||||
const meta: Meta<typeof PokemonCard> = {
|
|
||||||
title: 'Component/PokemonCard',
|
|
||||||
component: PokemonCard,
|
|
||||||
};
|
|
||||||
export default meta;
|
|
||||||
type Story = StoryObj<typeof PokemonCard>;
|
|
||||||
|
|
||||||
export const Charizard: Story = {
|
|
||||||
args: {
|
|
||||||
id: 6,
|
|
||||||
name: charizard_info.name,
|
|
||||||
image: charizard_svg,
|
|
||||||
types: ['fire', 'flying'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Bulbasaur: Story = {
|
|
||||||
args: {
|
|
||||||
id: 1,
|
|
||||||
name: 'bulbasaur',
|
|
||||||
image:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/1.svg',
|
|
||||||
types: ['grass', 'poison'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Pikachu: Story = {
|
|
||||||
args: {
|
|
||||||
id: 25,
|
|
||||||
name: 'pikachu',
|
|
||||||
image:
|
|
||||||
'https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/dream-world/25.svg',
|
|
||||||
types: ['electric'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
import { formatNumber } from './PokemonCard';
|
|
||||||
|
|
||||||
describe('Test Functions', () => {
|
|
||||||
describe('formatNumber', () => {
|
|
||||||
it('should format single digit integer correctly', () => {
|
|
||||||
expect(formatNumber(6)).toBe('#006');
|
|
||||||
});
|
|
||||||
it('should format double digit integer correctly', () => {
|
|
||||||
expect(formatNumber(16)).toBe('#016');
|
|
||||||
});
|
|
||||||
it('should format triple digit integer correctly', () => {
|
|
||||||
expect(formatNumber(116)).toBe('#116');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
import { LazyLoadImage } from 'react-lazy-load-image-component';
|
|
||||||
import 'react-lazy-load-image-component/src/effects/blur.css';
|
|
||||||
|
|
||||||
import './PokemonCard.css';
|
|
||||||
import { colorTypeGradients } from 'components/utils';
|
|
||||||
import PokemonTypes from 'components/PokemonTypes/PokemonTypes';
|
|
||||||
|
|
||||||
export interface PokemonCardProps {
|
|
||||||
id: number;
|
|
||||||
name: string;
|
|
||||||
image: string;
|
|
||||||
types: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
type PokemonCardPropsActionable = PokemonCardProps & {
|
|
||||||
onClickAction: () => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
export function formatNumber(num: number) {
|
|
||||||
return '#' + num.toString().padStart(3, '0');
|
|
||||||
}
|
|
||||||
|
|
||||||
const PokemonCard = ({
|
|
||||||
id,
|
|
||||||
name,
|
|
||||||
image,
|
|
||||||
types,
|
|
||||||
onClickAction,
|
|
||||||
}: PokemonCardPropsActionable) => {
|
|
||||||
const finalColor = colorTypeGradients(types);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className="thumbnail__container noselect"
|
|
||||||
style={{
|
|
||||||
background: `linear-gradient(${finalColor[0]}, ${finalColor[1]})`,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div className="card__header">
|
|
||||||
<div className="poke__number">{formatNumber(id)}</div>
|
|
||||||
<div className="info__icon">
|
|
||||||
<svg
|
|
||||||
stroke="currentColor"
|
|
||||||
fill="currentColor"
|
|
||||||
strokeWidth="0"
|
|
||||||
viewBox="0 0 512 512"
|
|
||||||
height="1em"
|
|
||||||
width="1em"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
onClick={onClickAction}
|
|
||||||
>
|
|
||||||
<path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"></path>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="image__container">
|
|
||||||
<LazyLoadImage
|
|
||||||
alt={name}
|
|
||||||
height={150}
|
|
||||||
src={image}
|
|
||||||
visibleByDefault={false}
|
|
||||||
delayMethod={'debounce'}
|
|
||||||
effect="blur"
|
|
||||||
className="img_thumbnail"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="poke__name">
|
|
||||||
<h3>{name}</h3>
|
|
||||||
<div className="poke__type">
|
|
||||||
<PokemonTypes types={types} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PokemonCard;
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 56 KiB |
|
|
@ -1,2 +0,0 @@
|
||||||
export * from './PokemonCard';
|
|
||||||
export { default } from './PokemonCard';
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
.poke__type {
|
|
||||||
display: flex;
|
|
||||||
grid-gap: 0 10px;
|
|
||||||
gap: 0 20px;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
margin-top: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__type__bg > img {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.poke__type__bg {
|
|
||||||
width: 40px;
|
|
||||||
height: 40px;
|
|
||||||
border-radius: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-content: center;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
|
||||||
|
|
||||||
import PokemonTypes from './PokemonTypes';
|
|
||||||
|
|
||||||
const meta: Meta<typeof PokemonTypes> = {
|
|
||||||
title: 'Component/PokemonTypes',
|
|
||||||
component: PokemonTypes,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default meta;
|
|
||||||
type Story = StoryObj<typeof PokemonTypes>;
|
|
||||||
|
|
||||||
export const fireOnly: Story = {
|
|
||||||
name: 'Fire only',
|
|
||||||
args: {
|
|
||||||
types: ['fire'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const grassAndPoinson: Story = {
|
|
||||||
name: 'Grass and Poison',
|
|
||||||
args: {
|
|
||||||
types: ['grass', 'poison'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const fireAndFlying: Story = {
|
|
||||||
name: 'Fire and Flying',
|
|
||||||
args: {
|
|
||||||
types: ['fire', 'flying'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const threeTypes: Story = {
|
|
||||||
name: 'Fire, Flying and Grass',
|
|
||||||
args: {
|
|
||||||
types: ['fire', 'flying', 'grass'],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
|
|
||||||
import { Tooltip, Zoom } from '@mui/material';
|
|
||||||
|
|
||||||
import * as pokeTypeAsset from 'assets/types';
|
|
||||||
import './PokemonTypes.css';
|
|
||||||
|
|
||||||
export const findPokeTypeAsset = (pokeType: string) => {
|
|
||||||
switch (pokeType) {
|
|
||||||
case 'normal':
|
|
||||||
return pokeTypeAsset.pokeType_normal;
|
|
||||||
case 'fire':
|
|
||||||
return pokeTypeAsset.pokeType_fire;
|
|
||||||
case 'water':
|
|
||||||
return pokeTypeAsset.pokeType_water;
|
|
||||||
case 'electric':
|
|
||||||
return pokeTypeAsset.pokeType_electric;
|
|
||||||
case 'grass':
|
|
||||||
return pokeTypeAsset.pokeType_grass;
|
|
||||||
case 'ice':
|
|
||||||
return pokeTypeAsset.pokeType_ice;
|
|
||||||
case 'fighting':
|
|
||||||
return pokeTypeAsset.pokeType_fighting;
|
|
||||||
case 'poison':
|
|
||||||
return pokeTypeAsset.pokeType_poison;
|
|
||||||
case 'ground':
|
|
||||||
return pokeTypeAsset.pokeType_ground;
|
|
||||||
case 'flying':
|
|
||||||
return pokeTypeAsset.pokeType_flying;
|
|
||||||
case 'psychic':
|
|
||||||
return pokeTypeAsset.pokeType_psychic;
|
|
||||||
case 'bug':
|
|
||||||
return pokeTypeAsset.pokeType_bug;
|
|
||||||
case 'rock':
|
|
||||||
return pokeTypeAsset.pokeType_rock;
|
|
||||||
case 'ghost':
|
|
||||||
return pokeTypeAsset.pokeType_ghost;
|
|
||||||
case 'dragon':
|
|
||||||
return pokeTypeAsset.pokeType_dragon;
|
|
||||||
case 'dark':
|
|
||||||
return pokeTypeAsset.pokeType_dark;
|
|
||||||
case 'steel':
|
|
||||||
return pokeTypeAsset.pokeType_steel;
|
|
||||||
case 'fairy':
|
|
||||||
return pokeTypeAsset.pokeType_fairy;
|
|
||||||
default:
|
|
||||||
return pokeTypeAsset.pokeType_normal;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export interface PokemonTypesProps {
|
|
||||||
types: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
const PokemonTypes = ({ types }: PokemonTypesProps) => {
|
|
||||||
return (
|
|
||||||
// css is set in consumer
|
|
||||||
<>
|
|
||||||
{types.map(type => (
|
|
||||||
<Tooltip title={type} key={type} TransitionComponent={Zoom} arrow>
|
|
||||||
<div className={`poke__type__bg ${type}`}>
|
|
||||||
<img src={findPokeTypeAsset(type)} alt={type} />
|
|
||||||
</div>
|
|
||||||
</Tooltip>
|
|
||||||
))}
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PokemonTypes;
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
export * from './PokemonTypes';
|
|
||||||
export { default } from './PokemonTypes';
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import { colorTypeGradients } from './utils';
|
|
||||||
|
|
||||||
describe('Test utility functions', () => {
|
|
||||||
it('should return correct color for each type', () => {
|
|
||||||
expect(colorTypeGradients(['grass'])).toBe(['#a8ff98', '#a8ff98']);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
const getColor = (type: string): string => {
|
|
||||||
let returnColor: string;
|
|
||||||
switch (type) {
|
|
||||||
case 'grass':
|
|
||||||
returnColor = '#a8ff98';
|
|
||||||
break;
|
|
||||||
case 'poison':
|
|
||||||
returnColor = '#d6a2e4';
|
|
||||||
break;
|
|
||||||
case 'normal':
|
|
||||||
returnColor = '#dcdcdc';
|
|
||||||
break;
|
|
||||||
case 'fire':
|
|
||||||
returnColor = '#ffb971';
|
|
||||||
break;
|
|
||||||
case 'water':
|
|
||||||
returnColor = '#8cc4e2';
|
|
||||||
break;
|
|
||||||
case 'electric':
|
|
||||||
returnColor = '#ffe662';
|
|
||||||
break;
|
|
||||||
case 'ice':
|
|
||||||
returnColor = '#8cf5e4';
|
|
||||||
break;
|
|
||||||
case 'fighting':
|
|
||||||
returnColor = '#da7589';
|
|
||||||
break;
|
|
||||||
case 'ground':
|
|
||||||
returnColor = '#e69a74';
|
|
||||||
break;
|
|
||||||
case 'flying':
|
|
||||||
returnColor = '#bbc9e4';
|
|
||||||
break;
|
|
||||||
case 'psychic':
|
|
||||||
returnColor = '#ffa5da';
|
|
||||||
break;
|
|
||||||
case 'bug':
|
|
||||||
returnColor = '#bae05f';
|
|
||||||
break;
|
|
||||||
case 'rock':
|
|
||||||
returnColor = '#C9BB8A';
|
|
||||||
break;
|
|
||||||
case 'ghost':
|
|
||||||
returnColor = '#8291e0';
|
|
||||||
break;
|
|
||||||
case 'dark':
|
|
||||||
returnColor = '#8e8c94';
|
|
||||||
break;
|
|
||||||
case 'dragon':
|
|
||||||
returnColor = '#88a2e8';
|
|
||||||
break;
|
|
||||||
case 'steel':
|
|
||||||
returnColor = '#9fb8b9';
|
|
||||||
break;
|
|
||||||
case 'fairy':
|
|
||||||
returnColor = '#fdb9e9';
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
returnColor = 'gainsboro';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return returnColor;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const colorTypeGradients = (types: string[]): string[] => {
|
|
||||||
const color1: string = getColor(types[0]);
|
|
||||||
let color2: string = color1;
|
|
||||||
|
|
||||||
if (types.length === 2) {
|
|
||||||
color2 = getColor(types[1]);
|
|
||||||
} else if (types.length === 1) {
|
|
||||||
color2 = color1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [color1, color2];
|
|
||||||
};
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
html {
|
|
||||||
--toggle: hsl(230deg 17% 85%);
|
|
||||||
--bgcolor: none;
|
|
||||||
--colorPrimary: #000;
|
|
||||||
--filterHeading: #000;
|
|
||||||
--selectBg: #fff;
|
|
||||||
--selectText: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'barcadebrawl';
|
|
||||||
src: url('assets/fonts/BarcadeBrawl.ttf');
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter__container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
margin: 7vh 0 5vh 0;
|
|
||||||
gap: 0 2vw;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter__items {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
font-family: 'barcadebrawl';
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: Fix incorrect render of input */
|
|
||||||
.filter__items > input {
|
|
||||||
width: 10vw;
|
|
||||||
margin-top: 5px;
|
|
||||||
background-color: var(--selectBg);
|
|
||||||
color: var(--selectText);
|
|
||||||
border: 1px solid var(--selectText);
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter__items > div,
|
|
||||||
label {
|
|
||||||
color: var(--filterHeading);
|
|
||||||
}
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
import {
|
|
||||||
useGetRegionOptions,
|
|
||||||
createRegionPokemonListOptionElements,
|
|
||||||
} from './Filters';
|
|
||||||
|
|
||||||
describe('Filters', () => {
|
|
||||||
describe('test utility functions', () => {
|
|
||||||
test('createOptionElements works correctly', () => {
|
|
||||||
const { data } = useGetRegionOptions();
|
|
||||||
const optionElements = createRegionPokemonListOptionElements(data);
|
|
||||||
expect(optionElements[0].props.children).toBe('Kanto (1-151)');
|
|
||||||
expect(optionElements[1].props.children).toBe('Johto (152-251)');
|
|
||||||
expect(optionElements[2].props.children).toBe('Hoenn (252-386)');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,115 +0,0 @@
|
||||||
import React, { useEffect } from 'react';
|
|
||||||
import { useAppDispatch, useAppSelector } from 'app/hooks';
|
|
||||||
|
|
||||||
import {
|
|
||||||
setSelectedRegion,
|
|
||||||
setSelectedType,
|
|
||||||
setSelectedSort,
|
|
||||||
setSearchInput,
|
|
||||||
initializeFilterSlice,
|
|
||||||
} from './filterSlice';
|
|
||||||
import { useGetTypeListQuery } from 'app/services/pokeRestApi';
|
|
||||||
import { RegionPokemonRange } from './types/slice';
|
|
||||||
import './Filters.css';
|
|
||||||
|
|
||||||
export const createRegionPokemonListOptionElements = (
|
|
||||||
data: RegionPokemonRange[],
|
|
||||||
) => {
|
|
||||||
return data.map(({ region, startId, endId }) => {
|
|
||||||
const value = `${region}`;
|
|
||||||
const label = `${
|
|
||||||
region.charAt(0).toUpperCase() + region.slice(1)
|
|
||||||
} (${startId}-${endId})`;
|
|
||||||
return (
|
|
||||||
<option key={region} value={value}>
|
|
||||||
{label}
|
|
||||||
</option>
|
|
||||||
);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const Filters = () => {
|
|
||||||
const dispatch = useAppDispatch();
|
|
||||||
|
|
||||||
const typeOptions = useAppSelector(state => state.filter.typeOptions);
|
|
||||||
const sortOptions = useAppSelector(state => state.filter.sortOptions);
|
|
||||||
const regionOptions = useAppSelector(state => state.filter.regionOptions);
|
|
||||||
const selectedRegion = useAppSelector(state => state.filter.selectedRegion);
|
|
||||||
const selectedType = useAppSelector(state => state.filter.selectedType);
|
|
||||||
const selectedSort = useAppSelector(state => state.filter.selectedSort);
|
|
||||||
const searchInput = useAppSelector(state => state.filter.searchInput);
|
|
||||||
|
|
||||||
const { isLoading: isFetchingTypeOptions } = useGetTypeListQuery();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
dispatch(initializeFilterSlice());
|
|
||||||
}, [dispatch]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<div className="filter__container noselect">
|
|
||||||
<div className="filter__items">
|
|
||||||
<div>
|
|
||||||
<div>REGION</div>
|
|
||||||
<select
|
|
||||||
name="regionSelect"
|
|
||||||
onChange={e => dispatch(setSelectedRegion(e.target.value))}
|
|
||||||
value={selectedRegion}
|
|
||||||
>
|
|
||||||
{createRegionPokemonListOptionElements(regionOptions)}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="filter__items">
|
|
||||||
<div>
|
|
||||||
<div>TYPE</div>
|
|
||||||
<select
|
|
||||||
name="regionSelect"
|
|
||||||
onChange={e => dispatch(setSelectedType(e.target.value))}
|
|
||||||
value={selectedType}
|
|
||||||
>
|
|
||||||
{isFetchingTypeOptions ? (
|
|
||||||
<option>Loading...</option>
|
|
||||||
) : (
|
|
||||||
typeOptions.map(type => (
|
|
||||||
<option key={type} value={type}>
|
|
||||||
{type}
|
|
||||||
</option>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="filter__items">
|
|
||||||
<div>
|
|
||||||
<div>SORT BY</div>
|
|
||||||
<select
|
|
||||||
name="sortSelect"
|
|
||||||
disabled={isFetchingTypeOptions}
|
|
||||||
onChange={e => dispatch(setSelectedSort(e.target.value))}
|
|
||||||
value={selectedSort}
|
|
||||||
>
|
|
||||||
{sortOptions.map(option => (
|
|
||||||
<option key={option.value} value={option.value}>
|
|
||||||
{option.name}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="filter__items">
|
|
||||||
<div>
|
|
||||||
<div>SEARCH</div>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
onChange={e => dispatch(setSearchInput(e.target.value))}
|
|
||||||
value={searchInput}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Filters;
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"count": 20,
|
|
||||||
"next": null,
|
|
||||||
"previous": null,
|
|
||||||
"results": [
|
|
||||||
{ "name": "normal", "url": "https://pokeapi.co/api/v2/type/1/" },
|
|
||||||
{ "name": "fighting", "url": "https://pokeapi.co/api/v2/type/2/" },
|
|
||||||
{ "name": "flying", "url": "https://pokeapi.co/api/v2/type/3/" },
|
|
||||||
{ "name": "poison", "url": "https://pokeapi.co/api/v2/type/4/" },
|
|
||||||
{ "name": "ground", "url": "https://pokeapi.co/api/v2/type/5/" },
|
|
||||||
{ "name": "rock", "url": "https://pokeapi.co/api/v2/type/6/" },
|
|
||||||
{ "name": "bug", "url": "https://pokeapi.co/api/v2/type/7/" },
|
|
||||||
{ "name": "ghost", "url": "https://pokeapi.co/api/v2/type/8/" },
|
|
||||||
{ "name": "steel", "url": "https://pokeapi.co/api/v2/type/9/" },
|
|
||||||
{ "name": "fire", "url": "https://pokeapi.co/api/v2/type/10/" },
|
|
||||||
{ "name": "water", "url": "https://pokeapi.co/api/v2/type/11/" },
|
|
||||||
{ "name": "grass", "url": "https://pokeapi.co/api/v2/type/12/" },
|
|
||||||
{ "name": "electric", "url": "https://pokeapi.co/api/v2/type/13/" },
|
|
||||||
{ "name": "psychic", "url": "https://pokeapi.co/api/v2/type/14/" },
|
|
||||||
{ "name": "ice", "url": "https://pokeapi.co/api/v2/type/15/" },
|
|
||||||
{ "name": "dragon", "url": "https://pokeapi.co/api/v2/type/16/" },
|
|
||||||
{ "name": "dark", "url": "https://pokeapi.co/api/v2/type/17/" },
|
|
||||||
{ "name": "fairy", "url": "https://pokeapi.co/api/v2/type/18/" },
|
|
||||||
{ "name": "unknown", "url": "https://pokeapi.co/api/v2/type/10001/" },
|
|
||||||
{ "name": "shadow", "url": "https://pokeapi.co/api/v2/type/10002/" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,113 +0,0 @@
|
||||||
import {
|
|
||||||
createAsyncThunk,
|
|
||||||
createSlice,
|
|
||||||
PayloadAction,
|
|
||||||
Slice,
|
|
||||||
} from '@reduxjs/toolkit';
|
|
||||||
import { FilterStateProps } from './types/slice';
|
|
||||||
import { RegionPokemonRange } from './types/slice';
|
|
||||||
import { pokeRestApi } from 'app/services/pokeRestApi';
|
|
||||||
import { fetchPokemonsInTheRegion } from 'features/Pokedex/pokedexSlice';
|
|
||||||
|
|
||||||
export const initialState: FilterStateProps = {
|
|
||||||
regionOptions: [],
|
|
||||||
typeOptions: [],
|
|
||||||
sortOptions: [],
|
|
||||||
selectedRegion: '',
|
|
||||||
selectedType: '',
|
|
||||||
selectedSort: '',
|
|
||||||
searchInput: '',
|
|
||||||
};
|
|
||||||
|
|
||||||
export const initializeFilterSlice = createAsyncThunk(
|
|
||||||
'filter/initializeFilterSlice',
|
|
||||||
async (_args, thunkAPI) => {
|
|
||||||
const dispatch = thunkAPI.dispatch;
|
|
||||||
|
|
||||||
const regionOptions = [
|
|
||||||
{ region: 'kanto', startId: 1, endId: 151 },
|
|
||||||
{ region: 'johto', startId: 152, endId: 251 },
|
|
||||||
{ region: 'hoenn', startId: 252, endId: 386 },
|
|
||||||
{ region: 'sinnoh', startId: 387, endId: 493 },
|
|
||||||
{ region: 'unova', startId: 494, endId: 649 },
|
|
||||||
{ region: 'kalos', startId: 650, endId: 721 },
|
|
||||||
{ region: 'alola', startId: 722, endId: 809 },
|
|
||||||
{ region: 'galar', startId: 810, endId: 898 },
|
|
||||||
];
|
|
||||||
|
|
||||||
dispatch(pokeRestApi.endpoints.getTypeList.initiate());
|
|
||||||
|
|
||||||
const sortOptions = [
|
|
||||||
{ name: 'ID', value: 'id' },
|
|
||||||
{ name: 'Name', value: 'name' },
|
|
||||||
];
|
|
||||||
|
|
||||||
return { regionOptions, sortOptions };
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
export const filterSlice: Slice<FilterStateProps> = createSlice({
|
|
||||||
name: 'filter',
|
|
||||||
initialState,
|
|
||||||
reducers: {
|
|
||||||
setSelectedRegion: (state, action: PayloadAction<string>) => {
|
|
||||||
state.selectedRegion = action.payload;
|
|
||||||
fetchPokemonsInTheRegion(state.selectedRegion);
|
|
||||||
},
|
|
||||||
setSelectedType: (state, action: PayloadAction<string>) => {
|
|
||||||
state.selectedType = action.payload;
|
|
||||||
},
|
|
||||||
setSelectedSort: (state, action: PayloadAction<string>) => {
|
|
||||||
state.selectedSort = action.payload;
|
|
||||||
},
|
|
||||||
setRegionOptions: (state, action: PayloadAction<RegionPokemonRange[]>) => {
|
|
||||||
state.regionOptions = action.payload;
|
|
||||||
},
|
|
||||||
setTypeOptions: (state, action: PayloadAction<string[]>) => {
|
|
||||||
state.typeOptions = action.payload;
|
|
||||||
},
|
|
||||||
setSortOptions: (
|
|
||||||
state,
|
|
||||||
action: PayloadAction<{ name: string; value: string }[]>,
|
|
||||||
) => {
|
|
||||||
state.sortOptions = action.payload;
|
|
||||||
},
|
|
||||||
setSearchInput: (state, action: PayloadAction<string>) => {
|
|
||||||
state.searchInput = action.payload;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
extraReducers: builder => {
|
|
||||||
builder.addCase(initializeFilterSlice.fulfilled, (state, action) => {
|
|
||||||
if (action.payload) {
|
|
||||||
state.regionOptions = action.payload.regionOptions;
|
|
||||||
state.sortOptions = action.payload.sortOptions;
|
|
||||||
|
|
||||||
state.selectedRegion = action.payload.regionOptions[0].region;
|
|
||||||
state.selectedSort = action.payload.sortOptions[0].value;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
builder.addMatcher(
|
|
||||||
pokeRestApi.endpoints.getTypeList.matchFulfilled,
|
|
||||||
(state, action) => {
|
|
||||||
if (action.payload && action.payload.results.length > 0) {
|
|
||||||
const regionListResults = action.payload.results;
|
|
||||||
state.typeOptions = regionListResults.map(region => region.name);
|
|
||||||
|
|
||||||
state.selectedType = action.payload.results[0].name;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export const {
|
|
||||||
setSelectedRegion,
|
|
||||||
setSelectedType,
|
|
||||||
setSelectedSort,
|
|
||||||
setRegionOptions,
|
|
||||||
setTypeOptions,
|
|
||||||
setSortOptions,
|
|
||||||
setSearchInput,
|
|
||||||
} = filterSlice.actions;
|
|
||||||
|
|
||||||
export default filterSlice.reducer;
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
export { default } from './Filters';
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
export type FilterStateProps = {
|
|
||||||
regionOptions: RegionPokemonRange[];
|
|
||||||
typeOptions: string[];
|
|
||||||
sortOptions: { name: string; value: string }[];
|
|
||||||
selectedRegion: string;
|
|
||||||
selectedType: string;
|
|
||||||
selectedSort: string;
|
|
||||||
searchInput: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type RegionPokemonRange = {
|
|
||||||
region: string;
|
|
||||||
startId: number;
|
|
||||||
endId: number;
|
|
||||||
};
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
import { useAppDispatch, useAppSelector } from 'app/hooks';
|
|
||||||
|
|
||||||
import InfoDialogComponent from 'components/InfoDialogComponent';
|
|
||||||
import { setCloseDialog } from './infoDialogSlice';
|
|
||||||
|
|
||||||
const InfoDialog = () => {
|
|
||||||
const dispatch = useAppDispatch();
|
|
||||||
|
|
||||||
const isOpen = useAppSelector(state => state.infoDialog.isOpen);
|
|
||||||
const selectedInfoDialogDetails = useAppSelector(
|
|
||||||
state => state.infoDialog.InfoDialogDetails,
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<InfoDialogComponent
|
|
||||||
openDialog={isOpen}
|
|
||||||
closeDialog={() => dispatch(setCloseDialog(null))}
|
|
||||||
id={selectedInfoDialogDetails.id}
|
|
||||||
name={selectedInfoDialogDetails.name}
|
|
||||||
types={selectedInfoDialogDetails.types}
|
|
||||||
genera={selectedInfoDialogDetails.genera}
|
|
||||||
image={selectedInfoDialogDetails.image}
|
|
||||||
height={selectedInfoDialogDetails.height}
|
|
||||||
weight={selectedInfoDialogDetails.weight}
|
|
||||||
genderRatio={selectedInfoDialogDetails.genderRatio}
|
|
||||||
description={selectedInfoDialogDetails.description}
|
|
||||||
abilities={selectedInfoDialogDetails.abilities}
|
|
||||||
stats={selectedInfoDialogDetails.stats}
|
|
||||||
evolutionChain={selectedInfoDialogDetails.evolutionChain}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default InfoDialog;
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue