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/components/CustomSelect.tsx b/client/src/components/CustomSelect.tsx
new file mode 100644
index 0000000..fc377db
--- /dev/null
+++ b/client/src/components/CustomSelect.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 Savoir-faire Linux Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+
+import { MenuItem, MenuItemProps, Select, SelectProps } from '@mui/material';
+
+export interface CustomSelectOption {
+ label: string;
+ value: MenuItemProps['value'];
+}
+
+export interface CustomSelectProps extends Omit<SelectProps, 'label'> {
+ value: CustomSelectOption['value'];
+ options: CustomSelectOption[];
+ onChange: SelectProps['onChange'];
+}
+
+const CustomSelect = ({ value, options, onChange }: CustomSelectProps) => {
+ return (
+ <Select onChange={onChange} value={value}>
+ {options.map((option) => (
+ <MenuItem key={option.label} value={option.value}>
+ {option.label}
+ </MenuItem>
+ ))}
+ </Select>
+ );
+};
+export { CustomSelect };
diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx
index 8373601..64d4c12 100644
--- a/client/src/components/Header.tsx
+++ b/client/src/components/Header.tsx
@@ -36,11 +36,12 @@
return (
<Box>
<Button aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
- Menu
+ {t('Menu')}
</Button>
<Menu id="simple-menu" anchorEl={anchorEl} open={Boolean(anchorEl)} onClose={handleClose}>
<MenuItem onClick={goToContacts}>Contacts</MenuItem>
- <MenuItem onClick={() => navigate('/settings')}>Account settings</MenuItem>
+ <MenuItem onClick={() => navigate('/settings-account')}>{t('settings_account')}</MenuItem>
+ <MenuItem onClick={() => navigate('/settings-general')}>{t('settings_general')}</MenuItem>
<MenuItem onClick={logout}>{t('logout')}</MenuItem>
</Menu>
</Box>
diff --git a/client/src/components/Settings.tsx b/client/src/components/Settings.tsx
new file mode 100644
index 0000000..81333de
--- /dev/null
+++ b/client/src/components/Settings.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2022 Savoir-faire Linux Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <https://www.gnu.org/licenses/>.
+ */
+import { Button, FormLabel, List, ListItem, ListSubheader, Stack, Switch, SwitchProps } from '@mui/material';
+import { Box } from '@mui/system';
+import { MouseEventHandler, ReactElement } from 'react';
+
+import { CustomSelect, CustomSelectProps } from './CustomSelect';
+
+interface Setting {
+ label: string;
+}
+
+interface SettingBaseProps {
+ label: string;
+ children: ReactElement;
+}
+
+const SettingBase = ({ label, children }: SettingBaseProps) => {
+ return (
+ <ListItem sx={{ padding: 0, margin: 0 }}>
+ <FormLabel sx={{ width: '100%' }}>
+ <Stack direction="row">
+ <Box flexGrow={1}>{label}</Box>
+ {children}
+ </Stack>
+ </FormLabel>
+ </ListItem>
+ );
+};
+
+interface SettingButtonProps extends Setting {
+ onClick: MouseEventHandler;
+}
+
+export const SettingButton = ({ onClick, ...settingBaseProps }: SettingButtonProps) => {
+ return (
+ <SettingBase {...settingBaseProps}>
+ <Button variant="contained" size="small" onClick={onClick} />
+ </SettingBase>
+ );
+};
+
+interface SettingSelectProps extends Setting, CustomSelectProps {}
+
+export const SettingSelect = ({ options, value, onChange, ...settingBaseProps }: SettingSelectProps) => {
+ return (
+ <SettingBase {...settingBaseProps}>
+ <CustomSelect value={value} options={options} onChange={onChange} />
+ </SettingBase>
+ );
+};
+
+interface SettingSwitchProps extends Setting {
+ checked: SwitchProps['checked'];
+ onChange: SwitchProps['onChange'];
+}
+
+export const SettingSwitch = ({ checked, onChange, ...settingBaseProps }: SettingSwitchProps) => {
+ return (
+ <SettingBase {...settingBaseProps}>
+ <Switch checked={checked} onChange={onChange} />
+ </SettingBase>
+ );
+};
+
+interface SettingGroupProps {
+ label: string;
+ children: ReactElement[];
+}
+
+export const SettingsGroup = ({ label, children }: SettingGroupProps) => {
+ return <List subheader={<ListSubheader>{label}</ListSubheader>}>{children}</List>;
+};