fix: bugs

521xueweihan · 521xueweihan · commit fd9ae515b056 · 2024-09-04T17:35:51.000+08:00
diff --git a/public/locales/en/repository.json b/public/locales/en/repository.json
@@ -6,7 +6,7 @@
   },
   "info": {
     "claimed": "Claimed",
-    "unclaim": "Unclaimed",
+    "claim": "Claim",
     "score_desc": "HelloGitHub Rating",
     "score_user_desc": "{{count}} ratings",
     "vite": "Visit",
diff --git a/public/locales/zh/repository.json b/public/locales/zh/repository.json
@@ -6,7 +6,7 @@
   },
   "info": {
     "claimed": "已认领",
-    "unclaim": "未认领",
+    "claim": "认领",
     "score_desc": "HelloGitHub 评分",
     "score_user_desc": "{{count}} 人评分",
     "vite": "访问",
diff --git a/src/components/rankTable/RankTable.tsx b/src/components/rankTable/RankTable.tsx
@@ -10,12 +10,13 @@ type column = {
   title: string;
   width: number | string;
   percent?: boolean;
-  render: (row: any, showPercent?: boolean) => any;
+  render: (row: any, showPercent?: boolean, i18n_lang?: string) => any;
 };
 
 type TableProps = {
   columns: column[];
   list: RankDataItem[];
+  i18n_lang: string;
 };
 
 export const getMonthName = (
@@ -35,7 +36,7 @@ export const getMonthName = (
   return date.toLocaleString(i18n_lang, { month: format });
 };
 
-export const Table = ({ columns, list }: TableProps) => {
+export const RankTable = ({ columns, list, i18n_lang }: TableProps) => {
   return (
     <div className='overflow-hidden rounded-lg border shadow dark:border-gray-700 dark:shadow-none'>
       <table className='w-min	min-w-full table-fixed divide-y-2 divide-gray-200 text-sm dark:divide-gray-700'>
@@ -60,7 +61,7 @@ export const Table = ({ columns, list }: TableProps) => {
               {columns.map(({ key, render, percent }) => {
                 let content = row[key];
                 if (render) {
-                  content = render(row, percent);
+                  content = render(row, percent, i18n_lang);
                 }
                 return (
                   <td
@@ -79,10 +80,6 @@ export const Table = ({ columns, list }: TableProps) => {
   );
 };
 
-export default function RankTable({ columns = [], list = [] }: TableProps) {
-  return <Table columns={columns} list={list} />;
-}
-
 type RankSearchBarProps = {
   title: string;
   logo: string;
diff --git a/src/components/report/Report.tsx b/src/components/report/Report.tsx
@@ -3,15 +3,25 @@ import { IoMdRemove, IoMdTrendingDown, IoMdTrendingUp } from 'react-icons/io';
 
 import { RankDataItem } from '@/types/rank';
 
-export const ChangeColumnRender = (row: RankDataItem, showPercent = false) => {
+export const ChangeColumnRender = (
+  row: RankDataItem,
+  showPercent = false,
+  i18n_lang: string
+) => {
   let text = '-';
   if (row.change !== null) {
     text = showPercent ? `${row.change}%` : `${row.change}`;
   }
 
   return (
     <div className='flex items-center'>
-      {row.change < 0 ? (
+      {i18n_lang === 'en' ? (
+        row.change < 0 ? (
+          <AiFillCaretDown className='text-red-500' />
+        ) : (
+          <AiFillCaretUp className='text-green-500' />
+        )
+      ) : row.change < 0 ? (
         <AiFillCaretDown className='text-green-500' />
       ) : (
         <AiFillCaretUp className='text-red-500' />
diff --git a/src/components/respository/Info.tsx b/src/components/respository/Info.tsx
@@ -470,7 +470,7 @@ const Info = ({ repo, t, i18n_lang }: RepositoryProps) => {
               <NoPrefetchLink href={`/repository/${repo.rid}/embed`}>
                 <div className='flex cursor-pointer items-center justify-center text-blue-500 hover:text-current active:text-gray-400 md:hover:text-blue-600'>
                   <BsPersonCheck className='mr-1' size={16} />
-                  {t('info.unclaim')}
+                  {t('info.claim')}
                 </div>
               </NoPrefetchLink>
             )}
diff --git a/src/hooks/useLoginContext.tsx b/src/hooks/useLoginContext.tsx
@@ -116,6 +116,7 @@ export const LoginProvider = ({
       // 3. 根据 me 接口的结果判断 token 是否过期
       // 4. isLogin 为 true 但 token 校验失败，则清理 localStorage
       localStorage.clear();
+      setIsLogin(false);
     }
     if (localStorage.theme) {
       setTheme(localStorage.theme);
diff --git a/src/pages/report/db-engines.tsx b/src/pages/report/db-engines.tsx
@@ -6,9 +6,10 @@ import { useMemo } from 'react';
 
 import Loading from '@/components/loading/Loading';
 import Navbar from '@/components/navbar/Navbar';
-import RankTable, {
+import {
   getMonthName,
   RankSearchBar,
+  RankTable,
 } from '@/components/rankTable/RankTable';
 import {
   ChangeColumnRender,
@@ -105,10 +106,18 @@ const DBEnginesPage: NextPage<RankPageProps> = ({
               onChange={onSearch}
             />
             <div className='md:hidden'>
-              <RankTable columns={md_columns} list={list} />
+              <RankTable
+                columns={md_columns}
+                list={list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='hidden md:block'>
-              <RankTable columns={columns} list={list} />
+              <RankTable
+                columns={columns}
+                list={list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='mt-2 rounded-lg border bg-white p-2 text-sm dark:border-gray-700 dark:bg-gray-800 dark:text-gray-300'>
               <div className='whitespace-pre-wrap leading-8'>
diff --git a/src/pages/report/netcraft.tsx b/src/pages/report/netcraft.tsx
@@ -6,9 +6,10 @@ import { useMemo } from 'react';
 
 import Loading from '@/components/loading/Loading';
 import Navbar from '@/components/navbar/Navbar';
-import RankTable, {
+import {
   getMonthName,
   RankSearchBar,
+  RankTable,
 } from '@/components/rankTable/RankTable';
 import {
   ChangeColumnRender,
@@ -124,21 +125,37 @@ const NetcraftPage: NextPage<NetcraftRankPageProps> = ({
               <div className='pb-1 text-center text-sm font-semibold dark:text-gray-300'>
                 {t('netcraft.market_title')}
               </div>
-              <RankTable columns={md_columns} list={all_list} />
+              <RankTable
+                columns={md_columns}
+                list={all_list}
+                i18n_lang={i18n.language}
+              />
               <div className='pt-2 pb-1 text-center text-sm font-semibold dark:text-gray-300'>
                 {t('netcraft.active_title')}
               </div>
-              <RankTable columns={md_columns} list={active_list} />
+              <RankTable
+                columns={md_columns}
+                list={active_list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='hidden md:block'>
               <div className='pb-1 text-center text-sm font-semibold dark:text-gray-300'>
                 {t('netcraft.market_title')}
               </div>
-              <RankTable columns={columns} list={all_list} />
+              <RankTable
+                columns={columns}
+                list={all_list}
+                i18n_lang={i18n.language}
+              />
               <div className='pt-2 pb-1  text-center text-sm font-semibold dark:text-gray-300'>
                 {t('netcraft.active_title')}
               </div>
-              <RankTable columns={columns} list={active_list} />
+              <RankTable
+                columns={columns}
+                list={active_list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='mt-2 rounded-lg border bg-white p-2 text-sm dark:border-gray-700 dark:bg-gray-800 dark:text-gray-300'>
               <div className='whitespace-pre-wrap leading-8'>
diff --git a/src/pages/report/tiobe.tsx b/src/pages/report/tiobe.tsx
@@ -6,9 +6,10 @@ import { useMemo } from 'react';
 
 import Loading from '@/components/loading/Loading';
 import Navbar from '@/components/navbar/Navbar';
-import RankTable, {
+import {
   getMonthName,
   RankSearchBar,
+  RankTable,
 } from '@/components/rankTable/RankTable';
 import {
   ChangeColumnRender,
@@ -101,10 +102,18 @@ const TiobePage: NextPage<RankPageProps> = ({
               onChange={onSearch}
             />
             <div className='md:hidden'>
-              <RankTable columns={md_columns} list={list} />
+              <RankTable
+                columns={md_columns}
+                list={list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='hidden md:block'>
-              <RankTable columns={columns} list={list} />
+              <RankTable
+                columns={columns}
+                list={list}
+                i18n_lang={i18n.language}
+              />
             </div>
             <div className='mt-2 rounded-lg border bg-white p-2 text-sm dark:border-gray-700 dark:bg-gray-800 dark:text-gray-300'>
               <div className='whitespace-pre-wrap leading-8'>

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ export const LoginProvider = ({`
`116`	`116`	`// 3. 根据 me 接口的结果判断 token 是否过期`
`117`	`117`	`// 4. isLogin 为 true 但 token 校验失败，则清理 localStorage`
`118`	`118`	`localStorage.clear();`
	`119`	`+ setIsLogin(false);`
`119`	`120`	`}`
`120`	`121`	`if (localStorage.theme) {`
`121`	`122`	`setTheme(localStorage.theme);`