Browse Source

some changes

Mila-Zagrevskaya 5 years ago
parent
commit
dba80fa418
4 changed files with 10 additions and 9 deletions
  1. 1 3
      src/App.js
  2. 3 3
      src/components/Admin/Orders.js
  3. 5 3
      src/style/all.scss
  4. 1 0
      src/style/select.scss

+ 1 - 3
src/App.js

@@ -44,9 +44,7 @@ export class App extends React.Component {
         //     .then (res => res.json ())
         //     .then (res => console.log (res))
     }
-    componentDidUnMount () {
-        window.removeEventListener  ( "hashchange", makeHashchange)  
-    }
+
     render() {
         return (
               <Loader flag={this.props.app.isFetching}>

+ 3 - 3
src/components/Admin/Orders.js

@@ -41,8 +41,8 @@ class Orders extends Component {
                                 <p>{el.time}</p>
                             </div>
                             <div className="name-info">
-                                <Link to={`/user/${el.user._id}`} className = "order-info">{`${el.user.firstName} ${el.user.lastName}`}</Link>
-                                <div className="info-serv-doc">
+                                 <div className="info-serv-doc">
+                                    <Link to={`/user/${el.user._id}`} className = "order-info">{`${el.user.firstName} ${el.user.lastName}`}</Link>
                                     <Link to={`/doctors/${el.doctor._id}`} className = "order-info">{el.doctor.name}</Link>
                                     <Link to={`/services/${el.spec._id}`} className = "order-info">{el.spec.name}</Link>
                                 </div>                                
@@ -62,8 +62,8 @@ class Orders extends Component {
                                 <p>{el.time}</p>
                             </div>
                             <div className="name-info">
-                                <Link to={`/user/${el.user._id}`} className = "order-info">{`${el.user.firstName} ${el.user.lastName}`}</Link>
                                 <div className="info-serv-doc">
+                                    <Link to={`/user/${el.user._id}`} className = "order-info">{`${el.user.firstName} ${el.user.lastName}`}</Link>
                                     <Link to={`/doctors/${el.doctor._id}`} className = "order-info">{el.doctor.name}</Link>
                                     <Link to={`/services/${el.spec._id}`} className = "order-info">{el.spec.name}</Link>
                                 </div>

+ 5 - 3
src/style/all.scss

@@ -1089,6 +1089,7 @@ h2 {
 	}
 	.order-info {
 		text-decoration: none;
+		text-align-last: left;
 		color: $header-color;
 		padding: 5px;
 	}
@@ -1099,9 +1100,11 @@ h2 {
 		color: $hover-color;
 		a {
 			color: $hover-color;
+			margin: 0 10px;
 		}
 		p {
-			margin: 0;
+			margin: 0 10px;
+			padding: 5px;
 		}
 	}
 	.name-info {
@@ -1110,8 +1113,7 @@ h2 {
 		justify-content: space-between;
 		.info-serv-doc {
 			display: flex;
-			margin-left: 10px;
-			flex-basis: 75%;
+			width: 100%;
 			justify-content: space-between;
 			a {
 				display: flex;

+ 1 - 0
src/style/select.scss

@@ -21,6 +21,7 @@ $opacity-color: rgba(17,17,17,0.8);
 	}
 
 	&__list {
+		position: absolute;
 		list-style: none;
 		padding: 0;
 		margin: 0;