Merge branch 'develop' into fix/-style-global

# Conflicts:
#	.idea/workspace.xml
#	frontend/layouts/default.vue

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

@@ -0,0 +1,101 @@
+
+<template>
+    <form @submit.prevent="validate">
+    <div class="flex items-center justify-between ">
+        <h1 class="text-3xl font-bold uppercase">
+            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
+        </h1>
+
+        <button
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+        >Enregistrer
+        </button>
+    </div>
+
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
+
+        <UiTextInput
+            label = "nom du fournisseur"
+            id="carrier-name"
+            v-model="form.name"
+        />
+
+        <UiTextInput
+                label = "code fournisseur"
+                id="code-id"
+                v-model="form.code"
+        />
+    </div>
+    </form>
+
+</template>
+
+<script setup lang="ts">
+import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
+import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
+const router = useRouter()
+const route = useRoute()
+const idCarrier = Number(route.params.id)
+const isLoading = ref(false)
+const isHydrating = ref(false)
+
+const form = reactive<CarrierFormData>({
+    code:'',
+    name:''
+})
+
+definePageMeta({
+    layout: 'admin'
+})
+
+const hydrateFromUser = (carrier: CarrierData | null) => {
+    if (!carrier) {
+        return
+    }
+    isHydrating.value = true
+    form.name = carrier.name ?? ''
+    form.code = carrier.code ?? ''
+    isHydrating.value = false
+}
+
+watch(
+    () => idCarrier,
+    async (id) => {
+        if (id === null) {
+            return
+        }
+        isLoading.value = true
+        try {
+            const user = await getCarrier(id)
+            hydrateFromUser(user)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+async function validate() {
+
+    const normalizedCarrierCode = form.code.trim()
+    const normalizedCarrierName = form.name.trim()
+
+    const basePayload = {
+        name: normalizedCarrierName,
+        code: normalizedCarrierCode
+
+    }
+
+    if(idCarrier){
+        await updateCarrier(idCarrier, basePayload)
+        navigate()
+        return
+    }
+    await createCarrier(basePayload)
+    navigate()
+}
+
+function navigate(){
+    router.push("/admin/carrier/carrier-list")
+}
+</script>

frontend/pages/admin/carrier/carrier-list.vue

@@ -0,0 +1,51 @@
+<template>
+
+    <div class="flex items-center justify-between ">
+            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
+            <NuxtLink
+                to="/admin/carrier"
+                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            >Ajouter
+            </NuxtLink>
+    </div>
+
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Label</div>
+                <div>Code</div>
+            </div>
+            <div
+                v-for="carrier in carrierList"
+                :key="carrier.id"
+                class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToCarrier(carrier.id)"
+                @keydown.enter="goToCarrier(carrier.id)"
+            >
+                <div>{{ carrier.name}}</div>
+                <div>{{ carrier.code }}</div>
+            </div>
+        </div>
+
+</template>
+
+<script setup lang="ts">
+import type {CarrierData} from "~/services/dto/carrier-data";
+import {getCarrierList} from "~/services/carrier";
+
+const carrierList = ref<CarrierData[]>()
+const router = useRouter()
+
+const goToCarrier = (id: number) => {
+    router.push(`/admin/carrier/${id}`)
+}
+
+definePageMeta({
+    layout: 'admin'
+})
+
+onMounted(async () => {
+    carrierList.value = await getCarrierList(false)
+})
+</script>

frontend/pages/admin/dashboard.vue

@@ -1,13 +1,9 @@
+<template>
+    <AdminUserForm/>
+</template>
+
 <script setup lang="ts">
 definePageMeta({
     layout: 'admin'
 })
 </script>
-
-<template>
-<h1>test</h1>
-</template>
-
-<style scoped>
-
-</style>

frontend/pages/admin/supplier/supplier-list.vue

@@ -0,0 +1,74 @@
+<template>
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold uppercase"> Fournisseurs </h1>
+        <NuxtLink to="/admin/supplier"
+                  class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+        >
+            Ajouter
+        </NuxtLink>
+    </div>
+    <div class="mt-6 border border-slate-200 mb-16">
+        <div class="max-h-96 overflow-y-auto">
+            <div
+                class="sticky top-0 z-10 grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+            >
+                <div>Nom</div>
+                <div>Mail</div>
+                <div>Rue</div>
+                <div>Complément</div>
+                <div>Code Postal</div>
+                <div>Ville</div>
+            </div>
+
+            <div v-for="supplier in supplierList" :key="supplier.id">
+                <template v-if="supplier.addresses?.length">
+                    <div
+                        v-for="addr in supplier.addresses"
+                        :key="addr.id"
+                        class="grid grid-cols-6 hover:bg-slate-50 border-t gap-4 px-4 py-2"
+                        @click="goToSupplier(supplier.id)"
+                    >
+                        <div class="truncate">
+                            {{ supplier.name }}
+                        </div>
+                        <div class="truncate">
+                            {{ supplier.email }}
+                        </div>
+                        <div class="truncate">
+                            {{ addr.street }}
+                        </div>
+                        <div class="truncate">
+                            {{ addr.street2 }}
+                        </div>
+                        <div>{{ addr.postalCode }}</div>
+                        <div class="uppercase truncate">
+                            {{ addr.city }}
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type {SupplierData} from "~/services/dto/supplier-data"
+import {getSupplierList} from "~/services/supplier"
+
+definePageMeta({layout: "admin"})
+
+const supplierList = ref<SupplierData[]>([])
+const router = useRouter()
+
+
+const goToSupplier = (id: number) => {
+    router.push(`/admin/supplier/${id}`)
+}
+
+onMounted(async () => {
+    supplierList.value = (await getSupplierList(false)) ?? []
+})
+
+</script>
+
+

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

@@ -0,0 +1,8 @@
+<template>
+    <UserForm/>
+</template>
+<script setup lang="ts">
+definePageMeta({
+    layout: 'admin'
+})
+</script>

frontend/pages/admin/user/list.vue

@@ -0,0 +1,57 @@
+<template>
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
+        <NuxtLink
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="router.push('/admin/user/')"
+        >
+            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>
+                    {{ user.roles?.join(', ') || ' ---' }}
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script setup lang="ts">
+definePageMeta({
+    layout: 'admin'
+})
+
+import type {UserData} from "~/services/dto/user-data";
+import {getAdminUsers, getUsers} from "~/services/auth";
+
+const userList = ref<UserData[]>([])
+const router = useRouter()
+
+const goToUser = (id: number) => {
+    router.push(`/admin/user/${id}`)
+}
+
+onMounted(async () => {
+    userList.value = await getAdminUsers()
+})
+</script>