nitro-web 0.0.83 → 0.0.85

package/client/app.tsx

@@ -94,10 +94,12 @@ function App({ settings, config, storeContainer }: { settings: Settings, config:
   }, [!!router])
 
   return (
+    // <StrictMode>
     <storeContainer.Provider>
       { router && <RouterProvider router={router}/> }
       <AfterApp settings={settings} />
     </storeContainer.Provider>
+    // </StrictMode>
   )
 }
 
@@ -291,9 +293,9 @@ async function beforeApp(config: Config) {
 
 const defaultMiddleware = {
   // Global middleware that can referenced from component routes
-  isAdmin: (route: unknown, store: { user?: { type?: string } }) => {
+  isAdmin: (route: unknown, store: { user?: { type?: string, isAdmin?: boolean } }) => {
     const user = store.user || { type: 'visitor' }
-    if (user?.type?.match(/admin/)) return
+    if (user?.type?.match(/admin/) || user?.isAdmin) return
     else if (user?.type && user?.type !== 'visitor') return { redirect: '/signin?unauth' }
     else return { redirect: '/signin?signin' }
   },

package/client/index.ts

@@ -18,10 +18,6 @@ export { ResetInstructions, ResetPassword } from '../components/auth/reset'
 export { Dashboard } from '../components/dashboard/dashboard'
 export { NotFound } from '../components/partials/not-found'
 export { Styleguide } from '../components/partials/styleguide'
-// export { SettingsAccount } from '../components/settings/settings-account'
-// export { SettingsBusiness } from '../components/settings/settings-business'
-// export { SettingsTeamMember } from '../components/settings/settings-team--member'
-// export { SettingsTeam } from '../components/settings/settings-team'
 
 // Component Elements
 export { Accordion } from '../components/partials/element/accordion'

package/components/auth/auth.api.js

@@ -192,7 +192,7 @@ async function resetPassword(req, res) {
 async function inviteInstructions(req, res) {
   try {
     // Check if user is admin here rather than in middleware (which may not exist yet)
-    if (req.user.type != 'admin') {
+    if (req.user.type != 'admin' && !req.user.isAdmin) {
       throw new Error('You are not authorized to invite users.')
     }
     const inviteToken = await tokenCreate()
@@ -315,7 +315,7 @@ export async function signinAndGetStore(user, isDesktop, getStore) {
   return { ...store, jwt }
 }
 
-export async function userCreate({ name, business, email, password }) {
+export async function userCreate({ business, password, ...userDataProp }) {
   try {
     if (!this.findUserFromProvider) {
       throw new Error('this.findUserFromProvider doesn\'t exist, make sure the context is available when calling this function')
@@ -330,14 +330,15 @@ export async function userCreate({ name, business, email, password }) {
       users: [{ _id: userId, role: 'owner', status: 'active' }],
     }
     const userData = {
-      _id: userId, 
-      email: email,
-      firstName: fullNameSplit(name)[0],
-      lastName: fullNameSplit(name)[1],
+      ...userDataProp,
+      _id: userId,
+      ...(userDataProp.name ? { 
+        firstName: fullNameSplit(userDataProp.name)[0],
+        lastName: fullNameSplit(userDataProp.name)[1],
+      } : {}),
       password: password ? await bcrypt.hash(password, 10) : undefined,
       ...(isMultiTenant ? { company: companyData._id } : {}),
     }
-
     // First validate the data so we don't have to create a transaction
     const results = await Promise.allSettled([
       db.user.validate(userData, options),
@@ -362,10 +363,7 @@ export async function userCreate({ name, business, email, password }) {
 
   } catch (err) {
     if (!isArray(err)) throw err
-    throw err.map((o) => {
-      if (o.title == 'firstName') o.title = 'name'
-      return o
-    })
+    else throw err //...
   }
 }
 

package/components/auth/reset.tsx

@@ -1,4 +1,4 @@
-import { Topbar, Field, FormError, Button, util } from 'nitro-web'
+import { Topbar, Field, FormError, Button, request } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function ResetInstructions() {
@@ -9,7 +9,7 @@ export function ResetInstructions() {
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
     try {
-      await util.request('post /api/reset-instructions', state, event, isLoading)
+      await request('post /api/reset-instructions', state, event, isLoading, setState)
       setStore((s) => ({ ...s, message: 'Done! Please check your email.' }))
       navigate('/signin')
     } catch (e) {
@@ -52,7 +52,7 @@ export function ResetPassword() {
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
     try {
-      const data = await util.request('post /api/reset-password', state, event, isLoading)
+      const data = await request('post /api/reset-password', state, event, isLoading, setState)
       setStore((s) => ({ ...s, ...data }))
       navigate('/')
     } catch (e) {

package/components/auth/signin.tsx

@@ -1,4 +1,4 @@
-import { Topbar, Field, Button, FormError, util, injectedConfig, updateJwt } from 'nitro-web'
+import { Topbar, Field, Button, FormError, request, queryObject, injectedConfig, updateJwt } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function Signin() {
@@ -15,7 +15,7 @@ export function Signin() {
 
   useEffect(() => {
     // Autofill the email input from ?email=
-    const query = util.queryObject(location.search, true)
+    const query = queryObject(location.search, true)
     if (query.email) setState({ ...state, email: query.email as string })
   }, [location.search])
 
@@ -33,7 +33,7 @@ export function Signin() {
 
   async function onSubmit (e: React.FormEvent<HTMLFormElement>) {
     try {
-      const data = await util.request('post /api/signin', state, e, isLoading)
+      const data = await request('post /api/signin', state, e, isLoading, setState)
       // Keep it loading until we navigate
       isLoading[1](true)
       setStore((s) => ({ ...s, ...data }))

package/components/auth/signup.tsx

@@ -1,4 +1,4 @@
-import { Button, Field, FormError, Topbar, util, injectedConfig } from 'nitro-web'
+import { Button, Field, FormError, Topbar, request, injectedConfig } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function Signup() {
@@ -15,12 +15,11 @@ export function Signup() {
 
   async function onSubmit (e: React.FormEvent<HTMLFormElement>) {
     try {
-      setState({ ...state, errors: [] }) // clear errors (optional)
-      const data = await util.request('post /api/signup', state, e, isLoading)
-      setStore((s) => ({ ...s, ...data }))
+      const data = await request('post /api/signup', state, e, isLoading, setState)
+      setStore((prev) => ({ ...prev, ...data }))
       setTimeout(() => navigate('/'), 0) // wait for setStore
     } catch (e) {
-      return setState({ ...state, errors: e as Errors })
+      setState((prev) => ({ ...prev, errors: e as Errors }))
     }
   }
   
@@ -32,7 +31,10 @@ export function Signup() {
         <div class="grid grid-cols-2 gap-6">  
           <div>
             <label for="name">Your Name</label>
-            <Field name="name" placeholder="E.g. Bruce Wayne" state={state} onChange={(e) => onChange(setState, e)} />
+            <Field name="name" placeholder="E.g. Bruce Wayne" state={state} 
+              onChange={(e) => onChange(setState, e)} 
+              errorTitle={/^(name|firstName|lastName)$/} // if different from `name`
+            />
           </div>
           <div>
             <label for="business.name">Company Name</label>

package/components/partials/form/checkbox.tsx

@@ -16,14 +16,16 @@ type CheckboxProps = React.InputHTMLAttributes<HTMLInputElement> & {
   checkboxClassName?: string
   svgClassName?: string
   labelClassName?: string
+  /** title used to find related error messages */
+  errorTitle?: string|RegExp
 }
 
 export function Checkbox({ 
-  state, size, subtext, text, type='checkbox', className, checkboxClassName, svgClassName, labelClassName, ...props 
+  state, size, subtext, text, type='checkbox', className, checkboxClassName, svgClassName, labelClassName, errorTitle, ...props 
 }: CheckboxProps) {
   // Checkbox/radio/toggle component
   let value!: boolean
-  const error = getErrorFromState(state, props.name)
+  const error = getErrorFromState(state, errorTitle || props.name)
   const id = props.id || props.name
 
   if (!props.name) throw new Error('Checkbox requires a `name` prop')

package/components/partials/form/drop.tsx

@@ -21,16 +21,18 @@ type DropProps = {
     errors?: Errors
     [key: string]: unknown
   }
+  /** title used to find related error messages */
+  errorTitle?: string|RegExp
   /** Props to pass to the input element */
   [key: string]: unknown
 }
 
 type Image = File | FileList | MonasteryImage | null
 
-export function Drop({ awsUrl, className, id, name, onChange, multiple, state, ...props }: DropProps) {
+export function Drop({ awsUrl, className, id, name, onChange, multiple, state, errorTitle, ...props }: DropProps) {
   if (!name) throw new Error('Drop component requires a `name` prop')
   let value: Image = null
-  const error = getErrorFromState(state, name)
+  const error = getErrorFromState(state, errorTitle || name)
   const inputId = id || name
   const [urls, setUrls] = useState([])
   const stateRef = useRef(state)

package/components/partials/form/field.tsx

@@ -25,6 +25,8 @@ type FieldExtraProps = {
   /** Dependencies to break the implicit memoization of onChange/onInputChange */
   deps?: unknown[]
   placeholder?: string
+  /** title used to find related error messages */
+  errorTitle?: string|RegExp
 }
 type IconWrapperProps = {
   iconPos: 'left' | 'right'
@@ -43,17 +45,18 @@ type IsFieldCachedProps = {
   name: string
   state?: FieldProps['state']
   deps?: FieldProps['deps']
+  errorTitle?: FieldProps['errorTitle']
 }
 
 export const Field = memo(FieldBase, (prev, next) => {
   return isFieldCached(prev, next)
 })
 
-function FieldBase({ state, icon, iconPos: ip, ...props }: FieldProps) {
+function FieldBase({ state, icon, iconPos: ip, errorTitle, ...props }: FieldProps) {
   // `type` must be kept as props.type for TS to be happy and follow the conditions below
   let value!: string
   let Icon!: React.ReactNode
-  const error = getErrorFromState(state, props.name)
+  const error = getErrorFromState(state, errorTitle || props.name)
   const type = props.type
   const iconPos = ip == 'left' || (type == 'color' && !ip) ? 'left' : 'right'
   const id = props.id || props.name
@@ -184,13 +187,9 @@ function ColorSvg({ hex }: { hex?: string }) {
 export function isFieldCached(prev: IsFieldCachedProps, next: IsFieldCachedProps) {
   // Check if the field is cached, onChange/onInputChange doesn't affect the cache
   const path = prev.name
-  const state = prev.state || {}
-  // If the state value has changed, re-render!
-  if (deepFind(state, path) !== deepFind(next.state || {}, path)) return false
-  // If the state error has changed, re-render!
-  if (getErrorFromState(state, path) !== getErrorFromState(next.state || {}, path)) return false
-  // If `deps` have changed, handy for onChange/onInputChange, re-render!
-  if ((next.deps?.length !== prev.deps?.length) || next.deps?.some((v, i) => v !== prev.deps?.[i])) return false
+  const prevState = prev.state || {}
+  const nextState = next.state || {}
+  const errorTitle = next.errorTitle || path
 
   // Check if any prop has changed, except `onChange`/`onInputChange`
   const allKeys = new Set([...Object.keys(prev), ...Object.keys(next)])
@@ -201,6 +200,16 @@ export function isFieldCached(prev: IsFieldCachedProps, next: IsFieldCachedProps
       return false
     }
   }
+
+  // If `deps` have changed, handy for onChange/onInputChange, re-render!
+  if ((next.deps?.length !== prev.deps?.length) || next.deps?.some((v, i) => v !== prev.deps?.[i])) return false
+
+  // If the state value has changed, re-render!
+  if (deepFind(prevState, path) !== deepFind(nextState, path)) return false
+  
+  // If the state error has changed, re-render!
+  if (getErrorFromState(prevState, errorTitle) !== getErrorFromState(nextState, errorTitle)) return false
+
   // All good, use cached version
   return true
 }

package/components/partials/form/select.tsx

@@ -43,6 +43,8 @@ export type SelectProps = {
   mode?: 'country'|'customer'|''
   /** Pass dependencies to break memoization, handy for onChange/onInputChange **/
   deps?: unknown[]
+  /** title used to find related error messages */
+  errorTitle?: string|RegExp
   /** All other props are passed to react-select **/
   [key: string]: unknown
 }
@@ -51,9 +53,11 @@ export const Select = memo(SelectBase, (prev, next) => {
   return isFieldCached(prev, next)
 })
 
-function SelectBase({ id, containerId, minMenuWidth, name, prefix='', onChange, options, state, mode='', ...props }: SelectProps) {
+function SelectBase({ 
+  id, containerId, minMenuWidth, name, prefix='', onChange, options, state, mode='', errorTitle, ...props 
+}: SelectProps) {
   let value: unknown|unknown[]
-  const error = getErrorFromState(state, name)
+  const error = getErrorFromState(state, errorTitle || name)
   if (!name) throw new Error('Select component requires a `name` and `options` prop')
 
   // Get value from value or state

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "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/index.js

@@ -20,10 +20,8 @@ export { sendEmail } from './email/index.js'
 
 // Export API controllers
 export * from '../components/auth/auth.api.js'
-export * from '../components/settings/settings.api.js'
 export * from '../components/billing/stripe.api.js'
 
 export { routes as authRoutes } from '../components/auth/auth.api.js'
-export { routes as settingsRoutes } from '../components/settings/settings.api.js'
 export { routes as stripeRoutes } from '../components/billing/stripe.api.js'
 

package/server/models/user.js

@@ -8,7 +8,7 @@ export default {
     company: { model: 'company', required: true },
     email: { type: 'email', required: true, index: 'unique' },
     firstName: { type: 'string', required: true },
-    lastName: { type: 'string' },
+    lastName: { type: 'string', required: true },
     password: { type: 'string', minLength: 6 },
     resetToken: { type: 'string' },
     status: { type: 'string', default: 'active', enum: ['active', 'deleted', 'inactive'] },
@@ -22,6 +22,12 @@ export default {
   findBL: ['password', 'resetToken'],
   updateBL: ['company', 'password', 'resetToken', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
 
+  messages: {
+    lastName: {
+      required: 'A full name is required',
+    },
+  },
+
   beforeValidate: [
     async function (data) {
       if (data.email) data.email = data.email.trim().toLowerCase()
@@ -32,7 +38,7 @@ export default {
 
   afterFind: [
     async function (data) {
-      if (!data) return
+      if (!data) return data
       data.name = fullName(data)
     },
   ],

package/server/router.js

@@ -298,8 +298,8 @@ function resolveMiddleware (controllers, middleware, route, item) {
 }
 
 export const middleware = {
+  // Default middleware called before all /api/* routes
   order: [
-    // Express middleware runtime order that are called for all API requests
     'loadAssets',
     'modifyRequest',
     'parseUrlEncoded',
@@ -308,6 +308,8 @@ export const middleware = {
     'beforeAPIRoute',
   ],
 
+  // --- Default middleware ---------------------
+
   modifyRequest: (req, res, next) => {
     // Handy boolean denoting that the request wants JSON returned
     // global.start = new Date().getTime()
@@ -345,4 +347,42 @@ export const middleware = {
     res.set('version', req.version)
     next()
   },
+
+  // --- Custom middleware ----------------------
+
+  isAdmin: (req, res, next) => {
+    // Still need to remove cookie matching in favour of uid..
+    // E.g. Cookie matching handy for rare issues, e.g. signout > signin (to a different user on another tab)
+    const user = req.user
+    let cookieMatch = user && (!req.headers.authid || user._id.toString() == req.headers.authid)
+    if (cookieMatch && (user.type?.match(/admin/) || user.isAdmin)) next()
+    else if (user && (user.type?.match(/admin/) || user.isAdmin)) res.unauthorized('Invalid cookie, please refresh your browser')
+    else if (user) res.unauthorized('You are not authorised to make this request.')
+    else res.unauthorized('Please sign in first.')
+  },
+  isCompanyOwner: (req, res, next) => {
+    let user = req.user || { companies: [] }
+    let cid = req.params.cid
+    let company = user.companies.find((o) => o._id.toString() == cid)
+    let companyUser = company?.users?.find((o) => o._id.toString() == user._id.toString())
+    if (!user._id) return res.unauthorized('Please sign in first.')
+    else if (!company || !companyUser) res.unauthorized('You are not authorised to make this request.')
+    else if (companyUser.type != 'owner') res.unauthorized('Only owners can make this request.')
+    else next()
+  },
+  isCompanyUser: (req, res, next) => {
+    let user = req.user || { companies: [] }
+    let cid = req.params.cid
+    let company = user.companies.find((o) => o._id.toString() == cid)
+    if (!user._id) return res.unauthorized('Please sign in first.')
+    else if (!company) res.unauthorized('You are not authorised to make this request.')
+    else next()
+  },
+  isUser: (req, res, next) => {
+    // todo: need to double check that uid is always defined
+    let uid = req.params.uid
+    if (req.user && (typeof uid == 'undefined' || req.user._id.toString() == uid)) next()
+    else if (req.user) res.unauthorized('You are not authorised to make this request.')
+    else res.unauthorized('Please sign in first.')
+  },
 }

package/types/util.d.ts

@@ -266,7 +266,7 @@ export function getCurrencyOptions(currencies: {
 /**
  * Returns an error from a state object matching the path
  * @param {{ errors?: { title: string, detail: string }[] }|undefined} state
- * @param {string} path
+ * @param {string|RegExp} path
  * @returns {{ title: string, detail: string }|undefined}
  */
 export function getErrorFromState(state: {
@@ -274,7 +274,7 @@ export function getErrorFromState(state: {
         title: string;
         detail: string;
     }[];
-} | undefined, path: string): {
+} | undefined, path: string | RegExp): {
     title: string;
     detail: string;
 } | undefined;
@@ -621,6 +621,7 @@ export function queryString(obj?: {
  * @param {{ [key: string]: any }} [data] - payload
  * @param {{preventDefault?: function}} [event] - event to prevent default
  * @param {[boolean, (value: boolean) => void]} [isLoading] - [isLoading, setIsLoading]
+ * @param {SetState} [setState] - if passed, state.errors will be reset before the request
  * @returns {Promise<any>}
  *
  * @example
@@ -631,7 +632,7 @@ export function request(route: string, data?: {
     [key: string]: any;
 }, event?: {
     preventDefault?: Function;
-}, isLoading?: [boolean, (value: boolean) => void]): Promise<any>;
+}, isLoading?: [boolean, (value: boolean) => void], setState?: SetState): Promise<any>;
 /**
  * Removes undefined from an array or object
  * @param {[]|{[key: string]: any}} variable
@@ -784,4 +785,5 @@ export type Image = {
     base64?: string;
     date?: number;
 };
+export type SetState = import("react").Dispatch<import("react").SetStateAction<any>>;
 //# sourceMappingURL=util.d.ts.map

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"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"}

package/util.js

@@ -4,6 +4,8 @@ import dateformat from 'dateformat'
 import { loadStripe } from '@stripe/stripe-js/pure.js' // pure removes ping
 import { twMerge as _twMerge } from 'tailwind-merge'
 
+/** @typedef {import('react').Dispatch<import('react').SetStateAction<any>>} SetState */
+
 /** @type {{[key: string]: {[key: string]: string|true}}} */
 let queryObjectCache = {}
 
@@ -689,7 +691,7 @@ export function getCurrencyOptions (currencies) {
 /**
  * Returns an error from a state object matching the path
  * @param {{ errors?: { title: string, detail: string }[] }|undefined} state
- * @param {string} path
+ * @param {string|RegExp} path
  * @returns {{ title: string, detail: string }|undefined}
  */
 export function getErrorFromState (state, path) {
@@ -1403,13 +1405,14 @@ export function queryString (obj, _path='', _output) {
  * @param {{ [key: string]: any }} [data] - payload
  * @param {{preventDefault?: function}} [event] - event to prevent default
  * @param {[boolean, (value: boolean) => void]} [isLoading] - [isLoading, setIsLoading]
+ * @param {SetState} [setState] - if passed, state.errors will be reset before the request
  * @returns {Promise<any>}
  * 
  * @example
  *   - request('post /api/user', { name: 'John' })
  *   - request(`get  /api/user/${id}`, undefined, e, isLoading)
  */
-export async function request (route, data, event, isLoading) {
+export async function request (route, data, event, isLoading, setState) {
   try {
     if (event?.preventDefault) event.preventDefault()
     const uri = route.replace(/^(post|put|delete|get) /, '')
@@ -1426,7 +1429,7 @@ export async function request (route, data, event, isLoading) {
 
     // warning, not persisting through re-renders, but should be fine until loading is finished
     data = data || {}
-    delete data.errors
+    if (setState) setState((/** @type {{[key: string]: any}} */prev) => ({ ...prev, errors: [] }))
 
     // Find out if the data has files?
     let hasFiles = false
@@ -1439,7 +1442,7 @@ export async function request (route, data, event, isLoading) {
 
     // If yes, convert to form data
     /** @type {FormData|undefined} */
-    const formData2 = hasFiles ? formData(data, { allowEmptyArrays: true, indices: true }) : undefined
+    const formData2 = hasFiles ? formData({ ...data }, { allowEmptyArrays: true, indices: true }) : undefined
 
     // send the request
     const axiosPromise = (method === 'get' || method === 'delete') 

package/components/settings/settings-account.tsx

@@ -1,139 +0,0 @@
-// @ts-nocheck
-// todo: finish tailwind conversion
-import * as util from 'nitro-web/util'
-import SvgTick from 'nitro-web/client/imgs/icons/tick.svg'
-import { Button, FormError, Field, Modal, Topbar, Tabbar } from 'nitro-web'
-
-export function SettingsAccount() {
-  const isLoading = useState(false)
-  const [removeModal, setRemoveModal] = useState()
-  const [{user}, setStore] = sharedStore.useTracked()
-  const [state, setState] = useState({
-    avatar: user.avatar || '',
-    email: user.email || '',
-    firstName: user.firstName || '',
-    lastName: user.lastName || '',
-  })
-
-  async function onSubmit (e) {
-    try {
-      const res = await util.request(`put /api/user/${user._id}?files=true`, state, e, isLoading)
-      setStore((s) => ({ ...s, user: { ...s.user, ...res }, message: 'Saved successfully 👍️' }))
-    } catch (errors) {
-      return setState({ ...state, errors })
-    }
-  }
-
-  return (
-    <div css={style}>
-      <Topbar 
-        title={<>Settings</>} 
-        submenu={
-          <Tabbar class="is-underline"tabs={[
-            { label: 'Business', path: '/settings/business' },
-            { label: 'Team', path: '/settings/team' },
-            { label: 'Account', path: '/settings/account' },
-          ]} />
-        }
-        btns={
-          <Button onClick={onSubmit} color="primary-sm" size="wide" IconLeft={SvgTick} isLoading={isLoading[0]}>
-            Save Settings
-          </Button>
-        }
-      />
-      <div class="box p-box">
-        <h3 class="h3">Account Info</h3>
-
-        <form class="form" onSubmit={onSubmit}>
-          <div class="cols cols-6 cols-gap-3">
-            <div class="col">
-              <label for="firstName">First Name(s)</label>
-              <Field name="firstName" placeholder="E.g. Bruce" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <label for="lastName">Last Name</label>
-              <Field name="lastName" placeholder="E.g. Wayne" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <label for="email">Email Address</label>
-              <Field name="email" type="email" placeholder="Your email address..." state={state} 
-                onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <Link to="/reset" class="label-right link2 underline2 is-active">Reset Password?</Link>
-              <label for="password">Password</label>
-              <Field name="password" placeholder="•••••••••••" disabled={true} />
-            </div>
-          </div>
-          
-          <div class="py-0-5 mb-12">
-            Warning: to remove all your data and delete your
-            account, <a href="#" onClick={() => setRemoveModal(user)} class="link2 underline2 is-active">click here</a>.
-            <FormError state={state} class="pt-2" />
-          </div>
-        </form>
-      </div>
-
-      <RemoveModal show={removeModal} setShow={setRemoveModal} />
-    </div>
-  )
-}
-
-export function RemoveModal ({ show, setShow }) {
-  // @param {object} showModal - user
-  const navigate = useNavigate()
-  const isLoading = useState(false)
-  const [, setStore] = sharedStore.useTracked()
-  const [state, setState] = useState({})
-
-  useEffect(() => {
-    if (show?._id) setState({ _id: show._id })
-  }, [show?._id])
-
-  async function onSubmit (e) {
-    try {
-      await util.request(`delete /api/account/${state._id}`, null, e, isLoading)
-      close()
-      setStore(o => ({ ...o, message: 'Data deleted successfully, Goodbye 👋...' }))
-      setTimeout(() => navigate('/signout'), 6000) // wait for setStore
-    } catch (errors) {
-      return setState({ ...state, errors })
-    }
-  }
-
-  function close() {
-    setShow(false)
-    setTimeout(() => setState(false), 300)
-  }
-
-  return (
-    <Modal show={show} setShow={close} css={style} class="p-modal-small" maxWidth={560} minHeight={0}>
-      <h2 class="h2"><em>Delete</em> Your Account?</h2>
-      <p class="text-paragraph py-2">
-        This will remove all the data against your account and including all companies owned by you.<br/>
-        <br/>
-        <b>Warning:</b> This cannot be undone.
-      </p>
-      <form class="form" onSubmit={onSubmit}>
-        <div class="py-0-5 mb-4">
-          <FormError state={state} class="pt-2" />
-        </div>
-        <Button onClick={onSubmit} color="secondary-sm" isLoading={isLoading[0]}>
-          Delete Account
-        </Button>
-      </form>
-    </Modal>
-  )
-}
-
-import { css } from 'twin.macro'
-const style = css`
-  /* input[type='file'] {
-    padding: 8px 18px;
-    font-size: 12px;
-  }
-  .avatar {
-    width: 38px;
-    height: 38px;
-  } */
- `

package/components/settings/settings-business.tsx

@@ -1,117 +0,0 @@
-//@ts-nocheck
-// todo: finish tailwind conversio
-
-////// look at the select type error below
-import * as util from 'nitro-web/util'
-import SvgTick from 'nitro-web/client/imgs/icons/tick.svg'
-import { Button, Field, Select, Topbar, Tabbar, injectedConfig } from 'nitro-web'
-
-export function SettingsBusiness() {
-  const isLoading = useState(false)
-  const [{ user }, setStore] = sharedStore.useTracked()
-  const [state, setState] = useState(() => {
-    const company = user.company
-    return {
-      business: {
-        address: company.business.address?.full || '',
-        country: company.business.country || 'nz',
-        currency: company.business.currency || 'nzd',
-        name: company.business.name || '',
-        number: company.business.number || '',
-        phone: company.business.phone || '',
-        website: company.business.website || '',
-      },
-    }
-  })
-
-  async function onSubmit (e) {
-    try {
-      const company = await util.request(`put /api/company/${user.company._id}`, state, e, isLoading)
-      setStore((s) => ({ ...s, user: { ...s.user, company }, message: 'Saved successfully 👍️' }))
-    } catch (errors) {
-      console.log(errors)
-      return setState({ ...state, errors })
-    }
-  }
-
-  return (
-    <div>
-      <Topbar 
-        title={<>Settings</>} 
-        submenu={
-          <Tabbar class="is-underline" tabs={[
-            { label: 'Business', path: '/settings/business' },
-            { label: 'Team', path: '/settings/team' },
-            { label: 'Account', path: '/settings/account' },
-          ]} />
-        }
-        btns={
-          <Button onClick={onSubmit} color="primary-sm" size="wide" IconLeft={SvgTick} isLoading={isLoading[0]}>
-            Save Settings
-          </Button>
-        }
-      />
-
-      <div class="box p-box">
-        <h3 class="h3">Business Settings</h3>
-
-        <form class="form" onSubmit={onSubmit}>
-          <div class="cols cols-6 cols-gap-3">
-            <div class="col">
-              <label for="business.country">Country</label>
-              <Select
-                // https://github.com/lipis/flag-icons
-                name="business.country" 
-                type="country" 
-                state={state} 
-                options={useMemo(() => util.getCountryOptions(injectedConfig.countries), [])} 
-                onChange={(e) => onChange(setState, e)}
-              />
-            </div>
-            <div class="col">
-              <label for="business.currency">Currency</label>
-              <Select 
-                name="business.currency" 
-                type="country" 
-                state={state} 
-                options={useMemo(() => util.getCurrencyOptions(injectedConfig.currencies), [])}
-                onChange={(e) => onChange(setState, e)}
-              />
-            </div>
-            <div class="col">
-              <label for="business.name">Trading Name</label>
-              <Field name="business.name" placeholder="E.g. Wayne Enterprises" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <Link to="#" class="label-right link2 underline2 is-active">Custom Address</Link>
-              <label for="business.address">Address (Start Typing...)</label>
-              <Field name="business.address.full" placeholder="" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <label for="business.website">Website</label>
-              <Field name="business.website" placeholder="https://" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <label for="business.phone">Mobile Number</label>
-              <Field name="business.phone" placeholder="" state={state} onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <Link to="#" class="label-right link2 underline2 is-active">What&apos;s this for?</Link>
-              <label for="tax.number">GST Number</label>
-              <Field class="mb-0" name="tax.number" placeholder="Appears on your documents" state={state} 
-                onChange={(e) => onChange(setState, e)} />
-            </div>
-            <div class="col">
-              <Link to="#" class="label-right link2 underline2 is-active">What&apos;s this for?</Link>
-              <label for="business.number">NZBN</label>
-              <Field class="mb-0" name="business.number" type="text" rows="23" placeholder="Appears on your documents" state={state} 
-                onChange={(e) => onChange(setState, e)} />
-            </div>
-          </div>
-        </form>
-      </div>
-
-    </div>
-  )
-}
-

package/components/settings/settings-team--member.tsx

@@ -1,106 +0,0 @@
-// @ts-nocheck
-// todo: finish tailwind conversion
-import { Button, FormError, Field, Modal, Select, injectedConfig } from 'nitro-web'
-import SvgTick from 'nitro-web/client/imgs/icons/tick.svg'
-
-type SettingsTeamMemberProps = {
-  showModal: boolean
-  setShowModal: (showModal: boolean) => void
-}
-
-export function SettingsTeamMember ({ showModal, setShowModal }: SettingsTeamMemberProps) {
-  // @param {object} showModal - user
-  const [{ user }] = sharedStore.useTracked()
-  const [isLoading] = useState(false)
-  const [state, setState] = useState({
-    business: {
-      name: '',
-      address: '',
-      website: '',
-      phone: '',
-    },
-  })
-
-  // permit polit changes
-  // typescripty, 
-
-  function onSubmit(_e) {
-    //... save
-  }
-
-  return (
-    <Modal show={showModal} setShow={setShowModal} class="p-modal">
-
-      <h2 class="h2"><em>Add</em> Team Member</h2>
-      <p class="subtitle">Invite a new team member to collaborate with you on {injectedConfig?.name || 'Nitro'}.</p>
-      
-      <form class="form" onSubmit={onSubmit}>
-        <div class="cols cols-6 cols-gap-2-5">
-          <div class="col">
-            <label for="role">Member Role</label>
-            <Select 
-              name="role"
-              isSearchable={false}
-              placeholder="Select a role"
-              onChange={(e) => onChange(setState, e)} 
-              state={state}
-              minMenuWidth={460}
-              options={[
-                { 
-                  className: 'bb',
-                  value: 'owner', 
-                  labelControl: 'Owner',
-                  label: <>
-                    <div class="mb-0-5"><b>Owner</b></div>
-                    <div>Full access.</div>
-                  </>,
-                },
-                { 
-                  className: 'bb',
-                  value: 'manager', 
-                  labelControl: 'Manager',
-                  label: <>
-                    <div class="mb-0-5"><b>Manager</b></div>
-                    <div>No access to billing or the ability to remove your account.</div>
-                  </>,
-                },
-              ]}
-            />
-          </div>
-          <div class="col">
-            <label for="email">Email Address</label>
-            <Field 
-              name="email" type="email" placeholder="Your email address..." state={state} 
-              onChange={(e) => onChange(setState, e)} 
-            />
-          </div>
-          <div class="col">
-            <label for="firstName">First Name</label>
-            <Field name="firstName" placeholder="E.g. Bruce" state={state} onChange={(e) => onChange(setState, e)} />
-          </div>
-          <div class="col">
-            <label for="lastName">Last Name</label>
-            <Field name="lastName" placeholder="E.g. Wayne" state={state} onChange={(e) => onChange(setState, e)} />
-          </div>
-          <div class="col-12">
-            <label for="message">Invitation Message</label>
-            <Field 
-              name="message" 
-              type="textarea" 
-              placeholder={`${user.firstName} is inviting you to collaborate on ${injectedConfig?.name || 'Nitro'}.`} 
-              state={state} 
-              onChange={(e) => onChange(setState, e)} 
-            />
-          </div>
-        </div>
-        
-        <div class="py-0-5 mb-4">
-          <FormError state={state} class="pt-2" />
-        </div>
-        <Button onClick={onSubmit} color="primary-sm" IconLeft={SvgTick} isLoading={isLoading[0]}>
-          Send Invitation
-        </Button>
-      </form>
-    </Modal>
-  )
-}

package/components/settings/settings-team.tsx

@@ -1,72 +0,0 @@
-// @ts-nocheck
-// todo: finish tailwind conversion
-import * as util from 'nitro-web/util'
-import SvgPlus from 'nitro-web/client/imgs/icons/plus.svg'
-import { Button, Table, Avatar, Tabbar, Topbar, SettingsTeamMember, injectedConfig } from 'nitro-web'
-
-export function SettingsTeam() {
-  const isLoading = useState(false)
-  const [showModal, setShowModal] = useState()
-  const [{ user }] = sharedStore.useTracked()
-  const [state] = useState({
-    users: user?.company?.users || [],
-  })
-  
-  function addTeamMember() {
-    //... open modal
-  }
-
-  return (
-    <div>
-      <Topbar
-        title={<>Settings</>} 
-        submenu={
-          <Tabbar class="is-underline" tabs={[
-            { label: 'Business', path: '/settings/business' },
-            { label: 'Team', path: '/settings/team' },
-            { label: 'Account', path: '/settings/account' },
-          ]} />
-        }
-        btns={
-          <Button onClick={addTeamMember} color="primary-sm" IconLeft={SvgPlus} isLoading={isLoading[0]}>
-            Add Team Member
-          </Button>
-        }
-      />
-
-      <Table
-        columns={[
-          { label: 'Member\'s Name', key: 'name', width: 1 },
-          { label: 'Email', key: 'email' },
-          { label: 'Joined On', key: 'joinedOn', align: 'center' },
-          { label: 'Role', key: 'role', width: '110px' },
-        ]}
-        rowOnClick={(e, user) => setShowModal(user)}
-        rows={
-          state.users.map(user => ({
-            ...user,
-            key: user._id,
-            name: (
-              <>
-                <Avatar awsUrl={injectedConfig.awsUrl} user={user} isRound={true} class="mt--1 mb--1" />
-                <b>{util.ucFirst(user.name)}</b>
-                {user.status != 'invited' && <span class="text-grey">(Invitation pending)</span>}
-              </>
-            ),
-            joinedOn: user.status == 'invited' ? <a href="#">Resend Invite</a> : util.date(user.createdAt),
-            role: util.ucFirst(user.role),
-          }))
-        }
-        actions={[
-          { label: 'Remove', onClick: (_row, _i) => console.log('remove') },
-        ]}
-        actionsAll={[
-          { label: 'Remove All', onClick: () => console.log('remove all') },
-        ]}
-      />
-
-      {/* Member modal */}
-      <SettingsTeamMember showModal={showModal} setShowModal={setShowModal} />
-    </div>
-  )
-}

package/components/settings/settings.api.js

@@ -1,51 +0,0 @@
-// @ts-nocheck
-import db from 'monastery'
-
-export const routes = {
-  'put  /api/company/:cid': ['isCompanyUser', update],
-  'put  /api/user/:uid': ['isUser', updateUser],
-}
-
-async function update(req, res) {
-  try {
-    const update = await db.company.update({
-      query: req.params.cid,
-      data: req.body,
-      files: req.query.files ? req.files : undefined,
-    })
-    if (!update) {
-      throw new Error('Coudln\'t find the company to update')
-    }
-    const company = await db.company.findOne({
-      query: req.params.cid,
-      populate: db.company.loginPopulate(),
-      _privateData: true,
-    })
-    res.json(company)
-
-  } catch (errs) {
-    res.error(errs)
-  }
-}
-
-async function updateUser(req, res) {
-  try {
-    const update = await db.user.update({
-      query: req.params.uid,
-      data: req.body,
-      files: req.query.files ? req.files : undefined,
-    })
-    if (!update) {
-      throw new Error('Coudln\'t find the user to update')
-    }
-    const user = await db.user.findOne({
-      query: req.params.uid,
-      _privateData: true,
-      blacklist: ['company'], // don't return the company id
-    })
-    res.json(user)
-
-  } catch (errs) {
-    res.error(errs)
-  }
-}