Dockerfile

@@ -1,27 +1,30 @@
-from golang:1.23 as build
+FROM golang:1.23 as build
 
-label author="Victor Lacasse-Beaudoin <vlbeaudoin@agecem.org>"
+LABEL author="Victor Lacasse-Beaudoin <vlbeaudoin@agecem.org>"
-label license="MIT"
+LABEL license="MIT"
-label licensee="AGECEM"
+LABEL licensee="AGECEM"
-label repo="https://git.agecem.com/agecem/babillard"
+LABEL repo="https://git.agecem.com/agecem/babillard"
 
-workdir /go/src/app
+WORKDIR /go/src/app
 
-copy go.mod go.sum LICENSE cmd.go config.go contenu.go data.go handlers.go response.go ./
+COPY go.mod go.sum ./
 
-add cmd/ cmd/
+ADD cmd/ cmd/
-add ui/ ui/
+ADD pkg/ pkg/
+ADD ui/ ui/
 
-run CGO_ENABLED=0 go build -a ./cmd/babillard/
+RUN CGO_ENABLED=0 go build -a ./cmd/babillard/
 
 # Alpine
 
-from alpine:3.21
+FROM alpine:3.21
 
-workdir /app
+RUN apk update && apk upgrade --no-cache
 
-add contenu/ contenu/
+WORKDIR /app
 
-copy --from=build /go/src/app/babillard /usr/bin/babillard
+ADD contenu/ contenu/
 
-cmd ["babillard", "server"]
+COPY --from=build /go/src/app/babillard /usr/bin/babillard
+
+CMD ["babillard", "server"]

cmd/babillard/main.go

