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.

Sign up for GitHub

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

Jump to bottom

Detail page #763

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Detail page #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d6283d
iframe allowFullScreena is a wrong property and changed to allowFullS…
amirreza-ashrafi-dev Apr 12, 2023
16021e7
return statement issue inside renderdetail method from Detail compone…
amirreza-ashrafi-dev Apr 12, 2023
e1aec00
remove console.log
amirreza-ashrafi-dev Apr 12, 2023
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
131 changes: 66 additions & 65 deletions src/components/CountryDetails/Detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,73 +54,74 @@ class Detail extends React.Component {

renderDetail = () => {
const { details } = this.state;
return <>
{!details ? (
<Loader />
) : (
<div className="region-details">
<img
alt={details.region}
src={details.flag}
height="100"
width="200"
/>
<h1>{this.props.match.params.id}</h1>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Population</h3>
<p>{details.population.toLocaleString()}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Capital</h3>
<p>{details.capital}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Call Code</h3>
<p>{details.callingCodes}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Region</h3>
<p>{details.region}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Native</h3>
<p>{details.demonym}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Languages</h3>
<p>
{details.languages
.map((language) => `${language.nativeName}`)
.join(", ")}
</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Currencies</h3>
<p>
{details.currencies
.map((currency) => `${currency.name} (${currency.code})`)
.join(", ")}
</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Time Zone(s)</h3>
<p>{details.timezones.join(", ")}</p>
</div>

!details ? (
<Loader />
) : (
<div className="region-details">
<img
alt={details.region}
src={details.flag}
height="100"
width="200"
/>
<h1>{this.props.match.params.id}</h1>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Population</h3>
<p>{details.population.toLocaleString()}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Capital</h3>
<p>{details.capital}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Call Code</h3>
<p>{details.callingCodes}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Region</h3>
<p>{details.region}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Native</h3>
<p>{details.demonym}</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Languages</h3>
<p>
{details.languages
.map((language) => `${language.nativeName}`)
.join(", ")}
</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Currencies</h3>
<p>
{details.currencies
.map((currency) => `${currency.name} (${currency.code})`)
.join(", ")}
</p>
</div>
<div className="ma3 pa4 br3 grow f4 ph3 pv2 dib shadow-5 ba tc">
<h3>Time Zone(s)</h3>
<p>{details.timezones.join(", ")}</p>
</div>
<CountryMap
countryName={details.name}
lat={details.latlng[0]}
lng={details.latlng[1]}
/>

<CountryMap
countryName={details.name}
lat={details.latlng[0]}
lng={details.latlng[1]}
/>

<Link
className="f6 link dim br-pill ph4 pv2 mb2 dib white bg-purple"
to={`/travel-guide/${details.region.toLowerCase()}`}
>
BACK
</Link>
</div>
);
<Link
className="f6 link dim br-pill ph4 pv2 mb2 dib white bg-purple"
to={`/travel-guide/${details.region.toLowerCase()}`}
>
BACK
</Link>
</div>
)}
</>
};

render() {
Expand Down
18 changes: 8 additions & 10 deletions src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@ const header = () => {
<div data-aos="fade-up" data-aos-duration="7000">
<Link to="/travel-guide">
<div data-aos="fade-up" data-aos-duration="7000">
<Link to="/travel-guide">
<iframe
src="https://giphy.com/embed/yo1whaKkz38ME"
width="150"
height="100"
className="giphy-embed"
allowFullScreena
title="A GIF of planet earth spinning"
></iframe>
</Link>
<iframe
src="https://giphy.com/embed/yo1whaKkz38ME"
width="150"
height="100"
className="giphy-embed"
allowFullScreen
title="A GIF of planet earth spinning"
></iframe>
</div>
</Link>
</div>
Expand Down