Mila-Zagrevskaya 5 年 前
コミット
5881cecb7b

+ 1 - 0
src/components/Admin/ChangeServices-Doctors.js

@@ -17,6 +17,7 @@ export default class ChangeServicesDoctors extends React.Component {
             changeInputValues,
         } = this.props;
         return (
+            
             <div style={{display:'flex',flexDirection:'column', width:'400px', margin:'10px 20px'}}>
                 <form style={{display:"flex",flexDirection:"column"}} onSubmit={(e)=>{
                     e.preventDefault();

+ 8 - 7
src/components/Admin/Shedule.js

@@ -19,10 +19,11 @@ export default class Shedule extends React.Component {
     };
 
     render() {
-        const {doctors,postNewShedule,sheduleMonthArray,setSheduleDoctor} = this.props;
+        const { doctors, postNewShedule, sheduleMonthArray, setSheduleDoctor } = this.props;
         return (
             <div  className = "shedule-container" >
-                <div className="option">
+              
+                <div className = "option" >
                     <select className = "appointment admin-appointment"  onChange={(e) => setSheduleDoctor(e.target.value)} defaultValue='Выберите доктора'>
                     <option disabled >Выберите доктора</option>
                         {
@@ -34,13 +35,13 @@ export default class Shedule extends React.Component {
 
                     {postNewShedule.doctor &&
                         <div className = "input-box">
-                            <input className = "shedule-input " type="date" onChange={(e) => this.setState({startDate:e.target.value})}/>
-                            <input className = "shedule-input right" type="date" onChange={(e) => this.setState({endDate:e.target.value})}/>
+                            <input className = "shedule-input " type="date" onChange = { ( e ) => this.setState({startDate:e.target.value } ) }/>
+                            <input className = "shedule-input right" type="date" onChange = { ( e ) => this.setState ( { endDate:e.target.value } ) } />
                         </div>
                     }
 
 
-                {(this.state.startDate && this.state.endDate) && <button className = "btn admin" onClick={this.post}>Post</button>}
+                { ( this.state.startDate && this.state.endDate ) && <button className = "btn admin" onClick = { this.post }>Отправить </button>}
 
                 </div>
                 
@@ -51,8 +52,8 @@ export default class Shedule extends React.Component {
                     <div className = "shedule">
                         {
                             sheduleMonthArray[new Date().getMonth()].map(el => (
-                                <div key={el._id} style={{margin:'10px 20px'}}>
-                                    <p>{new Date(el.data).toISOString().split('T')[0].split('-')[2]}</p>
+                                <div className = "days-of-month"  key={el._id}>
+                                    <p className = "title-day">{new Date(el.data).toISOString().split('T')[0].split('-')[2]}</p>
                                     {
                                         Object.keys(el).map(key=> {
                                             return [key,el[key]]

+ 1 - 1
src/components/header/index.js

@@ -13,7 +13,7 @@ export default () => (
 					<img src= {logo} className = "logo" alt="logo"/>
 				</Link>
 			</div>
-			<Navigation></Navigation>
+			<Navigation/>
 	</header>
 );
 

+ 20 - 8
src/style/all.scss

@@ -525,22 +525,34 @@ aside {
 	.right {
 		margin-right: 0;
 	}
-
-	.shedule {
-		display: flex; 
-		margin: 10px 20px;
-		width: 100%;
-		flex-wrap: wrap;
-	}
 	.month {
 		color: $hover-color;
 		text-transform: uppercase;
 		font-weight: 700;
 		letter-spacing: 0.2em;
-	}
+		}
 	.admin {
 		margin-top: 30px;
 		width: 100%;
 	}
+	.shedule {
+		display: flex; 
+		margin: 10px 0px;
+		width: 100%;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		.days-of-month {
+			width: 15%;
+			border: 1px solid $hover-color;
+			border-radius: 3px;
+			margin: 10px 20px;
+			text-align: center;
+			.title-day {
+				border-bottom: 1px solid $hover-color;
+				margin: 5px 0;
+			}
+		}
+	}
+
 }