@@ -24,7 +24,7 @@ package main
 import (
 	"log"
 
-	"git.agecem.com/agecem/babillard/v8"
+	"git.agecem.com/agecem/babillard/v7/pkg/babillard"
 )
 
 func main() {

data.go

@@ -1,42 +0,0 @@
-package babillard
-
-import (
-	"fmt"
-	"os"
-)
-
-var forbiddenFiles = []string{".gitkeep", "messages.txt", "Thumbs.db"}
-
-func ListContenu(path string) (files []string, err error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	stats, err := file.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	if !stats.IsDir() {
-		return nil, fmt.Errorf("contenu '%s' n'est pas un répertoire", path)
-	}
-
-	fileInfos, err := file.Readdir(-1)
-	if err != nil {
-		return nil, err
-	}
-
-fileLoop:
-	for _, fileInfo := range fileInfos {
-		for _, forbiddenFile := range forbiddenFiles {
-			if fileInfo.Name() == forbiddenFile {
-				continue fileLoop
-			}
-		}
-		files = append(files, fileInfo.Name())
-	}
-
-	return files, nil
-}

go.mod

@@ -1,26 +1,27 @@
-module git.agecem.com/agecem/babillard/v8
+module git.agecem.com/agecem/babillard/v7
 
-go 1.23.0
+go 1.23
-
-toolchain go1.23.6
 
 require (
-	codeberg.org/vlbeaudoin/couleuvre v0.13.0
+	codeberg.org/vlbeaudoin/couleuvre v0.10.0
 	github.com/labstack/echo/v4 v4.13.3
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/goccy/go-yaml v1.16.0 // indirect
+	github.com/kr/text v0.2.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.36.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,9 +1,12 @@
-codeberg.org/vlbeaudoin/couleuvre v0.13.0 h1:N2gAzpItFthQ0aPzMQjntRsrqrEXwuo0u6VHSGA/V6o=
+codeberg.org/vlbeaudoin/couleuvre v0.10.0 h1:Uk6795M7ziZPu1Fv8KgGNEbRjc1u4NPdPU4Tip0IpHU=
-codeberg.org/vlbeaudoin/couleuvre v0.13.0/go.mod h1:0RvzStph7J4/M+mZb903hn4GSYrTBjXYVJv72Pwpa90=
+codeberg.org/vlbeaudoin/couleuvre v0.10.0/go.mod h1:+M8nPA/3LknsY72RP0ZHCZycQ1SPxxRoXpnyHeSNE7U=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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/goccy/go-yaml v1.16.0 h1:d7m1G7A0t+logajVtklHfDYJs2Et9g3gHwdBNNFou0w=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/goccy/go-yaml v1.16.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+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/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=
@@ -12,24 +15,31 @@ 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.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+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=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

kubernetes/deployment.yaml

@@ -17,7 +17,6 @@ spec:
       containers:
       - name: babillard
         image: git.agecem.com/agecem/babillard:latest
-        imagePullPolicy: Always
         ports:
         - containerPort: 8080
         volumeMounts:

pkg/babillard/cmd.go

@@ -2,6 +2,7 @@ package babillard
 
 import (
 	"flag"
+	"os"
 
 	"codeberg.org/vlbeaudoin/couleuvre"
 )
@@ -9,7 +10,7 @@ import (
 var app couleuvre.App[Config]
 
 func init() {
-	app = couleuvre.App[Config]{EnvPrefix: "babillard"}
+	app = couleuvre.NewApp[Config]("BABILLARD_", ".", "_")
 
 	flag.StringVar(&app.Config.ServerContenuDir, ServerContenuDirName, ServerContenuDirDefault, ServerContenuDirDescription)
 	flag.IntVar(&app.Config.ServerPort, ServerPortName, ServerPortDefault, ServerPortDescription)
@@ -30,25 +31,31 @@ const (
 	ServerCmdDesc = "Démarrer le serveur web"
 )
 
-func ServerCmdExecuter(args ...string) error {
+func ServerCmdExecuter() error {
-	RunServer(app.Config)
+	RunServer(app.Config.ServerContenuDir, app.Config.ServerPort)
 	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.Execute(flag.Args()...); err != nil {
+	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 {
 		return err
 	}
 

pkg/babillard/contenu.go

@@ -9,8 +9,6 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-// pre-v2
-
 type ContenuHandler struct {
 	ContenuDir string
 }
@@ -45,24 +43,3 @@ func (h ContenuHandler) HandleAPIContenuFile(c echo.Context) error {
 
 	return c.File(fmt.Sprintf("%s/%s", contenu_dir, filename))
 }
-
-// v2
-
-func APIv2ListContenu(cfg Config) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		files, err := ListContenu(cfg.ServerContenuDir)
-		if err != nil {
-			return c.JSON(http.StatusInternalServerError, ErrorResponse{Error: err.Error()})
-		}
-
-		return c.JSON(http.StatusOK, NewContenuResponse(files))
-	}
-}
-
-// ui
-
-func UIContenuFichier(cfg Config) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		return c.File(fmt.Sprintf("%s/%s", cfg.ServerContenuDir, c.Param("fichier")))
-	}
-}

pkg/babillard/data.go

@@ -0,0 +1,24 @@
+package babillard
+
+import "os"
+
+func ListContenu(path string) ([]string, error) {
+	var files []string
+	f, err_open := os.Open(path)
+	defer f.Close()
+
+	if err_open != nil {
+		return nil, err_open
+	}
+	fileInfo, err_read := f.Readdir(-1)
+	if err_read != nil {
+		return nil, err_read
+	}
+
+	for _, file := range fileInfo {
+		if file.Name() != ".gitkeep" && file.Name() != "messages.txt" {
+			files = append(files, file.Name())
+		}
+	}
+	return files, nil
+}

pkg/babillard/handlers.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"git.agecem.com/agecem/babillard/v8/ui"
+	"git.agecem.com/agecem/babillard/v7/ui"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )
@@ -18,16 +18,12 @@ API Specifications
 '/api'                    | GET | Affiche les spécifications API
 '/api/contenu'            | GET | Affiche le nom des fichiers dans 'contenu/'
 '/api/contenu/{filename}' | GET | Affiche le fichier 'contenu/{filename}'
------
+-----`
 
-v2
---
-'/api/v2/contenu'         | GET | Affiche les noms des fichiers dans 'contenu/'
-`
 	return c.String(http.StatusOK, apispec)
 }
 
-func RunServer(cfg Config) {
+func RunServer(contenuDir string, serverPort int) {
 	log.Print("[I] Starting webserver")
 
 	e := echo.New()
@@ -49,17 +45,11 @@ func RunServer(cfg Config) {
 
 	groupAPI := e.Group("/api")
 
-	contenuHandler := NewContenuHandler(cfg.ServerContenuDir)
+	contenuHandler := NewContenuHandler(contenuDir)
 
 	groupAPI.GET("/", HandleAPIShow)
 	groupAPI.GET("/contenu/", contenuHandler.HandleAPIContenuList)
 	groupAPI.GET("/contenu/:filename/", contenuHandler.HandleAPIContenuFile)
 
-	groupAPI.GET("/v2/contenu/", APIv2ListContenu(cfg))
+	e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", serverPort)))
-
-	groupUI := e.Group("/ui")
-
-	groupUI.GET("/contenu/:fichier/", UIContenuFichier(cfg))
-
-	e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", cfg.ServerPort)))
 }

response.go

@@ -1,20 +0,0 @@
-package babillard
-
-type ErrorResponse struct {
-	Error string
-}
-
-type MessageResponse struct {
-	Message string
-}
-
-type ContenuResponse struct {
-	Data struct {
-		Contenu []string
-	}
-}
-
-func NewContenuResponse(fichiers []string) (response ContenuResponse) {
-	response.Data.Contenu = fichiers
-	return
-}

ui/css/style.css

@@ -20,3 +20,60 @@ embed {
     flex: 1;
     min-height: 0;
 }
+
+#bar {
+    width: 100%;
+    background-image: linear-gradient(to right, #033ead, #3093d1);
+    color: white;
+    font-family: 'Roboto', sans-serif;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    min-height: 75px;
+}
+
+img#bar-bg {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+}
+
+#time {
+    font-size: 300%;
+    height: 53px;
+}
+
+#text-content {
+    white-space: nowrap;
+    z-index: 1;
+    display: block;
+    height: 100%;
+    padding-top: 55px;
+    position: relative;
+}
+
+#text-container {
+    height: 100%;
+    background-image: linear-gradient(to right, #033ead, #3093d1);
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    flex-grow: 1;
+}
+
+#text-content div {
+    display: block;
+    position: fixed;
+    height: 100%;
+}
+
+#date-time {
+    display: flex;
+    flex-flow: column;
+    align-items: center;
+    height: 100%;
+    background-color: #033ead;
+    z-index: 1;
+    width: 225px;
+}

