diff --git a/Dockerfile b/Dockerfile index fe1894a..a93f3cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,9 @@ label repo="https://git.agecem.com/agecem/babillard" workdir /go/src/app -copy go.mod go.sum ./ +copy go.mod go.sum LICENSE cmd.go config.go contenu.go data.go handlers.go response.go ./ add cmd/ cmd/ -add pkg/ pkg/ add ui/ ui/ run CGO_ENABLED=0 go build -a ./cmd/babillard/ @@ -19,8 +18,6 @@ run CGO_ENABLED=0 go build -a ./cmd/babillard/ from alpine:3.21 -run apk update && apk upgrade --no-cache - workdir /app add contenu/ contenu/ diff --git a/pkg/babillard/cmd.go b/cmd.go similarity index 70% rename from pkg/babillard/cmd.go rename to cmd.go index 17d1726..ef86da6 100644 --- a/pkg/babillard/cmd.go +++ b/cmd.go @@ -2,7 +2,6 @@ package babillard import ( "flag" - "os" "codeberg.org/vlbeaudoin/couleuvre" ) @@ -10,7 +9,7 @@ import ( var app couleuvre.App[Config] func init() { - app = couleuvre.NewApp[Config]("BABILLARD_", ".", "_") + app = couleuvre.App[Config]{EnvPrefix: "babillard"} flag.StringVar(&app.Config.ServerContenuDir, ServerContenuDirName, ServerContenuDirDefault, ServerContenuDirDescription) flag.IntVar(&app.Config.ServerPort, ServerPortName, ServerPortDefault, ServerPortDescription) @@ -31,31 +30,25 @@ const ( ServerCmdDesc = "Démarrer le serveur web" ) -func ServerCmdExecuter() error { +func ServerCmdExecuter(args ...string) error { RunServer(app.Config) return nil } func Execute() error { + if err := app.AddCommands(couleuvre.Command{ + Name: ServerCmdName, + Description: ServerCmdDesc, + Executer: couleuvre.ExecuterFunc(ServerCmdExecuter), + }); err != nil { + return err + } + if err := app.Parse(); err != nil { return err } - if err := app.NewCommand(ServerCmdName, ServerCmdDesc, ServerCmdExecuter); err != nil { - return err - } - - var commandName string - if len(os.Args) > 1 { - commandName = flag.Arg(0) - } - - cmd, err := app.ParseCommand(commandName) - if err != nil { - return err - } - - if err := cmd.Execute(); err != nil { + if err := app.Execute(flag.Args()...); err != nil { return err } diff --git a/cmd/babillard/main.go b/cmd/babillard/main.go index a8195a2..879050d 100644 --- a/cmd/babillard/main.go +++ b/cmd/babillard/main.go @@ -24,7 +24,7 @@ package main import ( "log" - "git.agecem.com/agecem/babillard/v7/pkg/babillard" + "git.agecem.com/agecem/babillard/v8" ) func main() { diff --git a/pkg/babillard/config.go b/config.go similarity index 100% rename from pkg/babillard/config.go rename to config.go diff --git a/pkg/babillard/contenu.go b/contenu.go similarity index 100% rename from pkg/babillard/contenu.go rename to contenu.go diff --git a/pkg/babillard/data.go b/data.go similarity index 100% rename from pkg/babillard/data.go rename to data.go diff --git a/go.mod b/go.mod index 1af488a..8a2c3f6 100644 --- a/go.mod +++ b/go.mod @@ -1,27 +1,26 @@ -module git.agecem.com/agecem/babillard/v7 +module git.agecem.com/agecem/babillard/v8 -go 1.23 +go 1.23.0 + +toolchain go1.23.6 require ( - codeberg.org/vlbeaudoin/couleuvre v0.10.0 + codeberg.org/vlbeaudoin/couleuvre v0.13.0 github.com/labstack/echo/v4 v4.13.3 ) require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/kr/text v0.2.0 // indirect + github.com/goccy/go-yaml v1.16.0 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.32.0 // indirect - golang.org/x/net v0.34.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect - golang.org/x/time v0.9.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + golang.org/x/crypto v0.36.0 // indirect + golang.org/x/net v0.38.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect + golang.org/x/time v0.11.0 // indirect ) diff --git a/go.sum b/go.sum index 95cf8b9..2c1cb61 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,9 @@ -codeberg.org/vlbeaudoin/couleuvre v0.10.0 h1:Uk6795M7ziZPu1Fv8KgGNEbRjc1u4NPdPU4Tip0IpHU= -codeberg.org/vlbeaudoin/couleuvre v0.10.0/go.mod h1:+M8nPA/3LknsY72RP0ZHCZycQ1SPxxRoXpnyHeSNE7U= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +codeberg.org/vlbeaudoin/couleuvre v0.13.0 h1:N2gAzpItFthQ0aPzMQjntRsrqrEXwuo0u6VHSGA/V6o= +codeberg.org/vlbeaudoin/couleuvre v0.13.0/go.mod h1:0RvzStph7J4/M+mZb903hn4GSYrTBjXYVJv72Pwpa90= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/goccy/go-yaml v1.16.0 h1:d7m1G7A0t+logajVtklHfDYJs2Et9g3gHwdBNNFou0w= +github.com/goccy/go-yaml v1.16.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= @@ -15,31 +12,24 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= -golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/babillard/handlers.go b/handlers.go similarity index 97% rename from pkg/babillard/handlers.go rename to handlers.go index 73bd856..f15bf78 100644 --- a/pkg/babillard/handlers.go +++ b/handlers.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - "git.agecem.com/agecem/babillard/v7/ui" + "git.agecem.com/agecem/babillard/v8/ui" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" ) diff --git a/kubernetes/deployment.yaml b/k8s/deployment.yaml similarity index 100% rename from kubernetes/deployment.yaml rename to k8s/deployment.yaml diff --git a/kubernetes/service.yaml b/k8s/service.yaml similarity index 100% rename from kubernetes/service.yaml rename to k8s/service.yaml diff --git a/pkg/babillard/response.go b/response.go similarity index 100% rename from pkg/babillard/response.go rename to response.go diff --git a/ui/js/slider.js b/ui/js/slider.js index dbe227e..827aa6d 100644 --- a/ui/js/slider.js +++ b/ui/js/slider.js @@ -10,15 +10,14 @@ function afficherImage() { } function augmenterIndex() { - if (indexImages >= images.length - 1) { - indexImages = 0; - } else { indexImages ++; - } } function executionLoop(){ - //afficherIndex(); + if (indexImages >= images.length) { + location.reload(); + } + afficherImage(); augmenterIndex(); } @@ -41,5 +40,6 @@ function obtenirContenu(){ $(function(){ obtenirContenu(); + executionLoop(); var executionInterval = setInterval(executionLoop, (Math.floor(Math.random() * 6)+15)*1000); });