feat: add play with model to homepage

Author: wu-ciesielska

src/components/button/component.js

@@ -4,10 +4,10 @@ import './style.scss';
 
 const Button = (props) => {
   const {
-    onClick, buttonStyle = 'primary', children,
+    onClick, buttonStyle = 'primary', children, className = '',
   } = props;
 
-  return <button type="button" onClick={onClick} className={`button animated-button button button-${buttonStyle}`}>{children}</button>;
+  return <button type="button" onClick={onClick} className={`button animated-button button button-${buttonStyle} ${className}`}>{children}</button>;
 };
 
 export default Button;

src/screens/home/component.js

@@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import {
-  BlogPost, HeroSection, HistoricalData, HowItWorks, MiniMap, Video,
+  BlogPost, HeroSection, HistoricalData, HowItWorks, MiniMap, PlayWithModel, Video,
 } from './components';
 
 import './style.scss';
@@ -20,12 +20,12 @@ const Home = () => {
   }, [location.search]);
 
   return (
-    <div className="container" id="home-container">
+    <div className="container">
       <HeroSection />
       <div className="home-content">
         <MiniMap />
         <BlogPost />
-        <div className="page-container" style={{ height: '200px' }}>1st section</div>
+        <PlayWithModel />
         <div className="home-content-section">
           <HistoricalData />
           <Video />

src/screens/home/components/index.js

@@ -3,8 +3,9 @@ import HeroSection from './hero-section';
 import HistoricalData from './historical-data';
 import HowItWorks from './how-does-it-work';
 import MiniMap from './mini-map';
+import PlayWithModel from './play-with-model';
 import Video from './video';
 
 export {
-  BlogPost, HeroSection, HistoricalData, HowItWorks, MiniMap, Video,
+  BlogPost, HeroSection, HistoricalData, HowItWorks, MiniMap, PlayWithModel, Video,
 };

src/screens/home/components/mini-map/style.scss

@@ -7,6 +7,7 @@
         width: 100%;
         padding: 0;
         margin-bottom: 24px;
+        box-shadow: none;
 
         #map {
             height: 500px;

src/screens/home/components/play-with-model/component.js

@@ -7,9 +7,9 @@ import {
   SelectionBar,
 } from './components';
 
-import { Loading } from '../../components';
+import { Loading } from '../../../../components';
 
-import { DATA_MODES } from '../../constants';
+import { DATA_MODES } from '../../../../constants';
 
 export const DEFAULT_MODEL_VERSION = 2024;
 
@@ -102,12 +102,12 @@ const PlayWithModel = (props) => {
   }, [county, dataMode, predictions, rangerDistrict, selectedState]);
 
   return (
-    <div>
+    <div className="page-container">
       <Loading visible={isLoading} />
       {fetchErrorText.length > 0 && fetchErrorText.map((t) => <p>{t}</p>)}
       <OverviewText />
       <SelectionBar />
-      <div className="container" id="play-with-model-inputs-container">
+      <div className="play-with-model-inputs-container">
         <PlayWithModelInputs
           modelInputs={modelInputs}
           runModel={runModel}

src/screens/home/components/play-with-model/components/overview-text/component.js

@@ -2,20 +2,20 @@ import React from 'react';
 import ReactTooltip from 'react-tooltip';
 import './style.scss';
 
-import questionIcon from '../../../../assets/icons/help-circle.png';
+import questionIcon from '../../../../../../assets/icons/help-circle.png';
 
 const helpText = `Pick a year, state and<br />
 county/ranger district to<br />
 prepopulate the fields based<br />
 on historical data.`;
 
 const OverviewText = (_props) => (
-  <div className="container" id="overview-text">
-    <h1 id="title">
+  <div className="play-with-model-overview-text">
+    <h1 className="home-content-section-title">
       Play with the Model
     </h1>
     <div>
-      <img id="icon"
+      <img className="play-with-model-icon"
         data-tip={helpText}
         src={questionIcon}
         alt="Help"

src/screens/home/components/play-with-model/components/overview-text/style.scss

@@ -1,19 +1,13 @@
-#overview-text {
-    display: flex;
-    justify-content: center;
-    margin-top: 50px;
-    margin-bottom: 50px;
-}
+.play-with-model {
+    &-overview-text {
+        display: flex;
+        margin-bottom: 20px;
+    }
 
-#title {
-    font-family: 'Inter';
-    font-size: 44px;
-    letter-spacing: 1;
-    margin-right: 21px;
-}
-
-#icon {
-    width: 36px;
-    height: 36px;
-    margin-top: 8px;
-}
+    &-icon {
+        width: 24px;
+        height: 24px;
+        margin-top: 2px;
+        margin-left: 6px;
+    }
+}

