Skip to content

Commit 1428378

Browse files
EivindDelFierroEivindDelFierro
committed
Merge branch 'dev' into eivindBranch
2 parents 05f45ba + 67c45e3 commit 1428378

File tree

16 files changed

+71
-75
lines changed

16 files changed

+71
-75
lines changed

‎package.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
},
3434
"contributors": [
3535
"Abaas Khorrami",
36+
"Alex Gomez",
37+
"Alexander Landeros",
3638
"Ali Rahman",
3739
"Andy Tsou",
3840
"Andy Wong",
@@ -43,52 +45,71 @@
4345
"Caner Demir",
4446
"Carlos Perez",
4547
"Chris Flannery",
48+
"Chris Guizzetti",
4649
"Christopher LeBrett",
4750
"Cole Styron",
51+
"Daljit Gill",
52+
"Dane Corpion",
53+
"David Bernstein",
4854
"David Chai",
4955
"David Kim",
5056
"Dennis Lopez",
57+
"Edar Liu",
5158
"Edwin Menendez",
59+
"Eivind Del Fierro",
5260
"Ergi Shehu",
5361
"Eric Yun",
5462
"Freya Wu",
5563
"Gabriela Jardim Aquino",
5664
"Gregory Panciera",
5765
"Haejin Jo",
66+
"Harry Fox",
5867
"Hien Nguyen",
5968
"Jack Crish",
6069
"Jackie Yuan",
6170
"James McCollough",
6271
"James Nghiem",
6372
"Jasmine Noor",
73+
"Jason Victor",
6474
"Joseph Park",
75+
"Joseph Stern",
6576
"Josh Kim",
6677
"Joshua Howard",
6778
"Kevin Fey",
6879
"Kevin HoEun Lee",
6980
"Kevin Ngo",
7081
"Kim Mai Nguyen",
82+
"Kris Sorensen",
83+
"Kristina Wallen",
84+
"Kyle Bell",
7185
"Lance Ziegler",
7286
"Lina Shin",
7387
"Mark Teets",
7488
"Mike Bednarz",
7589
"Minzo Kim",
90+
"Morah Geist",
7691
"Nathanael Wa Mwenze",
92+
"Nathan Richardson",
7793
"Ngoc Zwolinski",
7894
"Nick Huemmer",
7995
"Peter Lam",
8096
"Prasanna Malla",
97+
"Quan Le",
8198
"Rajeeb Banstola",
8299
"Raymond Kwan",
83100
"Robby Tipton",
101+
"Robert Maeda",
84102
"Rocky Lin",
85103
"Ruth Anam",
86104
"Ryan Dang",
87105
"Sergei Liubchenko",
106+
"Sean Kelly",
88107
"Sierra Swaby",
89108
"Tania Lind",
90109
"Viet Nguyen",
110+
"Vincent Nguyen",
91111
"Wilton Lee",
112+
"Yididia Ketema",
92113
"Yujin Kang",
93114
"Zachary Freeman"
94115
],

