diff --git a/src/App.scss b/src/App.scss index 63f4c9a..0887f99 100644 --- a/src/App.scss +++ b/src/App.scss @@ -2,6 +2,9 @@ body { margin: 0px; padding: 0px; } + body::-webkit-scrollbar { + display: none; + } .wraper{ display: flex; &__rightbar{ diff --git a/src/components/Calendar/index.tsx b/src/components/Calendar/index.tsx index 33d3ba3..2026eb5 100644 --- a/src/components/Calendar/index.tsx +++ b/src/components/Calendar/index.tsx @@ -114,7 +114,7 @@ export default class Calendar extends React.PureComponent< startDayHour={8} endDayHour={20} excludedDays={[0, 6]} - cellDuration={60} + cellDuration={45} dayScaleCellComponent={DayScaleCell} timeTableLayoutComponent={TimeTableLayout} timeTableCellComponent={TimeTableCell} diff --git a/src/components/Class/index.scss b/src/components/Class/index.scss new file mode 100644 index 0000000..2965035 --- /dev/null +++ b/src/components/Class/index.scss @@ -0,0 +1,13 @@ +.paper { + display: flex; + min-height: 50px; + background-color: rgb(100, 181, 246) !important; + align-items: center; + justify-content: center; + flex-direction: column; + margin-top: 10px; + padding:10px; + border-radius: 10px; + width: 90%; + cursor: pointer; + } \ No newline at end of file diff --git a/src/components/Class/index.tsx b/src/components/Class/index.tsx new file mode 100644 index 0000000..a7f49cf --- /dev/null +++ b/src/components/Class/index.tsx @@ -0,0 +1,42 @@ +import React from "react"; +import "./index.scss"; +import Collapse from '@material-ui/core/Collapse'; + +interface ClassProps { + name:string; +} + +interface ClassState { + open: boolean; +} + +export default class Class extends React.Component { + constructor(props: ClassProps) { + super(props); + + this.Open = this.Open.bind(this); + this.state={ + open:false, + }; + } + + Open(e: React.MouseEvent) { + this.setState({ + open:!this.state.open + }); + } + + render() { + return ( +
{this.props.name} + +

1CB Pn 10.00 A0-1

dr inż. Michał Ren

+

1CB Pn 10.00 A0-1

dr inż. Michał Ren

+

1CB Pn 10.00 A0-1

dr inż. Michał Ren

+

1CB Pn 10.00 A0-1

dr inż. Michał Ren

+ + +
+ ); + } +} diff --git a/src/components/RightBar/index.scss b/src/components/RightBar/index.scss index 98fa97e..b03b92d 100644 --- a/src/components/RightBar/index.scss +++ b/src/components/RightBar/index.scss @@ -8,15 +8,6 @@ text-align: center; font-family: Lato; } - .paper { - display: flex; - margin-top: 10px; - height: 60px; - width: 90%; - background-color: #d4a8ff !important; - align-items: center; - justify-content: center; - } .text { border-bottom: 1px solid; } diff --git a/src/components/RightBar/index.tsx b/src/components/RightBar/index.tsx index ead1d0e..16b5a64 100644 --- a/src/components/RightBar/index.tsx +++ b/src/components/RightBar/index.tsx @@ -1,6 +1,7 @@ import React from "react"; import "./index.scss"; -import Paper from "@material-ui/core/Paper"; +import Class from "../Class"; + interface RightBarProps {} interface RightBarState {} @@ -9,7 +10,6 @@ export default class RightBar extends React.Component< RightBarProps, RightBarState > { - render() { return (
@@ -17,16 +17,14 @@ export default class RightBar extends React.Component< Hubert Wrzesiński

Semestr zimowy 2020/2021
- 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 + + + + + + + + ); } diff --git a/src/components/Transfer/index.scss b/src/components/Transfer/index.scss index 8a45482..7ead877 100644 --- a/src/components/Transfer/index.scss +++ b/src/components/Transfer/index.scss @@ -1,6 +1,5 @@ .wrapper { display: flex; - justify-content: center; text-align: center; align-items: center; @@ -8,31 +7,34 @@ .transfer { display: flex; - flex-wrap: wrap; width: 80%; height: 70%; padding-top: 40px; background: rgba(255, 220, 97, 0.48); border: 1px solid #000000; - justify-content: center; + &__left { + display: flex; + justify-content: space-around; + flex-grow: 1; + } + &__right { + flex-grow: 4; + } &__text { font-family: Lato; font-size: 50px; } - &__input{ + &__input { width: 300px; - height: 45px; - background: #D7A700; + height: 45px; + background: #d7a700; } - &__give{ - flex-grow: 1; + &__give { + } + &__recieve { + } + &__proposition { + } + &__add { } - &__recieve{ - flex-grow: 1; -} -&__proposition{ - flex-grow: 4; -} -&__add{ -} } diff --git a/src/components/Transfer/index.tsx b/src/components/Transfer/index.tsx index 6ebdf5c..3a5ad77 100644 --- a/src/components/Transfer/index.tsx +++ b/src/components/Transfer/index.tsx @@ -34,16 +34,20 @@ export default class Transfer extends React.Component< aria-describedby="simple-modal-description" >
-
-
Oddam
- +
+ {/* */} +
+
Oddam
+ +
+
+
Przyjmę
+ +
-
-
Przyjmę
- +
+
-
-