Merge branch 'feat/datacenter' into feat/datacenter-i18n

packages/app/src/components/workspace-modal/index.tsx

@@ -2,15 +2,15 @@ import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal';
 import { Wrapper } from '@/ui/layout';
 import { useState } from 'react';
 import { CreateWorkspaceModal } from '../create-workspace';
+
 import { Tooltip } from '@/ui/tooltip';
-import { toast } from '@/ui/toast';
 
 import { AddIcon, HelpCenterIcon } from '@blocksuite/icons';
 
 import { useAppState } from '@/providers/app-state-provider';
 import { useRouter } from 'next/router';
 import { useTranslation } from '@affine/i18n';
-import { LanguageMenu } from './LanguageMenu';
+import { LanguageMenu } from './SelectLanguageMenu';
 
 import { LoginModal } from '../login-modal';
 import { LogoutModal } from '../logout-modal';
@@ -29,7 +29,6 @@ import {
 } from './styles';
 import { WorkspaceCard } from './WorkspaceCard';
 import { Footer } from './Footer';
-import { useConfirm } from '@/providers/ConfirmProvider';
 interface WorkspaceModalProps {
   open: boolean;
   onClose: () => void;
@@ -42,7 +41,6 @@ export const WorkspaceModal = ({ open, onClose }: WorkspaceModalProps) => {
   const { t } = useTranslation();
   const [loginOpen, setLoginOpen] = useState(false);
   const [logoutOpen, setLogoutOpen] = useState(false);
-  const { confirm } = useConfirm();
 
   return (
     <>
@@ -117,19 +115,7 @@ export const WorkspaceModal = ({ open, onClose }: WorkspaceModalProps) => {
               setLoginOpen(true);
             }}
             onLogout={() => {
-              setLoginOpen(true);
-              confirm({
-                title: 'Sign out?',
-                content: `All data has been stored in the cloud. `,
-                confirmText: 'Sign out',
-                cancelText: 'Cancel',
-              }).then(async confirm => {
-                if (confirm) {
-                  await logout();
-                  await router.replace(`/workspace`);
-                  toast('Enabled success');
-                }
-              });
+              setLogoutOpen(true);
             }}
           />
         </ModalWrapper>

packages/app/src/components/workspace-modal/languageMenu.tsx

@@ -1,61 +0,0 @@
-import { LOCALES } from '@affine/i18n';
-import { styled } from '@/styles';
-import { useTranslation } from '@affine/i18n';
-import { ArrowDownIcon } from '@blocksuite/icons';
-import { Button } from '@/ui/button';
-import { Menu, MenuItem } from '@/ui/menu';
-
-const LanguageMenuContent = () => {
-  const { i18n } = useTranslation();
-  const changeLanguage = (event: string) => {
-    i18n.changeLanguage(event);
-  };
-  return (
-    <>
-      {LOCALES.map(option => {
-        return (
-          <ListItem
-            key={option.name}
-            title={option.name}
-            onClick={() => {
-              changeLanguage(option.tag);
-            }}
-          >
-            {option.originalName}
-          </ListItem>
-        );
-      })}
-    </>
-  );
-};
-export const LanguageMenu = () => {
-  const { i18n } = useTranslation();
-
-  const currentLanguage = LOCALES.find(item => item.tag === i18n.language);
-
-  return (
-    <Menu
-      content={<LanguageMenuContent />}
-      placement="bottom"
-      trigger="click"
-      disablePortal={true}
-    >
-      <Button
-        icon={<ArrowDownIcon />}
-        iconPosition="end"
-        noBorder={true}
-        style={{ textTransform: 'capitalize' }}
-      >
-        {currentLanguage?.originalName}
-      </Button>
-    </Menu>
-  );
-};
-
-const ListItem = styled(MenuItem)(({ theme }) => ({
-  height: '38px',
-  color: theme.colors.popoverColor,
-  fontSize: theme.font.sm,
-  textTransform: 'capitalize',
-  padding: '0 24px',
-}));