‎src/app/components/Loader.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import React from 'react';
44
import { ClipLoader } from 'react-spinners';
5-
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
6-
import { faCheck, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
5+
import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
6+
import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
77

88
/*
99
This file is what decides what icon (loading, checkmark, exclamation point) is displayed next to the checks in the ErrorContainer loading screen:
@@ -15,9 +15,11 @@ This file is what decides what icon (loading, checkmark, exclamation point) is d
1515

1616
const handleResult = (result: boolean): JSX.Element =>
1717
result ? (
18-
<FontAwesomeIcon icon={faCheck} className='check' size='lg' /> // if result boolean is true, we display a checkmark icon
18+
<CheckCircleOutlineIcon className='check'/>
19+
// if result boolean is true, we display a checkmark icon
1920
) : (
20-
<FontAwesomeIcon icon={faExclamationCircle} className='fail' size='lg' /> // if the result boolean is false, we display a fail icon
21+
<ErrorOutlineIcon className='fail'/>
22+
// if the result boolean is false, we display a fail icon
2123
);
2224

2325
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types

‎src/app/containers/ButtonsContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function ButtonsContainer(): JSX.Element {
113113
variant='outlined'
114114
className='export-button'
115115
type='button'
116-
onClick={() => exportHandler(snapshots)}
116+
onClick={() => exportHandler(tabs[currentTab])}
117117
>
118118
<FileDownloadIcon sx={{pr: 1}}/>
119119
Download

‎src/app/containers/TravelContainer.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from '../actions/actions';
1313
import { useStoreContext } from '../store';
1414
import { TravelContainerProps } from '../FrontendTypes';
15+
import { Button } from '@mui/material';
1516
import FastRewindIcon from '@mui/icons-material/FastRewind';
1617
import FastForwardIcon from '@mui/icons-material/FastForward';
1718

@@ -64,22 +65,24 @@ function TravelContainer(props: TravelContainerProps): JSX.Element {
6465

6566
return (
6667
<div className='travel-container'>
67-
<button
68+
<Button
69+
variant="contained"
6870
className='play-button'
71+
sx={{height: 25, p: 0, mr: 1, ml: 1}}
6972
type='button'
7073
// data-testid, prop for testing in RTL
7174
data-testid='play-button-test'
7275
onClick={() => play(selectedSpeed.value, playing, dispatch, snapshotsLength, sliderIndex)}
7376
>
7477
{playing ? 'Pause' : 'Play'}
75-
</button>
78+
</Button>
7679
<MainSlider snapshotsLength={snapshotsLength} />
77-
<button className='backward-button' onClick={() => dispatch(moveBackward())} type='button'>
78-
<FastRewindIcon sx={{mr: 1, color: '#000'}}/>
79-
</button>
80-
<button className='forward-button' onClick={() => dispatch(moveForward())} type='button'>
81-
<FastForwardIcon />
82-
</button>
80+
<Button variant="contained" className='backward-button' onClick={() => dispatch(moveBackward())} type='button' sx={{height: 25, minWidth: 30, p: 0, mr: 1}}>
81+
<FastRewindIcon sx={{color: '#000'}}/>
82+
</Button>
83+
<Button variant="contained" className='forward-button' onClick={() => dispatch(moveForward())} type='button' sx={{height: 25, minWidth: 30, p: 0}}>
84+
<FastForwardIcon sx={{color: '#000'}}/>
85+
</Button>
8386
<Dropdown speeds={speeds} selectedSpeed={selectedSpeed} setSpeed={setSpeed} />
8487
</div>
8588
);

‎src/app/styles/abstracts/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/// fontFamily: 'monaco, Consolas, Lucida Console, monospace'
2-
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
33
/// @type List
44
$text-font-stack: 'Outfit', sans-serif !default;
55

‎src/app/styles/components/_buttons.scss

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
2+
23

34
.save-series-button {
45
padding: 3px;
@@ -155,6 +156,7 @@
155156
border-radius: 5px;
156157
font-weight: 500;
157158
font-size: 16px;
159+
justify-content: center;
158160
}
159161

160162
.play-button:hover {
@@ -164,31 +166,25 @@
164166
}
165167

166168
.backward-button {
167-
width: 30px;
168-
height: 25px;
169-
margin: 7px;
170169
color: $brand-color;
171170
border-color: transparent;
172171
background: $blue-color-gradient;
173172
border-radius: 5px;
174173
}
175174

176175
.forward-button {
177-
width: 30px;
178-
height: 25px;
179-
margin: 7px;
180176
color: $brand-color;
181177
border-color: transparent;
182178
background: $blue-color-gradient;
183179
border-radius: 5px;
184180
}
185181

186-
.play-button:focus,
187-
.backward-button:focus,
188-
.forward-button:focus {
189-
outline: none;
190-
box-shadow: $box-shadow-blue;
191-
}
182+
// .play-button:focus,
183+
// .backward-button:focus,
184+
// .forward-button:focus {
185+
// outline: none;
186+
// box-shadow: $box-shadow-blue;
187+
// }
192188

193189
.forward-button:hover,
194190
.backward-button:hover {
@@ -197,16 +193,16 @@
197193
cursor: pointer;
198194
}
199195

200-
.import-button,
201-
.howToUse-button,
202-
.export-button,
203-
.pause-button {
204-
@extend %button-shared;
205-
font-size: 16px;
206-
color: white;
207-
border-color: transparent;
208-
background: $blue-color-gradient;
209-
}
196+
// .import-button,
197+
// .howToUse-button,
198+
// .export-button,
199+
// .pause-button {
200+
// @extend %button-shared;
201+
// font-size: 16px;
202+
// color: white;
203+
// border-color: transparent;
204+
// background: $blue-color-gradient;
205+
// }
210206

211207
.import-button:hover,
212208
.howToUse-button:hover,

‎src/app/styles/components/_performanceVisx.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
22

33
#RenderContainer {
44
display: flex;

‎src/app/styles/components/d3graph.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
22
body {
33
background-color: black;
44
}
@@ -13,7 +13,7 @@ body {
1313
fill: #fae6e4;
1414
background-color: red;
1515
font-size: 10px;
16-
font-family: 'Roboto', sans-serif;
16+
font-family: 'Outfit', sans-serif;
1717
}
1818

1919
/* modifies text of parent nodes (has children) */
@@ -34,7 +34,7 @@ div.tooltip {
3434
color: white;
3535
z-index: 100;
3636
font-size: 14px;
37-
font-family: 'Roboto', sans-serif;
37+
font-family: 'Outfit', sans-serif;
3838
background: rgb(17, 17, 17, 0.9);
3939
box-shadow: rgb(33 33 33 / 20%) 0px 1px 2px;
4040
border-radius: 5px;

‎src/app/styles/components/diff.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
22
.jsondiffpatch-delta {
3-
font-family: 'Roboto', sans-serif;
3+
font-family: 'Outfit', sans-serif;
44
font-size: 16px;
55
margin: 0;
66
padding: 0 0 0 12px;
77
display: inline-block;
88
}
99
.jsondiffpatch-delta pre {
10-
font-family: 'Roboto', sans-serif;
10+
font-family: 'Outfit', sans-serif;
1111
font-size: 16px;
1212
margin: 0;
1313
padding: 0;

‎src/app/styles/layout/_buttonsContainer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
22
* {
33
font-family: 'Outfit', sans-serif;
44
}

0 commit comments

Comments
 (0)