diff --git a/components/DateAndTime.js b/components/DateAndTime.js
index 628ea91..5e3c823 100644
--- a/components/DateAndTime.js
+++ b/components/DateAndTime.js
@@ -1,29 +1,12 @@
import { convertTime, timeToAMPM } from "../services/converters";
-import { isPM } from "../services/utils";
+import { getWeekDay, isPM } from "../services/utils";
import styles from "./DateAndTime.module.css";
const DateAndTime = ({ weatherData, systemUsed }) => {
- var weekday = [
- "Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday",
- ];
-
return (
- {
- weekday[
- new Date(
- convertTime(weatherData.dt, weatherData.timezone).input
- ).getUTCDay()
- ]
- }
- ,{" "}
+ {getWeekDay(weatherData)},{" "}
{systemUsed == "metric"
? parseInt(
convertTime(weatherData.dt, weatherData.timezone)[0].split(":")[0]
diff --git a/services/utils.js b/services/utils.js
index 6d28533..f75f45d 100644
--- a/services/utils.js
+++ b/services/utils.js
@@ -1,5 +1,22 @@
import { convertTime, kmToM, mpsToMph, timeToAMPM } from "./converters";
+export const getWeekDay = (weatherData) => {
+ const weekday = [
+ "Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ ];
+ return weekday[
+ new Date(
+ convertTime(weatherData.dt, weatherData.timezone).input
+ ).getUTCDay()
+ ];
+};
+
export const isPM = (time) => {
let hours = time.split(":")[0];
if (hours >= 12) {