adminforth 2.4.0-next.300 → 2.4.0-next.302

package/commands/createApp/templates/package.json.hbs

@@ -31,6 +31,6 @@
     "@types/express": "latest",
     "@types/node": "latest",
     "@prisma/client": "latest",
-    "prisma": "latest"
+    "prisma": "^7.0.0"
   }
 }

package/commands/createApp/templates/prisma.config.ts.hbs

@@ -0,0 +1,8 @@
+import 'dotenv/config'
+import { defineConfig, env } from 'prisma/config'
+
+export default defineConfig({
+  datasource: {
+    url: env('PRISMA_DATABASE_URL'),
+  },
+})

package/commands/createApp/templates/schema.prisma.hbs

@@ -4,7 +4,6 @@ generator client {
 
 datasource db {
   provider = "{{provider}}"
-  url      = env("PRISMA_DATABASE_URL")
 }
 
 model adminuser {

package/commands/createApp/utils.js

@@ -222,6 +222,11 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: { provider },
       condition: Boolean(prismaDbUrl), // only create if prismaDbUrl is truthy
     },
+    {
+      src:  'prisma.config.ts.hbs',
+      dest: 'prisma.config.ts',
+      data: {},
+    },
     {
       src: 'package.json.hbs',
       dest: 'package.json',

package/dist/spa/src/afcl/Dropzone.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- tag form used to reset the input (method .reset() in claer() function) -->
+    <!-- tag form used to reset the input (method .reset() in clear() function) -->
   <form class="flex items-center justify-center w-full"
     @dragover.prevent="dragging = true"
     @dragleave.prevent="dragging = false"
@@ -20,7 +20,7 @@
           :id="id"
           type="file"
           class="hidden"
-          :accept="props.extensions.join(',')"
+          :accept="normalizedExtensions.join(',')"
           @change="$event.target && doEmit(($event.target as HTMLInputElement).files!)"
           :multiple="props.multiple || false"
         />
@@ -80,7 +80,7 @@
           </p>
 
           <p class="text-xs text-lightDropzoneText dark:text-darkDropzoneText">
-            {{ props.extensions.join(', ').toUpperCase().replace(/\./g, '') }}
+            {{ normalizedExtensions.join(', ').toUpperCase().replace(/\./g, '') }}
             <template v-if="props.maxSizeBytes">
               (Max size: {{ humanifySize(props.maxSizeBytes) }})
             </template>
@@ -92,7 +92,7 @@
 
 <script setup lang="ts">
 import { humanifySize } from '@/utils';
-import { ref, type Ref } from 'vue';
+import { ref, type Ref, computed } from 'vue';
 import { IconFileSolid } from '@iconify-prerendered/vue-flowbite';
 import { watch } from 'vue';
 import adminforth from '@/adminforth';
@@ -108,6 +108,13 @@ const emit = defineEmits(['update:modelValue']);
 
 const id = `afcl-dropzone-${Math.random().toString(36).substring(7)}`;
 
+const normalizedExtensions = computed(() => {
+  return props.extensions.map(ext => {
+    const trimmed = ext.trim().toLowerCase();
+    return trimmed.startsWith('.') ? trimmed : `.${trimmed}`;
+  });
+});
+
 const selectedFiles: Ref<{
   name: string,
   size: number,
@@ -131,7 +138,7 @@ function doEmit(filesIn: FileList) {
   
   const multiple = props.multiple || false;
   const files = Array.from(filesIn);
-  const allowedExtensions = props.extensions.map(ext => ext.toLowerCase());
+  const allowedExtensions = normalizedExtensions.value;
   const maxSizeBytes = props.maxSizeBytes;
 
   if (!files.length) return;
@@ -142,6 +149,18 @@ function doEmit(filesIn: FileList) {
     const extension = file.name.split('.').pop()?.toLowerCase() || '';
     const size = file.size;
 
+    const isDuplicate = storedFiles.value.some(
+      existingFile => existingFile.name === file.name && existingFile.size === file.size
+    );
+    
+    if (isDuplicate) {
+      adminforth.alert({
+        message: `The file "${file.name}" is already selected.`,
+        variant: 'warning',
+      });
+      return;
+    }
+
     if (!allowedExtensions.includes(`.${extension}`)) {
       adminforth.alert({
         message: `Sorry, the file type .${extension} is not allowed. Please upload a file with one of the following extensions: ${allowedExtensions.join(', ')}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.4.0-next.300",
+  "version": "2.4.0-next.302",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",