diff --git a/src/layouts/GlobalLayout.tsx b/src/layouts/GlobalLayout.tsx
deleted file mode 100644
index 8a1cd71..0000000
--- a/src/layouts/GlobalLayout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import styles from './BasicLayout.less';
-import { ComProps } from '../type/displayType';
-// import MuiThemeProvider from 'material-ui'
-
-// const styles = require('./BasicLayout');
-
-export default function GlobalLayout(props: ComProps) {
- return
我是全局layout{props.children}
;
-}
diff --git a/src/layouts/GlobalLayout/index.tsx b/src/layouts/GlobalLayout/index.tsx
new file mode 100644
index 0000000..c2c2f3e
--- /dev/null
+++ b/src/layouts/GlobalLayout/index.tsx
@@ -0,0 +1,9 @@
+import styles from '../BasicLayout/index.less';
+import { ComProps } from '../../type/common';
+// import MuiThemeProvider from 'material-ui'
+
+// const styles = require('./Index');
+
+export default function Index(props: ComProps) {
+ return
{props.children}
;
+}
diff --git a/src/layouts/LoginLayout/index.tsx b/src/layouts/LoginLayout/index.tsx
new file mode 100644
index 0000000..9121969
--- /dev/null
+++ b/src/layouts/LoginLayout/index.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import loginbg from 'assets/images/login/loginbg.png';
+
+export default function LoginLayout(props) {
+ return (
+
+ {props.children}
+
+ );
+}
diff --git a/src/layouts/TestLayout.tsx b/src/layouts/TestLayout.tsx
index 8f2847b..a32b80f 100644
--- a/src/layouts/TestLayout.tsx
+++ b/src/layouts/TestLayout.tsx
@@ -1,4 +1,4 @@
-import { ComProps } from '../type/displayType';
+import { ComProps } from '../type/common';
export default function TestLayout(props: ComProps) {
console.log(props);
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 6814974..d64f7b9 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -1,20 +1,29 @@
-import BasicLayout from './BasicLayout';
-import DisplayLayout from './DisplayLayout';
-import GlobalLayout from './GlobalLayout';
-import './BasicLayout.less';
-import { ComProps } from '../type/displayType';
+import React from 'react';
+import BasicLayout from './BasicLayout/';
+import DisplayLayout from './DisplayLayout/';
+import GlobalLayout from './GlobalLayout/';
+import LoginLayout from './LoginLayout/';
+import './BasicLayout/index.less';
+import { ComProps } from '../type/common';
import { isNull } from 'util';
export default function(props: ComProps) {
const firstLevenPath = getSinglePath(props.location.pathname);
+ console.log(firstLevenPath);
let ChlLayout = null;
switch (firstLevenPath) {
case 'display':
ChlLayout = () =>
{props.children};
break;
- case 'test':
+ case 'coderiver':
ChlLayout = () =>
{props.children};
break;
+ case 'user':
+ ChlLayout = () =>
{props.children};
+ break;
+ default:
+ ChlLayout = null;
+ break;
}
return (
@@ -26,5 +35,9 @@ export default function(props: ComProps) {
// 根据路由名称获取不同等级的路由
export function getSinglePath(pathname = '/', level = 1) {
const pathArr = pathname.split('/')[level];
- if (pathArr) return pathArr;
+ if (pathArr) {
+ return pathArr;
+ } else {
+ return null;
+ }
}
diff --git a/src/models/globalModel.tsx b/src/models/globalModel.tsx
index c07ffd3..3635ff8 100644
--- a/src/models/globalModel.tsx
+++ b/src/models/globalModel.tsx
@@ -1,4 +1,4 @@
-import { Model } from 'src/typing';
+import { Model } from 'src/type/model';
type S = {
test: number;
@@ -19,7 +19,7 @@ export default ((): Model => {
},
effects: {
- *fetch({ payload, callback }, { call, put }) {
+ * fetch({ payload, callback }, { call, put }) {
// eslint-disable-line
yield put({ type: 'save' });
if (callback) callback();
diff --git a/src/pages/coderiver/index.tsx b/src/pages/coderiver/index.tsx
new file mode 100644
index 0000000..3225dfd
--- /dev/null
+++ b/src/pages/coderiver/index.tsx
@@ -0,0 +1,18 @@
+import React, { Component } from 'react';
+import HomeTitle from 'component/home/HomeTitle';
+import bgimg from 'assets/images/home/bg@2x(1).png';
+
+export default class Home extends Component {
+ render() {
+ return (
+
+
+
+
+
+
+
+
@@ -13,11 +23,12 @@ export default function() {
To get started, edit
src/pages/index.js and save to reload.
-
+
-
go to display
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
new file mode 100644
index 0000000..a586031
--- /dev/null
+++ b/src/pages/user/index.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function LoginLayout(props) {
+ return (
+
+
Login page
+
+ );
+}
diff --git a/src/type/displayType.d.ts b/src/type/common.d.ts
similarity index 100%
rename from src/type/displayType.d.ts
rename to src/type/common.d.ts
diff --git a/src/typing.d.ts b/src/type/model.d.ts
similarity index 99%
rename from src/typing.d.ts
rename to src/type/model.d.ts
index a1838ef..523351a 100644
--- a/src/typing.d.ts
+++ b/src/type/model.d.ts
@@ -1,7 +1,6 @@
import { AnyAction, Dispatch, Reducer } from 'redux';
import { History } from 'history';
-
export interface ReducersMapObject
{
[key: string]: (api: ReducerPayload) => T;
}
diff --git a/tsconfig.json b/tsconfig.json
index 5a24d20..dc3d026 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,13 +16,13 @@
"strictNullChecks": false,
"baseUrl": "./",
"paths": {
- "src/*": ["src/*"]
+ "src/*": ["src/*"],
+ "component/*": ["component/*"],
+ "assets/*": ["assets/*"]
},
"experimentalDecorators": true,
"noImplicitAny": false
},
"include": ["src"],
- "exclude": [
- "node_modules"
- ]
+ "exclude": ["node_modules"]
}
+