Skip to content
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
15 changes: 11 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"axios": "^0.21.1",
"axios": "^0.21.4",
"bootstrap": "^4.6.0",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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>
<title>Rick y Morty React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
16 changes: 15 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
import React from "react";
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";

import Home from "./pages/Home";
import Episode from "./pages/Episode";
import Character from "./pages/Character";
import Location from "./pages/Location";

function App() {
return <Home />;
return (
<Router>
<Switch>
{/* add routes here */}
<Route path="/location/:locationId" component={Location} />
<Route path="/character/:id" component={Character} />
<Route path="/episode/:id" component={Episode} />
<Route exact path="/" component={Home} />
</Switch>
</Router>
);
}

export default App;
12 changes: 7 additions & 5 deletions src/components/CharacterCard/CharacterCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@ import "./CharacterCard.scss";

import * as routes from "../../constants/routes";

function CharacterCard({ id, name, image, species, status, origin, location }) {
function CharacterCard({ id, name, image, species, status, origin }) {
const locationUrlArray = origin.url.split("/");
const locationId = locationUrlArray[locationUrlArray.length - 1];
return (
<div className="col col-12 col-sm-6 col-xl-3 CharacterCard">
<div className="col col-6 col-sm-6 col-xl-3 CharacterCard">
<img className="CharacterCard__img" src={image} alt="" />
<Link to={`${routes.CHARACTER}/${id}`}>
<h3 className="CharacterCard__name h4">{name}</h3>
</Link>
<div className="CharacterCard__meta">
<Link
className="CharacterCard__meta-item"
to={`${routes.LOCATION}/${id}`}
to={`${routes.LOCATION}/${locationId}`}
>
{origin.name}
</Link>
<p className="CharacterCard__meta-item">|</p>
<p className="CharacterCard__meta-item">{status}</p>
<p className="CharacterCard__meta-item">{species} |</p>
<p className="CharacterCard__meta-item"> {status}</p>
</div>
</div>
);
Expand Down
7 changes: 6 additions & 1 deletion src/components/EpisodeCard/EpisodeCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ import * as routes from "../../constants/routes";
function EpisodeCard({ id, name, airDate, episode }) {
return (
<div className="col col-12 col-sm-6 col-xl-4 EpisodeCard">
<Link to={`${routes.EPISODE}/${id}`}>
<Link
to={`${routes.EPISODE}/${id}`}
name={name}
airdate={airDate}
episode={episode}
>
<h3 className="Episode__name h5">{name}</h3>
</Link>
<div className="Episode__meta">
Expand Down
102 changes: 102 additions & 0 deletions src/pages/Character/Character.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/* eslint-disable no-console */

import axios from "axios";
import React, { Component } from "react";

import Layout from "../../components/Layout";
import CharacterCard from "../../components/CharacterCard";
import EpisodeCard from "../../components/EpisodeCard";

class Character extends Component {
constructor(props) {
super(props);

this.state = {
character: null,
episodes: [],
hasLoaded: false,
hasError: false,
errorMessage: null,
};
}

async componentDidMount() {
this.loadCharacter();
}

async loadCharacter() {
console.log(this);
// eslint-disable-next-line react/destructuring-assignment
const id = this.props.match.params.id;
const baseURL = `https://rickandmortyapi.com/api/character/ ${id}`;
try {
const APIcall = await axios.get(baseURL);

const episodeArray = APIcall.data.episode;
const episodes = await axios.all(
episodeArray.map((episodeURL) => axios.get(episodeURL)),
);

this.setState({
character: APIcall.data,
episodes: episodes,
hasLoaded: true,
});
} catch (err) {
this.setState({
hasError: false,
errorMessage: "Character not found!!",
});
}
}

render() {
const {
hasLoaded,
hasError,
errorMessage,
character,
episodes,
} = this.state;

return (
<Layout>
<section className="row">
<div className="col col-12">
{hasLoaded && !hasError ? (
<CharacterCard
key={character.id}
id={character.id}
name={character.name}
image={character.image}
species={character.species}
status={character.status}
origin={character.origin}
location={character.location}
/>
) : (
<h1>{errorMessage}</h1>
)}
</div>
<div className="col col-12">
<hr />
</div>
{episodes.map((episode) => (
<EpisodeCard
key={episode.data.id}
id={episode.data.id}
name={episode.data.name}
airDate={episode.data.air_date}
episode={episode.data.episode}
/>
))}
<div className="col col-12">
<hr />
</div>
</section>
</Layout>
);
}
}

export default Character;
1 change: 1 addition & 0 deletions src/pages/Character/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Character";
103 changes: 84 additions & 19 deletions src/pages/Episode/Episode.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,102 @@
/* eslint-disable no-console */
import axios from "axios";
import React, { Component } from "react";

import Layout from "../../components/Layout";
// import CharacterCard from "../../components/CharacterCard";
import CharacterCard from "../../components/CharacterCard";

class Episode extends Component {
constructor(props) {
super(props);

this.state = {};
// episode: null,
// characters: [],
// hasLoaded: false,
// hasError: false,
// errorMessage: null,
this.state = {
episode: null,
name: "",
airDate: "",
characters: [],
hasLoaded: false,
hasError: false,
errorMessage: null,
};
}

async componentDidMount() {
this.loadEpisode();
}

async loadEpisode() {
console.log(this);
// eslint-disable-next-line react/destructuring-assignment
const id = this.props.match.params.id;
const baseURL = `https://rickandmortyapi.com/api/episode/ ${id}`;
try {
const APIcall = await axios.get(baseURL);
const charArray = APIcall.data.characters;
const chars = await axios.all(
charArray.map((charURL) => axios.get(charURL)),
);

this.setState({
episode: APIcall.data.episode,
characters: chars,
name: APIcall.data.name,
airDate: APIcall.data.air_date,
hasLoaded: true,
});
} catch (err) {
this.setState({
hasError: false,
errorMessage: "Episode not found!!",
});
}
}

render() {
const {
hasLoaded,
hasError,
errorMessage,
characters,
name,
airDate,
episode,
} = this.state;

return (
<Layout>
<section className="row">
<div className="col col-12">
{/* {characters.map((character) => (
<CharacterCard
key={character.id}
id={character.id}
name={character.name}
image={character.image}
species={character.species}
status={character.status}
origin={character.origin}
location={character.location}
/>
))} */}
{hasLoaded && !hasError ? (
<>
<h3 className="Episode__name h5">{name}</h3>
<div className="Episode__meta">
<p className="Episode__meta-item">{airDate}</p>
<p className="Episode__meta-item">|</p>
<p className="Episode__meta-item">{episode}</p>
</div>
</>
) : (
<h1>{errorMessage}</h1>
)}
</div>
<div className="col col-12">
<hr />
</div>

{characters.map((character) => (
<CharacterCard
key={character.data.id}
id={character.data.id}
name={character.data.name}
image={character.data.image}
species={character.data.species}
status={character.data.status}
origin={character.data.origin}
/>
))}

<div className="col col-12">
<hr />
</div>
</section>
</Layout>
Expand Down
Loading