Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

finished #246

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,26 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
49 changes: 0 additions & 49 deletions README.md

This file was deleted.

44 changes: 44 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "3",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"axios": "^0.21.1",
"md5": "^2.3.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
"react-scripts": "4.0.2",
"redux": "^4.0.5",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"web-vitals": "^1.0.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
43 changes: 43 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
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`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
25 changes: 25 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions public/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
20 changes: 20 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@


import CharList from "./CharList";

function App() {

return (
<div className="container">
<div className="App">
<div className="bat">
<img src="https://i.ibb.co/bmTxYPj/bat.png" alt="bat" />
</div>
<CharList/>
</div>
</div>
);
}


export default (App);
32 changes: 32 additions & 0 deletions src/CharList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React, {useEffect} from "react";
import { connect } from "react-redux";
import { fetchChars } from "./actions";
import Display from "./Display";



const CharList = props => {

useEffect(() => {
props.fetchChars()
}, [])

return (
<div className="char">
<div className="map">
{props.char.map((person) => (

<Display key={person.name}{...person} />

))}
</div>
</div>
)
}

const mapStateToProps = (state) => {

return ({...state})
}

export default connect(mapStateToProps, {fetchChars})(CharList);
27 changes: 27 additions & 0 deletions src/Display.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react'


function Display({ appearance: { gender, race, height }, name, image:{url}, work: { base }, connections }) {
const group = connections["group-affiliation"]

return (
<div className="card">
<h2>{name}</h2>
<div>
<img src={url} alt={name}/>
</div>

<h3>{race} </h3>
<div className="ps">

<p>{gender}</p>

</div>
<p>{group}</p>
<p className='base'>{base}
</p>
</div>
)
}

export default Display
32 changes: 32 additions & 0 deletions src/actions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import axios from "axios"
export const FETCH_CHARS_LOADING = "FETCH_CHARS_LOADING";
export const CHAR_FETCH_SUCCESS = "CHAR_FETCH_SUCCESS";
export const CHAR_FETCH_ERROR = "CHAR_FETCH_ERROR";

const charIds = [309, 70, 522, 165, 370, 720, 263, 298,545,73,60,561];


export const fetchChars =() => {

return async dispatch => {
dispatch({ type: FETCH_CHARS_LOADING });
const allChars = await Promise.all( charIds.map((id) => {
return axios.get(`https://www.superheroapi.com/api.php/428965754828142/${id}`)
.then(res => {
const { appearance, name, image, work, connections } = res.data
return { appearance, name, image, work, connections }
})
}))

dispatch({type: CHAR_FETCH_SUCCESS, payload: allChars})

};
};








Loading