Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move theme into subdir and break into separate files. #604

Merged
merged 2 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Components/CutPlaneMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {useLocation} from 'react-router-dom'
import {Vector3} from 'three'
import Menu from '@mui/material/Menu'
import MenuItem from '@mui/material/MenuItem'
import useTheme from '../Theme'
import useTheme from '../theme/Theme'
import useStore from '../store/useStore'
import {addHashParams, getHashParams, getObjectParams, removeHashParams} from '../utils/location'
import {TooltipIconButton} from './Buttons'
Expand Down
2 changes: 1 addition & 1 deletion src/Components/ExtractLevelsMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {Vector3} from 'three'
import {IFCBUILDINGSTOREY} from 'web-ifc'
import Menu from '@mui/material/Menu'
import MenuItem from '@mui/material/MenuItem'
import useTheme from '../Theme'
import useStore from '../store/useStore'
import {addHashParams, getHashParams, removeHashParams} from '../utils/location'
import useTheme from '../theme/Theme'
import {isNumeric} from '../utils/strings'
import {TooltipIconButton} from './Buttons'
import LevelsIcon from '../assets/icons/Levels.svg'
Expand Down
2 changes: 1 addition & 1 deletion src/Components/SearchBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import InputBase from '@mui/material/InputBase'
import Paper from '@mui/material/Paper'
import debug from '../utils/debug'
import {looksLikeLink, githubUrlOrPathToSharePath} from '../ShareRoutes'
import useTheme from '../Theme'
import useTheme from '../theme/Theme'
import OpenModelControl from './OpenModelControl'
import {TooltipIconButton} from './Buttons'
import ClearIcon from '../assets/icons/Clear.svg'
Expand Down
19 changes: 9 additions & 10 deletions src/Share.jsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import React, {useEffect, useMemo, useRef} from 'react'
import CssBaseline from '@mui/material/CssBaseline'
import {useNavigate, useParams} from 'react-router-dom'
import CssBaseline from '@mui/material/CssBaseline'
import {ThemeProvider} from '@mui/material/styles'
import CadView from './Containers/CadView'
import useStore from './store/useStore'
import Styles from './Styles'
import useShareTheme from './Theme'
import debug from './utils/debug'
import {ColorModeContext} from './Context/ColorMode'
import {handleBeforeUnload} from './utils/event'
// TODO: This isn't used.
// If icons-material isn't imported somewhere, mui dies
/* eslint-disable */
import AccountCircle from '@mui/icons-material/AccountCircle'
import WidgetApi from "./WidgetApi/WidgetApi";
import {searchIndex} from './Containers/CadView';
/* eslint-enable */
import CadView, {searchIndex} from './Containers/CadView'
import {ColorModeContext} from './Context/ColorMode'
import Styles from './Styles'
import WidgetApi from './WidgetApi/WidgetApi'
import useStore from './store/useStore'
import useShareTheme from './theme/Theme'
import debug from './utils/debug'
import {handleBeforeUnload} from './utils/event'


/**
Expand Down
2 changes: 1 addition & 1 deletion src/ShareMock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {useEffect} from 'react'
import {ThemeProvider} from '@mui/material/styles'
import useStore from './store/useStore'
import {ColorModeContext} from './Context/ColorMode'
import useTheme from './Theme'
import useTheme from './theme/Theme'
import BaseRoutesMock from './BaseRoutesMock.test'


Expand Down
249 changes: 0 additions & 249 deletions src/Theme.jsx

This file was deleted.

5 changes: 3 additions & 2 deletions src/__mocks__/MockComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import useTheme from '../Theme'
import {ThemeProvider} from '@mui/material/styles'
import React from 'react'
import {ThemeProvider} from '@mui/material/styles'
import {ColorModeContext} from '../Context/ColorMode'
import useTheme from '../theme/Theme'


/**
* @param {object} children React component(s)
Expand Down
27 changes: 27 additions & 0 deletions src/theme/Colors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import {grey, green} from '@mui/material/colors'


/**
* @return {object} Color definitions: {grey, green, lime, black}
* @see https://mui.com/customization/color/#color-palette
*/
export function getColors() {
return {
grey: {
lightest: grey[100],
light: grey[300],
medium: '#C1C1C1',
dark: '#444444',
darkest: grey[900],
},
green: {
lightest: '#CEE6CA',
light: green[300],
medium: green[500],
dark: green[800],
darkest: '#459A47',
},
lime: green[400],
black: '#101010',
}
}