fix: update environment variables import in index.ts.hbs

Author: yaroslav8765

adminforth/commands/createApp/templates/index.ts.hbs

@@ -4,7 +4,8 @@ import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
 import dotenv from "dotenv";
-dotenv.config({ path: '.env.local' });
+dotenv.config({ path: '.env.local', override: true });
+dotenv.config({ path: '.env', override: true });
 
 const ADMIN_BASE_URL = '';
 

dev-demo/.env.sample

@@ -1,11 +1,5 @@
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
-ADMINFORTH_SECRET=123
-NODE_ENV=development
 OPENAI_API_KEY=1
 HEAVY_DEBUG=
 HEAVY_DEBUG_QUERY=
-PORT=3000
-
-DATABASE_FILE=./db.sqlite
-DATABASE_FILE_URL=file:${DATABASE_FILE}

dev-demo/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 *.sqlite
+*.sqlite-journal
 .env
 db

dev-demo/custom/GroupTable.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="p-4 space-y-4">
+    <h2 class="text-xl font-bold">🧪 JsonCell Test Table</h2>
+
+
+
+
+
+    <JsonViewer 
+      :value="[
+        {
+          id: 1,
+          name: 'Alice',
+          meta: {
+            age: 30,
+            hobbies: ['reading', 'biking'],
+            location: { city: 'Kyiv', country: 'Ukraine' }
+          }
+        },
+        {
+          id: 2,
+          name: 'Bob',
+          meta: {
+            age: 25,
+            active: true,
+            scores: { math: 92, english: 88 }
+          }
+        }
+      ]" 
+      :expandDepth="4" 
+    />
+
+
+
+    
+
+
+
+    <h3 class="text-lg font-semibold">Table with Pagination</h3>
+    <p class="text-gray-600">This table demonstrates pagination with a custom page size.</p>
+
+  </div>
+
+
+
+
+
+
+
+
+
+
+  <Table
+    :columns="[
+      { label: 'Name', fieldName: 'name' },
+      { label: 'Age', fieldName: 'age' },
+      { label: 'Country', fieldName: 'country' },
+    ]"
+    :data="[
+      { name: 'John', age: 30, country: 'US' },
+      { name: 'Rick', age: 25, country: 'CA' },
+      { name: 'Alice', age: 35, country: 'UK' },
+      { name: 'Colin', age: 40, country: 'AU' },
+    ]"
+    :pageSize="2"
+  ></Table>
+
+</template>
+
+<script setup lang="ts">
+import { JsonViewer } from '@/afcl'
+import { Table } from '@/afcl'
+
+
+// Фейковые данные
+const rows = [
+  {
+    id: 1,
+    name: 'Alice',
+    meta: {
+      age: 30,
+      hobbies: ['reading', 'biking'],
+      location: { city: 'Kyiv', country: 'Ukraine' }
+    }
+  },
+  {
+    id: 2,
+    name: 'Bob',
+    meta: {
+      age: 25,
+      active: true,
+      scores: { math: 92, english: 88 }
+    }
+  }
+]
+</script>

dev-demo/index.ts

@@ -11,6 +11,7 @@ import usersResource from './resources/users.js';
 // import gameResource from './resources/game.js';
 // import gamesUsersResource from './resources/games_users.js';
 // import gamesResource from './resources/games.js';
+// import groupTableResource from './resources/';
 import translationsResource from './resources/translation.js';
 import clinicsResource from './resources/clinics.js';
 import providersResource from './resources/providers.js';
@@ -78,7 +79,16 @@ export const admin = new AdminForth({
     loginBackgroundImage: 'https://images.unsplash.com/photo-1534239697798-120952b76f2b?q=80&w=3389&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
     loginBackgroundPosition: '1/2', // over, 3/4, 2/5, 3/5 (tailwind grid)
     demoCredentials: "adminforth:adminforth",  // never use it for production
-    loginPromptHTML: "Use email <b>adminforth</b> and password <b>adminforth</b> to login",
+    loginPromptHTML: async () => { return "Nya"},
+    // loginPromptHTML:"Nya without function",
+    // async () =>{
+    //   const adminForthUserExists = await admin.resource('users').count() > 0;
+    //   if (adminForthUserExists) {
+    //     return `<p>Welcome to <b>AdminForth</b> demo!</p>`
+    //   } else {
+    //     return `<p>Welcome to <b>AdminForth</b> demo!</p>`
+    //   }
+    // },
     // loginBackgroundImage: '@@/pho.jpg',
     rememberMeDays: 30,
     beforeLoginConfirmation: [async ({adminUser, adminforth, extra}) => {
@@ -190,7 +200,7 @@ export const admin = new AdminForth({
   dataSources: [
     {
       id: 'maindb',
-      url: process.env.DATABASE_URL,
+      url: process.env.DATABASE_URL as string,
     },
     {
       id: 'pg',
@@ -202,7 +212,7 @@ export const admin = new AdminForth({
     },
     {
       id: 'ch',
-      url: 'clickhouse://demo:demo@localhost:8125/demo',
+      url: 'clickhouse://demo:demo@localhost:8124/demo',
     },
     {
       id: 'mysql',
@@ -225,10 +235,17 @@ export const admin = new AdminForth({
     translationsResource,
   ],
   menu: [
+    {
+      label: 'TablesGroup',
+      path: '/overview',
+      homepage: true,
+      icon: 'flowbite:chart-pie-solid',
+      component: '@@/GroupTable.vue',
+    },
     {
       label: 'Dashboard',
       icon: 'flowbite:chart-pie-solid',
-      component: '@@/Dash.vue',
+      component: '@@/GroupTable.vue',
       path: '/dashboard',
       // homepage: true,
       isStaticRoute:false,
@@ -336,7 +353,7 @@ export const admin = new AdminForth({
 
 const app = express()
 app.use(express.json());
-const port = process.env.PORT || 3000;
+const port = process.env.PORT || 3001;
 
 (async () => {
     console.log('🅿️  Bundling AdminForth...');