nitro-web 0.1.1 → 0.1.3

package/client/app.tsx

@@ -15,7 +15,7 @@ type LayoutProps = {
 
 type Settings = {
   afterApp?: () => void
-  beforeApp: (config: Config) => Promise<object>
+  beforeApp: (config: Config) => Promise<unknown>
   // beforeStoreUpdate: (prevStore: Store | null, newData: Store) => Store
   isStatic?: boolean
   layouts: React.FC<LayoutProps>[]

package/components/auth/inviteConfirm.tsx

@@ -4,7 +4,7 @@ import { Fragment, useEffect } from 'react'
 
 type InviteConfirmProps = {
   className?: string,
-  elements?: { Button?: typeof Button },
+  elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
 }
 
@@ -25,6 +25,7 @@ export function InviteConfirm({ className, elements, redirectTo }: InviteConfirm
 
   const Elements = {
     Button: elements?.Button || Button,
+    Header: elements?.Header || null,
   }
 
   // Auto-confirm on mount for already signed-in users
@@ -72,6 +73,7 @@ export function InviteConfirm({ className, elements, redirectTo }: InviteConfirm
 
   return (
     <div className={className}>
+      {!!Elements.Header && Elements.Header}
       <Topbar title={<Fragment>Accept Your Invite</Fragment>} />
 
       <form onSubmit={(e) => submit(state, e)} class="mb-0">

package/components/auth/reset.tsx

@@ -4,7 +4,7 @@ import { Fragment } from 'react'
 
 type resetInstructionsProps = {
   className?: string,
-  elements?: { Button?: typeof Button },
+  elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
 }
 
@@ -16,6 +16,7 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
 
   const Elements = {
     Button: elements?.Button || Button,
+    Header: elements?.Header || null,
   }
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
@@ -31,6 +32,7 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
 
   return (
     <div className={className}>
+      {!!Elements.Header && Elements.Header}
       <Topbar title={<Fragment>Reset your Password</Fragment>} />
 
       <form onSubmit={onSubmit} class="mb-0">
@@ -64,6 +66,7 @@ export function ResetPassword({ className, elements, redirectTo }: resetInstruct
   
   const Elements = {
     Button: elements?.Button || Button,
+    Header: elements?.Header || null,
   }
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
@@ -79,6 +82,7 @@ export function ResetPassword({ className, elements, redirectTo }: resetInstruct
 
   return (
     <div className={className}>
+      {!!Elements.Header && Elements.Header}
       <Topbar title={<Fragment>Reset your Password</Fragment>} />
 
       <form onSubmit={onSubmit} class="mb-0">

package/components/auth/signin.tsx

@@ -4,11 +4,12 @@ import { Fragment } from 'react'
 
 type signinProps = {
   className?: string,
-  elements?: { Button?: typeof Button },
+  elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
+  hideSignup?: boolean,
 }
 
-export function Signin({ className, elements, redirectTo }: signinProps) {
+export function Signin({ className, elements, redirectTo, hideSignup }: signinProps) {
   const navigate = useNavigate()
   const location = useLocation()
   const isSignout = location.pathname == '/signout'
@@ -22,6 +23,7 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
   
   const Elements = {
     Button: elements?.Button || Button,
+    Header: elements?.Header || null,
   }
 
   useEffect(() => {
@@ -60,6 +62,7 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
 
   return (
     <div className={className}>
+      {!!Elements.Header && Elements.Header}
       <Topbar title={<Fragment>Sign in to your Account</Fragment>} />
 
       <form onSubmit={onSubmit} class="mb-0">
@@ -77,7 +80,9 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
         </div>
         
         <div class="mb-14">
-          Don&apos;t have an account? You can <Link to="/signup" class="underline2 is-active">sign up here</Link>.
+          {!hideSignup && (
+            <Fragment>Don&apos;t have an account? You can <Link to="/signup" class="underline2 is-active">sign up here</Link>.</Fragment>
+          )}
           <FormError state={state} className="pt-2" />
         </div>
 

package/components/auth/signup.tsx

@@ -4,7 +4,7 @@ import { Fragment } from 'react'
 
 type signupProps = {
   className?: string,
-  elements?: { Button?: typeof Button },
+  elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
 }
 
@@ -22,6 +22,7 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
 
   const Elements = {
     Button: elements?.Button || Button,
+    Header: elements?.Header || null,
   }
 
   async function onSubmit (e: React.FormEvent<HTMLFormElement>) {
@@ -37,6 +38,7 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
   
   return (
     <div className={className}>
+      {!!Elements.Header && Elements.Header}
       <Topbar title={<Fragment>Start your 21 day Free Trial</Fragment>} />
 
       <form onSubmit={onSubmit} class="mb-0">

package/components/partials/not-found.tsx

@@ -1,6 +1,8 @@
-export function NotFound() {
+import { twMerge } from 'nitro-web/util'
+
+export function NotFound({ className }: { className?: string }) {
   return (
-    <div style={{'minHeight': '300px'}}>
+    <div className={twMerge('min-h-[300px]', className)}>
       <span class="h1">Page Not Found</span><br />
       <br />
       The page you&apos;re looking for doesn&apos;t exist or has moved.<br />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "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/types.ts

@@ -17,7 +17,7 @@ type InjectedConfig = {
 
 export type Config = InjectedConfig & {
   // Non-injectable config on the client
-  beforeApp?: () => Promise<object>
+  beforeApp?: (config: Config) => Promise<unknown>
   beforeStoreUpdate?: (prevStore: Store | null, newData: Store) => Store
   middleware?: {[key: string]: (route: any, store: any) => undefined | { redirect: string }}
 }

package/util.js

@@ -756,9 +756,9 @@ export function formData (obj, cfg, existingFormData, keyPrefix) {
     cfg.allowEmptyArrays = cfg.allowEmptyArrays === undefined ? false : cfg.allowEmptyArrays
     existingFormData = existingFormData || new FormData()
 
-    const isBlob = typeof obj === 'object' && 
-      'size' in obj && typeof obj.size === 'number' && 
-      'type' in obj && typeof obj.type === 'string' && 
+    const isBlob = obj != null && typeof obj === 'object' &&
+      'size' in obj && typeof obj.size === 'number' &&
+      'type' in obj && typeof obj.type === 'string' &&
       'slice' in obj && typeof obj.slice === 'function'
 
     const isFile = isBlob &&