Skip to content

Commit

Permalink
(chore): lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ilan-gold committed Nov 26, 2024
1 parent 362ae48 commit 82e8766
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 45 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Button from '@mui/material/Button';
import AddIcon from '@mui/icons-material/Add';
import Button from '@mui/material/Button';
import React, { useCallback } from 'react';
import { useShallow } from 'zustand/shallow';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as React from 'react';

import { DTYPE_VALUES } from '@hms-dbmi/viv';
import HighlightOffIcon from '@mui/icons-material/HighlightOff';
import Checkbox from '@mui/material/Checkbox';
import CircularProgress from '@mui/material/CircularProgress';
import FormControl from '@mui/material/FormControl';
import Grid from '@mui/material/Grid';
import IconButton from '@mui/material/IconButton';
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
import Slider from '@mui/material/Slider';
import FormControl from '@mui/material/FormControl';
import MenuItem from '@mui/material/MenuItem';
import HighlightOffIcon from '@mui/icons-material/HighlightOff';
import { useShallow } from 'zustand/shallow';

import { FILL_PIXEL_VALUE } from '../../../constants';
Expand Down Expand Up @@ -96,7 +96,7 @@ function ChannelController({
return (
<Grid container direction="column" justifyContent="center">
<Grid container direction="row" justifyContent="space-between">
<Grid item xs={10} >
<Grid item xs={10}>
<FormControl variant="standard">
<Select size="small" value={name} onChange={onSelectionChange}>
{channelOptions.map(opt => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import MoreVertIcon from '@mui/icons-material/MoreVert';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import IconButton from '@mui/material/IconButton';
import MenuItem from '@mui/material/MenuItem';
import MenuList from '@mui/material/MenuList';
import Paper from '@mui/material/Paper';
import Popper from '@mui/material/Popper';
import makeStyles from '@mui/styles/makeStyles';
import MoreVertIcon from '@mui/icons-material/MoreVert';
import React, { useReducer, useRef } from 'react';

import ColorPalette from './ColorPalette';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import IconButton from '@mui/material/IconButton';
import LensIcon from '@mui/icons-material/Lens';
import IconButton from '@mui/material/IconButton';
import React from 'react';

import makeStyles from '@mui/styles/makeStyles';
Expand Down Expand Up @@ -29,23 +29,24 @@ const useStyles = makeStyles(() => ({
const ColorPalette = ({ handleColorSelect }) => {
const classes = useStyles();
return (
(<div className={classes.container} aria-label="color-swatch">
<div className={classes.container} aria-label="color-swatch">
{COLOR_PALLETE.map(color => {
return (
(<IconButton
<IconButton
className={classes.button}
key={color}
onClick={() => handleColorSelect(color)}
size="large">
size="large"
>
<LensIcon
fontSize="small"
style={{ color: `rgb(${color})` }}
className={classes.icon}
/>
</IconButton>)
</IconButton>
);
})}
</div>)
</div>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ function ColormapSelect() {
const isViewerLoading = useViewerStore(store => store.isViewerLoading);
return (
<FormControl fullWidth variant="standard">
<InputLabel htmlFor="colormap-select" size="small" >
<InputLabel htmlFor="colormap-select" size="small">
Additive {colormap === '' ? ' Blending' : 'Color Mapping'}
</InputLabel>
<Select
size="small"
size="small"
native
onChange={e =>
useImageSettingsStore.setState({ colormap: e.target.value })
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';

import Checkbox from '@mui/material/Checkbox';
import FormControl from '@mui/material/FormControl';
import Grid from '@mui/material/Grid';
import Select from '@mui/material/Select';
import MenuItem from '@mui/material/MenuItem';
import FormControl from '@mui/material/FormControl';
import Select from '@mui/material/Select';
import { useShallow } from 'zustand/shallow';

import {
Expand Down Expand Up @@ -69,7 +69,6 @@ function LensSelect() {
))}
</Select>
</FormControl>

</Grid>
</Grid>
);
Expand Down
11 changes: 6 additions & 5 deletions sites/avivator/src/components/Controller/components/Menu.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import InfoIcon from '@mui/icons-material/Info';
import SettingsIcon from '@mui/icons-material/Settings';
import { Select } from '@mui/material';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
Expand All @@ -10,8 +12,6 @@ import Popper from '@mui/material/Popper';
import TextField from '@mui/material/TextField';
import Typography from '@mui/material/Typography';
import makeStyles from '@mui/styles/makeStyles';
import InfoIcon from '@mui/icons-material/Info';
import SettingsIcon from '@mui/icons-material/Settings';
import React, { useState, useReducer, useRef, useEffect } from 'react';
import { useShallow } from 'zustand/shallow';

Expand Down Expand Up @@ -173,9 +173,9 @@ function Menu({ children, ...props }) {
{children.map((child, i) => {
return (
// biome-ignore lint/suspicious/noArrayIndexKey: Ignore carried over from eslint without description.
(<Grid item key={i} className={classes.item}>
<Grid item key={i} className={classes.item}>
{child}
</Grid>)
</Grid>
);
})}
</Grid>
Expand All @@ -188,7 +188,8 @@ function Menu({ children, ...props }) {
size="small"
endIcon={<SettingsIcon />}
onClick={toggleIsControllerOn}
aria-label="show-menu">
aria-label="show-menu"
>
AVIVATOR
</Button>
</Box>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import CloseIcon from '@mui/icons-material/Close';
import GitHubIcon from '@mui/icons-material/GitHub';
import Grid from '@mui/material/Grid';
import IconButton from '@mui/material/IconButton';
import Typography from '@mui/material/Typography';
import CloseIcon from '@mui/icons-material/Close';
import GitHubIcon from '@mui/icons-material/GitHub';
import React from 'react';
import { useViewerStore } from '../../../state';

Expand All @@ -15,7 +15,7 @@ function MenuTitle() {
store => store.toggleIsControllerOn
);
return (
(<Grid
<Grid
container
direction="row"
justifyContent="flex-end"
Expand All @@ -31,7 +31,8 @@ function MenuTitle() {
href="https://github.com/hms-dbmi/viv"
aria-label="GitHub Repository"
disableRipple
size="large">
size="large"
>
<GitHubIcon />
</IconButton>
</Grid>
Expand All @@ -46,7 +47,7 @@ function MenuTitle() {
<CloseIcon fontSize="small" />
</IconButton>
</Grid>
</Grid>)
</Grid>
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ function RenderingModeSelect() {
const options = !use3d ? [...renderingOptions, ''] : renderingOptions;
return (
<FormControl fullWidth variant="standard">
<InputLabel htmlFor="rendering-mode-select" size="small">Rendering Mode</InputLabel>
<InputLabel htmlFor="rendering-mode-select" size="small">
Rendering Mode
</InputLabel>
<Select
native
size="small"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createStyles, makeStyles } from '@mui/styles';
import Grid from '@mui/material/Grid';
import Slider from '@mui/material/Slider';
import Typography from '@mui/material/Typography';
import { createStyles, makeStyles } from '@mui/styles';
import React from 'react';
import { useShallow } from 'zustand/shallow';

Expand Down
2 changes: 1 addition & 1 deletion sites/avivator/src/components/RenderingModeSelect.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FormControl from '@mui/material/FormControl';
import InputLabel from '@mui/material/InputLabel';
import Select from '@mui/material/Select';
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
import React from 'react';

import { RENDERING_MODES } from '@hms-dbmi/viv';
Expand Down
2 changes: 1 addition & 1 deletion sites/avivator/src/components/Snackbars/Snackbars.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Snackbar from '@mui/material/Snackbar';
import Alert from '@mui/material/Alert';
import Snackbar from '@mui/material/Snackbar';
import React from 'react';
import { useShallow } from 'zustand/shallow';

Expand Down
37 changes: 23 additions & 14 deletions sites/avivator/src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
import { grey } from '@mui/material/colors';
import { ThemeProvider, StyledEngineProvider, createTheme, adaptV4Theme } from '@mui/material/styles';
import {
StyledEngineProvider,
ThemeProvider,
adaptV4Theme,
createTheme
} from '@mui/material/styles';
import React from 'react';
import ReactDOM from 'react-dom/client';

import Avivator from './Avivator';
import sources from './source-info';
import { getNameFromUrl } from './utils';

const theme = createTheme(adaptV4Theme({
palette: {
mode: 'dark',
primary: grey,
secondary: grey
},
props: {
MuiButtonBase: {
disableRipple: true
const theme = createTheme(
adaptV4Theme({
palette: {
mode: 'dark',
primary: grey,
secondary: grey
},
props: {
MuiButtonBase: {
disableRipple: true
}
}
}
}));
})
);

/** @param {string | null} url */
function resolveSource(url) {
Expand All @@ -41,9 +48,11 @@ function App() {
const source = resolveSource(query.get('image_url'));
return (
<StyledEngineProvider injectFirst>
(<ThemeProvider theme={theme}>
(
<ThemeProvider theme={theme}>
<Avivator source={source} isDemoImage={source.isDemoImage} />
</ThemeProvider>)
</ThemeProvider>
)
</StyledEngineProvider>
);
}
Expand Down

0 comments on commit 82e8766

Please sign in to comment.