tijl/tijl.dev-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update
All checks were successful
build / build (push) Successful in 35s
Details
release-tag / release-image (push) Successful in 16m13s
Details

Browse Source
This commit is contained in:
Tijl 2024-08-24 17:48:14 +02:00
parent 52bee24164
commit 2ef54d14f9
Signed by: tijl
GPG Key ID: DAE24BFCD722F053
10 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/handlers/account.go
View File

@ -3,8 +3,8 @@ package handlers
import (
"database/sql"
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2"
)

2
internal/handlers/auth.go
View File

@ -3,9 +3,9 @@ package handlers
import (
"net/http"
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2"
)

2
internal/handlers/blog.go
View File

@ -10,7 +10,7 @@ import (
"path/filepath"
"time"
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2"

7
internal/handlers/routes.go
View File

@ -5,9 +5,8 @@ import (
"net/http"
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
webf "git.tijl.dev/tijl/tijl.dev-core/web"
"github.com/gofiber/fiber/v2"
@ -39,10 +38,10 @@ func routes(app *fiber.App) {
return c.Render("about", data, "layouts/base")
})
app.Get("/services", func(c *fiber.Ctx) error {
_, err := user.GetSession(c)
/*_, err := user.GetSession(c)
if err != nil {
return c.Next()
}
}*/
data := *web.Common(c)
data["Title"] = i18n.Translate(c, "services")
return c.Render("services", data, "layouts/base")

2
internal/handlers/settings.go
View File

@ -1,7 +1,7 @@
package handlers
import (
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2"
)

5
internal/service/main.go
View File

@ -8,10 +8,11 @@ import (
"git.tijl.dev/tijl/tijl.dev-core/internal/assets"
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
"git.tijl.dev/tijl/tijl.dev-core/internal/handlers"
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
webinternal "git.tijl.dev/tijl/tijl.dev-core/internal/web"
"git.tijl.dev/tijl/tijl.dev-core/locales"
"git.tijl.dev/tijl/tijl.dev-core/modules/db"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
webf "git.tijl.dev/tijl/tijl.dev-core/web"
@ -35,7 +36,7 @@ func Listen() {
// Load assets
assets.Load()
// Load translations
i18n.Load()
i18n.RegisterTranslations(locales.Embed, ".")
// setup handler
handlers.Setup()
// setup web

2
internal/web/common.go
View File

@ -1,8 +1,8 @@
package web
import (
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
"github.com/gofiber/fiber/v2"
)

22
internal/i18n/i18n.go → modules/i18n/i18n.go
View File

@ -1,11 +1,11 @@
package i18n
import (
"embed"
"encoding/json"
"path/filepath"
"strings"
"git.tijl.dev/tijl/tijl.dev-core/locales"
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
"github.com/gofiber/fiber/v2"
)
@ -14,10 +14,13 @@ var translations map[string]map[string]string
const DefaultLang = "en"
func Load() {
func RegisterTranslations(embed embed.FS, location string) {
if translations == nil {
translations = make(map[string]map[string]string)
}
files, err := embed.ReadDir(location)
files, err := locales.Embed.ReadDir(".")
if err != nil {
log.Fatal().Err(err)
}
@ -33,7 +36,7 @@ func Load() {
lang := strings.TrimSuffix(file.Name(), filepath.Ext(file.Name()))
data, err := locales.Embed.ReadFile(filepath.Join(".", file.Name()))
data, err := embed.ReadFile(filepath.Join(location, file.Name()))
if err != nil {
log.Error().Err(err).Msg("Failed to read file")
continue
@ -45,11 +48,16 @@ func Load() {
continue
}
log.Debug().Str("filename", file.Name()).Msg("i18n.Load: loaded")
translations[lang] = messages
if translations[lang] == nil {
translations[lang] = make(map[string]string)
}
log.Info().Msg("loaded translations")
for key, value := range messages {
translations[lang][key] = value
}
log.Debug().Str("filename", file.Name()).Msg("i18n.RegisterTranslations: loaded")
}
}
func Translate(c *fiber.Ctx, key string) string {

2
tailwind.config.ts
View File

@ -1,6 +1,6 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: ["./web/views/**/*.html", "./web/**/*.{js,ts,css}"],
content: ["./internal/**/*.html", "./web/views/**/*.html", "./web/**/*.{js,ts,css}"],
theme: {
extend: {},
},

2
web/views/partials/menu.html
View File

@ -1,5 +1,5 @@
<nav hx-boost="true" class="flex fixed mx-auto w-full md:w-[80%] lg:w-[75%]">
<div class="mt-4 mx-4 rounded-2xl shadow-2xl bg-base-300 navbar">
<div class="mt-4 mx-4 rounded-2xl shadow-xl bg-base-300 navbar">
<div class="flex-1">
<a href="/" class="btn btn-ghost font-mono text-xl">tijl.dev</a>
</div>