Skip to content

Commit 1f185e5

Browse files
committed
Co-authored-by: pinardo88 <[email protected]>
1 parent 80d9880 commit 1f185e5

File tree

9 files changed

+868
-138
lines changed

9 files changed

+868
-138
lines changed

docs/assets/style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,7 @@ img {
12671267
border: 0.25rem solid var(--color-icon-background);
12681268
}
12691269

1270+
12701271
/* mobile */
12711272
@media (max-width: 769px) {
12721273
.tsd-widget.options,

docs/classes/app_components_Buttons_Tutorial.default.html

Lines changed: 667 additions & 9 deletions
Large diffs are not rendered by default.

jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ module.exports = {
1010
'www',
1111
'./src/backend/__tests__/ignore',
1212
'./src/app/__tests__enzyme/ignore',
13-
'./src/backend/__tests__/linkFiber.test.ts',
13+
// './src/backend/__tests__/linkFiber.test.ts',
1414
'./src/app/slices/mainSlice.ts',
1515
],
1616
coveragePathIgnorePatterns: [
1717
'/src/backend/__tests__/ignore/',
1818
'/src/app/__tests__enzyme/ignore',
19-
'./src/backend/__tests__/linkFiber.test.ts',
19+
// './src/backend/__tests__/linkFiber.test.ts',
2020
'./src/app/slices/mainSlice.ts',
2121
],
2222
transformIgnorePatterns: ['/node_modules/(?!d3|d3-array|internmap|delaunator|robust-predicates)'],

src/app/__tests__/ActionContainer.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ describe('unit testing for ActionContainer', () => {
192192
});
193193

194194
describe('Integration testing for ActionContainer.tsx', () => {
195-
xtest('renders the ActionContainer component', () => {
195+
test('renders the ActionContainer component', () => {
196196
//tests that the clearButton is rendered by testing if we can get "Clear"
197197
//need to set actionView to true to correctly render clearbutton
198198
render(

src/app/components/Buttons/Tutorial.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
108108
'<ul><li>Toggle record button to pause state changes on target application</li></ul>',
109109
position: 'right',
110110
},
111+
{
112+
title: 'Dropdown Menu',
113+
element: '.css-13cymwt-control',
114+
intro: '<ul><li>Dropdown Menu for picking between Timejump and UseContext</li></ul>',
115+
position: 'right',
116+
},
111117
{
112118
element: '.individual-action',
113119
title: 'Snapshot',
@@ -176,6 +182,13 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
176182
'<ul><li>This tab visually displays a JSON Tree containing the different components and states</li></ul>',
177183
position: 'bottom',
178184
},
185+
{
186+
title: 'Accessibility Tree',
187+
element: '.accessibility-tab',
188+
intro:
189+
'<ul><li>This tab visually displays a Accessibility Tree</li></ul>',
190+
position: 'bottom',
191+
},
179192
{
180193
title: 'Tutorial Complete',
181194
intro:

src/app/containers/TravelContainer.tsx

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import {
1313
import { useDispatch, useSelector } from 'react-redux';
1414
import { MainState, RootState, TravelContainerProps } from '../FrontendTypes';
1515
import { Button } from '@mui/material';
16-
import FastRewindIcon from '@mui/icons-material/FastRewind';
17-
import FastForwardIcon from '@mui/icons-material/FastForward';
1816

1917
/*
2018
This container renders the time-travel play button, seek bar, playback controls, and the playback speed dropdown, located towards the bottom of the application, above the locked, download, upload, and tutorial buttons
@@ -85,28 +83,9 @@ function TravelContainer(props: TravelContainerProps): JSX.Element {
8583
>
8684
{playing ? 'Pause' : 'Play'}
8785
</Button>
88-
<MainSlider className='main-slider' snapshotsLength={snapshotsLength} />
89-
<Button
90-
variant='contained'
91-
className='backward-button'
92-
onClick={() => dispatch(moveBackward(false))}
93-
type='button'
94-
sx={{ height: 25, minWidth: 30, p: 0, mr: 1 }}
95-
aria-label='Backward'
96-
>
97-
<FastRewindIcon className='backward-button-icon' />
98-
</Button>
99-
<Button
100-
variant='contained'
101-
className='forward-button'
102-
onClick={() => dispatch(moveForward(false))}
103-
type='button'
104-
sx={{ height: 25, minWidth: 30, p: 0 }}
105-
aria-label='Forward'
106-
>
107-
<FastForwardIcon className='forward-button-icon' />
108-
</Button>
86+
10987
<Dropdown speeds={speeds} selectedSpeed={selectedSpeed} setSpeed={setSpeed} />
88+
11089
</div>
11190
);
11291
}

src/app/styles/components/_buttons.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@
170170
border-radius: 5px;
171171
}
172172

173-
.backward-button-icon,
174-
.forward-button-icon {
175-
color: $scrub-icon;
176-
}
173+
// .backward-button-icon,
174+
// .forward-button-icon {
175+
// color: $scrub-icon;
176+
// }
177177

178178
.forward-button:hover,
179179
.backward-button:hover {

src/app/styles/layout/_buttonsContainer.scss

Lines changed: 67 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,93 @@
33
font-family: 'Outfit', sans-serif;
44
}
55
.buttons-container {
6-
//color: #ff0000;
7-
margin: 0 1% 0 1%;
8-
display: grid;
9-
grid-template-columns: repeat(5, 1fr);
10-
grid-gap: 1%;
11-
padding: 1% 0 1% 0;
6+
display: flex;
7+
align-items: center;
8+
background: white;
9+
border-top: 1px solid #e5e7eb;
10+
width: 100%;
1211
}
1312

14-
.introjs-tooltip {
15-
color: black;
16-
background-color: white;
17-
min-width: 20rem;
13+
.buttons-wrapper {
14+
display: flex;
15+
align-items: center;
16+
justify-content: space-between;
17+
max-width: 1200px;
18+
width: 100%;
19+
margin: 0 auto;
20+
padding: 0 24px;
21+
gap: 16px;
1822
}
19-
.introjs-tooltiptext ul {
20-
padding-left: 2px;
23+
24+
.introjs-button {
25+
background-color: #f0f0f0;
26+
color: #000;
27+
//border: 1px solid #ccc;
28+
//border-radius: 20px;
29+
outline: none;
30+
padding: 8px 20px;
31+
font-size: 14px;
32+
transition:
33+
background-color 0.3s ease,
34+
color 0.3s ease;
2135
}
2236

23-
// .introjs-helperLayer{
24-
// // border: 2px solid yellow
25-
// }
37+
.introjs-button:hover {
38+
background-color: #6cff87;
39+
color: #000 !important;
40+
border: 1px solid #6cff87;
41+
}
2642

27-
.tools-container {
28-
display: flex;
29-
justify-content: space-between;
30-
border: 0.5px solid grey;
31-
background-color: #35383e;
32-
padding: 3px;
33-
margin-bottom: 1rem;
43+
.introjs-skipbutton {
44+
height: 16px;
45+
width: auto;
46+
background-color: #f0f0f0;
47+
color: #000;
48+
//border: 1px solid #ccc;
49+
//border-radius: 10px;
50+
padding: 8px 8px;
51+
font-size: 12px;
52+
text-align: center;
53+
line-height: normal;
54+
transition:
55+
background-color 0.3s ease,
56+
color 0.3s ease;
3457
}
3558

36-
#seriesname {
37-
background-color: #333;
38-
color: white;
59+
.introjs-skipbutton:hover {
60+
background-color: #ff4d4d;
61+
color: #fff;
62+
border: 1px solid #ff4d4d;
3963
}
4064

41-
@media (max-width: 500px) {
42-
.buttons-container {
43-
//color: #ff0000;
44-
grid-template-columns: repeat(2, 1fr);
45-
}
65+
.introjs-tooltip-title {
66+
font-size: 18px;
67+
font-weight: bold;
68+
color: #000;
4669
}
4770

48-
.introjs-nextbutton {
49-
background-color: none;
50-
color: #3256f1;
51-
border: 1px solid;
52-
outline: none;
71+
.introjs-tooltiptext {
72+
font-size: 14px;
73+
// color: #333;
5374
}
5475

55-
.introjs-prevbutton {
56-
background-color: none;
57-
color: #3256f1;
58-
border: 1px solid;
59-
outline: none;
76+
.introjs-progressbar {
77+
background-color: #6cff87;
6078
}
6179

62-
.introjs-skipbutton {
63-
color: #d72828;
64-
border: 1px solid;
65-
margin-top: 2px;
66-
font-size: 16px;
67-
outline: none;
80+
.introjs-overlay {
81+
background-color: rgba(0, 0, 0, 0.7);
6882
}
6983

70-
.introjs-button {
71-
background: none;
72-
outline: none;
84+
.introjs-helperLayer {
85+
box-shadow: 0 0 10px 3px rgba(108, 255, 135, 0.7);
86+
border-radius: 8px;
7387
}
7488

89+
#seriesname {
90+
background-color: #333;
91+
color: white;
92+
}
7593
.dialog-pop-up {
7694
border: 1px solid #ff0001;
7795
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);

0 commit comments

Comments
 (0)