Skip to content

Commit 44c3d56

Browse files
committed
preMVPpres
1 parent b0eb94e commit 44c3d56

File tree

7 files changed

+36
-3
lines changed

7 files changed

+36
-3
lines changed

demo-app/src/client/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<title>Reactime MVP</title>
4+
<title>Reactime</title>
5+
<!-- <link rel="icon" type="image/x-icon" href="../../../assets/logos/blackWhiteSquareIcon.png"> -->
56
<link rel="stylesheet" type="text/css" href="./style.css">
67
</head>
78
<body>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import React from "react";
2+
3+
export default function HeatMapLegend() {
4+
return (
5+
<div className="heat-map-legend-container">
6+
<div className="heat-level-one"></div>
7+
<div className="heat-level-two"></div>
8+
<div className="heat-level-three"></div>
9+
<div className="heat-level-four"></div>
10+
</div>
11+
);
12+
}

src/app/containers/ActionContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ function ActionContainer(props: ActionContainerProps): JSX.Element {
195195
<i />
196196
</a>
197197
</aside>
198-
<div className='collapse'>Collapse</div>
198+
<div className='collapse'>Hide</div>
199199
</div>
200200
<a type='button' id='recordBtn' onClick={toggleRecord}>
201201
<i />
202202
<div
203203
className='toggle-record'
204204
style={{ display: 'flex', alignItems: 'center', textAlign: 'right' }}
205205
>
206-
Toggle Record
206+
Record
207207
</div>
208208
{recordingActions ? <Switch defaultChecked /> : <Switch />}
209209
</a>

src/app/containers/MainContainer.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
} from '../slices/mainSlice';
2020
import { useDispatch, useSelector } from 'react-redux';
2121
import { MainState, RootState } from '../FrontendTypes';
22+
import HeatMapLegend from '../components/StateRoute/ComponentMap/heatMapLegend';
2223

2324
/*
2425
This is the main container where everything in our application is rendered

src/app/containers/StateContainer.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import StateRoute from '../components/StateRoute/StateRoute';
88
import DiffRoute from '../components/DiffRoute/DiffRoute';
99
import { StateContainerProps } from '../FrontendTypes';
1010
import { Outlet } from 'react-router';
11+
import HeatMapLegend from '../components/StateRoute/ComponentMap/heatMapLegend';
1112

1213
// eslint-disable-next-line react/prop-types
1314
const StateContainer = (props: StateContainerProps): JSX.Element => {
@@ -22,6 +23,7 @@ const StateContainer = (props: StateContainerProps): JSX.Element => {
2223
} = props;
2324

2425
return (
26+
<>
2527
<div className='state-container'>
2628
<div className='main-navbar-container'>
2729
<div className='main-navbar-text' />
@@ -44,6 +46,7 @@ const StateContainer = (props: StateContainerProps): JSX.Element => {
4446
</NavLink>
4547
</div>
4648
</div>
49+
<HeatMapLegend />
4750
<Routes>
4851
<Route
4952
path='/diff/*'
@@ -68,11 +71,13 @@ const StateContainer = (props: StateContainerProps): JSX.Element => {
6871
currLocation={currLocation}
6972
/>
7073
{/* <Outlet/> */}
74+
{/* <HeatMapLegend /> */}
7175
</div>
7276
}
7377
/>
7478
</Routes>
7579
</div>
80+
</>
7681
);
7782
};
7883

src/app/styles/abstracts/_variablesLM.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ $background-color-weak: #d9d9d9;
2525
$contrasting-color: #161617;
2626
$contrasting-color-weak: #353536;
2727

28+
/// HEATMAP COLORS
29+
$heat-level-1: #F1B476;
30+
$heat-level-2: #E4765B;
31+
$heat-level-3: #C64442;
32+
$heat-level-4: #8C2743;
33+
2834
/////////////////////////////////////////////////////////////////////
2935
// ALL OF THE FOLLOWING COLORS SHOULD REFERENCE A COLOR FROM ABOVE //
3036
/////////////////////////////////////////////////////////////////////

src/app/styles/layout/_stateContainer.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,3 +282,11 @@
282282
.app-content {
283283
height: 100%;
284284
}
285+
286+
.heat-map-legend-container {
287+
display: flex;
288+
height: 3px;
289+
width: 200px;
290+
background-image: linear-gradient(to right, $heat-level-1, $heat-level-2, $heat-level-3, $heat-level-4);
291+
}
292+

0 commit comments

Comments
 (0)