Merge pull request 'feat: renommer package ui pour frontend' (#245) from vlbeaudoin/feat/ui-to-frontend into main
Reviewed-on: #245
|
@ -8,8 +8,8 @@ WORKDIR /go/src/app
|
||||||
|
|
||||||
COPY go.mod go.sum LICENSE ./
|
COPY go.mod go.sum LICENSE ./
|
||||||
ADD cmd/ cmd/
|
ADD cmd/ cmd/
|
||||||
|
ADD frontend/ frontend/
|
||||||
ADD pkg/ pkg/
|
ADD pkg/ pkg/
|
||||||
ADD ui/ ui/
|
|
||||||
|
|
||||||
RUN CGO_ENABLED=0 go build -a -o agecem-org \
|
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'" \
|
-ldflags="-X 'git.agecem.com/agecem/agecem-org/pkg/agecemorg/version.version=$agecem_org_version'" \
|
||||||
|
|
|
@ -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
|
Les fichiers sont embedded dans l'exécutable afin de simplifier le déploiement.
|
||||||
dépendances avec l'application, simplifiant son déploiement.
|
|
||||||
|
|
||||||
Une copie du contenu peut être obtenue par un appel de GetTemplatesFS().
|
|
||||||
*/
|
*/
|
||||||
package ui
|
package frontend
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 818 B After Width: | Height: | Size: 818 B |
Before Width: | Height: | Size: 965 B After Width: | Height: | Size: 965 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
@ -12,7 +12,7 @@ import (
|
||||||
|
|
||||||
"codeberg.org/vlbeaudoin/pave/v2"
|
"codeberg.org/vlbeaudoin/pave/v2"
|
||||||
"codeberg.org/vlbeaudoin/voki/v3"
|
"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/labstack/echo/v4"
|
||||||
"github.com/minio/minio-go/v7"
|
"github.com/minio/minio-go/v7"
|
||||||
)
|
)
|
||||||
|
@ -605,7 +605,7 @@ func HandleVieEtudiante(c echo.Context) error {
|
||||||
Error string
|
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()
|
data.Error = err.Error()
|
||||||
log.Println("json error in vie-etudiante:", err)
|
log.Println("json error in vie-etudiante:", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,8 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"codeberg.org/vlbeaudoin/pave/v2"
|
"codeberg.org/vlbeaudoin/pave/v2"
|
||||||
"git.agecem.com/agecem/agecem-org/v3/ui"
|
"git.agecem.com/agecem/agecem-org/v3/frontend"
|
||||||
"git.agecem.com/agecem/agecem-org/v3/ui/public"
|
"git.agecem.com/agecem/agecem-org/v3/frontend/public"
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
"github.com/labstack/echo/v4/middleware"
|
"github.com/labstack/echo/v4/middleware"
|
||||||
)
|
)
|
||||||
|
@ -16,7 +16,7 @@ import (
|
||||||
func RunServer(cfg Config) {
|
func RunServer(cfg Config) {
|
||||||
e := echo.New()
|
e := echo.New()
|
||||||
|
|
||||||
e.Renderer = ui.NewRenderer()
|
e.Renderer = frontend.NewRenderer()
|
||||||
|
|
||||||
e.Pre(middleware.RemoveTrailingSlash())
|
e.Pre(middleware.RemoveTrailingSlash())
|
||||||
|
|
||||||
|
|