diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go index faca9906..03288df5 100644 --- a/backend/app/api/routes.go +++ b/backend/app/api/routes.go @@ -4,12 +4,6 @@ import ( "embed" "errors" "fmt" - "io" - "mime" - "net/http" - "path" - "path/filepath" - "github.com/go-chi/chi/v5" "github.com/hay-kot/httpkit/errchain" httpSwagger "github.com/swaggo/http-swagger/v2" // http-swagger middleware @@ -19,6 +13,11 @@ import ( _ "github.com/sysadminsmedia/homebox/backend/app/api/static/docs" "github.com/sysadminsmedia/homebox/backend/internal/data/ent/authroles" "github.com/sysadminsmedia/homebox/backend/internal/data/repo" + "io" + "mime" + "net/http" + "path" + "path/filepath" ) const prefix = "/api" diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index e78d95cd..eb0763a1 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -39,7 +39,7 @@
-

Welcome, {{ username }}

+

{{ $t("global.welcome", { username: username }) }}

@@ -53,7 +53,7 @@ - Create + {{ $t("global.create") }}
- +
diff --git a/frontend/locales/en.json b/frontend/locales/en.json index f3c6e66a..712529e0 100644 --- a/frontend/locales/en.json +++ b/frontend/locales/en.json @@ -11,7 +11,9 @@ "submit": "Submit", "confirm": "Confirm", "create": "Create", - "create_and_add": "Create and Add Another" + "create_and_add": "Create and Add Another", + "welcome": "Welcome, { username }", + "sign_out": "Sign Out" }, "index": { "tagline": "Track, Organize, and Manage your Things.", @@ -25,6 +27,16 @@ "joining_group": "You're Joining an Existing Group!", "dont_join_group": "Don't want to join a group?" }, + "profile": { + "change_password": "Change Password", + "current_password": "Current Password", + "new_password": "New Password", + "notifier": "{ type, select, true {Edit} false {Create} other {Other}} Notifier", + "name": "Name", + "url": "URL", + "enabled": "Enabled", + "test": "Test" + }, "components": { "global": { "password_score": { diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts index cf530c43..3febeed7 100644 --- a/frontend/nuxt.config.ts +++ b/frontend/nuxt.config.ts @@ -1,7 +1,4 @@ -import { resolve, dirname } from "node:path"; -import { fileURLToPath } from "url"; import { defineNuxtConfig } from "nuxt/config"; -import VueI18nVitePlugin from "@intlify/unplugin-vue-i18n/vite"; // https://v3.nuxtjs.org/api/configuration/nuxt.config export default defineNuxtConfig({ @@ -9,13 +6,6 @@ export default defineNuxtConfig({ build: { transpile: ["vue-i18n"], }, - vite: { - plugins: [ - VueI18nVitePlugin({ - include: [resolve(dirname(fileURLToPath(import.meta.url)), "./locales/**")], - }), - ], - }, modules: [ "@nuxtjs/tailwindcss", "@pinia/nuxt", diff --git a/frontend/pages/profile.vue b/frontend/pages/profile.vue index 37cdc83e..4449e87f 100644 --- a/frontend/pages/profile.vue +++ b/frontend/pages/profile.vue @@ -305,11 +305,11 @@