src/screens/home/components/play-with-model/components/play-with-model-inputs/component.js

@@ -1,11 +1,12 @@
 import React from 'react';
 
-import './style.scss';
+import trapIcon from '../../../../../../assets/icons/trap.png';
+import cleridsIcon from '../../../../../../assets/icons/clerids.png';
+import endobrevIcon from '../../../../../../assets/icons/endobrev.png';
+import { ChoiceInput } from '../../../../../../components/input-components';
+import { Button } from '../../../../../../components';
 
-import trapIcon from '../../../../assets/icons/trap.png';
-import cleridsIcon from '../../../../assets/icons/clerids.png';
-import endobrevIcon from '../../../../assets/icons/endobrev.png';
-import { ChoiceInput } from '../../../../components/input-components';
+import './style.scss';
 
 const PlayWithModelInputs = (props) => {
   const {
@@ -182,9 +183,9 @@ const PlayWithModelInputs = (props) => {
             firstOptionText="Year"
           />
         </div>
-        <button className="animated-button" id="run-button" type="button" onClick={runModel}>
+        <Button className="run-button" onClick={runModel}>
           Run
-        </button>
+        </Button>
       </div>
     </div>
   );

src/screens/home/components/play-with-model/components/play-with-model-inputs/style.scss

@@ -1,12 +1,6 @@
-#play-with-model-inputs-container {
-    display: flex;
+.play-with-model-inputs-container {
     justify-content: space-between;
-    padding: 36px 47px 39px 61px;
     border-radius: 26px;
-    box-shadow: 0 35px 90px -10px rgba(0, 0, 0, 0.06);
-    background-color: #ffffff;
-    margin-top: 58px;
-    margin-bottom: 100px;
 }
 
 .change-fields-container {
@@ -21,7 +15,7 @@
     margin-bottom: 37px;
 
     .input-description {
-        font-size: 22px;
+        font-size: 18px;
         font-weight: 600;
         line-height: 1.4;
         text-align: left;
@@ -31,8 +25,7 @@
     .required-text {
         color: #ff0000;
         float: right;
-        margin-right: 20px;
-        margin-top: 7px;
+        margin-top: 10px;
     }
 }
 
@@ -128,23 +121,14 @@ span.required-text {
     }
 }
 
-#run-button {
+.run-button {
     width: 129px;
-    padding: 11px 20px;
-    margin-top: 25px;
-    margin-bottom: 10px;
-    border-radius: 6px;
-    background-color: #3c4253;
-    font-size: 20px;
-    font-weight: 500;
-    color: #ffffff;
-    float: right;
 }
 
 .actions-container {
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: flex-end;
 
     .selection-button {
         background-color: #f0f2f8;

src/screens/home/components/play-with-model/components/play-with-model-outputs/component.js

@@ -72,10 +72,10 @@ const PlayWithModelOutputs = (props) => {
   return (
     <div id="predictions-output">
       <div id="vl" />
+      <div id="predictions-generated-title">
+        <p>{predictionTitle()}</p>
+      </div>
       <div className="predictions-generated">
-        <div id="predictions-generated-title">
-          <p>{predictionTitle()}</p>
-        </div>
         {predictionDetails()}
       </div>
     </div>

src/screens/home/components/play-with-model/components/play-with-model-outputs/style.scss

@@ -1,50 +1,56 @@
 #predictions-output {
-    display: flex;
+    width: 100%;
+    margin-top: 30px;
 
     #vl {
-        border-left: 2px dashed #d7dae4;
+        border-top: 2px dashed #d7dae4;
         height: auto;
-        margin-right: 30px;
-        margin-left: 30px;
+        padding-top: 30px;
     }
 
     #predictions-generated-title {
-        font-size: 16px;
+        font-size: 18px;
         font-weight: 600;
         color: #3c4253;
-        text-align: left;
+        text-align: center;
 
         p {
             height: 56px;
         }
     }
 
     .predictions-generated {
-        width: 250px;
-        margin-left: 20px;
-        margin-right: 20px;
+        width: 100%;
+        padding: 0 10px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        gap: 20px;
 
-        #prob-spots, #prob-spots-disabled,
-        #prob-outbreak, #prob-outbreak-disabled {
+        #prob-spots,
+        #prob-spots-disabled,
+        #prob-outbreak,
+        #prob-outbreak-disabled {
             width: 11vw;
-            max-width: 150px;
+            max-width: 300px;
             padding: 14px 48px 14px 49px;
             border-radius: 12px;
         }
 
-        #prob-spots, #prob-spots-disabled {
+        #prob-spots,
+        #prob-spots-disabled {
             box-shadow: 0 18px 50px 0 rgba(255, 193, 72, 0.4);
             background-color: #ffc148;
-            margin-top: 35px;
         }
 
-        #prob-outbreak,  #prob-outbreak-disabled {
+        #prob-outbreak,
+        #prob-outbreak-disabled {
             box-shadow: 0 18px 50px 0 rgba(134, 204, 255, 0.4);
             background-color: #86ccff;
-            margin-top: 50px;
         }
 
-        #prob-outbreak-disabled, #prob-spots-disabled {
+        #prob-outbreak-disabled,
+        #prob-spots-disabled {
             box-shadow: 0 18px 50px 0 rgba(49, 57, 85, 0.04);
             background-color: #c9cdd9;
         }

src/screens/home/components/play-with-model/components/selection-bar/component.js

@@ -1,13 +1,14 @@
 import React from 'react';
 
-import { ChoiceInput } from '../../../../components/input-components';
+import { ChoiceInput } from '../../../../../../components/input-components';
+import { Button } from '../../../../../../components';
 
-import { DATA_MODES } from '../../../../constants';
+import { DATA_MODES } from '../../../../../../constants';
 
 import {
   getStateNameFromAbbreviation,
   getStateAbbreviationFromStateName,
-} from '../../../../utils';
+} from '../../../../../../utils';
 
 import './style.scss';
 
