-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ea14dbe
commit 68f98e8
Showing
18 changed files
with
1,326 additions
and
100 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,18 @@ | ||
| <!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. | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <link rel="icon" href="%PUBLIC_URL%/favicon.png" /> | ||
| <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="manifest" href="%PUBLIC_URL%/manifest.json" /> | ||
| <title>Rick & Morty Wiki</title> | ||
| </head> | ||
|
|
||
| You can add webfonts, meta tags, or analytics to this file. | ||
| The build step will place the bundled scripts into the <body> tag. | ||
| <body> | ||
| <div id="root"></div> | ||
| </body> | ||
|
|
||
| To begin the development, run `npm start` or `yarn start`. | ||
| To create a production bundle, use `npm run build` or `yarn build`. | ||
| --> | ||
| </body> | ||
| </html> | ||
| </html> |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,48 @@ | ||
| .App { | ||
| margin: 0 1%; | ||
| width: 97%; | ||
| } | ||
|
|
||
| h1 { | ||
| text-align: center; | ||
| color: whitesmoke; | ||
| } | ||
|
|
||
| .App-logo { | ||
| height: 40vmin; | ||
| pointer-events: none; | ||
| /* .MuiPaper-root.MuiPaper-elevation.MuiPaper-rounded.MuiPaper-elevation1.MuiCard-root.css-1xez8po-MuiPaper-root-MuiCard-root { | ||
| margin: auto; | ||
| } */ | ||
|
|
||
| /* Search */ | ||
|
|
||
| .search { | ||
| text-align: center; | ||
| margin-bottom: 2%; | ||
| color: rgb(255, 255, 255); | ||
| } | ||
|
|
||
| @media (prefers-reduced-motion: no-preference) { | ||
| .App-logo { | ||
| animation: App-logo-spin infinite 20s linear; | ||
| } | ||
| /* Filter */ | ||
|
|
||
| .filter { | ||
| color: whitesmoke; | ||
| } | ||
|
|
||
| .App-header { | ||
| background-color: #282c34; | ||
| min-height: 100vh; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| font-size: calc(10px + 2vmin); | ||
| color: white; | ||
| /* Card */ | ||
|
|
||
| span.MuiBadge-badge { | ||
| font-size: 17px; | ||
| border-radius: 0px; | ||
| } | ||
|
|
||
| .App-link { | ||
| color: #61dafb; | ||
| .MuiTypography-h5 { | ||
| text-align: center; | ||
| } | ||
|
|
||
| /* Pagination */ | ||
|
|
||
| .pagination { | ||
| margin: 4% 0 2% 0; | ||
| } | ||
|
|
||
| @keyframes App-logo-spin { | ||
| from { | ||
| transform: rotate(0deg); | ||
| } | ||
| to { | ||
| transform: rotate(360deg); | ||
| } | ||
| svg.MuiSvgIcon-root { | ||
| color: #8fd746; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import React from "react"; | ||
| import Card from "@mui/material/Card"; | ||
| import Grid from "@mui/material/Unstable_Grid2"; | ||
| import CardContent from "@mui/material/CardContent"; | ||
| import CardMedia from "@mui/material/CardMedia"; | ||
| import Typography from "@mui/material/Typography"; | ||
| import Badge from "@mui/material/Badge"; | ||
| const CardItem = ({ results }) => { | ||
| return ( | ||
| <Grid | ||
| xs={12} | ||
| sm={8} | ||
| md={9} | ||
| container | ||
| rowSpacing={1} | ||
| columnSpacing={{ sm: 1, md: 2 }} | ||
| > | ||
| {results ? ( | ||
| results.map((result) => { | ||
| let { id, name, image, origin, gender, location, species, status } = | ||
| result; | ||
| return ( | ||
| <Grid xs={12} sm={6} md={4} lg={3}> | ||
| <Card sx={{ maxWidth: 300 }} key={id}> | ||
| <div style={{ position: "relative" }}> | ||
| <Badge | ||
| color={ | ||
| status === "Dead" | ||
| ? "error" | ||
| : status === "Alive" | ||
| ? "primary" | ||
| : "warning" | ||
| } | ||
| badgeContent={status} | ||
| style={{ | ||
| position: "absolute", | ||
| top: "10px", | ||
| right: status === "unknown" ? "40px" : "25px", | ||
| }} | ||
| /> | ||
| <CardMedia | ||
| component="img" | ||
| image={image} | ||
| alt={name + " image"} | ||
| /> | ||
| </div> | ||
|
|
||
| <CardContent> | ||
| <Typography gutterBottom variant="h5" component="div"> | ||
| {result.name} | ||
| </Typography> | ||
| <Typography variant="body1" color="text.info"> | ||
| Gender: {gender} <br></br> | ||
| Species: {species} <br></br> | ||
| Origin: {origin.name} <br></br> | ||
| Location: {location.name} | ||
| </Typography> | ||
| </CardContent> | ||
| </Card> | ||
| {/* </Badge> */} | ||
| </Grid> | ||
| ); | ||
| }) | ||
| ) : ( | ||
| <div>No Caharacters Found</div> | ||
| )} | ||
| </Grid> | ||
| ); | ||
| }; | ||
|
|
||
| export default CardItem; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import React from "react"; | ||
|
|
||
| const Filter = () => { | ||
| return <div className="filter">Filter</div>; | ||
| }; | ||
|
|
||
| export default Filter; |
Empty file.
Oops, something went wrong.