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

Author: NoOne7135

README.md

@@ -1,4 +1,4 @@
-# AdminForth - free powerfull Node.js admin panel framework on Vue & Tailwind
+# AdminForth - powerfull Agent-first Typescript admin panel framework
 
 
 <a href="https://adminforth.dev"><img src="https://img.shields.io/badge/website-adminforth.dev-blue" style="height:24px"/></a> <a href="https://adminforth.dev"><img src="https://img.shields.io/npm/dw/adminforth" style="height:24px"/></a> <a href="https://devforth.io"><img src="https://raw.githubusercontent.com/devforth/OnLogs/e97944fffc24fec0ce2347b205c9bda3be8de5c5/.assets/df_powered_by.svg" style="height:28px"/></a>
@@ -16,9 +16,8 @@
 <br/>
 
 <div align="center">
-  <img src="https://github.com/user-attachments/assets/e643caad-1daa-4085-b125-cc940557a2ec"
- alt="AdminForth Dashboard" width="90%">
-
+  <img src="https://github.com/user-attachments/assets/775c527d-65c3-4d9c-bb0c-3692462f2818"
+ alt="AdminForth Agent" width="90%">
 </div>
 
 
@@ -38,32 +37,43 @@ Why AdminForth:
 
 ## Project initialisation
 
-```
-mkdir myadmin && cd myadmin
+To create an AdminForth project, run:
+
+```bash
 npx adminforth create-app
 ```
 
-## Previews
+During the interactive initialization process, AdminForth will ask you to provide a local database URL.
 
-<a href="https://adminforth.dev/docs/tutorial/Customization/customPages">Custom Dashboard</a>
-<br/>
-<img src="https://github.com/user-attachments/assets/aa899196-f7f3-4582-839c-2267f2e9e197" alt="AdminForth Dashboard demo" width="80%" />
+### Integrating AdminForth into your existing application
 
-<a href="https://adminforth.dev/docs/tutorial/Plugins/chat-gpt">Text completion plugin (Copilot-style) using LLMs</a>
-<br/>
+If you want to build an admin panel for an existing project that already has a database with tables, you can provide the connection URL to your existing development database, such as a local or deployed one.
 
-<img src="https://github.com/user-attachments/assets/cfa17cbd-3a53-4725-ab46-53c7c7666028" alt="AdminForth ChatGPT demo" width="80%" />
+After that, you may want to generate AdminForth resource files from your existing database tables:
 
-<a href="https://adminforth.dev/docs/tutorial/Plugins/upload/#image-generation">Image Generation using image generation models</a>
-<br/>
-<img src="https://github.com/user-attachments/assets/b923e044-7e29-46ff-ab91-eeca5eee2b0a" alt="AdminForth DALE-E image generator demo" width="80%">
+```bash
+npx adminforth resource
+```
+
+Resource files are needed for AdminForth to “know” about your tables and define how to work with them.
+
+Use the command above every time you add new tables or change their schema.
+
+### Starting from scratch
+
+If you do not have a database yet, start an empty local database, for example PostgreSQL in Docker, and provide its URL to the AdminForth CLI.
+
+If the adminforth CLI does not detect any tables, it will suggest adding Prisma as a migration tool. Prisma is not related to AdminForth, but it is one of the most convenient migration tools.
+
+Please follow [getting started](https://adminforth.dev/docs/tutorial/gettingStarted/).
 
+# For AdminForth developers
 
-# For developers
+> Follow this section only if you want to make changes to the AdminForth framework or develop a plugin.
 
-The most convenient way to add new features or fixes is using `dev-demo`. It imports the source code of the repository and plugins so you can edit them and see changes on the fly.
+The most convenient way to add new features or fixes is to use `dev-demo`. It imports the repository source code and plugins, so you can edit them and see changes on the fly.
 
-# Requirements
+## Requirements
 
 - **Node.js 20**
 - **Docker**

adminforth/dataConnectors/sqlite.ts

@@ -101,6 +101,9 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
             const [precision, scale] = baseType.match(/\d+/g);
             field.precision = parseInt(precision);
             field.scale = parseInt(scale);
+          } else if (baseType == 'json' || baseType == 'jsonb') {
+            field.type = AdminForthDataTypes.JSON;
+            field._underlineType = baseType;
           } else if (baseType === 'decimal') {
             field.type = AdminForthDataTypes.DECIMAL;
             field._underlineType = 'decimal';
@@ -155,17 +158,14 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return value === null ? null : !!value;
       } else if (field.type == AdminForthDataTypes.JSON) {
-        if (field._underlineType == 'text' || field._underlineType == 'varchar') {
+        if (typeof value === 'string') {
           try {
             return JSON.parse(value);
           } catch (e) {
             return {'error': `Failed to parse JSON: ${e.message}`}
           }
-        } else {
-          afLogger.warn(`AdminForth: JSON field is not a string/text but ${field._underlineType}, this is not supported yet`);
         }
       }
-
       return value;
     }
 
@@ -192,12 +192,10 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return value === null ? null : (value ? 1 : 0);
       } else if (field.type == AdminForthDataTypes.JSON) {
-        // check underline type is text or string
-        if (field._underlineType == 'text' || field._underlineType == 'varchar') {
-          return JSON.stringify(value);
-        } else {
-          afLogger.warn(`AdminForth: JSON field is not a string/text but ${field._underlineType}, this is not supported yet`);
+        if (value === null || value === undefined) {
+          return null;
         }
+        return typeof value === 'string' ? value : JSON.stringify(value);
       }
 
       return value;

adminforth/documentation/blog/2024-10-31-compose-ec2-deployment/index.md

@@ -210,6 +210,8 @@ resource "null_resource" "sync_files_and_run" {
   provisioner "local-exec" {
     # heredoc syntax
     command = <<-EOF
+    set -eu
+
     rsync -t -av \
       --delete \
       --exclude 'node_modules' \

adminforth/documentation/blog/2024-11-14-compose-ec2-deployment-ci/index.md

@@ -255,6 +255,8 @@ resource "null_resource" "sync_files_and_run" {
     # heredoc syntax
     # remove files that where deleted on the source
     command = <<-EOF
+    set -eu
+
     #  -o StrictHostKeyChecking=no
     rsync -t -av -e "ssh -i ./.keys/id_rsa -o StrictHostKeyChecking=no" \
       --delete \

adminforth/documentation/blog/2025-02-19-compose-aws-ec2-ecr-terraform-github-actions/index.md

@@ -480,6 +480,8 @@ resource "null_resource" "sync_files_and_run" {
 
   provisioner "local-exec" {
     command = <<-EOF
+      set -eu
+
       aws ecr get-login-password --region ${local.aws_region} --profile myaws | docker login --username AWS --password-stdin ${aws_ecr_repository.myadmin_repo.repository_url}
 
       echo "Running build"

adminforth/documentation/blog/2025-02-19-compose-ec2-deployment-github-actions-registry/index.md

@@ -337,6 +337,8 @@ resource "null_resource" "wait_for_user_data" {
 resource "null_resource" "setup_registry" {
   provisioner "local-exec" {
     command = <<-EOF
+      set -eu
+
       echo "Generating secret for local registry"
       sha256sum ./.keys/id_rsa | cut -d ' ' -f1 | tr -d '\n' > ./.keys/registry.pure
 
@@ -396,6 +398,7 @@ resource "null_resource" "sync_files_and_run" {
 
   provisioner "local-exec" {
     command = <<-EOF
+      set -eu
 
       # map appserver.local to the instance (in CI we don't know the IP, so have to use this mapping)
       # so then in GA pipeline we will use