Commit 3d6d0331 by 小明

加入图片资源, 加入第三方库(antd)依赖,

parent bd539dc4
...@@ -27,5 +27,6 @@ ...@@ -27,5 +27,6 @@
"istanbul" "istanbul"
] ]
} }
} },
"plugins": [["import", { libraryName: "antd", style: "css" }]]
} }
\ No newline at end of file
...@@ -67,7 +67,7 @@ module.exports = (options) => ({ ...@@ -67,7 +67,7 @@ module.exports = (options) => ({
{ {
test: /\.(mp4|webm)$/, test: /\.(mp4|webm)$/,
use: 'url-loader?limit=10000', use: 'url-loader?limit=10000',
}, }
], ],
}, },
plugins: options.plugins.concat([ plugins: options.plugins.concat([
......
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
"babel-core": "6.18.0", "babel-core": "6.18.0",
"babel-eslint": "7.1.0", "babel-eslint": "7.1.0",
"babel-loader": "6.2.7", "babel-loader": "6.2.7",
"babel-plugin-import": "^1.1.0",
"babel-plugin-istanbul": "2.0.3", "babel-plugin-istanbul": "2.0.3",
"babel-plugin-react-intl": "2.2.0", "babel-plugin-react-intl": "2.2.0",
"babel-plugin-react-transform": "2.0.2", "babel-plugin-react-transform": "2.0.2",
...@@ -152,6 +153,7 @@ ...@@ -152,6 +153,7 @@
"karma-webpack": "1.8.0", "karma-webpack": "1.8.0",
"lint-staged": "3.2.0", "lint-staged": "3.2.0",
"mocha": "3.1.2", "mocha": "3.1.2",
"moment": "^2.17.1",
"ngrok": "2.2.3", "ngrok": "2.2.3",
"node-sass": "^3.13.1", "node-sass": "^3.13.1",
"null-loader": "0.1.1", "null-loader": "0.1.1",
......
...@@ -23,6 +23,7 @@ import configureStore from './store'; ...@@ -23,6 +23,7 @@ import configureStore from './store';
// Import the CSS reset, which HtmlWebpackPlugin transfers to the build folder // Import the CSS reset, which HtmlWebpackPlugin transfers to the build folder
// import 'sanitize.css/sanitize.css'; // import 'sanitize.css/sanitize.css';
import 'antd/dist/antd.css';
import 'styles/index.scss'; import 'styles/index.scss';
// Create redux store with history // Create redux store with history
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
...@@ -11,9 +11,10 @@ ...@@ -11,9 +11,10 @@
* the linting exception. * the linting exception.
*/ */
import React from 'react'; import React, { PureComponent } from 'react';
export default class App extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
export default class App extends PureComponent { // eslint-disable-line react/prefer-stateless-function
static propTypes = { static propTypes = {
children: React.PropTypes.node, children: React.PropTypes.node,
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Col, Row, Icon } from 'antd'; import { Col, Row, Icon } from 'antd';
class DashboardIndexAdmin extends Component { // eslint-disable-line react/prefer-stateless-function export default class DashboardIndexAdmin extends Component { // eslint-disable-line react/prefer-stateless-function
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
} }
render() { render() {
return (<p> hello admin!</p>);
const allShortcuts = [ const allShortcuts = [
{ type: 'purchase', title: '采购列表' }, { type: 'purchase', title: '采购列表' },
{ type: 'sale', title: '销售列表' }, { type: 'sale', title: '销售列表' },
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Col, Row, Icon } from 'antd'; import { Col, Row, Icon } from 'antd';
class DashboardIndexMember extends Component { // eslint-disable-line react/prefer-stateless-function export default class DashboardIndexMember extends Component { // eslint-disable-line react/prefer-stateless-function
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
} }
render() { render() {
return (<p> hello member!</p>);
const props = $.extend({}, this.props); const props = $.extend({}, this.props);
const memberShortcuts = [ const memberShortcuts = [
......
...@@ -19,10 +19,10 @@ export default function createRoutes(store) { ...@@ -19,10 +19,10 @@ export default function createRoutes(store) {
return [ return [
{ {
path: '/', path: '/',
name: 'home', name: 'dashboard',
getComponent(nextState, cb) { getComponent(nextState, cb) {
const importModules = Promise.all([ const importModules = Promise.all([
System.import('containers/HomePage'), System.import('modules/dashboard'),
]); ]);
const renderRoute = loadModule(cb); const renderRoute = loadModule(cb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment