Skip to content

Commit b578daa

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into next
2 parents dc8f46f + d61e4e0 commit b578daa

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
import { Express } from "express";
1+
import { Express, Request, Response } from "express";
22
import { IAdminForth } from "adminforth";
3-
43
export function initApi(app: Express, admin: IAdminForth) {
54
app.get(`${admin.config.baseUrl}/api/hello/`,
6-
(req, res) => {
7-
res.json({ message: "Hello from AdminForth API!" });
5+
async (req: Request, res: Response) => {
6+
const allUsers = await admin.resource("adminuser").list([]);
7+
res.json({
8+
message: "Hello from AdminForth API!",
9+
users: allUsers,
10+
});
811
}
912
);
1013
}

adminforth/spa/src/components/Toast.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div v-else class="af-toast-icon inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-green-500 bg-green-100 rounded-lg dark:bg-green-800 dark:text-green-200">
1919
<IconCheckCircleSolid class="w-5 h-5" aria-hidden="true" />
2020
</div>
21-
<div class="flex flex-col items-center justify-center break-all">
21+
<div class="flex flex-col items-center justify-center break-all overflow-hidden [display:-webkit-box] [-webkit-box-orient:vertical] [-webkit-line-clamp:70]">
2222
<div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
2323
<div class="ms-3 text-sm font-normal max-w-xs pr-2" v-else>
2424
{{toast.message}}

0 commit comments

Comments
 (0)