From cc78d4e2b1adf729d38a63f6b147544b100f94a3 Mon Sep 17 00:00:00 2001
From: kunish <kunish.butt@gmail.com>
Date: Tue, 5 Sep 2023 21:09:35 +0800
Subject: [PATCH] feat: make some changes in response to community suggestions

- make the size of the menu items in header larger
- move switch language button to config page
---
 src/components/Header.tsx | 41 ++++++++++++++-------------------------
 src/i18n/en.ts            |  1 +
 src/i18n/zh.ts            |  1 +
 src/pages/Config.tsx      | 15 +++++++++++++-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index a85840d..2ed6297 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -5,7 +5,6 @@ import {
   IconGlobe,
   IconGlobeFilled,
   IconHome,
-  IconLanguage,
   IconMenu,
   IconNetwork,
   IconPalette,
@@ -14,8 +13,7 @@ import {
 } from '@tabler/icons-solidjs'
 import { For, ParentComponent, Show, createMemo, createSignal } from 'solid-js'
 import { twMerge } from 'tailwind-merge'
-import { Button } from '~/components'
-import { LANG, ROUTES, themes } from '~/constants'
+import { ROUTES, themes } from '~/constants'
 import { renderProxiesInSamePage, setCurTheme, useProxies } from '~/signals'
 
 const Nav: ParentComponent<{ href: string; tooltip: string }> = ({
@@ -63,8 +61,19 @@ const ThemeSwitcher = () => (
   </div>
 )
 
+const LogoText = () => (
+  <a
+    class="flex gap-2 whitespace-nowrap text-xl font-bold uppercase"
+    href="https://github.com/metacubex/metacubexd"
+    target="_blank"
+  >
+    <span>metacube, </span>
+    <div class="transition-transform hover:rotate-90 hover:scale-125">xd</div>
+  </a>
+)
+
 export const Header = () => {
-  const [t, { locale }] = useI18n()
+  const [t] = useI18n()
   const { proxyProviders } = useProxies()
   const navs = createMemo(() => {
     const list = [
@@ -148,21 +157,12 @@ export const Header = () => {
           </div>
         </div>
 
-        <a
-          class="flex whitespace-nowrap text-xl font-bold uppercase"
-          href="https://github.com/metacubex/metacubexd"
-          target="_blank"
-        >
-          <span class="mr-2">metacube, </span>
-          <div class="transition-transform hover:rotate-90 hover:scale-125">
-            xd
-          </div>
-        </a>
+        <LogoText />
       </div>
 
       <Show when={location.pathname !== ROUTES.Setup}>
         <div class="navbar-center hidden lg:flex">
-          <ul class="menu menu-horizontal gap-2">
+          <ul class="menu menu-horizontal menu-lg gap-2">
             <For each={navs()}>
               {({ href, name, icon }) => (
                 <Nav href={href} tooltip={name}>
@@ -176,17 +176,6 @@ export const Header = () => {
 
       <div class="navbar-end">
         <div class="flex items-center gap-2">
-          <Button
-            class="btn-circle btn-sm"
-            onClick={() => {
-              const curLocale = locale()
-
-              locale(curLocale === LANG.EN ? LANG.ZH : LANG.EN)
-            }}
-          >
-            <IconLanguage />
-          </Button>
-
           <ThemeSwitcher />
         </div>
       </div>
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 0b981aa..1759a7a 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -65,4 +65,5 @@ export default {
   md: 'Normal size',
   lg: 'Large size',
   switchEndpoint: 'Switch Endpoint',
+  switchLanguage: 'Switch Language',
 }
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 24eb0a8..e36bedc 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -65,4 +65,5 @@ export default {
   md: '正常尺寸',
   lg: '超大尺寸',
   switchEndpoint: '切换后端',
+  switchLanguage: '切换语言',
 }
diff --git a/src/pages/Config.tsx b/src/pages/Config.tsx
index 26dbd60..c8d630e 100644
--- a/src/pages/Config.tsx
+++ b/src/pages/Config.tsx
@@ -6,6 +6,7 @@ import { For, Show, createSignal, onMount } from 'solid-js'
 import { z } from 'zod'
 import { Button } from '~/components'
 import {
+  LANG,
   PROXIES_ORDERING_TYPE,
   PROXIES_PREVIEW_TYPE,
   ROUTES,
@@ -230,7 +231,7 @@ const ConfigForm = () => {
 }
 
 const ConfigForXd = () => {
-  const [t] = useI18n()
+  const [t, { locale }] = useI18n()
   const navigate = useNavigate()
 
   const onSwitchEndpointClick = () => {
@@ -377,6 +378,18 @@ const ConfigForXd = () => {
         </select>
       </div>
 
+      <div>
+        <Button
+          onClick={() => {
+            const curLocale = locale()
+
+            locale(curLocale === LANG.EN ? LANG.ZH : LANG.EN)
+          }}
+        >
+          {t('switchLanguage')}
+        </Button>
+      </div>
+
       <div>
         <Button onClick={onSwitchEndpointClick}>{t('switchEndpoint')}</Button>
       </div>