update

canyon-project · Jan 18, 2024 · 547f270 · 547f270
1 parent 7910f25
commit 547f270
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 18 deletions.
diff --git a/packages/canyon-platform/index.html b/packages/canyon-platform/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Canyon</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/packages/canyon-platform/locales/cn.json b/packages/canyon-platform/locales/cn.json
@@ -1,7 +1,8 @@
 {
   "menus": {
     "projects": "项目",
-    "settings": "设置"
+    "settings": "设置",
+    "docs": "文档"
   },
   "projects": {
     "desc": "查看与您的账户相关的所有项目",
@@ -13,7 +14,9 @@
       "option": "操作",
       "delete": "删除",
       "detail": "详情"
-    }
+    },
+    "record": "记录",
+    "overview": "概览"
   },
   "settings": {
     "desc": "设置您的账户信息",
@@ -25,4 +28,4 @@
       "submit": "提交"
     }
   }
-}
+}
diff --git a/packages/canyon-platform/public/light-logo.svg b/packages/canyon-platform/public/light-logo.svg
diff --git a/packages/canyon-platform/public/logo.svg b/packages/canyon-platform/public/logo.svg
diff --git a/packages/canyon-platform/public/vite.svg b/packages/canyon-platform/public/vite.svg
diff --git a/packages/canyon-platform/public/welcome-bg.svg b/packages/canyon-platform/public/welcome-bg.svg
diff --git a/packages/canyon-platform/src/assets/book.svg b/packages/canyon-platform/src/assets/book.svg
diff --git a/packages/canyon-platform/src/pages/index.tsx b/packages/canyon-platform/src/pages/index.tsx
@@ -1,19 +1,19 @@
 import Icon, {
-  AppstoreOutlined,
+  AppstoreOutlined, ArrowRightOutlined,
   FolderOutlined,
   LogoutOutlined,
   MailOutlined,
   MoreOutlined,
   SettingOutlined,
 } from '@ant-design/icons';
 import {
-  Avatar,
+  Avatar, Button,
   ConfigProvider,
   Divider,
   Dropdown,
   Menu,
   MenuProps,
-  theme,
+  theme, Tooltip,
   Typography,
 } from 'antd';
 import { useEffect, useMemo, useState } from 'react';
@@ -27,7 +27,7 @@ import { useTranslation } from 'react-i18next';
 import logoSvg from '../assets/logo.svg';
 import AppFooter from '../components/app/footer.tsx';
 import ScrollBasedLayout from '../ScrollBasedLayout.tsx';
-
+import book from '../assets/book.svg'
 type MenuItem = Required<MenuProps>['items'][number];
 
 function getItem(
@@ -118,9 +118,24 @@ function Index() {
               className={'px-3 py-[16px] mb-[8px]'}
               style={{ borderBottom: `1px solid ${token.colorBorder}` }}
             >
-              <div className={'text-2xl font-bold flex items-center'}>
-                <img className={'w-[36px] mr-[8px]'} src={logoSvg} alt='' />
-                Arex
+              <div className={'text-xl font-bold flex items-center justify-between'}>
+
+                <div className={'cursor-pointer'} onClick={()=>{
+                  nav(`/`)
+                }}>
+                  <img className={'w-[30px] mr-[8px]'} src={logoSvg} alt='' />
+                  Arex
+                </div>
+
+                <Tooltip title={<div>
+                  <span>{t('menus.docs')}</span>
+                  <ArrowRightOutlined />
+                </div>}>
+                  <Button type={'text'} icon={<img src={book}/>}></Button>
+                </Tooltip>
+
+
+                {/*cursor-pointer*/}
               </div>
             </div>
 

diff --git a/packages/canyon-platform/src/pages/index/projects/[id]/index.tsx b/packages/canyon-platform/src/pages/index/projects/[id]/index.tsx
@@ -1,6 +1,7 @@
 import {Divider, Input, Table} from "antd";
 import {useState} from "react";
 import ReactECharts from 'echarts-for-react';
+import {useTranslation} from "react-i18next";
 const dataSource = [
   {
     commitSha: '1',
@@ -110,11 +111,12 @@ const option = {
   ]
 };
 const ProjectOverviewPage = () => {
+  const {t} = useTranslation();
   const [searchValue, setSearchValue] = useState('');
   return <div className={'px-6 pt-8 pb-8'}>
     <h1 className={'mb-10'}>{'canyon/canyon-demo'}</h1>
 
-    <p className={'text-[#6b6d85]'}>Overview</p>
+    <p className={'text-[#6b6d85]'}>{t('projects.overview')}</p>
 
     <div className={'flex mb-10'}>
       <div
@@ -146,7 +148,7 @@ const ProjectOverviewPage = () => {
       </div>
     </div>
 
-    <p className={'text-[#6b6d85]'}>Records</p>
+    <p className={'text-[#6b6d85]'}>{t('projects.record')}</p>
     <Input.Search
         placeholder={
           'Enter the "Commit Sha" or "Branch" or "Compare Target" or "Message" keyword for search'

diff --git a/packages/canyon-report/.eslintrc b/packages/canyon-report/.eslintrc
@@ -1,7 +1,6 @@
 {
   "extends": [
     "eslint:recommended",
-    "plugin:preact/recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:import/typescript",
     "plugin:prettier/recommended",
@@ -20,7 +19,6 @@
     "sourceType": "module"
   },
   "plugins": [
-    "preact",
     "@typescript-eslint",
     "import",
     "simple-import-sort",

diff --git a/packages/canyon-report/package.json b/packages/canyon-report/package.json
@@ -27,7 +27,6 @@
     "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-preact": "^0.1.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "prettier": "^3.0.3",