Mila-Zagrevskaya 5 jaren geleden
bovenliggende
commit
cfa26a93c8
6 gewijzigde bestanden met toevoegingen van 403 en 18 verwijderingen
  1. 8 8
      db.json
  2. 9 1
      src/App.js
  3. 2 2
      src/components/main/Main.js
  4. 382 3
      src/components/main/reviews.js
  5. 1 1
      src/components/main/team.js
  6. 1 3
      src/style/all.scss

+ 8 - 8
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": {
@@ -69,7 +69,7 @@
                 "photo": "./images/doctors/lisa.jpg",
                 "experience": 15,
                 "rank": "Стоматолог-ортодонт",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff7813e","5d320979dae390159ff78142","5d320979dae390159ff78135"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -132,7 +132,7 @@
                 "photo": "./images/doctors/alison.jpg",
                 "experience": 6,
                 "rank": "Стоматолог-эндодонтист ",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320978dae390159ff780df","5d320979dae390159ff780f0","5d320979dae390159ff780f6","5d320978dae390159ff780d0","5d320979dae390159ff780ec"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -195,7 +195,7 @@
                 "photo": "./images/doctors/lorenskatner.jpg",
                 "experience": 4,
                 "rank": "Стоматолог-терапевт",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff780fd","5d320979dae390159ff78116","5d320979dae390159ff780fa","5d320979dae390159ff78104"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -258,7 +258,7 @@
                 "photo": "./images/doctors/ericforman.jpg",
                 "experience": 10,
                 "rank": "Стоматолог-протезист",
-                "speciality": ["service1","service2","service3","service4","service5"],
+                "speciality": ["5d320979dae390159ff78137","5d320979dae390159ff7811d","5d320979dae390159ff78140","5d320979dae390159ff78114","5d320979dae390159ff78118", "5d320979dae390159ff7811a", "5d320979dae390159ff78125", "5d32097adae390159ff7816a", "5d32097adae390159ff78161"],
                 "schedule": {
                     "08": {
                       "09": {
@@ -321,7 +321,7 @@
                 "photo":  "./images/doctors/kris_taub.jpg",
                 "experience": 20,
                 "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> 
         )

File diff suppressed because it is too large
+ 382 - 3
src/components/main/reviews.js


+ 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>

+ 1 - 3
src/style/all.scss

@@ -278,12 +278,10 @@ h2 {
 }
 
 //  Footer
-
 .footer {
 	position: static;
-	// top: 80%;
 	background-image: url(../assets/images/bg2.jpg);
-	// background-size: 100vh;
+	background-size: cover;
 	background-repeat: no-repeat;
 	padding: 60px 25px;
 	color: $opacity-color;