You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/05/20 08:04:12 UTC
[incubator-apisix-dashboard] branch feat-refactor updated: feat:
refactor SSL structure
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch feat-refactor
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/feat-refactor by this push:
new 5f81983 feat: refactor SSL structure
5f81983 is described below
commit 5f81983df5acf3fc495ad2d2fb4229da7eb3aeff
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Wed May 20 15:52:19 2020 +0800
feat: refactor SSL structure
---
config/config.ts | 4 ++--
src/pages/ssl/{pages/create/style.less => Create.less} | 0
src/pages/ssl/{pages/create/index.tsx => Create.tsx} | 2 +-
src/pages/ssl/{pages/list/index.tsx => List.tsx} | 0
src/pages/ssl/{pages/create => }/components/CertificateForm/index.tsx | 2 +-
.../ssl/{pages/create => }/components/CertificateUploader/index.tsx | 4 ++--
src/pages/ssl/{pages/create => }/components/Step1/index.tsx | 4 ++--
src/pages/ssl/{pages/create => }/components/Step2/index.tsx | 2 +-
src/pages/ssl/{pages/create => }/components/Step3/index.tsx | 2 +-
src/pages/ssl/{pages/create => }/components/Step4/index.tsx | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/config/config.ts b/config/config.ts
index b6bb295..7524365 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -66,13 +66,13 @@ export default defineConfig({
{
path: '/ssl/list',
name: 'list',
- component: './SSLModule/pages/list',
+ component: './ssl/List',
hideInMenu: true,
},
{
name: 'create',
path: '/ssl/create',
- component: './SSLModule/pages/create',
+ component: './ssl/Create',
hideInMenu: true,
},
],
diff --git a/src/pages/ssl/pages/create/style.less b/src/pages/ssl/Create.less
similarity index 100%
rename from src/pages/ssl/pages/create/style.less
rename to src/pages/ssl/Create.less
diff --git a/src/pages/ssl/pages/create/index.tsx b/src/pages/ssl/Create.tsx
similarity index 98%
rename from src/pages/ssl/pages/create/index.tsx
rename to src/pages/ssl/Create.tsx
index 2d2db9a..0ec6ff4 100644
--- a/src/pages/ssl/pages/create/index.tsx
+++ b/src/pages/ssl/Create.tsx
@@ -6,7 +6,7 @@ import Step1 from './components/Step1';
import Step2 from './components/Step2';
import Step3 from './components/Step3';
import Step4 from './components/Step4';
-import styles from './style.less';
+import styles from './Create.less';
const { Step } = Steps;
diff --git a/src/pages/ssl/pages/list/index.tsx b/src/pages/ssl/List.tsx
similarity index 100%
rename from src/pages/ssl/pages/list/index.tsx
rename to src/pages/ssl/List.tsx
diff --git a/src/pages/ssl/pages/create/components/CertificateForm/index.tsx b/src/pages/ssl/components/CertificateForm/index.tsx
similarity index 97%
rename from src/pages/ssl/pages/create/components/CertificateForm/index.tsx
rename to src/pages/ssl/components/CertificateForm/index.tsx
index ef9ebbe..0cbd083 100644
--- a/src/pages/ssl/pages/create/components/CertificateForm/index.tsx
+++ b/src/pages/ssl/components/CertificateForm/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Form, Input } from 'antd';
import { useIntl } from 'umi';
import { FormInstance } from 'antd/lib/form';
-import { FormData } from '../..';
+import { FormData } from '../../Create';
interface CertificateFormProps {
mode: 'EDIT' | 'VIEW';
diff --git a/src/pages/ssl/pages/create/components/CertificateUploader/index.tsx b/src/pages/ssl/components/CertificateUploader/index.tsx
similarity index 97%
rename from src/pages/ssl/pages/create/components/CertificateUploader/index.tsx
rename to src/pages/ssl/components/CertificateUploader/index.tsx
index 9408862..aaa35d6 100644
--- a/src/pages/ssl/pages/create/components/CertificateUploader/index.tsx
+++ b/src/pages/ssl/components/CertificateUploader/index.tsx
@@ -4,8 +4,8 @@ import { UploadOutlined } from '@ant-design/icons';
import { UploadFile } from 'antd/lib/upload/interface';
import { useForm } from 'antd/es/form/util';
import forge from 'node-forge';
-import { FormData } from '../..';
-import styles from '../../style.less';
+import { FormData } from '../../Create';
+import styles from '../../Create.less';
export interface AltName {
value: string;
diff --git a/src/pages/ssl/pages/create/components/Step1/index.tsx b/src/pages/ssl/components/Step1/index.tsx
similarity index 94%
rename from src/pages/ssl/pages/create/components/Step1/index.tsx
rename to src/pages/ssl/components/Step1/index.tsx
index bd702d4..c463d12 100644
--- a/src/pages/ssl/pages/create/components/Step1/index.tsx
+++ b/src/pages/ssl/components/Step1/index.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Form, Button, Select } from 'antd';
-import styles from '../../style.less';
-import { StepProps } from '../..';
+import styles from '../../Create.less';
+import { StepProps } from '../../Create';
const { Option } = Select;
diff --git a/src/pages/ssl/pages/create/components/Step2/index.tsx b/src/pages/ssl/components/Step2/index.tsx
similarity index 98%
rename from src/pages/ssl/pages/create/components/Step2/index.tsx
rename to src/pages/ssl/components/Step2/index.tsx
index f6e80b9..51c320f 100644
--- a/src/pages/ssl/pages/create/components/Step2/index.tsx
+++ b/src/pages/ssl/components/Step2/index.tsx
@@ -9,7 +9,7 @@ import {
UploadType,
AltName,
} from '../CertificateUploader';
-import { StepProps } from '../..';
+import { StepProps } from '../../Create';
const Step2: React.FC<StepProps> = ({ onStepChange, onFormChange, data }) => {
const [form] = Form.useForm();
diff --git a/src/pages/ssl/pages/create/components/Step3/index.tsx b/src/pages/ssl/components/Step3/index.tsx
similarity index 95%
rename from src/pages/ssl/pages/create/components/Step3/index.tsx
rename to src/pages/ssl/components/Step3/index.tsx
index 6bfc3d2..e1a921c 100644
--- a/src/pages/ssl/pages/create/components/Step3/index.tsx
+++ b/src/pages/ssl/components/Step3/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Form, Button } from 'antd';
import { create as createSSL } from '@/pages/ssl/service';
import CertificateForm from '../CertificateForm';
-import { StepProps } from '../..';
+import { StepProps } from '../../Create';
const Step3: React.FC<StepProps> = ({ data, onStepChange }) => {
const [form] = Form.useForm();
diff --git a/src/pages/ssl/pages/create/components/Step4/index.tsx b/src/pages/ssl/components/Step4/index.tsx
similarity index 94%
rename from src/pages/ssl/pages/create/components/Step4/index.tsx
rename to src/pages/ssl/components/Step4/index.tsx
index 1a503cc..de6ac17 100644
--- a/src/pages/ssl/pages/create/components/Step4/index.tsx
+++ b/src/pages/ssl/components/Step4/index.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Result, Button } from 'antd';
import { history } from 'umi';
-import { StepProps } from '../..';
+import { StepProps } from '../../Create';
const Step4: React.FC<StepProps> = ({ onStepChange, onFormChange }) => {
return (