agecem/babillard
5
0
Fork 0
Code Issues 5 Pull requests Releases Packages 1 Activity

refactor!: Déplacer fichiers statiques vers embed

Browse source 
Bump golang -> `1.21.4`

Bump alpine -> `3.18.4`

Exposer fichiers html sur `/*`

Exposer fichiers css sur `/public/css/*`

Exposer fichiers js sur `/public/js/*`

Retirer prefix cgo de build step

Ajouter `public/` à build step

Retirer `public/static/` de `static/` dans run step

Retirer mentions à static_dir dans `cmd/server.go`

Retirer flag `server.static_dir`, `--static_dir` de serverCmd

Retirer paramètre `static_dir` de `runServer`

Remplacer middleware `RemoveTrailingSlash` -> `AddTrailingSlash`

Ajouter `echo.Group`s pour exposition statique avec config

Refactor déclaration de routes api derrière groupe `/api`

Fix références de fichiers js et css dans `index.html` et `slider.js`

BREAKING: static_dir n'est plus utilisé, les fichiers sont maintenant embedded
This commit is contained in:
Victor Lacasse-Beaudoin 2023-11-29 17:15:27 -05:00
parent b68859f90b
commit 996aa67984
7 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

0
public/static/style.css → public/css/style.css
View file

18
public/embed.go
View file

@ -2,9 +2,17 @@ package public
import "embed"
//go:embed static/*
var embedFS embed.FS
//go:embed html/*
var htmlFS embed.FS
func GetEmbedFS() embed.FS {
return embedFS
}
func HTMLFS() embed.FS { return htmlFS }
//go:embed css/*
var cssFS embed.FS
func CSSFS() embed.FS { return cssFS }
//go:embed js/*
var jsFS embed.FS
func JSFS() embed.FS { return jsFS }

4
public/static/index.html → public/html/index.html
View file

@ -5,13 +5,13 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="slider.js"></script>
<script src="/public/js/slider.js"></script>
<!-- BROKEN, brise slider.js quand inclu
<script src="text.js"></script>
!-->
<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="/public/css/style.css">
</head>
<body>

2
public/static/slider.js → public/js/slider.js
View file

@ -6,7 +6,7 @@ function afficherIndex() {
}
function afficherImage() {
$('#image').attr('src', "api/contenu/"+images[indexImages]);
$('#image').attr('src', "/api/contenu/"+images[indexImages]);
}
function augmenterIndex() {

0
public/static/text.js → public/js/text.js
View file