diff --git a/frontend/.gitignore b/frontend/.gitignore index 619d279..33b2f6c 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -25,4 +25,6 @@ yarn-error.log* /.idea /.scannerwork -compose.overrides.yml \ No newline at end of file +compose.overrides.yml + +/src/api/OpenApi.yml \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index de0d018..6bd4ece 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "oasis", - "version": "2.1.0", + "version": "2.1.2", "private": true, "dependencies": { "@ant-design/icons": "^5.5.1", diff --git a/frontend/src/api/schema.d.ts b/frontend/src/api/schema.d.ts index 21a94b2..f4d6fb4 100644 --- a/frontend/src/api/schema.d.ts +++ b/frontend/src/api/schema.d.ts @@ -1,12 +1,3 @@ -/* - * Copyright (c) 2024. Esup - Université de Bordeaux - * - * This file is part of the Esup-Oasis project (https://github.com/EsupPortail/esup-oasis). - * For full copyright and license information please view the LICENSE file distributed with the source code. - * - * @author Julien Lemonnier - */ - /** * This file was auto-generated by openapi-typescript. * Do not make direct changes to the file. @@ -942,6 +933,11 @@ export interface paths { patch: operations["api_types_evenements_id_patch"]; }; "/types_evenements/{typeId}/taux": { + /** + * Retrieves the collection of TauxHoraire resources. + * @description Retrieves the collection of TauxHoraire resources. + */ + get: operations["api_types_evenements_typeIdtaux_get_collection"]; /** * Creates a TauxHoraire resource. * @description Creates a TauxHoraire resource. @@ -11346,6 +11342,71 @@ export interface operations { }; }; }; + /** + * Retrieves the collection of TauxHoraire resources. + * @description Retrieves the collection of TauxHoraire resources. + */ + api_types_evenements_typeIdtaux_get_collection: { + parameters: { + query?: { + /** @description The collection page number */ + page?: number; + /** @description The number of items per page */ + itemsPerPage?: number; + date?: string; + }; + path: { + /** @description TauxHoraire identifier */ + typeId: string; + }; + }; + responses: { + /** @description TauxHoraire collection */ + 200: { + content: { + "application/ld+json": { + "hydra:member": components["schemas"]["TauxHoraire.jsonld-taux.out"][]; + "hydra:totalItems"?: number; + /** + * @example { + * "@id": "string", + * "type": "string", + * "hydra:first": "string", + * "hydra:last": "string", + * "hydra:previous": "string", + * "hydra:next": "string" + * } + */ + "hydra:view"?: { + /** Format: iri-reference */ + "@id"?: string; + "@type"?: string; + /** Format: iri-reference */ + "hydra:first"?: string; + /** Format: iri-reference */ + "hydra:last"?: string; + /** Format: iri-reference */ + "hydra:previous"?: string; + /** Format: iri-reference */ + "hydra:next"?: string; + }; + "hydra:search"?: { + "@type"?: string; + "hydra:template"?: string; + "hydra:variableRepresentation"?: string; + "hydra:mapping"?: { + "@type"?: string; + variable?: string; + property?: string | null; + required?: boolean; + }[]; + }; + }; + "text/html": components["schemas"]["TauxHoraire-taux.out"][]; + }; + }; + }; + }; /** * Creates a TauxHoraire resource. * @description Creates a TauxHoraire resource. diff --git a/frontend/src/controls/AppLayout/AppLayout.scss b/frontend/src/controls/AppLayout/AppLayout.scss index b25044d..55d90cc 100644 --- a/frontend/src/controls/AppLayout/AppLayout.scss +++ b/frontend/src/controls/AppLayout/AppLayout.scss @@ -33,6 +33,7 @@ .user .ant-menu-title-content { padding: 0 !important; } + .user .ant-menu-title-content, .recherche .ant-menu-title-content { background-color: $light-grey; } @@ -86,6 +87,10 @@ align-items: center; } + .ant-menu .recherche { + line-height: 1; + } + .recherche.recherche-en-cours { .ant-menu-submenu-title { @@ -155,6 +160,8 @@ background: none; } + + .sider-trigger { background: transparent !important; color: $primary; @@ -278,10 +285,15 @@ vertical-align: middle !important; } + .ant-menu-submenu-title { + line-height: 52px; + } + .user-space { font-size: 1rem; vertical-align: middle; font-weight: 400; + text-align: left; .ant-space-item { margin: 0; diff --git a/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx b/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx index 878bfce..7f99d33 100644 --- a/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx +++ b/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx @@ -37,7 +37,7 @@ export const menuItemUtilisateur = ( { key: "user", label: ( -