nitro-web 0.0.168 → 0.0.170

package/client/app.tsx

@@ -19,7 +19,7 @@ type Settings = {
   // beforeStoreUpdate: (prevStore: Store | null, newData: Store) => Store
   isStatic?: boolean
   layouts: React.FC<LayoutProps>[]
-  middleware: Record<string, (route: unknown, store: Store) => undefined | { redirect: string }>
+  allMiddleware: Record<string, (route: unknown, store: Store) => undefined | { redirect: string }>
   name: string
   titleSeparator?: string
 }
@@ -52,7 +52,7 @@ export async function setupApp(config: Config, storeContainer: StoreContainer, l
     beforeApp: config.beforeApp || beforeApp,
     isStatic: config.isStatic,
     layouts: layouts,
-    middleware: Object.assign(defaultMiddleware, config.middleware || {}),
+    allMiddleware: Object.assign(middleware, config.middleware || {}),
     name: config.name,
     titleSeparator: config.titleSeparator,
   }
@@ -165,9 +165,9 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
           const layoutNum = (parseInt(String(route.meta?.layout || '1')) || 1) - 1
 
           // get the routes middleware
-          const middleware = toArray(route[routePath]).filter((policyNameOrTrue) => {
+          const routeMiddleware = toArray(route[routePath]).filter((policyNameOrTrue) => {
             if (policyNameOrTrue === true) return // ignore true
-            else if (policyNameOrTrue in settings.middleware) return true
+            else if (policyNameOrTrue in settings.allMiddleware) return true
             else console.error(`No middleware named '${policyNameOrTrue}' defined under config.middleware, skipping..`)
           })
 
@@ -180,7 +180,7 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
               layout: layoutNum,
               title: `${route.meta?.title ? `${route.meta.title}${settings.titleSeparator || ' - '}` : ''}${settings.name}`,
             },
-            middleware: middleware as string[],
+            middleware: routeMiddleware as string[],
             name: componentName,
             path: routePath,
             redirect: route.redirect,
@@ -218,7 +218,7 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
               await setTimeoutPromise(() => {}, 0)
             }
             for (const key of route.middleware) {
-              const error = settings.middleware[key](route, exposedStoreData || {})
+              const error = settings.allMiddleware[key](route, exposedStoreData || {})
               // Note: the redirect uses the new pathname for query string values, e.g. '?example=value'. We also can't use the 
               // current pathname, as this doesn't exist on page refresh.
               if (error && error.redirect) {
@@ -317,22 +317,19 @@ async function beforeApp(config: Config) {
   return { ...storeData, apiAvailable }
 }
 
-const defaultMiddleware = {
-  // Global middleware that can referenced from component routes
+export const middleware = {
+  // Default middleware that can referenced from component routes
   isAdmin: (route: unknown, store: { user?: { type?: string, isAdmin?: boolean } }) => {
-    const user = store.user || { type: 'visitor' }
-    if (user?.type?.match(/admin/) || user?.isAdmin) return
-    else if (user?.type && user?.type !== 'visitor') return { redirect: '/signin?unauth' }
+    if (store.user?.type?.match(/admin/) || store.user?.isAdmin) return
+    else if (store.user) return { redirect: '/signin?unauth' }
     else return { redirect: '/signin?signin' }
   },
   isSubscribed: (route: unknown, store: { user?: { company?: { currentSubscription?: string } } }) => {
-    const user = store?.user || { type: 'visitor', company: { currentSubscription: '' } }
-    if (!user?.company?.currentSubscription) return
+    if (store.user?.company?.currentSubscription) return
     else return { redirect: '/plans/subscribe' }
   },
   isUser: (route: unknown, store: { user?: { type?: string } }) => {
-    const user = store.user || { type: 'visitor' }
-    if (user?.type !== 'visitor') return
+    if (store.user) return
     else return { redirect: '/signin?signin' }
   },
 }

package/client/index.ts

@@ -9,7 +9,7 @@ export * as util from 'nitro-web/util'
 export * from '../types'
 
 // Main app functions
-export { setupApp, updateJwt } from './app'
+export { setupApp, updateJwt, middleware } from './app'
 export { createStore, exposedStoreData, preloadedStoreData, setStoreWrapper } from './store'
 
 // Component Pages
@@ -23,7 +23,7 @@ export { Styleguide } from '../components/partials/styleguide'
 // Component Elements
 export { Accordion } from '../components/partials/element/accordion'
 export { Avatar } from '../components/partials/element/avatar'
-export { Button } from '../components/partials/element/button'
+export { Button, Spinner } from '../components/partials/element/button'
 export { Calendar, type CalendarProps } from '../components/partials/element/calendar'
 export { Dropdown, type DropdownProps, type DropdownOption } from '../components/partials/element/dropdown'
 export { Filters, type FilterType, usePushChangesToPath } from '../components/partials/element/filters'
@@ -36,6 +36,7 @@ export { TimePicker, type TimePickerProps } from '../components/partials/element
 export { Tooltip } from '../components/partials/element/tooltip'
 export { Topbar } from '../components/partials/element/topbar'
 export { Table, type TableColumn, type TableProps, type TableRow, type TableRowType } from '../components/partials/element/table'
+export { LoadingWithDots, LoadingOverlay } from '../components/partials/element/loading'
 
 // Component Form Elements
 export { Checkbox } from '../components/partials/form/checkbox'

package/components/auth/auth.api.js

@@ -420,10 +420,14 @@ export async function sendToken({ type = 'reset', user, beforeUpdate, beforeSend
   if (!user?.firstName) throw new Error('user.firstName is required')
   const token = await tokenCreate(user._id)
 
+  // get the data
+  const data = beforeUpdate ? beforeUpdate({ [type + 'Token']: token }) : { [type + 'Token']: token }
+  if (type === 'invite') data.isInvited = true
+
   // Update the user with the token
   const result = await db.user.update({
     query: { _id: user._id },
-    data: beforeUpdate ? beforeUpdate({ [type + 'Token']: token }) : { [type + 'Token']: token },
+    data: data,
     blacklist: ['-' + type + 'Token'],
   })
 

package/components/partials/element/button.tsx

@@ -41,16 +41,16 @@ export function Button({
 
   // Button colors, you can use custom colors by using className instead
   const colors = {
-    'primary': 'bg-primary hover:bg-primary-hover ring-transparent text-white [&>.loader]:border-white',
-    'secondary': 'bg-secondary hover:bg-secondary-hover ring-transparent text-white [&>.loader]:border-white',
-    'black': 'bg-black hover:bg-gray-800 ring-transparent text-white [&>.loader]:border-white',
-    'dark': 'bg-gray-800 hover:bg-gray-700 ring-transparent text-white [&>.loader]:border-white',
-    'white': 'bg-white hover:bg-gray-50 ring-gray-300 text-gray-900 [&>.loader]:border-black', // maybe change to text-foreground
-    'clear': 'hover:bg-gray-50 ring-gray-300 hover:text-foreground [&>.loader]:border-foreground !shadow-none',
-    'danger': 'bg-danger hover:bg-danger-hover ring-transparent text-white [&>.loader]:border-white',
-    'warning': 'bg-warning hover:bg-warning-hover ring-transparent text-white [&>.loader]:border-white',
-    'info': 'bg-info hover:bg-info-hover ring-transparent text-white [&>.loader]:border-white',
-    'success': 'bg-success hover:bg-success-hover ring-transparent text-white [&>.loader]:border-white',
+    'primary': 'bg-primary hover:bg-primary-hover ring-transparent text-white [&>.spinner]:border-white',
+    'secondary': 'bg-secondary hover:bg-secondary-hover ring-transparent text-white [&>.spinner]:border-white',
+    'black': 'bg-black hover:bg-gray-800 ring-transparent text-white [&>.spinner]:border-white',
+    'dark': 'bg-gray-800 hover:bg-gray-700 ring-transparent text-white [&>.spinner]:border-white',
+    'white': 'bg-white hover:bg-gray-50 ring-gray-300 text-gray-900 [&>.spinner]:border-black', // maybe change to text-foreground
+    'clear': 'hover:bg-gray-50 ring-gray-300 hover:text-foreground [&>.spinner]:border-foreground !shadow-none',
+    'danger': 'bg-danger hover:bg-danger-hover ring-transparent text-white [&>.spinner]:border-white',
+    'warning': 'bg-warning hover:bg-warning-hover ring-transparent text-white [&>.spinner]:border-white',
+    'info': 'bg-info hover:bg-info-hover ring-transparent text-white [&>.spinner]:border-white',
+    'success': 'bg-success hover:bg-success-hover ring-transparent text-white [&>.spinner]:border-white',
   }
   
   // Button sizes (px is better for height consistency)
@@ -91,12 +91,17 @@ export function Button({
       </span>
       {(IconRight || IconRightEnd) && getIcon(IconRight || IconRightEnd)}
       {
-        isLoading &&
-        <span className={
-          'loader !opacity-100 absolute top-[50%] left-[50%] w-[1rem] h-[1rem] ml-[-0.5rem] mt-[-0.5rem] ' +
-          'rounded-full animate-spin border-2 !border-t-transparent'
-        } />
+        isLoading && <Spinner className={'!opacity-100 size-[1rem]'} absoluteCenter={true} />
       }
     </button>
   )
 }
+
+export function Spinner({ className, absoluteCenter }: { className?: string, absoluteCenter?: boolean }) {
+  const absoluteCenterClass = absoluteCenter ? 'absolute top-[50%] left-[50%] ml-[-0.5rem] mt-[-0.5rem]' : ''
+  return (
+    <span
+      className={twMerge(`spinner border-black border-2 inline-block size-[1em] rounded-full animate-spin ${absoluteCenterClass} ${className||''} !border-t-transparent `)}
+    />
+  )
+}

package/components/partials/element/loading.tsx

@@ -0,0 +1,25 @@
+import { Spinner, twMerge } from 'nitro-web'
+
+export function LoadingWithDots({ message='Loading', className, classNameDots }: { 
+  message?: string, 
+  className?: string, 
+  classNameDots?: string 
+}) {
+  return (
+    <span className={`flex items-center gap-[0.2em] ${className}`}>
+      {message}<span className={twMerge('relative loading-dots', classNameDots)} />
+    </span> 
+  )
+}
+
+export function LoadingOverlay({ message='Loading', className }: { message?: string, className?: string }) {
+  return (
+    <div 
+      className={twMerge('absolute inset-0 bg-white bg-opacity-75 flex items-center justify-center z-10 text-md [&>span]:bg-white', className)}
+    >
+      <span className="inline-block flex items-center justify-center gap-3 p-2">
+        <Spinner />{message}
+      </span>
+    </div>
+  )
+}

package/components/partials/element/table.tsx

@@ -1,6 +1,6 @@
 import { JSX, useState, useCallback, Fragment, useMemo, useEffect } from 'react'
 import { ChevronDownIcon, ChevronUpIcon } from 'lucide-react'
-import { Checkbox, queryObject, queryString, twMerge } from 'nitro-web'
+import { Checkbox, queryObject, queryString, Spinner, twMerge, LoadingWithDots, LoadingOverlay } from 'nitro-web'
 import { useLocation, useNavigate } from 'react-router-dom'
 
 export type TableRowType = 'row' | 'loading' | 'empty' | 'thead'
@@ -45,7 +45,11 @@ export type TableProps<T> = {
   columnHeaderClassName?: string
   checkboxClassName?: string
   checkboxSize?: number
+  loadingOverlayClassName?: string
   isLoading?:boolean
+  loadingMessage?: string
+  showLoadingInline?: boolean|JSX.Element
+  showLoadingOverlay?: boolean|JSX.Element
 }
 
 export function Table<T extends TableRow>({ 
@@ -71,7 +75,12 @@ export function Table<T extends TableRow>({
   columnHeaderClassName,
   checkboxClassName,
   checkboxSize=16,
+  loadingOverlayClassName,
+  // Loading
   isLoading=false,
+  loadingMessage,
+  showLoadingInline=false,
+  showLoadingOverlay=true,
 }: TableProps<T>) {
   const location = useLocation()
   const [selectedRowIds, setSelectedRowIds] = useState<string[]>([])
@@ -80,9 +89,9 @@ export function Table<T extends TableRow>({
   const [rand] = useState(() => new Date().getTime() + Math.random())
 
   const rowsToRender = useMemo(() => {
-    // 1) Only show the first row when loading (content hidden), 2) an empty row when there are no records, or all rows
-    return rows.length > 0 ? (isLoading ? rows.slice(0, 1) : rows) : [{ _id: '' }] as unknown as T[]
-  }, [rows, isLoading])
+    // 1) Only show the first row when loading inline(content hidden), 2) an empty row when there are no records, or all rows
+    return rows.length > 0 ? ((isLoading && showLoadingInline) ? rows.slice(0, 1) : rows) : [{ _id: '' }] as unknown as T[]
+  }, [rows, isLoading, showLoadingInline])
 
   const columns = useMemo(() => {
     const checkboxCol: TableColumn = { value: 'checkbox', label: '', disableSort: true }
@@ -145,7 +154,7 @@ export function Table<T extends TableRow>({
     >
       <div 
         style={{ borderSpacing: `0 ${rowGap}px` }}
-        className={twMerge('table w-full border-separate', tableClassName)}
+        className={twMerge('table w-full border-separate', showLoadingOverlay ? 'relative' : '', tableClassName)}
       >
         {/* Thead row */}
         <div className="table-row relative">
@@ -181,7 +190,7 @@ export function Table<T extends TableRow>({
                   > 
                     {
                       col.value == 'checkbox'
-                        ? <>
+                        ? <Fragment>
                             <Checkbox 
                               size={checkboxSize}
                               name={`checkbox-all-${rand}`}
@@ -195,7 +204,7 @@ export function Table<T extends TableRow>({
                             >
                               {generateCheckboxActions && generateCheckboxActions(selectedRowIds)}
                             </div>
-                          </>
+                          </Fragment>
                         : <span className={twMerge(
                             'flex items-center gap-x-2 transition-opacity',
                             selectedRowIds.length ? 'opacity-0' : '',
@@ -267,9 +276,9 @@ export function Table<T extends TableRow>({
                             />
                           }
                           {
-                            // Rows (content hidden when loading)
+                            // Rows (content hidden when loading inline)
                             row._id &&
-                            <div className={isLoading ? 'opacity-0 pointer-events-none' : ''}>
+                            <div className={isLoading && showLoadingInline ? 'opacity-0 pointer-events-none' : ''}>
                               {
                                 col.value == 'checkbox'
                                   ? <Checkbox 
@@ -287,10 +296,21 @@ export function Table<T extends TableRow>({
                             </div>
                           }
                           {
-                            // Show "loading" or "no records" text in the first column
-                            j == 0 && (isLoading || !row._id) &&
-                            <div className={'absolute top-0 h-full flex items-center justify-center text-sm text-gray-500'}>
-                              { isLoading ? <>Loading<span className="relative ml-[2px] loading-dots" /></> : 'No records found.' }
+                            // Show "no records" or "loading" text in the first column
+                            j == 0 && (!row._id || isLoading) &&
+                            <div className={'absolute top-0 h-full flex items-center justify-center gap-3 text-sm text-gray-500'}>
+                              {
+                                (!row._id && !isLoading) ? (
+                                  'No records found.' 
+                                ) : (!row._id && isLoading && showLoadingInline === true) ? (
+                                  <Fragment>
+                                    <Spinner className="border-gray-500" />
+                                    <LoadingWithDots message={loadingMessage} />
+                                  </Fragment>
+                                ) : (!row._id && isLoading && showLoadingInline) ? (
+                                  showLoadingInline
+                                ) : null
+                              }
                             </div>
                           }
                         </div>
@@ -302,6 +322,11 @@ export function Table<T extends TableRow>({
             )
           })
         }
+        { 
+          (isLoading && showLoadingOverlay === true) 
+            ? <LoadingOverlay className={twMerge('m-[1px]', loadingOverlayClassName)} message={loadingMessage} /> 
+            : (isLoading && showLoadingOverlay) ? showLoadingOverlay : null
+        }
       </div>
     </div>
   )

package/components/partials/styleguide.tsx

@@ -1,6 +1,6 @@
 import { 
   Drop, Dropdown, Field, Select, Button as ButtonNitro, Checkbox, GithubLink, Modal, Calendar, injectedConfig, TimePicker,
-  Filters, FilterType, Table, TableColumn, usePushChangesToPath,
+  Filters, FilterType, Table, TableColumn, usePushChangesToPath, Spinner, LoadingWithDots,
 } from 'nitro-web'
 import { date, getCurrencyOptions, onChange, ucFirst } from 'nitro-web/util'
 import { Check, EllipsisVerticalIcon, FileEditIcon } from 'lucide-react'
@@ -44,6 +44,7 @@ export function Styleguide({ className, elements, children, currencies }: Styleg
     'Filters',
     'Button Colors & Sizes',
     'Button Icons',
+    'Loading Elements',
     'Varients',
     'Selects',
     'Inputs',
@@ -367,6 +368,18 @@ export function Styleguide({ className, elements, children, currencies }: Styleg
         </div>
       )}
 
+      {groups.includes('Loading Elements') && (
+        <div>
+          <h2 class="h3">Loading Elements</h2>
+          <div class="flex flex-wrap gap-x-6 gap-y-4 items-center mb-6">
+            <div><Spinner /></div>
+            <div><Spinner className="border-secondary" /></div>
+            <div><Spinner className="border-primary border-[3px]" /></div>
+            <div><LoadingWithDots message="Loading" /></div>
+          </div>
+        </div>
+      )}
+
       {groups.includes('Varients') && (
         <div>
           <h2 class="h3">Varients</h2>
@@ -659,6 +672,17 @@ export function Styleguide({ className, elements, children, currencies }: Styleg
             className="mb-6"
             isLoading={true}
           />
+          <Table
+            rows={[]}
+            columns={thead}
+            rowSideColor={(row) => ({ className: row?.status == 'pending' ? 'bg-yellow-400' : '', width: 5 })}
+            generateCheckboxActions={generateCheckboxActions}
+            generateTd={generateTd}
+            className="mb-6"
+            isLoading={true}
+            showLoadingOverlay={false}
+            showLoadingInline={true}
+          />
           <Table
             rows={rows.slice(0, 2).map(row => ({ ...row, _id: row._id + '1' }))}
             columns={thead}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.168",
+  "version": "0.0.170",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",

package/server/models/user.js

@@ -7,20 +7,23 @@ export default {
     avatar: { type: 'image' },
     company: { model: 'company', required: true },
     email: { type: 'email', required: true, index: 'unique' },
+    isInvited: { type: 'boolean' },
     firstName: { type: 'string', required: true },
     lastName: { type: 'string', required: true },
-    password: { type: 'string', minLength: 6 },
-    resetToken: { type: 'string' },
     status: { type: 'string', default: 'active', enum: ['active', 'deleted', 'inactive'] },
     stripeCustomer: { type: 'any' },
     stripeSubscription: { type: 'any' },
     stripeIntents: { type: 'any' },
     type: { type: 'string', default: 'user', enum: ['user', 'admin'] },
     usedFreeTrial: { type: 'boolean', default: false },
+    // hidden fields
+    password: { type: 'string', minLength: 6 },
+    inviteToken: { type: 'string' },
+    resetToken: { type: 'string' },
   },
 
-  findBL: ['password', 'resetToken'],
-  updateBL: ['company', 'password', 'resetToken', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
+  findBL: ['password', 'inviteToken', 'resetToken'],
+  updateBL: ['password', 'inviteToken', 'resetToken', 'company', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
 
   messages: {
     lastName: {

package/server/router.js

@@ -1,4 +1,5 @@
 // @ts-nocheck
+// renamed to app, similar to client/app.tsx
 import fs from 'fs'
 import path, { dirname } from 'path'
 import http from 'http'

package/types/components/auth/auth.api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAkLA,qGAyCC;AAED;;GAKC;AAED,0FAQC;AAED;;;;iBAkDC;AAED,mDAOC;AAED,4CAYC;AAED,kFAiBC;AAOD,qEAeC;AAED,sEAWC;AAED,iEAMC;AAED,gEAMC;AAID,wEAoBC;AAED;;;;;;;;GAQG;AACH,yEANG;IAAoC,IAAI,EAAhC,OAAO,GAAG,QAAQ;IACuC,IAAI,EAA7D;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC;IAC5B,YAAY;IACZ,eAAe;CAC1C,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAgCtE;AAhbD;;;;;;;;;;;;;;;;;;;;EA6BC;AAmED,0DAEC;AAkCD,mDAEC;AAnBD,iDAeC;AA9BD,2DAaC;AAuBD,2DAwBC;AAjID,4DA+DC"}
+{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAkLA,qGAyCC;AAED;;GAKC;AAED,0FAQC;AAED;;;;iBAkDC;AAED,mDAOC;AAED,4CAYC;AAED,kFAiBC;AAOD,qEAeC;AAED,sEAWC;AAED,iEAMC;AAED,gEAMC;AAID,wEAoBC;AAED;;;;;;;;GAQG;AACH,yEANG;IAAoC,IAAI,EAAhC,OAAO,GAAG,QAAQ;IACuC,IAAI,EAA7D;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC;IAC5B,YAAY;IACZ,eAAe;CAC1C,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAoCtE;AApbD;;;;;;;;;;;;;;;;;;;;EA6BC;AAmED,0DAEC;AAkCD,mDAEC;AAnBD,iDAeC;AA9BD,2DAaC;AAuBD,2DAwBC;AAjID,4DA+DC"}

package/types/server/models/user.d.ts

@@ -14,62 +14,70 @@ declare namespace _default {
             export { required_1 as required };
             export let index: string;
         }
-        export namespace firstName {
+        export namespace isInvited {
             let type_2: string;
             export { type_2 as type };
-            let required_2: boolean;
-            export { required_2 as required };
         }
-        export namespace lastName {
+        export namespace firstName {
             let type_3: string;
             export { type_3 as type };
-            let required_3: boolean;
-            export { required_3 as required };
+            let required_2: boolean;
+            export { required_2 as required };
         }
-        export namespace password {
+        export namespace lastName {
             let type_4: string;
             export { type_4 as type };
-            export let minLength: number;
+            let required_3: boolean;
+            export { required_3 as required };
         }
-        export namespace resetToken {
+        export namespace status {
             let type_5: string;
             export { type_5 as type };
-        }
-        export namespace status {
-            let type_6: string;
-            export { type_6 as type };
             let _default: string;
             export { _default as default };
             let _enum: string[];
             export { _enum as enum };
         }
         export namespace stripeCustomer {
+            let type_6: string;
+            export { type_6 as type };
+        }
+        export namespace stripeSubscription {
             let type_7: string;
             export { type_7 as type };
         }
-        export namespace stripeSubscription {
+        export namespace stripeIntents {
             let type_8: string;
             export { type_8 as type };
         }
-        export namespace stripeIntents {
-            let type_9: string;
-            export { type_9 as type };
-        }
-        export namespace type_10 {
-            let type_11: string;
-            export { type_11 as type };
+        export namespace type_9 {
+            let type_10: string;
+            export { type_10 as type };
             let _default_1: string;
             export { _default_1 as default };
             let _enum_1: string[];
             export { _enum_1 as enum };
         }
-        export { type_10 as type };
+        export { type_9 as type };
         export namespace usedFreeTrial {
-            let type_12: string;
-            export { type_12 as type };
+            let type_11: string;
+            export { type_11 as type };
             let _default_2: boolean;
             export { _default_2 as default };
         }
+        export namespace password {
+            let type_12: string;
+            export { type_12 as type };
+            export let minLength: number;
+        }
+        export namespace inviteToken {
+            let type_13: string;
+            export { type_13 as type };
+        }
+        export namespace resetToken {
+            let type_14: string;
+            export { type_14 as type };
+        }
     }
     let findBL: string[];
     let updateBL: string[];

package/types/server/models/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../server/models/user.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA8CmB,gCAEd"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../server/models/user.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiDmB,gCAEd"}

package/types/server/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAmCA,wHA6HC;AAoPD,+CAEC;AAED,kEAYC;AApGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAkF1B;sBAnYY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;iBA1Ba,MAAM;oBAIH,SAAS"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAoCA,wHA6HC;AAoPD,+CAEC;AAED,kEAYC;AApGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAkF1B;sBAnYY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;iBA1Ba,MAAM;oBAIH,SAAS"}

package/types.ts

@@ -29,6 +29,7 @@ export type User = {
   name?: string
   avatar?: MonasteryImage
   isAdmin?: boolean
+  isInvited?: boolean
   type?: string
 }