moved appversion to user settings

sinamics · Aug 7, 2023 · 0600f8c · 0600f8c
1 parent 361b667
commit 0600f8c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 33 deletions.
diff --git a/src/locales/en/common.json b/src/locales/en/common.json
@@ -245,10 +245,7 @@
 		},
 		"settings": {
 			"authentication": "Authentication",
-			"enableUserRegistration": "Enable user registration?",
-			"application": "Application",
-			"version": "Version",
-			"developerMode": "developer mode"
+			"enableUserRegistration": "Enable user registration?"
 		},
 		"networkSetting": {
 			"memberAnotations": "Member Anotations",
@@ -373,9 +370,14 @@
 				"apiUrlLabel": "Zerotier API Url",
 				"apiUrlLabelDescription": "The url of the ZeroTier Central API, Default is https://api.zerotier.com/api/v1"
 			},
-			"acccountPreferences": {
+			"accountPreferences": {
 				"title": "Account Preferences",
 				"languageLabel": "Language"
+			},
+			"application": {
+				"title": "Application",
+				"version": "Version",
+				"developerMode": "developer mode"
 			}
 		}
 	}

diff --git a/src/locales/es/common.json b/src/locales/es/common.json
@@ -244,10 +244,7 @@
 		},
 		"settings": {
 			"authentication": "Autenticación",
-			"enableUserRegistration": "¿Habilitar registro de usuario?",
-			"application": "Aplicación",
-			"version": "Versión",
-			"developerMode": "modo de desarrollador"
+			"enableUserRegistration": "¿Habilitar registro de usuario?"
 		},
 		"networkSetting": {
 			"memberAnotations": "Anotaciones de miembro",
@@ -376,6 +373,11 @@
 			"accountPreferences": {
 				"title": "Preferencias de la cuenta",
 				"languageLabel": "Idioma"
+			},
+			"application": {
+				"title": "Aplicación",
+				"version": "Versión",
+				"developerMode": "modo de desarrollador"
 			}
 		}
 	}

diff --git a/src/locales/no/common.json b/src/locales/no/common.json
@@ -245,10 +245,7 @@
 		},
 		"settings": {
 			"authentication": "Autentisering",
-			"enableUserRegistration": "Aktiver brukerregistrering?",
-			"application": "Applikasjon",
-			"version": "Versjon",
-			"developerMode": "utviklermodus"
+			"enableUserRegistration": "Aktiver brukerregistrering?"
 		},
 		"networkSetting": {
 			"memberAnotations": "Medlemsanmerkninger",
@@ -376,6 +373,11 @@
 			"accountPreferences": {
 				"title": "Kontoinnstillinger",
 				"languageLabel": "Språk"
+			},
+			"application": {
+				"title": "Applikasjon",
+				"version": "Versjon",
+				"developerMode": "utviklermodus"
 			}
 		}
 	}

diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json
@@ -245,10 +245,7 @@
 		},
 		"settings": {
 			"authentication": "身份验证",
-			"enableUserRegistration": "启用用户注册？",
-			"application": "应用",
-			"version": "版本",
-			"developerMode": "开发者模式"
+			"enableUserRegistration": "启用用户注册？"
 		},
 		"networkSetting": {
 			"memberAnotations": "成员注释",
@@ -376,6 +373,11 @@
 			"accountPreferences": {
 				"title": "帐户首选项",
 				"languageLabel": "语言"
+			},
+			"application": {
+				"title": "应用",
+				"version": "版本",
+				"developerMode": "开发者模式"
 			}
 		}
 	}

diff --git a/src/pages/admin/settings/index.tsx b/src/pages/admin/settings/index.tsx
@@ -1,7 +1,6 @@
 import { type ReactElement } from "react";
 import { LayoutAuthenticated } from "~/components/layouts/layout";
 import { api } from "~/utils/api";
-import { globalSiteVersion } from "~/utils/global";
 import { useTranslations } from "next-intl";
 
 const Settings = () => {
@@ -45,19 +44,6 @@ const Settings = () => {
 					/>
 				</div>
 			</div>
-			<div className="pb-10">
-				<p className="text-sm text-gray-400">{t("settings.application")}</p>
-				<div className="divider mt-0 p-0 text-gray-500"></div>
-				<div className="flex items-center justify-between">
-					<p>{t("settings.version")}</p>
-					<a
-						className="link text-primary"
-						href="https://github.com/sinamics/ztnet/releases"
-					>
-						{globalSiteVersion ?? t("settings.developerMode")}
-					</a>
-				</div>
-			</div>
 		</main>
 	);
 };

diff --git a/src/pages/user-settings/account/index.tsx b/src/pages/user-settings/account/index.tsx
@@ -6,6 +6,7 @@ import { toast } from "react-hot-toast";
 import InputField from "~/components/elements/inputField";
 import { useRouter } from "next/router";
 import { useTranslations } from "next-intl";
+import { globalSiteVersion } from "~/utils/global";
 
 const languageNames = {
 	en: "English",
@@ -233,13 +234,13 @@ const Account = () => {
 					</div>
 				</div>
 				<p className="pt-10 text-[0.7rem] text-gray-400">
-					{t("account.acccountPreferences.title")}
+					{t("account.accountPreferences.title")}
 				</p>
 				<div className="divider mt-0 p-0 text-gray-500" />
 				<div className="form-control w-full max-w-xs">
 					<label className="label">
 						<span className="label-text font-medium">
-							{t("account.acccountPreferences.languageLabel")}
+							{t("account.accountPreferences.languageLabel")}
 						</span>
 					</label>
 					<select
@@ -254,6 +255,21 @@ const Account = () => {
 						))}
 					</select>
 				</div>
+				<div className="py-10">
+					<p className="text-sm text-gray-400">
+						{t("account.application.title")}
+					</p>
+					<div className="divider mt-0 p-0 text-gray-500"></div>
+					<div className="flex items-center justify-between">
+						<p>{t("account.application.version")}</p>
+						<a
+							className="link text-primary"
+							href="https://github.com/sinamics/ztnet/releases"
+						>
+							{globalSiteVersion ?? t("account.application.developerMode")}
+						</a>
+					</div>
+				</div>
 			</div>
 		</main>
 	);