#226: move menu to top

openclimatefix · Sep 23, 2022 · aeca398 · aeca398
1 parent 0376ac4
commit aeca398
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,6 +11,7 @@
     "presets": ["next/babel"]
   },
   "rules": {
-    "@next/next/no-img-element": "off"
+    "@next/next/no-img-element": "off",
+    "prettier/prettier": "error"
   }
 }
diff --git a/apps/nowcasting-app/.eslintignore b/apps/nowcasting-app/.eslintignore
@@ -2,3 +2,5 @@
 node_modules/*
 node_modules
 .next/*
+**/data/*
+**/data/**/*
diff --git a/apps/nowcasting-app/components/button-group.tsx b/apps/nowcasting-app/components/button-group.tsx
@@ -25,7 +25,7 @@ const ButtonGroup = ({ rightString }: IButtonGroup) => {
       >
         DELTA
       </button>
-       <div className="absolute left-0 top-0 items-center px-3 py-2 mx-1  ml-px text-lg font-extrabold text-black bg-white">
+      <div className="absolute left-0 top-0 items-center px-3 py-2 mx-1  ml-px text-lg font-extrabold text-black bg-white">
         {rightString}
       </div>
     </span>

diff --git a/apps/nowcasting-app/components/charts/pv-remix-chart.tsx b/apps/nowcasting-app/components/charts/pv-remix-chart.tsx
@@ -88,7 +88,7 @@ const PvRemixChart: FC<{ date?: string }> = () => {
     setSelectedISOTime(time + ":00.000Z");
   };
   return (
-    <div className="flex flex-col flex-1 mb-12">
+    <div className="flex flex-col flex-1 mt-12 mb-1">
       <div className="flex-grow mb-7">
         <ForecastHeader
           pvForecastData={nationalForecastData}

diff --git a/apps/nowcasting-app/components/charts/remix-line.tsx b/apps/nowcasting-app/components/charts/remix-line.tsx
@@ -207,7 +207,7 @@ const RemixLine: React.FC<RemixLineProps> = ({
                               style={{ color: toolTipColors[name] }}
                             >
                               <div className={`flex justify-between`}>
-                                <div className={`font-extrabold`}>{toolTiplabels[name]}:{" "}</div>
+                                <div className={`font-extrabold`}>{toolTiplabels[name]}: </div>
                                 <div className="font-serif font-extrabold text-sm ml-7">
                                   {" "}
                                   {prettyPrintYNumberWithCommas(value as string)}{" "}
@@ -219,7 +219,7 @@ const RemixLine: React.FC<RemixLineProps> = ({
                       <li className={`flex justify-between pt-4 text-sm text-white font-serif`}>
                         <div>
                           {formatISODateStringHumanNumbersOnly(data?.formatedDate + ":00+00:00")}{" "}
-                          </div>
+                        </div>
                         <div>MW</div>
                       </li>
                     </ul>

diff --git a/apps/nowcasting-app/components/side-layout/index.tsx b/apps/nowcasting-app/components/side-layout/index.tsx
@@ -16,8 +16,8 @@ const SideLayout: React.FC<SideLayoutProps> = ({ children, className }) => {
           (className || "")
         }
       >
-        <div className="relative h-full flex flex-col overflow-y-scroll">{children}</div>
         <SideFooter />
+        <div className="relative h-full flex flex-col overflow-y-scroll">{children}</div>
       </div>
       <div className="absolute bottom-16 -right-5 h-10 mb-[3px]">
         <ExpandButton isOpen={isOpen} onClick={() => setIsOpen((o) => !o)} />

diff --git a/apps/nowcasting-app/components/side-layout/side-footer/index.tsx b/apps/nowcasting-app/components/side-layout/side-footer/index.tsx
@@ -31,7 +31,7 @@ const SideFooter: React.FC<SideFooterProps> = ({}) => {
   const [forecastCreationTime] = useGlobalState("forecastCreationTime");
 
   return (
-    <footer className="text-white text-right px-2 bg-black flex absolute bottom-0 w-full p-1 text-sm ">
+    <footer className="text-white text-right px-2 bg-black flex absolute top-0 w-full p-1 text-sm ">
       <div className="p-1 items-center inline-flex">
         <a
           className="flex h-6 w-auto mr-2"

diff --git a/apps/nowcasting-app/components/utils.ts b/apps/nowcasting-app/components/utils.ts
@@ -42,20 +42,19 @@ export const convertISODateStringToLondonTime = (date: string) => {
   return date_london_time_str;
 };
 
-
 export const formatISODateStringHuman = (date: string) => {
   // Change date to nice human readable format.
   // Note that this converts the string to Europe London Time
   // timezone and seconds are removed
 
   const d = new Date(date);
-  
+
   const date_london = d.toLocaleString("en-GB", {
-    weekday: 'long',
-    day: 'numeric',
-    month: 'long',
-    year: 'numeric',
-    timeZone: 'Europe/London'
+    weekday: "long",
+    day: "numeric",
+    month: "long",
+    year: "numeric",
+    timeZone: "Europe/London"
   });
   return `${date_london}`;
 };

diff --git a/apps/nowcasting-app/tailwind.config.js b/apps/nowcasting-app/tailwind.config.js
@@ -1,4 +1,4 @@
-const defaultTheme = require("tailwindcss/defaultTheme")
+const defaultTheme = require("tailwindcss/defaultTheme");
 
 module.exports = {
   content: ["./pages/**/*.{js,ts,jsx,tsx}", "./components/**/*.{js,ts,jsx,tsx}"],
@@ -17,7 +17,7 @@ module.exports = {
       fontFamily: {
         sans: ["Inter", ...defaultTheme.fontFamily.sans],
         mono: ["ui-monospace", ...defaultTheme.fontFamily.mono],
-        serif: ["Source Code Pro", ...defaultTheme.fontFamily.serif],
+        serif: ["Source Code Pro", ...defaultTheme.fontFamily.serif]
       },
       colors: {
         amber: {