Skip to content

Commit d14f327

Browse files
authored
Merge pull request #28 from oslabs-beta/feature/garrett
Feature/garrett
2 parents 3e8edcf + a091920 commit d14f327

28 files changed

+289
-1216
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
"jsdom": "^23.0.1",
150150
"react-dom": "^18.2.0",
151151
"react-router-dom": "^6.21.1",
152-
"sass-loader": "^13.3.2",
152+
"sass": "^1.83.0",
153+
"sass-loader": "^16.0.4",
153154
"style-loader": "^3.3.3",
154155
"ts-jest": "^29.1.2",
155156
"ts-loader": "^9.5.1",
@@ -195,14 +196,14 @@
195196
"rc-tooltip": "^6.1.3",
196197
"react": "^18.2.0",
197198
"react-apexcharts": "^1.4.1",
199+
"react-hot-toast": "^2.4.1",
198200
"react-hover": "^3.0.1",
199201
"react-json-tree": "^0.18.0",
200202
"react-redux": "^9.0.4",
201203
"react-select": "^5.8.0",
202204
"react-spinners": "^0.13.8",
203205
"redux": "^5.0.0",
204206
"regenerator-runtime": "^0.14.1",
205-
"sass": "^1.69.5",
206207
"styled-components": "^6.1.2",
207208
"web-vitals": "^3.5.0"
208209
}

src/app/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import { MemoryRouter as Router } from 'react-router-dom';
33
import MainContainer from './containers/MainContainer';
4+
import { Toaster } from 'react-hot-toast';
45

56
/*
67
'currentTab' is the current active tab within Google Chrome.
@@ -11,6 +12,7 @@ import MainContainer from './containers/MainContainer';
1112
function App(): JSX.Element {
1213
return (
1314
<Router>
15+
<Toaster />
1416
<MainContainer />
1517
</Router>
1618
);

src/app/__tests__/ErrorMsg.test.tsx

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/app/__tests__/Loader.test.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/app/components/Actions/Action.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,12 @@ const Action = (props: ActionProps): JSX.Element => {
8888
/>
8989
</div>
9090
{isCurrIndex ? (
91-
<button className='current-snap' type='button'>
92-
{`Snapshot: ${displayName}`}
93-
</button>
91+
<input
92+
className='current-snap'
93+
key={`ActionInput${displayName}`}
94+
type='text'
95+
placeholder={`Snapshot: ${displayName}`}
96+
/>
9497
) : (
9598
<button className='time-button' type='button'>
9699
{displayTime}

src/app/components/Buttons/Tutorial.tsx

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
9191
steps = [
9292
{
9393
title: 'Reactime Tutorial',
94-
intro: 'A performance and state management tool for React apps.',
94+
intro:
95+
'A tool for time travel debugging and performance monitoring in React applications.',
9596
position: 'top',
9697
},
9798
{
@@ -226,37 +227,6 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
226227
intro: 'Additional info can be found be hovering over desired metrics',
227228
position: 'top',
228229
},
229-
// {
230-
// title: 'LCP',
231-
// element: document.querySelectorAll('.metric')[0],
232-
// intro:
233-
// '<strong>Largest Contentful Paint</strong><br/>The amount of time it takes for the largest image, video or text block within the viewport to be fully rendered and interactive.',
234-
// position: 'top',
235-
// },
236-
237-
// {
238-
// title: 'FID',
239-
// element: document.querySelectorAll('.metric')[1],
240-
// intro:
241-
// '<strong>First Input Delay</strong><br/>A measurement of load responsiveness, the time from the first user interaction (for example, a click) to the browser responding to that interaction.',
242-
// position: 'top',
243-
// },
244-
245-
// {
246-
// title: 'FCP',
247-
// element: document.querySelectorAll('.metric')[2],
248-
// intro:
249-
// '<strong>First Contentful Paint</strong><br/>The amount of time it takes to render the first DOM element of any variety',
250-
// position: 'top',
251-
// },
252-
253-
// {
254-
// title: 'TTFB',
255-
// element: document.querySelectorAll('.metric')[3],
256-
// intro:
257-
// "<strong>Time To First Byte</strong><br/>The amount of time it takes for a user's browser to receive the first byte of page content from the server.",
258-
// position: 'top',
259-
// },
260230
];
261231
break;
262232
case 'history':
@@ -270,7 +240,7 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
270240
},
271241
{
272242
title: 'Viewing History Snapshot',
273-
element: '.node active',//document.querySelectorAll('.snapshotNode')[0]
243+
element: '.node active', //document.querySelectorAll('.snapshotNode')[0]
274244
intro:
275245
'Each node will represent a snapshot in the page. <ul><li>A single snapshot will show as a node while multiple snapshots will be represented as a timeline.</li><li>Highlighting over one will show any state changes compared to the previous snapshot. </li><li>Clicking a node will set the snapshot as the current one.</li></ul>',
276246
position: 'top',

src/app/components/ErrorHandling/ErrorHandler.tsx

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/app/components/ErrorHandling/ErrorMsg.tsx

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/app/components/ErrorHandling/Loader.tsx

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/app/components/StateRoute/WebMetrics/WebMetrics.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { useDispatch } from 'react-redux';
1010

1111
const radialGraph = (props) => {
1212
const dispatch = useDispatch();
13-
console.log('props', props);
1413
const state = {
1514
series: [props.series], // series appears to be the scale at which data is displayed based on the type of webMetrics measured.
1615
options: {

0 commit comments

Comments
 (0)