diff --git a/components/Dates.js b/components/Dates.js new file mode 100644 index 0000000..56f354d --- /dev/null +++ b/components/Dates.js @@ -0,0 +1,42 @@ +import { convertTime, timeToAMPM } from "../services/converters"; +import { isPM } from "../services/utils"; + +import styles from "./Dates.module.css"; + +const Dates = ({ weatherData, systemUsed }) => { + var weekday = [ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + ]; + + return ( +

+ { + weekday[ + new Date( + convertTime(weatherData.dt, weatherData.timezone).input + ).getUTCDay() + ] + } + ,{" "} + {systemUsed == "metric" + ? parseInt( + convertTime(weatherData.dt, weatherData.timezone)[0].split(":")[0] + ) + : timeToAMPM( + convertTime(weatherData.dt, weatherData.timezone)[0] + ).split(":")[0]} + :00{" "} + {systemUsed == "imperial" + ? isPM(convertTime(weatherData.dt, weatherData.timezone)[0]) + : ""} +

+ ); +}; + +export default Dates; diff --git a/components/Dates.module.css b/components/Dates.module.css new file mode 100644 index 0000000..9c1be68 --- /dev/null +++ b/components/Dates.module.css @@ -0,0 +1,3 @@ +.title { + text-align: left; +} diff --git a/pages/index.js b/pages/index.js index 5e9ff89..cff9165 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,14 +1,12 @@ import { useState, useEffect } from "react"; import MainCard from "../components/MainCard"; +import Dates from "../components/Dates"; import Metrics from "../components/Metrics"; import SwitchBox from "../components/SwitchBox"; import LoadingScreen from "../components/LoadingScreen"; import ErrorScreen from "../components/ErrorScreen"; -import { convertTime, timeToAMPM } from "../services/converters"; -import { isPM } from "../services/utils"; - import styles from "../styles/Home.module.css"; const App = () => { @@ -43,16 +41,6 @@ const App = () => { ? setSystemUsed("imperial") : setSystemUsed("metric"); - var weekday = [ - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - ]; - return weatherData && !weatherData.message ? (
{
-

- { - weekday[ - new Date( - convertTime(weatherData.dt, weatherData.timezone).input - ).getUTCDay() - ] - } - ,{" "} - {systemUsed == "metric" - ? parseInt( - convertTime(weatherData.dt, weatherData.timezone)[0].split( - ":" - )[0] - ) - : timeToAMPM( - convertTime(weatherData.dt, weatherData.timezone)[0] - ).split(":")[0]} - :00{" "} - {systemUsed == "imperial" - ? isPM(convertTime(weatherData.dt, weatherData.timezone)[0]) - : ""} -

- +