Bump root version to v4
Remove all files from v3 Move all files from v4/ to project root
This commit is contained in:
parent
3c0d45fa04
commit
9a0bf87e7b
40 changed files with 423 additions and 2130 deletions
10
web/embed.go
Normal file
10
web/embed.go
Normal file
|
@ -0,0 +1,10 @@
|
|||
package web
|
||||
|
||||
import "embed"
|
||||
|
||||
//go:embed templates/*
|
||||
var templatesFS embed.FS
|
||||
|
||||
func GetTemplates() embed.FS {
|
||||
return templatesFS
|
||||
}
|
107
web/templates/index.html
Normal file
107
web/templates/index.html
Normal file
|
@ -0,0 +1,107 @@
|
|||
{{ define "index-html" }}
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>
|
||||
AGECEM | Bottin
|
||||
</title>
|
||||
|
||||
<style>
|
||||
body {
|
||||
/* Center the form on the page */
|
||||
margin: 0 auto;
|
||||
width: 400px;
|
||||
/* Form outline */
|
||||
padding: 1em;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 1em;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
form li + li {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
label {
|
||||
/* Uniform size & alignment */
|
||||
display: inline-block;
|
||||
width: 90px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
input,
|
||||
textarea {
|
||||
/* To make sure that all text fields have the same font settings
|
||||
By default, textareas have a monospace font */
|
||||
font: 1em sans-serif;
|
||||
|
||||
/* Uniform text field size */
|
||||
width: 300px;
|
||||
box-sizing: border-box;
|
||||
|
||||
/* Match form field borders */
|
||||
border: 1px solid #999;
|
||||
}
|
||||
|
||||
input:focus,
|
||||
textarea:focus {
|
||||
/* Additional highlight for focused elements */
|
||||
border-color: #000;
|
||||
}
|
||||
|
||||
textarea {
|
||||
/* Align multiline text fields with their labels */
|
||||
vertical-align: top;
|
||||
|
||||
/* Provide space to type some text */
|
||||
height: 5em;
|
||||
}
|
||||
|
||||
.button {
|
||||
/* Align buttons with the text fields */
|
||||
padding-left: 90px; /* same size as the label elements */
|
||||
}
|
||||
|
||||
button {
|
||||
/* This extra margin represent roughly the same space as the space
|
||||
between the labels and their text fields */
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h2>
|
||||
Bottin des membres de l'AGECEM
|
||||
</h2>
|
||||
|
||||
<p>
|
||||
Scannez la carte étudiante d'unE membre<br>
|
||||
-ou-<br>
|
||||
Entrez manuellement le code à 7 chiffres
|
||||
</p>
|
||||
|
||||
<form action="/membre" method="get">
|
||||
<ul>
|
||||
<li>
|
||||
<label for="membre_id">Numéro étudiant:</label>
|
||||
<input type="text" id="membre_id" name="membre_id" autofocus/>
|
||||
</li>
|
||||
<li class="button">
|
||||
<button type="submit">Rechercher</button>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
|
||||
<p class="result">{{ .Result }}</p>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
{{ end }}
|
64
web/webhandlers/handlers.go
Normal file
64
web/webhandlers/handlers.go
Normal file
|
@ -0,0 +1,64 @@
|
|||
package webhandlers
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"git.agecem.com/agecem/bottin/v4/data"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
func GetIndex(c echo.Context) error {
|
||||
return c.Render(http.StatusOK, "index-html", nil)
|
||||
}
|
||||
|
||||
func GetMembre(c echo.Context) error {
|
||||
apiClientKey := viper.GetString("web.api.key")
|
||||
apiClientHost := viper.GetString("web.api.host")
|
||||
apiClientProtocol := viper.GetString("web.api.protocol")
|
||||
apiClientPort := viper.GetInt("web.api.port")
|
||||
|
||||
/*
|
||||
log.Printf(`
|
||||
apiClientKey: %s
|
||||
apiClientHost: %s
|
||||
apiClientProtocol: %s
|
||||
apiClientPort: %d`,
|
||||
apiClientKey, apiClientHost, apiClientProtocol, apiClientPort,
|
||||
)
|
||||
*/
|
||||
|
||||
apiClient := data.NewApiClient(apiClientKey, apiClientHost, apiClientProtocol, apiClientPort)
|
||||
|
||||
membreID := c.QueryParam("membre_id")
|
||||
|
||||
/*
|
||||
// TODO
|
||||
log.Printf("Requesting membreID: [%s]", membreID)
|
||||
*/
|
||||
|
||||
membre, err := apiClient.GetMembre(membreID)
|
||||
if err != nil {
|
||||
return c.Render(http.StatusBadRequest, "index-html", struct {
|
||||
Result string
|
||||
}{
|
||||
Result: fmt.Sprintln("👎", err.Error()),
|
||||
})
|
||||
}
|
||||
|
||||
membreResult := fmt.Sprintf(`👍
|
||||
Membre trouvéE: [%s]`, membre.ID)
|
||||
|
||||
if membre.PreferedName != "" {
|
||||
membreResult = fmt.Sprintf("%s -> %s", membreResult, membre.PreferedName)
|
||||
} else {
|
||||
membreResult = fmt.Sprintf("%s -> %s, %s", membreResult, membre.LastName, membre.FirstName)
|
||||
}
|
||||
|
||||
return c.Render(http.StatusOK, "index-html", struct {
|
||||
Result string
|
||||
}{
|
||||
Result: membreResult,
|
||||
})
|
||||
}
|
Reference in a new issue