nitro-web 0.0.34 → 0.0.36

package/components/auth/auth.api.js

@@ -324,13 +324,13 @@ export async function userCreate({ name, business, email, password }) {
   }
 }
 
-export async function findUserFromProvider(query, passwordToTest) {
+export async function findUserFromProvider(query, passwordToCheck) {
   /**
    * Find user for state (and verify password if signing in with email)
    * @param {object} query - e.g. { email: 'test@test.com' }
-   * @param {string} <passwordToTest> - password to test
+   * @param {string} <passwordToCheck> - password to test
    */
-  const testPassword = arguments.length > 1
+  const checkPassword = arguments.length > 1
   const user = await db.user.findOne({
     query: query,
     blacklist: ['-password'],
@@ -345,15 +345,18 @@ export async function findUserFromProvider(query, passwordToTest) {
     })
   }
   if (!user) {
-    throw new Error(testPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
+    throw new Error(checkPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
   } else if (!user.company) {
     throw new Error('The current company is no longer associated with this user')
   } else if (user.company.status != 'active') {
     throw new Error('This user is not associated with an active company')
   } else {
-    if (testPassword) {
-      const match = user.password ? await (await import('bcrypt')).compare(passwordToTest, user.password) : false
-      if (!match && !(config.masterPassword && passwordToTest == config.masterPassword)) {
+    if (checkPassword) {
+      if (!user.password) {
+        throw new Error('There is no password associated with this account, please try signing in with another method.')
+      }
+      const match = user.password ? await (await import('bcrypt')).compare(passwordToCheck, user.password) : false
+      if (!match && !(config.masterPassword && passwordToCheck == config.masterPassword)) {
         throw new Error('Email or password is incorrect.')
       }
     }

package/components/auth/reset.tsx

@@ -3,7 +3,7 @@ import { Errors } from 'nitro-web/types'
 
 export function ResetInstructions() {
   const navigate = useNavigate()
-  const isLoading = useState()
+  const isLoading = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState({ email: '', errors: [] as Errors })
 
@@ -41,7 +41,7 @@ export function ResetInstructions() {
 export function ResetPassword() {
   const navigate = useNavigate()
   const params = useParams()
-  const isLoading = useState()
+  const isLoading = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState(() => ({
     password: '',

package/components/partials/element/sidebar.tsx

@@ -1,17 +1,14 @@
 // Component: https://tailwindui.com/components/application-ui/application-shells/sidebar#component-a69d85b6237ea2ad506c00ef1cd39a38
-import { Dialog, DialogBackdrop, DialogPanel, TransitionChild } from '@headlessui/react'
 import avatarImg from 'nitro-web/client/imgs/avatar.jpg'
 import { injectedConfig } from 'nitro-web'
 import {
-  Bars3Icon,
   HomeIcon,
   UsersIcon,
-  XMarkIcon,
   ArrowLeftCircleIcon,
   PaintBrushIcon,
 } from '@heroicons/react/24/outline'
 
-const sidebarWidth = 'lg:w-80'
+const sidebarWidth = 'w-[19rem] lg:w-80'
 
 export type SidebarProps = {
   Logo?: React.FC<{ width?: string, height?: string }>;
@@ -27,47 +24,10 @@ export function Sidebar({ Logo, menu, links }: SidebarProps) {
   const [sidebarOpen, setSidebarOpen] = useState(false)
   return (
     <>
-      {/* mobile sidebar opened */}
-      <Dialog open={sidebarOpen} onClose={setSidebarOpen} className="relative z-50 lg:hidden nitro-sidebar">
-        <DialogBackdrop
-          transition
-          className="fixed inset-0 bg-gray-900/80 transition-opacity duration-300 ease-linear data-[closed]:opacity-0"
-        />
-        <div className="fixed inset-0 flex">
-          <DialogPanel
-            transition
-            className="relative mr-16 flex w-full max-w-xs flex-1 transform transition duration-300 ease-in-out 
-            data-[closed]:-translate-x-full"
-          >
-            <TransitionChild>
-              <div className="absolute left-full top-0 flex w-16 justify-center pt-5 duration-300 ease-in-out data-[closed]:opacity-0">
-                <button type="button" onClick={() => setSidebarOpen(false)} className="-m-2.5 p-2.5">
-                  <XMarkIcon aria-hidden="true" className="size-6 text-white" />
-                </button>
-              </div>
-            </TransitionChild>
-            <SidebarContents Logo={Logo} menu={menu} links={links} />
-          </DialogPanel>
-        </div>
-      </Dialog>
-
       {/* Static sidebar for desktop */}
-      <div className={`hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:flex-col ${sidebarWidth}`}>
+      <div className={`relative inset-y-0 z-50 flex flex-col ${sidebarWidth}`}>
         <SidebarContents Logo={Logo} menu={menu} links={links} />
       </div>
-      
-      {/* mobile sidebar closed */}
-      <div className="sticky top-0 z-40 flex items-center gap-x-6 bg-white px-4 py-4 shadow-sm sm:px-6 lg:hidden">
-        <button type="button" onClick={() => setSidebarOpen(true)} className="-m-2.5 p-2.5 text-gray-700 lg:hidden">
-          <Bars3Icon aria-hidden="true" className="size-6" />
-        </button>
-        <div className="flex-1 text-sm/6 font-semibold text-gray-900">Dashboard</div>
-        <Link to="#">
-          <img alt="" src={avatarImg} className="size-8 rounded-full bg-gray-50" />
-        </Link>
-      </div>
-      
-      <div class={`${sidebarWidth}`} />
     </>
   )
 }
@@ -96,13 +56,13 @@ function SidebarContents ({ Logo, menu, links }: SidebarProps) {
 
   // Sidebar component, swap this element with another sidebar if you like
   return (
-    <div className="flex grow flex-col gap-y-8 overflow-y-auto bg-white py-5 px-10 lg:border-r lg:border-gray-200">
+    <div className="flex grow flex-col gap-y-8 overflow-y-auto py-5 px-10 border-r bg-primary border-gray-200 text-white">
       {Logo && (
         <div className="flex h-16 shrink-0 items-center gap-2 justify-bedtween">
           <Link to="/">
             <Logo width="70" height={undefined} />
           </Link>
-          <span className="text-[9px] text-gray-900 font-semibold mt-4">{injectedConfig.version}</span>
+          <span className="text-[9px] text-gray-200 font-semibold mt-4">{injectedConfig.version}</span>
         </div>
       )}
       <nav className="flex flex-1 flex-col">
@@ -165,7 +125,7 @@ function SidebarContents ({ Logo, menu, links }: SidebarProps) {
             </ul>
           </li>
 
-          <li className="-mx-6 mt-auto hidden lg:block">
+          <li className="-mx-6 mt-auto block">
             <Link
               to="#"
               className="flex items-center gap-x-4 px-6 py-3 text-sm/6 font-semibold text-gray-900 hover:bg-gray-50"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "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 🚀",
@@ -66,6 +66,7 @@
     },
     "bumpFiles": [
       "package.json",
+      "package-lock.json",
       "../webpack/package.json",
       {
         "filename": "../readme.md",

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BC;AAED,6DAaC;AAED,4DAQC;AAED,iFAaC;AAED,0EAIC;AAED,gDAEC;AAED,0CAEC;AAED,qFAQC;AAED,uDAIC;AAED,iEAoBC;AAED;;;;EAgIC;AAED,wCASC;AAED,mDAYC;AAED,+DAyBC;AAED,iEAeC;AAED,kFA2BC;AAED,gEAIC;AAED,6CASC;AAED,qEAsEC;AAED,8CAGC;AAED,kDAQC;AAED;;;;IAOC;AAED;;;IAOC;AAED;;;;;GAKG;AACH,uCAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAYlB;AAED;;;;;;;EAUC;AAED,sDAYC;AAED,uEAEC;AAED,kDAsBC;AAED,+DAaC;AAED,0DAEC;AAED,+CAEC;AAED,kDAEC;AAED,6CAIC;AAED,kEAOC;AAED,mDAEC;AAED,6CAiBC;AAED,iDAEC;AAED;;;;GAIG;AACH,mCAHW,OAAO,GACL,OAAO,CAKnB;AAED,gDAEC;AAED,iDAEC;AAED,0CAEC;AAED,yEAWC;AAED,mFAwCC;AAED;;;;;;;;;;;;;;;;;;;;;;;;EA0CC;AAED,uEAmBC;AAED,oDAKC;AAED,iDAOC;AAED;;;;;;;;GAQG;AACH,8FAyCC;AAED,kEAQC;AAED,8CAeC;AAED,+DAiCC;AAED,8CAcC;AAED,yFAiDC;AAED,oDAYC;AAED,4EAmBC;AAED,kDAUC;AAED,mFAiDC;AAED,oEAaC;AAED,8EAIC;AAED,0DAQC;AAED,uDAMC;AAED,mFAwBC;AAED;;;;EAyBC;AAED,8CAIC;AAED,uCAGC;AAED,0CAGC;AAxoCD,6BAAoC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BC;AAED,6DAaC;AAED,4DAQC;AAED,iFAaC;AAED,0EAIC;AAED,gDAEC;AAED,0CAEC;AAED,qFAQC;AAED,uDAIC;AAED,iEAoBC;AAED;;;;EAgIC;AAED,wCASC;AAED,mDAYC;AAED,+DAyBC;AAED,iEAeC;AAED,kFA2BC;AAED,gEAIC;AAED,6CASC;AAED,qEAsEC;AAED,8CAGC;AAED,kDAQC;AAED;;;;IAOC;AAED;;;IAOC;AAED;;;;;GAKG;AACH,uCAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAYlB;AAED;;;;;;;EAUC;AAED,sDAYC;AAED,uEAEC;AAED,kDAsBC;AAED,+DAaC;AAED,0DAEC;AAED,+CAEC;AAED,kDAEC;AAED,6CAIC;AAED,kEAOC;AAED,mDAEC;AAED,6CAiBC;AAED,iDAEC;AAED;;;;GAIG;AACH,mCAHW,OAAO,GACL,OAAO,CAKnB;AAED,gDAEC;AAED,iDAEC;AAED,0CAEC;AAED,yEAWC;AAED,mFAwCC;AAED;;;;;;;;;;;;;;;;;;;;;;;;EA0CC;AAED,uEAmBC;AAED,oDAKC;AAED,iDAOC;AAED;;;;;;;;GAQG;AACH,8FAyCC;AAED,kEAQC;AAED,8CAeC;AAED,+DAiCC;AAED,8CAcC;AAED,yFAkDC;AAED,oDAYC;AAED,4EAmBC;AAED,kDAUC;AAED,mFAiDC;AAED,oEAaC;AAED,8EAIC;AAED,0DAQC;AAED,uDAMC;AAED,mFAwBC;AAED;;;;EAyBC;AAED,8CAIC;AAED,uCAGC;AAED,0CAGC;AAzoCD,6BAAoC"}

package/util.js

@@ -955,6 +955,7 @@ export async function request (route, data, event, isLoading) {
     return res.value.data
 
   } catch (errs) {
+    if (isLoading) isLoading[1](false)
     throw getResponseErrors(errs)
   }
 }