@@ -37,22 +38,20 @@ const SelectionBar = (props) => {
   const countyMode = dataMode === DATA_MODES.COUNTY;
 
   return (
-    <div id="predictionbar" className="container">
-      <div className="predictionbar-year-selection">
-        <p className="predictionbar-year-selection-title">Year</p>
-        <div className="predictionbar-year-selection-options">
+    <div className="play-with-model-bar">
+      <div className="play-with-model-bar-selection">
+        <p className="play-with-model-bar-selection-title">Year</p>
+        <div className="play-with-model-bar-selection-options">
           <ChoiceInput setValue={setPredictionYear} value={year} options={revYears} firstOptionText="Year" />
         </div>
       </div>
-      <div id="vl1" />
-      <div className="predictionbar-year-selection">
-        <p className="predictionbar-year-selection-title">State</p>
-        <div className="predictionbar-year-selection-options">
+      <div className="play-with-model-bar-selection">
+        <p className="play-with-model-bar-selection-title">State</p>
+        <div className="play-with-model-bar-selection-options">
           <ChoiceInput value={selectedStateName} setValue={setStateAbbrev} options={statesMappedToNames} firstOptionText="State" />
         </div>
       </div>
-      <div id="vl1" />
-      <div className="predictionbar-year-selection">
+      <div className="play-with-model-bar-selection">
         <div id="mode-selection">
           <button
             type="button"
@@ -62,7 +61,6 @@ const SelectionBar = (props) => {
           >
             County
           </button>
-          <div id="vl2" />
           <button
             type="button"
             id="mode-btn"
@@ -82,14 +80,12 @@ const SelectionBar = (props) => {
           />
         </div>
       </div>
-      <button
-        type="button"
-        id="reset-current-data-button"
-        className="animated-button"
+      <Button
+        className="reset-current-data-button"
         onClick={clearAllSelections}
       >
         Clear
-      </button>
+      </Button>
     </div>
   );
 };