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

Author: NoOne7135

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

@@ -1,6 +1,5 @@
-import AdminForth, { AdminForthDataTypes, AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
-
-import type { AdminUser } from  'adminforth';
+import AdminForth, { AdminForthDataTypes } from 'adminforth';
+import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
 
 async function canModifyUsers({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
   return adminUser.dbUser.role === 'superadmin';

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

@@ -1,5 +1,5 @@
 import express from 'express';
-import AdminForth, { Filters } from 'adminforth';
+import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 
 const ADMIN_BASE_URL = '';

adminforth/index.ts

@@ -7,7 +7,6 @@ import CodeInjector from './modules/codeInjector.js';
 import ExpressServer from './servers/express.js';
 // import FastifyServer from './servers/fastify.js';
 import { ADMINFORTH_VERSION, listify, suggestIfTypo, RateLimiter, RAMLock, getClientIp } from './modules/utils.js';
-
 import { 
   type AdminForthConfig, 
   type IAdminForth, 

adminforth/spa/src/afcl/Input.vue

@@ -16,7 +16,7 @@
       :value="modelValue"
       aria-describedby="helper-text-explanation"
       class="inline-flex bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-0 focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary 
-      blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white translate-y-0"
+      blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 placeholder-gray-500 dark:placeholder-gray-400 dark:text-white translate-y-0"
       :class="{'rounded-l-md': !$slots.prefix && !prefix, 'rounded-r-md': !$slots.suffix && !suffix, 'w-full': fullWidth}"
       :disabled="readonly"
     >

live-demo/deploy/.woodpecker.yml

@@ -28,15 +28,23 @@ steps:
       - npm audit signatures
       - npx semantic-release
 
-  slack-on-failure:
+  slack-on-success:
     when:
       - event: push
-        status: [failure, success]
+        status: success
+    image: curlimages/curl
+    commands:
+      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - cd live-demo/deploy && /bin/sh buildSlackNotify.sh success
+
+  slack-on-failure:
+    when:
       - event: push
+        status: failure
     image: curlimages/curl
     commands:
       - export $(cat /woodpecker/deploy.vault.env | xargs)
-      - cd live-demo/deploy && /bin/sh buildSlackNotify.sh
+      - cd live-demo/deploy && /bin/sh buildSlackNotify.sh failure
 
   build-live-demo:
     when:

live-demo/deploy/buildSlackNotify.sh

@@ -3,9 +3,10 @@
 
 COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
 
+echo 'STATUS', $1;
 
-if [ "$CI_STEP_STATUS" = "success" ]; then
-  MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
+if [ "$1" = "success" ]; then
+  MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_PIPELINE_FORGE_URL|$COMMIT_SHORT_SHA>)"
 
 
   curl  -s -X POST -H "Content-Type: application/json" -d '{