From 076bb1a90c176b119c1c8714dd3867ccf2d2104b Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 6 May 2025 19:40:23 -0400 Subject: [PATCH] feat: renommer package ui pour frontend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Si on suit les considérations du domain-driven design, le fait qu'on réfère toustes à cette partie du code comme `le frontend` me pousse à renommer le package pour mieux réflèter notre utilisation. Ça devrait rendre plus évident où les fichiers sources du frontend sont situés. --- Dockerfile | 2 +- {ui => frontend}/admin-edit.html | 0 {ui => frontend}/admin-upload.html | 0 {ui => frontend}/admin.html | 0 {ui => frontend}/dialog-document-delete.html | 0 {ui => frontend}/dialog-document-rename.html | 0 {ui => frontend}/dialog.html | 0 {ui => frontend}/documentation.html | 0 {ui => frontend}/footer.html | 0 {ui => frontend}/formulaires.html | 0 ui/ui.go => frontend/frontend.go | 9 +++------ {ui => frontend}/general.html | 0 {ui => frontend}/header.html | 0 {ui => frontend}/index.html | 0 {ui => frontend}/proces-verbaux.html | 0 {ui => frontend}/public/css/admin-edit.css | 0 {ui => frontend}/public/css/admin-upload.css | 0 {ui => frontend}/public/css/admin.css | 0 {ui => frontend}/public/css/documentation.css | 0 {ui => frontend}/public/css/fonts.css | 0 {ui => frontend}/public/css/footer.css | 0 {ui => frontend}/public/css/general.css | 0 {ui => frontend}/public/css/header.css | 0 {ui => frontend}/public/css/index.css | 0 {ui => frontend}/public/css/proces-verbaux.css | 0 {ui => frontend}/public/css/snackbar.css | 0 {ui => frontend}/public/css/vie-etudiante.css | 0 {ui => frontend}/public/fonts/.gitkeep | 0 .../public/fonts/Poppins/poppins-black-italic.ttf | Bin .../public/fonts/Poppins/poppins-black-italic.woff | Bin .../public/fonts/Poppins/poppins-black-italic.woff2 | Bin .../public/fonts/Poppins/poppins-black.ttf | Bin .../public/fonts/Poppins/poppins-black.woff | Bin .../public/fonts/Poppins/poppins-black.woff2 | Bin .../public/fonts/Poppins/poppins-bold-italic.ttf | Bin .../public/fonts/Poppins/poppins-bold-italic.woff | Bin .../public/fonts/Poppins/poppins-bold-italic.woff2 | Bin .../public/fonts/Poppins/poppins-bold.ttf | Bin .../public/fonts/Poppins/poppins-bold.woff | Bin .../public/fonts/Poppins/poppins-bold.woff2 | Bin .../fonts/Poppins/poppins-extrabold-italic.ttf | Bin .../fonts/Poppins/poppins-extrabold-italic.woff | Bin .../fonts/Poppins/poppins-extrabold-italic.woff2 | Bin .../public/fonts/Poppins/poppins-extrabold.ttf | Bin .../public/fonts/Poppins/poppins-extrabold.woff | Bin .../public/fonts/Poppins/poppins-extrabold.woff2 | Bin .../fonts/Poppins/poppins-extralight-italic.ttf | Bin .../fonts/Poppins/poppins-extralight-italic.woff | Bin .../fonts/Poppins/poppins-extralight-italic.woff2 | Bin .../public/fonts/Poppins/poppins-extralight.ttf | Bin .../public/fonts/Poppins/poppins-extralight.woff | Bin .../public/fonts/Poppins/poppins-extralight.woff2 | Bin .../public/fonts/Poppins/poppins-light-italic.ttf | Bin .../public/fonts/Poppins/poppins-light-italic.woff | Bin .../public/fonts/Poppins/poppins-light-italic.woff2 | Bin .../public/fonts/Poppins/poppins-light.ttf | Bin .../public/fonts/Poppins/poppins-light.woff | Bin .../public/fonts/Poppins/poppins-light.woff2 | Bin .../public/fonts/Poppins/poppins-medium-italic.ttf | Bin .../public/fonts/Poppins/poppins-medium-italic.woff | Bin .../fonts/Poppins/poppins-medium-italic.woff2 | Bin .../public/fonts/Poppins/poppins-medium.ttf | Bin .../public/fonts/Poppins/poppins-medium.woff | Bin .../public/fonts/Poppins/poppins-medium.woff2 | Bin .../public/fonts/Poppins/poppins-regular-italic.ttf | Bin .../fonts/Poppins/poppins-regular-italic.woff | Bin .../fonts/Poppins/poppins-regular-italic.woff2 | Bin .../public/fonts/Poppins/poppins-regular.ttf | Bin .../public/fonts/Poppins/poppins-regular.woff | Bin .../public/fonts/Poppins/poppins-regular.woff2 | Bin .../fonts/Poppins/poppins-semibold-italic.ttf | Bin .../fonts/Poppins/poppins-semibold-italic.woff | Bin .../fonts/Poppins/poppins-semibold-italic.woff2 | Bin .../public/fonts/Poppins/poppins-semibold.ttf | Bin .../public/fonts/Poppins/poppins-semibold.woff | Bin .../public/fonts/Poppins/poppins-semibold.woff2 | Bin .../public/fonts/Poppins/poppins-thin-italic.ttf | Bin .../public/fonts/Poppins/poppins-thin-italic.woff | Bin .../public/fonts/Poppins/poppins-thin-italic.woff2 | Bin .../public/fonts/Poppins/poppins-thin.ttf | Bin .../public/fonts/Poppins/poppins-thin.woff | Bin .../public/fonts/Poppins/poppins-thin.woff2 | Bin {ui => frontend}/public/icones/.gitkeep | 0 {ui => frontend}/public/icones/agecem-logo.svg | 0 {ui => frontend}/public/icones/facebook-icon.svg | 0 {ui => frontend}/public/icones/fermer.svg | 0 {ui => frontend}/public/icones/hamburger-menu.svg | 0 {ui => frontend}/public/icones/instagram-icon.svg | 0 {ui => frontend}/public/images/.gitkeep | 0 {ui => frontend}/public/images/header_agecem.png | Bin {ui => frontend}/public/js/header.js | 0 {ui => frontend}/public/js/index.js | 0 {ui => frontend}/public/public.go | 0 {ui => frontend}/snackbar.html | 0 {ui => frontend}/vie-etudiante-organismes.json | 0 {ui => frontend}/vie-etudiante.html | 0 pkg/agecemorg/handler.go | 4 ++-- pkg/agecemorg/routes.go | 6 +++--- 98 files changed, 9 insertions(+), 12 deletions(-) rename {ui => frontend}/admin-edit.html (100%) rename {ui => frontend}/admin-upload.html (100%) rename {ui => frontend}/admin.html (100%) rename {ui => frontend}/dialog-document-delete.html (100%) rename {ui => frontend}/dialog-document-rename.html (100%) rename {ui => frontend}/dialog.html (100%) rename {ui => frontend}/documentation.html (100%) rename {ui => frontend}/footer.html (100%) rename {ui => frontend}/formulaires.html (100%) rename ui/ui.go => frontend/frontend.go (65%) rename {ui => frontend}/general.html (100%) rename {ui => frontend}/header.html (100%) rename {ui => frontend}/index.html (100%) rename {ui => frontend}/proces-verbaux.html (100%) rename {ui => frontend}/public/css/admin-edit.css (100%) rename {ui => frontend}/public/css/admin-upload.css (100%) rename {ui => frontend}/public/css/admin.css (100%) rename {ui => frontend}/public/css/documentation.css (100%) rename {ui => frontend}/public/css/fonts.css (100%) rename {ui => frontend}/public/css/footer.css (100%) rename {ui => frontend}/public/css/general.css (100%) rename {ui => frontend}/public/css/header.css (100%) rename {ui => frontend}/public/css/index.css (100%) rename {ui => frontend}/public/css/proces-verbaux.css (100%) rename {ui => frontend}/public/css/snackbar.css (100%) rename {ui => frontend}/public/css/vie-etudiante.css (100%) rename {ui => frontend}/public/fonts/.gitkeep (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-black.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-bold.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extrabold.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-extralight.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-light.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-medium.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-regular.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-semibold.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin-italic.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin-italic.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin-italic.woff2 (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin.ttf (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin.woff (100%) rename {ui => frontend}/public/fonts/Poppins/poppins-thin.woff2 (100%) rename {ui => frontend}/public/icones/.gitkeep (100%) rename {ui => frontend}/public/icones/agecem-logo.svg (100%) rename {ui => frontend}/public/icones/facebook-icon.svg (100%) rename {ui => frontend}/public/icones/fermer.svg (100%) rename {ui => frontend}/public/icones/hamburger-menu.svg (100%) rename {ui => frontend}/public/icones/instagram-icon.svg (100%) rename {ui => frontend}/public/images/.gitkeep (100%) rename {ui => frontend}/public/images/header_agecem.png (100%) rename {ui => frontend}/public/js/header.js (100%) rename {ui => frontend}/public/js/index.js (100%) rename {ui => frontend}/public/public.go (100%) rename {ui => frontend}/snackbar.html (100%) rename {ui => frontend}/vie-etudiante-organismes.json (100%) rename {ui => frontend}/vie-etudiante.html (100%) diff --git a/Dockerfile b/Dockerfile index 4fc66a1..3d9b82c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ WORKDIR /go/src/app COPY go.mod go.sum LICENSE ./ ADD cmd/ cmd/ +ADD frontend/ frontend/ ADD pkg/ pkg/ -ADD ui/ ui/ RUN CGO_ENABLED=0 go build -a -o agecem-org \ -ldflags="-X 'git.agecem.com/agecem/agecem-org/pkg/agecemorg/version.version=$agecem_org_version'" \ diff --git a/ui/admin-edit.html b/frontend/admin-edit.html similarity index 100% rename from ui/admin-edit.html rename to frontend/admin-edit.html diff --git a/ui/admin-upload.html b/frontend/admin-upload.html similarity index 100% rename from ui/admin-upload.html rename to frontend/admin-upload.html diff --git a/ui/admin.html b/frontend/admin.html similarity index 100% rename from ui/admin.html rename to frontend/admin.html diff --git a/ui/dialog-document-delete.html b/frontend/dialog-document-delete.html similarity index 100% rename from ui/dialog-document-delete.html rename to frontend/dialog-document-delete.html diff --git a/ui/dialog-document-rename.html b/frontend/dialog-document-rename.html similarity index 100% rename from ui/dialog-document-rename.html rename to frontend/dialog-document-rename.html diff --git a/ui/dialog.html b/frontend/dialog.html similarity index 100% rename from ui/dialog.html rename to frontend/dialog.html diff --git a/ui/documentation.html b/frontend/documentation.html similarity index 100% rename from ui/documentation.html rename to frontend/documentation.html diff --git a/ui/footer.html b/frontend/footer.html similarity index 100% rename from ui/footer.html rename to frontend/footer.html diff --git a/ui/formulaires.html b/frontend/formulaires.html similarity index 100% rename from ui/formulaires.html rename to frontend/formulaires.html diff --git a/ui/ui.go b/frontend/frontend.go similarity index 65% rename from ui/ui.go rename to frontend/frontend.go index be54960..53975fb 100644 --- a/ui/ui.go +++ b/frontend/frontend.go @@ -1,12 +1,9 @@ /* -Package templates contient les fichiers html à templater par l'application. +Package frontend contient les fichiers sources et templates du frontend web -Le contenu sera embedded dans le fichier binaire, dans le but de bundle les -dépendances avec l'application, simplifiant son déploiement. - -Une copie du contenu peut être obtenue par un appel de GetTemplatesFS(). +Les fichiers sont embedded dans l'exécutable afin de simplifier le déploiement. */ -package ui +package frontend import ( "embed" diff --git a/ui/general.html b/frontend/general.html similarity index 100% rename from ui/general.html rename to frontend/general.html diff --git a/ui/header.html b/frontend/header.html similarity index 100% rename from ui/header.html rename to frontend/header.html diff --git a/ui/index.html b/frontend/index.html similarity index 100% rename from ui/index.html rename to frontend/index.html diff --git a/ui/proces-verbaux.html b/frontend/proces-verbaux.html similarity index 100% rename from ui/proces-verbaux.html rename to frontend/proces-verbaux.html diff --git a/ui/public/css/admin-edit.css b/frontend/public/css/admin-edit.css similarity index 100% rename from ui/public/css/admin-edit.css rename to frontend/public/css/admin-edit.css diff --git a/ui/public/css/admin-upload.css b/frontend/public/css/admin-upload.css similarity index 100% rename from ui/public/css/admin-upload.css rename to frontend/public/css/admin-upload.css diff --git a/ui/public/css/admin.css b/frontend/public/css/admin.css similarity index 100% rename from ui/public/css/admin.css rename to frontend/public/css/admin.css diff --git a/ui/public/css/documentation.css b/frontend/public/css/documentation.css similarity index 100% rename from ui/public/css/documentation.css rename to frontend/public/css/documentation.css diff --git a/ui/public/css/fonts.css b/frontend/public/css/fonts.css similarity index 100% rename from ui/public/css/fonts.css rename to frontend/public/css/fonts.css diff --git a/ui/public/css/footer.css b/frontend/public/css/footer.css similarity index 100% rename from ui/public/css/footer.css rename to frontend/public/css/footer.css diff --git a/ui/public/css/general.css b/frontend/public/css/general.css similarity index 100% rename from ui/public/css/general.css rename to frontend/public/css/general.css diff --git a/ui/public/css/header.css b/frontend/public/css/header.css similarity index 100% rename from ui/public/css/header.css rename to frontend/public/css/header.css diff --git a/ui/public/css/index.css b/frontend/public/css/index.css similarity index 100% rename from ui/public/css/index.css rename to frontend/public/css/index.css diff --git a/ui/public/css/proces-verbaux.css b/frontend/public/css/proces-verbaux.css similarity index 100% rename from ui/public/css/proces-verbaux.css rename to frontend/public/css/proces-verbaux.css diff --git a/ui/public/css/snackbar.css b/frontend/public/css/snackbar.css similarity index 100% rename from ui/public/css/snackbar.css rename to frontend/public/css/snackbar.css diff --git a/ui/public/css/vie-etudiante.css b/frontend/public/css/vie-etudiante.css similarity index 100% rename from ui/public/css/vie-etudiante.css rename to frontend/public/css/vie-etudiante.css diff --git a/ui/public/fonts/.gitkeep b/frontend/public/fonts/.gitkeep similarity index 100% rename from ui/public/fonts/.gitkeep rename to frontend/public/fonts/.gitkeep diff --git a/ui/public/fonts/Poppins/poppins-black-italic.ttf b/frontend/public/fonts/Poppins/poppins-black-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-black-italic.ttf rename to frontend/public/fonts/Poppins/poppins-black-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-black-italic.woff b/frontend/public/fonts/Poppins/poppins-black-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-black-italic.woff rename to frontend/public/fonts/Poppins/poppins-black-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-black-italic.woff2 b/frontend/public/fonts/Poppins/poppins-black-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-black-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-black-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-black.ttf b/frontend/public/fonts/Poppins/poppins-black.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-black.ttf rename to frontend/public/fonts/Poppins/poppins-black.ttf diff --git a/ui/public/fonts/Poppins/poppins-black.woff b/frontend/public/fonts/Poppins/poppins-black.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-black.woff rename to frontend/public/fonts/Poppins/poppins-black.woff diff --git a/ui/public/fonts/Poppins/poppins-black.woff2 b/frontend/public/fonts/Poppins/poppins-black.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-black.woff2 rename to frontend/public/fonts/Poppins/poppins-black.woff2 diff --git a/ui/public/fonts/Poppins/poppins-bold-italic.ttf b/frontend/public/fonts/Poppins/poppins-bold-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold-italic.ttf rename to frontend/public/fonts/Poppins/poppins-bold-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-bold-italic.woff b/frontend/public/fonts/Poppins/poppins-bold-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold-italic.woff rename to frontend/public/fonts/Poppins/poppins-bold-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-bold-italic.woff2 b/frontend/public/fonts/Poppins/poppins-bold-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-bold-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-bold.ttf b/frontend/public/fonts/Poppins/poppins-bold.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold.ttf rename to frontend/public/fonts/Poppins/poppins-bold.ttf diff --git a/ui/public/fonts/Poppins/poppins-bold.woff b/frontend/public/fonts/Poppins/poppins-bold.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold.woff rename to frontend/public/fonts/Poppins/poppins-bold.woff diff --git a/ui/public/fonts/Poppins/poppins-bold.woff2 b/frontend/public/fonts/Poppins/poppins-bold.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-bold.woff2 rename to frontend/public/fonts/Poppins/poppins-bold.woff2 diff --git a/ui/public/fonts/Poppins/poppins-extrabold-italic.ttf b/frontend/public/fonts/Poppins/poppins-extrabold-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold-italic.ttf rename to frontend/public/fonts/Poppins/poppins-extrabold-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-extrabold-italic.woff b/frontend/public/fonts/Poppins/poppins-extrabold-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold-italic.woff rename to frontend/public/fonts/Poppins/poppins-extrabold-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-extrabold-italic.woff2 b/frontend/public/fonts/Poppins/poppins-extrabold-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-extrabold-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-extrabold.ttf b/frontend/public/fonts/Poppins/poppins-extrabold.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold.ttf rename to frontend/public/fonts/Poppins/poppins-extrabold.ttf diff --git a/ui/public/fonts/Poppins/poppins-extrabold.woff b/frontend/public/fonts/Poppins/poppins-extrabold.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold.woff rename to frontend/public/fonts/Poppins/poppins-extrabold.woff diff --git a/ui/public/fonts/Poppins/poppins-extrabold.woff2 b/frontend/public/fonts/Poppins/poppins-extrabold.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-extrabold.woff2 rename to frontend/public/fonts/Poppins/poppins-extrabold.woff2 diff --git a/ui/public/fonts/Poppins/poppins-extralight-italic.ttf b/frontend/public/fonts/Poppins/poppins-extralight-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight-italic.ttf rename to frontend/public/fonts/Poppins/poppins-extralight-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-extralight-italic.woff b/frontend/public/fonts/Poppins/poppins-extralight-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight-italic.woff rename to frontend/public/fonts/Poppins/poppins-extralight-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-extralight-italic.woff2 b/frontend/public/fonts/Poppins/poppins-extralight-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-extralight-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-extralight.ttf b/frontend/public/fonts/Poppins/poppins-extralight.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight.ttf rename to frontend/public/fonts/Poppins/poppins-extralight.ttf diff --git a/ui/public/fonts/Poppins/poppins-extralight.woff b/frontend/public/fonts/Poppins/poppins-extralight.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight.woff rename to frontend/public/fonts/Poppins/poppins-extralight.woff diff --git a/ui/public/fonts/Poppins/poppins-extralight.woff2 b/frontend/public/fonts/Poppins/poppins-extralight.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-extralight.woff2 rename to frontend/public/fonts/Poppins/poppins-extralight.woff2 diff --git a/ui/public/fonts/Poppins/poppins-light-italic.ttf b/frontend/public/fonts/Poppins/poppins-light-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-light-italic.ttf rename to frontend/public/fonts/Poppins/poppins-light-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-light-italic.woff b/frontend/public/fonts/Poppins/poppins-light-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-light-italic.woff rename to frontend/public/fonts/Poppins/poppins-light-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-light-italic.woff2 b/frontend/public/fonts/Poppins/poppins-light-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-light-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-light-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-light.ttf b/frontend/public/fonts/Poppins/poppins-light.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-light.ttf rename to frontend/public/fonts/Poppins/poppins-light.ttf diff --git a/ui/public/fonts/Poppins/poppins-light.woff b/frontend/public/fonts/Poppins/poppins-light.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-light.woff rename to frontend/public/fonts/Poppins/poppins-light.woff diff --git a/ui/public/fonts/Poppins/poppins-light.woff2 b/frontend/public/fonts/Poppins/poppins-light.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-light.woff2 rename to frontend/public/fonts/Poppins/poppins-light.woff2 diff --git a/ui/public/fonts/Poppins/poppins-medium-italic.ttf b/frontend/public/fonts/Poppins/poppins-medium-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium-italic.ttf rename to frontend/public/fonts/Poppins/poppins-medium-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-medium-italic.woff b/frontend/public/fonts/Poppins/poppins-medium-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium-italic.woff rename to frontend/public/fonts/Poppins/poppins-medium-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-medium-italic.woff2 b/frontend/public/fonts/Poppins/poppins-medium-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-medium-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-medium.ttf b/frontend/public/fonts/Poppins/poppins-medium.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium.ttf rename to frontend/public/fonts/Poppins/poppins-medium.ttf diff --git a/ui/public/fonts/Poppins/poppins-medium.woff b/frontend/public/fonts/Poppins/poppins-medium.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium.woff rename to frontend/public/fonts/Poppins/poppins-medium.woff diff --git a/ui/public/fonts/Poppins/poppins-medium.woff2 b/frontend/public/fonts/Poppins/poppins-medium.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-medium.woff2 rename to frontend/public/fonts/Poppins/poppins-medium.woff2 diff --git a/ui/public/fonts/Poppins/poppins-regular-italic.ttf b/frontend/public/fonts/Poppins/poppins-regular-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular-italic.ttf rename to frontend/public/fonts/Poppins/poppins-regular-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-regular-italic.woff b/frontend/public/fonts/Poppins/poppins-regular-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular-italic.woff rename to frontend/public/fonts/Poppins/poppins-regular-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-regular-italic.woff2 b/frontend/public/fonts/Poppins/poppins-regular-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-regular-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-regular.ttf b/frontend/public/fonts/Poppins/poppins-regular.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular.ttf rename to frontend/public/fonts/Poppins/poppins-regular.ttf diff --git a/ui/public/fonts/Poppins/poppins-regular.woff b/frontend/public/fonts/Poppins/poppins-regular.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular.woff rename to frontend/public/fonts/Poppins/poppins-regular.woff diff --git a/ui/public/fonts/Poppins/poppins-regular.woff2 b/frontend/public/fonts/Poppins/poppins-regular.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-regular.woff2 rename to frontend/public/fonts/Poppins/poppins-regular.woff2 diff --git a/ui/public/fonts/Poppins/poppins-semibold-italic.ttf b/frontend/public/fonts/Poppins/poppins-semibold-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold-italic.ttf rename to frontend/public/fonts/Poppins/poppins-semibold-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-semibold-italic.woff b/frontend/public/fonts/Poppins/poppins-semibold-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold-italic.woff rename to frontend/public/fonts/Poppins/poppins-semibold-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-semibold-italic.woff2 b/frontend/public/fonts/Poppins/poppins-semibold-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-semibold-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-semibold.ttf b/frontend/public/fonts/Poppins/poppins-semibold.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold.ttf rename to frontend/public/fonts/Poppins/poppins-semibold.ttf diff --git a/ui/public/fonts/Poppins/poppins-semibold.woff b/frontend/public/fonts/Poppins/poppins-semibold.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold.woff rename to frontend/public/fonts/Poppins/poppins-semibold.woff diff --git a/ui/public/fonts/Poppins/poppins-semibold.woff2 b/frontend/public/fonts/Poppins/poppins-semibold.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-semibold.woff2 rename to frontend/public/fonts/Poppins/poppins-semibold.woff2 diff --git a/ui/public/fonts/Poppins/poppins-thin-italic.ttf b/frontend/public/fonts/Poppins/poppins-thin-italic.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin-italic.ttf rename to frontend/public/fonts/Poppins/poppins-thin-italic.ttf diff --git a/ui/public/fonts/Poppins/poppins-thin-italic.woff b/frontend/public/fonts/Poppins/poppins-thin-italic.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin-italic.woff rename to frontend/public/fonts/Poppins/poppins-thin-italic.woff diff --git a/ui/public/fonts/Poppins/poppins-thin-italic.woff2 b/frontend/public/fonts/Poppins/poppins-thin-italic.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin-italic.woff2 rename to frontend/public/fonts/Poppins/poppins-thin-italic.woff2 diff --git a/ui/public/fonts/Poppins/poppins-thin.ttf b/frontend/public/fonts/Poppins/poppins-thin.ttf similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin.ttf rename to frontend/public/fonts/Poppins/poppins-thin.ttf diff --git a/ui/public/fonts/Poppins/poppins-thin.woff b/frontend/public/fonts/Poppins/poppins-thin.woff similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin.woff rename to frontend/public/fonts/Poppins/poppins-thin.woff diff --git a/ui/public/fonts/Poppins/poppins-thin.woff2 b/frontend/public/fonts/Poppins/poppins-thin.woff2 similarity index 100% rename from ui/public/fonts/Poppins/poppins-thin.woff2 rename to frontend/public/fonts/Poppins/poppins-thin.woff2 diff --git a/ui/public/icones/.gitkeep b/frontend/public/icones/.gitkeep similarity index 100% rename from ui/public/icones/.gitkeep rename to frontend/public/icones/.gitkeep diff --git a/ui/public/icones/agecem-logo.svg b/frontend/public/icones/agecem-logo.svg similarity index 100% rename from ui/public/icones/agecem-logo.svg rename to frontend/public/icones/agecem-logo.svg diff --git a/ui/public/icones/facebook-icon.svg b/frontend/public/icones/facebook-icon.svg similarity index 100% rename from ui/public/icones/facebook-icon.svg rename to frontend/public/icones/facebook-icon.svg diff --git a/ui/public/icones/fermer.svg b/frontend/public/icones/fermer.svg similarity index 100% rename from ui/public/icones/fermer.svg rename to frontend/public/icones/fermer.svg diff --git a/ui/public/icones/hamburger-menu.svg b/frontend/public/icones/hamburger-menu.svg similarity index 100% rename from ui/public/icones/hamburger-menu.svg rename to frontend/public/icones/hamburger-menu.svg diff --git a/ui/public/icones/instagram-icon.svg b/frontend/public/icones/instagram-icon.svg similarity index 100% rename from ui/public/icones/instagram-icon.svg rename to frontend/public/icones/instagram-icon.svg diff --git a/ui/public/images/.gitkeep b/frontend/public/images/.gitkeep similarity index 100% rename from ui/public/images/.gitkeep rename to frontend/public/images/.gitkeep diff --git a/ui/public/images/header_agecem.png b/frontend/public/images/header_agecem.png similarity index 100% rename from ui/public/images/header_agecem.png rename to frontend/public/images/header_agecem.png diff --git a/ui/public/js/header.js b/frontend/public/js/header.js similarity index 100% rename from ui/public/js/header.js rename to frontend/public/js/header.js diff --git a/ui/public/js/index.js b/frontend/public/js/index.js similarity index 100% rename from ui/public/js/index.js rename to frontend/public/js/index.js diff --git a/ui/public/public.go b/frontend/public/public.go similarity index 100% rename from ui/public/public.go rename to frontend/public/public.go diff --git a/ui/snackbar.html b/frontend/snackbar.html similarity index 100% rename from ui/snackbar.html rename to frontend/snackbar.html diff --git a/ui/vie-etudiante-organismes.json b/frontend/vie-etudiante-organismes.json similarity index 100% rename from ui/vie-etudiante-organismes.json rename to frontend/vie-etudiante-organismes.json diff --git a/ui/vie-etudiante.html b/frontend/vie-etudiante.html similarity index 100% rename from ui/vie-etudiante.html rename to frontend/vie-etudiante.html diff --git a/pkg/agecemorg/handler.go b/pkg/agecemorg/handler.go index 3988db1..29de956 100644 --- a/pkg/agecemorg/handler.go +++ b/pkg/agecemorg/handler.go @@ -12,7 +12,7 @@ import ( "codeberg.org/vlbeaudoin/pave/v2" "codeberg.org/vlbeaudoin/voki/v3" - "git.agecem.com/agecem/agecem-org/v3/ui" + "git.agecem.com/agecem/agecem-org/v3/frontend" "github.com/labstack/echo/v4" "github.com/minio/minio-go/v7" ) @@ -605,7 +605,7 @@ func HandleVieEtudiante(c echo.Context) error { Error string } - if err := json.Unmarshal([]byte(ui.OrganismesJSON()), &data.Data.Organismes); err != nil { + if err := json.Unmarshal([]byte(frontend.OrganismesJSON()), &data.Data.Organismes); err != nil { data.Error = err.Error() log.Println("json error in vie-etudiante:", err) } diff --git a/pkg/agecemorg/routes.go b/pkg/agecemorg/routes.go index 52a73f7..c98ddba 100644 --- a/pkg/agecemorg/routes.go +++ b/pkg/agecemorg/routes.go @@ -7,8 +7,8 @@ import ( "net/http" "codeberg.org/vlbeaudoin/pave/v2" - "git.agecem.com/agecem/agecem-org/v3/ui" - "git.agecem.com/agecem/agecem-org/v3/ui/public" + "git.agecem.com/agecem/agecem-org/v3/frontend" + "git.agecem.com/agecem/agecem-org/v3/frontend/public" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" ) @@ -16,7 +16,7 @@ import ( func RunServer(cfg Config) { e := echo.New() - e.Renderer = ui.NewRenderer() + e.Renderer = frontend.NewRenderer() e.Pre(middleware.RemoveTrailingSlash())