From 4489c5a9e723cfad5f41aafd929bccdc6ac0257b Mon Sep 17 00:00:00 2001
From: Antoine D <106921102+Suboyyy@users.noreply.github.com>
Date: Sun, 13 Oct 2024 17:42:09 +0200
Subject: [PATCH] Merge master (#406)
* Custom badge commission input (#402)
* commission : input, add permission field
* orga permisison is orgaprice
* fix: permission can know be invite + add ' ' value
* fix: permission as BadgePermission
---------
Co-authored-by: Antoine D
* security: disable possibility for non-admin users from editing fields except "place" in user modal (#404)
* feat: trailer added (#405)
Co-authored-by: Antoine D
---------
Co-authored-by: Antoine D
---
src/app/(dashboard)/admin/genbadge/page.tsx | 23 +++++++++++++++----
.../admin/genbadge/style.module.scss | 4 ++--
src/app/page.tsx | 4 ++--
src/components/dashboard/UserModal.tsx | 23 ++++++++-----------
src/types.ts | 2 +-
5 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/app/(dashboard)/admin/genbadge/page.tsx b/src/app/(dashboard)/admin/genbadge/page.tsx
index 572a6f68..d624fbce 100644
--- a/src/app/(dashboard)/admin/genbadge/page.tsx
+++ b/src/app/(dashboard)/admin/genbadge/page.tsx
@@ -142,7 +142,7 @@ const GenBadges = () => {
}}
required
/>
-
,
- /*,*/
+ ,