Skip to content

Commit 6ddfbe0

Browse files
morahgeistKyEBellEivindDelFierrobrok3turtl3yididiaketema
committed
group review merge into master
Co-authored-by: Kyle Bell <KyEBell@users.noreply.github.com> Co-authored-by: EivindDelFierro <EivindDelFierro@users.noreply.github.com> Co-authored-by: Sean Kelly <brok3turtl3@users.noreply.github.com> Co-authored-by: Yididia Ketema <yididiaketema@users.noreply.github.com>
2 parents f8c8f2b + fd7b956 commit 6ddfbe0

File tree

15 files changed

+22
-108
lines changed

15 files changed

+22
-108
lines changed

‎assets/logos/marqueePromoTitle.png‎

21.7 KB
Loading

‎assets/logos/smallPromoTitle.png‎

18 KB
Loading

‎src/app/components/ErrorMsg.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ function ErrorMsg({ loadingArray, status, launchContent }): JSX.Element {
3333
<div>
3434
Could not connect to the Target App. Try closing Reactime and reloading the page.
3535
<br />
36+
<br />
37+
If you encounter this error on the initial launch of Reactime, refresh the webpage you are developing.
38+
<br />
39+
If Reactime is running as an iframe in your developer tools, right click on the Reactime application and click 'Reload Frame'
40+
<br />
41+
<br />
3642
NOTE: By default Reactime only launches the content script on URLS starting with
3743
localhost.
3844
<br />
@@ -48,7 +54,13 @@ function ErrorMsg({ loadingArray, status, launchContent }): JSX.Element {
4854
case 'RDT Error':
4955
return (
5056
<div>
51-
React Dev Tools isnt installed!
57+
React Dev Tools is not installed!
58+
<br />
59+
<br />
60+
If you encounter this error on the initial launch of Reactime, refresh the webpage you are developing.
61+
<br />
62+
If Reactime is running as an iframe in your developer tools, right click on the Reactime application and click 'Reload Frame'
63+
<br />
5264
<br />
5365
<a
5466
href='https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en'

‎src/app/components/StateRoute/PerformanceVisx/BarGraph.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ const BarGraph = (props: BarGraphProps): JSX.Element => {
6363
});
6464

6565
const keys = Object.keys(data.componentData);
66-
const getSnapshotId = (d: snapshot) => d.snapshotId; // data accessor (used to generate scales) and formatter (add units for on hover box). d comes from data.barstack post filtered data
67-
6866
const getSnapshotId = (d: snapshot) => d.snapshotId; // data accessor (used to generate scales) and formatter (add units for on hover box). d comes from data.barstack post filtered data
6967
const formatSnapshotId = (id) => `Snapshot ID: ${id}`; // returns snapshot id when invoked in tooltip section
7068
const formatRenderTime = (time) => `${time} ms `; // returns render time when invoked in tooltip section

‎src/app/components/StateRoute/PerformanceVisx/BarGraphComparison.tsx‎

Lines changed: 5 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { scaleBand, scaleLinear, scaleOrdinal } from '@visx/scale';
1010
import { useTooltip, useTooltipInPortal, defaultStyles } from '@visx/tooltip';
1111
import { Text } from '@visx/text';
1212
import { schemeTableau10 } from 'd3-scale-chromatic';
13-
import { styled } from '@mui/system';
1413
import Select from '@mui/material/Select';
1514
import MenuItem from '@mui/material/MenuItem';
1615
import FormControl from '@mui/material/FormControl';
@@ -135,24 +134,6 @@ const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
135134
snapshotIdScale.rangeRound([0, xMax]);
136135
renderingScale.range([yMax, 0]);
137136

138-
// const StyledFormControl = styled(FormControl)(({ theme }) => ({
139-
// // applies the theme style to the FormControl component
140-
// margin: theme.spacing(1),
141-
// minWidth: 160,
142-
// height: 30,
143-
// }));
144-
145-
// StyledSelect to use for MUI select components to maintain consistent styling for all select components
146-
147-
// const StyledSelect = styled(Select)({
148-
// // applies the object to customize the style of the 'Select' component
149-
// minWidth: 160,
150-
// fontSize: '1.2rem',
151-
// fontWeight: 200,
152-
// height: 30,
153-
// border: '1px solid #da262c',
154-
// });
155-
156137
const handleSeriesChange = (event: Event) => {
157138
if (!event) {
158139
return;
@@ -221,7 +202,6 @@ const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
221202
<Button
222203
variant='contained'
223204
sx={{ p: 2, color: 'white' }}
224-
// type='button'
225205
className='delete-button'
226206
onClick={() => {
227207
setButtonLoad(true);
@@ -236,39 +216,9 @@ const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
236216
: { backgroundColor: '#ff6569', color: 'black' }
237217
}
238218
>
239-
{buttonLoad ? 'Deleted' : 'Clear Series'}
219+
{buttonLoad ? 'Deleted' : 'Clear All Series'}
240220
</Button>
241-
{/* Mui 'Compare Series Dropdown Starts here */}
242-
{/* <StyledFormControl // MUI styled 'FormControl' component
243-
variant='filled'
244-
>
245-
<InputLabel
246-
id='simple-select-outlined-label'
247-
sx={{ fontSize: '1.2rem' }}
248-
style={{ color: 'white' }}
249-
>
250-
Compare Series
251-
</InputLabel>
252-
<StyledSelect // MUI styled 'select' component
253-
labelId='simple-select-outlined-label'
254-
id='simple-select-outlined-label'
255-
open={open}
256-
onClose={handleClose}
257-
onOpen={handleOpen}
258-
value={series} // added 8/3/2023
259-
onChange={handleSeriesChange}
260-
>
261-
{!comparison.length ? (
262-
<MenuItem>No series available</MenuItem>
263-
) : (
264-
comparison.map((tabElem, index) => (
265-
<MenuItem key={`MenuItem${tabElem.name}`} value={index}>
266-
{tabElem.name}
267-
</MenuItem>
268-
))
269-
)}
270-
</StyledSelect>
271-
</StyledFormControl> */}
221+
272222
<FormControl sx={{ m: 1, minWidth: 180 }} size='small'>
273223
<InputLabel
274224
id='simple-select-outlined-label'
@@ -342,10 +292,10 @@ const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
342292
</StyledSelect>
343293
</StyledFormControl>
344294
*/}
295+
{/*==============================================================================================================================*/}
296+
{/*==============================================================================================================================*/}
345297
</div>
346298
</div>
347-
{/*==============================================================================================================================*/}
348-
{/*==============================================================================================================================*/}
349299

350300
<svg ref={containerRef} width={width} height={height}>
351301
<rect x={0} y={0} width={width} height={height} fill={background} rx={14} />
@@ -361,8 +311,7 @@ const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
361311
xOffset={snapshotIdScale.bandwidth() / 2}
362312
/>
363313
<Group top={margin.top} left={margin.left}>
364-
<BarStack
365-
// Current Tab bar stack.
314+
<BarStack // Current Tab bar stack.
366315
data={setXpointsCurrentTab()} // array of data that generates a stack
367316
keys={keys} // array of keys corresponding to stack layers
368317
x={getCurrentTab} // returns the value mapped to the x of a bar

‎src/app/components/StateRoute/PerformanceVisx/PerformanceVisx.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ const getPerfMetrics = (snapshots, snapshotsIds): PerfData => {
155155
const seriesArr: Series[] = project === null ? [] : JSON.parse(project);
156156
const actionsArr = [];
157157

158-
console.log("Project:", project)
159-
console.log('seriesArr:', seriesArr)
160-
161158
if (seriesArr.length) {
162159
for (let i = 0; i < seriesArr.length; i += 1) {
163160
for (const actionObj of seriesArr[i].data.barStack) {

‎src/app/components/WebMetrics.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ const radialGraph = (props) => {
119119
</Trigger>
120120
<Hover type='hover'>
121121
<div style={{zIndex: 1, position: 'relative', padding: '0.5rem 1rem'}} id='hover-box'>
122-
{/* <div style="zIndex: 1; position: relative; padding: 0.5rem 1rem;" id='hover-box'> */}
123122
<p><strong>{props.name}</strong></p>
124123
<p>{props.description}</p>
125124
</div>

‎src/app/components/theme.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ const theme = createTheme({
2222
},
2323
},
2424
},
25-
// MuiSelect: {
26-
// styleOverrides: {
27-
// root: {
28-
// main: '#556cd4',
29-
// },
30-
// },
31-
// },
3225
},
3326
});
3427

‎src/app/containers/ActionContainer.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ function ActionContainer(props): JSX.Element {
142142
);
143143
useEffect(() => {
144144
setActionView(true);
145-
// !!!! Why is the dependency array the function being called within the useEffect? !!!!
146-
// may not call an infinite loop since it involves a setter function
147145
}, [setActionView]);
148146

149147
// Function sends message to background.js which sends message to the content script

‎src/app/containers/ButtonsContainer.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as React from 'react';
22
import { importSnapshots, toggleMode } from '../actions/actions';
33
import { useStoreContext } from '../store';
44
import { Button } from '@mui/material';
5-
65
import Tutorial from '../components/Tutorial';
76
import LockIcon from '@mui/icons-material/Lock';
87
import LockOpenIcon from '@mui/icons-material/LockOpen';

0 commit comments

Comments
 (0)