few visual changes

src/App.js

@@ -54,7 +54,6 @@ export class App extends React.Component {
     }
 
     render() {
-        console.log(this.props.app)
         return (
             <div className="container">
                 <Header/>
@@ -63,14 +62,14 @@ export class App extends React.Component {
                         <Route exact path="/doctors" render={() => <Doctors data={this.props.app.doctors} /> } />
                         <Route exact path="/services" render={() => <Services data={this.props.app.services} />} />
                         <Route exact path="/reviews" render={() => <div>Reviews</div>} />
-                        <Route path="/admin/" render={() => <Admin />} />
-                        <Route exact path="/services/:service" render={(props) => <Service
-                            his={props}
-                            data={this.props.app.services}
-                        />} />
-                        <Route  path="/appointment/:doctorId" render={(props) => <Appointment
-                            his={props}
-                        />} />
+                        <Route path="/admin/" component={Admin} />
+                        <Route exact path="/services/:service" render={(props) =>
+                            <Service
+                                his={props}
+                                data={this.props.app.services}
+                            />}
+                        />
+                        <Route  path="/appointment/:doctorId" component={Appointment}/>
                         <Route exact path="/auth" component={Auth} />
                     </Switch>
                 <Footer/>

src/actions/actions.js

@@ -8,7 +8,7 @@ const URL = "https://api-clinics.herokuapp.com/api/v1/";
 export const changeInputDoctorForm = payload => ({
     type: types.CHANGE_INPUT_VALUE_DOCTOR_FORM,
     payload
-})
+});
 
 // -----------------------------------------------------------------------------------------------------------------
 
@@ -58,32 +58,6 @@ export const setSheduleDoctor = payload => ({
 
 // -----------------------------------------------------------------------------------------------------------------
 
-// const getAllRequest = payload => ({
-//     type: types.GET_ALL_REQUEST,
-//     payload
-// });
-//
-// const getAllRequestSuccess = payload => ({
-//     type: types.GET_ALL_REQUEST_SUCCESS,
-//     payload
-// });
-//
-// const getAllRequestFail = payload => ({
-//     type: types.GET_ALL_REQUEST_FAIL,
-//     payload
-// });
-//
-// export const getAll = () => dispatch => {
-//     dispatch(getAllRequest());
-//     return fetch(`${URL}.json`)
-//         .then(res => res.json())
-//         .then(res => dispatch(getAllRequestSuccess(res)))
-//         .catch(err => dispatch(getAllRequestFail(err)));
-// };
-
-// -----------------------------------------------------------------------------------------------------------------
-// -----------------------------------------------------------------------------------------------------------------
-
 const getDoctorsRequest = payload => ({
     type: types.GET_DOCTORS_REQUEST,
     payload

src/actionsTypes/actionsTypes.js

@@ -6,10 +6,6 @@ export const GET_SERVICES_REQUEST = "GET_SERVICES_REQUEST";
 export const GET_SERVICES_REQUEST_SUCCESS = "GET_SERVICES_REQUEST_SUCCESS";
 export const GET_SERVICES_REQUEST_FAIL = "GET_SERVICES_REQUEST_FAIL";
 
-// export const GET_ALL_REQUEST = "GET_ALL_REQUEST";
-// export const GET_ALL_REQUEST_SUCCESS = "GET_ALL_REQUEST_SUCCESS";
-// export const GET_ALL_REQUEST_FAIL = "GET_ALL_REQUEST_FAIL";
-
 export const CHANGE_APPOINTMENT_SHEDULE= "CHANGE_APPOINTMENT_SHEDULE";
 export const CHANGE_APPOINTMENT_DOCTOR= "CHANGE_APPOINTMENT_DOCTOR";
 export const CHANGE_APPOINTMENT_TIME= "CHANGE_APPOINTMENT_TIME";
@@ -45,7 +41,6 @@ export const PUT_DOCTORS_REQUEST = "PUT_DOCTORS_REQUEST";
 export const PUT_DOCTORS_REQUEST_SUCCESS = "PUT_DOCTORS_REQUEST_SUCCESS";
 export const PUT_DOCTORS_REQUEST_FAIL = "PUT_DOCTORS_REQUEST_FAIL";
 
-// export const CHANGE_SHEDULE_DATE= "CHANGE_SHEDULE_DATE";
 export const CHANGE_SHEDULE_DOCTOR= "CHANGE_SHEDULE_DOCTOR";
 
 export const CHANGE_INPUT_VALUE_DOCTOR_FORM= "CHANGE_INPUT_VALUE_DOCTOR_FORM";

src/components/Appointment.js

@@ -16,7 +16,8 @@ import {
 export class Appoint extends React.Component {
 
     componentDidMount() {
-        this.props.setAppointmentDoctor(this.props.his.match.params.doctorId)
+        console.log(this.props)
+        this.props.setAppointmentDoctor(this.props.match.params.doctorId)
     }
 
     componentWillUnmount() {
@@ -25,8 +26,8 @@ export class Appoint extends React.Component {
 
     render() {
         const {doctors, appointment, timeArray, wrongDate,services} = this.props.app;
-        const {his, setAppointmentSpec, setAppointmentShedule, setAppointmentTime, setAppointmentComment, postOrders} = this.props;
-        const doctor = doctors.find(el => el._id === his.match.params.doctorId);
+        const {match, setAppointmentSpec, setAppointmentShedule, setAppointmentTime, setAppointmentComment, postOrders} = this.props;
+        const doctor = doctors.find(el => el._id === match.params.doctorId);
         let spec;
         if (appointment.spec){
             spec = services.find(el => el._id === appointment.spec)

src/components/Service.js

@@ -7,8 +7,7 @@ export default class Service extends React.Component {
 
     render() {
         const {his,data} = this.props;
-        const service = data.find(el => el._id === his.match.params.service)
-        console.log(this.props)
+        const service = data.find(el => el._id === his.match.params.service);
         return (
             <div style={{display:'flex',flexDirection:'column', width:'200px', margin:'100px 20px'}}>
                 {service.name}

src/reducers/reducers.js

@@ -127,10 +127,8 @@ export const appReducer = (state = defaultState,action) => {
             let shedule = doctor.shedule.find(el => el._id === action.payload);
             let duration = state.services.find(el => el._id === state.appointment.spec).duration;
             for (let index in shedule) {
-                console.log(index)
                 let check = true;
                 for (let x=0;x < duration; x++){
-
                     if (shedule[`${+index.split(':')[0]+x < 10 ? '0' +(+index.split(':')[0] + x) + ':00' : +index.split(':')[0]+ x + ':00'}`] !== true){
                         check = false
                     }
@@ -202,6 +200,7 @@ export const appReducer = (state = defaultState,action) => {
         case types.CHANGE_SHEDULE_DOCTOR : {
             let doctor = state.doctors.find(el=>el.name === action.payload);
             let array = [[],[],[],[],[],[],[],[],[],[],[],[]];
+            // eslint-disable-next-line array-callback-return
             doctor.shedule.map(el => {
                 array[new Date(el.data).getMonth()].push(el)
             });