diff --git a/package-lock.json b/package-lock.json index 26a4e140d..429995604 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,6 @@ "fontsource-roboto": "^3.0.3", "html2canvas": "^1.0.0-rc.7", "immutable": "^4.0.0-rc.12", - "is-electron": "^2.2.0", "jspdf": "^2.3.1", "jszip": "^3.6.0", "node-sass": "^4.14.1", @@ -49209,11 +49208,6 @@ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==" }, - "is-electron": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.0.tgz", - "integrity": "sha512-SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q==" - }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", diff --git a/package.json b/package.json index 28a69e1e5..e91903fa2 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ "fontsource-roboto": "^3.0.3", "html2canvas": "^1.0.0-rc.7", "immutable": "^4.0.0-rc.12", - "is-electron": "^2.2.0", "jspdf": "^2.3.1", "jszip": "^3.6.0", "node-sass": "^4.14.1", diff --git a/src/app.tsx b/src/app.tsx index 5f6f8d6a9..6d2b49813 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -15,7 +15,6 @@ import ManagementPage from "./components/workers-page/management-page.component" import { ScheduleDataActionCreator } from "./state/reducers/month-state/schedule-data/schedule-data.action-creator"; import { NotificationProvider } from "./components/common-components/notification/notification.context"; import { NetlifyProFooter } from "./components/common-components/netlify-pro-footer/netlify-pro-footer.component"; -import isElectron from "is-electron"; import { Box } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; import JiraLikeDrawer from "./components/common-components/drawer/jira-like-drawer.component"; @@ -34,7 +33,7 @@ const useStyles = makeStyles(() => ({ display: "block", overflowX: "auto", overflowY: "auto", - height: `calc(100vh - ${parseInt(ScssVars.footerHeight.slice(0, -2))}px)`, + height: "100vh", flexGrow: 1, }, drawer: { @@ -111,12 +110,12 @@ function App(): JSX.Element { + - {isElectron() ? <> : } diff --git a/src/assets/styles/styles/custom/_management_page.scss b/src/assets/styles/styles/custom/_management_page.scss index a65e913c6..853556ba9 100644 --- a/src/assets/styles/styles/custom/_management_page.scss +++ b/src/assets/styles/styles/custom/_management_page.scss @@ -5,7 +5,7 @@ overflow: auto; width: 100%; padding: 20px; - min-height: 90vh; + min-height: 100vh; h1 { margin: 0 10px 10px 10px; } diff --git a/src/assets/styles/styles/custom/_schedule_page.scss b/src/assets/styles/styles/custom/_schedule_page.scss index c4406c989..8be197fa4 100644 --- a/src/assets/styles/styles/custom/_schedule_page.scss +++ b/src/assets/styles/styles/custom/_schedule_page.scss @@ -8,6 +8,7 @@ flex-direction: column; width: 100%; align-items: center; + min-height: 100vh; .schedule { margin: auto; diff --git a/src/components/common-components/drawer/drawer-header.component.tsx b/src/components/common-components/drawer/drawer-header.component.tsx index 6f5c02017..bc0b2ece0 100644 --- a/src/components/common-components/drawer/drawer-header.component.tsx +++ b/src/components/common-components/drawer/drawer-header.component.tsx @@ -14,7 +14,7 @@ const useStyles = makeStyles({ height: ScssVars.drawerHeaderHeight, }, fullHeight: { - height: "80%", + height: "97%", overflowY: "auto", }, exitButton: { diff --git a/src/components/common-components/drawer/jira-like-drawer.component.tsx b/src/components/common-components/drawer/jira-like-drawer.component.tsx index a4aa916c2..70ebe6bc1 100644 --- a/src/components/common-components/drawer/jira-like-drawer.component.tsx +++ b/src/components/common-components/drawer/jira-like-drawer.component.tsx @@ -20,7 +20,6 @@ const useStyles = makeStyles({ height: `calc(100vh - ${ parseInt(ScssVars.headerHeight.slice(0, -2)) + parseInt(ScssVars.drawerHeaderHeight.slice(0, -2)) + - parseInt(ScssVars.footerHeight.slice(0, -2)) + 1 }px)`, }, diff --git a/src/components/common-components/netlify-pro-footer/netlify-pro-footer.component.tsx b/src/components/common-components/netlify-pro-footer/netlify-pro-footer.component.tsx index 851916aea..f21ea3c91 100644 --- a/src/components/common-components/netlify-pro-footer/netlify-pro-footer.component.tsx +++ b/src/components/common-components/netlify-pro-footer/netlify-pro-footer.component.tsx @@ -26,7 +26,7 @@ export function NetlifyProFooter(): JSX.Element { return ( - Wszelkie prawa zastrzeżone. Copyright © 2020-2021: + Wykonanie: Logo koła naukowego Glider Glider