mirror of
https://github.com/lingble/twenty.git
synced 2025-11-01 21:27:58 +00:00
Renaming "Experience" to "Appearance" (#2776)
* refining settings * Delete .idea/workspace.xml * Update .gitignore
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,5 +1,6 @@
|
|||||||
**/**/.env
|
**/**/.env
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.idea/workspace.xml
|
||||||
node_modules/
|
node_modules/
|
||||||
# yarn is the recommended package manager across the project
|
# yarn is the recommended package manager across the project
|
||||||
.package-lock.json
|
.package-lock.json
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import { SettingsObjects } from '~/pages/settings/data-model/SettingsObjects';
|
|||||||
import { SettingsDevelopersApiKeyDetail } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail';
|
import { SettingsDevelopersApiKeyDetail } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail';
|
||||||
import { SettingsDevelopersApiKeys } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeys';
|
import { SettingsDevelopersApiKeys } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeys';
|
||||||
import { SettingsDevelopersApiKeysNew } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew';
|
import { SettingsDevelopersApiKeysNew } from '~/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew';
|
||||||
import { SettingsExperience } from '~/pages/settings/SettingsExperience';
|
import { SettingsAppearance } from '~/pages/settings/SettingsAppearance';
|
||||||
import { SettingsProfile } from '~/pages/settings/SettingsProfile';
|
import { SettingsProfile } from '~/pages/settings/SettingsProfile';
|
||||||
import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace';
|
import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace';
|
||||||
import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';
|
import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';
|
||||||
@@ -66,8 +66,8 @@ export const App = () => {
|
|||||||
element={<SettingsProfile />}
|
element={<SettingsProfile />}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
path={SettingsPath.Experience}
|
path={SettingsPath.Appearance}
|
||||||
element={<SettingsExperience />}
|
element={<SettingsAppearance />}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
path={SettingsPath.WorkspaceMembersPage}
|
path={SettingsPath.WorkspaceMembersPage}
|
||||||
|
|||||||
@@ -41,12 +41,12 @@ export const SettingsNavbar = () => {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<NavItem
|
<NavItem
|
||||||
label="Experience"
|
label="Appearance"
|
||||||
to="/settings/profile/experience"
|
to="/settings/profile/appearance"
|
||||||
Icon={IconColorSwatch}
|
Icon={IconColorSwatch}
|
||||||
active={
|
active={
|
||||||
!!useMatch({
|
!!useMatch({
|
||||||
path: useResolvedPath('/settings/profile/experience').pathname,
|
path: useResolvedPath('/settings/profile/appearance').pathname,
|
||||||
end: true,
|
end: true,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export enum SettingsPath {
|
export enum SettingsPath {
|
||||||
ProfilePage = 'profile',
|
ProfilePage = 'profile',
|
||||||
Experience = 'profile/experience',
|
Appearance = 'profile/appearance',
|
||||||
Objects = 'objects',
|
Objects = 'objects',
|
||||||
ObjectDetail = 'objects/:objectSlug',
|
ObjectDetail = 'objects/:objectSlug',
|
||||||
ObjectEdit = 'objects/:objectSlug/edit',
|
ObjectEdit = 'objects/:objectSlug/edit',
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ const navItems = (
|
|||||||
active
|
active
|
||||||
/>
|
/>
|
||||||
<NavItem
|
<NavItem
|
||||||
label="Experience"
|
label="Appearance"
|
||||||
to="/settings/profile/experience"
|
to="/settings/profile/appearance"
|
||||||
Icon={IconColorSwatch}
|
Icon={IconColorSwatch}
|
||||||
/>
|
/>
|
||||||
<NavTitle label="Workspace" />
|
<NavTitle label="Workspace" />
|
||||||
|
|||||||
@@ -13,15 +13,15 @@ const StyledH1Title = styled(H1Title)`
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const SettingsExperience = () => {
|
export const SettingsAppearance = () => {
|
||||||
const { colorScheme, setColorScheme } = useColorScheme();
|
const { colorScheme, setColorScheme } = useColorScheme();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
<SettingsPageContainer>
|
<SettingsPageContainer>
|
||||||
<StyledH1Title title="Experience" />
|
<StyledH1Title title="Appearance" />
|
||||||
<Section>
|
<Section>
|
||||||
<H2Title title="Appearance" />
|
<H2Title title="Theme" />
|
||||||
<ColorSchemePicker value={colorScheme} onChange={setColorScheme} />
|
<ColorSchemePicker value={colorScheme} onChange={setColorScheme} />
|
||||||
</Section>
|
</Section>
|
||||||
</SettingsPageContainer>
|
</SettingsPageContainer>
|
||||||
@@ -6,13 +6,13 @@ import {
|
|||||||
} from '~/testing/decorators/PageDecorator';
|
} from '~/testing/decorators/PageDecorator';
|
||||||
import { graphqlMocks } from '~/testing/graphqlMocks';
|
import { graphqlMocks } from '~/testing/graphqlMocks';
|
||||||
|
|
||||||
import { SettingsExperience } from '../SettingsExperience';
|
import { SettingsAppearance } from '../SettingsAppearance';
|
||||||
|
|
||||||
const meta: Meta<PageDecoratorArgs> = {
|
const meta: Meta<PageDecoratorArgs> = {
|
||||||
title: 'Pages/Settings/SettingsExperience',
|
title: 'Pages/Settings/SettingsAppearance',
|
||||||
component: SettingsExperience,
|
component: SettingsAppearance,
|
||||||
decorators: [PageDecorator],
|
decorators: [PageDecorator],
|
||||||
args: { routePath: '/settings/experience' },
|
args: { routePath: '/settings/appearance' },
|
||||||
parameters: {
|
parameters: {
|
||||||
msw: graphqlMocks,
|
msw: graphqlMocks,
|
||||||
},
|
},
|
||||||
@@ -20,6 +20,6 @@ const meta: Meta<PageDecoratorArgs> = {
|
|||||||
|
|
||||||
export default meta;
|
export default meta;
|
||||||
|
|
||||||
export type Story = StoryObj<typeof SettingsExperience>;
|
export type Story = StoryObj<typeof SettingsAppearance>;
|
||||||
|
|
||||||
export const Default: Story = {};
|
export const Default: Story = {};
|
||||||
@@ -22,8 +22,8 @@ export const getPageTitleFromPath = (pathname: string): string => {
|
|||||||
return 'Opportunities';
|
return 'Opportunities';
|
||||||
case `${AppBasePath.Settings}/${SettingsPath.ProfilePage}`:
|
case `${AppBasePath.Settings}/${SettingsPath.ProfilePage}`:
|
||||||
return 'Profile';
|
return 'Profile';
|
||||||
case `${AppBasePath.Settings}/${SettingsPath.Experience}`:
|
case `${AppBasePath.Settings}/${SettingsPath.Appearance}`:
|
||||||
return 'Experience';
|
return 'Appearance';
|
||||||
case `${AppBasePath.Settings}/${SettingsPath.WorkspaceMembersPage}`:
|
case `${AppBasePath.Settings}/${SettingsPath.WorkspaceMembersPage}`:
|
||||||
return 'Workspace Members';
|
return 'Workspace Members';
|
||||||
case `${AppBasePath.Settings}/${SettingsPath.Workspace}`:
|
case `${AppBasePath.Settings}/${SettingsPath.Workspace}`:
|
||||||
|
|||||||
Reference in New Issue
Block a user