diff --git a/frontend/appflowy_tauri/src/appflowy_app/App.tsx b/frontend/appflowy_tauri/src/appflowy_app/App.tsx
index 38342048ab..efb4736264 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/App.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/App.tsx
@@ -1,7 +1,6 @@
import { Routes, Route, BrowserRouter } from 'react-router-dom';
import { TestColors } from './components/TestColors/TestColors';
-import { Welcome } from './views/Welcome';
import { Provider } from 'react-redux';
import { store } from './stores/store';
import { DocumentPage } from './views/DocumentPage';
@@ -29,7 +28,6 @@ const App = () => {
} />
} />
} />
- } />
}>
}>
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/auth/ProtectedRoutes.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/auth/ProtectedRoutes.tsx
index 55a2ba4f9d..5b8bde9576 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/auth/ProtectedRoutes.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/auth/ProtectedRoutes.tsx
@@ -11,15 +11,16 @@ export const ProtectedRoutes = () => {
useEffect(() => {
void checkUser().then(async (result) => {
+ await new Promise(() =>
+ setTimeout(() => {
+ setIsLoading(false);
+ }, 1200)
+ );
+
if (result.err) {
throw new Error(result.val.msg);
}
- await new Promise(() =>
- setTimeout(() => {
- setIsLoading(false);
- }, 1200)
- );
});
}, []);
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationFloatingPanel.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationFloatingPanel.tsx
index 7ab84ab905..bada0dcc4e 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationFloatingPanel.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationFloatingPanel.tsx
@@ -1,5 +1,5 @@
import { AppLogo } from '../AppLogo';
-import { Workspace } from '../Workspace';
+import { WorkspaceUser } from '../WorkspaceUser';
import { FolderItem } from './FolderItem';
import { PluginsButton } from './PluginsButton';
import { TrashButton } from './TrashButton';
@@ -52,7 +52,7 @@ export const NavigationFloatingPanel = ({
-
+
{folders.map((folder, index) => (
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
index 119baf795f..44f79be47e 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
@@ -1,12 +1,13 @@
-import { Workspace } from '../Workspace';
+import { WorkspaceUser } from '../WorkspaceUser';
import { AppLogo } from '../AppLogo';
import { FolderItem } from './FolderItem';
-import { PluginsButton } from './PluginsButton';
import { TrashButton } from './TrashButton';
import { NewFolderButton } from './NewFolderButton';
import { NavigationResizer } from './NavigationResizer';
import { IFolder } from '../../../stores/reducers/folders/slice';
import { IPage } from '../../../stores/reducers/pages/slice';
+import { useNavigate } from 'react-router-dom';
+import React from 'react';
export const NavigationPanel = ({
onCollapseNavigationClick,
@@ -26,27 +27,22 @@ export const NavigationPanel = ({
-
-
-
-
- {folders.map((folder, index) => (
- page.folderId === folder.id)}
- onPageClick={onPageClick}
- >
- ))}
-
+
+
-
+ {/*
*/}
+
+
+
+
+ {/*Trash Button*/}
+ {/*New Folder Button*/}
@@ -54,3 +50,47 @@ export const NavigationPanel = ({
>
);
};
+
+type AppsContext = {
+ folders: IFolder[];
+ pages: IPage[];
+ onPageClick: (page: IPage) => void;
+};
+
+const WorkspaceApps: React.FC
= ({ folders, pages, onPageClick }) => (
+
+ {folders.map((folder, index) => (
+ page.folderId === folder.id)}
+ onPageClick={onPageClick}
+ >
+ ))}
+
+);
+
+export const TestBackendButton = () => {
+ const navigate = useNavigate();
+ return (
+
+ );
+};
+
+export const DesignSpec = () => {
+ const navigate = useNavigate();
+
+ return (
+
+ );
+};
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/WorkspaceUser.tsx
similarity index 93%
rename from frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx
rename to frontend/appflowy_tauri/src/appflowy_app/components/layout/WorkspaceUser.tsx
index 1cb35ea85c..c85e1c757b 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/Workspace.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/WorkspaceUser.tsx
@@ -1,6 +1,6 @@
import { useAppSelector } from '../../stores/store';
-export const Workspace = () => {
+export const WorkspaceUser = () => {
const currentUser = useAppSelector((state) => state.currentUser);
return (
diff --git a/frontend/appflowy_tauri/src/appflowy_app/views/Welcome.tsx b/frontend/appflowy_tauri/src/appflowy_app/views/Welcome.tsx
deleted file mode 100644
index 2e821cf931..0000000000
--- a/frontend/appflowy_tauri/src/appflowy_app/views/Welcome.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Link } from 'react-router-dom';
-
-export const Welcome = () => {
- return (
-
-
Welcome
-
- Color Palette
-
-
- Testing API
-
-
- );
-};
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 85794ae3c5..de0209cf49 100644
--- a/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs
+++ b/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs
@@ -132,7 +132,7 @@ fn generate_ts_protobuf_files(
};
if result.is_err() {
- panic!("Generate dart pb file failed with: {}, {:?}", path, result)
+ panic!("Generate ts pb file failed with: {}, {:?}", path, result)
};
});