This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/next by this push:
new d8e2502 Update boilerplate (#149)
d8e2502 is described below
commit d8e250275d4a81403f58c4d4c17dc2cac3fd1b69
Author: 琚致远 <[email protected]>
AuthorDate: Tue Mar 10 13:58:56 2020 +0800
Update boilerplate (#149)
* feat: update DefaultFooter
* feat: update title
* feat: remove HeaderSearch
* feat: update documentation link
* feat: update title
* feat: update logo
---
config/defaultSettings.ts | 2 +-
src/assets/logo.svg | 22 +++++++++++++++++++++-
src/components/GlobalHeader/RightContent.tsx | 28 ++--------------------------
src/layouts/BasicLayout.tsx | 18 +++---------------
src/layouts/UserLayout.tsx | 17 ++++++++++++++---
src/manifest.json | 4 ++--
src/pages/document.ejs | 4 ++--
7 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index c1dba42..6c56795 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -55,7 +55,7 @@ export default {
menu: {
locale: true,
},
- title: 'Ant Design Pro',
+ title: 'APISIX Dashboard',
pwa: false,
iconfontUrl: '',
} as DefaultSettings;
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
index 239bf69..ef5ec53 100644
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -1 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"
version="1.1" viewBox="0 0 200 200"><title>Group 28 Copy 5</title><desc>Created
with Sketch.</desc><defs><linearGradient id="linearGradient-1" x1="62.102%"
x2="108.197%" y1="0%" y2="37.864%"><stop offset="0%"
stop-color="#4285EB"/><stop offset="100%"
stop-color="#2EC7FF"/></linearGradient><linearGradient id="linearGradient-2"
x1="69.644%" x2="54.043%" y1="0%" y2="108.457%"><stop of [...]
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg";>
+ <defs>
+ <linearGradient id="id0" gradientUnits="userSpaceOnUse" x1="25119.8"
y1="11052.5" x2="21725.7" y2="21551.7" gradientTransform="matrix(0.028095, 0,
0, 0.028095, -492.867096, -144.769821)">
+ <stop offset="0" style="stop-color:#A92F33"/>
+ <stop offset="1" style="stop-color:#E62129"/>
+ </linearGradient>
+ <linearGradient id="id1" gradientUnits="userSpaceOnUse" x1="27026.6"
y1="8021.8" x2="30514.6" y2="16218.5" gradientTransform="matrix(0.028095, 0, 0,
0.028095, -492.867096, -144.769821)">
+ <stop offset="0" style="stop-color:#A92F33"/>
+ <stop offset="1" style="stop-color:#E8443F"/>
+ </linearGradient>
+ <linearGradient id="id2" gradientUnits="userSpaceOnUse" x1="23046.1"
y1="14340.2" x2="26713.9" y2="9900.07" gradientTransform="matrix(0.028095, 0,
0, 0.028095, -492.867096, -144.769821)">
+ <stop offset="0" style="stop-color:#E62129"/>
+ <stop offset="1" style="stop-color:#E8443F"/>
+ </linearGradient>
+ </defs>
+ <path class="fil1" d="M 156.005 337.641 L 247.284 205.232 L 218.515 160.195
L 134.429 259.986 C 134.429 259.986 134.429 259.986 134.429 259.986 C 134.429
259.986 134.429 259.986 134.429 259.986 C 106.503 293.139 102.007 301.399
78.689 340.281 L 156.033 337.641 Z" style="fill: url(#id0);"/>
+ <path class="fil2" d="M 382.616 340.281 L 419.616 340.141 L 253.325 51.188 L
253.325 51.188 L 333.619 340.281 L 382.644 340.281 Z M 253.297 51.188 L 211.239
120.694 L 219.695 106.732 L 253.297 51.216 Z" style="fill: url(#id1);"/>
+ <polygon class="fil3" points="218.487 160.195 333.59 340.281 253.297 51.188
253.297 51.188 253.297 51.188 219.724 106.703 78.661 340.281" style="fill:
url(#id2);"/>
+ <path d="M 116.292 266.849 L 116.292 278.269 L 111.252 278.269 L 111.252
277.099 C 111.119 277.392 110.855 277.659 110.462 277.899 C 110.062 278.146
109.702 278.269 109.382 278.269 L 95.732 278.269 C 95.365 278.269 94.995
278.176 94.622 277.989 C 94.249 277.796 93.945 277.526 93.712 277.179 C 93.479
276.839 93.359 276.452 93.352 276.019 C 93.345 275.192 93.335 274.146 93.322
272.879 C 93.309 271.612 93.302 270.946 93.302 270.879 C 93.302 269.932 93.555
269.189 94.062 268.649 C 94.562 2 [...]
+</svg>
\ No newline at end of file
diff --git a/src/components/GlobalHeader/RightContent.tsx
b/src/components/GlobalHeader/RightContent.tsx
index 3040ceb..ff4c537 100644
--- a/src/components/GlobalHeader/RightContent.tsx
+++ b/src/components/GlobalHeader/RightContent.tsx
@@ -4,7 +4,6 @@ import React from 'react';
import { connect } from 'dva';
import { ConnectProps, ConnectState } from '@/models/connect';
import Avatar from './AvatarDropdown';
-import HeaderSearch from '../HeaderSearch';
import SelectLang from '../SelectLang';
import styles from './index.less';
@@ -30,33 +29,10 @@ const GlobalHeaderRight: React.SFC<GlobalHeaderRightProps>
= props => {
return (
<div className={className}>
- <HeaderSearch
- className={`${styles.action} ${styles.search}`}
- placeholder="站内搜索"
- defaultValue="umi ui"
- options={[
- { label: <a href="https://umijs.org/zh/guide/umi-ui.html";>umi
ui</a>, value: 'umi ui' },
- {
- label: <a href="next.ant.design">Ant Design</a>,
- value: 'Ant Design',
- },
- {
- label: <a href="https://protable.ant.design/";>Pro Table</a>,
- value: 'Pro Table',
- },
- {
- label: <a href="https://prolayout.ant.design/";>Pro Layout</a>,
- value: 'Pro Layout',
- },
- ]}
- // onSearch={value => {
- // //console.log('input', value);
- // }}
- />
- <Tooltip title="使用文档">
+ <Tooltip title="Documentation">
<a
target="_blank"
- href="https://pro.ant.design/docs/getting-started";
+ href="https://github.com/apache/incubator-apisix";
rel="noopener noreferrer"
className={styles.action}
>
diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index f87b57b..256570c 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -61,24 +61,12 @@ const menuDataRender = (menuList: MenuDataItem[]):
MenuDataItem[] =>
const defaultFooterDom = (
<DefaultFooter
- copyright="2019 蚂蚁金服体验技术部出品"
+ copyright="2020 Apache APISIX"
links={[
{
- key: 'Ant Design Pro',
- title: 'Ant Design Pro',
- href: 'https://pro.ant.design',
- blankTarget: true,
- },
- {
- key: 'github',
+ key: 'GitHub',
title: <GithubOutlined />,
- href: 'https://github.com/ant-design/ant-design-pro',
- blankTarget: true,
- },
- {
- key: 'Ant Design',
- title: 'Ant Design',
- href: 'https://ant.design',
+ href: 'https://github.com/apache/incubator-apisix',
blankTarget: true,
},
]}
diff --git a/src/layouts/UserLayout.tsx b/src/layouts/UserLayout.tsx
index add204e..5737569 100644
--- a/src/layouts/UserLayout.tsx
+++ b/src/layouts/UserLayout.tsx
@@ -6,6 +6,7 @@ import { formatMessage } from 'umi-plugin-react/locale';
import { connect } from 'dva';
import SelectLang from '@/components/SelectLang';
import { ConnectProps, ConnectState } from '@/models/connect';
+import { GithubOutlined } from '@ant-design/icons';
import logo from '../assets/logo.svg';
import styles from './UserLayout.less';
@@ -51,14 +52,24 @@ const UserLayout: React.FC<UserLayoutProps> = props => {
<div className={styles.header}>
<Link to="/">
<img alt="logo" className={styles.logo} src={logo} />
- <span className={styles.title}>Ant Design</span>
+ <span className={styles.title}>APISIX Dashboard</span>
</Link>
</div>
- <div className={styles.desc}>Ant Design 是西湖区最具影响力的 Web 设计规范</div>
+ <div className={styles.desc}>Cloud-Native Microservices API
Gateway</div>
</div>
{children}
</div>
- <DefaultFooter />
+ <DefaultFooter
+ copyright="2020 Apache APISIX"
+ links={[
+ {
+ key: 'GitHub',
+ title: <GithubOutlined />,
+ href: 'https://github.com/apache/incubator-apisix',
+ blankTarget: true,
+ },
+ ]}
+ />
</div>
</>
);
diff --git a/src/manifest.json b/src/manifest.json
index 839bc5b..a4f731e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
- "name": "Ant Design Pro",
- "short_name": "Ant Design Pro",
+ "name": "Apache APISIX Dashboard",
+ "short_name": "Apache APISIX Dashboard",
"display": "standalone",
"start_url": "./?utm_source=homescreen",
"theme_color": "#002140",
diff --git a/src/pages/document.ejs b/src/pages/document.ejs
index 450ba45..8c4db94 100644
--- a/src/pages/document.ejs
+++ b/src/pages/document.ejs
@@ -7,7 +7,7 @@
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0,
user-scalable=0"
/>
- <title>Ant Design Pro</title>
+ <title>Apache APISIX Dashboard</title>
<link rel="icon" href="/favicon.png" type="image/x-icon" />
</head>
<body>
@@ -185,7 +185,7 @@
width="32"
style="margin-right: 8px;"
/>
- Ant Design
+ Apache APISIX Dashboard
</div>
</div>
</div>
