瀏覽代碼

add cards doctors

Mila-Zagrevskaya 5 年之前
父節點
當前提交
aef3ae448d
共有 5 個文件被更改,包括 28 次插入21 次删除
  1. 13 13
      db.json
  2. 9 1
      src/App.js
  3. 2 2
      src/components/main/Main.js
  4. 3 4
      src/components/main/reviews.js
  5. 1 1
      src/components/main/team.js

+ 13 - 13
db.json

@@ -2,11 +2,11 @@
 {
     "doctors": [
             {
-                "description": "Грегори Хаус",
+                "name": "Грегори Хаус",
                 "photo": "./images/doctors/gregoryhaus.jpg",
-                "experience": 30,
+                "experience": "1991-03-22",
                 "rank": "Стоматолог-хирург",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff78155","5d320979dae390159ff7814d"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -67,9 +67,9 @@
             {
                 "description": "Лиза Кадди",
                 "photo": "./images/doctors/lisa.jpg",
-                "experience": 15,
+                "experience": "2004-05-13",
                 "rank": "Стоматолог-ортодонт",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff7813e","5d320979dae390159ff78142","5d320979dae390159ff78135"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -130,9 +130,9 @@
             {
                 "description": "Эллисон Кэмерон",
                 "photo": "./images/doctors/alison.jpg",
-                "experience": 6,
+                "experience": "2011-08-02",
                 "rank": "Стоматолог-эндодонтист ",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320978dae390159ff780df","5d320979dae390159ff780f0","5d320979dae390159ff780f6","5d320978dae390159ff780d0","5d320979dae390159ff780ec"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -193,9 +193,9 @@
             {
                 "description": "Лоренс Катнер",
                 "photo": "./images/doctors/lorenskatner.jpg",
-                "experience": 4,
+                "experience": "2015-10-01",
                 "rank": "Стоматолог-терапевт",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff780fd","5d320979dae390159ff78116","5d320979dae390159ff780fa","5d320979dae390159ff78104"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -256,9 +256,9 @@
             {
                 "description": "Эрик Форман",
                 "photo": "./images/doctors/ericforman.jpg",
-                "experience": 10,
+                "experience": "2009-02-10",
                 "rank": "Стоматолог-протезист",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff78137","5d320979dae390159ff7811d","5d320979dae390159ff78140","5d320979dae390159ff78114","5d320979dae390159ff78118", "5d320979dae390159ff7811a", "5d320979dae390159ff78125", "5d32097adae390159ff7816a", "5d32097adae390159ff78161"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -319,9 +319,9 @@
             {
                 "description": "Крис Тауб",
                 "photo":  "./images/doctors/kris_taub.jpg",
-                "experience": 20,
+                "experience": "1999-03-29",
                 "rank": "Детский стоматолог",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d32097adae390159ff781a3","5d32097adae390159ff7818d","5d32097adae390159ff78178","5d32097adae390159ff7817e","5d32097adae390159ff78186", "5d32097adae390159ff781a8", "5d32097adae390159ff7816f", "5d32097adae390159ff78188", "5d32097adae390159ff7819d", "5d320979dae390159ff78147", "5d32097adae390159ff7817c"],
                 "schedule": {
                     "08": {
                       "09": {

+ 9 - 1
src/App.js

@@ -38,6 +38,14 @@ export class App extends React.Component {
         //     .then(res => res.json())
         //     .then(res => console.log (res))
 
+    //     fetch("https://api-clinics.herokuapp.com/api/v1/doctors",{
+    //         method: "GET",
+    //         credentials:"include"
+    //     })
+    //     .then(res => res.json())
+    //     .then(res => console.log (res))
+    // }
+
         // fetch ("https://api-clinics.herokuapp.com/api/v1/auth/login", {
         //     method : "POST",
         //     credentials: "include",
@@ -54,7 +62,7 @@ export class App extends React.Component {
     }
 
     render() {
-        console.log(this.props.app.servicesArray)
+        // console.log(this.props.app)
         return (
             <>
                     <Header/>

+ 2 - 2
src/components/main/Main.js

@@ -8,7 +8,7 @@ import Button from "../buttons/button";
 import About from "./aboutUs";
 import Team from "./team";
 // import MyMap from "./myMap";
-// import Reviews from "./reviews";
+import Reviews from "./reviews";
 
 import {connect} from 'react-redux'
 
@@ -45,7 +45,7 @@ export class Main extends React.Component {
                   {/* <MyMap /> */}
                 </div>
                 <div className="wrapper">
-                    {/* <Reviews services = {this.props.app.doctors} postDoctors = {this.props.postDoctors}/> */}
+                    <Reviews services = {this.props.app.doctors} postDoctors = {this.props.postDoctors}/>
                 </div>
             </main> 
         )

+ 3 - 4
src/components/main/reviews.js

@@ -4,7 +4,6 @@ import Button from "../buttons/button";
 // import { postServices} from "../../store/app/actions";
 
 
-// const doctors  = [ ]
 
 
 export default class Reviews extends React.Component {
@@ -15,9 +14,9 @@ export default class Reviews extends React.Component {
             <>
                 <h2>Отзывы</h2>
                 <div classdescription = "reviews-container">
-                    <Button className = "btn" text = "POST to servises"
-                    //  onClick = { ( ) => {   doctors.map ( el => postDoctors (el))           }  }
-                        />
+                    <Button className = "btn" text = "POST to doctors"
+                        // onClick = { ( ) => {   doctors.map ( el => postDoctors ( el ) )  }  }
+                    />
                  </div>
             </>
         ) 

+ 1 - 1
src/components/main/team.js

@@ -7,7 +7,7 @@ import {Link} from 'react-router-dom';
 export default class Team extends React.Component {
     render( ) {
         const {doctorsArr } = this.props
-        console.log(doctorsArr)
+        console.log (doctorsArr)
         return (
             <>
                 <h2>Наши врачи</h2>