adminforth 2.22.0-next.17 → 2.22.0-next.19

package/commands/createApp/utils.js

@@ -13,6 +13,9 @@ import Handlebars from 'handlebars';
 import { promisify } from 'util';
 import { getVersion } from '../cli.js';
 
+import { URL } from 'url'
+import net from 'net'
+
 const execAsync = promisify(exec);
 
 function detectAdminforthVersion() {
@@ -159,6 +162,44 @@ function checkForExistingPackageJson(options) {
   }
 }
 
+function checkIfDatabaseLocal(urlString) {
+  if (urlString.startsWith('sqlite')) {
+    return true;
+  }
+  try {
+    const url = new URL(urlString)
+
+    const host = url.hostname
+
+    if (!host) return false
+
+    // localhost
+    if (host === 'localhost') return true
+
+    // loopback ipv4
+    if (host === '127.0.0.1') return true
+
+    // loopback ipv6
+    if (host === '::1') return true
+
+    // private IP ranges
+    if (net.isIP(host)) {
+      if (
+        host.startsWith('10.') ||
+        host.startsWith('192.168.') ||
+        host.match(/^172\.(1[6-9]|2\d|3[0-1])\./)
+      ) {
+        return true
+      }
+    }
+
+
+    return false
+  } catch {
+    return false
+  }
+}
+
 async function scaffoldProject(ctx, options, cwd) {
   const projectDir = path.join(cwd, options.appName);
   await fse.ensureDir(projectDir);
@@ -253,7 +294,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: '.env.local.hbs',
       dest: '.env.local',
-      data: { dbUrl, prismaDbUrl },
+      data: { dbUrl: checkIfDatabaseLocal(dbUrl) ? dbUrl : null, prismaDbUrl },
     },
     {
       src: '.env.prod.hbs',
@@ -269,8 +310,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
       // We'll write .env using the same content as .env.sample
       src: '.env.local.hbs',
       dest: '.env',
-      data: {},
-      empty: true,
+      data: {dbUrl, prismaDbUrl},
     },
     {
       src: 'adminuser.ts.hbs',

package/dist/spa/src/utils/utils.ts

@@ -598,4 +598,22 @@ export function generateMessageHtmlForRecordChange(changedFields: Record<string,
   const listHtml = items ? `<ul class="mt-2 list-disc list-inside">${items}</ul>` : '';
   const messageHtml = `<div>${escapeHtml(t('There are unsaved changes. Are you sure you want to leave this page?'))}${listHtml}</div>`;
   return messageHtml; 
+}
+
+export function getTimeAgoString(date: Date): string {
+  const now = new Date();
+  const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000);
+
+  if (diffInSeconds < 60) {
+    return `${diffInSeconds} ${diffInSeconds === 1 ? 'second' : 'seconds'} ago`;
+  } else if (diffInSeconds < 3600) {
+    const minutes = Math.floor(diffInSeconds / 60);
+    return `${minutes} ${minutes === 1 ? 'minute' : 'minutes'} ago`;
+  } else if (diffInSeconds < 86400) {
+    const hours = Math.floor(diffInSeconds / 3600);
+    return `${hours} ${hours === 1 ? 'hour' : 'hours'} ago`;
+  } else {
+    const days = Math.floor(diffInSeconds / 86400);
+    return `${days} ${days === 1 ? 'day' : 'days'} ago`;
+  }
 }

package/package.json

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