add

b_beauty_project/src/components/AppHeader/index.js

@@ -37,7 +37,7 @@ class AppHeader extends Component {
               Link
               href="/"
             >
-              B Beauty
+              <img src={require('../../image/icon.png') }></img>
             </IconButton>
             <Typography variant="h6" className={classes.title}></Typography>
             <Button color="inherit" Link href="/LoginPage">

b_beauty_project/src/views/BeauticianShopPage/Home/index.js

@@ -97,7 +97,7 @@ class ResponsiveDrawer extends Component {
             href="/"
             style={{ color: "white" }}
           >
-            B Beauty
+            <img src={require('../../../image/icon.png') }></img>
           </IconButton>
         </div>
 

b_beauty_project/src/views/DataShopPage/Datashop/index.js

@@ -22,6 +22,8 @@ import Paper from "@material-ui/core/Paper";
 import CardMedia from "@material-ui/core/CardMedia";
 import MenuItem from "@material-ui/core/MenuItem";
 import PhotoCameraIcon from "@material-ui/icons/PhotoCamera";
+import PostAddIcon from '@material-ui/icons/PostAdd';
+import CancelIcon from '@material-ui/icons/Cancel';
 import Avatar from "react-avatar";
 
 const styles = theme => ({
@@ -90,7 +92,7 @@ class Datashop extends Component {
         <div className="row mt-2 mb-2">
           <div className="col s12 m6 l12">
             <div className="row center">
-              <h4>ข้อมูทั่วไป</h4>
+              <h3>ข้อมูลทั่วไป</h3>
             </div>
             <div className="row center">
               <br />
@@ -235,7 +237,6 @@ class Datashop extends Component {
                   native: true
                 }}
                 variant="outlined"
-                
                 InputProps={{
                   startAdornment: (
                     <InputAdornment position="start">
@@ -243,12 +244,13 @@ class Datashop extends Component {
                     </InputAdornment>
                   )
                 }}
-              >{currencies.map(option => (
-                <option key={option.value} value={option.value}>
-                  {option.label}
-                </option>
-              ))}</TextField>
-             
+              >
+                {currencies.map(option => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </TextField>
             </div>
             <br></br>
 
@@ -269,6 +271,40 @@ class Datashop extends Component {
             </div>
           </div>
         </div>
+        <div className="row center">
+          <div className="row">
+            <h3>ข้อมูลโปรโมชั่น</h3>
+          </div>
+          <div>
+            <TextField
+              className={classes.margin}
+              id="promotion"
+              label="ข้อมูลโปรโมชั่น"
+              autoComplete="promotion"
+              variant="outlined"
+              InputProps={{
+                startAdornment: (
+                  <InputAdornment position="start">
+                   <PostAddIcon/>
+                  </InputAdornment>
+                )
+              }}
+            />
+            &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;
+            <Button variant="contained" color="secondary">
+              ยกเลิก
+            </Button>{" "}
+            &nbsp; &nbsp; &nbsp;
+            <Button variant="contained" color="primary">
+              ตกลง
+            </Button>
+            &nbsp; &nbsp; &nbsp;
+            <Fab color="secondary" aria-label="edit">
+              <EditIcon />
+            </Fab>
+          </div>
+          <br></br>
+        </div>
       </div>
     );
   }

b_beauty_project/src/views/DataShopPage/Home/index.js

@@ -105,7 +105,7 @@ class ResponsiveDrawer extends Component {
             href="/"
             style={{ color: "white" }}
           >
-            B Beauty
+            <img src={require('../../../image/icon.png') }></img>
           </IconButton>
         </div>
 
@@ -122,7 +122,7 @@ class ResponsiveDrawer extends Component {
             <ListItemIcon>
               <AccountBoxIcon />
             </ListItemIcon>
-            <ListItemText primary="โปรไฟล์ร้าน" />
+            <ListItemText primary="โปรไฟล์" />
           </ListItem>
 
           <ListItem

b_beauty_project/src/views/DataShopPage/Profile/index.js

@@ -2,8 +2,7 @@ import React, { Component } from "react";
 import { withStyles } from "@material-ui/core/styles";
 import { withRouter } from "react-router-dom";
 import compose from "recompose/compose";
-import Input from "@material-ui/core/Input";
-import InputLabel from "@material-ui/core/InputLabel";
+import { Input, InputLabel } from "@material-ui/core";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import FormControl from "@material-ui/core/FormControl";
 import TextField from "@material-ui/core/TextField";
@@ -37,7 +36,7 @@ class Profile extends Component {
     return (
       <div className="row center">
         <div className="row mt-2 mb-2">
-          <h2>โปรไฟล์ร้าน</h2>
+          <h2>โปรไฟล์</h2>
         </div>
         <br />
         <div className="row mt-2 mb-2">
@@ -63,8 +62,8 @@ class Profile extends Component {
             <div ClassName="row">
               <TextField
                 className={classes.margin}
-                id="outlined-uncontrolled"
-                label="ชื่อร้าน"
+                id="name"
+                label="ชื่อ-นามสกุล"
                 variant="outlined"
                 InputProps={{
                   startAdornment: (
@@ -77,7 +76,7 @@ class Profile extends Component {
 
               <TextField
                 className={classes.margin}
-                id="outlined-uncontrolled"
+                id="email"
                 label="E_mail"
                 variant="outlined"
                 InputProps={{
@@ -93,7 +92,7 @@ class Profile extends Component {
             <div>
               <TextField
                 className={classes.margin}
-                id="outlined-password-input"
+                id="password1"
                 label="Password"
                 type="password"
                 autoComplete="current-password"
@@ -109,7 +108,7 @@ class Profile extends Component {
 
               <TextField
                 className={classes.margin}
-                id="outlined-password-input"
+                id="password2"
                 label="Confirm-Password"
                 type="password"
                 autoComplete="current-password"
@@ -127,7 +126,7 @@ class Profile extends Component {
             <div>
               <TextField
                 className={classes.margin}
-                id="outlined-password-input"
+                id="address"
                 label="ที่อยู่"
                 autoComplete="address"
                 variant="outlined"
@@ -141,7 +140,7 @@ class Profile extends Component {
               />
               <TextField
                 className={classes.margin}
-                id="outlined-password-input"
+                id="tel"
                 label="เบอร์โทร"
                 autoComplete="Phone number"
                 variant="outlined"

b_beauty_project/src/views/LoginPage/index.js

@@ -13,7 +13,8 @@ import AddPhotoAlternateIcon from "@material-ui/icons/AddPhotoAlternate";
 import MailOutlineIcon from "@material-ui/icons/MailOutline";
 import VpnKeyIcon from "@material-ui/icons/VpnKey";
 import Button from "@material-ui/core/Button";
-
+import Link from '@material-ui/core/Link';
+import axios from "axios";
 
 const styles = theme => ({
   root: {
@@ -24,8 +25,23 @@ const styles = theme => ({
   }
 });
 class Login extends Component {
+  state = {
+    email: "",
+    password: ""
+  };
+
+  handleChange = event => {
+    console.log("name : ", event.target.name);
+    console.log("value : ", event.target.value);
+
+    this.setState({
+      [event.target.name]: event.target.value
+    });
+  };
+
   render() {
-    const {classes} = this.props;
+    const { classes } = this.props;
+    const { email, password } = this.state;
 
     return (
       <div>
@@ -34,7 +50,9 @@ class Login extends Component {
           <div>
             <TextField
               className={classes.margin}
-              id="outlined-uncontrolled"
+              id="email"
+              name="email"
+              value={email}
               label="E_mail"
               variant="outlined"
               InputProps={{
@@ -44,13 +62,16 @@ class Login extends Component {
                   </InputAdornment>
                 )
               }}
+              onChange={this.handleChange}
             />
           </div>
           <br></br>
           <div>
             <TextField
               className={classes.margin}
-              id="outlined-password-input"
+              id="password"
+              name="password"
+              value={password}
               label="Password"
               type="password"
               autoComplete="current-password"
@@ -62,6 +83,7 @@ class Login extends Component {
                   </InputAdornment>
                 )
               }}
+              onChange={this.handleChange}
             />
           </div>
           <br></br>
@@ -69,7 +91,12 @@ class Login extends Component {
             <Button variant="contained" color="primary" disableElevation>
               เข้าสู่ระบบ
             </Button>
-           
+          </div>
+          <br/><br/>
+          <div className="row center">
+            <Link href="/RegisterPage" >
+              ยังไม่ได้ลงทะเบียน
+            </Link>
           </div>
         </div>
       </div>

b_beauty_project/src/views/RigisterPage/index.js

@@ -33,7 +33,7 @@ class RegisterPage extends Component {
     address: "",
     tel: "",
     image: "",
-    rolr: "0"
+    rolr: ""
   };
 
   handleChange = event => {
@@ -214,7 +214,7 @@ class RegisterPage extends Component {
                     image: image,
                     address: address,
                     tel: tel,
-                    role:role
+                    role: '0'
                   })
                   .then(response => {
                     console.log("สร้างผู้ใช้สำเร็จ", response);

b_beauty_project/src/views/RigisterShopPage/index.js

@@ -214,7 +214,7 @@ class RegisterShopPage extends Component {
                     image: image,
                     address: address,
                     tel: tel,
-                    role:role
+                    role: '1'
                   })
                   .then(response => {
                     console.log("สร้างผู้ใช้สำเร็จ", response);