Merge pull request #29 from JAVACAFE-STUDY/develop

Develop to Master 머지
JAVACAFE-STUDY · Jul 27, 2019 · 97a2786 · 97a2786
2 parents 3fabe8e + 1243a9e
commit 97a2786
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainity-ladning",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Chainity welcome pages",
   "private": true,
   "main": "dist/index.js",

diff --git a/src/assets/jss/material-kit-react/views/loginPage.jsx b/src/assets/jss/material-kit-react/views/loginPage.jsx
@@ -40,7 +40,8 @@ const signupPageStyle = {
     "& footer": {
       position: "absolute",
       bottom: "0",
-      width: "100%"
+      width: "100%",
+      zIndex: 1
     }
   },
   form: {

diff --git a/src/views/LoginPage/LoginPage.jsx b/src/views/LoginPage/LoginPage.jsx
@@ -34,7 +34,7 @@ class LoginPage extends React.Component {
     super(props);
     this.state = {
       cardAnimaton: "cardHidden",
-      id: "",
+      email: "",
       password: ""
     };
     this.inputUserInfo = this.inputUserInfo.bind(this);
@@ -54,7 +54,7 @@ class LoginPage extends React.Component {
   inputUserInfo(e) {
     this.setState({
       ...this.state,
-      [e.currentTarget.id]: e.currentTarget.value
+      [e.currentTarget.id]: e.currentTarget.value.replace(/\s/g, "")
     });
   }
 
@@ -115,6 +115,7 @@ class LoginPage extends React.Component {
                           fullWidth: true
                         }}
                         inputProps={{
+                          value: this.state.email,
                           type: "text",
                           required: true,
                           endAdornment: (
@@ -132,6 +133,7 @@ class LoginPage extends React.Component {
                           fullWidth: true
                         }}
                         inputProps={{
+                          value: this.state.password,
                           type: "password",
                           required: true,
                           endAdornment: (