This commit is contained in:
2025-10-09 00:11:34 +02:00
parent 1ead02ab69
commit 774756a747
20 changed files with 288 additions and 74 deletions

View File

@@ -10,6 +10,7 @@
"dependencies": {
"pinia": "^3.0.3",
"vue": "^3.5.18",
"vue-i18n": "^11.1.12",
"vue-router": "^4.5.1"
},
"devDependencies": {
@@ -1161,6 +1162,50 @@
"url": "https://github.com/sponsors/nzakas"
}
},
"node_modules/@intlify/core-base": {
"version": "11.1.12",
"resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.12.tgz",
"integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==",
"license": "MIT",
"dependencies": {
"@intlify/message-compiler": "11.1.12",
"@intlify/shared": "11.1.12"
},
"engines": {
"node": ">= 16"
},
"funding": {
"url": "https://github.com/sponsors/kazupon"
}
},
"node_modules/@intlify/message-compiler": {
"version": "11.1.12",
"resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.12.tgz",
"integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==",
"license": "MIT",
"dependencies": {
"@intlify/shared": "11.1.12",
"source-map-js": "^1.0.2"
},
"engines": {
"node": ">= 16"
},
"funding": {
"url": "https://github.com/sponsors/kazupon"
}
},
"node_modules/@intlify/shared": {
"version": "11.1.12",
"resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.12.tgz",
"integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==",
"license": "MIT",
"engines": {
"node": ">= 16"
},
"funding": {
"url": "https://github.com/sponsors/kazupon"
}
},
"node_modules/@jridgewell/gen-mapping": {
"version": "0.3.13",
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -4050,6 +4095,26 @@
"eslint": "^8.57.0 || ^9.0.0"
}
},
"node_modules/vue-i18n": {
"version": "11.1.12",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.12.tgz",
"integrity": "sha512-BnstPj3KLHLrsqbVU2UOrPmr0+Mv11bsUZG0PyCOzsawCivk8W00GMXHeVUWIDOgNaScCuZah47CZFE+Wnl8mw==",
"license": "MIT",
"dependencies": {
"@intlify/core-base": "11.1.12",
"@intlify/shared": "11.1.12",
"@vue/devtools-api": "^6.5.0"
},
"engines": {
"node": ">= 16"
},
"funding": {
"url": "https://github.com/sponsors/kazupon"
},
"peerDependencies": {
"vue": "^3.0.0"
}
},
"node_modules/vue-router": {
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.1.tgz",

View File

@@ -16,6 +16,7 @@
"dependencies": {
"pinia": "^3.0.3",
"vue": "^3.5.18",
"vue-i18n": "^11.1.12",
"vue-router": "^4.5.1"
},
"devDependencies": {

View File

@@ -45,23 +45,24 @@
<template>
<form @submit.prevent="onSubmit">
<div class="field">
<label class="label">Title</label>
<label class="label">{{$t('addbook.title')}}</label>
<div class="control">
<input :class="'input ' + (titleError ? 'is-danger' : '')" type="text" maxlength="300"
required v-model="book.title" placeholder="Title">
required v-model="book.title" :placeholder="$t('addbook.title')">
</div>
<p v-if="titleError" class="help is-danger">{{titleError}}</p>
</div>
<div class="field">
<label class="label">Author</label>
<label class="label">{{$t('addbook.author')}}</label>
<div class="control">
<input :class="'input ' + (authorError ? 'is-danger' : '')" type="text" maxlength="100" v-model="book.author" placeholder="Author">
<input :class="'input ' + (authorError ? 'is-danger' : '')" type="text" maxlength="100"
v-model="book.author" :placeholder="$t('addbook.author')">
</div>
<p v-if="authorError" class="help is-danger">{{authorError}}</p>
</div>
<div class="field">
<div class="control">
<button class="button is-link">Submit</button>
<button class="button is-link">{{$t('addbook.submit')}}</button>
</div>
</div>
</form>

View File

@@ -15,13 +15,13 @@
<div class="navbar-menu">
<div class="navbar-start">
<RouterLink to="/" class="navbar-item" activeClass="is-active">
Home
</RouterLink>
<RouterLink v-if="authStore.user" to="/add" class="navbar-item" activeClass="is-active">
Add Book
{{ $t('navbar.home')}}
</RouterLink>
<RouterLink v-if="authStore.user" to="/books" class="navbar-item" activeClass="is-active">
My Books
{{ $t('navbar.mybooks')}}
</RouterLink>
<RouterLink v-if="authStore.user" to="/add" class="navbar-item" activeClass="is-active">
{{ $t('navbar.addbook')}}
</RouterLink>
</div>
<div class="navbar-end">
@@ -34,16 +34,16 @@
{{ authStore.user.username }}
</div>
<a @click="authStore.logout" class="button is-light">
Log out
{{ $t('navbar.logout')}}
</a>
</div>
<div v-else class="navbar-item">
<div class="buttons">
<RouterLink to="/signup" class="button is-primary">
<strong>Sign up</strong>
<strong>{{ $t('navbar.signup')}}</strong>
</RouterLink>
<RouterLink to="/login" class="button is-light">
Log in
{{ $t('navbar.login')}}
</RouterLink>
</div>
</div>

View File

@@ -9,11 +9,11 @@ const { data, error } = getMyBooks();
<template>
<div class="books">
<div v-if="error">Error when loading books: {{ error.message }}</div>
<div v-if="error">{{$t('bookbrowser.error', {error: error.message})}}</div>
<div class="book" v-else-if="data" v-for="book in data" :key="book.id">
<BookCard v-bind="book" />
</div>
<div v-else>Loading...</div>
<div v-else>{{$t('bookbrowser.loading')}}</div>
</div>
</template>

View File

@@ -7,10 +7,10 @@
<template>
<div v-if="authStore.user">
Welcome {{ authStore.user.username }} !
{{ $t('home.welcomeuser', {username: authStore.user.username}) }}
</div>
<div v-else>
Welcome to PersonalLibraryManager. Please login ou sign in to continue.
{{ $t('home.welcome') }}
</div>
</template>

View File

@@ -47,24 +47,24 @@
</div>
<form class="box" @submit.prevent="onSubmit">
<div class="field">
<label class="label">Username</label>
<label class="label">{{$t('login.username')}}</label>
<div class="control">
<input :class="'input ' + (userError ? 'is-danger' : '')" type="text" minlength="2" maxlength="20"
required v-model="user.username" placeholder="Username">
required v-model="user.username" :placeholder="$t('login.username')">
</div>
<p v-if="userError" class="help is-danger">{{userError}}</p>
</div>
<div class="field">
<label class="label">Password</label>
<label class="label">{{$t('login.password')}}</label>
<div class="control">
<input :class="'input ' + (passwordError ? 'is-danger' : '')" type="password" minlength="6"
maxlength="100" v-model="user.password" required placeholder="Password">
maxlength="100" v-model="user.password" required :placeholder="$t('login.password')">
</div>
<p v-if="passwordError" class="help is-danger">{{passwordError}}</p>
</div>
<div class="field">
<div class="control">
<button class="button is-link">Log In</button>
<button class="button is-link">{{$t('login.login')}}</button>
</div>
</div>
</form>

View File

@@ -41,24 +41,24 @@
</div>
<form class="box" @submit.prevent="onSubmit">
<div class="field">
<label class="label">Username</label>
<label class="label">{{$t('signup.username')}}</label>
<div class="control">
<input :class="'input ' + (userError ? 'is-danger' : '')" type="text" minlength="2" maxlength="20"
required v-model="user.username" placeholder="Username">
required v-model="user.username" :placeholder="$t('signup.username')">
</div>
<p v-if="userError" class="help is-danger">{{userError}}</p>
</div>
<div class="field">
<label class="label">Password</label>
<label class="label">{{ $t('signup.password') }}</label>
<div class="control">
<input :class="'input ' + (passwordError ? 'is-danger' : '')" type="password" minlength="6"
maxlength="100" v-model="user.password" required placeholder="Password">
maxlength="100" v-model="user.password" required :placeholder="$t('signup.password')">
</div>
<p v-if="passwordError" class="help is-danger">{{passwordError}}</p>
</div>
<div class="field">
<div class="control">
<button class="button is-link">Sign In</button>
<button class="button is-link">{{ $t('signup.signup') }}</button>
</div>
</div>
</form>

33
front/src/locales/en.json Normal file
View File

@@ -0,0 +1,33 @@
{
"home": {
"welcomeuser": "Welcome {username} !",
"welcome": "Welcome to PersonalLibraryManager. Please login ou sign in to continue."
},
"navbar": {
"home": "Home",
"mybooks": "My Books",
"addbook": "Add Book",
"logout": "Log out",
"signup": "Sign up",
"login": "Log In"
},
"addbook": {
"title":"Title",
"author":"Author",
"submit":"Submit"
},
"signup": {
"username":"Username",
"password":"Password",
"signup":"Sign up"
},
"login": {
"username":"Username",
"password":"Password",
"login":"Log in"
},
"bookbrowser": {
"error": "Error when loading books: {error}",
"loading": "Loading..."
}
}

33
front/src/locales/fr.json Normal file
View File

@@ -0,0 +1,33 @@
{
"home": {
"welcomeuser": "Bienvenue {username} !",
"welcome": "Bienvenue sur PersonalLibraryManager. Merci de se connecter ou de s'inscrire pour continuer."
},
"navbar": {
"home": "Accueil",
"mybooks": "Mes Livres",
"addbook": "Ajouter Un Livre",
"logout": "Se déconnecter",
"signup": "S'inscrire",
"login": "Se connecter"
},
"addbook": {
"title":"Titre",
"author":"Auteur",
"submit":"Confirmer"
},
"signup": {
"username":"Nom d'utilisateur",
"password":"Mot de passe",
"signup":"S'inscrire"
},
"login": {
"username":"Nom d'utilisateur",
"password":"Mot de passe",
"login":"Connexion"
},
"bookbrowser": {
"error": "Erreur pendant le chargement des livres: {error}",
"loading": "Chargement..."
}
}

View File

@@ -1,4 +1,5 @@
import { createApp } from 'vue'
import { createI18n } from "vue-i18n";
import { createPinia } from 'pinia'
import { createRouter, createWebHistory } from 'vue-router'
import App from './App.vue'
@@ -8,6 +9,17 @@ import SignUp from './SignUp.vue'
import LogIn from './LogIn.vue'
import Home from './Home.vue'
import fr from './locales/fr.json';
import en from './locales/en.json';
// configure i18n
const i18n = createI18n({
locale: navigator.language,
fallbackLocale: "en",
messages: { fr, en },
});
const routes = [
{ path: '/', component: Home },
@@ -24,4 +36,4 @@ export const router = createRouter({
const pinia = createPinia()
createApp(App).use(pinia).use(router).mount('#app')
createApp(App).use(i18n).use(pinia).use(router).mount('#app')

3
go.mod
View File

@@ -34,6 +34,7 @@ require (
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -42,7 +43,7 @@ require (
golang.org/x/crypto v0.42.0 // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/text v0.30.0 // indirect
google.golang.org/protobuf v1.36.9 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

4
go.sum
View File

@@ -56,6 +56,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/nicksnyder/go-i18n/v2 v2.6.0 h1:C/m2NNWNiTB6SK4Ao8df5EWm3JETSTIGNXBpMJTxzxQ=
github.com/nicksnyder/go-i18n/v2 v2.6.0/go.mod h1:88sRqr0C6OPyJn0/KRNaEz1uWorjxIKP7rUUcvycecE=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
@@ -88,6 +90,8 @@ golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

View File

@@ -5,6 +5,8 @@ import (
"fmt"
"net/http"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"git.artlef.fr/PersonalLibraryManager/internal/jwtauth"
"git.artlef.fr/PersonalLibraryManager/internal/model"
"github.com/gin-gonic/gin"
@@ -13,84 +15,84 @@ import (
"gorm.io/gorm"
)
func GetMyBooksHanderl(c *gin.Context, db *gorm.DB) {
func GetMyBooksHanderl(ac appcontext.AppContext) {
var userbooks []model.UserBook
user, err := getAuthenticatedUser(c, db)
user, err := getAuthenticatedUser(ac)
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
db.Preload("Book").Where("user_id = ?", user.ID).Find(&userbooks)
ac.Db.Preload("Book").Where("user_id = ?", user.ID).Find(&userbooks)
var booksDto []bookUserGet
for _, userbook := range userbooks {
booksDto = append(booksDto, fromUserBookDb(&userbook))
}
c.JSON(http.StatusOK, booksDto)
ac.C.JSON(http.StatusOK, booksDto)
}
func PostBookHandler(c *gin.Context, db *gorm.DB) {
func PostBookHandler(ac appcontext.AppContext) {
var book bookPostCreate
err := c.ShouldBindJSON(&book)
err := ac.C.ShouldBindJSON(&book)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
user, fetchUserErr := getAuthenticatedUser(c, db)
user, fetchUserErr := getAuthenticatedUser(ac)
if fetchUserErr != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
bookDb := book.toBook(&user)
err = db.Model(&model.Book{}).Save(&bookDb).Error
err = ac.Db.Model(&model.Book{}).Save(&bookDb).Error
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
c.String(200, "Success")
ac.C.String(200, "Success")
}
func PostSignupHandler(c *gin.Context, db *gorm.DB) {
func PostSignupHandler(ac appcontext.AppContext) {
var user userSignup
err := c.ShouldBindJSON(&user)
err := ac.C.ShouldBindJSON(&user)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
userDb, err := user.toUser()
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
err = db.Model(&model.User{}).Save(&userDb).Error
err = ac.Db.Model(&model.User{}).Save(&userDb).Error
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
c.String(200, "Success")
ac.C.String(200, "Success")
}
func PostLoginHandler(c *gin.Context, db *gorm.DB) {
func PostLoginHandler(ac appcontext.AppContext) {
var user userLogin
err := c.ShouldBindJSON(&user)
err := ac.C.ShouldBindJSON(&user)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
if !isUserAndPasswordOk(db, user.Username, user.Password) {
c.JSON(http.StatusInternalServerError,
gin.H{"error": "Invalid credentials."})
if !isUserAndPasswordOk(ac.Db, user.Username, user.Password) {
ac.C.JSON(http.StatusInternalServerError,
gin.H{"error": i18nresource.GetTranslatedMessage(ac, "InvalidCredentials")})
return
}
var jwtToken string
jwtToken, err = jwtauth.GenerateJwtToken(user.Username)
if err != nil {
c.JSON(http.StatusUnauthorized,
ac.C.JSON(http.StatusUnauthorized,
gin.H{"error": fmt.Errorf("Error when generating JWT token: %w", err)})
return
}
c.JSON(200, gin.H{"message": "Authentication was a success.", "token": jwtToken})
ac.C.JSON(200, gin.H{"message": i18nresource.GetTranslatedMessage(ac, "AuthenticationSuccess"), "token": jwtToken})
}
func isUserAndPasswordOk(db *gorm.DB, username string, password string) bool {
@@ -100,22 +102,22 @@ func isUserAndPasswordOk(db *gorm.DB, username string, password string) bool {
return err == nil
}
func getAuthenticatedUser(c *gin.Context, db *gorm.DB) (model.User, error) {
func getAuthenticatedUser(ac appcontext.AppContext) (model.User, error) {
var user model.User
username, userIsInContext := c.Get("user")
username, userIsInContext := ac.C.Get("user")
if !userIsInContext {
return user, errors.New("User not found in context")
}
res := db.Where("name = ?", username).First(&user)
res := ac.Db.Where("name = ?", username).First(&user)
return user, res.Error
}
func manageBindingError(c *gin.Context, err error) {
func manageBindingError(ac appcontext.AppContext, err error) {
var ve validator.ValidationErrors
if errors.As(err, &ve) {
c.JSON(http.StatusBadRequest, getValidationErrors(&ve))
ac.C.JSON(http.StatusBadRequest, getValidationErrors(ac, &ve))
} else {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
}
}

View File

@@ -3,6 +3,8 @@ package api
import (
"fmt"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"github.com/go-playground/validator/v10"
)
@@ -11,27 +13,27 @@ type apiValidationError struct {
Err string `json:"error"`
}
func getValidationErrors(ve *validator.ValidationErrors) []apiValidationError {
func getValidationErrors(ac appcontext.AppContext, ve *validator.ValidationErrors) []apiValidationError {
errors := make([]apiValidationError, len(*ve))
for i, fe := range *ve {
errors[i] = apiValidationError{
Field: fe.Field(),
Err: computeValidationMessage(&fe),
Err: computeValidationMessage(ac, &fe),
}
}
return errors
}
func computeValidationMessage(fe *validator.FieldError) string {
func computeValidationMessage(ac appcontext.AppContext, fe *validator.FieldError) string {
tag := (*fe).Tag()
switch tag {
case "required":
return fmt.Sprintf("%s is required.", (*fe).Field())
return i18nresource.GetTranslatedMessage(ac, "ValidationRequired")
case "min":
return fmt.Sprintf("%s is not long enough. It should be at least %s characters.", (*fe).Field(), (*fe).Param())
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationTooShort"), (*fe).Param())
case "max":
return fmt.Sprintf("%s is too long. It should be under %s characters.", (*fe).Field(), (*fe).Param())
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationTooLong"), (*fe).Param())
default:
return fmt.Sprintf("Validation failed for '%s' property.", tag)
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationPropertyFail"), tag)
}
}

View File

@@ -0,0 +1,13 @@
package appcontext
import (
"github.com/gin-gonic/gin"
"github.com/nicksnyder/go-i18n/v2/i18n"
"gorm.io/gorm"
)
type AppContext struct {
C *gin.Context
Db *gorm.DB
I18n *i18n.Bundle
}

View File

@@ -0,0 +1,6 @@
InvalidCredentials = "Invalid credentials."
AuthenticationSuccess = "Authentication was a success."
ValidationRequired = "This field is required."
ValidationTooShort = "This field is too short. It should be at least %s characters."
ValidationTooLong = "This field is too long. It should be under %s characters."
ValidationPropertyFail = "Validation failed for '%s' property."

View File

@@ -0,0 +1,6 @@
InvalidCredentials = "Identifiants invalides."
AuthenticationSuccess = "Connexion réussie."
ValidationRequired = "Ce champ est requis."
ValidationTooShort = "Ce champ est trop court. Il devrait contenir au moins %s caractères."
ValidationTooLong = "Ce champ est trop long. Il ne devrait pas dépasser %s caractères."
ValidationPropertyFail = "La validation a échoué pour la propriété '%s'."

View File

@@ -0,0 +1,32 @@
package i18nresource
import (
"embed"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/pelletier/go-toml"
"golang.org/x/text/language"
)
//go:embed locale.*.toml
var localeFS embed.FS
func InitializeI18n() *i18n.Bundle {
bundle := i18n.NewBundle(language.English)
bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
bundle.LoadMessageFileFS(localeFS, "locale.en.toml")
bundle.LoadMessageFileFS(localeFS, "locale.fr.toml")
return bundle
}
func GetTranslatedMessage(ac appcontext.AppContext, messageID string) string {
localizer := i18n.NewLocalizer(ac.I18n, ac.C.GetHeader("Accept-Language"))
message, err := localizer.LocalizeMessage(&i18n.Message{
ID: messageID,
})
if err != nil {
message = err.Error()
}
return message
}

View File

@@ -5,8 +5,10 @@ import (
"github.com/gin-gonic/gin"
"git.artlef.fr/PersonalLibraryManager/internal/api"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/config"
"git.artlef.fr/PersonalLibraryManager/internal/db"
i18nresource "git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"git.artlef.fr/PersonalLibraryManager/internal/jwtauth"
"git.artlef.fr/PersonalLibraryManager/internal/middleware"
)
@@ -20,17 +22,18 @@ func Setup(config *config.Config) *gin.Engine {
r := gin.Default()
r.Use(cors.New(configureCors())) // All origins allowed by default
r.Use(middleware.Auth())
bundle := i18nresource.InitializeI18n()
r.GET("/mybooks", func(c *gin.Context) {
api.GetMyBooksHanderl(c, db)
api.GetMyBooksHanderl(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/book", func(c *gin.Context) {
api.PostBookHandler(c, db)
api.PostBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/auth/signup", func(c *gin.Context) {
api.PostSignupHandler(c, db)
api.PostSignupHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/auth/login", func(c *gin.Context) {
api.PostLoginHandler(c, db)
api.PostLoginHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
return r
}