ui/embed.go

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

ui/html/index.html

@@ -1,17 +1,43 @@
 <html>
 
   <head>
-    <title>AGECEM | babillard</title>
+    <title>AGECEM | slider</title>
+
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-    <link rel="stylesheet" href="/public/css/style.css">
+
-    <!--<script src="/public/js/carousel.js"></script>--!>
     <script src="/public/js/slider.js"></script>
+
+    <!-- BROKEN, brise slider.js quand inclu
+    <script src="text.js"></script>
+    !-->
+
+    <link rel="stylesheet" href="/public/css/style.css">
   </head>
 
   <body>
+    <p id="debug"></p>
+
     <div id="contenu">
       <embed id="image"/>
     </div>
+
+    <!-- BROKEN
+    <div id="bar">
+
+      <div id="date-time">
+          <div id="time"></div>
+          <div id="date"></div>
+      </div>
+
+      <div id="text-container">
+          <div id="text-content">
+            <div>Ce texte sera remplacé par jQuery!</div>
+          </div>
+      </div>
+
+  </div>
+  --!>
+
   </body>
 
 </html>

ui/js/carousel.js

@@ -1,32 +0,0 @@
-// 2025-02 Victor Lacasse-Beaudoin, AGECEM
-//
-// Carousel d'images à afficher sur https://babillard.agecem.com/ ainsi que
-// sur la télévision du Centre-Multi Services de l'AGECEM.
-//
-// WIP
-async function getContenu() {
-    const url = "/api/v2/contenu/";
-    try {
-        const response = await fetch(url);
-        if (!response.ok) {
-            //TODO start interval then refresh page to try again
-            throw new Error(`Response status: ${response.status}`);
-        }
-        json = await response.json();
-        console.log("[i] got contenu");
-        console.log(json);
-
-        //startCarousel(json);
-        }
-    catch (error) {
-        console.error(error.message);
-    }
-}
-
-function run(){
-    console.log("[i] run");
-
-    getContenu();
-}
-
-run();

ui/js/slider.js

@@ -10,14 +10,15 @@ function afficherImage() {
 }
 
 function augmenterIndex() {
+  if (indexImages >= images.length - 1) {
+    indexImages = 0;
+  } else {
     indexImages ++;
   }
+}
 
 function executionLoop(){
-  if (indexImages >= images.length) {
+  //afficherIndex();
-      location.reload();
-  }
-
   afficherImage();
   augmenterIndex();
 }
@@ -40,6 +41,5 @@ function obtenirContenu(){
 
 $(function(){
   obtenirContenu();
-  executionLoop();
   var executionInterval = setInterval(executionLoop, (Math.floor(Math.random() * 6)+15)*1000);
 });

ui/js/text.js

@@ -0,0 +1,65 @@
+// VARS
+// Vitesses
+var vitesseTexte =  4000; // En millisecondes
+
+// Coordonnées
+var pointInitial = '100%';
+var pointDestination = '-=2000px';
+
+// Messages
+var messageDiv = '#text-content div'
+var messages = [];
+var indexMessages = 0;
+
+var fontSize;
+var fontSizeLength;
+
+// FUNCS
+function animerTexte(){
+  // Diriger le texte vers la droite jusqu'à `pointDestination'.
+  // Récursivement reset la position du texte.
+  $(messageDiv).animate({left: pointDestination}, vitesseTexte, 'linear', resetTexte);
+}
+
+function resetTexte(){
+  // Remettre le texte au point initial
+  $(messageDiv).css('left', pointInitial);
+
+  // Récursivement animer le texte
+  animerTexte();
+}
+
+function updateTexte(){
+  var message = messages[indexMessages];
+
+  $(messageDiv).text(message);
+
+  augmenterIndex();
+}
+
+function augmenterIndex() {
+  if (indexMessages >= messages.length - 1) {
+    indexMessages = 0;
+  } else {
+    indexMessages ++;
+  }
+}
+
+function initialiserMessages(){
+  fontSize = $(messageDiv).css('fontSize');
+  fontSizeLength = fontSize.length;
+
+  // TODO Importer messages
+  messages = ['hello, world!'];
+
+
+  // TODO pointDestination = -1 * longueurMessage
+  //pointDestination = messages[0].width * fontSize.substring(fontSize.length-2);
+  pointDestination = messages[indexMessages].width;
+}
+
+// EXEC
+$(function(){
+  //initialiserMessages();
+  resetTexte();
+});