Routing shell

components/AppShell.jsx

@@ -1,5 +1,7 @@
+import { useCallback, useEffect, useState } from 'react';
 import { useDrag } from 'react-use-gesture';
-import { Route, Switch } from 'wouter';
+import { Router, Route, Switch, useRoute } from 'wouter';
+import { cog, cogOutline, home, homeOutline, list, listOutline } from 'ionicons/icons';
 
 import Store from '../store';
 import * as actions from '../store/actions';
@@ -16,13 +18,16 @@ import TabBar from '../components/ui/TabBar';
 import { SafeAreaProvider } from '../components/ui/SafeArea';
 import Notifications from '../components/Notifications';
 import MenuContent from '../components/MenuContent';
-import { useEffect, useState } from 'react';
 import Home from './pages/Home';
-import { cog, cogOutline, home, homeOutline, list, listOutline } from 'ionicons/icons';
+import Lists from './pages/Lists';
+import Settings from './pages/Settings';
+import useLocation from '../hooks/useLocation';
 
 const CurrentPage = ({ page }) => {
   const currentPage = Store.useState(selectors.getCurrentPage);
 
+  const [match, params] = useRoute('/lists');
+  console.log('Matches?', match);
   // const Page = currentPage.component;
   const Page = page;
 
@@ -32,19 +37,23 @@ const CurrentPage = ({ page }) => {
     setLocal(true);
   }, []);
 
+  console.log('Rendering current page', local);
+
   return (
     <PageStack>
       {local ? (
         <Switch>
           <Route path="/" component={Home} />
+          <Route path="/lists" component={Lists} />
+          <Route path="/settings" component={Settings} />
         </Switch>
       ) : (
         <Page selected={true} />
       )}
       {/*pages.map(p => {
-        const Page = p.component;
-        return <Page selected={page.id === p.id} key={p.id} />;
-      })*/}
+          const Page = p.component;
+          return <Page selected={page.id === p.id} key={p.id} />;
+        })*/}
       {/*<Page selected={true} />*/}
     </PageStack>
   );
@@ -87,39 +96,41 @@ const AppShell = ({ page }) => {
       }}
     >
       <SafeAreaProvider>
-        <Menu open={showMenu} onClose={closeMenu}>
-          <MenuContent />
-        </Menu>
-        <Nav page={currentPage} />
-        {/*<CurrentPage page={currentPage} />*/}
-        <CurrentPage page={page} />
-        <TabBar>
-          <Tab
-            icon={homeOutline}
-            selectedIcon={home}
-            title="Home"
-            onClick={() => actions.setPage(p)}
-            selected={'home' === currentPage?.id}
-          />
-          <Tab
-            icon={listOutline}
-            selectedIcon={list}
-            title="Lists"
-            onClick={() => actions.setPage(p)}
-            selected={'lists' === currentPage?.id}
-          />
-          <Tab
-            icon={cogOutline}
-            selectedIcon={cog}
-            title="settings"
-            onClick={() => actions.setPage(p)}
-            selected={'settings' === currentPage?.id}
-          />
-        </TabBar>
-        <Backdrop open={showMenu || showNotifications} onClose={backdropClose} />
-        <Modal open={showNotifications} onClose={closeNotifications}>
-          <Notifications />
-        </Modal>
+        <Router hook={useLocation}>
+          <Menu open={showMenu} onClose={closeMenu}>
+            <MenuContent />
+          </Menu>
+          <Nav page={currentPage} />
+          {/*<CurrentPage page={currentPage} />*/}
+          <CurrentPage page={page} />
+          <TabBar>
+            <Tab
+              icon={homeOutline}
+              selectedIcon={home}
+              title="Home"
+              href="/"
+              selected={'home' === currentPage?.id}
+            />
+            <Tab
+              icon={listOutline}
+              selectedIcon={list}
+              title="Lists"
+              href="/lists"
+              selected={'lists' === currentPage?.id}
+            />
+            <Tab
+              icon={cogOutline}
+              selectedIcon={cog}
+              title="settings"
+              href="/settings"
+              selected={'settings' === currentPage?.id}
+            />
+          </TabBar>
+          <Backdrop open={showMenu || showNotifications} onClose={backdropClose} />
+          <Modal open={showNotifications} onClose={closeNotifications}>
+            <Notifications />
+          </Modal>
+        </Router>
       </SafeAreaProvider>
     </App>
   );

components/pages/Lists.jsx

@@ -7,7 +7,10 @@ import List from '../ui/List';
 import VirtualScroll from '../ui/VirtualScroll';
 
 const ListEntry = ({ list, ...props }) => (
-  <div {...props} className="p-4 border-solid dark:border-gray-800 border-b cursor-pointer dark:text-gray-200">
+  <div
+    {...props}
+    className="p-4 border-solid dark:border-gray-800 border-b cursor-pointer dark:text-gray-200"
+  >
     <span className="text-md">{list.name}</span>
   </div>
 );
@@ -29,7 +32,7 @@ const AllLists = ({ onSelect }) => {
 
 const Lists = ({ selected }) => {
   return (
-    <Content visible={selected} className="p-4 dark:bg-black">
+    <Content visible={true} className="p-4 dark:bg-black">
       <List className="h-full w-full">
         {selected && (
           <AllLists

components/pages/Settings.jsx

@@ -12,7 +12,7 @@ const Settings = ({ selected }) => {
   const settings = Store.useState(selectors.getSettings);
 
   return (
-    <Content visible={selected} className="p-4 dark:bg-black">
+    <Content visible={true} className="p-4 dark:bg-black">
       <List>
         <ListItem className="flex">
           <span className="text-md flex-1 dark:text-gray-200">Enable Notifications</span>

components/ui/Tab.jsx

@@ -1,24 +1,27 @@
 import classNames from 'classnames';
 import Icon from './Icon';
+import { Link } from 'wouter';
 
-const Tab = ({ title, icon, selected, selectedIcon, onClick }) => (
-  <a
-    onClick={onClick}
-    href="#"
-    className={classNames('px-6 rounded-md text-sm text-center font-medium cursor-pointer', {
-      'text-gray-500 dark:text-white': !selected,
-      'text-gray-800 dark:text-gray-600': selected,
-    })}
-  >
-    {icon && (
-      <Icon
-        icon={selected ? selectedIcon : icon}
-        className="cursor-pointer"
-        style={{ fontSize: '18px' }}
-      />
-    )}
-    <label className="block cursor-pointer">{title}</label>
-  </a>
+const Tab = ({ title, href, icon, selected, selectedIcon, onClick }) => (
+  <Link href={href}>
+    <a
+      onClick={onClick}
+      href="#"
+      className={classNames('px-6 rounded-md text-sm text-center font-medium cursor-pointer', {
+        'text-gray-500 dark:text-white': !selected,
+        'text-gray-800 dark:text-gray-600': selected,
+      })}
+    >
+      {icon && (
+        <Icon
+          icon={selected ? selectedIcon : icon}
+          className="cursor-pointer"
+          style={{ fontSize: '18px' }}
+        />
+      )}
+      <label className="block cursor-pointer">{title}</label>
+    </a>
+  </Link>
 );
 
 export default Tab;