various requested css fixes, footer updated to spec

Signed-off-by: Duncan Ragsdale <[email protected]>
slacgismo · Sep 5, 2024 · d693a61 · d693a61
1 parent 8da786f
commit d693a61
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 48 deletions.
diff --git a/__tests__/app.test.tsx b/__tests__/app.test.tsx
@@ -144,7 +144,7 @@ describe('Footer', () => {
 
     // Filter this array to get the specific links
     const blogLink = allLinks.find((link) => (
-      link.textContent === 'Blog')
+      link.textContent === 'News')
     );
     expect(blogLink).toBeInTheDocument();
   });

diff --git a/src/app/globals.css b/src/app/globals.css
@@ -424,6 +424,8 @@ body {
   img {
     max-width: 100%;
     border-radius: 5px;
+    display: block;
+    margin: 0 auto;
   }
 
   table {

diff --git a/src/app/homepage.tsx b/src/app/homepage.tsx
@@ -35,25 +35,28 @@ export default function Home() {
         <div className="flex flex-col items-center">
         </div>
         <div className='grid grid-cols-2 gap-4 justify-center content-center'>
-          <div className="m-2
+          <div className="
+          m-2
           flex
           flex-column
           shadow tableBorder
           bg-white
           completeFit
-          justify-center">
+          justify-center
+          overflow-scroll
+          ">
             <DemoBoard />
           </div>
           <div className="flex flex-col items-center">
             <div className="text-5xl font-bold">
               <span className="
               sTextColor">
-           PV-
+           PV{' '}
               </span>
            Validation Hub!
             </div>
             <p className="text-lg mt-4 pl-36 items-center">
-            Helping developers to validate their pv science algorithms,
+            Helping developers to validate their PV science algorithms,
             and helping analysts select algorithms for use in their pipelines
             </p>
             <div className="flex flex-row mt-4">

diff --git a/src/app/modules/footer/footer.tsx b/src/app/modules/footer/footer.tsx
@@ -2,10 +2,9 @@
 // *********** START OF IMPORTS ***********
 
 import Link from 'next/link';
-import Image from 'next/image';
 import React from 'react';
 import styles from '@/app/modules/modulecss/footer.module.css';
-import {Grid, Typography} from '@mui/material';
+import {Grid} from '@mui/material';
 import {Box} from '@mui/system';
 
 // *********** MODULE IMPORTS ***********
@@ -39,45 +38,38 @@ export default function Footer() {
                   href="https://www6.slac.stanford.edu/
                   news-and-events/connect-with-us"
                   color="inherit">
-                  Community
+                  SLAC
                 </Link>
               </Grid>
               <Grid item xs={2}>
-                <Link href="https://www6.slac.stanford.edu/about"
+                <Link href="https://gismo.slac.stanford.edu/"
                   color="inherit">
-                  Company
+                  GISMo
                 </Link>
               </Grid>
               <Grid item xs={4}>
                 <Box alignItems="center" justifyContent="center">
-                  <Typography
-                    display="block"
-                    align="center"
-                    variant="h6"
-                    noWrap
-                    sx={{
-                      mr: 2,
-                      fontFamily: 'sans-serif',
-                      fontWeight: 700,
-                      color: 'black',
-                      textDecoration: 'none',
-                    }}
-                  >
-                    PVHub
-                  </Typography>
+                  <Link
+                    href="/"
+                    className="
+                    text-2xl
+                    font-bold
+                    ">
+                    Valhub
+                  </Link>
                 </Box>
               </Grid>
               <Grid item xs={2}>
-                <Link href="https://www6.slac.stanford.edu/
-                news-and-events/news-center"
-                color="inherit">
-                  Blog
+                <Link href="https://gismo.slac.stanford.edu/news-and-events"
+                  color="inherit">
+                  News
                 </Link>
               </Grid>
               <Grid item xs={2}>
-                <Link href="https://www6.slac.stanford.edu/about/resources"
-                  color="inherit">
-                  Resources
+                <Link href="https://www.energy.gov/eere/solar/
+                solar-energy-technologies-office"
+                color="inherit">
+                  SETO
                 </Link>
               </Grid>
             </Grid>
@@ -86,18 +78,11 @@ export default function Footer() {
         </Grid>
         <Grid item xs={12}>
           <Box display="flex" justifyContent="center" alignItems="center">
-            <Image src="/static/next.svg"
-              alt="Next.js Logo" width={32} height={32}
-              className={styles.footerIcon} />
-            <Image src="/static/next.svg"
-              alt="Next.js Logo" width={32} height={32}
-              className={styles.footerIcon} />
-            <Image src="/static/next.svg"
-              alt="Next.js Logo" width={32} height={32}
-              className={styles.footerIcon} />
-            <Image src="/static/next.svg"
-              alt="Next.js Logo" width={32} height={32}
-              className={styles.footerIcon} />
+            <div>
+            This work is supported by the U.S. Department of Energy’s
+            Office of Energy Efficiency and Renewable Energy (EERE) under
+            the Solar Energy Technologies Office Award Number 38529.
+            </div>
           </Box>
         </Grid>
       </Grid>

diff --git a/src/app/modules/homepage/demo.json b/src/app/modules/homepage/demo.json
@@ -23,7 +23,7 @@
         "created_by": "Jane Doe",
         "execution_time": 49.543,
         "status": "completed",
-        "metrics": ["latitude", "longitude"],
+        "metrics": ["time_series", "latitude", "longitude"],
         "error": 22.207
       },
       {
@@ -32,7 +32,7 @@
         "created_by": "Bob",
         "execution_time": 12.345,
         "status": "completed",
-        "metrics": ["data_sampling_frequency"],
+        "metrics": ["time_series", "data_sampling_frequency"],
         "error": 20.207
       },
       {

diff --git a/src/app/modules/homepage/demoTable.tsx b/src/app/modules/homepage/demoTable.tsx
@@ -109,7 +109,7 @@ export default function DemoBoard() {
 
   return (
     <Box sx={{
-      height: '55dvh',
+      height: '40dvh',
       width: '60dvw',
     }} className='content-center justify-center'>
       <Typography
@@ -121,7 +121,7 @@ export default function DemoBoard() {
         columns={columns}
         disableColumnFilter={true}
         rows={Array.isArray(demo) ? demo : []}
-        hideFooterPagination={true}
+        hideFooter={true}
         className="scale-[0.85]"
       />
     </Box>