update

770b9761 · nano · eafe7520 · eafe7520 · 770b9761 · 770b9761
Commit 770b9761 authored Apr 05, 2017 by nano
12 changed files
--- a/mock/.gitkeep
+++ b/mock/.gitkeep
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
    "react": "^15.4.0",
    "react-addons-transition-group": "^15.4.2",
    "react-cropper": "^0.10.1",
+    "react-document-title": "^2.0.2",
    "react-dom": "^15.4.0",
    "react-image-crop": "^2.0.3",
    "react-intl": "^2.2.3",

--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,6 @@
 <head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Dva Demo</title>
  <link rel="stylesheet" href="index.css" />
 </head>
 <body>

--- a/src/assets/MoeCube.png
+++ b/src/assets/MoeCube.png
--- a/src/assets/yay.jpg
+++ b/src/assets/yay.jpg
--- a/src/routes/Index.js
+++ b/src/routes/Index.js
@@ -2,10 +2,12 @@ import React from 'react';
 import { connect } from 'dva';
 import styles from './Index.less';
 import Particles from 'react-particles-js'
+import DocumentTitle from 'react-document-title'

-function Index({ children }) {
+function Index({ children, messages }) {
  return (
    <div style={{ height: "100%" }}>
+      <DocumentTitle title={messages['title'] || 'Moe Cube'}>
        <Particles
          params={{
            'particles': {
@@ -124,13 +126,19 @@ function Index({ children }) {
            position: "fixed"
          }}          
          />
+      </DocumentTitle>      
      {children}      
    </div>
  );
 }

-function mapStateToProps() {
-  return {};
+function mapStateToProps(state) {
+  const {
+    common: {messages}
+  } = state
+  return {
+    messages
+  };
 }

 export default connect(mapStateToProps)(Index);
--- a/src/routes/IndexPage.css
+++ b/src/routes/IndexPage.css
-
-.normal {
-  font-family: Georgia, sans-serif;
-  margin-top: 3em;
-  text-align: center;
-}
-
-.title {
-  font-size: 2.5rem;
-  font-weight: normal;
-  letter-spacing: -1px;
-}
-
-.welcome {
-  height: 328px;
-  background: url(../assets/yay.jpg) no-repeat center 0;
-  background-size: 388px 328px;
-}
-
-.list {
-  font-size: 1.2em;
-  margin-top: 1.8em;
-  list-style: none;
-  line-height: 1.5em;
-}
-
-.list code {
-  background: #f7f7f7;
-}
--- a/src/routes/IndexPage.js
+++ b/src/routes/IndexPage.js
-import { connect } from 'dva';
-import React from 'react';
-import styles from './IndexPage.css';
-
-function IndexPage() {
-  return (
-    <div className={styles.normal}>
-      <h1 className={styles.title}>Yay! Welcome to dva!</h1>
-      <div className={styles.welcome}/>
-      <ul className={styles.list}>
-        <li>To get started, edit <code>src/index.js</code> and save to reload.</li>
-        <li><a href="https://github.com/dvajs/dva-docs/blob/master/v1/en-us/getting-started.md">Getting Started</a></li>
-      </ul>
-    </div>
-  );
-}
-
-IndexPage.propTypes = {};
-
-export default connect()(IndexPage);
--- a/src/routes/Login.js
+++ b/src/routes/Login.js
@@ -3,6 +3,7 @@ import { connect } from 'dva';
 import { Link } from 'dva/router';
 import React, { PropTypes } from 'react';
 import { FormattedMessage as Format } from 'react-intl';
+import logo from '../assets/MoeCube.png'
 import './Login.less';

 const FormItem = Form.Item;
@@ -37,6 +38,9 @@ class Login extends React.Component {
    return (
      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
        <Spin spinning={loading} delay={100}>
+          <FormItem style={{display: 'flex', justifyContent:'center'}}>
+            <img src={logo} style={{height:'20vw', width: '20vw'}}/>                                        
+          </FormItem>
          <Form onSubmit={this.onSubmitLogin} className="login-form">
            <FormItem>
              {getFieldDecorator('account', {

--- a/src/services/example.js
+++ b/src/services/example.js
-import request from '../utils/request';
-
-export async function query() {
-  return request('/api/users');
-}
--- a/yarn.lock
+++ b/yarn.lock
@@ -2087,6 +2087,10 @@ eventsource@^0.1.3:
  dependencies:
    original ">=0.0.5"

+exenv@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.1.tgz#75de1c8dee02e952b102aa17f8875973e0df14f9"
+
 exit-hook@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -4518,6 +4522,12 @@ react-dev-utils@^0.4.2:
    sockjs-client "1.0.3"
    strip-ansi "3.0.1"

+react-document-title@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/react-document-title/-/react-document-title-2.0.2.tgz#1e42b672d300f8f90d8d05544b0d71f0ca7860aa"
+  dependencies:
+    react-side-effect "^1.0.2"
+
 react-dom@^0.14.0:
  version "0.14.8"
  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-0.14.8.tgz#0f1c547514263f771bd31814a739e5306575069e"
@@ -4597,6 +4607,13 @@ react-router@^2.8.1:
    loose-envify "^1.2.0"
    warning "^3.0.0"

+react-side-effect@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.1.0.tgz#57209f7ebc940d55e0fda82fe51422654175d609"
+  dependencies:
+    exenv "^1.2.1"
+    shallowequal "^0.2.2"
+
 react-slick@~0.14.2:
  version "0.14.7"
  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.14.7.tgz#5035f8b070f26fd18be1f6d3adc7dd2ab4b0bc2f"