refactor: refactor according to design and add menu item

reearth · Oct 9, 2024 · d5825d3 · d5825d3
1 parent ded91a0
commit d5825d3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/WorkspaceSetting/index.tsx b/web/src/beta/features/AccountAndWorkSpaceSetting/innerPages/WorkspaceSetting/index.tsx
@@ -59,7 +59,7 @@ const WorkspaceSetting: FC<Props> = ({
               title={t("Workspace Name")}
               value={currentWorkspace?.name ? t(currentWorkspace.name) : ""}
               onChange={setWorkspaceName}
-              appearance={currentWorkspace?.personal ? "readonly" : "present"}
+              appearance={currentWorkspace?.personal ? "readonly" : undefined}
               disabled={currentWorkspace?.personal}
             />
             <ButtonWrapper>

diff --git a/web/src/beta/features/Dashboard/LeftSidePanel/profile.tsx b/web/src/beta/features/Dashboard/LeftSidePanel/profile.tsx
@@ -58,6 +58,12 @@ export const Profile: FC<ProfileProp> = ({
         };
       })
     },
+    {
+      id: "workspaceSettings",
+      title: t("Workspace Settings"),
+      icon: "setting",
+      onClick: () => navigate("/settings/workspace")
+    },
     {
       id: "accountSettings",
       title: t("Account Settings"),

diff --git a/web/src/beta/lib/reearth-ui/components/ModalPanel/index.tsx b/web/src/beta/lib/reearth-ui/components/ModalPanel/index.tsx
@@ -79,7 +79,7 @@ const Content = styled("div")(() => ({
 
 const ActionWrapper = styled("div")<{ showBorder: boolean }>(
   ({ theme, showBorder }) => ({
-    padding: theme.spacing.normal,
+    padding: theme.spacing.large,
     background: theme.bg[1],
     borderBottomRightRadius: theme.radius.large,
     borderBottomLeftRadius: theme.radius.large,

diff --git a/web/src/beta/lib/reearth-ui/components/PopupMenu/index.tsx b/web/src/beta/lib/reearth-ui/components/PopupMenu/index.tsx
@@ -298,6 +298,9 @@ const Item = styled("div")<{
   backgroundColor: "transparent",
   "&:hover": {
     backgroundColor: `${theme.bg[2]}`
+  },
+  "&:nth-child(2)": {
+    borderBottom: `1px solid ${theme.outline.weak}`
   }
 }));
 

diff --git a/web/src/services/i18n/translations/en.yml b/web/src/services/i18n/translations/en.yml
@@ -74,6 +74,7 @@ Starred: ''
 Switch WorkSpace: ''
 Personal: ''
 Team Workspace: ''
+Workspace Settings: ''
 Account Settings: ''
 Log Out: ''
 Re:Earth Visualizer: ''

diff --git a/web/src/services/i18n/translations/ja.yml b/web/src/services/i18n/translations/ja.yml
@@ -74,6 +74,7 @@ Starred: ''
 Switch WorkSpace: ''
 Personal: ''
 Team Workspace: ''
+Workspace Settings: ''
 Account Settings: ''
 Log Out: ''
 Re:Earth Visualizer: ''