nitro-web 0.1.4 → 0.2.0

package/client/app.tsx

@@ -137,7 +137,7 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
   }
   // Loop files
   // const components = {}
-  const layouts: Route[][] = []
+  const layouts: Route[][] = [] //rename to routes
 
   for (const filename of requireContext.keys()) {
     const file = requireContext(filename) // require
@@ -319,17 +319,17 @@ async function beforeApp(config: Config) {
 
 export const middleware = {
   // Default middleware that can referenced from component routes
-  isAdmin: (route: unknown, store: { user?: { isAdmin?: boolean } }) => {
+  isAdmin: (route: unknown, store: { user?: { isAdmin?: boolean, _id?: string } }) => {
     if (store.user?.isAdmin) return
-    else if (store.user) return { redirect: '/signin?unauth' }
+    else if (store.user?._id) return { redirect: '/signin?unauth' }
     else return { redirect: '/signin?signin' }
   },
   isSubscribed: (route: unknown, store: { user?: { company?: { currentSubscription?: string } } }) => {
     if (store.user?.company?.currentSubscription) return
     else return { redirect: '/plans/subscribe' }
   },
-  isUser: (route: unknown, store: { user?: { isAdmin?: boolean } }) => {
-    if (store.user) return
+  isUser: (route: unknown, store: { user?: { _id?: string } }) => {
+    if (store.user?._id) return
     else return { redirect: '/signin?signin' }
   },
 }

package/client/index.ts

@@ -11,7 +11,7 @@ export * from '../types'
 
 // Main app functions
 export { setupApp, updateJwt, middleware } from './app'
-export { createStore, exposedStoreData, preloadedStoreData, setStoreWrapper } from './store'
+export { createStore, exposedStoreData, preloadedStoreData, setStoreWrapper, getSignoutStore, getInitialStore } from './store'
 
 // Component Pages
 export { Signin } from '../components/auth/signin'

package/client/store.ts

@@ -1,16 +1,18 @@
 import { createContainer } from 'react-tracked'
 import { Dispatch, SetStateAction } from 'react'
-import { axios, isObject } from 'nitro-web/util'
+import { axios, isObject, deepCopy } from 'nitro-web/util'
 import { updateJwt } from 'nitro-web'
 import { Store } from 'nitro-web/types'
 
-export const preloadedStoreData: Store = {}
-export let exposedStoreData: Store = preloadedStoreData
+export const preloadedStoreData: Partial<Store> = {}
+export let initialStoreData: Store // handy for resetting the user on signout
+export let exposedStoreData: Store // handy for the router to access the store
 
-export function createStore<T extends Store>(store: T) {
+export function createStore<T extends Store>(initialStore: T) {
   const container = createContainer(() => {
     // const [state, setState] = useState<T>(() => (initData || store || {}) as T)
-    const [state, setState] = useState<T>(() => beforeUpdate({ ...store, ...preloadedStoreData } as T))
+    const [state, setState] = useState<T>(() => beforeUpdate({ ...initialStore, ...preloadedStoreData } as T))
+    initialStoreData = initialStore
     exposedStoreData = state
     return [state, setStoreWrapper(setState)]
   })
@@ -45,3 +47,11 @@ function beforeUpdate<T extends Store>(newStore: T) {
   }
   return newStore
 }
+
+export function getInitialStore() {
+  return deepCopy(initialStoreData)
+}
+
+export function getSignoutStore(prev: Store, initialStore: Store) {
+  return { ...(prev || {}), user: initialStore.user }
+}