Set base for settings, add volatile settings for theme and language
Goal is to have a common and reusable base for the settings. Having nice styles and saving preferences is out of scope for now.
Note the conversation page is now the "main page" instead of the account settings.
Change-Id: I328686047d924642ae6781096c9f57308e8fea22
diff --git a/client/src/themes/Default.ts b/client/src/themes/Default.ts
index 1986bc5..cc890ec 100644
--- a/client/src/themes/Default.ts
+++ b/client/src/themes/Default.ts
@@ -15,7 +15,7 @@
* License along with this program. If not, see
* <https://www.gnu.org/licenses/>.
*/
-import { createTheme, SimplePaletteColorOptions } from '@mui/material';
+import { createTheme, PaletteMode, SimplePaletteColorOptions } from '@mui/material';
declare module '@mui/material/styles' {
interface Theme {
@@ -33,33 +33,7 @@
}
}
-const theme = createTheme({
- palette: {
- primary: {
- light: '#E5EEF5', // same as "#0056991A"
- main: '#0071C9',
- dark: '#005699',
- },
- error: {
- main: '#CC0022',
- dark: '#720013',
- },
- success: {
- main: '#009980',
- },
- secondary: {
- main: '#A3C2DA',
- dark: '#06493F',
- },
- },
- InfoTooltip: {
- backgroundColor: {
- main: '#FFFFFF',
- },
- color: {
- main: '#292929',
- },
- },
+const fonts = {
typography: {
fontFamily: 'Ubuntu',
allVariants: {
@@ -166,185 +140,220 @@
`,
},
},
-});
+};
-export default createTheme(theme, {
- components: {
- MuiButton: {
- styleOverrides: {
- root: {
- height: '46px',
- fontWeight: 700,
- fontSize: '15px',
- lineHeight: '17px',
- textTransform: 'none',
- borderRadius: '5px',
- },
- sizeSmall: {
- height: '36px',
- },
- contained: {
- background: theme.palette.primary.dark,
- '&:hover': {
- background: theme.palette.primary.main,
- },
- },
- outlined: {
- background: '#FFF',
- borderColor: '#0056995C',
- color: theme.palette.primary.dark,
- '&:hover': {
- background: theme.palette.primary.light,
- borderColor: theme.palette.primary.dark,
- },
- },
- text: {
- background: '#fff',
- color: theme.palette.primary.dark,
- '&:hover': {
- background: theme.palette.primary.light,
- },
- },
+const palettes = {
+ light: {
+ palette: {
+ mode: 'light' as PaletteMode,
+ primary: {
+ light: '#E5EEF5', // same as "#0056991A"
+ main: '#0071C9',
+ dark: '#005699',
+ },
+ error: {
+ main: '#CC0022',
+ dark: '#720013',
+ },
+ success: {
+ main: '#009980',
+ },
+ secondary: {
+ main: '#A3C2DA',
+ dark: '#06493F',
},
},
- MuiDialog: {
- styleOverrides: {
- paper: {
- padding: '16px',
- boxShadow: '3px 3px 7px #00000029',
- borderRadius: '20px',
- },
+ InfoTooltip: {
+ backgroundColor: {
+ main: '#FFFFFF',
},
- },
- MuiDialogActions: {
- styleOverrides: {
- root: {
- padding: '0px',
- },
- },
- },
- MuiDialogContent: {
- styleOverrides: {
- root: {
- padding: '0px',
- margin: '16px 0px',
- minWidth: '500px',
- },
- },
- },
- MuiDialogTitle: {
- styleOverrides: {
- root: {
- padding: '0px',
- },
- },
- },
- MuiSwitch: {
- defaultProps: {
- disableRipple: true,
- },
- styleOverrides: {
- root: {
- width: '60px',
- height: '30px',
- padding: 0,
- },
- switchBase: {
- padding: 0,
- '&.Mui-checked': {
- transform: `translateX(30px)`,
- },
- },
- thumb: {
- width: '28px',
- height: '28px',
- border: `1px solid ${theme.palette.primary.dark}`,
- '.Mui-checked.Mui-checked &': {
- width: '30px',
- height: '30px',
- border: 'none',
- },
- },
- track: {
- backgroundColor: theme.palette.primary.light,
- borderRadius: '30px',
- opacity: 1,
- '.Mui-checked.Mui-checked + &': {
- backgroundColor: theme.palette.primary.light,
- opacity: 1,
- },
- },
- colorPrimary: {
- color: '#fff',
- '&.Mui-checked': {
- color: theme.palette.primary.dark,
- },
- },
- },
- },
- MuiInput: {
- styleOverrides: {
- root: {
- color: theme.palette.primary.dark,
- '&.Mui-error': {
- color: theme.palette.error.main,
- },
- },
- underline: {
- /*
- Material UI uses "before" for the regular underline.
- There is a second underline called "after" placed over "before"
- */
- '&:before': {
- borderBottom: `2px solid ${theme.palette.primary.dark}`,
- },
- '&:hover:not(.Mui-disabled, .Mui-error):before': {
- borderBottom: '2px solid #03B9E9',
- },
- '&:after': {
- borderBottom: '2px solid #03B9E9',
- },
- '&:hover:not(.Mui-error):after': {
- borderBottom: '2px solid #03B9E9',
- },
- },
- },
- },
- MuiFormControl: {
- styleOverrides: {
- root: {
- height: '90px',
- },
- },
- },
- MuiFormHelperText: {
- styleOverrides: {
- root: {
- position: 'absolute',
- bottom: '0px',
- fontSize: '15px',
- },
- },
- },
- MuiInputLabel: {
- styleOverrides: {
- root: {
- color: 'black',
- fontSize: '15px',
- left: '50%',
- transform: 'translate(-50%, 20px)',
- transition: 'left .2s, transform .2s',
- },
- shrink: {
- color: 'black',
- left: 0,
- transform: 'translate(0, 50px) scale(0.75)',
- transition: 'left .2s, transform .2s',
- '&.Mui-focused, &.Mui-error': {
- color: 'black',
- },
- },
+ color: {
+ main: '#292929',
},
},
},
-});
+ dark: {
+ palette: {
+ mode: 'dark' as PaletteMode,
+ primary: {
+ light: '#E5EEF5', // same as "#0056991A"
+ main: '#0071C9',
+ dark: '#005699',
+ },
+ error: {
+ main: '#CC0022',
+ dark: '#720013',
+ },
+ success: {
+ main: '#009980',
+ },
+ secondary: {
+ main: '#A3C2DA',
+ dark: '#06493F',
+ },
+ },
+ InfoTooltip: {
+ backgroundColor: {
+ main: '#FFFFFF',
+ },
+ color: {
+ main: '#292929',
+ },
+ },
+ },
+};
+
+export const buildDefaultTheme = (mode: PaletteMode) => {
+ // Attemps to set the fonts on the second "createTheme" has resulted with wrong font-families
+ const partialTheme = createTheme({ ...palettes[mode], ...fonts });
+ const palette = partialTheme.palette;
+
+ return createTheme(partialTheme, {
+ components: {
+ MuiButton: {
+ styleOverrides: {
+ root: {
+ height: '46px',
+ fontWeight: 700,
+ fontSize: '15px',
+ lineHeight: '17px',
+ textTransform: 'none',
+ borderRadius: '5px',
+ },
+ sizeSmall: {
+ height: '36px',
+ },
+ contained: {
+ background: palette.primary.dark,
+ '&:hover': {
+ background: palette.primary.main,
+ },
+ },
+ outlined: {
+ background: '#FFF',
+ borderColor: '#0056995C',
+ color: palette.primary.dark,
+ '&:hover': {
+ background: palette.primary.light,
+ borderColor: palette.primary.dark,
+ },
+ },
+ text: {
+ background: '#fff',
+ color: palette.primary.dark,
+ '&:hover': {
+ background: palette.primary.light,
+ },
+ },
+ },
+ },
+ MuiSwitch: {
+ defaultProps: {
+ disableRipple: true,
+ },
+ styleOverrides: {
+ root: {
+ width: '60px',
+ height: '30px',
+ padding: 0,
+ },
+ switchBase: {
+ padding: 0,
+ '&.Mui-checked': {
+ transform: `translateX(30px)`,
+ },
+ },
+ thumb: {
+ width: '28px',
+ height: '28px',
+ border: `1px solid ${palette.primary.dark}`,
+ '.Mui-checked.Mui-checked &': {
+ width: '30px',
+ height: '30px',
+ border: 'none',
+ },
+ },
+ track: {
+ backgroundColor: palette.primary.light,
+ borderRadius: '30px',
+ opacity: 1,
+ '.Mui-checked.Mui-checked + &': {
+ backgroundColor: palette.primary.light,
+ opacity: 1,
+ },
+ },
+ colorPrimary: {
+ color: '#fff',
+ '&.Mui-checked': {
+ color: palette.primary.dark,
+ },
+ },
+ },
+ },
+ MuiInput: {
+ styleOverrides: {
+ root: {
+ color: palette.primary.dark,
+ '&.Mui-error': {
+ color: palette.error.main,
+ },
+ },
+ underline: {
+ /*
+ Material UI uses "before" for the regular underline.
+ There is a second underline called "after" placed over "before"
+ */
+ '&:before': {
+ borderBottom: `2px solid ${palette.primary.dark}`,
+ },
+ '&:hover:not(.Mui-disabled, .Mui-error):before': {
+ borderBottom: '2px solid #03B9E9',
+ },
+ '&:after': {
+ borderBottom: '2px solid #03B9E9',
+ },
+ '&:hover:not(.Mui-error):after': {
+ borderBottom: '2px solid #03B9E9',
+ },
+ },
+ },
+ },
+ MuiFormControl: {
+ styleOverrides: {
+ root: {
+ height: '90px',
+ },
+ },
+ },
+ MuiFormHelperText: {
+ styleOverrides: {
+ root: {
+ position: 'absolute',
+ bottom: '0px',
+ fontSize: '15px',
+ },
+ },
+ },
+ MuiInputLabel: {
+ styleOverrides: {
+ root: {
+ color: 'black',
+ fontSize: '15px',
+ left: '50%',
+ transform: 'translate(-50%, 20px)',
+ transition: 'left .2s, transform .2s',
+ },
+ shrink: {
+ color: 'black',
+ left: 0,
+ transform: 'translate(0, 50px) scale(0.75)',
+ transition: 'left .2s, transform .2s',
+ '&.Mui-focused, &.Mui-error': {
+ color: 'black',
+ },
+ },
+ },
+ },
+ },
+ });
+};