add

Backend/controllers/shop/index.js

@@ -15,7 +15,7 @@ exports.addShop = async (req, res) => {
 exports.getShop = async (req, res) => {
   try {
     let shop = await Shop.findAll();
-    res.status(200).send("success");
+    res.status(200).send(shop);
   } catch (err) {
     console.log(err);
     res.sendStatus(401);
@@ -45,7 +45,7 @@ exports.getShopId = async (req, res) => {
         id: shopId
       }
     });
-    res.status(200).send("success");
+    res.status(200).send(shop);
   } catch (err) {
     console.log(err);
     res.sendStatus(401);

Backend/models/shop/index.js

@@ -9,13 +9,16 @@ module.exports = db.sequelize.define("shops", {
   },
 
   name: {
-    type: Sequelize.INTEGER
+    type: Sequelize.STRING
   },
-  timeopen: {
+  nameeng: {
     type: Sequelize.STRING
   },
+  timeopen: {
+    type: Sequelize.DATE
+  },
   timeclose: {
-    type: Sequelize.STRING
+    type: Sequelize.DATE
   },
   address: {
     type: Sequelize.TEXT
@@ -32,6 +35,14 @@ module.exports = db.sequelize.define("shops", {
   facebook: {
     type: Sequelize.TEXT
   },
+  image:{
+    type: Sequelize.TEXT
+  },
+  userId: {
+    type: Sequelize.INTEGER,
+    references: 'users',
+    referencesKey: 'id'
+  },
   type: {
     type: Sequelize.ENUM(
       "สปาและนวด",
@@ -42,4 +53,7 @@ module.exports = db.sequelize.define("shops", {
       "แต่งหน้าทำผม"
     )
   }
+ 
+
+  
 });

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

@@ -80,11 +80,13 @@ class Datashop extends Component {
   state = {
     currency: "1",
     name: "",
+    nameeng: "",
     timeopen: "",
     timeclose: "",
     tel: "",
     address: "",
     detail: "",
+    images: "",
     map: "",
     facebook: "",
     type: "",
@@ -110,6 +112,7 @@ class Datashop extends Component {
     const {
       currency,
       name,
+      nameeng,
       timeopen,
       timeclose,
       tel,
@@ -161,7 +164,22 @@ class Datashop extends Component {
                 }}
                 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
                 className={classes.margin}
                 id="timeopen"
@@ -179,6 +197,10 @@ class Datashop extends Component {
                 }}
                 onChange={this.handleChange}
               />
+             
+            </div>
+            <br />
+            <div>
             <TextField
                 className={classes.margin}
                 id="timeclose"
@@ -196,9 +218,6 @@ class Datashop extends Component {
                 }}
                 onChange={this.handleChange}
               />
-            </div>
-            <br />
-            <div>
               <TextField
                 className={classes.margin}
                 id="tel"
@@ -233,6 +252,10 @@ class Datashop extends Component {
                 }}
                 onChange={this.handleChange}
               />
+             
+            </div>
+            <br />
+            <div>
             <TextField
                 className={classes.margin}
                 id="detail"
@@ -250,9 +273,6 @@ class Datashop extends Component {
                 }}
                 onChange={this.handleChange}
               />
-            </div>
-            <br />
-            <div>
               <TextField
                 className={classes.margin}
                 id="map"
@@ -330,6 +350,7 @@ class Datashop extends Component {
                     axios
                       .post("http://localhost:9000/api/shop/add", {
                         name: name,
+                        nameeng:nameeng,
                         timeopen: timeopen,
                         timeclose: timeclose,
                         tel: tel,

b_beauty_project/src/views/HomePage/index.js

@@ -22,7 +22,7 @@ import { injectIntl, FormattedRelativeTime } from "react-intl";
 import { th } from "date-fns/locale";
 import { format } from "date-fns";
 import MenuIcon from "@material-ui/icons/Menu";
-
+import axios from "axios";
 import SearchIcon from "@material-ui/icons/Search";
 import DirectionsIcon from "@material-ui/icons/Directions";
 import ListIcon from "@material-ui/icons/List";
@@ -63,34 +63,64 @@ const styles = theme => ({
     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 = [
   {
     value: "1",
-    label: "    กรุณาเลือกประเภท     "
+    label: "    กรุณาเลือกช่าง    "
   },
   {
     value: "2",
-    label: "สปาและนวด"
+    label: "ช่าง ก"
   },
   {
     value: "3",
-    label: "ผิวหน้า"
+    label: "ช่าง ข"
   },
   {
     value: "4",
-    label: "ขนตาและคิ้ว"
+    label: "ช่าง ค"
   },
   {
     value: "5",
-    label: "ทำเล็บ"
+    label: "ช่าง ง"
   },
   {
     value: "6",
-    label: "ชาลอน"
+    label: "ช่าง จ"
   },
   {
     value: "7",
-    label: "แต่งหน้าทำผม"
+    label: "ช่าง"
   }
 ];
 class HomePage extends Component {
@@ -99,7 +129,8 @@ class HomePage extends Component {
     date: new Date(),
     open: false,
     list: false,
-    rating: 0
+    rating: 0,
+    shops: []
   };
   handleClickOpen = () => {
     this.setState({
@@ -122,7 +153,7 @@ class HomePage extends Component {
     });
   };
   
-  componentDidMount = () => {
+  componentDidMount = async () => {
     let { pathname } = this.props.location;
     pathname = pathname.substring(1, pathname.length);
     // console.log('pathname', pathname)
@@ -142,8 +173,12 @@ class HomePage extends Component {
         : 0;
     //   7
 
+    const response = await axios.get("http://localhost:9000/api/shop/all");
+    console.warn(response.data)
+
     this.setState({
-      tab: tab
+      tab: tab,
+      shops: response.data
     });
   };
 
@@ -177,7 +212,7 @@ class HomePage extends Component {
     const { classes } = this.props;
     // 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 (
       <div>
         <AppBra tab={tab} handleChangeTab={this.handleChangeTab} />
@@ -214,6 +249,7 @@ class HomePage extends Component {
             </div>
           </div>
 
+          { shops.map(shop =>
             <div className="row mt-5 mb-2 ">
               <div className="col s12 m6 l6">
                 <div className="row  mt-3 mb-2 center">
@@ -221,7 +257,7 @@ class HomePage extends Component {
                     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"
                     width="60%"
                     onClick={() => {
-                    this.props.history.push("/ShopPage");
+                      this.props.history.push("/ShopPage", { id: shop.id });
                     }}
                   />
                 </div>
@@ -229,12 +265,12 @@ class HomePage extends Component {
 
               <div className="col s12 m6 l4">
                 <div className="row mt-2 mb-2">
-                <h3>น้องใหม่บิวตี้ NongMai Beauty</h3>
+                  <h3>{shops.name}</h3>
+                  
                 </div>
 
                 <div className="row mt-2 mb-2">
-                ที่อยู่ : 10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง อำเภอเหล่าเสือโก้ก
-                จังหวัดอุบลราชธานี 34000
+                  {shops.address}
                 </div>
 
                 <div className="row  mt-3 mb-2">
@@ -329,11 +365,11 @@ class HomePage extends Component {
                             )
                           }}
                         >
-                        {/* {currencies.map(option => (
+                          {currencieslist.map(option => (
                             <option key={option.value} value={option.value}>
                               {option.label}
                             </option>
-                        ))} */}
+                          ))}
                         </TextField>
                         <TextField
                           className={classes.margin}
@@ -354,11 +390,11 @@ class HomePage extends Component {
                             )
                           }}
                         >
-                        {/* {currencies.map(option => (
+                          {currencies.map(option => (
                             <option key={option.value} value={option.value}>
                               {option.label}
                             </option>
-                        ))} */}
+                          ))}
                         </TextField>
                       </DialogContentText>
                     </DialogContent>
@@ -374,6 +410,7 @@ class HomePage extends Component {
                 </div>
               </div>
             </div>
+          ) }
         </div>
       </div>
     );

b_beauty_project/src/views/ShopPage/index.js

@@ -20,7 +20,7 @@ import {
   DialogTitle,
   InputAdornment,
   TextField,
-  InputBase,
+  InputBase
 } from "@material-ui/core";
 import MoreVertIcon from "@material-ui/icons/MoreVert";
 import { DatePicker } from "@material-ui/pickers";
@@ -70,15 +70,76 @@ const styles = theme => ({
     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 {
   state = {
-    name: "xxx",
-    email: "xyz.ggg.com",
+  
     reviwe: false,
     list: false,
     date: new Date(),
     open: false,
-    data: false
+    queue:false,
+    shop: null
   };
   handleClickOpen = () => {
     this.setState({
@@ -110,58 +171,40 @@ class ShopPage extends Component {
       list: false
     });
   };
-  ClickOpendata = () => {
+  ClickOpenqueue = () => {
     this.setState({
-      data: true
+      queue: true
     });
   };
-  Closedata = () => {
+  Closequeue = () => {
     this.setState({
-      data: false
+      queue: false
     });
   };
 
-  componentDidMount = () => {
-    axios
-      .get("http://localhost:9000/api/auth/getUserById/7")
-      .then(function(response) {
-        // handle success
-        // console.log("response : ", 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);
-
+  componentDidMount = async () => {
+    const {location } = this.props;
+    const id = location.state.id;
+    const response = await axios.get(`http://localhost:9000/api/shop/getShopId/${id}`);
     this.setState({
-          name: name,
-          email: email
+      shop: response.data
     });
-      })
-      .catch(function(error) {
-        // handle error
-        console.log(error);
-      });
-
-    console.log("here");
   };
 
   render() {
     const { classes } = this.props;
     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 (
       <div>
         <AppBar />
 
-        <div className="row ">
+        { shop && <div className="row">
           <div className="row mt-2 mb-2">
             <div className="col s12 m6 l1"></div>
             <div className="col s12 m6 l11">
-              <h3>น้องใหม่บิวตี้ NongMai Beauty</h3>
-              10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง อำเภอเหล่าเสือโก้ก
-              จังหวัดอุบลราชธานี 34000
+             <h3>{shop.name}</h3>
+             {shop.address}
             </div>
           </div>
           <div className="row mt-4 mb-2">
@@ -240,15 +283,15 @@ class ShopPage extends Component {
                     <Button
                       variant="outlined"
                       color="primary"
-                      onClick={this.ClickOpendata}
+                      onClick={this.ClickOpenqueue}
                     >
                       ถัดไป
                     </Button>
                   </DialogActions>
                 </Dialog>
                 <Dialog
-                  open={data}
-                  onClose={this.Closedata}
+                  open={queue}
+                  onClose={this.Closequeue}
                   aria-labelledby="max-width-dialog-title"
                 >
                   <DialogTitle id="max-width-dialog-title">
@@ -275,12 +318,12 @@ class ShopPage extends Component {
                           )
                         }}
                       >
-                        {/* {currencies.map(option => (
+                        {currencieslist.map(option => (
                           <option key={option.value} value={option.value}>
                             {option.label}
                           </option>
-                        ))} */}
-                      </TextField>&nbsp;&nbsp;
+                        ))}
+                      </TextField> &nbsp; &nbsp; &nbsp;
                       <TextField
                         className={classes.margin}
                         id="list"
@@ -300,19 +343,19 @@ class ShopPage extends Component {
                           )
                         }}
                       >
-                        {/* {currencies.map(option => (
+                        {currencies.map(option => (
                           <option key={option.value} value={option.value}>
                             {option.label}
                           </option>
-                        ))} */}
+                        ))}
                       </TextField>
                     </DialogContentText>
                   </DialogContent>
                   <DialogActions>
-                    <Button onClick={this.Closedata} color="primary">
+                    <Button onClick={this.Closequeue} color="primary">
                       Cancel
                     </Button>
-                    <Button onClick={this.Closedata} color="primary">
+                    <Button onClick={this.Closequeue} color="primary">
                       Subscribe
                     </Button>
                   </DialogActions>
@@ -331,15 +374,14 @@ class ShopPage extends Component {
               </div>
               <div className="row">
                 <h4>
-                  ที่อยู่ : 10 หมู่ 1 บ้านโพนเมือง ตำบลโพนเมือง
-                  อำเภอเหล่าเสือโก้ก จังหวัดอุบลราชธานี 34000
+                {shop.address}
                 </h4>
               </div>
 
               <div className="row">
-                <h4>เบอร์โทร : 082-547-8955</h4>
-                <h4>เวลาเปิด : 08:00 น.</h4>
-                <h4>เวลาปิด : 18:00 น.</h4>
+                <h4>เบอร์โทร : {shop.tel}</h4>
+                <h4>เวลาเปิด : {shop.timeopen} น.</h4>
+                <h4>เวลาปิด : {shop.timeclose} น.</h4>
               </div>
             </div>
           </div>
@@ -347,7 +389,6 @@ class ShopPage extends Component {
           <div className="row mt-2 mb-2">
             <div className="col s12 m6 l7">
               <div className="row center">
-               
                 <h4>ผลงานช่าง ปิยพร อาภรศรี</h4>
                 <div className="col s12 m6 l4">
                   <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img>
@@ -355,7 +396,6 @@ class ShopPage extends Component {
                 <div className="col s12 m6 l4">
                   <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSAaEt_unwBuDLyqCP_bW3PBawVHkjZrNq-F3u7mAKtSjmBTrHE"></img>
                 </div>
-                
               </div>
             </div>
             <div className="col s12 m6 l1"></div>
@@ -443,7 +483,7 @@ class ShopPage extends Component {
                   onClose={this.handleClose}
                   aria-labelledby="form-dialog-title"
                 >
-                  <DialogTitle id="form-dialog-title">Subscribe</DialogTitle>
+                  <DialogTitle id="form-dialog-title">เขียนรีวิวติชม</DialogTitle>
                   <DialogContent>
                     <DialogContentText>
                       To subscribe to this website, please enter your email
@@ -463,6 +503,7 @@ class ShopPage extends Component {
             </div>
           </div>
         </div>
+        }
       </div>
     );
   }