👷‍♀️

frontend/src/app/CoreLayout.tsx

@@ -1,37 +1,42 @@
-import { Layout } from 'antd'
 import { useUserContext } from '../contexts/UserContext'
-import { Login } from './pages/Login'
-import { Route, Switch } from 'react-router'
+import { Redirect, Route, Switch } from 'react-router'
+import { Link } from 'react-router-dom'
 import { Dashboard } from './pages/Dashboard'
-import { AppHeader } from './layout/AppHeader'
-import { Profile } from './pages/Profile'
-import { NewUser } from './forms/NewUser'
-import { ForgotPassword } from './pages/ForgotPassword'
+import { UserForm } from './components/UserForm'
+import { TransactionList } from './components/TransactionList'
+import { AccountForm } from './components/AccountForm'
 
 export const CoreLayout = () => {
-  const { user } = useUserContext()
+  const { user, accounts, selectedAccount } = useUserContext()
 
-  if (!user)
-    return (
-      <Layout className="layout">
-        <AppHeader user={user} />
-        <Login />
-      </Layout>
-    )
+  if (!accounts?.length) <Redirect to="/account/new" />
 
-  // header, sidebar, avatar?
   return (
-    <Layout className="layout">
-      <AppHeader user={user} />
-      <Layout.Content>
-        <Switch>
-          <Route path="/forgot-password" component={ForgotPassword} />
-          <Route path="/login" component={Login} />
-          <Route path="/new/user" component={NewUser} />
-          <Route path="/profile" component={Profile} />
-          <Route exact path="/" component={Dashboard} />
-        </Switch>
-      </Layout.Content>
-    </Layout>
+    <div className="app" id="appElement">
+      <nav>
+        <Link to="/">Home</Link>
+        <Link to="/select">Select Budget</Link>
+        <Link to="/account">Budget Details</Link>
+        <Link to="/details">Transactions</Link>
+        <Link to="/user">Profile</Link>
+      </nav>
+
+      <Switch>
+        <Route path="/user" component={UserForm} />
+        <Route path="/details" component={TransactionList} />
+        <Route path="/account/new" component={AccountForm} />
+        <Route path="/account" component={AccountForm} />
+        <Route path="/" component={Dashboard} />
+      </Switch>
+
+      {/* {showingModal && <TransactionModal account={account} />} */}
+
+      <footer>
+        <p>User: {user?.name}</p>
+        <p>|</p>
+        <p>Budget: {selectedAccount?.name}</p>
+        <p>|</p>
+      </footer>
+    </div>
   )
 }