Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c5895c7

Browse filesBrowse files
NoOne7135NoOne7135
committed
Merge branch 'main' of https://github.com/devforth/adminforth into next
2 parents 7657ef5 + fccc0d8 commit c5895c7
Copy full SHA for c5895c7

File tree

Expand file treeCollapse file tree

6 files changed

+18
-11
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+18
-11
lines changed

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

Copy file name to clipboardExpand all lines: adminforth/commands/createApp/templates/adminuser.ts.hbs
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import AdminForth, { AdminForthDataTypes, AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
2-
3-
import type { AdminUser } from 'adminforth';
1+
import AdminForth, { AdminForthDataTypes } from 'adminforth';
2+
import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
43

54
async function canModifyUsers({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
65
return adminUser.dbUser.role === 'superadmin';

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

Copy file name to clipboardExpand all lines: adminforth/commands/createApp/templates/index.ts.hbs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import express from 'express';
2-
import AdminForth, { Filters } from 'adminforth';
2+
import AdminForth from 'adminforth';
33
import usersResource from "./resources/adminuser.js";
44

55
const ADMIN_BASE_URL = '';

‎adminforth/index.ts

Copy file name to clipboardExpand all lines: adminforth/index.ts
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CodeInjector from './modules/codeInjector.js';
77
import ExpressServer from './servers/express.js';
88
// import FastifyServer from './servers/fastify.js';
99
import { ADMINFORTH_VERSION, listify, suggestIfTypo, RateLimiter, RAMLock, getClientIp } from './modules/utils.js';
10-
1110
import {
1211
type AdminForthConfig,
1312
type IAdminForth,

‎adminforth/spa/src/afcl/Input.vue

Copy file name to clipboardExpand all lines: adminforth/spa/src/afcl/Input.vue
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:value="modelValue"
1717
aria-describedby="helper-text-explanation"
1818
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
19-
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"
19+
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"
2020
:class="{'rounded-l-md': !$slots.prefix && !prefix, 'rounded-r-md': !$slots.suffix && !suffix, 'w-full': fullWidth}"
2121
:disabled="readonly"
2222
>

‎live-demo/deploy/.woodpecker.yml

Copy file name to clipboardExpand all lines: live-demo/deploy/.woodpecker.yml
+11-3Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,23 @@ steps:
2828
- npm audit signatures
2929
- npx semantic-release
3030

31-
slack-on-failure:
31+
slack-on-success:
3232
when:
3333
- event: push
34-
status: [failure, success]
34+
status: success
35+
image: curlimages/curl
36+
commands:
37+
- export $(cat /woodpecker/deploy.vault.env | xargs)
38+
- cd live-demo/deploy && /bin/sh buildSlackNotify.sh success
39+
40+
slack-on-failure:
41+
when:
3542
- event: push
43+
status: failure
3644
image: curlimages/curl
3745
commands:
3846
- export $(cat /woodpecker/deploy.vault.env | xargs)
39-
- cd live-demo/deploy && /bin/sh buildSlackNotify.sh
47+
- cd live-demo/deploy && /bin/sh buildSlackNotify.sh failure
4048

4149
build-live-demo:
4250
when:

‎live-demo/deploy/buildSlackNotify.sh

Copy file name to clipboardExpand all lines: live-demo/deploy/buildSlackNotify.sh
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
55

6+
echo 'STATUS', $1;
67

7-
if [ "$CI_STEP_STATUS" = "success" ]; then
8-
MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
8+
if [ "$1" = "success" ]; then
9+
MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_PIPELINE_FORGE_URL|$COMMIT_SHORT_SHA>)"
910

1011

1112
curl -s -X POST -H "Content-Type: application/json" -d '{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.