+
@@ -108,7 +108,11 @@ class SearchBar extends React.Component {
);
@@ -118,10 +122,10 @@ class SearchBar extends React.Component {
class SearchResult extends React.Component {
render() {
return (
-
- {this.props.name}
- {this.props.type}
-
+
+ | {this.props.name} |
+ {this.props.type} |
+
);
}
}
diff --git a/src/components/SideMenu.css b/src/components/SideMenu.css
index 17f81d5..0782675 100644
--- a/src/components/SideMenu.css
+++ b/src/components/SideMenu.css
@@ -83,4 +83,21 @@
.SideMenu-Item:active, .SideMenu-Item.active {
border-left: 4px solid steelblue;
background-color: aliceblue;
+}
+
+@media (max-width: 870px) {
+ .SideMenu {
+ position: static;
+ align-self: center;
+ height: 400px;
+ margin: 10px;
+ }
+
+ .SMCategory-Button {
+ font-size: 20px;
+ }
+
+ .SideMenu-Item {
+ font-size: 12px;
+ }
}
\ No newline at end of file
diff --git a/src/components/Slideshow/Slideshow.css b/src/components/Slideshow/Slideshow.css
index bff0ba0..374dc9b 100644
--- a/src/components/Slideshow/Slideshow.css
+++ b/src/components/Slideshow/Slideshow.css
@@ -105,4 +105,10 @@ html {
padding: 10px;
color: white;
box-shadow: 0 0 10px 1px black;
+}
+
+@media (max-width: 425px) {
+ .Slideshow-container {
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/src/components/Slideshow/Slideshow.js b/src/components/Slideshow/Slideshow.js
index 940fe1d..32600f3 100644
--- a/src/components/Slideshow/Slideshow.js
+++ b/src/components/Slideshow/Slideshow.js
@@ -30,6 +30,10 @@ export class Slideshow extends React.Component {
this.autoScroll = setInterval(this.scrollRight, 4000);
}
+ componentWillUnmount() {
+ clearInterval(this.autoScroll);
+ }
+
scrollRight() {
if (this.curSlideId === this.slideCount + this.id) {
this.curSlideId = this.slidesComponents[0].props.id;
diff --git a/src/components/inputs.css b/src/components/inputs.css
index c1ebf7e..0147c25 100644
--- a/src/components/inputs.css
+++ b/src/components/inputs.css
@@ -107,6 +107,7 @@
.InputRow {
display: flex;
flex-direction: row;
+ flex-wrap: wrap;
align-items: center;
justify-content: space-evenly;
}
@@ -121,12 +122,18 @@
white-space: nowrap;
}
+.tableOverflowContainer {
+ width: 100%;
+ overflow-x: auto;
+ margin: 10px;
+}
+
table {
background-color: aliceblue;
- margin: 10px;
border-radius: 10px;
border-collapse: collapse;
border-spacing: 0px;
+ width: 100%;
}
thead {
@@ -146,4 +153,5 @@ th:last-child {
th {
padding: 4px;
-}
\ No newline at end of file
+}
+
diff --git a/src/pages/DoctorProfilePage.js b/src/pages/DoctorProfilePage.js
index 3d55064..648fc31 100644
--- a/src/pages/DoctorProfilePage.js
+++ b/src/pages/DoctorProfilePage.js
@@ -260,28 +260,30 @@ class DoctorProfilePage extends React.Component {
openTable = (
<>
Поточні записи
-
-
-
- | Ім'я пацієнта |
- Номер телефону |
- Час |
- Дата |
-
-
-
- {open.map(a => {
- return (
-
- | {`${a.user.firstName} ${a.user.lastName}`} |
- {a.user.phone} |
- {moment(a.timeSlot.time).format('HH:mm')} |
- {moment(a.timeSlot.time).format('DD.MM.YYYY')} |
+
+
+
+
+ | Ім'я пацієнта |
+ Номер телефону |
+ Час |
+ Дата |
- );
- })}
-
-
+
+
+ {open.map(a => {
+ return (
+
+ | {`${a.user.firstName} ${a.user.lastName}`} |
+ {a.user.phone} |
+ {moment(a.timeSlot.time).format('HH:mm')} |
+ {moment(a.timeSlot.time).format('DD.MM.YYYY')} |
+
+ );
+ })}
+
+
+
>
);
} else openTable =