From baa67e2aed95a694a20c3222be9e51aa450b2dfe Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 21 Mar 2023 08:18:11 +0800 Subject: [PATCH] chore: fix import references --- .../components/_shared/database-hooks/loadField.ts | 2 +- .../grid/GridTableHeader/GridTableHeader.hooks.tsx | 2 +- .../components/grid/GridTableHeader/GridTableHeader.tsx | 2 +- .../components/layout/NavigationPanel/FolderItem.hooks.ts | 2 +- .../layout/NavigationPanel/NavigationPanel.hooks.ts | 2 +- .../components/layout/NavigationPanel/PageItem.tsx | 2 +- .../components/user/application/notifications/parser.ts | 4 ++-- .../user/application/notifications/user_listener.ts | 4 ++-- .../stores/effects/database/cell/cell_bd_svc.ts | 5 ++--- .../stores/effects/database/cell/cell_observer.ts | 4 ++-- .../stores/effects/database/cell/controller_builder.ts | 2 +- .../stores/effects/database/cell/data_parser.ts | 6 ++---- .../stores/effects/database/cell/data_persistence.ts | 6 ++---- .../stores/effects/database/cell/select_option_bd_svc.ts | 4 ++-- .../stores/effects/database/view/view_row_observer.ts | 4 ++-- .../src/appflowy_app/stores/reducers/current-user/slice.ts | 2 +- .../src/appflowy_app/stores/reducers/database/slice.ts | 4 ++-- .../stores/reducers/folders/notifications/parser.ts | 4 ++-- .../src/appflowy_app/stores/reducers/grid/slice.ts | 2 +- .../src/appflowy_app/stores/reducers/pages/slice.ts | 2 +- 20 files changed, 30 insertions(+), 35 deletions(-) diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/loadField.ts b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/loadField.ts index 459794f455..25471b07d7 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/loadField.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/loadField.ts @@ -9,7 +9,7 @@ import { NumberFormat, SingleSelectTypeOptionPB, TimeFormat, -} from '../../../../services/backend'; +} from '@/services/backend'; import { makeChecklistTypeOptionContext, makeDateTypeOptionContext, diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.hooks.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.hooks.tsx index 46d778f0ec..d05ddaf5f3 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.hooks.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.hooks.tsx @@ -1,5 +1,5 @@ import { nanoid } from 'nanoid'; -import { FieldType } from '../../../../services/backend/models/flowy-database/field_entities'; +import { FieldType } from '@/services/backend/models/flowy-database/field_entities'; import { gridActions } from '../../../stores/reducers/grid/slice'; import { useAppDispatch, useAppSelector } from '../../../stores/store'; diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.tsx index 084d2c5749..27c0b72a96 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableHeader/GridTableHeader.tsx @@ -7,7 +7,7 @@ import { SingleSelectTypeSvg } from '../../_shared/svg/SingleSelectTypeSvg'; import { MultiSelectTypeSvg } from '../../_shared/svg/MultiSelectTypeSvg'; import { ChecklistTypeSvg } from '../../_shared/svg/ChecklistTypeSvg'; import { UrlTypeSvg } from '../../_shared/svg/UrlTypeSvg'; -import { FieldType } from '../../../../services/backend/models/flowy-database/field_entities'; +import { FieldType } from '@/services/backend/models/flowy-database/field_entities'; export const GridTableHeader = () => { const { fields, onAddField } = useGridTableHeaderHooks(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts index 3c38ab70cd..5c61a933ac 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts @@ -2,7 +2,7 @@ import { foldersActions, IFolder } from '../../../stores/reducers/folders/slice' import { useEffect, useState } from 'react'; import { useAppDispatch, useAppSelector } from '../../../stores/store'; import { IPage, pagesActions } from '../../../stores/reducers/pages/slice'; -import { AppPB, ViewLayoutTypePB } from '../../../../services/backend'; +import { AppPB, ViewLayoutTypePB } from '@/services/backend'; import { AppBackendService } from '../../../stores/effects/folder/app/app_bd_svc'; import { WorkspaceBackendService } from '../../../stores/effects/folder/workspace/workspace_bd_svc'; import { useError } from '../../error/Error.hooks'; diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.hooks.ts index 1387291293..d728c1e838 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.hooks.ts @@ -1,7 +1,7 @@ import { useAppSelector } from '../../../stores/store'; import { useNavigate } from 'react-router-dom'; import { IPage } from '../../../stores/reducers/pages/slice'; -import { ViewLayoutTypePB } from '../../../../services/backend'; +import { ViewLayoutTypePB } from '@/services/backend'; import { useState } from 'react'; export const useNavigationPanelHooks = function () { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.tsx index 6085fb2a8c..b1736c1435 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.tsx @@ -7,7 +7,7 @@ import { IPage } from '../../../stores/reducers/pages/slice'; import { Button } from '../../_shared/Button'; import { usePageEvents } from './PageItem.hooks'; import { RenamePopup } from './RenamePopup'; -import { ViewLayoutTypePB } from '../../../../services/backend'; +import { ViewLayoutTypePB } from '@/services/backend'; import { useEffect, useRef, useState } from 'react'; import { PAGE_ITEM_HEIGHT } from '../../_shared/constants'; diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/parser.ts b/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/parser.ts index 21e5bde9ff..4e3a57af4b 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/parser.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/parser.ts @@ -1,5 +1,5 @@ -import { FlowyError, UserNotification } from '../../../../../services/backend'; -import { NotificationParser, OnNotificationError } from '../../../../../services/backend/notifications'; +import { FlowyError, UserNotification } from '@/services/backend'; +import { NotificationParser, OnNotificationError } from '@/services/backend/notifications'; import { Result } from 'ts-results'; declare type UserNotificationCallback = (ty: UserNotification, payload: Result) => void; diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/user_listener.ts b/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/user_listener.ts index b22a285ce2..94e0043108 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/user_listener.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/user/application/notifications/user_listener.ts @@ -1,5 +1,5 @@ -import { FlowyError, UserNotification, UserProfilePB } from '../../../../../services/backend'; -import { AFNotificationObserver, OnNotificationError } from '../../../../../services/backend/notifications'; +import { FlowyError, UserNotification, UserProfilePB } from '@/services/backend'; +import { AFNotificationObserver, OnNotificationError } from '@/services/backend/notifications'; import { UserNotificationParser } from './parser'; import { Ok, Result } from 'ts-results'; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_bd_svc.ts index 03f22277bd..1b07ebfb0a 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_bd_svc.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_bd_svc.ts @@ -1,6 +1,5 @@ -import { DatabaseEventGetCell, DatabaseEventUpdateCell } from '../../../../../services/backend/events/flowy-database'; -import { CellChangesetPB, CellIdPB } from '../../../../../services/backend/models/flowy-database/cell_entities'; -import { FieldType } from '../../../../../services/backend/models/flowy-database/field_entities'; +import { DatabaseEventGetCell, DatabaseEventUpdateCell } from '@/services/backend/events/flowy-database'; +import { CellChangesetPB, CellIdPB, FieldType } from '@/services/backend'; class CellIdentifier { constructor( diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_observer.ts index 9aa9763a99..7796112559 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_observer.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/cell_observer.ts @@ -1,7 +1,7 @@ import { Ok, Result } from 'ts-results'; -import { ChangeNotifier } from '../../../../utils/change_notifier'; +import { ChangeNotifier } from '$app/utils/change_notifier'; import { DatabaseNotificationObserver } from '../notifications/observer'; -import { DatabaseNotification, FlowyError } from '../../../../../services/backend'; +import { DatabaseNotification, FlowyError } from '@/services/backend'; type UpdateCellNotifiedValue = Result; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts index 9d66dd6ee5..7858f5a938 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts @@ -1,4 +1,4 @@ -import { DateCellDataPB, FieldType, SelectOptionCellDataPB, URLCellDataPB } from '../../../../../services/backend'; +import { DateCellDataPB, FieldType, SelectOptionCellDataPB, URLCellDataPB } from '@/services/backend'; import { CellIdentifier } from './cell_bd_svc'; import { CellController } from './cell_controller'; import { diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_parser.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_parser.ts index 20a7a3e68d..86b2198b4e 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_parser.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_parser.ts @@ -1,10 +1,8 @@ import utf8 from 'utf8'; import { CellBackendService, CellIdentifier } from './cell_bd_svc'; -import { DateCellDataPB } from '../../../../../services/backend/models/flowy-database/date_type_option_entities'; -import { SelectOptionCellDataPB } from '../../../../../services/backend/models/flowy-database/select_type_option'; -import { URLCellDataPB } from '../../../../../services/backend/models/flowy-database/url_type_option_entities'; +import { SelectOptionCellDataPB, URLCellDataPB, DateCellDataPB } from '@/services/backend'; import { Err, None, Ok, Option, Some } from 'ts-results'; -import { Log } from '../../../../utils/log'; +import { Log } from '$app/utils/log'; abstract class CellDataParser { abstract parserData(data: Uint8Array): Option; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_persistence.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_persistence.ts index 26e0a4afb9..c6eb7288ec 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_persistence.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/data_persistence.ts @@ -1,10 +1,8 @@ import { Result } from 'ts-results'; -import { FlowyError } from '../../../../../services/backend/models/flowy-error'; import { CellBackendService, CellIdentifier } from './cell_bd_svc'; import { CalendarData } from './controller_builder'; -import { DateChangesetPB } from '../../../../../services/backend/models/flowy-database/date_type_option_entities'; -import { CellIdPB } from '../../../../../services/backend/models/flowy-database/cell_entities'; -import { DatabaseEventUpdateDateCell } from '../../../../../services/backend/events/flowy-database'; +import { DateChangesetPB, FlowyError, CellIdPB } from '@/services/backend'; +import { DatabaseEventUpdateDateCell } from '@/services/backend/events/flowy-database'; export abstract class CellDataPersistence { abstract save(data: D): Promise>; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/select_option_bd_svc.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/select_option_bd_svc.ts index 1ab1a61148..af4158db3b 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/select_option_bd_svc.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/select_option_bd_svc.ts @@ -5,13 +5,13 @@ import { SelectOptionCellChangesetPB, SelectOptionChangesetPB, SelectOptionPB, -} from '../../../../../services/backend'; +} from '@/services/backend'; import { DatabaseEventCreateSelectOption, DatabaseEventGetSelectOptionCellData, DatabaseEventUpdateSelectOption, DatabaseEventUpdateSelectOptionCell, -} from '../../../../../services/backend/events/flowy-database'; +} from '@/services/backend/events/flowy-database'; export class SelectOptionBackendService { constructor(public readonly viewId: string, public readonly fieldId: string) {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/view/view_row_observer.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/view/view_row_observer.ts index 198c86e598..b3da8cd061 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/view/view_row_observer.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/view/view_row_observer.ts @@ -6,8 +6,8 @@ import { ReorderSingleRowPB, RowsChangesetPB, RowsVisibilityChangesetPB, -} from '../../../../../services/backend'; -import { ChangeNotifier } from '../../../../utils/change_notifier'; +} from '@/services/backend'; +import { ChangeNotifier } from '$app/utils/change_notifier'; import { DatabaseNotificationObserver } from '../notifications/observer'; export type RowsVisibilityNotifyValue = Result; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts index 969925bdc3..4b5fbcb5ea 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { nanoid } from 'nanoid'; -import { WorkspaceSettingPB } from '../../../../services/backend/models/flowy-folder/workspace'; +import { WorkspaceSettingPB } from '@/services/backend/models/flowy-folder/workspace'; export interface ICurrentUser { id?: string; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/database/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/database/slice.ts index 005fa75781..1c4947e3cb 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/database/slice.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/database/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { FieldType } from '../../../../services/backend/models/flowy-database/field_entities'; -import { DateFormat, NumberFormat, SelectOptionColorPB, TimeFormat } from '../../../../services/backend'; +import { FieldType } from '@/services/backend/models/flowy-database/field_entities'; +import { DateFormat, NumberFormat, SelectOptionColorPB, TimeFormat } from '@/services/backend'; export interface ISelectOption { selectOptionId: string; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts index e0220a9f22..27c091458b 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts @@ -1,5 +1,5 @@ -import { FlowyError, FolderNotification } from '../../../../../services/backend'; -import { NotificationParser, OnNotificationError } from '../../../../../services/backend/notifications'; +import { FlowyError, FolderNotification } from '@/services/backend'; +import { NotificationParser, OnNotificationError } from '@/services/backend/notifications'; import { Result } from 'ts-results'; declare type FolderNotificationCallback = (ty: FolderNotification, payload: Result) => void; diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts index 139bd4f012..5b72e7a270 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { nanoid } from 'nanoid'; -import { FieldType } from '../../../../services/backend/models/flowy-database/field_entities'; +import { FieldType } from '@/services/backend/models/flowy-database/field_entities'; const initialState = { title: 'My plans on the week', diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts index 9c7700d11b..804038444f 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { ViewLayoutTypePB } from '../../../../services/backend'; +import { ViewLayoutTypePB } from '@/services/backend'; export interface IPage { id: string;