Merge branch 'develop'

ziteh · Sep 18, 2024 · 0e54fe4 · 0e54fe4
2 parents 1e2d19b + d8c4b38
commit 0e54fe4
Show file tree

Hide file tree

Showing 6 changed files with 2,884 additions and 3,654 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,5 +30,5 @@ jobs:
 
       - name: Build
         run: |
-          pnpm run prisma:update
+          pnpm run prisma:migration
           pnpm run build
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ COPY . .
 
 RUN \
   corepack enable pnpm && \
-  pnpm run prisma:update && \
+  pnpm run prisma:migration && \
   pnpm run build
 
 # Remove dev dependencies

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Hie can run on a NAS via Docker, allowing you to access and view your images con
 
 ```sh
 pnpm install
-pnpm run prisma:update
+pnpm run prisma:migration
 pnpm run dev
 ```
 

diff --git a/app/components/appLayout/sidebar/index.tsx b/app/components/appLayout/sidebar/index.tsx
@@ -108,11 +108,7 @@ export default function Sidebar(props: Props) {
                 New Tag
               </ListItemIcon>
             </ListItemButton>
-            <TagFormDialog
-              existingTags={[]}
-              open={tagFormOpen}
-              onClose={handleTagFormClose}
-            />
+            <TagFormDialog open={tagFormOpen} onClose={handleTagFormClose} />
           </ListItem>
 
           <ListItem disablePadding>
@@ -122,12 +118,7 @@ export default function Sidebar(props: Props) {
                 New Item
               </ListItemIcon>
             </ListItemButton>
-            <ItemFormDialog
-              folders={[]}
-              tags={[]}
-              open={itemFormOpen}
-              onClose={handleItemFormClose}
-            />
+            <ItemFormDialog open={itemFormOpen} onClose={handleItemFormClose} />
           </ListItem>
 
           <ListItem disablePadding>

diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "prisma:update": "npx prisma migrate dev --name init && npx prisma generate",
+    "prisma:migration": "pnpm dlx prisma migrate dev --name init",
+    "prisma:generate": "pnpm dlx prisma generate",
     "docker:build": "docker build -t hie .",
     "docker:save": "docker save hie -o hie.tar"
   },