nitro-web 0.0.174 → 0.0.179

package/components/auth/reset.tsx

@@ -10,7 +10,7 @@ type resetInstructionsProps = {
 
 export function ResetInstructions({ className, elements, redirectTo }: resetInstructionsProps) {
   const navigate = useNavigate()
-  const isLoading = useState(false)
+  const [isLoading, setIsLoading] = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState({ email: '', errors: [] as Errors })
 
@@ -20,7 +20,8 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
     try {
-      await request('post /api/reset-instructions', state, event, isLoading, setState)
+      if (isLoading) return
+      await request('post /api/reset-instructions', state, event, setIsLoading, setState)
       setStore((s) => ({ ...s, message: 'Done! Please check your email.' }))
       navigate(redirectTo || '/signin')
     } catch (e) {
@@ -43,7 +44,7 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
           <FormError state={state} className="pt-2" />
         </div>
 
-        <Elements.Button className="w-full" isLoading={isLoading[0]} type="submit">Email me a reset password link</Elements.Button>
+        <Elements.Button className="w-full" isLoading={isLoading} type="submit">Email me a reset password link</Elements.Button>
       </form>
     </div>
   )
@@ -52,7 +53,7 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
 export function ResetPassword({ className, elements, redirectTo }: resetInstructionsProps) {
   const navigate = useNavigate()
   const params = useParams()
-  const isLoading = useState(false)
+  const [isLoading, setIsLoading] = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState(() => ({
     password: '',
@@ -67,7 +68,8 @@ export function ResetPassword({ className, elements, redirectTo }: resetInstruct
 
   async function onSubmit (event: React.FormEvent<HTMLFormElement>) {
     try {
-      const data = await request('post /api/reset-password', state, event, isLoading, setState)
+      if (isLoading) return
+      const data = await request('post /api/reset-password', state, event, setIsLoading, setState)
       setStore((s) => ({ ...s, ...data }))
       setTimeout(() => navigate(redirectTo || '/'), 10) // wait for setStore
     } catch (e) {
@@ -94,7 +96,7 @@ export function ResetPassword({ className, elements, redirectTo }: resetInstruct
           <FormError state={state} className="pt-2" />
         </div>
 
-        <Elements.Button class="w-full" isLoading={isLoading[0]} type="submit">Reset Password</Elements.Button>
+        <Elements.Button class="w-full" isLoading={isLoading} type="submit">Reset Password</Elements.Button>
       </form>
     </div>
   )

package/components/auth/signin.tsx

@@ -12,7 +12,7 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
   const navigate = useNavigate()
   const location = useLocation()
   const isSignout = location.pathname == '/signout'
-  const isLoading = useState(isSignout)
+  const [isLoading, setIsLoading] = useState(isSignout)
   const [, setStore] = useTracked()
   const [state, setState] = useState({
     email: injectedConfig.env == 'development' ? (injectedConfig.placeholderEmail || '') : '',
@@ -35,18 +35,19 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
       setStore((s) => ({ ...s, user: undefined }))
       // util.axios().get('/api/signout')
       Promise.resolve()
-        .then(() => isLoading[1](false))
+        .then(() => setIsLoading(false))
         .then(() => updateJwt())
         .then(() => navigate({ pathname: '/signin', search: location.search }, { replace: true }))
-        .catch(err => (console.error(err), isLoading[1](false)))
+        .catch(err => (console.error(err), setIsLoading(false)))
     }
   }, [isSignout])
 
   async function onSubmit (e: React.FormEvent<HTMLFormElement>) {
     try {
-      const data = await request('post /api/signin', state, e, isLoading, setState)
+      if (isLoading) return
+      const data = await request('post /api/signin', state, e, setIsLoading, setState)
       // Keep it loading until we navigate
-      isLoading[1](true)
+      setIsLoading(true)
       setStore((s) => ({ ...s, ...data }))
       setTimeout(() => { // wait for setStore
         if (location.search.includes('redirect')) navigate(location.search.replace('?redirect=', ''))
@@ -80,7 +81,7 @@ export function Signin({ className, elements, redirectTo }: signinProps) {
           <FormError state={state} className="pt-2" />
         </div>
 
-        <Elements.Button class="w-full" isLoading={isLoading[0]} type="submit">Sign In</Elements.Button>
+        <Elements.Button class="w-full" isLoading={isLoading} type="submit">Sign In</Elements.Button>
       </form>
     </div>
   )

package/components/auth/signup.tsx

@@ -10,7 +10,7 @@ type signupProps = {
 
 export function Signup({ className, elements, redirectTo }: signupProps) {
   const navigate = useNavigate()
-  const isLoading = useState(false)
+  const [isLoading, setIsLoading] = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState({
     email: injectedConfig.env === 'development' ? (injectedConfig.placeholderEmail || '') : '',
@@ -26,7 +26,8 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
 
   async function onSubmit (e: React.FormEvent<HTMLFormElement>) {
     try {
-      const data = await request('post /api/signup', state, e, isLoading, setState)
+      if (isLoading) return
+      const data = await request('post /api/signup', state, e, setIsLoading, setState)
       setStore((prev) => ({ ...prev, ...data }))
       setTimeout(() => navigate(redirectTo || '/'), 10) // wait for setStore
     } catch (e) {
@@ -66,7 +67,7 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
           <FormError state={state} className="pt-2" />
         </div>
 
-        <Elements.Button class="w-full" isLoading={isLoading[0]} type="submit">Create Account</Elements.Button>
+        <Elements.Button class="w-full" isLoading={isLoading} type="submit">Create Account</Elements.Button>
       </form>
     </div>
   )

package/components/partials/styleguide.tsx

@@ -711,10 +711,17 @@ export function Styleguide({ className, elements, children, currencies }: Styleg
             <h2 class="h3">Modals & Notifications</h2>
             <div class="flex flex-wrap gap-x-6 gap-y-4 mb-6">
               <Button color="primary" onClick={() => setShowModal1(true)}>Modal (default)</Button>
-              <Button color="danger" onClick={() => setStore({ message: { text: 'Error.', type: 'error' }}) }>Notification error</Button>
-              <Button color="warning" onClick={() => setStore({ message: { text: 'Warning.', type: 'warning' }}) }>Notification warning</Button>{/*eslint-disable-line*/}
-              <Button color="info" onClick={() => setStore({ message: { text: 'Info.', type: 'info' }}) }>Notification info</Button>
-              <Button color="success" onClick={() => setStore({ message: 'Success.' })}>Notification success</Button>
+              <Button color="danger" onClick={() => setStore((s) => ({ ...s, message: { text: 'Error.', type: 'error' }}))}>
+                Notification error
+              </Button>
+              <Button color="warning" onClick={() => setStore((s) => ({ ...s,  message: { text: 'Warning.', type: 'warning' }})) }>
+                Notification warning
+              </Button>{/*eslint-disable-line*/}
+              <Button color="info" onClick={() => setStore((s) => ({ ...s,  message: { text: 'Info.', type: 'info' }})) }>
+                Notification info</Button>
+              <Button color="success" onClick={() => setStore((s) => ({ ...s,  message: 'Success.' }))}>
+                Notification success
+              </Button>
             </div>
           </div>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.174",
+  "version": "0.0.179",
   "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 🚀",
@@ -26,6 +26,7 @@
     "major": "npm run types && standard-version -a --release-as major && npm publish && cd ../webpack && npm publish",
     "minor": "npm run types && standard-version -a --release-as minor && npm publish && cd ../webpack && npm publish",
     "patch": "npm run types && standard-version -a --release-as patch && npm publish && cd ../webpack && npm publish",
+    "publish": "npm publish && cd ../webpack && npm publish",
     "types": "tsc util.js ./server/index.js --declaration --declarationMap --allowJs --emitDeclarationOnly --jsx react-jsx --esModuleInterop --skipLibCheck --outDir types && cd ../webpack && npm run types -w . && cd ../core"
   },
   "dependencies": {