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

Final edition #30

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Final edition #30

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
facff3e
Final edition
ManaGh Jun 16, 2023
720304d
edit the start page instead of having NaN!
ManaGh Jun 21, 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
43 changes: 39 additions & 4 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,53 @@
import React, { useState } from "react";
import "./App.scss";
import Header from "./components/Header/Header";
import Footer from "./components/Footer/Footer";
import Icon from './components/Icon/Icon';
import { TodayForecast } from "./components/TodayForecast/TodayForecast";
import HourlyForecast from "./components/HourlyForecast/HourlyForecast";
// import Icon from "./components/Icon/Icon";


//configs
const siteTitle = process.env.REACT_APP_SITE_TITLE ?? "CYF Weather";

function App() {
const [data, setData] = useState([]);

function getNewLocation(city) {
fetch(
`https://api.openweathermap.org/data/2.5/forecast?q=${city}&units=metric&appid=7e5286e19236105eab5bba5240bf165e`
)
.then((response) => response.json())
.then((data) => {
setData(data);
});
ManaGh marked this conversation as resolved.
Show resolved Hide resolved
}

return (

<div className="App">
<Header title={siteTitle} />
<Header title={siteTitle} getNewLocation={getNewLocation} data={data} />

<main className="c-site-main" tabIndex="0">
<Icon name="clear"/>

<section className="todayForecast">
<TodayForecast
weatherId={data?.list?.[0]?.weather?.[0]?.id}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe if the data is missing, you could show a message instead? At the moment, running locally, it's showing blank values / NaN

description={data?.list?.[0]?.weather?.[0]?.description}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could destructure these values, to make it a bit more readable, eg -

const [firstItem] = data.list[0]

temp_min={Math.floor(data?.list?.[0]?.main?.temp_min)}
temp_max={Math.ceil(data?.list?.[0]?.main?.temp_max)}
humidity={data?.list?.[0]?.main?.humidity}
pressure={data?.list?.[0]?.main?.pressure}
/>
</section>
<section className="hourlyForecast">
{data?.list?.splice(0, 7)?.map((future) => (
<HourlyForecast
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every item in a list should be given a key prop (doc)

time={future.dt_txt}
iconId={future.weather[0].id}
temp={future.main.temp.toFixed()}
/>
))}
</section>
</main>
<Footer />
</div>
Expand Down
100 changes: 100 additions & 0 deletions src/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,102 @@
@use "theme/utilities.scss";
@use "theme/global.scss";
// @use "theme/fonts.scss";


.App{
background-color: #8ecae6;
}

.c-site-header{
padding: 20px;
}

.header{
background-color: #219ebc;
padding: 10px;
}

.Location{
background-color: #37b0cf;
margin: 10px;
padding: 10px;
border: none;
border-bottom: 2px solid rgb(8, 8, 78);
}

.button{
background-color: #0d6b9a;
color: white;
margin-left: 15px;
padding: 15px;
border: none;
border-radius: 5px;
}

// ----------TodayForecast section----------
.weather-img{
margin: auto;
width: 200px;
height: 200px;
object-fit: cover;
}

.description{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One way to avoid duplicating these two lines is to declare a utility class eg -

.center-horizontal {
  display: flex;
  justify-content: center;
}

Then use that class on the 3 elements in addition to .description, .temp and .current-container

display: flex;
justify-content: center;
color: white;
}

.temp {
display: flex;
justify-content: center;
margin: 20px;
}

.current-container{
display: flex;
justify-content: center;
}

.humid-press{
padding: 30px;
}


// // -----------HourlyForecast------

// .container{
// background-color: #023047;
// display: flex;
// flex-wrap: nowrap;
// width: 100%;
// padding: 0px 2em 0px 2em;
// justify-content: center;
// }

.hourlyForecast{
display: flex;
// flex-direction: column;
background-color: #023047;
// text-align: center;
line-height: 50px;
padding: 0px 2em 0px 2em;
ManaGh marked this conversation as resolved.
Show resolved Hide resolved
justify-content: center;
flex-wrap: nowrap;
}

.items{
display: flex;
height: auto;
// column-gap: 20px;
// background-color: #023047;
justify-content: center;
align-items: center;
width: auto;
// border: 1px solid #fb8500;
}

.time,.temperature{
display: flex;
color: white;
}
30 changes: 22 additions & 8 deletions src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
import React from "react";
import './Header.scss'
import React, { useState } from "react";
import "./Header.scss";

const Header = ({title}) =>
<header className="c-site-header">
<h1 className="c-site-header__title o-type__invisible">{title}</h1>
{/* look up component */}
</header>
const Header = ({getNewLocation}) => {
const [city, setCity] = useState("");
console.log({ city });
ManaGh marked this conversation as resolved.
Show resolved Hide resolved

return (
<header className="header">
<input
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best to wrap this in a <form /> element so the user can submit by pressing enter while in an input

className="Location"

placeholder="Type in a city name"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For accessibility, inputs should have labels. If the label isn't visible in the design, you can hide it except for screen readers with a .visually-hidden class (ref - https://css-tricks.com/inclusively-hidden/)

value={city}
onChange={(e) => setCity(e.target.value)}
/>
<button className="button" onClick={() => getNewLocation(city)}>
Find Weather
</button>
</header>
);

};

export default Header;
export default Header;
3 changes: 1 addition & 2 deletions src/components/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@use "../../theme/utilities.scss";
@use "../../theme/global.scss";


.c-site-header {
background-color: var(--theme-color--block);
}


17 changes: 17 additions & 0 deletions src/components/HourlyForecast/HourlyForecast.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
import Icon from "../Icon/Icon";

function HourlyForecast({ time, iconId, temp }) {
const formattedTime = time.split(" ")[1].slice(0, 5);

return (
<div className="container">
<div className="items time">{formattedTime}</div>
<div className="items">
<Icon weatherId={iconId} />
</div>
<div className="items temperature">{temp}°C</div>
</div>
);
}
export default HourlyForecast;
87 changes: 65 additions & 22 deletions src/components/Icon/Icon.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import clear from '../../img/weather-icons/clear.svg'
import cloudy from '../../img/weather-icons/cloudy.svg'
// import cloudy from '../../img/weather-icons/cloudy.svg'
import drizzle from '../../img/weather-icons/drizzle.svg'
import fog from '../../img/weather-icons/fog.svg'
import mostlycloudy from '../../img/weather-icons/mostlycloudy.svg'
Expand All @@ -10,28 +10,71 @@ import snow from '../../img/weather-icons/snow.svg'
import storm from '../../img/weather-icons/storm.svg'
import unknown from '../../img/weather-icons/unknown.svg'

function Icon({ name }) {
if (name === 'clear') {
return <img src={clear} alt="clear" />
} else if (name === 'cloudy') {
return <img src={cloudy} alt="cloudy" />
} else if (name === 'drizzle') {
return <img src={drizzle} alt="drizzle" />
} else if (name === 'fog') {
return <img src={fog} alt="fog" />
} else if (name === 'mostlycloudy') {
return <img src={mostlycloudy} alt="mostlycloudy" />
} else if (name === 'partlycloudy') {
return <img src={partlycloudy} alt="partlycloudy" />
} else if (name === 'rain') {
return <img src={rain} alt="rain" />
} else if (name === 'snow') {
return <img src={snow} alt="snow" />
} else if (name === 'storm') {
return <img src={storm} alt="storm" />
} else {
return <img src={unknown} alt="unknown" />
// function Icon({ name }) {
// if (name === 'clear') {
// return <img src={clear} alt="clear" />
// } else if (name === 'cloudy') {
// return <img src={cloudy} alt="cloudy" />
// } else if (name === 'drizzle') {
// return <img src={drizzle} alt="drizzle" />
// } else if (name === 'fog') {
// return <img src={fog} alt="fog" />
// } else if (name === 'mostlycloudy') {
// return <img src={mostlycloudy} alt="mostlycloudy" />
// } else if (name === 'partlycloudy') {
// return <img src={partlycloudy} alt="partlycloudy" />
// } else if (name === 'rain') {
// return <img src={rain} alt="rain" />
// } else if (name === 'snow') {
// return <img src={snow} alt="snow" />
// } else if (name === 'storm') {
// return <img src={storm} alt="storm" />
// } else {
// return <img src={unknown} alt="unknown" />
// }
// }

const images = {
storm: { src: storm, alt: "storm" },
drizzle: { src: drizzle, alt: "drizzle" },
rain: { src: rain, alt: "rain" },
snow: { src: snow, alt: "snow" },
fog: { src: fog, alt: "fog" },
clear: { src: clear, alt: "clear" },
partlyCloudy: { src: partlycloudy, alt: "partly cloudy" },
mostlyCloudy: { src: mostlycloudy, alt: "mostly cloudy" },
unknown: { src: unknown, alt: "unknown" },
};

function selectImage(weatherId) {
if (weatherId < 300) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could alternatively use a switch statement here

return images.storm;
} else if (weatherId < 499) {
return images.drizzle;
} else if (weatherId < 599) {
return images.rain;
} else if (weatherId < 699) {
return images.snow;
} else if (weatherId < 799) {
return images.fog;
} else if (weatherId === 800) {
return images.clear;
} else if (weatherId === 801) {
return images.partlyCloudy;
} else if (weatherId < 805 && weatherId > 801) {
return images.mostlyCloudy;
}
return images.unknown;
}

const Icon = ({ weatherId }) => {
const image = selectImage(weatherId);

return (
<div className="weather-img">
<img src={image.src} alt={image.alt} />
</div>
);
};

export default Icon
28 changes: 28 additions & 0 deletions src/components/TodayForecast/TodayForecast.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from "react";
import Icon from "../Icon/Icon";

export function TodayForecast({
weatherId,
description,
temp_min,
temp_max,
humidity,
pressure,
}) {
console.log(weatherId);
console.log(description);
return (
<div>
<Icon weatherId={weatherId} />
<h2 className="description">{description}</h2>
<h3 className="temp">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't need to be a heading as there's no content under it

Temperature : {temp_min}° to {temp_max}°C
</h3>

<div className="current-container">
<h4 className="humid-press">Humidity : {humidity}%</h4>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These can be divs instead of subheadings

<h4 className="humid-press">Pressure : {pressure}</h4>
</div>
</div>
);
}
8 changes: 8 additions & 0 deletions src/components/TodayForecast/TodayForecast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// div {
// display: flex;
// justify-content: space-between;
// padding: var(--theme-spacing--6);
// }
// li {
// list-style: none;
// }
3 changes: 3 additions & 0 deletions src/theme/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
--theme-color-ink: rgba(255, 255, 255, 1);
--theme-color-highlight: rgba(0, 0, 0, 1);
--theme-color-shade: rgba(0, 0, 0, 1);



}
}
10 changes: 5 additions & 5 deletions src/theme/images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
svg{
height: 100%;
height: auto;
width: auto;
min-width: 1em;
}

img {
width: 100%;
height: 100%;
max-width: 100%;
object-fit: cover;
width: auto;
height: auto;
max-width: auto;
object-fit: fill;
}
Loading