Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/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',

adminforth/documentation/docs/tutorial/08-Plugins/02-TwoFactorsAuth.md

@@ -697,12 +697,24 @@ Add the new resource to index.ts:
     ...
   ],
 ```
+To use passkey you need to use Key-Value adapter. For example:
+```bash
+npm i @adminforth/key-value-adapter-ram
+```
+
 
 Now, update the settings of the Two-Factor Authentication plugin:
 
 ```ts tittle='./resources/adminuser.ts'
+
+  //diff-add
+  import RamKeyValueAdapter from '@adminforth/key-value-adapter-ram'
+
+  ...
+
   plugins: [
     new TwoFactorsAuthPlugin ({ 
+      keyValueAdapter: new RamKeyValueAdapter(),
       twoFaSecretFieldName: 'secret2fa', 
       timeStepWindow: 1,       
       //diff-add

adminforth/documentation/src/css/custom.css

@@ -207,8 +207,8 @@ pre code:has(.code-block-diff-remove-line) {
 .laptop .theme_switcher {
   position: absolute;
   cursor: pointer;
-  top: 2.56vw;
-  right: 5.28vw;
+  top: 2.84vw;
+  right: 5.98vw;
   width: 2vw;
   height: 2vw;
   font-size: 1.5vw;

adminforth/documentation/src/pages/index.module.css

@@ -32,3 +32,22 @@
 }
 
 
+.card-demo {
+  max-width: 500px;
+}
+
+.cardsWrapper {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(300px, 500px));
+  gap: 4rem;
+  justify-content: center;
+  padding: 1rem;
+
+  @media (max-width: 1200px) {
+    grid-template-columns: repeat(2, minmax(300px, 500px));
+  }
+  @media (max-width: 768px) {
+    grid-template-columns: repeat(1, minmax(300px, 500px));
+  }
+
+}

adminforth/documentation/src/pages/index.tsx

@@ -44,7 +44,7 @@ const images = [
     original: require('@site/static/img/previews/2fa_plugin.png').default,
     title: '2FA Plugin - secure your admin panel',
     link: '/docs/tutorial/Plugins/TwoFactorsAuth/',
-    description: 'RFC 6238-Compliant TOTP-Based 2FA will add additional security layer to your admin panel'
+    description: 'RFC 6238-Compliant TOTP-Based 2FA will add additional security layer to your admin panel. Also supports passkeys'
   },
   {
     original: require('@site/static/img/previews/dark.png').default,
@@ -105,7 +105,13 @@ const images = [
     title: 'AI Translation Plugin - translate your admin and External apps',
     link: '/docs/tutorial/Plugins/i18n/',
     description: 'Use LLMs to translate any external apps (Mobile, Nuxt, etc.) OR/AND admin panel with minimal effort. Any language supported'
-  }
+  },
+  {
+    original: require('@site/static/img/previews/bulk-ai-flow.png').default,
+    title: 'Bulk AI Plugin - generate data for your resources',
+    link: '/docs/tutorial/Plugins/bulk-ai-flow/',
+    description: 'Use LLMs to fill records with generated data or images. For example, generate product descriptions based on product name and image or generate products images'
+  },
 ];
 
 
@@ -201,13 +207,7 @@ export default function Home(): JSX.Element {
         What it can do for you
       </Heading>
 
-        <div style={{
-          display: 'flex',
-          flexWrap: 'wrap',
-          gap: '4rem',
-          justifyContent: 'center',
-          padding: '1rem',
-        }}>
+        <div className={styles.cardsWrapper}>
           {images.map((item, index) => (
             <div className="card-demo" key={`feature${index}`}>
               <div className="card shadow--md" style={{