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

Author: ivictbor

live-demo/app/index.ts

@@ -210,10 +210,17 @@ if (import.meta.url === `file://${process.argv[1]}`) {
     if (!await admin.resource('users').get([Filters.EQ('email', DEMO_EMAIL)])) {
       await admin.resource('users').create({
         email: DEMO_EMAIL,
-        password_hash: await AdminForth.Utils.generatePasswordHash(DEMO_PASSWORD ),
+        password_hash: await AdminForth.Utils.generatePasswordHash(DEMO_PASSWORD),
         role: 'user',  // THE DEMO user role is 'user' not 'superadmin', he can't do any destructive actions
       });
     }
+    if (!await admin.resource('users').get([Filters.EQ('email', "admin1@adminfoth.dev")])) {
+      await admin.resource('users').create({
+        email: "admin1@adminfoth.dev",
+        password_hash: await AdminForth.Utils.generatePasswordHash(process.env.ADMIN_PASSWORD),
+        role: 'superadmin',  // THE DEMO user role is 'user' not 'superadmin', he can't do any destructive actions
+      });
+    }
 
     await seedDatabase();
   });

live-demo/app/resources/apartments.ts

@@ -47,6 +47,46 @@ export default {
       showIn: ['list', 'create', 'edit', 'filter', 'show'],  // all available options
       maxLength: 255,  // you can set max length for string fields
       minLength: 3,  // you can set min length for string fields
+    },
+    {
+      name: 'country',
+      components: {
+        list: '@/renderers/CountryFlag.vue'
+      },
+      enum: [{
+        value: 'US',
+        label: 'United States'
+      }, {
+        value: 'DE',
+        label: 'Germany'
+      }, {
+        value: 'FR',
+        label: 'France'
+      }, {
+        value: 'GB',
+        label: 'United Kingdom'
+      }, {
+        value:'NL',
+        label: 'Netherlands'
+      }, {
+        value: 'IT',
+        label: 'Italy'
+      }, {
+        value: 'ES',
+        label: 'Spain'
+      }, {
+        value: 'DK',
+        label: 'Denmark'
+      }, {
+        value: 'PL',
+        label: 'Poland'
+      }, {
+        value: 'UA',
+        label: 'Ukraine'
+      }, {
+        value: null,
+        label: 'Not defined'
+      }],
     }, 
     {
       name: 'apartment_image',
@@ -89,43 +129,6 @@ export default {
       sortable: false,
       showIn: ['show', 'edit', 'create', 'filter'],
     },
-    {
-      name: 'country',
-      enum: [{
-        value: 'US',
-        label: 'United States'
-      }, {
-        value: 'DE',
-        label: 'Germany'
-      }, {
-        value: 'FR',
-        label: 'France'
-      }, {
-        value: 'GB',
-        label: 'United Kingdom'
-      }, {
-        value:'NL',
-        label: 'Netherlands'
-      }, {
-        value: 'IT',
-        label: 'Italy'
-      }, {
-        value: 'ES',
-        label: 'Spain'
-      }, {
-        value: 'DK',
-        label: 'Denmark'
-      }, {
-        value: 'PL',
-        label: 'Poland'
-      }, {
-        value: 'UA',
-        label: 'Ukraine'
-      }, {
-        value: null,
-        label: 'Not defined'
-      }],
-    },
     {
       name: 'listed',
       required: true,  // will be required on create/edit

live-demo/app/resources/translations.ts

@@ -4,6 +4,12 @@ import CompletionAdapterOpenAIChatGPT from "@adminforth/completion-adapter-open-
 import I18nPlugin from "@adminforth/i18n";
 import { v1 as uuid } from "uuid";
 
+const blockDemoUsers = async ({ record, adminUser, resource }) => {
+  if (adminUser.dbUser && adminUser.dbUser.role !== 'superadmin') {
+    return { ok: false, error: "You can't do this on demo.adminforth.dev" }
+  }
+  return { ok: true };
+}
 
 export default {
   dataSource: "maindb",
@@ -12,6 +18,17 @@ export default {
   label: "Translations",
 
   recordLabel: (r: any) => `✍️ ${r.en_string}`,
+  hooks: {
+    delete: {
+      beforeSave: blockDemoUsers,
+    },
+    edit: {
+      beforeSave: blockDemoUsers,
+    },
+    create: {
+      beforeSave: blockDemoUsers,
+    },
+  },
   plugins: [
     new I18nPlugin({
       supportedLanguages: ['en', 'uk', 'ja', 'fr'],
@@ -35,19 +52,20 @@ export default {
       // will hel to filter out incomplete translations
       completedFieldName: 'completedLangs',
 
-      completeAdapter: new CompletionAdapterOpenAIChatGPT({
-        openAiApiKey: process.env.OPENAI_API_KEY as string,
-        model: 'gpt-4o-mini',
-        expert: {
-          // for UI translation it is better to lower down the temperature from default 0.7. Less creative and more accurate
-          temperature: 0.5,
-        },
-      }),
+      // completeAdapter: new CompletionAdapterOpenAIChatGPT({
+      //   openAiApiKey: process.env.OPENAI_API_KEY as string,
+      //   model: 'gpt-4o-mini',
+      //   expert: {
+      //     // for UI translation it is better to lower down the temperature from default 0.7. Less creative and more accurate
+      //     temperature: 0.5,
+      //   },
+      // }),
     }),
 
   ],
   options: {
     listPageSize: 30,
+      
   },
   columns: [
     {

live-demo/app/undefined

@@ -20,4 +20,5 @@ steps:
       - VAULT_HARBOR_KEY
       - VAULT_OPENAI_API_KEY
       - VAULT_AWS_ACCESS_KEY_ID
-      - VAULT_AWS_SECRET_ACCESS_KEY
+      - VAULT_AWS_SECRET_ACCESS_KEY
+      - VAULT_ADMIN_PASSWORD

live-demo/deploy/.woodpecker.yml

@@ -11,6 +11,7 @@ services:
       - AWS_ACCESS_KEY_ID=${VAULT_AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${VAULT_AWS_SECRET_ACCESS_KEY}
       - DATABASE_FILE_URL=file:./db/live.sqlite
+      - ADMIN_PASSWORD=${VAULT_ADMIN_PASSWORD}
     volumes:
       - af-db:/code/db/