Fixed loading bar styles

jamie6king · Nov 19, 2024 · 64ce61e · 64ce61e
1 parent 5ea3594
commit 64ce61e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/client/Show.jsx b/client/Show.jsx
@@ -98,7 +98,7 @@ export default function Weather() {
 
                 { (mainLoading) ? (
 
-                    <BarLoader />
+                    <BarLoader color="#ffffff" cssOverride={{ width: "100%" }} />
 
                 ) : (
                     <>
@@ -137,7 +137,7 @@ export default function Weather() {
 
                 { (forecastLoading) ? (
 
-                    <BarLoader />
+                    <BarLoader color="#ffffff" cssOverride={{ width: "100%" }} />
 
                 ) : (
                     <>
@@ -150,10 +150,10 @@ export default function Weather() {
                                 { forecastData.list.map((day) => {
 
                                     const localDate = DateTime.fromSeconds(day.dt)
-                                    const date = DateTime.fromSeconds(day.dt).setZone(localTime.zone);
+                                    const date = localDate.setZone(localTime.zone);
                                     const dateDayOrNight = (date.hour > 6 && date.hour < 20) ? "d" : "n";
-                                    const now = new Date();
-                                    const dateString = (now.month < localDate.month|| now.day < localDate.day) ? localDate.toFormat("HH:mm") : "";
+                                    const now = DateTime.now();
+                                    const dateString = (now.month < localDate.month || now.day < localDate.day) ? localDate.toFormat("dd/MM") : "";
 
                                     return (
                                         <div key={day.dt}>

diff --git a/client/styles/show.module.scss b/client/styles/show.module.scss
@@ -10,11 +10,11 @@
 .weather {
     display: grid;
     grid-template-rows: min-content auto;
-    padding: 16px;
 }
 
 .locationBar {
     position: relative;
+    margin: 16px;
     padding: 16px;
     display: flex;
     align-items: center;
@@ -53,7 +53,8 @@
 }
 
 .mainTemp {
-    margin-top: 16px;
+    margin: 16px;
+    margin-top: 0px;
     display: grid;
     grid-template-rows: 1fr 1fr;
     background-color: #1e1e1e;