Skip to content

5
59110440259
Commit 340845da authored by Piyaphorn Arphornsri's avatar Piyaphorn Arphornsri
Browse files
Options

add

parent 7fff7e5b
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 192 deletions
b_beauty_project/src/components/AppHeader/index.js
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -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/Databeautician/index.js
View file @ 340845da
import React, { Component } from "react";
import { withStyles, makeStyles } from "@material-ui/core/styles";
import { withStyles } from "@material-ui/core/styles";
import {
Dialog,
Button,
......@@ -20,14 +20,7 @@ import { format } from "date-fns";
import { MenuIcon } from "@material-ui/icons/Menu";
import Fab from "@material-ui/core/Fab";
import AddIcon from "@material-ui/icons/Add";
import Table from "@material-ui/core/Table";
import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableContainer from "@material-ui/core/TableContainer";
import TableHead from "@material-ui/core/TableHead";
import TableRow from "@material-ui/core/TableRow";
import DeleteIcon from "@material-ui/icons/Delete";
import EditIcon from "@material-ui/icons/Edit";
import Input from "@material-ui/core/Input";
import InputLabel from "@material-ui/core/InputLabel";
import InputAdornment from "@material-ui/core/InputAdornment";
......@@ -44,6 +37,8 @@ import BusinessIcon from "@material-ui/icons/Business";
import MaterialTable from "material-table";
import axios from "axios";
const styles = theme => ({
root: {
height: 150,
......@@ -65,42 +60,7 @@ const styles = theme => ({
position: "absolute",
bottom: theme.spacing(2),
right: theme.spacing(2)
}
});
const StyledTableCell = withStyles(theme => ({
head: {
backgroundColor: theme.palette.common.black,
color: theme.palette.common.white
},
body: {
fontSize: 14
}
}))(TableCell);
const StyledTableRow = withStyles(theme => ({
root: {
"&:nth-of-type(odd)": {
backgroundColor: theme.palette.background.default
}
}
}))(TableRow);
function createData(name, email, address, phonenumber, edit, action) {
return { name, email, address, phonenumber, edit, action };
}
const rows = [
createData(
"Frozen yoghurt",
"email@mmmj",
"ที่อยู่ 120/255 มหาวิทยาลัยุบลราชธานี ",
" 012455887",
<EditIcon />,
<DeleteIcon />
)
];
const useStyles = makeStyles({
table: {
minWidth: 700
}
......@@ -127,7 +87,24 @@ class Databeautician extends Component {
birthYear: 2017,
birthCity: 34
}
]
],
name: "",
email: "",
password: "",
password2: "",
address: "",
tel: "",
image: "",
rolr: ""
};
handleChange = event => {
console.log("name : ", event.target.name);
console.log("value : ", event.target.value);
this.setState({
[event.target.name]: event.target.value
});
};
handleClickOpen = () => {
this.setState({
......@@ -140,7 +117,7 @@ class Databeautician extends Component {
});
};
handleCloseAndSave = () => {
//Save to db
this.setState(prevState => {
const data = [...prevState.data];
......@@ -167,7 +144,19 @@ class Databeautician extends Component {
render() {
const { classes } = this.props;
const { open, columns, data } = this.state;
const {
open,
columns,
data,
name,
email,
password,
password2,
address,
tel,
image,
role
} = this.state;
return (
<div>
<MaterialTable
......@@ -178,17 +167,17 @@ class Databeautician extends Component {
selection: false
}}
editable={{
// onRowAdd: newData =>
// onRowAdd: newData =>
// new Promise(resolve => {
// setTimeout(() => {
// setTimeout(() => {
// resolve();
// this.setState(prevState => {
// const data = [...prevState.data];
// data.push(newData);
// return { ...prevState, data };
// });
// }, 600);
// }),
// this.setState(prevState => {
// const data = [...prevState.data];
// data.push(newData);
// return { ...prevState, data };
// });
// }, 600);
// }),
onRowUpdate: (newData, oldData) =>
new Promise(resolve => {
setTimeout(() => {
......@@ -233,120 +222,179 @@ class Databeautician extends Component {
>
<DialogTitle id="alert-dialog-title">{"ลงทะเบียนช่าง"}</DialogTitle>
<DialogContent>
<TextField
className={classes.margin}
id="outlined-uncontrolled"
label="ชื่อ-สกุล"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AccountCircle />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-uncontrolled"
label="E_mail"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<MailOutlineIcon />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-password-input"
label="Password"
type="password"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<VpnKeyIcon />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-password-input"
label="Confirm-Password"
type="password"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<VpnKeyIcon />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-password-input"
label="ที่อยู่"
autoComplete="address"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<BusinessIcon />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-password-input"
label="เบอร์โทร"
autoComplete="Phone number"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<ContactPhoneIcon />
</InputAdornment>
)
}}
/>
<br /> <br />
<TextField
className={classes.margin}
id="outlined-file-input"
label="เพิ่มรูปภาพ"
type="file"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AddPhotoAlternateIcon />
</InputAdornment>
)
}}
/>
<div>
<TextField
className={classes.margin}
id="name"
name="name"
value={name}
label="ชื่อ-สกุล"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AccountCircle />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="email"
name="email"
value={email}
label="E_mail"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<MailOutlineIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="password"
name="password"
value={password}
label="Password"
type="password"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<VpnKeyIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="password2"
name="password2"
value={password2}
label="Confirm-Password"
type="password"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<VpnKeyIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="address"
name="address"
value={address}
label="ที่อยู่"
autoComplete="address"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<BusinessIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="tel"
name="tel"
value={tel}
label="เบอร์โทร"
autoComplete="Phone number"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<ContactPhoneIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
<br></br>
<div>
<TextField
className={classes.margin}
id="image"
name="image"
value={image}
label="เพิ่มรูปภาพ"
type="file"
autoComplete="current-password"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AddPhotoAlternateIcon />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
</div>
</DialogContent>
<DialogActions>
<Button onClick={this.handleClose} color="primary">
ยกเลิก
</Button>
<Button
onClick={this.handleCloseAndSave}
color="primary"
autoFocus
onClick={() => {
if (password === password2) {
axios
.post("http://localhost:9000/api/auth/register", {
email: email,
password: password,
name: name,
image: image,
address: address,
tel: tel,
role: "2"
})
.then(response => {
console.log("สร้างผู้ใช้สำเร็จ", response);
})
.catch(error => {
console.log(error);
});
// alert("ลงทะเบียนสำเร็จ");
} else {
alert("password ไม่ถูกต้อง");
}
}}
>
ยืนยัน
</Button>
......
b_beauty_project/src/views/DataShopPage/Datashop/index.js
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -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
View file @ 340845da
......@@ -214,7 +214,7 @@ class RegisterShopPage extends Component {
image: image,
address: address,
tel: tel,
role:role
role: '1'
})
.then(response => {
console.log("สร้างผู้ใช้สำเร็จ", response);
......
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