From abe386511218c2597eec9367fcb2feb2d9f19664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 4 Jun 2019 18:21:36 +0800
Subject: [PATCH] support dark theme

---
 .../src/components/Applications/index.less    |  4 +--
 AccountSettings/src/style.less                |  2 +-
 FormStepForm/src/components/Result/index.less |  2 +-
 ListBasicList/src/_mock.ts                    |  4 +--
 ListTableList/src/_mock.ts                    |  4 +--
 ResultFail/src/Result/index.less              |  2 +-
 ResultFail/src/index.less                     |  6 ++++
 ResultFail/src/index.tsx                      | 17 ++---------
 ResultSuccess/src/Result/index.less           |  2 +-
 ResultSuccess/src/index.less                  | 16 +++++++++++
 ResultSuccess/src/index.tsx                   | 28 +++++--------------
 UserRegisterResult/src/Result/index.less      |  2 +-
 package.json                                  |  2 +-
 13 files changed, 43 insertions(+), 48 deletions(-)
 create mode 100644 ResultSuccess/src/index.less

diff --git a/AccountCenter/src/components/Applications/index.less b/AccountCenter/src/components/Applications/index.less
index 6fa63e32..a8ad7554 100644
--- a/AccountCenter/src/components/Applications/index.less
+++ b/AccountCenter/src/components/Applications/index.less
@@ -10,9 +10,7 @@
     .ant-card-meta-avatar {
       font-size: 0;
     }
-    .ant-card-actions {
-      background: #f7f9fa;
-    }
+
     .ant-list .ant-list-item-content-single {
       max-width: 100%;
     }
