adminforth 3.6.8 → 3.6.10

package/commands/createApp/utils.js

@@ -487,32 +487,42 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
   }
 }
 
-async function resolvePackageManagerCommand(packageManager) {
-  if (packageManager !== 'pnpm') {
-    return packageManager;
-  }
-
-  try {
-    await execAsync('pnpm --version', { env: process.env });
-    return 'pnpm';
-  } catch {
-    try {
-      await execAsync('corepack pnpm --version', { env: process.env });
-      return 'corepack pnpm';
-    } catch {
-      throw new Error('pnpm is not available. Install pnpm globally or enable Corepack before creating a pnpm project.');
-    }
+async function installDependenciesPnpm(ctx, cwd) {
+  const isWindows = process.platform === 'win32';
+
+  const nodeBinary = process.execPath; 
+  const pnpmPath = path.join(path.dirname(nodeBinary), isWindows ? 'pnpm.cmd' : 'pnpm');
+  const customDir = ctx.customDir;
+  if (isWindows) {
+    const res = await Promise.all([
+      execAsync(`pnpm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`pnpm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
   }
 }
 
-async function installDependencies(ctx, cwd, packageManager) {
-  const packageManagerCommand = await resolvePackageManagerCommand(packageManager);
-  const command = `${packageManagerCommand} install`;
-
-  await Promise.all([
-    execAsync(command, { cwd, env: process.env }),
-    execAsync(command, { cwd: ctx.customDir, env: process.env }),
-  ]);
+async function installDependenciesNpm(ctx, cwd) {
+  const isWindows = process.platform === 'win32';
+
+  const nodeBinary = process.execPath; 
+  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'npm.cmd' : 'npm');
+  const customDir = ctx.customDir;
+  if (isWindows) {
+    const res = await Promise.all([
+      execAsync(`npm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`npm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  }
 }
 
 function generateFinalInstructionsPnpm(skipPrismaSetup, options) {
@@ -586,7 +596,11 @@ export function prepareWorkflow(options) {
     {
       title: '📦 Installing dependencies...',
       task: async (ctx) => {
-        await installDependencies(ctx, ctx.projectDir, options.useNpm ? 'npm' : 'pnpm');
+        if (options.useNpm) {
+          await installDependenciesNpm(ctx, ctx.projectDir);
+        } else {
+          await installDependenciesPnpm(ctx, ctx.projectDir);
+        }
       }
     },
     {

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

@@ -5,7 +5,7 @@
     @dragleave.prevent="dragging = false"
     @drop.prevent="dragging = false; doEmit(($event.dataTransfer as DataTransfer).files)"
   >
-      <label :id="id" class="flex flex-col items-center justify-center w-full border-2 border-dashed rounded-lg cursor-pointer
+      <label :id="id" class="flex flex-col items-center justify-center w-full border-2 border-dashed rounded-default cursor-pointer
         hover:bg-lightDropzoneBackgroundHover hover:border-lightDropzoneBorderHover  dark:hover:border-darkDropzoneBorderHover dark:hover:bg-darkDropzoneBackgroundHover"
         :class="{
           'border-lightDropzoneBorderDragging dark:border-darkDropzoneBorderDragging': dragging,
@@ -50,7 +50,7 @@
           >
             <template v-for="(file, index) in selectedFiles" :key="index">
               <div
-                class="text-sm text-lightDropzoneIcon dark:text-darkDropzoneIcon  bg-lightDropzoneBackgroundHover dark:bg-darkDropzoneBackgroundHover rounded-md 
+                class="text-sm text-lightDropzoneIcon dark:text-darkDropzoneIcon  bg-lightDropzoneBackgroundHover dark:bg-darkDropzoneBackgroundHover rounded-default 
                       flex items-center gap-1 px-2 py-1 group"
               >
                 <IconFileSolid class="w-4 h-4 flex-shrink-0" />

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

@@ -1,16 +1,16 @@
 <template>
   <div class="relative w-full bg-lightProgressBarUnfilledColor rounded-full h-2.5 dark:bg-darkProgressBarUnfilledColor" :class="props.height ? `h-${props.height}` : ''">
-    <span v-if="leftLabel" class="absolute -top-6 left-0 text-sm text-lightProgressBarText dark:text-darkProgressBarText">{{ leftLabel }}</span>
-    <span v-if="rightLabel" class="absolute -top-6 right-0 text-sm text-lightProgressBarText dark:text-darkProgressBarText">{{ rightLabel }}</span>
-    <div 
+    <span v-if="leftLabel" class="absolute -top-6 left-0 text-sm" :class="textClass">{{ leftLabel }}</span>
+    <span v-if="rightLabel" class="absolute -top-6 right-0 text-sm" :class="textClass">{{ rightLabel }}</span>
+    <div
       class="bg-lightPrimary dark:bg-darkPrimary h-2.5 rounded-full transition-all duration-300 ease-in-out"
-      :class="{ 'progress-bar': showAnimation, [`h-${props.height}`]: props.height }"  
+      :class="{ 'progress-bar': showAnimation, [`h-${props.height}`]: props.height }"
       :style="{ width: `${percentage}%` }"
     ></div>
     <div v-if="showValues || showProgress" class="flex justify-between mt-2">
-      <span v-if="showValues" class="text-sm text-lightProgressBarText dark:text-darkProgressBarText">{{ formatValue(minValue) }}</span>
-      <span v-if="showProgress" class="text-sm text-lightProgressBarText dark:text-darkProgressBarText">{{ progressText }}</span>
-      <span v-if="showValues" class="text-sm text-lightProgressBarText dark:text-darkProgressBarText">{{ formatValue(maxValue) }}</span>
+      <span v-if="showValues" class="text-sm" :class="textClass">{{ formatValue(minValue) }}</span>
+      <span v-if="showProgress" class="text-sm" :class="textClass">{{ progressText }}</span>
+      <span v-if="showValues" class="text-sm" :class="textClass">{{ formatValue(maxValue) }}</span>
     </div>
   </div>
 </template>
@@ -31,6 +31,7 @@ interface Props {
   showProgress?: boolean
   showAnimation?: boolean
   height?: number
+  textClass?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -39,7 +40,8 @@ const props = withDefaults(defineProps<Props>(), {
   formatter: (value: number) => `${value}`,
   progressFormatter: (value: number, percentage: number) => `${value}`,
   showValues: true,
-  showProgress: true
+  showProgress: true,
+  textClass: 'text-lightProgressBarText dark:text-darkProgressBarText',
 })
 
 const percentage = computed((): number => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "3.6.8",
+  "version": "3.6.10",
   "description": "OpenSource Agent-Native forth-generation admin panel",
   "keywords": [
     "adminforth",