Skip to content

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

add

parent dbb28bff
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 237 deletions
Backend/controllers/shop/index.js
View file @ 69157781
...@@ -15,7 +15,7 @@ exports.addShop = async (req, res) => { ...@@ -15,7 +15,7 @@ exports.addShop = async (req, res) => {
exports.getShop = async (req, res) => { exports.getShop = async (req, res) => {
try { try {
let shop = await Shop.findAll(); let shop = await Shop.findAll();
res.status(200).send("success"); res.status(200).send(shop);
} catch (err) { } catch (err) {
console.log(err); console.log(err);
res.sendStatus(401); res.sendStatus(401);
...@@ -45,7 +45,7 @@ exports.getShopId = async (req, res) => { ...@@ -45,7 +45,7 @@ exports.getShopId = async (req, res) => {
id: shopId id: shopId
} }
}); });
res.status(200).send("success"); res.status(200).send(shop);
} catch (err) { } catch (err) {
console.log(err); console.log(err);
res.sendStatus(401); res.sendStatus(401);
......
Backend/models/shop/index.js
View file @ 69157781
...@@ -9,13 +9,16 @@ module.exports = db.sequelize.define("shops", { ...@@ -9,13 +9,16 @@ module.exports = db.sequelize.define("shops", {
}, },
name: { name: {
type: Sequelize.INTEGER type: Sequelize.STRING
}, },
timeopen: { nameeng: {
type: Sequelize.STRING type: Sequelize.STRING
}, },
timeopen: {
type: Sequelize.DATE
},
timeclose: { timeclose: {
type: Sequelize.STRING type: Sequelize.DATE
}, },
address: { address: {
type: Sequelize.TEXT type: Sequelize.TEXT
...@@ -32,6 +35,14 @@ module.exports = db.sequelize.define("shops", { ...@@ -32,6 +35,14 @@ module.exports = db.sequelize.define("shops", {
facebook: { facebook: {
type: Sequelize.TEXT type: Sequelize.TEXT
}, },
image:{
type: Sequelize.TEXT
},
userId: {
type: Sequelize.INTEGER,
references: 'users',
referencesKey: 'id'
},
type: { type: {
type: Sequelize.ENUM( type: Sequelize.ENUM(
"สปาและนวด", "สปาและนวด",
...@@ -42,4 +53,7 @@ module.exports = db.sequelize.define("shops", { ...@@ -42,4 +53,7 @@ module.exports = db.sequelize.define("shops", {
"แต่งหน้าทำผม" "แต่งหน้าทำผม"
) )
} }
}); });
b_beauty_project/src/views/DataShopPage/Datashop/index.js
View file @ 69157781
...@@ -80,11 +80,13 @@ class Datashop extends Component { ...@@ -80,11 +80,13 @@ class Datashop extends Component {
state = { state = {
currency: "1", currency: "1",
name: "", name: "",
nameeng: "",
timeopen: "", timeopen: "",
timeclose: "", timeclose: "",
tel: "", tel: "",
address: "", address: "",
detail: "", detail: "",
images: "",
map: "", map: "",
facebook: "", facebook: "",
type: "", type: "",
...@@ -110,6 +112,7 @@ class Datashop extends Component { ...@@ -110,6 +112,7 @@ class Datashop extends Component {
const { const {
currency, currency,
name, name,
nameeng,
timeopen, timeopen,
timeclose, timeclose,
tel, tel,
...@@ -161,7 +164,22 @@ class Datashop extends Component { ...@@ -161,7 +164,22 @@ class Datashop extends Component {
}} }}
onChange={this.handleChange} onChange={this.handleChange}
/> />
<TextField
className={classes.margin}
id="nameeng"
name="nameeng"
value={nameeng}
label="Name"
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AccountCircle />
</InputAdornment>
)
}}
onChange={this.handleChange}
/>
<TextField <TextField
className={classes.margin} className={classes.margin}
id="timeopen" id="timeopen"
...@@ -179,7 +197,11 @@ class Datashop extends Component { ...@@ -179,7 +197,11 @@ class Datashop extends Component {
}} }}
onChange={this.handleChange} onChange={this.handleChange}
/> />
<TextField
</div>
<br />
<div>
<TextField
className={classes.margin} className={classes.margin}
id="timeclose" id="timeclose"
name="timeclose" name="timeclose"
...@@ -196,9 +218,6 @@ class Datashop extends Component { ...@@ -196,9 +218,6 @@ class Datashop extends Component {
}} }}
onChange={this.handleChange} onChange={this.handleChange}
/> />
</div>
<br />
<div>
<TextField <TextField
className={classes.margin} className={classes.margin}
id="tel" id="tel"
...@@ -233,7 +252,11 @@ class Datashop extends Component { ...@@ -233,7 +252,11 @@ class Datashop extends Component {
}} }}
onChange={this.handleChange} onChange={this.handleChange}
/> />
<TextField
</div>
<br />
<div>
<TextField
className={classes.margin} className={classes.margin}
id="detail" id="detail"
name="detail" name="detail"
...@@ -250,9 +273,6 @@ class Datashop extends Component { ...@@ -250,9 +273,6 @@ class Datashop extends Component {
}} }}
onChange={this.handleChange} onChange={this.handleChange}
/> />
</div>
<br />
<div>
<TextField <TextField
className={classes.margin} className={classes.margin}
id="map" id="map"
...@@ -330,6 +350,7 @@ class Datashop extends Component { ...@@ -330,6 +350,7 @@ class Datashop extends Component {
axios axios
.post("http://localhost:9000/api/shop/add", { .post("http://localhost:9000/api/shop/add", {
name: name, name: name,
nameeng:nameeng,
timeopen: timeopen, timeopen: timeopen,
timeclose: timeclose, timeclose: timeclose,
tel: tel, tel: tel,
......
b_beauty_project/src/views/HomePage/index.js
View file @ 69157781
...@@ -22,7 +22,7 @@ import { injectIntl, FormattedRelativeTime } from "react-intl"; ...@@ -22,7 +22,7 @@ import { injectIntl, FormattedRelativeTime } from "react-intl";
import { th } from "date-fns/locale"; import { th } from "date-fns/locale";
import { format } from "date-fns"; import { format } from "date-fns";
import MenuIcon from "@material-ui/icons/Menu"; import MenuIcon from "@material-ui/icons/Menu";
import axios from "axios";
import SearchIcon from "@material-ui/icons/Search"; import SearchIcon from "@material-ui/icons/Search";
import DirectionsIcon from "@material-ui/icons/Directions"; import DirectionsIcon from "@material-ui/icons/Directions";
import ListIcon from "@material-ui/icons/List"; import ListIcon from "@material-ui/icons/List";
...@@ -63,34 +63,64 @@ const styles = theme => ({ ...@@ -63,34 +63,64 @@ const styles = theme => ({
justifyContent: "center" justifyContent: "center"
} }
}); });
const currencieslist = [
{
value: "1",
label: " กรุณาเลือกรายการ "
},
{
value: "2",
label: "อบไอน้ำ 30 นาที"
},
{
value: "3",
label: "นวดหน้า 60 นาที "
},
{
value: "4",
label: "สระได 20 นาที"
},
{
value: "5",
label: "ทำเล็บ 60 นาที"
},
{
value: "6",
label: "ยืดผมถาวร 120 นาที"
},
{
value: "7",
label: "ทำสีผม 60 นาที"
}
];
const currencies = [ const currencies = [
{ {
value: "1", value: "1",
label: " กรุณาเลือกประเภท " label: " กรุณาเลือกช่าง "
}, },
{ {
value: "2", value: "2",
label: "สปาและนวด" label: "ช่าง ก"
}, },
{ {
value: "3", value: "3",
label: "ผิวหน้า" label: "ช่าง ข"
}, },
{ {
value: "4", value: "4",
label: "ขนตาและคิ้ว" label: "ช่าง ค"
}, },
{ {
value: "5", value: "5",
label: "ทำเล็บ" label: "ช่าง ง"
}, },
{ {
value: "6", value: "6",
label: "ชาลอน" label: "ช่าง จ"
}, },
{ {
value: "7", value: "7",
label: "แต่งหน้าทำผม" label: "ช่าง"
} }
]; ];
class HomePage extends Component { class HomePage extends Component {
...@@ -99,7 +129,8 @@ class HomePage extends Component { ...@@ -99,7 +129,8 @@ class HomePage extends Component {
date: new Date(), date: new Date(),
open: false, open: false,
list: false, list: false,
rating: 0 rating: 0,
shops: []
}; };
handleClickOpen = () => { handleClickOpen = () => {
this.setState({ this.setState({
...@@ -121,8 +152,8 @@ class HomePage extends Component { ...@@ -121,8 +152,8 @@ class HomePage extends Component {
list: false list: false
}); });
}; };
componentDidMount = () => { componentDidMount = async () => {
let { pathname } = this.props.location; let { pathname } = this.props.location;
pathname = pathname.substring(1, pathname.length); pathname = pathname.substring(1, pathname.length);
// console.log('pathname', pathname) // console.log('pathname', pathname)
...@@ -142,8 +173,12 @@ class HomePage extends Component { ...@@ -142,8 +173,12 @@ class HomePage extends Component {
: 0; : 0;
// 7 // 7
const response = await axios.get("http://localhost:9000/api/shop/all");
console.warn(response.data)
this.setState({ this.setState({
tab: tab tab: tab,
shops: response.data
}); });
}; };
...@@ -177,7 +212,7 @@ class HomePage extends Component { ...@@ -177,7 +212,7 @@ class HomePage extends Component {
const { classes } = this.props; const { classes } = this.props;
// const tab = this.state.tab; // const tab = this.state.tab;
// หรือ // หรือ
const { tab, date, open, list, value, rating } = this.state; const { tab, date, open, list, value, rating, shops } = this.state;
return ( return (
<div> <div>
<AppBra tab={tab} handleChangeTab={this.handleChangeTab} /> <AppBra tab={tab} handleChangeTab={this.handleChangeTab} />
...@@ -214,166 +249,168 @@ class HomePage extends Component { ...@@ -214,166 +249,168 @@ class HomePage extends Component {
</div> </div>
</div> </div>
<div className="row mt-5 mb-2 "> { shops.map(shop =>
<div className="col s12 m6 l6"> <div className="row mt-5 mb-2 ">
<div className="row mt-3 mb-2 center"> <div className="col s12 m6 l6">
<img <div className="row mt-3 mb-2 center">
src="https://www.smeleader.com/wp-content/uploads/2018/05/%E0%B9%81%E0%B8%9F%E0%B8%A3%E0%B8%99%E0%B9%84%E0%B8%8A%E0%B8%AA%E0%B9%8C%E0%B8%A3%E0%B9%89%E0%B8%B2%E0%B8%99%E0%B9%80%E0%B8%AA%E0%B8%A3%E0%B8%B4%E0%B8%A1%E0%B8%AA%E0%B8%A7%E0%B8%A2-%E0%B8%A3%E0%B8%A7%E0%B8%A1%E0%B9%81%E0%B8%9A%E0%B8%A3%E0%B8%99%E0%B8%94%E0%B9%8C%E0%B8%A3%E0%B9%89%E0%B8%B2%E0%B8%99%E0%B8%8B%E0%B8%B2%E0%B8%A5%E0%B8%AD%E0%B8%99-%E0%B8%AA%E0%B8%B2%E0%B8%99%E0%B8%9D%E0%B8%B1%E0%B8%99%E0%B8%98%E0%B8%B8%E0%B8%A3%E0%B8%81%E0%B8%B4%E0%B8%88%E0%B8%97%E0%B8%A3%E0%B8%87%E0%B8%9C%E0%B8%A1.jpg" <img
width="60%" src="https://www.smeleader.com/wp-content/uploads/2018/05/%E0%B9%81%E0%B8%9F%E0%B8%A3%E0%B8%99%E0%B9%84%E0%B8%8A%E0%B8%AA%E0%B9%8C%E0%B8%A3%E0%B9%89%E0%B8%B2%E0%B8%99%E0%B9%80%E0%B8%AA%E0%B8%A3%E0%B8%B4%E0%B8%A1%E0%B8%AA%E0%B8%A7%E0%B8%A2-%E0%B8%A3%E0%B8%A7%E0%B8%A1%E0%B9%81%E0%B8%9A%E0%B8%A3%E0%B8%99%E0%B8%94%E0%B9%8C%E0%B8%A3%E0%B9%89%E0%B8%B2%E0%B8%99%E0%B8%8B%E0%B8%B2%E0%B8%A5%E0%B8%AD%E0%B8%99-%E0%B8%AA%E0%B8%B2%E0%B8%99%E0%B8%9D%E0%B8%B1%E0%B8%99%E0%B8%98%E0%B8%B8%E0%B8%A3%E0%B8%81%E0%B8%B4%E0%B8%88%E0%B8%97%E0%B8%A3%E0%B8%87%E0%B8%9C%E0%B8%A1.jpg"
onClick={() => { width="60%"
this.props.history.push("/ShopPage"); onClick={() => {
}} this.props.history.push("/ShopPage", { id: shop.id });
/> }}
</div> />
</div> </div>
<div className="col s12 m6 l4">
<div className="row mt-2 mb-2">
<h3>น้องใหม่บิวตี้ NongMai Beauty</h3>
</div> </div>
<div className="row mt-2 mb-2"> <div className="col s12 m6 l4">
ที่อยู่ : 10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง อำเภอเหล่าเสือโก้ก <div className="row mt-2 mb-2">
จังหวัดอุบลราชธานี 34000 <h3>{shops.name}</h3>
</div>
</div>
<div className="row mt-3 mb-2"> <div className="row mt-2 mb-2">
โปรโมชั่น : จองคิวผ่าน B Beauty ลด 5 % {shops.address}
</div>
<div className="row mt-3 mb-2">
<div className={classes.root}>
<Rating
name="size-large"
defaultValue={3.5}
size="large"
readOnly
/>
</div> </div>
</div>
<div className="row center"> <div className="row mt-3 mb-2">
<Button โปรโมชั่น : จองคิวผ่าน B Beauty ลด 5 %
variant="outlined" </div>
color="primary" <div className="row mt-3 mb-2">
onClick={this.handleClickOpen} <div className={classes.root}>
> <Rating
จองคิว name="size-large"
</Button> defaultValue={3.5}
<Dialog size="large"
open={open} readOnly
onClose={this.handleClose}
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
>
<DialogTitle id="alert-dialog-title">{"จองคิว"}</DialogTitle>
<DialogContent>
<h6>
วันที่ที่เลือกคือ{" "}
{format(new Date(date), "dd MMMM yyyy", {
locale: th
})}
</h6>
<DatePicker
autoOk
orientation="static"
variant="static"
openTo="date"
minDate={new Date()}
value={date}
onChange={this.handleChangeDate}
/> />
</DialogContent> </div>
<DialogActions> </div>
<Button
variant="outlined" <div className="row center">
onClick={this.handleClose} <Button
color="primary" variant="outlined"
> color="primary"
ยกเลิก onClick={this.handleClickOpen}
</Button> >
<Button จองคิว
variant="outlined" </Button>
color="primary" <Dialog
onClick={this.ClickOpen} open={open}
> onClose={this.handleClose}
ถัดไป aria-labelledby="alert-dialog-title"
</Button> aria-describedby="alert-dialog-description"
</DialogActions> >
</Dialog> <DialogTitle id="alert-dialog-title">{"จองคิว"}</DialogTitle>
<Dialog <DialogContent>
open={list} <h6>
onClose={this.Close} วันที่ที่เลือกคือ{" "}
aria-labelledby="max-width-dialog-title" {format(new Date(date), "dd MMMM yyyy", {
> locale: th
<DialogTitle id="max-width-dialog-title"> })}
กรุณาเลือกข้อมูลการจอง </h6>
</DialogTitle> <DatePicker
<DialogContent> autoOk
<DialogContentText> orientation="static"
<TextField variant="static"
className={classes.margin} openTo="date"
id="list" minDate={new Date()}
name="list" value={date}
select onChange={this.handleChangeDate}
label="เลือกรายการ" />
onChange={this.handleChange} </DialogContent>
SelectProps={{ <DialogActions>
native: true <Button
}}
variant="outlined" variant="outlined"
InputProps={{ onClick={this.handleClose}
startAdornment: ( color="primary"
<InputAdornment position="start">
<ListIcon />
</InputAdornment>
)
}}
> >
{/* {currencies.map(option => ( ยกเลิก
<option key={option.value} value={option.value}> </Button>
{option.label} <Button
</option>
))} */}
</TextField>
<TextField
className={classes.margin}
id="list"
name="list"
select
label="เลือกช่าง"
onChange={this.handleChange}
SelectProps={{
native: true
}}
variant="outlined" variant="outlined"
InputProps={{ color="primary"
startAdornment: ( onClick={this.ClickOpen}
<InputAdornment position="start">
<AssignmentIndIcon />
</InputAdornment>
)
}}
> >
{/* {currencies.map(option => ( ถัดไป
<option key={option.value} value={option.value}> </Button>
{option.label} </DialogActions>
</option> </Dialog>
))} */} <Dialog
</TextField> open={list}
</DialogContentText> onClose={this.Close}
</DialogContent> aria-labelledby="max-width-dialog-title"
<DialogActions> >
<Button onClick={this.Close} color="primary"> <DialogTitle id="max-width-dialog-title">
Cancel กรุณาเลือกข้อมูลการจอง
</Button> </DialogTitle>
<Button onClick={this.Close} color="primary"> <DialogContent>
Subscribe <DialogContentText>
</Button> <TextField
</DialogActions> className={classes.margin}
</Dialog> id="list"
name="list"
select
label="เลือกรายการ"
onChange={this.handleChange}
SelectProps={{
native: true
}}
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<ListIcon />
</InputAdornment>
)
}}
>
{currencieslist.map(option => (
<option key={option.value} value={option.value}>
{option.label}
</option>
))}
</TextField>
<TextField
className={classes.margin}
id="list"
name="list"
select
label="เลือกช่าง"
onChange={this.handleChange}
SelectProps={{
native: true
}}
variant="outlined"
InputProps={{
startAdornment: (
<InputAdornment position="start">
<AssignmentIndIcon />
</InputAdornment>
)
}}
>
{currencies.map(option => (
<option key={option.value} value={option.value}>
{option.label}
</option>
))}
</TextField>
</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={this.Close} color="primary">
Cancel
</Button>
<Button onClick={this.Close} color="primary">
Subscribe
</Button>
</DialogActions>
</Dialog>
</div>
</div> </div>
</div> </div>
</div> ) }
</div> </div>
</div> </div>
); );
......
b_beauty_project/src/views/ShopPage/index.js
View file @ 69157781
...@@ -20,7 +20,7 @@ import { ...@@ -20,7 +20,7 @@ import {
DialogTitle, DialogTitle,
InputAdornment, InputAdornment,
TextField, TextField,
InputBase, InputBase
} from "@material-ui/core"; } from "@material-ui/core";
import MoreVertIcon from "@material-ui/icons/MoreVert"; import MoreVertIcon from "@material-ui/icons/MoreVert";
import { DatePicker } from "@material-ui/pickers"; import { DatePicker } from "@material-ui/pickers";
...@@ -70,15 +70,76 @@ const styles = theme => ({ ...@@ -70,15 +70,76 @@ const styles = theme => ({
right: theme.spacing(2) right: theme.spacing(2)
} }
}); });
const currencieslist = [
{
value: "1",
label: " กรุณาเลือกรายการ "
},
{
value: "2",
label: "อบไอน้ำ 30 นาที"
},
{
value: "3",
label: "นวดหน้า 60 นาที "
},
{
value: "4",
label: "สระได 20 นาที"
},
{
value: "5",
label: "ทำเล็บ 60 นาที"
},
{
value: "6",
label: "ยืดผมถาวร 120 นาที"
},
{
value: "7",
label: "ทำสีผม 60 นาที"
}
];
const currencies = [
{
value: "1",
label: " กรุณาเลือกช่าง "
},
{
value: "2",
label: "ช่าง ก"
},
{
value: "3",
label: "ช่าง ข"
},
{
value: "4",
label: "ช่าง ค"
},
{
value: "5",
label: "ช่าง ง"
},
{
value: "6",
label: "ช่าง จ"
},
{
value: "7",
label: "ช่าง"
}
];
class ShopPage extends Component { class ShopPage extends Component {
state = { state = {
name: "xxx",
email: "xyz.ggg.com",
reviwe: false, reviwe: false,
list: false, list: false,
date: new Date(), date: new Date(),
open: false, open: false,
data: false queue:false,
shop: null
}; };
handleClickOpen = () => { handleClickOpen = () => {
this.setState({ this.setState({
...@@ -110,58 +171,40 @@ class ShopPage extends Component { ...@@ -110,58 +171,40 @@ class ShopPage extends Component {
list: false list: false
}); });
}; };
ClickOpendata = () => { ClickOpenqueue = () => {
this.setState({ this.setState({
data: true queue: true
}); });
}; };
Closedata = () => { Closequeue = () => {
this.setState({ this.setState({
data: false queue: false
}); });
}; };
componentDidMount = () => { componentDidMount = async () => {
axios const {location } = this.props;
.get("http://localhost:9000/api/auth/getUserById/7") const id = location.state.id;
.then(function(response) { const response = await axios.get(`http://localhost:9000/api/shop/getShopId/${id}`);
// handle success this.setState({
// console.log("response : ", response.data); shop: response.data
// const name = response.data.name; });
// const email = response.data.email;
const { name, email } = response.data;
console.log("name : ", name);
console.log("email : ", email);
this.setState({
name: name,
email: email
});
})
.catch(function(error) {
// handle error
console.log(error);
});
console.log("here");
}; };
render() { render() {
const { classes } = this.props; const { classes } = this.props;
const bull = <span className={classes.bullet}>•</span>; const bull = <span className={classes.bullet}>•</span>;
const { name, email, reviwe, list, date, open ,data} = this.state; const { shop, reviwe, list, date, open, queue } = this.state;
return ( return (
<div> <div>
<AppBar /> <AppBar />
<div className="row "> { shop && <div className="row">
<div className="row mt-2 mb-2"> <div className="row mt-2 mb-2">
<div className="col s12 m6 l1"></div> <div className="col s12 m6 l1"></div>
<div className="col s12 m6 l11"> <div className="col s12 m6 l11">
<h3>น้องใหม่บิวตี้ NongMai Beauty</h3> <h3>{shop.name}</h3>
10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง อำเภอเหล่าเสือโก้ก {shop.address}
จังหวัดอุบลราชธานี 34000
</div> </div>
</div> </div>
<div className="row mt-4 mb-2"> <div className="row mt-4 mb-2">
...@@ -240,15 +283,15 @@ class ShopPage extends Component { ...@@ -240,15 +283,15 @@ class ShopPage extends Component {
<Button <Button
variant="outlined" variant="outlined"
color="primary" color="primary"
onClick={this.ClickOpendata} onClick={this.ClickOpenqueue}
> >
ถัดไป ถัดไป
</Button> </Button>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
<Dialog <Dialog
open={data} open={queue}
onClose={this.Closedata} onClose={this.Closequeue}
aria-labelledby="max-width-dialog-title" aria-labelledby="max-width-dialog-title"
> >
<DialogTitle id="max-width-dialog-title"> <DialogTitle id="max-width-dialog-title">
...@@ -275,12 +318,12 @@ class ShopPage extends Component { ...@@ -275,12 +318,12 @@ class ShopPage extends Component {
) )
}} }}
> >
{/* {currencies.map(option => ( {currencieslist.map(option => (
<option key={option.value} value={option.value}> <option key={option.value} value={option.value}>
{option.label} {option.label}
</option> </option>
))} */} ))}
</TextField>&nbsp;&nbsp; </TextField> &nbsp; &nbsp; &nbsp;
<TextField <TextField
className={classes.margin} className={classes.margin}
id="list" id="list"
...@@ -300,19 +343,19 @@ class ShopPage extends Component { ...@@ -300,19 +343,19 @@ class ShopPage extends Component {
) )
}} }}
> >
{/* {currencies.map(option => ( {currencies.map(option => (
<option key={option.value} value={option.value}> <option key={option.value} value={option.value}>
{option.label} {option.label}
</option> </option>
))} */} ))}
</TextField> </TextField>
</DialogContentText> </DialogContentText>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button onClick={this.Closedata} color="primary"> <Button onClick={this.Closequeue} color="primary">
Cancel Cancel
</Button> </Button>
<Button onClick={this.Closedata} color="primary"> <Button onClick={this.Closequeue} color="primary">
Subscribe Subscribe
</Button> </Button>
</DialogActions> </DialogActions>
...@@ -331,15 +374,14 @@ class ShopPage extends Component { ...@@ -331,15 +374,14 @@ class ShopPage extends Component {
</div> </div>
<div className="row"> <div className="row">
<h4> <h4>
ที่อยู่ : 10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง {shop.address}
อำเภอเหล่าเสือโก้ก จังหวัดอุบลราชธานี 34000
</h4> </h4>
</div> </div>
<div className="row"> <div className="row">
<h4>เบอร์โทร : 082-547-8955</h4> <h4>เบอร์โทร : {shop.tel}</h4>
<h4>เวลาเปิด : 08:00 น.</h4> <h4>เวลาเปิด : {shop.timeopen} น.</h4>
<h4>เวลาปิด : 18:00 น.</h4> <h4>เวลาปิด : {shop.timeclose} น.</h4>
</div> </div>
</div> </div>
</div> </div>
...@@ -347,15 +389,13 @@ class ShopPage extends Component { ...@@ -347,15 +389,13 @@ class ShopPage extends Component {
<div className="row mt-2 mb-2"> <div className="row mt-2 mb-2">
<div className="col s12 m6 l7"> <div className="col s12 m6 l7">
<div className="row center"> <div className="row center">
<h4>ผลงานช่าง ปิยพร อาภรศรี</h4>
<h4>ผลงานช่าง ปิยพร อาภรศรี</h4> <div className="col s12 m6 l4">
<div className="col s12 m6 l4"> <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img>
<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img> </div>
</div> <div className="col s12 m6 l4">
<div className="col s12 m6 l4"> <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img>
<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img> </div>
</div>
</div> </div>
</div> </div>
<div className="col s12 m6 l1"></div> <div className="col s12 m6 l1"></div>
...@@ -443,7 +483,7 @@ class ShopPage extends Component { ...@@ -443,7 +483,7 @@ class ShopPage extends Component {
onClose={this.handleClose} onClose={this.handleClose}
aria-labelledby="form-dialog-title" aria-labelledby="form-dialog-title"
> >
<DialogTitle id="form-dialog-title">Subscribe</DialogTitle> <DialogTitle id="form-dialog-title">เขียนรีวิวติชม</DialogTitle>
<DialogContent> <DialogContent>
<DialogContentText> <DialogContentText>
To subscribe to this website, please enter your email To subscribe to this website, please enter your email
...@@ -463,6 +503,7 @@ class ShopPage extends Component { ...@@ -463,6 +503,7 @@ class ShopPage extends Component {
</div> </div>
</div> </div>
</div> </div>
}
</div> </div>
); );
} }
......
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