Squashed commit of the following:

commit c034b88 Author: 老J <[email protected]> Date: Fri May 10 19:29:03 2024 +0800 v1.2.13 Fix the issue of the logo not displaying in dark mode. commit 632bcea Author: 老J <[email protected]> Date: Fri May 10 19:22:10 2024 +0800 Fix the issue of the logo not displaying in dark mode. commit eb9bce5 Author: 老J <[email protected]> Date: Thu May 9 19:39:24 2024 +0800 Remove object information from uploading message.
llaoj · May 10, 2024 · 15ab355 · 15ab355
1 parent 0784159
commit 15ab355
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 15 deletions.
diff --git a/frontend/app/[locale]/user/email-code/page.tsx b/frontend/app/[locale]/user/email-code/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
 import { FormEvent, useState } from "react";
 import { useRouter } from "next/navigation";
 import { useLocale, useTranslations } from "next-intl";
+import Logo from "@/components/logo";
 
 export default function EmailCode({
   searchParams,
@@ -49,7 +49,7 @@ export default function EmailCode({
       className="card w-full md:w-[32rem] bg-base-100 shadow-xl"
     >
       <div className="card-body gap-4">
-        <Image src="/gcopy.svg" width={50} height={50} alt="gcopy's logo" />
+        <Logo />
         <div className="flex items-center">
           <a className="btn btn-ghost btn-circle btn-xs" href="/">
             <svg

diff --git a/frontend/app/[locale]/user/login/page.tsx b/frontend/app/[locale]/user/login/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
 import { FormEvent, useState } from "react";
 import { useRouter } from "next/navigation";
 import { useLocale, useTranslations } from "next-intl";
+import Logo from "@/components/logo";
 
 export default function Login({
   searchParams,
@@ -60,7 +60,7 @@ export default function Login({
       className="card w-full md:w-[32rem] bg-base-100 shadow-xl"
     >
       <div className="card-body gap-4">
-        <Image src="/gcopy.svg" width={50} height={50} alt="gcopy's logo" />
+        <Logo />
         <div className="flex items-center">
           <a
             className="btn btn-ghost btn-circle btn-xs"

diff --git a/frontend/components/logo.tsx b/frontend/components/logo.tsx
@@ -0,0 +1,21 @@
+export default function Logo() {
+  return (
+    <div>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+        data-slot="icon"
+        className="w-12 h-12 dark:text-white"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="M8.25 7.5V6.108c0-1.135.845-2.098 1.976-2.192.373-.03.748-.057 1.123-.08M15.75 18H18a2.25 2.25 0 0 0 2.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48.424 48.424 0 0 0-1.123-.08M15.75 18.75v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5A3.375 3.375 0 0 0 6.375 7.5H5.25m11.9-3.664A2.251 2.251 0 0 0 15 2.25h-1.5a2.251 2.251 0 0 0-2.15 1.586m5.8 0c.065.21.1.433.1.664v.75h-6V4.5c0-.231.035-.454.1-.664M6.75 7.5H4.875c-.621 0-1.125.504-1.125 1.125v12c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V16.5a9 9 0 0 0-9-9Z"
+        />
+      </svg>
+    </div>
+  );
+}
diff --git a/frontend/components/sync-clipboard.tsx b/frontend/components/sync-clipboard.tsx
@@ -267,7 +267,7 @@ export default function SyncClipboard() {
       return;
     }
     addLog(t("logs.readSuccess"));
-    addLog(t("logs.uploading", { object: t(xtype) }));
+    addLog(t("logs.uploading"));
 
     const response = await fetch("/api/v1/clipboard", {
       method: "POST",
@@ -308,7 +308,7 @@ export default function SyncClipboard() {
   const uploadFileHandler = async (file: File) => {
     resetLog();
 
-    addLog(t("logs.uploading", { object: file.name }));
+    addLog(t("logs.uploading"));
     const response = await fetch("/api/v1/clipboard", {
       method: "POST",
       headers: {

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -63,7 +63,7 @@
       "clickAgain": "Click again due to browser security policies 👉",
       "clickPaste": "If the \"Paste\" appears on the page, click it to allow reading the clipboard.",
       "unchanged": "Clipboard unchanged.",
-      "uploading": "Uploading {object}",
+      "uploading": "Uploading...",
       "uploaded": "Uploaded {type}({index}).",
       "received": "Received {type}({index}) from {clientname}.",
       "unsupportedFormat": "Unsupported format: {format}.",

diff --git a/frontend/messages/zh.json b/frontend/messages/zh.json
@@ -63,7 +63,7 @@
       "clickAgain": "因为浏览器安全策略, 请再次点击 👉",
       "clickPaste": "如果页面出现\"粘贴\", 点击它以允许读取剪切板.",
       "unchanged": "剪切板没有改变.",
-      "uploading": "正在上传 {object}",
+      "uploading": "正在上传...",
       "uploaded": "已上传 {type}({index}).",
       "received": "已接收 {type}({index}) 来自 {clientname}.",
       "unsupportedFormat": "不支持的格式: {format}.",

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gcopy",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3375 --experimental-https",

diff --git a/frontend/public/gcopy.svg b/frontend/public/gcopy.svg
diff --git a/frontend/public/next.svg b/frontend/public/next.svg
diff --git a/frontend/public/vercel.svg b/frontend/public/vercel.svg
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.2.12
+v1.2.13