From 51041f686063a95f1973b6a71d02c20f6ad3e717 Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:24:16 +0800 Subject: [PATCH] CI: Appflowy tauri ci (#1851) * chore: add notification parser * chore: rename classes to models * refactor: add effects and reducers folder * chore: update eslint version * chore: run npx eslint --fix src * fix: ParserOptions.project error by ignore linting the .eslintrc.cjs * ci: add tauri lint * ci: disable ubuntu and windows tauri ci * ci: install --------- Co-authored-by: Annie --- .github/workflows/tauri_ci.yaml | 10 +++++++++- frontend/.vscode/settings.json | 2 ++ frontend/.vscode/tasks.json | 18 +++++++++++++----- frontend/appflowy_tauri/.eslintignore | 4 +++- frontend/appflowy_tauri/.gitignore | 2 +- frontend/appflowy_tauri/package.json | 9 ++++++--- .../appflowy_tauri/src/appflowy_app/App.tsx | 16 ++++++++-------- .../components/TestApiButton/TestApiButton.tsx | 14 +++++--------- .../ConfirmAccount/ConfirmAccount.hooks.ts | 4 ++-- .../components/auth/Login/Login.hooks.ts | 4 ++-- .../components/auth/SignUp/SignUp.hooks.ts | 4 ++-- .../appflowy_app/components/auth/auth.hooks.ts | 4 ++-- .../board/application/RemoveMeAction.ts | 1 - .../board/application/RemoveMeReducer.test.ts | 1 - .../board/application/RemoveMeReducer.ts | 1 - .../src/appflowy_app/components/board/index.ts | 1 - .../presentation/RemoveMeComponent.test.tsx | 1 - .../board/presentation/RemoveMeComponent.tsx | 1 - .../appflowy_app/components/editor/index.ts | 1 - .../presentation/RemoveMeComponent.test.tsx | 1 - .../editor/presentation/RemoveMeComponent.tsx | 1 - .../GridTableCount/GridTableCount.hooks.ts | 2 +- .../GridTableHeader/GridTableHeader.hooks.tsx | 6 +++--- .../grid/GridTableHeader/GridTableHeader.tsx | 2 +- .../grid/GridTableRows/GridAddRow.hooks.ts | 4 ++-- .../grid/GridTableRows/GridTableItem.hooks.ts | 4 ++-- .../grid/GridTableRows/GridTableRows.hooks.ts | 2 +- .../grid/GridTitle/GridTitle.hooks.ts | 4 ++-- .../grid/application/notifications/index.ts | 1 - .../layout/NavigationPanel/FolderItem.hooks.ts | 6 +++--- .../layout/NavigationPanel/FolderItem.tsx | 4 ++-- .../NavigationPanel/NavigationPanel.hooks.ts | 2 +- .../NavigationPanel/NavigationResizer.tsx | 4 ++-- .../NavigationPanel/NewFolderButton.hooks.ts | 4 ++-- .../layout/NavigationPanel/PageItem.hooks.ts | 4 ++-- .../layout/NavigationPanel/PageItem.tsx | 2 +- .../components/layout/Workspace.tsx | 2 +- .../user/application/notifications/parser.ts | 2 +- .../application/notifications/user_listener.ts | 4 ++-- .../home/application/notifications/index.ts | 1 - .../src/appflowy_app/home/index.ts | 1 - .../presentation/RemoveMeComponent.test.tsx | 1 - .../home/presentation/RemoveMeComponent.tsx | 1 - .../appflowy_tauri/src/appflowy_app/index.ts | 1 - .../reducers}/current-user/slice.ts | 0 .../reducers/folders}/notifications/parser.ts | 6 +++--- .../reducers}/folders/slice.ts | 0 .../reducers/grid}/notifications/parser.ts | 8 ++++---- .../{redux => stores/reducers}/grid/slice.ts | 2 +- .../reducers}/navigation-width/slice.ts | 0 .../{redux => stores/reducers}/pages/slice.ts | 0 .../src/appflowy_app/{ => stores}/store.ts | 10 +++++----- .../{pages => views}/BoardPage.tsx | 0 .../{pages => views}/ConfirmAccountPage.tsx | 0 .../{pages => views}/DocumentPage.tsx | 0 .../appflowy_app/{pages => views}/GridPage.tsx | 0 .../{pages => views}/LoginPage.tsx | 0 .../{pages => views}/SignUpPage.tsx | 0 .../appflowy_app/{pages => views}/Welcome.tsx | 0 .../src/services/backend/index.ts | 12 ++++++------ .../services/backend/notifications/listener.ts | 4 ++-- .../services/backend/notifications/parser.ts | 4 ++-- .../flowy-codegen/src/protobuf_file/mod.rs | 2 +- .../rust-lib/flowy-codegen/src/ts_event/mod.rs | 2 +- frontend/scripts/makefile/tauri.toml | 2 +- 65 files changed, 110 insertions(+), 106 deletions(-) delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeAction.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.test.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/index.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.test.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/editor/index.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.test.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/index.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/index.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/home/index.ts delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsx delete mode 100644 frontend/appflowy_tauri/src/appflowy_app/index.ts rename frontend/appflowy_tauri/src/appflowy_app/{redux => stores/reducers}/current-user/slice.ts (100%) rename frontend/appflowy_tauri/src/appflowy_app/{home/application => stores/reducers/folders}/notifications/parser.ts (83%) rename frontend/appflowy_tauri/src/appflowy_app/{redux => stores/reducers}/folders/slice.ts (100%) rename frontend/appflowy_tauri/src/appflowy_app/{components/grid/application => stores/reducers/grid}/notifications/parser.ts (70%) rename frontend/appflowy_tauri/src/appflowy_app/{redux => stores/reducers}/grid/slice.ts (96%) rename frontend/appflowy_tauri/src/appflowy_app/{redux => stores/reducers}/navigation-width/slice.ts (100%) rename frontend/appflowy_tauri/src/appflowy_app/{redux => stores/reducers}/pages/slice.ts (100%) rename frontend/appflowy_tauri/src/appflowy_app/{ => stores}/store.ts (84%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/BoardPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/ConfirmAccountPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/DocumentPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/GridPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/LoginPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/SignUpPage.tsx (100%) rename frontend/appflowy_tauri/src/appflowy_app/{pages => views}/Welcome.tsx (100%) diff --git a/.github/workflows/tauri_ci.yaml b/.github/workflows/tauri_ci.yaml index 8ff9eea35a..bdedeb45ef 100644 --- a/.github/workflows/tauri_ci.yaml +++ b/.github/workflows/tauri_ci.yaml @@ -14,7 +14,8 @@ jobs: strategy: fail-fast: false matrix: - platform: [macos-latest, ubuntu-20.04, windows-latest] + # platform: [macos-latest, ubuntu-20.04, windows-latest] + platform: [macos-latest] runs-on: ${{ matrix.platform }} steps: @@ -61,6 +62,13 @@ jobs: cargo install --force cargo-make cargo make appflowy-tauri-deps-tools + - name: lint + working-directory: frontend/appflowy_tauri + run: | + yarn --frozen-lockfile + yarn test:prettier + yarn test:code + - name: build working-directory: frontend/appflowy_tauri run: | diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json index df4284dcf5..93ea743c8a 100644 --- a/frontend/.vscode/settings.json +++ b/frontend/.vscode/settings.json @@ -27,6 +27,8 @@ "prettier.printWidth": 140, "editor.wordWrap": "wordWrapColumn", "dart.lineLength": 80, + "typescript.validate.enable": true, + "javascript.validate.enable": true, "files.associations": { "*.log.*": "log" }, diff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.json index bb56606f1b..e69ebd96c2 100644 --- a/frontend/.vscode/tasks.json +++ b/frontend/.vscode/tasks.json @@ -170,7 +170,7 @@ "type": "shell", "isBackground": true, "command": "npm run dev", - "problemMatcher": ["$tsc"], + "problemMatcher": "$tsc-watch", "options": { "cwd": "${workspaceFolder}/appflowy_tauri" } @@ -179,7 +179,7 @@ "label": "AF: Tauri UI Build", "type": "shell", "command": "npm run build", - "problemMatcher": ["$tsc"], + "problemMatcher": "$tsc-watch", "options": { "cwd": "${workspaceFolder}/appflowy_tauri" } @@ -188,7 +188,7 @@ "label": "AF: Tauri Dev", "type": "shell", "command": "npm run tauri dev", - "problemMatcher": ["$tsc"], + "problemMatcher": "$tsc-watch", "options": { "cwd": "${workspaceFolder}/appflowy_tauri" } @@ -200,7 +200,7 @@ "options": { "cwd": "${workspaceFolder}" }, - "problemMatcher": ["$tsc"] + "problemMatcher": "$tsc-watch" }, { "label": "AF: Tauri Clean + Dev", @@ -213,6 +213,14 @@ "options": { "cwd": "${workspaceFolder}" } - } + }, + { + "label": "AF: Tauri ESLint", + "type": "shell", + "command": "npx eslint --fix src", + "options": { + "cwd": "${workspaceFolder}/appflowy_tauri" + } + }, ] } \ No newline at end of file diff --git a/frontend/appflowy_tauri/.eslintignore b/frontend/appflowy_tauri/.eslintignore index d9a9c05b8f..fdb50c998f 100644 --- a/frontend/appflowy_tauri/.eslintignore +++ b/frontend/appflowy_tauri/.eslintignore @@ -1,2 +1,4 @@ /src/services -/src/styles \ No newline at end of file +/src/styles +.eslintrc.cjs +node_modules \ No newline at end of file diff --git a/frontend/appflowy_tauri/.gitignore b/frontend/appflowy_tauri/.gitignore index b88d2d0637..0ae4944041 100644 --- a/frontend/appflowy_tauri/.gitignore +++ b/frontend/appflowy_tauri/.gitignore @@ -23,5 +23,5 @@ dist-ssr *.sln *.sw? -**/src/services/backend/classes/ +**/src/services/backend/models/ **/src/services/backend/events/ \ No newline at end of file diff --git a/frontend/appflowy_tauri/package.json b/frontend/appflowy_tauri/package.json index ace80708fc..d78fd52236 100644 --- a/frontend/appflowy_tauri/package.json +++ b/frontend/appflowy_tauri/package.json @@ -8,6 +8,8 @@ "build": "tsc && vite build", "preview": "vite preview", "format": "prettier --write .", + "test:code": "eslint --max-warnings=0 --ext .js,.ts,.tsx .", + "test:prettier": "yarn prettier --list-different src", "tauri:dev": "tauri dev" }, "dependencies": { @@ -29,11 +31,12 @@ "@types/node": "^18.7.10", "@types/react": "^18.0.15", "@types/react-dom": "^18.0.6", - "@typescript-eslint/eslint-plugin": "^5.49.0", - "@typescript-eslint/parser": "^5.49.0", + "@typescript-eslint/eslint-plugin": "^5.51.0", + "@typescript-eslint/parser": "^5.51.0", "@vitejs/plugin-react": "^3.0.0", "autoprefixer": "^10.4.13", - "eslint": "^8.33.0", + "eslint": "^8.34.0", + "eslint-plugin-react": "^7.32.2", "postcss": "^8.4.21", "prettier": "^2.8.3", "prettier-plugin-tailwindcss": "^0.2.2", diff --git a/frontend/appflowy_tauri/src/appflowy_app/App.tsx b/frontend/appflowy_tauri/src/appflowy_app/App.tsx index 56a22bcb96..48601f4cd2 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/App.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/App.tsx @@ -2,16 +2,16 @@ import { Routes, Route, BrowserRouter } from 'react-router-dom'; import { TestColors } from './components/TestColors/TestColors'; import TestApiButton from './components/TestApiButton/TestApiButton'; -import { Welcome } from './pages/Welcome'; +import { Welcome } from './views/Welcome'; import { Provider } from 'react-redux'; -import { store } from './store'; -import { DocumentPage } from './pages/DocumentPage'; -import { BoardPage } from './pages/BoardPage'; -import { GridPage } from './pages/GridPage'; -import { LoginPage } from './pages/LoginPage'; +import { store } from './stores/store'; +import { DocumentPage } from './views/DocumentPage'; +import { BoardPage } from './views/BoardPage'; +import { GridPage } from './views/GridPage'; +import { LoginPage } from './views/LoginPage'; import { ProtectedRoutes } from './components/auth/ProtectedRoutes'; -import { SignUpPage } from './pages/SignUpPage'; -import { ConfirmAccountPage } from './pages/ConfirmAccountPage'; +import { SignUpPage } from './views/SignUpPage'; +import { ConfirmAccountPage } from './views/ConfirmAccountPage'; const App = () => { // const location = useLocation(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/TestApiButton/TestApiButton.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/TestApiButton/TestApiButton.tsx index 34cb036394..e25973e66c 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/TestApiButton/TestApiButton.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/TestApiButton/TestApiButton.tsx @@ -1,9 +1,6 @@ import { - UserEventSignIn, SignInPayloadPB, - UserEventGetUserProfile, - UserEventGetUserSetting, -} from '../../../services/backend/events/flowy-user/index'; +} from '../../../services/backend/models/flowy-user/index'; import { nanoid } from 'nanoid'; import { UserNotificationListener } from '../user/application/notifications'; import { @@ -11,14 +8,13 @@ import { CreateAppPayloadPB, CreateWorkspacePayloadPB, FolderEventCreateApp, - FolderEventCreateView, FolderEventCreateWorkspace, FolderEventOpenWorkspace, - FolderEventReadCurrentWorkspace, WorkspaceIdPB, } from '../../../services/backend/events/flowy-folder'; import { useEffect, useState } from 'react'; -import * as dependency_1 from '../../../services/backend/classes/flowy-folder/app'; +import * as dependency_1 from '../../../services/backend/models/flowy-folder/app'; +import { UserEventGetUserSetting, UserEventSignIn } from '../../../services/backend/events/flowy-user'; const TestApiButton = () => { const [workspaceId, setWorkspaceId] = useState(''); @@ -59,14 +55,14 @@ const TestApiButton = () => { }, [workspaceId]); async function sendSignInEvent() { - let make_payload = () => + const make_payload = () => SignInPayloadPB.fromObject({ email: nanoid(4) + '@gmail.com', password: 'A!@123abc', name: 'abc', }); - let listener = new UserNotificationListener({ + const listener = new UserNotificationListener({ onUserSignIn: (userProfile) => { console.log(userProfile); }, diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/ConfirmAccount/ConfirmAccount.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/auth/ConfirmAccount/ConfirmAccount.hooks.ts index 8532c680b3..2d92317fcc 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/ConfirmAccount/ConfirmAccount.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/ConfirmAccount/ConfirmAccount.hooks.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { currentUserActions } from '../../../redux/current-user/slice'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { currentUserActions } from '../../../stores/reducers/current-user/slice'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; import { useNavigate } from 'react-router-dom'; export const useConfirmAccount = () => { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/Login/Login.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/auth/Login/Login.hooks.ts index 102b04062e..eb6704dc05 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/Login/Login.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/Login/Login.hooks.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { currentUserActions } from '../../../redux/current-user/slice'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { currentUserActions } from '../../../stores/reducers/current-user/slice'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; import { useNavigate } from 'react-router-dom'; export const useLogin = () => { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/SignUp/SignUp.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/auth/SignUp/SignUp.hooks.ts index 8ddb959098..8a89f469d0 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/SignUp/SignUp.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/SignUp/SignUp.hooks.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { useAppDispatch, useAppSelector } from '../../../store'; -import { currentUserActions } from '../../../redux/current-user/slice'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; +import { currentUserActions } from '../../../stores/reducers/current-user/slice'; import { useNavigate } from 'react-router-dom'; export const useSignUp = () => { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts index 2b476a8a20..5fe606835c 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/auth.hooks.ts @@ -1,5 +1,5 @@ -import { currentUserActions } from '../../redux/current-user/slice'; -import { useAppDispatch, useAppSelector } from '../../store'; +import { currentUserActions } from '../../stores/reducers/current-user/slice'; +import { useAppDispatch, useAppSelector } from '../../stores/store'; export const useAuth = () => { const dispatch = useAppDispatch(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeAction.ts b/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeAction.ts deleted file mode 100644 index 693da49fc4..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeAction.ts +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.test.ts b/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.test.ts deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.test.ts +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.ts b/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.ts deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/application/RemoveMeReducer.ts +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/index.ts b/frontend/appflowy_tauri/src/appflowy_app/components/board/index.ts deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.test.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.test.tsx deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.test.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.tsx deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/board/presentation/RemoveMeComponent.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/editor/index.ts b/frontend/appflowy_tauri/src/appflowy_app/components/editor/index.ts deleted file mode 100644 index 336ce12bb9..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/editor/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.test.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.test.tsx deleted file mode 100644 index f47da57f03..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.test.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.tsx deleted file mode 100644 index 693da49fc4..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/editor/presentation/RemoveMeComponent.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableCount/GridTableCount.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableCount/GridTableCount.hooks.ts index 0ce445108a..3e51c526ac 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableCount/GridTableCount.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableCount/GridTableCount.hooks.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '../../../store'; +import { useAppSelector } from '../../../stores/store'; export const useGridTableCount = () => { const { grid } = useAppSelector((state) => state); 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 c299e911d4..46d778f0ec 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,7 +1,7 @@ import { nanoid } from 'nanoid'; -import { FieldType } from '../../../../services/backend/classes/flowy-database/field_entities'; -import { gridActions } from '../../../redux/grid/slice'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { FieldType } from '../../../../services/backend/models/flowy-database/field_entities'; +import { gridActions } from '../../../stores/reducers/grid/slice'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; export const useGridTableHeaderHooks = function () { const dispatch = useAppDispatch(); 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 3df9e57f41..084d2c5749 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/classes/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/grid/GridTableRows/GridAddRow.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridAddRow.hooks.ts index 6f0c0a7774..685e36bee9 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridAddRow.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridAddRow.hooks.ts @@ -1,5 +1,5 @@ -import { gridActions } from '../../../redux/grid/slice'; -import { useAppDispatch } from '../../../store'; +import { gridActions } from '../../../stores/reducers/grid/slice'; +import { useAppDispatch } from '../../../stores/store'; export const useGridAddRow = () => { const dispatch = useAppDispatch(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableItem.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableItem.hooks.ts index d37a095e0d..e36cd3f952 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableItem.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableItem.hooks.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { gridActions } from '../../../redux/grid/slice'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { gridActions } from '../../../stores/reducers/grid/slice'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; export const useGridTableItemHooks = ( rowItem: { value: string | number; fieldId: string; cellId: string }, diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableRows.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableRows.hooks.ts index 2382ad3f17..b534c5a4d3 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableRows.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTableRows/GridTableRows.hooks.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '../../../store'; +import { useAppSelector } from '../../../stores/store'; export const useGridTableRowsHooks = () => { const grid = useAppSelector((state) => state.grid); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTitle/GridTitle.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTitle/GridTitle.hooks.ts index bd932fd991..91483a821a 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTitle/GridTitle.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/GridTitle/GridTitle.hooks.ts @@ -1,7 +1,7 @@ import { useState } from 'react'; -import { gridActions } from '../../../redux/grid/slice'; +import { gridActions } from '../../../stores/reducers/grid/slice'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; export const useGridTitleHooks = function () { const dispatch = useAppDispatch(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/index.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/index.ts deleted file mode 100644 index f47da57f03..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file 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 8be57a2905..ce77e7b28e 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 @@ -1,8 +1,8 @@ -import { foldersActions, IFolder } from '../../../redux/folders/slice'; +import { foldersActions, IFolder } from '../../../stores/reducers/folders/slice'; import { useState } from 'react'; -import { useAppDispatch } from '../../../store'; +import { useAppDispatch } from '../../../stores/store'; import { nanoid } from 'nanoid'; -import { pagesActions } from '../../../redux/pages/slice'; +import { pagesActions } from '../../../stores/reducers/pages/slice'; export const useFolderEvents = (folder: IFolder) => { const appDispatch = useAppDispatch(); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.tsx index 2f7c062ee6..b1718c2c88 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.tsx @@ -2,9 +2,9 @@ import { Details2Svg } from '../../_shared/svg/Details2Svg'; import AddSvg from '../../_shared/svg/AddSvg'; import { NavItemOptionsPopup } from './NavItemOptionsPopup'; import { NewPagePopup } from './NewPagePopup'; -import { IFolder } from '../../../redux/folders/slice'; +import { IFolder } from '../../../stores/reducers/folders/slice'; import { useFolderEvents } from './FolderItem.hooks'; -import { IPage } from '../../../redux/pages/slice'; +import { IPage } from '../../../stores/reducers/pages/slice'; import { PageItem } from './PageItem'; import { Button } from '../../_shared/Button'; import { RenamePopup } from './RenamePopup'; 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 0d1634616d..402f0f3c8c 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,4 +1,4 @@ -import { useAppSelector } from '../../../store'; +import { useAppSelector } from '../../../stores/store'; import { useNavigate } from 'react-router-dom'; export const useNavigationPanelHooks = function () { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationResizer.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationResizer.tsx index 4725ad0344..087d3c0d42 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationResizer.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationResizer.tsx @@ -1,7 +1,7 @@ import { useResizer } from '../../_shared/useResizer'; -import { useAppDispatch, useAppSelector } from '../../../store'; +import { useAppDispatch, useAppSelector } from '../../../stores/store'; import { useEffect } from 'react'; -import { navigationWidthActions } from '../../../redux/navigation-width/slice'; +import { navigationWidthActions } from '../../../stores/reducers/navigation-width/slice'; export const NavigationResizer = () => { const width = useAppSelector((state) => state.navigationWidth); diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NewFolderButton.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NewFolderButton.hooks.ts index ed1f5eb008..b510412b68 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NewFolderButton.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NewFolderButton.hooks.ts @@ -1,5 +1,5 @@ -import { useAppDispatch } from '../../../store'; -import { foldersActions } from '../../../redux/folders/slice'; +import { useAppDispatch } from '../../../stores/store'; +import { foldersActions } from '../../../stores/reducers/folders/slice'; import { nanoid } from 'nanoid'; export const useNewFolder = () => { diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.hooks.ts index 653042bfab..63ede28832 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.hooks.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/PageItem.hooks.ts @@ -1,5 +1,5 @@ -import { IPage, pagesActions } from '../../../redux/pages/slice'; -import { useAppDispatch } from '../../../store'; +import { IPage, pagesActions } from '../../../stores/reducers/pages/slice'; +import { useAppDispatch } from '../../../stores/store'; import { useState } from 'react'; import { nanoid } from 'nanoid'; 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 d8a6de6a54..80558c8e66 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 @@ -3,7 +3,7 @@ import { BoardSvg } from '../../_shared/svg/BoardSvg'; import { GridSvg } from '../../_shared/svg/GridSvg'; import { Details2Svg } from '../../_shared/svg/Details2Svg'; import { NavItemOptionsPopup } from './NavItemOptionsPopup'; -import { IPage } from '../../../redux/pages/slice'; +import { IPage } from '../../../stores/reducers/pages/slice'; import { Button } from '../../_shared/Button'; import { usePageEvents } from './PageItem.hooks'; import { RenamePopup } from './RenamePopup'; diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx index 5c5dd5e2e4..1cb35ea85c 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx +++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx @@ -1,4 +1,4 @@ -import { useAppSelector } from '../../store'; +import { useAppSelector } from '../../stores/store'; export const Workspace = () => { const currentUser = useAppSelector((state) => state.currentUser); 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 c2b17b1a40..f8308517d6 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 @@ -8,7 +8,7 @@ export class UserNotificationParser extends NotificationParser super( params.callback, (ty) => { - let notification = UserNotification[ty]; + const notification = UserNotification[ty]; if (isUserNotification(notification)) { return UserNotification[notification]; } else { 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 c8d57ebc36..8bd5a70d57 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,4 +1,4 @@ -import { FlowyError, UserNotification, UserProfilePB } from '../../../../../services/backend'; +import { UserNotification, UserProfilePB } from '../../../../../services/backend'; import { AFNotificationListener, OnNotificationError } from '../../../../../services/backend/notifications'; import { UserNotificationParser } from './parser'; @@ -15,7 +15,7 @@ export class UserNotificationListener extends AFNotificationListener { switch (notification) { case UserNotification.DidUpdateUserProfile: diff --git a/frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/index.ts b/frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/index.ts deleted file mode 100644 index cb0ff5c3b5..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/frontend/appflowy_tauri/src/appflowy_app/home/index.ts b/frontend/appflowy_tauri/src/appflowy_app/home/index.ts deleted file mode 100644 index 693da49fc4..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/home/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsx b/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsx deleted file mode 100644 index f47da57f03..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsx b/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsx deleted file mode 100644 index f47da57f03..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsx +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/index.ts b/frontend/appflowy_tauri/src/appflowy_app/index.ts deleted file mode 100644 index f47da57f03..0000000000 --- a/frontend/appflowy_tauri/src/appflowy_app/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} \ No newline at end of file diff --git a/frontend/appflowy_tauri/src/appflowy_app/redux/current-user/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/redux/current-user/slice.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/current-user/slice.ts diff --git a/frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/parser.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts similarity index 83% rename from frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/parser.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts index c7d32cde0c..09b0c9d967 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/home/application/notifications/parser.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/notifications/parser.ts @@ -1,5 +1,5 @@ -import { FolderNotification } from '../../../../services/backend'; -import { NotificationParser, OnNotificationError } from '../../../../services/backend/notifications/parser'; +import { FolderNotification } from '../../../../../services/backend'; +import { NotificationParser, OnNotificationError } from '../../../../../services/backend/notifications'; declare type FolderNotificationCallback = (ty: FolderNotification, payload: Uint8Array) => void; @@ -8,7 +8,7 @@ export class FolderNotificationParser extends NotificationParser { - let notification = FolderNotification[ty]; + const notification = FolderNotification[ty]; if (isFolderNotification(notification)) { return FolderNotification[notification]; } else { diff --git a/frontend/appflowy_tauri/src/appflowy_app/redux/folders/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/redux/folders/slice.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/parser.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/notifications/parser.ts similarity index 70% rename from frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/parser.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/notifications/parser.ts index bee35c2ec4..b507c004a3 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/notifications/parser.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/notifications/parser.ts @@ -1,14 +1,14 @@ -import { DatabaseNotification } from "../../../../../services/backend"; -import { NotificationParser, OnNotificationError } from "../../../../../services/backend/notifications/parser"; +import { DatabaseNotification } from '../../../../../services/backend'; +import { NotificationParser, OnNotificationError } from '../../../../../services/backend/notifications'; declare type DatabaseNotificationCallback = (ty: DatabaseNotification, payload: Uint8Array) => void; export class DatabaseNotificationParser extends NotificationParser { - constructor(params: { id?: String; callback: DatabaseNotificationCallback; onError?: OnNotificationError }) { + constructor(params: { id?: string; callback: DatabaseNotificationCallback; onError?: OnNotificationError }) { super( params.callback, (ty) => { - let notification = DatabaseNotification[ty]; + const notification = DatabaseNotification[ty]; if (isDatabaseNotification(notification)) { return DatabaseNotification[notification]; } else { diff --git a/frontend/appflowy_tauri/src/appflowy_app/redux/grid/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts similarity index 96% rename from frontend/appflowy_tauri/src/appflowy_app/redux/grid/slice.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/grid/slice.ts index 12f674e792..139bd4f012 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/redux/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/classes/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/redux/navigation-width/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/navigation-width/slice.ts similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/redux/navigation-width/slice.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/navigation-width/slice.ts diff --git a/frontend/appflowy_tauri/src/appflowy_app/redux/pages/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/redux/pages/slice.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/reducers/pages/slice.ts diff --git a/frontend/appflowy_tauri/src/appflowy_app/store.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/store.ts similarity index 84% rename from frontend/appflowy_tauri/src/appflowy_app/store.ts rename to frontend/appflowy_tauri/src/appflowy_app/stores/store.ts index 02320285a6..17750cdf2f 100644 --- a/frontend/appflowy_tauri/src/appflowy_app/store.ts +++ b/frontend/appflowy_tauri/src/appflowy_app/stores/store.ts @@ -7,11 +7,11 @@ import { ListenerEffectAPI, addListener, } from '@reduxjs/toolkit'; -import { foldersSlice } from './redux/folders/slice'; -import { pagesSlice } from './redux/pages/slice'; -import { navigationWidthSlice } from './redux/navigation-width/slice'; -import { currentUserSlice } from './redux/current-user/slice'; -import { gridSlice } from './redux/grid/slice'; +import { foldersSlice } from './reducers/folders/slice'; +import { pagesSlice } from './reducers/pages/slice'; +import { navigationWidthSlice } from './reducers/navigation-width/slice'; +import { currentUserSlice } from './reducers/current-user/slice'; +import { gridSlice } from './reducers/grid/slice'; const listenerMiddlewareInstance = createListenerMiddleware({ onError: () => console.error, diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/BoardPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/BoardPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/BoardPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/BoardPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/ConfirmAccountPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/ConfirmAccountPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/ConfirmAccountPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/ConfirmAccountPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/DocumentPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/DocumentPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/DocumentPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/DocumentPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/GridPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/GridPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/GridPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/GridPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/LoginPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/LoginPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/LoginPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/LoginPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/SignUpPage.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/SignUpPage.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/SignUpPage.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/SignUpPage.tsx diff --git a/frontend/appflowy_tauri/src/appflowy_app/pages/Welcome.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/Welcome.tsx similarity index 100% rename from frontend/appflowy_tauri/src/appflowy_app/pages/Welcome.tsx rename to frontend/appflowy_tauri/src/appflowy_app/views/Welcome.tsx diff --git a/frontend/appflowy_tauri/src/services/backend/index.ts b/frontend/appflowy_tauri/src/services/backend/index.ts index 0dd1c40eac..d9b08aff40 100644 --- a/frontend/appflowy_tauri/src/services/backend/index.ts +++ b/frontend/appflowy_tauri/src/services/backend/index.ts @@ -1,6 +1,6 @@ -export * from "./classes/flowy-user"; -export * from "./classes/flowy-document"; -export * from "./classes/flowy-database"; -export * from "./classes/flowy-folder"; -export * from "./classes/flowy-net"; -export * from "./classes/flowy-error"; +export * from "./models/flowy-user"; +export * from "./models/flowy-document"; +export * from "./models/flowy-database"; +export * from "./models/flowy-folder"; +export * from "./models/flowy-net"; +export * from "./models/flowy-error"; diff --git a/frontend/appflowy_tauri/src/services/backend/notifications/listener.ts b/frontend/appflowy_tauri/src/services/backend/notifications/listener.ts index fd9fd65a0e..b206b58d43 100644 --- a/frontend/appflowy_tauri/src/services/backend/notifications/listener.ts +++ b/frontend/appflowy_tauri/src/services/backend/notifications/listener.ts @@ -1,6 +1,6 @@ import { listen, UnlistenFn } from "@tauri-apps/api/event"; -import { FlowyError } from "../classes/flowy-error"; -import { SubscribeObject } from "../classes/flowy-notification"; +import { FlowyError } from "../models/flowy-error"; +import { SubscribeObject } from "../models/flowy-notification"; import { NotificationParser } from "./parser"; declare type OnError = (error: FlowyError) => void; diff --git a/frontend/appflowy_tauri/src/services/backend/notifications/parser.ts b/frontend/appflowy_tauri/src/services/backend/notifications/parser.ts index ff667cc603..1e520934fa 100644 --- a/frontend/appflowy_tauri/src/services/backend/notifications/parser.ts +++ b/frontend/appflowy_tauri/src/services/backend/notifications/parser.ts @@ -1,6 +1,6 @@ import { Ok, Err, Result } from "ts-results/result"; -import { FlowyError } from "../classes/flowy-error"; -import { SubscribeObject } from "../classes/flowy-notification"; +import { FlowyError } from "../models/flowy-error"; +import { SubscribeObject } from "../models/flowy-notification"; export declare type OnNotificationPayload = (ty: T, payload: Uint8Array) => void; export declare type OnNotificationError = (error: FlowyError) => void; diff --git a/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs b/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs index a3c98d3f88..85794ae3c5 100644 --- a/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs +++ b/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs @@ -119,7 +119,7 @@ fn generate_ts_protobuf_files( let mut output = PathBuf::new(); output.push(root); output.push(tauri_backend_service_path); - output.push("classes"); + output.push("models"); output.push(name); if !output.as_path().exists() { diff --git a/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs b/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs index 57bdf6f0b0..e3e4c12a2a 100644 --- a/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs +++ b/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs @@ -81,7 +81,7 @@ pub fn gen(crate_name: &str) { Ok(ref mut file) => { let mut export = String::new(); export.push_str("// Auto-generated, do not edit \n"); - export.push_str(&format!("export * from '../../classes/{}';\n", crate_name)); + export.push_str(&format!("export * from '../../models/{}';\n", crate_name)); export.push_str(&format!("export * from './{}';\n", event_file)); file.write_all(export.as_bytes()).unwrap(); File::flush(file).unwrap(); diff --git a/frontend/scripts/makefile/tauri.toml b/frontend/scripts/makefile/tauri.toml index 1bfaa20e85..995f92ab5b 100644 --- a/frontend/scripts/makefile/tauri.toml +++ b/frontend/scripts/makefile/tauri.toml @@ -27,7 +27,7 @@ run_task = { name = [ [tasks.rm_tauri_generated_protobuf_files] private = true script = [""" - protobuf_file_paths = glob_array ${TAURI_BACKEND_SERVICE_PATH}/classes + protobuf_file_paths = glob_array ${TAURI_BACKEND_SERVICE_PATH}/models if not array_is_empty ${protobuf_file_paths} echo Remove generated protobuf files: for path in ${protobuf_file_paths}