Language switching and merging

Add the webuiInitialize variable, dev: '', build:'/webui'
2025-03-15 00:52:21 +08:00
parent b58729751a
commit 5fef68b62f
7 changed files with 17 additions and 27 deletions
--- a/lightrag/api/webui/index.html
+++ b/lightrag/api/webui/index.html
@@ -1,17 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <link rel="icon" type="image/svg+xml" href="./logo.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Lightrag</title>
-    <script type="module" crossorigin src="./assets/index-DwcJE583.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-BV5s8k-a.css">
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
--- a/lightrag_webui/src/components/AppSettings.tsx
+++ b/lightrag_webui/src/components/AppSettings.tsx
@@ -5,8 +5,13 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
 import { useSettingsStore } from '@/stores/settings'
 import { PaletteIcon } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
+import { cn } from '@/lib/utils'

-export default function AppSettings() {
+interface AppSettingsProps {
+  className?: string
+}
+
+export default function AppSettings({ className }: AppSettingsProps) {
  const [opened, setOpened] = useState<boolean>(false)
  const { t } = useTranslation()

@@ -27,7 +32,7 @@ export default function AppSettings() {
  return (
    <Popover open={opened} onOpenChange={setOpened}>
      <PopoverTrigger asChild>
-        <Button variant="outline" size="icon" className="h-9 w-9">
+        <Button variant="ghost" size="icon" className={cn("h-9 w-9", className)}>
          <PaletteIcon className="h-5 w-5" />
        </Button>
      </PopoverTrigger>
--- a/lightrag_webui/src/features/LoginPage.tsx
+++ b/lightrag_webui/src/features/LoginPage.tsx
@@ -9,8 +9,7 @@ import { Card, CardContent, CardHeader } from '@/components/ui/Card'
 import Input from '@/components/ui/Input'
 import Button from '@/components/ui/Button'
 import { ZapIcon } from 'lucide-react'
-import ThemeToggle from '@/components/ThemeToggle'
-import LanguageToggle from '@/components/LanguageToggle'
+import AppSettings from '@/components/AppSettings'

 const LoginPage = () => {
  const navigate = useNavigate()
@@ -44,8 +43,7 @@ const LoginPage = () => {
  return (
    <div className="flex h-screen w-screen items-center justify-center bg-gradient-to-br from-emerald-50 to-teal-100 dark:from-gray-900 dark:to-gray-800">
      <div className="absolute top-4 right-4 flex items-center gap-2">
-        <LanguageToggle />
-        <ThemeToggle />
+        <AppSettings className="bg-white/30 dark:bg-gray-800/30 backdrop-blur-sm rounded-md" />
      </div>
      <Card className="w-full max-w-[480px] shadow-lg mx-4">
        <CardHeader className="flex items-center justify-center space-y-2 pb-8 pt-6">
--- a/lightrag_webui/src/features/SiteHeader.tsx
+++ b/lightrag_webui/src/features/SiteHeader.tsx
@@ -1,7 +1,6 @@
 import Button from '@/components/ui/Button'
-import { SiteInfo } from '@/lib/constants'
+import { SiteInfo, webuiPrefix } from '@/lib/constants'
 import AppSettings from '@/components/AppSettings'
-import LanguageToggle from '@/components/LanguageToggle'
 import { TabsList, TabsTrigger } from '@/components/ui/Tabs'
 import { useSettingsStore } from '@/stores/settings'
 import { useAuthStore } from '@/stores/state'
@@ -67,7 +66,7 @@ export default function SiteHeader() {

  return (
    <header className="border-border/40 bg-background/95 supports-[backdrop-filter]:bg-background/60 sticky top-0 z-50 flex h-10 w-full border-b px-4 backdrop-blur">
-      <a href="/" className="mr-6 flex items-center gap-2">
+      <a href={webuiPrefix} className="mr-6 flex items-center gap-2">
        <ZapIcon className="size-4 text-emerald-400" aria-hidden="true" />
        {/* <img src='/logo.png' className="size-4" /> */}
        <span className="font-bold md:inline-block">{SiteInfo.name}</span>
@@ -85,6 +84,9 @@ export default function SiteHeader() {
            </a>
          </Button>
          <AppSettings />
+          <Button variant="ghost" size="icon" side="bottom" tooltip={t('header.logout')} onClick={handleLogout}>
+            <LogOutIcon className="size-4" aria-hidden="true" />
+          </Button>
        </div>
      </nav>
    </header>
--- a/lightrag_webui/src/lib/constants.ts
+++ b/lightrag_webui/src/lib/constants.ts
@@ -1,6 +1,6 @@
 import { ButtonVariantType } from '@/components/ui/Button'

-export const backendBaseUrl = 'http://localhost:9621/'
+export const backendBaseUrl = ''
 export const webuiPrefix = ''

 export const controlButtonVariant: ButtonVariantType = 'ghost'
--- a/lightrag_webui/src/locales/en.json
+++ b/lightrag_webui/src/locales/en.json
@@ -12,6 +12,7 @@
    "retrieval": "Retrieval",
    "api": "API",
    "projectRepository": "Project Repository",
+    "logout": "Logout",
    "themeToggle": {
      "switchToLight": "Switch to light theme",
      "switchToDark": "Switch to dark theme"
--- a/lightrag_webui/src/locales/zh.json
+++ b/lightrag_webui/src/locales/zh.json
@@ -12,6 +12,7 @@
    "retrieval": "检索",
    "api": "API",
    "projectRepository": "项目仓库",
+    "logout": "退出登录",
    "themeToggle": {
      "switchToLight": "切换到浅色主题",
      "switchToDark": "切换到深色主题"