diff --git a/AccountSettings/src/style.less b/AccountSettings/src/style.less
index abda0287..6a859578 100644
--- a/AccountSettings/src/style.less
+++ b/AccountSettings/src/style.less
@@ -36,7 +36,7 @@
   }
   :global {
     .ant-list-split .ant-list-item:last-child {
-      border-bottom: 1px solid #e8e8e8;
+      border-bottom: 1px solid @border-color-split;
     }
     .ant-list-item {
       padding-top: 14px;
diff --git a/FormStepForm/src/components/Result/index.less b/FormStepForm/src/components/Result/index.less
index 00c95879..cc4ed6eb 100644
--- a/FormStepForm/src/components/Result/index.less
+++ b/FormStepForm/src/components/Result/index.less
@@ -40,7 +40,7 @@
   .extra {
     padding: 24px 40px;
     text-align: left;
-    background: #fafafa;
+    background: @component-background;
     border-radius: @border-radius-sm;
 
     @media screen and (max-width: @screen-xs) {
diff --git a/ListBasicList/src/_mock.ts b/ListBasicList/src/_mock.ts
index f94d793b..7567867f 100644
--- a/ListBasicList/src/_mock.ts
+++ b/ListBasicList/src/_mock.ts
@@ -100,7 +100,7 @@ function fakeList(count: number): BasicListItemDataType[] {
   return list;
 }
 
-let sourceData: Array<BasicListItemDataType>;
+let sourceData: Array<BasicListItemDataType> = [];
 
 function getFakeList(req: { query: any }, res: { json: (arg0: BasicListItemDataType[]) => void }) {
   const params = req.query;
@@ -117,7 +117,7 @@ function postFakeList(req: { body: any }, res: { json: (arg0: BasicListItemDataT
   // const params = getUrlParams(url);
   const { method, id } = body;
   // const count = (params.count * 1) || 20;
-  let result = sourceData;
+  let result = sourceData || [];
 
   switch (method) {
     case 'delete':
diff --git a/ListTableList/src/_mock.ts b/ListTableList/src/_mock.ts
index 1800036b..fe29d304 100644
--- a/ListTableList/src/_mock.ts
+++ b/ListTableList/src/_mock.ts
@@ -155,6 +155,6 @@ function postRule(
 }
 
 export default {
-  'GET /api/': getRule,
-  'POST /api/': postRule,
+  'GET /api/rule': getRule,
+  'POST /api/rule': postRule,
 };
diff --git a/ResultFail/src/Result/index.less b/ResultFail/src/Result/index.less
index 00c95879..f1944ca3 100644
--- a/ResultFail/src/Result/index.less
+++ b/ResultFail/src/Result/index.less
@@ -40,7 +40,7 @@
   .extra {
     padding: 24px 40px;
     text-align: left;
-    background: #fafafa;
+    background: @background-color-light;
     border-radius: @border-radius-sm;
 
     @media screen and (max-width: @screen-xs) {
diff --git a/ResultFail/src/index.less b/ResultFail/src/index.less
index c594abfd..c219f290 100644
--- a/ResultFail/src/index.less
+++ b/ResultFail/src/index.less
@@ -3,3 +3,9 @@
 .error_icon {
   color: @highlight-color;
 }
+.title {
+  margin-bottom: 16px;
+  color: @heading-color;
+  font-weight: 500;
+  font-size: 16px;
+}
diff --git a/ResultFail/src/index.tsx b/ResultFail/src/index.tsx
index b4be7061..d0d38363 100644
--- a/ResultFail/src/index.tsx
+++ b/ResultFail/src/index.tsx
@@ -1,20 +1,13 @@
 import React, { Fragment } from 'react';
 import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import { Button, Icon, Card } from 'antd';
-import Result from './Result';
 import { GridContent } from '@ant-design/pro-layout';
+import Result from './Result';
 import styles from './index.less';
 
 const extra = (
   <Fragment>
-    <div
-      style={{
-        fontSize: 16,
-        color: 'rgba(0, 0, 0, 0.85)',
-        fontWeight: 500,
-        marginBottom: 16,
-      }}
-    >
+    <div className={styles.title}>
       <FormattedMessage
         id="BLOCK_NAME.error.hint-title"
         defaultMessage="The content you submitted has the following error:"
@@ -32,11 +25,7 @@ const extra = (
       </a>
     </div>
     <div>
-      <Icon
-        style={{ color: '#f5222d', marginRight: 8 }}
-        className={styles.error_icon}
-        type="close-circle-o"
-      />
+      <Icon style={{ marginRight: 8 }} className={styles.error_icon} type="close-circle-o" />
       <FormattedMessage
         id="BLOCK_NAME.error.hint-text2"
         defaultMessage="Your account is not yet eligible to apply"
diff --git a/ResultSuccess/src/Result/index.less b/ResultSuccess/src/Result/index.less
index 00c95879..f1944ca3 100644
--- a/ResultSuccess/src/Result/index.less
+++ b/ResultSuccess/src/Result/index.less
@@ -40,7 +40,7 @@
   .extra {
     padding: 24px 40px;
     text-align: left;
-    background: #fafafa;
+    background: @background-color-light;
     border-radius: @border-radius-sm;
 
     @media screen and (max-width: @screen-xs) {
diff --git a/ResultSuccess/src/index.less b/ResultSuccess/src/index.less
new file mode 100644
index 00000000..3610827e
--- /dev/null
+++ b/ResultSuccess/src/index.less
@@ -0,0 +1,16 @@
+@import '~antd/lib/style/themes/default.less';
+
+.title {
+  position: relative;
+  left: 42px;
+  color: @text-color;
+  font-size: 12px;
+  text-align: left;
+}
+
+.head-title {
+  margin-bottom: 20px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500px;
+  font-size: 16px;
+}
diff --git a/ResultSuccess/src/index.tsx b/ResultSuccess/src/index.tsx
index 64dca84d..4a45c2cd 100644
--- a/ResultSuccess/src/index.tsx
+++ b/ResultSuccess/src/index.tsx
@@ -3,22 +3,15 @@ import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import { Button, Row, Col, Icon, Steps, Card } from 'antd';
 import Result from './Result';
 import { GridContent } from '@ant-design/pro-layout';
+import styles from './index.less';
 
 const { Step } = Steps;
 
 const desc1 = (
-  <div
-    style={{
-      fontSize: 12,
-      color: 'rgba(0, 0, 0, 0.45)',
-      position: 'relative',
-      left: 42,
-      textAlign: 'left',
-    }}
-  >
+  <div className={styles.title}>
     <div style={{ margin: '8px 0 4px' }}>
       <FormattedMessage id="BLOCK_NAME.success.step1-operator" defaultMessage="Qu Lili" />
-      <Icon style={{ marginLeft: 8 }} type="dingding-o" />
+      <Icon style={{ marginLeft: 8, color: '#00A0E9' }} type="dingding-o" />
     </div>
     <div>2016-12-12 12:32</div>
   </div>
@@ -40,31 +33,24 @@ const desc2 = (
 
 const extra = (
   <Fragment>
-    <div
-      style={{
-        fontSize: 16,
-        color: 'rgba(0, 0, 0, 0.85)',
-        fontWeight: 500,
-        marginBottom: 20,
-      }}
-    >
+    <div className={styles['head-title']}>
       <FormattedMessage id="BLOCK_NAME.success.operate-title" defaultMessage="Project Name" />
     </div>
     <Row style={{ marginBottom: 16 }}>
       <Col xs={24} sm={12} md={12} lg={12} xl={6}>
-        <span style={{ color: 'rgba(0, 0, 0, 0.85)' }}>
+        <span>
           <FormattedMessage id="BLOCK_NAME.success.operate-id" defaultMessage="Project ID：" />
         </span>
         23421
       </Col>
       <Col xs={24} sm={12} md={12} lg={12} xl={6}>
-        <span style={{ color: 'rgba(0, 0, 0, 0.85)' }}>
+        <span>
           <FormattedMessage id="BLOCK_NAME.success.principal" defaultMessage="Principal：" />
         </span>
         <FormattedMessage id="BLOCK_NAME.success.step1-operator" defaultMessage="Qu Lili" />
       </Col>
       <Col xs={24} sm={24} md={24} lg={24} xl={12}>
-        <span style={{ color: 'rgba(0, 0, 0, 0.85)' }}>
+        <span>
           <FormattedMessage
             id="BLOCK_NAME.success.operate-time"
             defaultMessage="Effective time："
diff --git a/UserRegisterResult/src/Result/index.less b/UserRegisterResult/src/Result/index.less
index 00c95879..f1944ca3 100644
--- a/UserRegisterResult/src/Result/index.less
+++ b/UserRegisterResult/src/Result/index.less
@@ -40,7 +40,7 @@
   .extra {
     padding: 24px 40px;
     text-align: left;
-    background: #fafafa;
+    background: @background-color-light;
     border-radius: @border-radius-sm;
 
     @media screen and (max-width: @screen-xs) {
diff --git a/package.json b/package.json
index 24495c3f..b3228ee6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "cross-env PAGES_PATH='ProfileAdvanced/src' umi dev",
+    "dev": "cross-env PAGES_PATH='ResultSuccess/src' umi dev",
     "lint": "npm run lint:ts && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
     "lint-staged:ts": "tslint",
-- 
GitLab