CHANGELOG.md

@@ -58,6 +58,7 @@ Ajouter dans le fichier .env du frontend
 * [#355] modification front admin transporteur
 * [#356] front page admin bovin
 * [#353] modification front admin client
+* [#353] modification front admin utilisateur
 ### Changed
 
 ### Fixed

frontend/pages/admin/bovin/[[id]].vue

@@ -9,7 +9,7 @@
                     class="cursor-pointer text-primary-500"
                 />
             </div>
-            <h1 class="text-4xl text-primary-500 font-bold uppercase">
+            <h1 class="text-3xl text-primary-500 font-bold uppercase">
                 {{ route.params.id ? 'Modifications du type bovin' : 'Ajout d\'un type bovin' }}
             </h1>
         </div>

frontend/pages/admin/carrier/[[id]].vue

@@ -10,7 +10,7 @@
                     class="cursor-pointer text-primary-500"
                 />
             </div>
-            <h1 class="text-4xl text-primary-500 font-bold uppercase">
+            <h1 class="text-3xl text-primary-500 font-bold uppercase">
                 {{ route.params.id ? 'Modification du transporteur' : 'Ajout d\'un transporteur' }}
             </h1>
         </div>

frontend/pages/admin/user/[[id]].vue

@@ -1,51 +1,70 @@
 <template>
     <form @submit.prevent="validate">
-        <div
+        <div class="flex items-center relative">
-            class="flex items-center justify-between gap-10">
+            <div class="flex flex-row absolute -left-[60px]">
-            <h1 class="text-3xl font-bold uppercase">
+                <Icon
+                    @click="router.push('/admin/user/list')"
+                    name="gg:arrow-left-o"
+                    size="40"
+                    class="cursor-pointer text-primary-500"
+                />
+            </div>
+            <h1 class="text-3xl text-primary-500 font-bold uppercase">
                 {{ userId ? "Modification de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
-            <UiButton
-                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-                type="submit"
-            >
-                <Icon :name="userId ? '' : 'mdi:plus'" size="28" />
-                {{ userId ? 'Valider' : 'Ajouter' }}
-            </UiButton>
         </div>
 
-        <div class="grid gap-y-16 gap-x-40 py-12">
+        <div class="flex flex-cols-3 justify-between mb-11 pt-7">
             <UiTextInput
                 id="user-name"
                 v-model="form.username"
                 label="Nom de l'utilisateur"
+                :disabled="!auth.isAdmin"
+                wrapper-class="w-[280px]"
             />
 
             <UiSelect
                 id="user-role"
                 v-model="form.role"
-                label="Rôle de l'utilisateur"
+                label="Role de l'utilisateur"
                 :options="ROLE"
+                :disabled="!auth.isAdmin"
+                wrapper-class="w-[280px]"
             />
+
             <UiTextInput
                 id="user-password"
                 v-model="form.password"
                 label="Mot de passe"
                 type="password"
-
+                :disabled="!auth.isAdmin"
+                wrapper-class="w-[280px]"
             />
+        </div>
 
+        <div class="flex items-center justify-center">
+            <UiButton
+                class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                type="submit"
+                :disabled="isLoading || isHydrating || !auth.isAdmin"
+            >
+                <Icon :name="userId ? '' : 'mdi:plus'" size="28" />
+                {{ userId ? 'Valider' : 'Ajouter' }}
+            </UiButton>
         </div>
     </form>
 </template>
+
 <script setup lang="ts">
-import {computed, reactive, ref, watch} from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
-import {ROLE} from '~/utils/constants'
+import { ROLE } from '~/utils/constants'
-import {createUser, updateUser, getUser} from '~/services/auth'
+import { createUser, updateUser, getUser } from '~/services/auth'
-import type {UserData, UserFormData, UserPayload} from '~/services/dto/user-data'
+import type { UserData, UserFormData, UserPayload } from '~/services/dto/user-data'
+import { useAuthStore } from '~/stores/auth'
 
 const route = useRoute()
 const router = useRouter()
+const auth = useAuthStore()
 const userId = computed(() => resolveUserId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)
@@ -59,7 +78,6 @@ const resolveUserId = (param: unknown) => {
     return Number.isFinite(id) ? id : null
 }
 
-
 const form = reactive<UserFormData>({
     username: '',
     password: '',
@@ -73,8 +91,8 @@ const hydrateFromUser = (user: UserData | null) => {
     isHydrating.value = true
     form.username = user.username ?? ''
     const roles = user.roles ?? []
-    const hasAdmin = roles.includes("ROLE_ADMIN")
+    const hasAdmin = roles.includes('ROLE_ADMIN')
-    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
+    form.role = hasAdmin ? 'ROLE_ADMIN' : 'ROLE_USER'
     form.password = ''
     isHydrating.value = false
 }
@@ -93,10 +111,11 @@ watch(
             isLoading.value = false
         }
     },
-    {immediate: true}
+    { immediate: true }
 )
 
 async function validate() {
+    if (!auth.isAdmin) return
 
     const normalizedUsername = form.username.trim()
     const normalizedRole = form.role.trim()
@@ -112,13 +131,12 @@ async function validate() {
 
     if (userId.value) {
         await updateUser(userId.value, basePayload)
-        await router.push(`/admin/user/list/`)
         return
     }
 
     const created = await createUser(basePayload)
     if (created) {
-        await router.push(`/admin/user/list/`)
+        await router.push('/admin/user/list')
     }
 }
 </script>

frontend/pages/admin/user/list.vue

@@ -1,58 +1,72 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
+        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
+    </div>
+
+    <div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
+        <div class="grid grid-cols-2 text-primary-700 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+            <div>Utilisateur</div>
+            <div>Role</div>
+        </div>
+        <div v-if="userList.length === 0" class="px-4 py-6 text-slate-400">
+            Aucun utilisateur.
+        </div>
+        <template v-else>
+            <div
+                v-for="user in userList"
+                :key="user.id"
+                class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200 items-center"
+                role="button"
+                tabindex="0"
+                @click="goToUser(user.id)"
+                @keydown.enter="goToUser(user.id)"
+            >
+                <div>{{ user.username }}</div>
+                <div>{{ getRoleLabels(user.roles) }}</div>
+            </div>
+        </template>
+    </div>
+    <div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
+        Acces reserve aux administrateurs.
+    </div>
+
+    <div class="flex justify-center items-center">
         <NuxtLink
             to="/admin/user"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
+            @click="handleAddClick"
         >
             <Icon name="mdi:plus" size="28" />
             Ajouter
         </NuxtLink>
-
-    </div>
-
-    <div>
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-3 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Username</div>
-                <div>Role</div>
-            </div>
-            <div
-                v-for="user in userList"
-                :key="user.id"
-                class="grid grid-cols-3 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t items-center"
-                role="button"
-                tabindex="0"
-                @click="goToUser(user.id)"
-            >
-                <div>
-                    {{ user.username }}
-                </div>
-                <div>
-                    {{ getRoleLabels(user.roles) }}
-                </div>
-            </div>
-        </div>
     </div>
 </template>
 
-
 <script setup lang="ts">
-import type {UserData} from "~/services/dto/user-data";
+import type { UserData } from "~/services/dto/user-data"
-import {getAdminUsers} from "~/services/auth";
+import { getAdminUsers } from "~/services/auth"
-import {ROLE} from "~/utils/constants";
+import { ROLE } from "~/utils/constants"
+import { useAuthStore } from "~/stores/auth"
 
 const userList = ref<UserData[]>([])
 const router = useRouter()
+const auth = useAuthStore()
 const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
 
 const goToUser = (id: number) => {
+    if (!auth.isAdmin) return
     router.push(`/admin/user/${id}`)
 }
 
+const handleAddClick = (event: Event) => {
+    if (auth.isAdmin) return
+    event.preventDefault()
+}
+
 const getRoleLabels = (roles?: string[]) => {
     if (!roles || roles.length === 0) {
-        return ' ---'
+        return '---'
     }
 
     return roles
@@ -61,6 +75,7 @@ const getRoleLabels = (roles?: string[]) => {
 }
 
 onMounted(async () => {
+    if (!auth.isAdmin) return
     userList.value = await getAdminUsers()
 })
 </script>