From cb278ec742703c0f72dee51cb38c24358ce2c372 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 25 Nov 2024 11:46:24 +0800
Subject: [PATCH 1/9] fix: NEXT_PUBLIC_Links env example
---
.env.example | 2 +-
docker/.env.example | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.example b/.env.example
index 7b86098..2dcb8ba 100644
--- a/.env.example
+++ b/.env.example
@@ -12,6 +12,6 @@ NEXT_PUBLIC_FixedTopServerName=false
NEXT_PUBLIC_CustomLogo=https://nezha-cf.buycoffee.top/apple-touch-icon.png
NEXT_PUBLIC_CustomTitle=NezhaDash
NEXT_PUBLIC_CustomDescription=NezhaDash is a dashboard for Nezha.
-NEXT_PUBLIC_Links="[{"link":"https://github.com/hamster1963/nezha-dash","name":"GitHub"},{"link":"https://buycoffee.top/coffee","name":"Buycoffee☕️"}]"
+NEXT_PUBLIC_Links='[{"link":"https://github.com/hamster1963/nezha-dash","name":"GitHub"},{"link":"https://buycoffee.top/coffee","name":"Buycoffee☕️"}]'
NEXT_PUBLIC_DisableIndex=false
NEXT_PUBLIC_ShowTagCount=false
diff --git a/docker/.env.example b/docker/.env.example
index f597931..0f7c902 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -12,6 +12,6 @@ NEXT_PUBLIC_FixedTopServerName=false
NEXT_PUBLIC_CustomLogo=https://nezha-cf.buycoffee.top/apple-touch-icon.png
NEXT_PUBLIC_CustomTitle=NezhaDash
NEXT_PUBLIC_CustomDescription=NezhaDash is a dashboard for Nezha.
-NEXT_PUBLIC_Links="[{"link":"https://github.com/hamster1963/nezha-dash","name":"GitHub"},{"link":"https://buycoffee.top/coffee","name":"Buycoffee☕️"}]"
+NEXT_PUBLIC_Links='[{"link":"https://github.com/hamster1963/nezha-dash","name":"GitHub"},{"link":"https://buycoffee.top/coffee","name":"Buycoffee☕️"}]'
NEXT_PUBLIC_DisableIndex=false
NEXT_PUBLIC_ShowTagCount=false
\ No newline at end of file
From 0b061d805e0a1fb1273e392943930f5c01c67692 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 25 Nov 2024 15:16:40 +0800
Subject: [PATCH 2/9] fix(header): logo path
---
app/(main)/header.tsx | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/(main)/header.tsx b/app/(main)/header.tsx
index 197743b..ebcc1cc 100644
--- a/app/(main)/header.tsx
+++ b/app/(main)/header.tsx
@@ -7,13 +7,11 @@ import { Skeleton } from "@/components/ui/skeleton";
import getEnv from "@/lib/env-entry";
import { DateTime } from "luxon";
import { useTranslations } from "next-intl";
-import { useTheme } from "next-themes";
import { useRouter } from "next/navigation";
import React, { useEffect, useRef, useState } from "react";
function Header() {
const t = useTranslations("Header");
- const { resolvedTheme } = useTheme();
const customLogo = getEnv("NEXT_PUBLIC_CustomLogo");
const customTitle = getEnv("NEXT_PUBLIC_CustomTitle");
const customDescription = getEnv("NEXT_PUBLIC_CustomDescription");
@@ -35,14 +33,15 @@ function Header() {
width={40}
height={40}
alt="apple-touch-icon"
- src={
- customLogo
- ? customLogo
- : resolvedTheme === "light"
- ? "/apple-touch-icon.png"
- : "/apple-touch-icon-dark.png"
- }
- className="relative m-0! border-2 border-transparent h-6 w-6 object-cover object-top p-0!"
+ src={customLogo ? customLogo : "/apple-touch-icon.png"}
+ className="relative m-0! border-2 border-transparent h-6 w-6 object-cover object-top p-0! dark:hidden"
+ />
+ 
{customTitle ? customTitle : "NezhaDash"}
From 22a0b03a98e4714be7bb6a63088506299523a6e4 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 25 Nov 2024 15:33:53 +0800
Subject: [PATCH 3/9] chore: deps
---
bun.lockb | Bin 539814 -> 539814 bytes
package.json | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/bun.lockb b/bun.lockb
index 3c5409c768b034c3c0a6a78190469b9f7ddc7193..93e0b56a429cde90da970f8637609abb58837150 100755
GIT binary patch
delta 176
zcmV;h08js>`5>nGAdoH~mS1J(6Jp6RZA%DD;a!kD?gxGaVi#D^RyC{l{wf>vu}<29
zlW3eUgII*OScCy}jX=<~?w>rsXF4>rL-AK~HutyRDU;KXJS>M$^&%-(FBJL5(0+}5(9?~5(Kvm5(W4T0X2sPAO*Ju
eAO`Jh0W`Ptj0Vg?m-5&KAcx@32DjkP2gYpYPf-~F
delta 176
zcmV;h08js>`5>nGAdoH~nkO5$rD0kc;~P&>jOnp5SggII*OScCy}jX=_`9DR|@yV>qw|J&s#TkVe0hfsSqd3hS6Yt>Ju+Md3fChtbp
zvaJua(~X(sysu0TB8E9n@aJgr^=BQnZsCUw5(0+}5(9?~5(Kvm5(W4T0W^mOAO*Ju
eAO`Jh0W-Jsj0Vg?m*Uk1Acx@32DjkP2gYo>B~ecR
diff --git a/package.json b/package.json
index 9750edf..92d3c28 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"recharts": "^2.13.3",
"sharp": "^0.33.5",
"swr": "^2.2.6-beta.4",
- "tailwind-merge": "^2.5.4",
+ "tailwind-merge": "^2.5.5",
"tailwindcss-animate": "^1.0.7",
"typescript-eslint": "^8.15.0"
},
From 962a5cd4be92aa96410d785a152b8a8d475f1109 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 25 Nov 2024 15:34:21 +0800
Subject: [PATCH 4/9] fix(header): button hover color on dark mode
---
components/LanguageSwitcher.tsx | 2 +-
components/ThemeSwitcher.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/LanguageSwitcher.tsx b/components/LanguageSwitcher.tsx
index 16ffb64..a336d62 100644
--- a/components/LanguageSwitcher.tsx
+++ b/components/LanguageSwitcher.tsx
@@ -27,7 +27,7 @@ export function LanguageSwitcher() {