Cleanup

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-.env
+.env
+.DS_Store

client/src/App.js

@@ -15,8 +15,10 @@ import AppBar from "./components/SiteAppBar.js";
 
 const theme = createTheme({
   typography: {
+    fontFamily: '"Open Sans", sans-serif',
     button: {
       textTransform: "none",
+      fontSize: "medium",
     },
   },
   palette: {

client/src/components/About.js

@@ -1,5 +1,4 @@
 import { Box, Grid, Paper, Typography, styled } from "@mui/material";
-import graphic from "./images/windmills_grid.jpg";
 
 // visualization. will delete later
 const Item = styled(Paper)(({ theme }) => ({
@@ -74,10 +73,10 @@ export default function About() {
             </Typography>
 
             <Typography variant="h6" color="common.white" sx={{}}>
-              Paper citation: DFAT: A Web-Based Demand Flexibility Assessment
-              Toolkit for Building-to-Grid Integration.{" "}
+              Paper citation: DFAT: A Web-Based Toolkit for Estimating Demand
+              Flexibility in Building-to-Grid Integration.{" "}
               <a
-                href="https://doi.org/10.1016/j.buildenv.2023.110663"
+                href="https://www.softxjournal.com"
                 target="_blank"
                 rel="noopener noreferrer"
                 style={{ color: "#2196f3" }} // Inline styling

client/src/components/Advanced.js

@@ -17,7 +17,7 @@ import axios from "axios";
 import { useState } from "react";
 
 import { useNavigate } from "react-router-dom";
-import { calculations } from "../logic/Advanced_Calculations.js";
+import { calculations } from "../logic/AdvancedCalculations.js";
 import { createVisualizations } from "./calculator-components/Visualizations.js";
 
 // visualization for boxes. will delete later

client/src/components/Basic.js

@@ -13,8 +13,8 @@ import {
 import axios from "axios";
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { createCaseIDs, gtaCalculation } from "../logic/DR_Calculations.js";
-import { abbreviationToFullName } from "../logic/stateAbbreviations.js";
+import { createCaseIDs, gtaCalculation } from "../logic/DRCalculations.js";
+import { abbreviationToFullName } from "../logic/StateAbbreviations.js";
 import { createVisualizations } from "./calculator-components/Visualizations.js";
 
 export default function Basic() {
@@ -343,20 +343,6 @@ export default function Basic() {
           Basic Calculator
         </Typography>
 
-        <Button
-          variant="contained"
-          color="secondary"
-          onClick={loadBasicTemplate}
-          sx={{
-            marginTop: 2,
-            marginBottom: 3,
-            width: "21%",
-            height: "50px",
-          }}
-        >
-          Load Template
-        </Button>
-
         <form>
           <Typography
             variant="h5"

client/src/components/Home.js

@@ -183,10 +183,10 @@ export default function Home() {
             color="white.main"
             sx={{ fontSize: "1.2rem" }}
           >
-            DFAT: A Web-Based Demand Flexibility Assessment Toolkit for
-            Building-to-Grid Integration.{" "}
+            DFAT: A Web-Based Toolkit for Estimating Demand Flexibility in
+            Building-to-Grid Integration{" "}
             <a
-              href="https://doi.org/10.1016/j.buildenv.2023.110663"
+              href="https://www.softxjournal.com/"
               target="_blank"
               rel="noopener noreferrer"
               style={{ color: "#2196f3" }}

client/src/components/SiteAppBar.js

@@ -19,7 +19,7 @@ import {
 } from "@mui/material";
 import { Menu as MenuIcon } from "@mui/icons-material";
 import { useNavigate } from "react-router-dom";
-import { ReactComponent as Logo } from "./images/lbnlgridintegrationgroup.svg";
+import { ReactComponent as Logo } from "./images/5_BL_Horiz_Tile_rgb.svg";
 
 const drawerWidth = 240;
 const navItems = ["Calculator", "FAQ", "About"];
@@ -77,7 +77,7 @@ export default function SiteAppBar(props) {
           </IconButton>
           <Logo
             onClick={() => navigate("/")}
-            style={{ width: 450, height: 150, cursor: "pointer" }}
+            style={{ width: 330, height: 90, cursor: "pointer" }}
           ></Logo>
           <Typography
             variant="h6"

client/src/index.css

@@ -0,0 +1 @@
+@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap");