Merge pull request #6177 from weseek/feat/show-incomplete-sidebar

feat: Show incomplete sidebar

packages/app/src/components/BasicLayout.tsx

@@ -15,7 +15,7 @@ type Props = {
 
 export const BasicLayout = ({ children, title, className }: Props): JSX.Element => {
 
-  // const Sidebar = dynamic(() => import('../client/js/components/Sidebar'), { ssr: false });
+  const Sidebar = dynamic(() => import('./Sidebar'), { ssr: false });
   // const HotkeysManager = dynamic(() => import('../client/js/components/Hotkeys/HotkeysManager'), { ssr: false });
   // const PageCreateModal = dynamic(() => import('../client/js/components/PageCreateModal'), { ssr: false });
   const ShortcutsModal = dynamic(() => import('./ShortcutsModal'), { ssr: false });
@@ -28,8 +28,7 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
 
         <div className="page-wrapper d-flex d-print-block">
           <div className="grw-sidebar-wrapper">
-            {/* <Sidebar /> */}
-            Sidebar
+            <Sidebar />
           </div>
 
           <div className="flex-fill mw-0">

packages/app/src/components/Sidebar/SidebarContents.tsx

@@ -3,11 +3,13 @@ import React from 'react';
 import { SidebarContentsType } from '~/interfaces/ui';
 import { useCurrentSidebarContents } from '~/stores/ui';
 
-import CustomSidebar from './CustomSidebar';
-import PageTree from './PageTree';
+// import CustomSidebar from './CustomSidebar';
+// import PageTree from './PageTree';
 import RecentChanges from './RecentChanges';
 import Tag from './Tag';
 
+const DummyComponent = (): JSX.Element => <></>; // Todo: remove this later when it is able to render other Contents.
+
 const SidebarContents = (): JSX.Element => {
   const { data: currentSidebarContents } = useCurrentSidebarContents();
 
@@ -17,13 +19,15 @@ const SidebarContents = (): JSX.Element => {
       Contents = RecentChanges;
       break;
     case SidebarContentsType.CUSTOM:
-      Contents = CustomSidebar;
+      // Contents = CustomSidebar;
+      Contents = DummyComponent;
       break;
     case SidebarContentsType.TAG:
       Contents = Tag;
       break;
     default:
-      Contents = PageTree;
+      // Contents = PageTree;
+      Contents = DummyComponent;
   }
 
   return (