luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: merge issue

Browse Source
This commit is contained in:
linonetwo
2023-01-10 18:15:02 +08:00
parent 09e900b1f7
commit abc895c6b2
8 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client-app/src-OctoBase

Submodule client-app/src-OctoBase updated: b941d0a8a9...456b68ec75

2
packages/app/src/components/create-workspace/index.tsx
View File

@@ -5,7 +5,7 @@ import { useState } from 'react';
import Input from '@/ui/input'; import Input from '@/ui/input';
import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; import { useTemporaryHelper } from '@/providers/temporary-helper-provider';
import { KeyboardEvent } from 'react'; import { KeyboardEvent } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from '@affine/i18n';
interface ICloseParams { interface ICloseParams {
workspaceId?: string; workspaceId?: string;
} }

2
packages/app/src/components/edgeless-toolbar/index.tsx
View File

@@ -19,7 +19,7 @@ import Slide from '@mui/material/Slide';
import useCurrentPageMeta from '@/hooks/use-current-page-meta'; import useCurrentPageMeta from '@/hooks/use-current-page-meta';
import { useAppState } from '@/providers/app-state-provider'; import { useAppState } from '@/providers/app-state-provider';
import useHistoryUpdated from '@/hooks/use-history-update'; import useHistoryUpdated from '@/hooks/use-history-update';
import { useTranslation } from 'react-i18next'; import { useTranslation } from '@affine/i18n';
const useToolbarList1 = () => { const useToolbarList1 = () => {
const { t } = useTranslation(); const { t } = useTranslation();

2
packages/app/src/components/file-upload/index.tsx
View File

@@ -1,7 +1,7 @@
import { Button } from '@/ui/button'; import { Button } from '@/ui/button';
import { FC, useRef, ChangeEvent, ReactElement } from 'react'; import { FC, useRef, ChangeEvent, ReactElement } from 'react';
import { styled } from '@/styles'; import { styled } from '@/styles';
import { useTranslation } from 'react-i18next'; import { useTranslation } from '@affine/i18n';
interface Props { interface Props {
uploadType?: string; uploadType?: string;
children?: ReactElement; children?: ReactElement;

2
packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx
View File

@@ -4,7 +4,7 @@ import { useAppState } from '@/providers/app-state-provider';
import { useConfirm } from '@/providers/ConfirmProvider'; import { useConfirm } from '@/providers/ConfirmProvider';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import useCurrentPageMeta from '@/hooks/use-current-page-meta'; import useCurrentPageMeta from '@/hooks/use-current-page-meta';
import { useTranslation } from 'react-i18next'; import { useTranslation } from '@affine/i18n';
export const TrashButtonGroup = () => { export const TrashButtonGroup = () => {
const { permanentlyDeletePage } = usePageHelper(); const { permanentlyDeletePage } = usePageHelper();

2
packages/app/src/components/workspace-modal/index.tsx
View File

@@ -10,7 +10,7 @@ import {
UsersIcon, UsersIcon,
AddIcon, AddIcon,
} from '@blocksuite/icons'; } from '@blocksuite/icons';
import { useConfirm } from '@/providers/confirm-provider'; import { useConfirm } from '@/providers/ConfirmProvider';
import { toast } from '@/ui/toast'; import { toast } from '@/ui/toast';
import { WorkspaceAvatar } from '@/components/workspace-avatar'; import { WorkspaceAvatar } from '@/components/workspace-avatar';
import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; import { useTemporaryHelper } from '@/providers/temporary-helper-provider';

3
packages/app/src/components/workspace-modal/languageMenu.tsx
View File

@@ -1,10 +1,9 @@
import { LOCALES } from '@/libs/i18n/resources/index';
import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore'; import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore';
import type { TooltipProps } from '@mui/material'; import type { TooltipProps } from '@mui/material';
import { styled } from '@/styles'; import { styled } from '@/styles';
import { Button, Tooltip } from '@mui/material'; import { Button, Tooltip } from '@mui/material';
import { useState } from 'react'; import { useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation, LOCALES } from '@affine/i18n';
export const LanguageMenu = () => { export const LanguageMenu = () => {
const { i18n } = useTranslation(); const { i18n } = useTranslation();

2
packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
View File

@@ -12,7 +12,7 @@ import {
} from './WorkspaceItem'; } from './WorkspaceItem';
import { WorkspaceSetting } from '@/components/workspace-setting'; import { WorkspaceSetting } from '@/components/workspace-setting';
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
import { getDataCenter, WorkspaceType } from '@affine/datacenter'; import { WorkspaceType } from '@affine/datacenter';
import { useModal } from '@/providers/GlobalModalProvider'; import { useModal } from '@/providers/GlobalModalProvider';
export type WorkspaceDetails = Record< export type WorkspaceDetails = Record<