From 47491c7c37f3dc02977bf8d713d2d6ca25ddfd0b Mon Sep 17 00:00:00 2001 From: wrzesinski-hubert Date: Fri, 12 Jun 2020 16:17:48 +0200 Subject: [PATCH] rightbar and transfer --- src/components/Class/index.scss | 2 +- src/components/Class/index.tsx | 55 +++++++++++++++++++++------- src/components/RightBar/index.scss | 10 +++--- src/components/RightBar/index.tsx | 57 +++++++++++++++++++++++++----- src/components/Transfer/index.scss | 33 +++++++++++------ 5 files changed, 120 insertions(+), 37 deletions(-) diff --git a/src/components/Class/index.scss b/src/components/Class/index.scss index 2965035..d38e5a4 100644 --- a/src/components/Class/index.scss +++ b/src/components/Class/index.scss @@ -1,4 +1,4 @@ -.paper { +.class { display: flex; min-height: 50px; background-color: rgb(100, 181, 246) !important; diff --git a/src/components/Class/index.tsx b/src/components/Class/index.tsx index a7f49cf..0173da5 100644 --- a/src/components/Class/index.tsx +++ b/src/components/Class/index.tsx @@ -1,9 +1,22 @@ import React from "react"; import "./index.scss"; -import Collapse from '@material-ui/core/Collapse'; +import Collapse from "@material-ui/core/Collapse"; + +type ClassType = { + group_id: string; + day: string; + time: string; + lecturer: string; + room: string; +}; + +type group = { + classname:string; + classgroups:Array +} interface ClassProps { - name:string; + data: group; } interface ClassState { @@ -15,28 +28,44 @@ export default class Class extends React.Component { super(props); this.Open = this.Open.bind(this); - this.state={ - open:false, + this.state = { + open: false, }; } Open(e: React.MouseEvent) { this.setState({ - open:!this.state.open + open: !this.state.open, }); } render() { return ( -
{this.props.name} +
+ {this.props.data.classname} -

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

- - -
+

+ {this.props.data.classgroups[0].group_id} {this.props.data.classgroups[0].day} + {this.props.data.classgroups[0].time} {this.props.data.classgroups[0].room} +

{this.props.data.classgroups[0].lecturer} +

+

+ {this.props.data.classgroups[1].group_id} {this.props.data.classgroups[1].day} + {this.props.data.classgroups[1].time} {this.props.data.classgroups[1].room} +

{this.props.data.classgroups[1].lecturer} +

+

+ {this.props.data.classgroups[0].group_id} {this.props.data.classgroups[0].day} + {this.props.data.classgroups[0].time} {this.props.data.classgroups[0].room} +

{this.props.data.classgroups[0].lecturer} +

+

+ {this.props.data.classgroups[1].group_id} {this.props.data.classgroups[1].day} + {this.props.data.classgroups[1].time} {this.props.data.classgroups[1].room} +

{this.props.data.classgroups[1].lecturer} +

+ +
); } } diff --git a/src/components/RightBar/index.scss b/src/components/RightBar/index.scss index b03b92d..a22894b 100644 --- a/src/components/RightBar/index.scss +++ b/src/components/RightBar/index.scss @@ -1,4 +1,4 @@ -.shop-cart { +.right-bar { padding-top: 10px; padding-left: 15px; padding-right: 15px; @@ -7,8 +7,8 @@ align-items: center; text-align: center; font-family: Lato; + &__text { + border-bottom: 1px solid; + } + } - .text { - border-bottom: 1px solid; - } - \ No newline at end of file diff --git a/src/components/RightBar/index.tsx b/src/components/RightBar/index.tsx index 959caa6..c8eb531 100644 --- a/src/components/RightBar/index.tsx +++ b/src/components/RightBar/index.tsx @@ -11,18 +11,59 @@ export default class RightBar extends React.Component< RightBarState > { render() { + var data = [ + { + classname: "E-gospodarka - narzędzia i bezpieczeństwo", + classgroups: [ + { + group_id: "1CB", + day: "Pn", + time: "10:00", + lecturer: "dr inż. Michał Ren", + room: "A2-01", + }, + { + group_id: "1CC", + day: "Wt", + time: "12:00", + lecturer: "dr inż. Michał Ren", + room: "A3-01", + }, + ], + }, + { + classname: "Statystyka", + classgroups: [ + { + group_id: "1CB", + day: "Pn", + time: "10:00", + lecturer: "dr inż. Michał Ren", + room: "A2-01", + }, + { + group_id: "1CC", + day: "Wt", + time: "12:00", + lecturer: "dr inż. Michał Ren", + room: "A3-01", + }, + ], + }, + ]; + return ( -
-
+
+
Hubert Wrzesiński

Semestr zimowy 2020/2021
- - - - - - + + + + + +
); } diff --git a/src/components/Transfer/index.scss b/src/components/Transfer/index.scss index 7ead877..88d8e00 100644 --- a/src/components/Transfer/index.scss +++ b/src/components/Transfer/index.scss @@ -3,15 +3,22 @@ justify-content: center; text-align: center; align-items: center; + } .transfer { display: flex; + outline:none; width: 80%; height: 70%; padding-top: 40px; - background: rgba(255, 220, 97, 0.48); - border: 1px solid #000000; + background: rgba(255, 220, 97, 0.6); + + border: 3px solid #000000; + border-radius: 5% 5% 5% 5% / 5% 5% 5% 5%; + text-transform: uppercase; + letter-spacing: 0.3ch; + &__left { display: flex; justify-content: space-around; @@ -23,18 +30,24 @@ &__text { font-family: Lato; font-size: 50px; + margin-bottom: 10px; } &__input { width: 300px; height: 45px; - background: #d7a700; + background: #ffc400; + outline:none; + border: 1px solid; + border-radius: 22px ; + padding: 10px; + font-size: 24px; + transition-duration: 0.3s; + } - &__give { - } - &__recieve { - } - &__proposition { - } - &__add { + input:focus { + -webkit-box-shadow: 4px 4px 5px 0px rgba(0,0,0,0.75); + -moz-box-shadow: 4px 4px 5px 0px rgba(0,0,0,0.75); + box-shadow: 4px 4px 5px 0px rgba(0,0,0,0.75); + } }