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

ivictbor · ivictbor · commit 4438f58f7073 · 2026-02-02T22:38:20.000Z
diff --git a/adapters/install-adapters.sh b/adapters/install-adapters.sh
@@ -4,7 +4,8 @@ adminforth-email-adapter-mailgun adminforth-google-oauth-adapter adminforth-gith
 adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-oauth-adapter \
 adminforth-twitch-oauth-adapter adminforth-image-generation-adapter-openai adminforth-storage-adapter-amazon-s3 \
 adminforth-storage-adapter-local adminforth-image-vision-adapter-openai adminforth-key-value-adapter-ram \
-adminforth-login-captcha-adapter-cloudflare adminforth-login-captcha-adapter-recaptcha adminforth-completion-adapter-google-gemini"
+adminforth-login-captcha-adapter-cloudflare adminforth-login-captcha-adapter-recaptcha adminforth-completion-adapter-google-gemini \
+adminforth-key-value-adapter-redis adminforth-key-value-adapter-leveldb"
 
 # for each
 install_adapter() {
diff --git a/adminforth/commands/createApp/templates/.env.local.hbs b/adminforth/commands/createApp/templates/.env.local.hbs
@@ -1,5 +1,8 @@
 ADMINFORTH_SECRET=123
 NODE_ENV=development
+DEBUG_LEVEL=info
+AF_DEBUG_LEVEL=info
+DB_DEBUG_LEVEL=info
 DATABASE_URL={{{dbUrl}}}
 {{#if prismaDbUrl}}
 PRISMA_DATABASE_URL={{{prismaDbUrl}}}
diff --git a/adminforth/documentation/docs/tutorial/05-ListOfAdapters.md b/adminforth/documentation/docs/tutorial/05-ListOfAdapters.md
@@ -244,10 +244,49 @@ The RAM adapter is a simplest in-memory key-value storage. Stores data in proces
 
 Pros:
 * Simplest in use - does not reqauire any external daemon.
+
 Cones:
 * In production sutable for single-process installations only
 
 
+### Redis adapter
+
+```bash
+npm i @adminforth/key-value-adapter-redis
+```
+
+Redis adapter uses redis database.
+
+```ts
+import RedisKeyValueAdapter from '@adminforth/key-value-adapter-redis';
+
+const adapter = new RedisKeyValueAdapter({
+  redisUrl: '127.0.0.1:6379'
+})
+
+adapeter.set('test-key', 'test-value', 120); //expiry in 120 seconds
+
+```
+
+### LevelDB adapter
+
+```bash
+npm i @adminforth/key-value-adapter-leveldb
+```
+
+LebelDB uses local storage for storing keys.
+
+```ts
+import LevelDBKeyValueAdapter from '@adminforth/key-value-adapter-leveldb'
+
+const adapter = new LevelDBKeyValueAdapter({ 
+  dbPath: './testdb' 
+});
+
+adapeter.set('test-key', 'test-value', 120); //expiry in 120 seconds
+
+```
+
 ## 🤖Captcha adapters
 
 Used to add capthca to the login screen
diff --git a/adminforth/modules/logger.ts b/adminforth/modules/logger.ts
@@ -6,23 +6,21 @@ const baseLogger = pino({
     options: {
       colorize: true,
       ignore: 'pid,hostname',
-      hideObject: true,
-      messageFormat: '{layer}: {msg}',
     }
   },
 });
 
 export const logger = baseLogger.child(
-  { layer: 'user_logs' },
-  { level: process.env.HEAVY_DEBUG ? 'trace' : ( process.env.DEBUG_LEVEL || 'info' ) }
+  { name: 'User logs' },
+  { level: process.env.HEAVY_DEBUG ? 'trace' : ( process.env.DEBUG_LEVEL || 'info' ) },
 );
 
 export const afLogger = baseLogger.child(
-  { layer: 'af' },
+  { name: 'AF' },
   { level: process.env.HEAVY_DEBUG ? 'trace' :  ( process.env.AF_DEBUG_LEVEL || 'info' ) }
 );
 
 export const dbLogger = baseLogger.child(
-  { layer: 'db' },
+  { name: 'DB' },
   { level: process.env.HEAVY_DEBUG_QUERY ? 'trace' : (process.env.DB_DEBUG_LEVEL|| 'info') }
 );
diff --git a/adminforth/spa/src/components/Toast.vue b/adminforth/spa/src/components/Toast.vue
@@ -18,17 +18,16 @@
     <div v-else class="af-toast-icon inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-green-500 bg-green-100 rounded-lg dark:bg-green-800 dark:text-green-200">
         <IconCheckCircleSolid class="w-5 h-5" aria-hidden="true" />
     </div>
-
-    <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
-    <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-else>
-        <div class="flex flex-col items-center justify-center break-all">
+    <div class="flex flex-col items-center justify-center break-all">
+        <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
+        <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-else>
             {{toast.message}}
-            <div v-if="toast.buttons" class="flex justify-center mt-2 gap-2">
-                <div v-for="button in toast.buttons" class="af-toast-button rounded-md bg-lightButtonsBackground hover:bg-lightButtonsHover text-lightButtonsText dark:bg-darkPrimary dark:hover:bg-darkButtonsBackground  dark:text-darkButtonsText">
-                    <button @click="onButtonClick(button.value)" class="px-2 py-1 rounded hover:bg-black/5 dark:hover:bg-white/10">
-                        {{ button.label }}
-                    </button>
-                </div>
+        </div>
+        <div v-if="toast.buttons" class="flex mt-2 gap-2 w-full ml-6">
+            <div v-for="button in toast.buttons" class="af-toast-button rounded-md bg-lightButtonsBackground hover:bg-lightButtonsHover text-lightButtonsText dark:bg-darkPrimary dark:hover:bg-darkButtonsBackground  dark:text-darkButtonsText">
+                <button @click="onButtonClick(button.value)" class="px-2 py-1 rounded hover:bg-black/5 dark:hover:bg-white/10">
+                    {{ button.label }}
+                </button>
             </div>
         </div>
     </div>
diff --git a/dev-demo/custom/package-lock.json b/dev-demo/custom/package-lock.json
diff --git a/dev-demo/custom/package.json b/dev-demo/custom/package.json
diff --git a/dev-demo/package-lock.json b/dev-demo/package-lock.json
diff --git a/dev-demo/package.json b/dev-demo/package.json
@@ -18,7 +18,9 @@
     "install-adapters": "cd ../adapters && bash install-adapters.sh",
     "build-adminforth": "cd ../adminforth && npm ci && npm run build && npm link",
     "migrate:all": "npm run migrate:sqlite && npm run migrate:mysql && npm run migrate:postgres && npm run migrate:clickhouse",
-    "setup-dev-demo": "npm run build-adminforth && cp .env.local .env && npm run install-plugins && npm run install-adapters && npm install && npm link adminforth && bash ./run_inventory.sh"
+    "preinstall": "node scripts/check-node.js",
+    "check-docker": "node scripts/check-docker.js",
+    "setup-dev-demo": "npm run preinstall && npm run check-docker && npm run build-adminforth && cp .env.local .env && npm run install-plugins && npm run install-adapters && npm install && npm link adminforth && bash ./scripts/run_inventory.sh"
   },
   "author": "",
   "license": "ISC",
diff --git a/dev-demo/resources/adminuser.ts b/dev-demo/resources/adminuser.ts
@@ -141,11 +141,11 @@ export default {
     }),
     new UploadPlugin({
       pathColumnName: "avatar",
-      storageAdapter: new AdminForthAdapterS3Storage({
-        bucket: process.env.AWS_BUCKET_NAME as string,
-        region: process.env.AWS_REGION as string,
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
+      storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
+        fileSystemFolder: "./db/uploads",
+        adminServeBaseUrl: "static/source",
+        mode: "public", // or "private"
+        signingSecret: '1241245',
       }),
       allowedFileExtensions: [
         "jpg",
diff --git a/dev-demo/resources/carsResourseTemplate.ts b/dev-demo/resources/carsResourseTemplate.ts
@@ -164,12 +164,10 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
 
     *********************************************************************************/
       new UploadPlugin({
-        storageAdapter: new AdminForthAdapterS3Storage({
-          bucket: process.env.AWS_BUCKET_NAME as string,
-          region: process.env.AWS_REGION as string,
-          accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
-          secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
-          s3ACL: 'public-read',
+        storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
+          fileSystemFolder: "./db/uploads",
+          mode: "public", // or "private"
+          signingSecret: '1241245',
         }),
         pathColumnName: 'photos',
         allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
@@ -181,12 +179,10 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
         },
       }),
       new UploadPlugin({
-        storageAdapter: new AdminForthAdapterS3Storage({
-          bucket: process.env.AWS_BUCKET_NAME as string,
-          region: process.env.AWS_REGION as string,
-          accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
-          secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
-          s3ACL: 'public-read',
+        storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
+          fileSystemFolder: "./db/uploads_promo",
+          mode: "public", // or "private"
+          signingSecret: '1241245',
         }),
         pathColumnName: 'promo_picture',
         allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
@@ -233,12 +229,10 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
       ...(process.env.OPENAI_API_KEY ? 
         [
           new UploadPlugin({
-            storageAdapter: new AdminForthAdapterS3Storage({
-              bucket: process.env.AWS_BUCKET_NAME as string,
-              region: process.env.AWS_REGION as string,
-              accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
-              secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
-              s3ACL: 'public-read',
+            storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
+              fileSystemFolder: "./db/uploads_promo_generated",
+              mode: "public", // or "private"
+              signingSecret: '1241245',
             }),
             pathColumnName: 'generated_promo_picture',
             allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
diff --git a/dev-demo/resources/cars_description_image.ts b/dev-demo/resources/cars_description_image.ts
@@ -35,11 +35,10 @@ export default {
   plugins: [
     new UploadPlugin({
       pathColumnName: "image_path",
-      storageAdapter: new AdminForthAdapterS3Storage({
-        bucket: process.env.AWS_BUCKET_NAME as string,
-        region: process.env.AWS_REGION as string,
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
+      storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
+        fileSystemFolder: "./db/uploads_promo_generated",
+        mode: "public", // or "private"
+        signingSecret: '1241245',
       }),
   
       allowedFileExtensions: [
diff --git a/dev-demo/scripts/check-docker.js b/dev-demo/scripts/check-docker.js
@@ -0,0 +1,19 @@
+import { execSync } from 'node:child_process';
+
+try {
+  execSync('docker --version', { stdio: 'ignore' });
+  console.log('✅ Docker is installed');
+  try {
+    execSync('docker info', { stdio: 'ignore' });
+  } catch {
+    console.error('❌ Docker is installed but not running');
+    process.exit(1);
+  }
+  console.log('✅ Docker is Running');
+} catch {
+  console.error(
+    '❌ Docker is not installed or not available in PATH.\n' +
+    'Please install Docker: https://docs.docker.com/get-docker/'
+  );
+  process.exit(1);
+}
diff --git a/dev-demo/scripts/check-node.js b/dev-demo/scripts/check-node.js
@@ -0,0 +1,11 @@
+const [major] = process.versions.node.split('.').map(Number);
+
+if (major < 20 || major > 22) {
+  console.error(
+    `❌ Node.js ${process.versions.node} detected.\n` +
+    `Please use Node.js version 20, 21, or 22.`,
+  );
+  process.exit(1);
+}
+
+console.log(`✅ Node.js ${process.versions.node}`);
diff --git a/dev-demo/scripts/run_inventory.sh b/dev-demo/scripts/run_inventory.sh
