From ce16deb011d15ab6280254624d784ede1bd10e84 Mon Sep 17 00:00:00 2001 From: Bjorgvin Gudjonsson Date: Fri, 1 Dec 2017 17:42:12 +0000 Subject: [PATCH 01/11] update --- src/components/BookingTable/index.js | 2 +- src/components/Modal/index.js | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/BookingTable/index.js b/src/components/BookingTable/index.js index bf62a75..b47cc02 100644 --- a/src/components/BookingTable/index.js +++ b/src/components/BookingTable/index.js @@ -447,7 +447,7 @@ class BookingTable extends Component { Date: Sat, 2 Dec 2017 16:34:46 +0000 Subject: [PATCH 02/11] hheeh --- src/components/BookingTable/x.png | Bin 0 -> 2193 bytes src/components/Modal/index.js | 47 +++++++++++++++++++++++------- src/redux/locale/locale.js | 4 +-- 3 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 src/components/BookingTable/x.png diff --git a/src/components/BookingTable/x.png b/src/components/BookingTable/x.png new file mode 100644 index 0000000000000000000000000000000000000000..d83454f2fcb9e1986ef809e35271072960f030ae GIT binary patch literal 2193 zcmV;C2yXX@P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%U zKS@MER9FeUSW9aYQ52q=q(WEjbmKxdK6WB#X-iEkNniA3rQ#ouNI_I^<*Ez!B1$#> zfr@Rdj;8d8fZrya*pYI=I{*mg*LBL~NFZVbjE&n%^!{pR$1X8wFI z7_yaRH3k|EoeA{xL^hP=*mSHc^>lK^zE6hxMTFQdW*2XVf}uAgff4`tvG(C}0Pdad zTfZ+mj#bcPLe{-x+D^a#&-V5rW^&$s90;fff}GFi!tr=~TRR)+?fqHE7uw~aQr7jU zj6J@WWQavfBz;8u6bjCrE8Wqzymv=E)YEQTIdxZ*&<;eNB8e>It^cg)z+V(=5)m>SB^WAZy@{eGdsn%@+ynLxBCXaLD|>@;H30fs|?z z4Ct+b#6=E3WVKpf5fKmqGaYcGol_236Mv$^XVj^OgvJqodRjPZKxCK-mjLZa0+DEg ze7hbz>edyJdco___x0A8fW^0?BpRYqOidfNc9HpM>xu}Rgo>}In-V(aPn)FkCnhH+`;^J(sS7eyw*%2- zTXT+(gm(jj>|mF8))RXBH#RVksJd*EI3t0GxZ45u8*F;fYV}OT)BrHZqQ36^(eEy60zPc5SJ4KiA{cudhU6j#I~wn;$xB}AYYK%qMY z1-HhOQjwz-!&)tMnGV_-x-nwYhauD59g~#`U_Fi}Zncg6ffUa!Gmuay4Ih~#Sm^Gi zg6B{XnY_jT7VnGKFn!Ud2wWnQbJ<&%6Yk*$3KPX@yKIdq0DfAMAr>)3pT6kRy=R99 zVxC1s2%cjD(eO6CMM30t1PC`69q{ zFcNb9yBWD3TkmHH7BiX*BjX2PFLmfsKGggLuYQ2> Tg|vMj00000NkvXXu0mjfz;G=Q literal 0 HcmV?d00001 diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index 492dfc7..14a0d9c 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -2,6 +2,8 @@ import React, { Component } from 'react'; import styled from 'styled-components'; import { css } from 'styled-components'; import PropTypes from 'prop-types'; +import timeBlue from '../BookingTable/timeblue.svg'; +import closeX from '../BookingTable/x.png'; const ModalWrapper = styled.div` ${props => { @@ -29,8 +31,8 @@ const ModalContainer = styled.div` border: 1px solid #888; width: 32%; height: 44%; - min-width: 200px; - min-height: 200px; + min-width: 461px; + min-height: 343px; border-radius: 8px; background-color: #f4f5f9; box-shadow: 0 8px 20px 0 rgba(0, 0, 0, 0.5); @@ -38,23 +40,43 @@ const ModalContainer = styled.div` left: 50%; position: absolute; transform: translateX(-50%) translateY(-50%); + font-family: Trebuchet MS; + font-size: 14px; + color: #738190; img { height: 30px; + padding: 0px 10px; } `; const ModalHead = styled.div` - margin-top: 0; - height: 20px; + height: 5%; + width: 100%; background-color: #ffffff; border-radius: 8px 8px 0 0; - width: 100%; - padding: 22px 0; + padding: 27px 0; font-family: Trebuchet MS; font-size: 20px; color: #0085ff; + button { + border: none; + background-color: Transparent; + } +`; + +const ModalFooter = styled.div` + button { + background-color: #0085ff; + border: none; + color: white; + padding: 10px 54px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + font-family: Trebuchet MS; + } `; -const ModalFooter = styled.div``; export default class Modal extends Component { componentDidUpdate(prevProps, prevState) { @@ -70,16 +92,19 @@ export default class Modal extends Component { {this.props.modalHeader.length > 0 && ( - {this.props.modalHeader} + + Blue clock icon + {this.props.modalHeader} + + )} {this.props.children} - diff --git a/src/redux/locale/locale.js b/src/redux/locale/locale.js index d05a252..69fef8f 100644 --- a/src/redux/locale/locale.js +++ b/src/redux/locale/locale.js @@ -12,7 +12,7 @@ const strings = new LocalizedStrings({ end: 'End', note: 'Note', optional: 'Optional', - bookTime: 'Book Time', + bookTime: 'Book', closeModal: 'Close Modal', }, is: { @@ -26,7 +26,7 @@ const strings = new LocalizedStrings({ end: 'Endar', note: 'Athugasemd', optional: 'valfrjálst', - bookTime: 'Bóka Tíma', + bookTime: 'Bóka', closeModal: 'Loka Modal', }, }); From c83b04dd086788126024d86f0fa01b1ef3243a87 Mon Sep 17 00:00:00 2001 From: tomasdarri27 Date: Sat, 2 Dec 2017 21:05:46 +0000 Subject: [PATCH 03/11] Modal modified, not finished --- src/components/BookingTable/index.js | 146 ++++++++++++++++----------- src/components/DropDown/index.js | 4 +- src/components/Modal/index.js | 11 +- src/redux/locale/locale.js | 8 +- 4 files changed, 105 insertions(+), 64 deletions(-) diff --git a/src/components/BookingTable/index.js b/src/components/BookingTable/index.js index b47cc02..0e6c56e 100644 --- a/src/components/BookingTable/index.js +++ b/src/components/BookingTable/index.js @@ -128,6 +128,34 @@ const ErrorMessage = styled.p` text-align: center; `; +const ModalWrapper = styled.div` + .startTime { + display: flex; + justify-content: flex-end; + margin-top: 15px; + margin-bottom: 10px; + margin-right: 20px; + } + .endTime { + display: flex; + justify-content: flex-end; + margin-right: 20px; + margin-bottom: 10px; + } + .textInput { + display: flex; + justify-content: flex-end; + margin-right: 20px; + margin-bottom: 10px; + } + .textArea { + width: 350px; + height: 93px; + border-radius: 2px; + border: none; + } +`; + class BookingTable extends Component { static propTypes = { locale: PropTypes.shape({ @@ -445,67 +473,71 @@ class BookingTable extends Component { )} - - this.bookTime( - this.state.timeStamp, - this.state.userName, - this.state.userId, - this.state.bookTimeText, - this.state.startTime, - this.state.endTime - )} - onSubmit2={() => this.setState({ showModal: false })} - > -
-
- {this.props.locale.start} - Blue clock icon - {this.state.range.length > 0 && ( - { - this.setState({ startTime: date }, () => { - this.validateDate(); - }); - }} - /> - )} - {this.state.valid === false && ( - NotValidIcon + + + this.bookTime( + this.state.timeStamp, + this.state.userName, + this.state.userId, + this.state.bookTimeText, + this.state.startTime, + this.state.endTime )} -
+ onSubmit2={() => this.setState({ showModal: false })} + >
- {this.props.locale.end} - Red clock icon - {this.state.range.length > 0 && ( - { - this.setState({ endTime: date }, () => { - this.validateDate(); - }); - }} +
+ {this.props.locale.start} + Blue clock icon + {this.state.range.length > 0 && ( + { + this.setState({ startTime: date }, () => { + this.validateDate(); + }); + }} + /> + )} + {this.state.valid === false && ( + NotValidIcon + )} +
+
+ {this.props.locale.end} + Red clock icon + {this.state.range.length > 0 && ( + { + this.setState({ endTime: date }, () => { + this.validateDate(); + }); + }} + /> + )} +
+
+ {this.props.locale.note} + Grey note icon + - )} -
-
- {this.props.locale.note} - Grey note icon - +
-
- + + ); } diff --git a/src/components/DropDown/index.js b/src/components/DropDown/index.js index 56880c6..557a83d 100644 --- a/src/components/DropDown/index.js +++ b/src/components/DropDown/index.js @@ -10,8 +10,8 @@ const DropDownWrapper = styled.div` position: relative; display: inline-block; .dropbtn { - width: 90px; - height: 30px; + width: 350px; + height: 36px; color: white; font-size: 16px; border: none; diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index 14a0d9c..e9352e9 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -50,6 +50,7 @@ const ModalContainer = styled.div` `; const ModalHead = styled.div` + display: flex; height: 5%; width: 100%; background-color: #ffffff; @@ -61,20 +62,28 @@ const ModalHead = styled.div` button { border: none; background-color: Transparent; + margin-left: 50%; + cursor: pointer; } `; const ModalFooter = styled.div` + display: flex; + justify-content: flex-end; button { background-color: #0085ff; border: none; + border-radius: 2px; color: white; padding: 10px 54px; text-align: center; text-decoration: none; display: inline-block; - font-size: 16px; + font-size: 13px; font-family: Trebuchet MS; + font-weight: bold; + cursor: pointer; + margin-right: 20px; } `; diff --git a/src/redux/locale/locale.js b/src/redux/locale/locale.js index 69fef8f..fee4c46 100644 --- a/src/redux/locale/locale.js +++ b/src/redux/locale/locale.js @@ -11,9 +11,9 @@ const strings = new LocalizedStrings({ start: 'Start', end: 'End', note: 'Note', - optional: 'Optional', + optional: '(Optional)', bookTime: 'Book', - closeModal: 'Close Modal', + closeModal: 'Close Window', }, is: { time: 'Tími', @@ -25,9 +25,9 @@ const strings = new LocalizedStrings({ start: 'Byrjar', end: 'Endar', note: 'Athugasemd', - optional: 'valfrjálst', + optional: '(Valfrjálst)', bookTime: 'Bóka', - closeModal: 'Loka Modal', + closeModal: 'Loka Glugga', }, }); From fc9fd719ed9ce6954dd10420554a45825389ca33 Mon Sep 17 00:00:00 2001 From: Bjorgvin Gudjonsson Date: Sat, 2 Dec 2017 22:42:46 +0000 Subject: [PATCH 04/11] updated text boxes --- src/components/BookingTable/index.js | 3 ++- src/components/DropDown/index.js | 3 ++- src/components/Modal/index.js | 2 +- src/containers/main/index.js | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/BookingTable/index.js b/src/components/BookingTable/index.js index 0e6c56e..beb744f 100644 --- a/src/components/BookingTable/index.js +++ b/src/components/BookingTable/index.js @@ -149,10 +149,11 @@ const ModalWrapper = styled.div` margin-bottom: 10px; } .textArea { - width: 350px; + width: 278px; height: 93px; border-radius: 2px; border: none; + text-align: initial; } `; diff --git a/src/components/DropDown/index.js b/src/components/DropDown/index.js index 557a83d..a98f1a5 100644 --- a/src/components/DropDown/index.js +++ b/src/components/DropDown/index.js @@ -10,7 +10,7 @@ const DropDownWrapper = styled.div` position: relative; display: inline-block; .dropbtn { - width: 350px; + width: 280px; height: 36px; color: white; font-size: 16px; @@ -19,6 +19,7 @@ const DropDownWrapper = styled.div` cursor: pointer; outline: none !important; color: #5f7183; + text-align: initial; } ${props => { if (props.menuHidden) { diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index e9352e9..33a707d 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -62,7 +62,7 @@ const ModalHead = styled.div` button { border: none; background-color: Transparent; - margin-left: 50%; + margin-left: 39%; cursor: pointer; } `; diff --git a/src/containers/main/index.js b/src/containers/main/index.js index a46b10c..a3e733b 100644 --- a/src/containers/main/index.js +++ b/src/containers/main/index.js @@ -27,9 +27,9 @@ class Main extends Component { userData: { name: '' }, }; render() { - if (this.props.userData.name === '') { - return ; - } + // if (this.props.userData.name === '') { + // return ; + // } return (
From 938968156590419cf59afbfe21f895990e529430 Mon Sep 17 00:00:00 2001 From: tomasdarri27 Date: Sat, 2 Dec 2017 23:17:52 +0000 Subject: [PATCH 05/11] flags added, not finished --- src/components/BookingTable/index.js | 2 +- src/components/Header/iceflag.png | Bin 0 -> 446 bytes src/components/Header/index.js | 16 ++++++++++++++-- src/components/Header/usaflag.png | Bin 0 -> 365 bytes src/components/Modal/index.js | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 src/components/Header/iceflag.png create mode 100644 src/components/Header/usaflag.png diff --git a/src/components/BookingTable/index.js b/src/components/BookingTable/index.js index beb744f..5ba3e43 100644 --- a/src/components/BookingTable/index.js +++ b/src/components/BookingTable/index.js @@ -528,7 +528,7 @@ class BookingTable extends Component {
{this.props.locale.note} Grey note icon - &Gw5C$QgCCNjN5cCKNzC}V^YN4XYT0}c21-nYq zMZ;icW($Oj`CWFHZ$9{7{`21%m@{HBA+vifWZE>1T9Hnr!pQRgupEcQa+#e{Q)gB3 zT;B`LW`#{oNTjw@G64BpnxW$myuSfpI}V9lI+9n$@byZnDFXw1$T#7O*wj`{zEON( z#8Gc-T&ey+OyF5#0?!(0muS?Ae9eLyNy5SM+!WR@O^yuTDMG!0D}HNs{fxFwwISlMl6Zo;U3}p z0K}3>?A0}$MT!7yMM+5WT-Ba oM&sY9<#{Z+y+~ez!C)}(346nEo|#X=2LJ#707*qoM6N<$f_cfz{this.props.userData.name}

)} - - + + ); } diff --git a/src/components/Header/usaflag.png b/src/components/Header/usaflag.png new file mode 100644 index 0000000000000000000000000000000000000000..a8793614d23a0d6ffdf4865d5c0cc25df6726d01 GIT binary patch literal 365 zcmV-z0h0cSP)@z*I`(d)4>+AK&4USUX&Yybc===I0OG^S0bKPyZXpwc!3?00000 LNkvXXu0mjf Date: Sat, 2 Dec 2017 23:31:13 +0000 Subject: [PATCH 06/11] flags fixed --- src/components/Header/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 0ed9229..6641531 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -13,9 +13,9 @@ const HeaderWrapper = styled.header` justify-content: center; padding: 7px; background-color: #0085ff; - img { + button { border: none; - background-color: red; + background-color: Transparent; } `; From e8c5f9bff47e1ef23350b72bd268eaabc3432197 Mon Sep 17 00:00:00 2001 From: Bjorgvin Gudjonsson Date: Sun, 3 Dec 2017 15:52:35 +0000 Subject: [PATCH 07/11] flag fixed --- src/components/Header/iceflag.png | Bin 446 -> 4072 bytes src/components/Header/index.js | 1 + src/components/Header/usaflag.png | Bin 365 -> 4000 bytes src/containers/main/index.js | 6 +++--- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Header/iceflag.png b/src/components/Header/iceflag.png index 27095242b7577f08728774a5de9375555b333357..38e61ae54d710e7888d2e3450af403662c11e940 100644 GIT binary patch literal 4072 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 Nv~D8QOH?gG{|5@qX`=uD literal 446 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 literal 365 zcmV-z0h0cSP)@z*I`(d)4>+AK&4USUX&Yybc===I0OG^S0bKPyZXpwc!3?00000 LNkvXXu0mjf; - // } + if (this.props.userData.name === '') { + return ; + } return (
From 26a7244b1a35c3df728bf179a876f6983b0684f2 Mon Sep 17 00:00:00 2001 From: tomasdarri27 Date: Sun, 3 Dec 2017 17:20:08 +0000 Subject: [PATCH 08/11] =?UTF-8?q?over=20to=20bj=C3=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DropDown/index.js | 7 ++-- src/components/Header/index.js | 39 ++++++++++--------- src/components/Modal/index.js | 4 +- src/components/{BookingTable => Modal}/x.png | Bin 4 files changed, 28 insertions(+), 22 deletions(-) rename src/components/{BookingTable => Modal}/x.png (100%) diff --git a/src/components/DropDown/index.js b/src/components/DropDown/index.js index a98f1a5..77ed94c 100644 --- a/src/components/DropDown/index.js +++ b/src/components/DropDown/index.js @@ -8,8 +8,7 @@ import * as ApiActions from '../../components/Actions/actions'; const DropDownWrapper = styled.div` position: relative; - display: inline-block; - .dropbtn { + ${'' /* display: inline-block; */} .dropbtn { width: 280px; height: 36px; color: white; @@ -43,7 +42,9 @@ const DropDownWrapper = styled.div` } }}; .bookingButton { - width: 90px; + width: -webkit-fill-available; + display: inline-flex; + justify-content: flex-start; height: 30px; color: white; font-size: 16px; diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 61db1f1..735f3da 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -9,27 +9,28 @@ import iceFlag from './iceflag.png'; import * as LocaleActions from '../../redux/locale/actions'; const HeaderWrapper = styled.header` - display: flex; - justify-content: center; padding: 7px; background-color: #0085ff; + display: flex; + justify-content: center; + align-items: center; +`; + +const FlagWrapper = styled.div` + background-color: pink; + display: flex; + justify-content: flex-end; button { border: none; background-color: Transparent; margin: 37px 1px; + outline: none; } `; -const ImageLogo = styled.div` - background-image: url(${props => props.src}); - background-repeat: no-repeat; - background-position: center; - background-size: contain; - width: 200px; - height: 50px; -`; const UserInfo = styled.div` position: relative; + background-color: red; height: 100%; display: flex; img { @@ -63,14 +64,16 @@ class Header extends Component {

{this.props.userData.name}

)} - - + + + + ); } diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index 0f5ac78..fa79eff 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import { css } from 'styled-components'; import PropTypes from 'prop-types'; import timeBlue from '../BookingTable/timeblue.svg'; -import closeX from '../BookingTable/x.png'; +import closeX from './x.png'; const ModalWrapper = styled.div` ${props => { @@ -64,6 +64,8 @@ const ModalHead = styled.div` background-color: Transparent; margin-left: 39%; cursor: pointer; + padding: 0; + outline: none; } `; diff --git a/src/components/BookingTable/x.png b/src/components/Modal/x.png similarity index 100% rename from src/components/BookingTable/x.png rename to src/components/Modal/x.png From 5a0b50db15dfca8b7962183a221d828d36145a88 Mon Sep 17 00:00:00 2001 From: Bjorgvin Gudjonsson Date: Sun, 3 Dec 2017 18:22:37 +0000 Subject: [PATCH 09/11] ebs logo added --- src/components/Header/index.js | 27 ++++++++++++++++++--------- src/components/Header/logo.png | Bin 0 -> 20186 bytes 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 src/components/Header/logo.png diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 735f3da..1f4c72d 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -5,6 +5,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import usaFlag from './usaflag.png'; import iceFlag from './iceflag.png'; +import ebsLogo from './logo.png'; import * as LocaleActions from '../../redux/locale/actions'; @@ -12,35 +13,40 @@ const HeaderWrapper = styled.header` padding: 7px; background-color: #0085ff; display: flex; - justify-content: center; + justify-content: space-between; align-items: center; `; const FlagWrapper = styled.div` - background-color: pink; - display: flex; - justify-content: flex-end; + margin-right: 64px; + button { border: none; background-color: Transparent; - margin: 37px 1px; outline: none; } `; +const LogoHeader = styled.div` + img { + width: 45%; + display: flex; + justify-content: flex-start; + align-items: flex-start; + } +`; const UserInfo = styled.div` - position: relative; - background-color: red; - height: 100%; - display: flex; + margin-right: 160px; img { border-radius: 50%; margin-right: 10px; + width: 20%; } p { color: white; display: inline-block; white-space: nowrap; + font-family: 'Trebuchet MS'; } `; @@ -58,6 +64,9 @@ class Header extends Component { render() { return ( + + logo of the website + {this.props.userData != null && ( / diff --git a/src/components/Header/logo.png b/src/components/Header/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0d2fd6d38c1c0e10cd811dc51ce21879ab41872a GIT binary patch literal 20186 zcmeFYV{~QD*FP9^?2c{QR>!t&+wLSCt7F@?ZQHhSV`K9D;rTyn&CI)bId`plSDjO} ztG3SGbw0apn7phQ95fa*5D*ZYgt)LG5D@Uhce?-*{QDOR1`iAf2o}>qNJw5nNQgk* z(azMu+5`wlJSRn4!6QCTT!^w$b;~oww#puUhRRWMVs-c~n-fZZ5Z-_CYqp9$EF@9A)yCL{^Nf(#i#-())I@Yr?zHO{@=4hC*`EjDy*m=rra zemdc+2-2GY38a3UmX6;7oDh-Y$V1dE2KFv5!xY{yPWAbykLsNC+#I61W*2`s_+3|; znGxt1JaB8oQZH)E2ekoCcX|5<8}=x|KxmLa(ggmraMBQ|0yA4`%MgB}VgW$dp#tDL zz*<43E5r(HM1Q8$<$*r`ghC7u`+n9b;Eja5RugN!%%c^Ii{6>wY3xuAaJJB0MS1NZ zU7y0F6JG_lBfK%HgqV?n{{#&s93aSBghYTh&V);cg#3)6!+GRM$xMi_=LiAZK*~Yk z{t^3w{fDj(_b*V^NFGH+5foa4ui?}WWC8R@w1N@3%i#-qr;#7ejk0?Dfu^Ip;5?YK;ydyALTjzox+Jqg-Ql0&79~KtkuBTF+~Nw@*tjeiGO|WU$Re`K8xo_d5%_7GrmV z?jFxp1<&blPg)kY7RkuYG2_RM?SxS&wzj65)D1(oi9wjdUF7 zx(o{oi|a-QeG9ZFb{R+>&wE+JxNkZUp(h9qCyYX`D&BVZHxR`&zYy{X5U4%~jR9YD z512cM9wKC)07@w6s6JH%2mXP;6mze34J1l{VGX!7kXDat4UBRC=ng{(Xw(iY2LfGS z`3`ss#Igv2JJf5h7egokBvdY;voHjs@B||E0Fr}HN2~w|NSI(;tTG8G646g%y1E~f zqLP1UM`R12UvN32GX&{~a7SdUJ^p}|EqxT__qKq>FBtO0+{ zsy5J3$A5$(-*e6gTkmVc3>efIo~-8Me@>+``8L;HWKc*z!6GgLJ!8)gpL^R@C^xHQ9NZuB_^d? z`EbQOs!3JN$_A}c!P9WXm^lKGOhdt&ya5F!$_R>d3f2Utgtvs|v9YnCv8yrUM6fZK zM0QGi#jc!<%J;A`!N#JxlK9e}XH;jpmdFqA542ID%*8Krisl{-Dh*U?8f!vpVyJE5 znUW>YY9{`YsgjkF#beYeq$3Vx`9=)ymt&z6u|$;1d1X#PWgVwaP}xLmE-T&XKmi%w{?7N$)rBo$m2u@`{2? zOH7MQYma~@T_=5M;VK<8p)~6o#u{WTT^JdHIf)ZuC)Fo8CR#?Hc_jT3wkftsQ1dNC zU7}xecs1A6(u;KpeB|GPAI)%!WOHPbrZh9TG9lVpsv56^H&fdV+m4;zM6IG9aV9Z! zSYEGB+C59M8g(PLa5{B7Z9G9=!C!k{TVK;3rq7-*8DPEPnBbPMGnh_T3$Q)0p<$P? zv)H_Q7Ytt+>r>NHXeWG$dGis8!)9gkUGoKvVD{bj2Ztb{@KfZaH>BremeN_$@6)l; zWEnE8G;KVWrAH?wBkh`ID;6&TTZ26EUYPER#nuH(LiZbsy*KA|BPOQ~Mkf$mAod+rQ zEN0)g9=aJyjA_4=cFWr7m}p&nDUT?R7%3boTwYvYU34iwr)8IEHg8U}Mc;tB`n-bK zz~1EdXmLOAzse43MX z3E{-gCTaE*J}XbLDj8b?+hy1oOl;Hph&~aofl&AG7Ct#-Jf}61q&Pj2&6lkglNWq5 zvI!n0DW4>J)phIhRccdyYDlVQ8+g7D=3|IvU#7*8~C z`U-7fjfBRNn8C*gDYR~_xRwHg($BddDg3XW?@}(glDQ?&g4$VB_m*9F;2_ zds;}%CyKQ`4i-1bi5ZE>zAn!$^VLG-b83y%t{OUB!7ZXKM@O33jftdZq+p~m%QEU} z?OCl|<{#~F^K9BQxN2=a#3uR1M$1K^G7sr8?A5F9CNO^EQA}TTfm#nuRV%Ls*lt>8 zt#%%ht{<0!>-+%3i; z>TKok$#A%3?AmJMhs%3g)$74)^uEDxIyMh>bY=~AZS!nN?M1=T=wdNNaZ(l*myW$> z4rOyGKzb;3cyc}skSW9E)oEfV_11drggyn4$-jQK?D-n795fVxhaRKn*skohdgy4A z?zCRZpYg@9bTy~zHTWR;q4HD?hr7=$>+$Mfm+d zYI?4?p}24wHd}?)&3kJFd%^2rumGKx-boMs5%sh5^LR-usXDsr(Pwihdtv)d^xpKO zI?>K$>&l1yO6N}CzNi0*69B=F;Q=OX#zDzj$WV-+XQN6yg{h z?6^wQbV2dEH@K)6^mJgF#P?B6j|6;FM;qnyXM`O3>h8BQlFgHu|5rm z<41ZcePkyh(CIAq6nc)VEU^sXo-?_a2Mtw6FCrg2T<0Rh?**V9wb_}Oou=H}>UP3a zZXlM)zuPYbzy2J*;XW!ZSg2<~`^Nc!z+%{H4ETL%e7`F|*^6s90Rf?r{__QvP$anq z0s{GAp{(w#E+frlWM@NXU~Fe-Lg#K{|2-NAh{v7lyJ=(MY(U^{V{Pli<<3j=uMu3| z?SF356A}Dth_e+hk-CgLfsmb}2>~k|3mpRyA2b000gt1xDVL(K=zqw+uXu^fot^Eu z=;__u-00kx>FgZM=ovXVIq4ag=$V*kzemtIdDuD|xYOD?5&wIV|IQ<9;$-A#Vef2V zXG`$UyatALF3!9}ME@-GKc9c|Y2t42e^#<}`j1%O0@DA}L(fRZK>z^zR`oAdE{|_Y#8^iym z{9ir)i}D{%xa1ryOum)$k1F^WdFcOd_x>}UhyEWu{V%=!+bI9K`)w6IXde3iu`nNW zf7!_t5Rd?ngs`BpJMd*Dgg46KQjZxZ6bT{$iE<$ng^0)?cv8sgLa{i-Pi1QsU_oJ@ z$B^yu`Qm^eG)?o|r<8&{P3*kk5C{a0ubTfkchxU0{{QT|Cc%tM@;#dveePg5$Cpm7AJ2nnuh^R z^dD8v)Ij|hKCE_9HX1$f?% zlsv~`=b^d$wX3UR{(ycgZ>^Qv4HoRY=H?6o%GA+k>Ti}bymBQnUz ze>@$F#{X*++-WH5IZMvPhAn!tagcnzWo#@w#BKoHH&H=e6?LOSg81qbZ_@XGW6SZj zj*2gDzunIJxxq}1%;?yKIN6rQi;Az_J)EtwgbE|XE&F1A#WH{Vb}s8b&yqkV@$YcH zuvJn`Hd`!|)PAqGQ}5b5K7Rwcb2<~q{)U>YI6s@Ns;EPeNT^VYwkJ_n%J|q+y|I}4 zn0NM~zH|2U6)HB<#pI$K<$sYoH}I|T6Sk8FW1r1JX} z6-GTZ)wD>ANIi7wdtr?ZT%%$|(OjL~XPza#;_OP*V;tdALi6yNNWNx$XcA;{p85f}b= ziYo(Ue6J??WpqfLpAu8gCW3on&cMzoj~_sj7~S_D;~OA8XDhs>)^azkGjD21n>L$_ zmNo9dj(%1B@vr%XM@sHk4(n+K1=dDEW33WbgGDH4-|I-3>wn{aOHY;My^ znrNaQ{~L(UP=U2U6ty)8X@E6c_@eOH$cqxSNkb-=T|yobDk}FC@{?@LH;32h_Z&De zx9W*Dde;!fhX5@}q?|u!$V2x2haWC~0-GuACBxoVsn5y5SbRz|gG2@-j z@k{W)xyHn=Eu)pe+dc-{S~>lknm-~6yc9_P&I;f1u!W$Ui@;r$46u8}aUqPPUQ`PS&i;*ym*rg179cjC+Ln^qJ0yomx zY;T1l&|g!FbC~}fWX&OeTy23PSDZ`Zt$4DxL!leqwx$Q?sWnGpxoCYPima@t*+(_& zFrq+GhL2OVsvI+MOa*Zh{}{vJNqQ7G*$wSjZ@MM8+cZq4Z0VCRf_%Be%Fu64NnQF z-V+QiuKoiIESur*WhGe+{Esjbyw*E*bc?SnHElX&IGxDR!(8|OX0t{iAQT_{C}Rez z#DM+V7xtq~#YF~#{kCi4aR1Ssm+2d;yqCM#qKAZap}I(Yb=Ae13xe&OqINrD#@crY zovYh5e*wk+y3`1wx;@c@$r6!)(9@PCBJcTM zNnMdRoX4M$twL*Z?=*gvYR(?dPX?nJ9?y2;h)bg32=&_ohIS&ARfkZ8`0jaJHW!t# zlJjYJV*7-z9a0B1In$dg50o_jJzEJcNZHY@Wi{5L#HY2Ebx5*TV@7WQ4R?GlAl>l` z?b{z>qP7o?JBN1b5H@T{P#w)0SLy9A3tMeYfN0)uV8*p3jCnn)v5#l_DBV}yN65>U zOnwE9?FoCqO}W5B?_qmYhuYf>s6292PVVb-nyJK1Ri@v+TWe`2R?8@4dHSlmWGXIe zPM^yx68{tVSHyB^eOAu}ZOu!H3Q+Bg;5HuyK(6Y#P9AW-llx#}py*}l*5uQ@EkH97 z3@6fFO0KYalf6@}L|s%<)&h^M0Kv@}ble^5s(qQeNph05J=CIW`Pe~Qxr(Fp1Y?hD zlQ<&~_{UW1tj&G(qa`O)hx!|I?86RFTTdEm@~!6fx$bPU7WOjvTBE(k(qig4#PY_a z>q8mVdq+p!trjI1YVpIV$npKCh?<sX=-@riP|{GS*kzXh&pAsc;8qHWnRuAdopqk1g#^H zH|=F~@sV?y?6XC<>}sCI2CliQ%v5%~iwbeBX(J5%#x}!oT*FkOR1WCyw1AYP|pE)1C%;j+hb!dAC}o(()jTT z9X2o@&hptOD&rWQnW*2~y4i{HBSrP=>GK#6GsPl0>baEsr;5d?R5w*oKVYl&M zNmUh%sUZLXklzz=I^IHs$OBiNHn_Yy$Hk4tzHGHuJ>BN#p4+f`e+ z`qymKbWCrKU8{XaFU_GUANgNx`r@rs7cxt=o&7SEu0F_0U*TL&W}(BonZ3i+r&xUd$o{J{ zX47qIJZk(Dh-Y7oHHS*>-B|rb!{Mikql!KpFy4BjY^bLnOO;efIbMQV9!;5xG|5b{24Z z5*Q)x0979SE54CukuQr6XYF)3*pSECeQC~Ra7rSRD$Mk~U3L-M8NXDp$yFoqzW8vZ zpp>i>$!13r+X`H(vK9)N4LnxX(+d+S>heM+38AbVewnJH*zyuQ2;qb2Pg5%geWxIQ zh2S>Q08}sB1(D9-*Jgu_a5uV=Yz7)|e(5jkK)i)dsxg0Fjl61&<>3{PBCQ`wdZj#D z?=bUuxD;6Y+-foxsU=W-4Y5BqsJO%{vXhrqGBQ}5m*`qCTp=Je8t5Boj&qb$SNt@0XQOA! zY(7w?qGw0o9MIc-Q5TLT06o-+phui))*XKrFS}TS=>(= zITI+eV7NhQja5h78}YDc9j;=-p5PB~>=f80RH}l9kDS(a=9&`P#LZg}?h*X)$q{!? zcjnB}vuMYRbf?!ONRo{mY=M z)y3uG{_?XD>?;|Y&diZB=#aA5#pA}B*91NEYHRCK=Psj&`QpR(y}7Bn?ytVRB(5Qa z@4Kb-Zu6?hp-OM1Hg@CQtDN$(lqm@66*>6bR6hP4PdgRA~|C7`;rir1DqS(qmBO8n1~=L{f3F--<nU;>^=n5zWHNCn2R>m?76eZA^cYEQpI@uhv!U;NXvp-guwvE{)n_cN;nh_6 zYpJg;)+L!qQBu>nd`Su{@CWS>?Dc!*%YZOgb|;|*m`nzh=TRd2mAz_qF|PC13lx}W{HY~e?plVl9FejEL}x$xCQY)n&? zO81t9#Tk=fHd7{SXXvhp!|4V6e)^#vVzSLT6WGAQ8Ia zS~=GTy>SP?Ds4qH*iOmNJ^Ff9uwi)=kw$rVZ4HsBpZQ~)7UiJ9tOZyrn24+iR#)HR zWMyozn$vOdtFyD$aiQ)cptZX)FB=7I{_Z0LZ=EG0jX;} z>zjGF<+9EUWD_TDB6VaHMxEp{5{xY`nM!|k(_l67&%R!S_I*Lh6H@@U1?%=D1Ef<9 zhw|If+z2_%VMo36n5jR7a8k^#ChIvJ%_Sk8ExRjN`9cDG?r|IeAtKo z%*EVO(kVD)T73Yk8GvT-LC1%W_6IDJxOhB#0Ox-B{NwqbtaeiN#$y(e@@RFLVB^)y zcVD&l{xeBtxhN$B>7>Ta{19V1k|RHxN}6$d{rJ!E+ydRB#w0#37gzQ3>1HgxVGGQ{ z^@oCYKXIvid7>Q#kPdJZ1o-+8CZ0n1#&f!c_1Dd4cjn0!fEyP4FVu24BoF$?vt0CV z7kSbZLKF5T?#dv9agNCiv~2otAbAPkz*`QxYK+7;mJdBJ$1&T2Zl^!z22)8p{JeIVJ zTsSYBsiCVwSw>uX<=V!Jd;P8R2E40r;Heu&XZ~cLaO`p39g+QHW96&VU~Ya0sDZ|t zaGo_T+FS4qouVT}BqYZlpb37S!7PD`Fqw6XX64Eqg9zem6hEk}r~uLH81ZUL$DPCO z9pN!rRlKsr7(Lv|MrGAr{LivGi(hW6C=D*#DK?7T*=>xj!S1KyfRK37%k@tW7LDs& zsBrP-vc+Lw;I;)KjY)NP2~pYGad*?aUW5Mfl=_;a$mE@L0v@_-=G#r(mZ{9; z)i*{>1){D~aoN3%`c%hjQqxhQ0sD)r6Att5}Pu!S&q!E4S_ud-PXk_)a>-Rzb%ow6%hqp(vzeY#ZOCO9jNJKuMdI>bH)(GJ;k?p zu$mdx+rD+oU^pAIYmFNfGH0cA(XnLsNPnYM3sT3>MBhK`>1u9UkLVbiL^jV?}TB;Hq5`nlu{)3}| zcAKuU0o2FfoKp+I5!v)Z^fO7<6%Do=4&p*{6`Axg9>^VH9FB5HR$tPxAIUTH>v}yQ zSx(wcU}Nho7*=c(((hgjr82G+fcTpXajp`}^kn*TeCwJF$t&WoM3x(*JHSs&zIbE} zeXL|mG{?o@iddQEcB9Q1Zc?APbA6|9j~`b7gKJwza7Fa$E45^LI9(5xN3>$q{#!_f z?}FOF&lnx=Bmh`O_-yb`heE*ACdQc6XFGH4eAmnc6hvQL@&yblxWKVt1;BUn(gfUX zpY#iCxu6v-n_jvg|FkXFZ|kC<2`?K0t7-Qy!FrCr)L+ZL9mk^0$O!p+wNH7F8c{vD zF#QmDv#w1BysN=N?fJ=8CYJ+wO_}b#ivZ)qUB|{`OIF?mv6&MSm--Ee3^^@x6#?Fu z9B`#gI7j8cR6Xq~PtPBs_}brF-f<@}mK655+wH~#D-Zasfam6SmpIMav(U6+U;NegcoKtku8L#_RC4_;jV2hY}wC#xZ=KSK_b($UmDbyJ7%J{pnQDh!rykL#A@j9zP zxC#Xf0@@E!2|N8Wdt{=WcB9U1^u#p z+GYK`yma?6!9540fB>TULF{BmAC_a43T1BP3G?ST8 zosrotI&JT>KwOI!kG`nq_ZJqLx#QYj`$OL9?l3#m^rWvVB@P(6G-W{B8{hMz4poX7{+94-32WRrd{n?q(b}+5I8}lni$bm zj_V^h94KkLb);=JX@XgvY`nsp?z{RaZz^Xs_9;2G4DM2j=snrmc_s-^FZ)g3cY#}Z z(DWlCBL_?mHR#T5fp|PWaIN)> zTPH-%yTiBLobaHFh?%4kWDhNu{c}8JnWll)IoM3!#zSl+2K%?uOFf3-9+tLS(b6$` zjDta~_X&c#F3APEo9xKy1|7AcSGq~t$s%?5*1JUS`DDO4UJUs?&eO=(n19^a@pv1+ z1UUvWvksFeRn3Cez4tp^B2x`a7zaM&WpTzQS3~KGBW=Tsh-NO>u^iJ&UNd=3T#Q%R zMLF@FK`$Hk6ES*dz!WW0>9)nXD~?e`g0|>KFl%zWnH>T%UH-jKE0e5cJ*#BWnw#$US`dI28+%FxidbU3%52Lj746udUNATTwR&d-WVBUJuj@>Q*j*R_ zb_y2E4E@(}F=4GWgNu$Ikf1G?^DSTlZxYKptdY8fMQ^oU^7WYsxHEgryc_t*Pw_B#Hs@LKc zczs@;VPK%gyp&*wOK>))D^@WGAdYbzh4bd&rZbuem;T?@?_^lc^-DNYjE z^=vQ35H&aDr432Rec0f@=v@kn_M7;`o&}v4Ngs<=KANAl!almyFXdyK%<0(s>1oNZFH71 z-HW}xlNI3|&45wEp`r2Aj;9L9r!pu*^Am!^3wdbY4;&bF&Q2Z>E5^Zd!VubUoFpJ# zxh61?qu<15_Hs&a2QfYNUdhOs@kZvgxh^b( z7Ce}VjgK5jzITRi92yeoPY*D>(SS)R3QX^8gJogBKN##qcrS}|2PKD!yF+PNcH)4U z%S)ZB$>6f_w1czfO?FAGc_9@%OcA&et|TekQ4Qy=&Y+?hp7dq$fyQrEx1c7pLpdEA zzI$@g`7H2x{P!-&(FWM`7E!zT)Ar}JRYps9E=MCr+}e(Bc!6mEpg#qd>h_whuZ5-a6ErinRbd24~W? zU2!UkGt!%I*j@5ZPovY#s3=}^LkCWTj6vUtd>p9^q`$5@mmHK(pcnY{>5s>6A(~Ta zA5A&a;pi3q`TCc(N@E6CXy=;h+RjN1d&kaJl~=R#ZO zl!L2#o(<+jP{`TToY4~WsC?J$o~(xfybUwGJFFaS%Lk`nz|6V;0`HD}%YX<4kHv;# zhfvgDYlw`Q($_ znxYp0mIestihdBajdOLlu*{osRw`;<2xm+mTi5}Lxs7LcAqJAY3NDIs{U}~r28Vkf z-tJ4Nl!@;R+XNlj8onEWy8(}?^tZBqbad2ysy;i7R|DR%yP^2$xK9n+V+_T8peEsmN;{ zcJ!HUbu-lIJ~70O&z6H>V`P&Ha1PJQfa>v_HRaS~&*hX-$&>oYowWpyt`E$h)wkn1Sg{ zLliS=@7a2ej8KOxc9{%+s=l&WK3YMm#i5q6?bFbZ=a`spEH&z1*Cjnlo9@P5b}OZ0 zCxlRLt!TT{KX9(W(rEWtM2%@j-P$BE-N;XZH)rHQl_`n(0HopB_@<3M!>3roT2|t7 zNDQ`Uum01>)Pj)3F`xs!l0^@S`~nDziY2t}NwjG=s>M2HNB_>mHTd4qfHIw#Ci&y~ zlx?HjN7E6{cCmZe;g9V_y-oK$un>xL$6lvsza8dcGYeV%-Zf_DbylEbhLs12qyrqb zZQn@4uU>d6X<@ORM2c6z8tS3OWOI!Go4v40{c9EwJqfl%loXsM{5|~BM*f8b;+|?3 zDX#?ni!lC?F`;u#=!7tqlE#R!Z`Vcz@UrjuQ(_yYKz8K?R9i-B;96S6+#$3JF}?M9 z_tE!AoCw08I`jbFTZ(bCeJ=DXiz!PWARo;YE>HDpqtVQ_J*#-bZ~d-qNkS`IOpI_l_q>`J?4_ z5`z1ii1P|>rCQuvnXbPHZpahq`>S*F(Y66zlQNhnPK!zLe8j66pS@v>q5(tJc4eYL zKmSg7gw6PrDb5;C=`pKo^xJtYSj61jxUS9oM(Vd_0Pxo7j5{^bi7`F(OxM7*7Hukwr{n=#n zoE&<@UVO6Xw01N%b~T|`T4Eb25tJG)ftUkZ%t*=A~ugphHP|Z?K$&Aw={taU$H73ob+Pz`= zJgBK@wabBT#0lU1V2Q?W?0aO6rLZF%=4x8Gt`f+HC zWy*K0ebFKhs2H3`khw>eS*G(kup}#s~%Vrr*I`?>Seh|wu5G`NY_-(c_E41v%to+%& z3s9n@M@>}r_S^jXMDXZIi@86S6vI9w-9@Dd)l*Q>oj`W)N_#ik3Jo&cSFd1DVA+oj z!Ino=x6c%ZR-7;0U&kTMWf>+L`$ne*<9>tZ*&7k_TeFF{ zc`q(Jb&u)u%&6g$(N|@G*-5Uz7Syc8lD<*d(zm>5S$JG>Ay$crB*NF&Mna@Jsdezs z)K10x-6g0I$;{1WPve0PvktIbPekAq-gcHkFnXksV`1aFG@deaCRK(A4@RzGj zlGo6H!dqkVoTx@p@6>+1RJfb=_$wIP;X2cY2MLiI&UhentfJ=U$>VkUr2`G-mCq_G zN@5aB5lZe8*2np0f!d7b!hKJ{)LlRvnO^AVB>EeU>8~E{sby(VpUw4)^5tSl{I1l~ zC&TI_J;Thb^WCXRp2JTb96Tk>VcV>!dI)DLG7>kZCHqMoY=^?2D5oHSRM2AB%N2(} z0P>N`V=xvB6H$b3{X{TUL*`n$tnVpsyxjtJSP%})LxZ&CT?gqxwHbDNe;k}zJ&28I z$^Hnfo^u~5zu64}_B1>$^;YI{Gux-ndiy3`d94oq@n=61w|$p(-lg#uaqVJP|JUm| zodv9^fwi?1xy9J)qxk!9F}>@6S6It;H$yIEiO~qd`rEwAfJbaY71Q zMBeQ#r_X0@I#ken+fe0VzoumR6UzBdD;nPEvxTkAR4c{QkTIdJQs_Xu{HKnQH~fy_ z%bo_oOLZokCft9Q!VM6ICOq9-7VY1-aq>NN&~FdPOcl>VD0R>fE$~nw_N&40`P&*r zJ{sZ#T-UmY4^1m!ELemBB6tcvSB0#dV}h`QROTdB2gwKeHS0h=^M0KCyfk#~vd_k# zFZHPbT{dNV#xv!`iBox;xJ|1$2>4KZT4uWF;On;hV=Vn!mqFYxH8^v9y`QIY5_jBq zb5IMvW{_T*2J%Uc_aKMhN8c&^Miqc)}dyb-Wv@A{8oG{k{$j0aNRtOUb}-(?dmZF3KLN<984}42GPr0%?FmV@?$zXd+tSZ(V4|yh-9OWx zh*mDHfR4ktcpk5xv!^0#3+=c5+9w5qdy~9lcFHx`bjFpgsjP&)w0X_Gu&jUMGSjBF*nN1%WD1y) zwxH;?Ft{$f-)J0hX+iIRfoq{6yB;g_oo>?=H-|;{gN6PCzja|RhZnZ=g2P{G(EVB@ z`K5SO$vs!D`x)SIT4T6?lK3(j){0^@F32~bdXw!~MMb9w$>EV3YU=8ZU2*a!#fKaQ zZYb^0sr5eFgXq6BTdHoph#bMXZj3_ml0Ctzuu z4sgfET6<_xI^e#sfHvDXR)I?G@rP8!mx;ce@^N|!(my)H?>W@=p#wBgxa1|LSoVAm zatu|wFeVFY=y<*p|` z1`P*UsWC~Vu6LT6ZXR5B^hyu8m9>jvOr05o|B40ESZvYvo;zKR$o4(5dFT*yepmx;)rz zptVdzUQTv1K3&8!GB)ru3jwS!U!%m}A)~ymhcNWC;>vpYVs!(CoU@w_b87$j;x6o% z8)Kq@82!oUa5~d9@jeGPtgq|-So`dCAbLP^IP;<>4%BVT3^Vq_Bt;K_WJuEI6gJ(d z5;eNL9?p}wCQG~><_sH&7ON9Y~w2MVqU(hSe8k8RP9b)_;E{YmHUl*Mc zZC6v~K9nel+>M7KXUsT}0S#t3_4h;KI63~b)hAEJg%Sl;xasnbDN|y5cuC#hTa=md ztLQDggQo98b#h~cYqAn>MK*j%wUSuU+H8iYa#!yKbY{65K59R|HG-^n!6|as2a#9l zIO~#1Eb18iT~DWJ0x>O@j*Q>eh<^@4+tR#tqyPNdtVllUrY|#A%<~Z0Q=}g+=&JqB zW!+WPZi3pqZLvb?%h0uHD~_fMbS(tZtTjr*2R|Y4GSQ&zG-NeYH3vY#mR9#A+ay^1 z?cbq?K&GRAYrpdNjk9+pxx{gQ84FEl-@F!V!;^F9Bhgp;8ysh=Zx%dW*OjEy68rvL z2no^7EFT1gVOX)3EW;VE@gR@WD@p1O2L667RIbMVj+$>-oV6N2|II6I{bM!wE+Hw33f?C?#EO3#$E-*OJQ$*5Fc^MDbYGs| zCvlY0LBpNLFznIe1_ts-ID8S_Y&ZFIk|aJ47B&;_$81@!6YY7>acQfGsjLYma_L7F z_7F0FZhn)RR7?WHS9*dcfkSWOL@KerZ-F9lByoEOd&2Xi@<+(hVT;rtJ!kAIQ~NOM z=6AttAf_j>qpn}_95@&wvim~rir7V`sZX>AaFoHPHj^x`nMIrWI7E7UW0QkdlIw}{ z`6nhNuP*#RYZR>9ZHpoL<4)d?9LumV*%@@ik2qI=VI-RDB&7(u?dz65lZvP1gv(U> z_ov*rRG&+<;UJ3p?h*63U?92$;LSFq_agOcIhsSFoZuO?Yd21!7Sem*h9ks4BWu#> zByo}}fr8>yKk#lEPGWK5ay7w#^d}w2Vk@fMiLux5LxoZ{*buycsOmr(gwV%uW#~6P z+QO)8A$To#ZRbSzn92GKUe8z6|A!QswT=3kN4N+zQ{k0HywFKIaMYn*e-$)=kY9|T zY@~3d!%5FB#>?Znnw^J4ED;FS7p1$Ir);=rCo;%z(mfVqwIA!IP+C}k)}J4qly^Ey zRGW>-S@%HsJvm*ba2Vr+_#z77cJi3$(Ap|g*^D#q8LuEq%w3Ig>R&6 ziQt7M#*S8H_{J)~8|6v4SL}$kQO}xBD(@4xU$BDeJu6*Que8qcrz;WDF_d7<7--7& zftyY*|7jv_o|1X$>~3xl76m09aK1A* z_U*o2Tm!^Jicc_r;>O@#5)$(uE;b3#EaHiP5pd*lFOm%o@iLrN26gbjZeToL(4p30 z#ig3ry{AvE;j-FTxBk^zltwBht+GW{X#>#+VR6j60DMCB(#XT%>oVHC zzEzoY8D2`yG~CPVPOkJRj!q4}>p5>O9Av=dqdeNBR0J@(*i3c<*VS7QB2;H7CP@Rp zp7Q^NFnRw_x|drX1&$oP+#^0^iMm+wP>?ink^#AZ<$vn`I&~2?Br1l$%hS}0#joy! z`Bozd?K=qOzC`%mrS^a%Vp}w8gE6-Sb2}yIF|4J&h5u5sf zW=S+KO#T{_i?ZE0OgXg?iOh^i{!vr`glLBYq(d}Y!@4RHRE~Fw`n!G{{Qa+(dR)z> z*1JNQQit%gG<2f^*50pnenzD+IQZa7j(9Q}soobk1`1w{MVD_c@blUWDx`Qe`mnUR z#0)TXS;vZdr0^yvc^ou39xr%K%iV!e4Ov_HCvBG1fh%Q7Ta`|W9aGnN68jEWmiJba z5x+kYDTWV)jh9CmH3*ZjFW5$51})2hz&GD2HYbVyu-Pk>rtxWg+-Z?Y0UI%r0 zte#FlDe0M~PxqOBb&KfFVty2eUHM#R7EQ@EGJEEs6^r&i1(2p;)0^OV)OQaPnvq8d z9WMyZW@sTMwBcq{WM^G#uX9?Ki=BoER3ZrkUhHuSh>iV8O^I?UsYV|y_s})t7RLZuz}S$@s%?mwGj6IYUken znQs3$fOiWwcNPn4&QvlXn=?5dYmT8C!z>ZTgw1KBq*4esHMbnQ-OhxTS%s`wWOBAS zClVza7AfLh-?$&&pT9qU|A5c+!}YkX_v7<;JzmcXtYAXkxro+II<(FhMI?MYk2rc% z<|LEKOC2j6&<_SZ{bcu1fF97!h^<|RTIF2jY*HFx)lI$8T1<2-z)dLD#L+WHS?|SU zLBzSnJXDyzrfxbC{ zn@G{D%r5P!s)oKXIuqK_sGr2K?RtIl7L8fCtf!#x3^%ii)z7jGLv!#I+#;OYL(27x zKCj3_{?1e=)C72w`zqtAnbs3A#s6&#BI{jK}-IDZE=Uu-K62Y(m3< zzio0WyaJtHC5ukD8;t1+@eJdg03~DZ8x5uJZ_d8Klf>>~uL1a^!602n*QM@wI1!kC zkjy4!%p;fXN64~z`01)YYKS`pU%1fQR}p^0ARP=UV*O1Y&+q|5YWQE*aDgG;>Z4#@;a;7|Fp2ca$kuRiLJI0Z9@Vqnq{WzBm zda|;#cT_m-203lOR-s|*jw3RncVwX$=nLh#{7G1B~nWSxt*uS2BFn%^%jt=QxW zP3#0mzZlff7%GBn@YwJ>`THr;iQBIE=m8PIX{R8I8r|Vs0WATZVD+-gFC_n3zH6Sa z@FK5Z==b=8Bb3`d+F@>Y}7J)(uOe^xT3x z?xycbnXAVVS5QwKnhOsR?!_O??X#ZtOvO2-dZR8k4b}^0Cv8@jaoa`QpV`2dJsmz@ z8USa9{|bve5OW&Fp$bOu*^i?oAbW7n6ayqn=cz+#Lt5_hf$&2T8M3^H24A13Vi0mT zbqi;apF3Xbk(|YW)!ttOx452?0T79p*}1e_^y*&WU7qLQ(dAhr6Kt^&mv*j;qR=qx~wjBTqgn%+u0Oou=WB+moqr~m{ zR-hD|l&ChEgbs#D>R;QOw)RtJW0Em@jv1r#nh8%^?d z>}FPB!f2}tdkX2Qg@E1YpCh-m9Y(69p21Ciubqx2eCR+Rgu8wLj5g(1dpnm5r(i3t zNZX%5t(i$Rx#)giyLrm}t1gN`+~{MWUyy&4>D3L5IFalW-m`KnMh!AyBew5rn^edlS#~-p$A5}FJbe0O z2$TZ5eR5k~^A59TGB=K#JualZwK>K9JU&~HC+Lx{CCPfldaYk%)nu1wUh~;(5fpkL zdEH{sr>SXpe!v8&-wL>&UUFy8X?<4+lkfJ+lqon>^2S!NQK~`ysjYMRE0~rPfi`z+ zigN_%bYvF5RVg%i_m8uUK~^6YE+fw%;TAt#%35}t_bAnJD4B}gre+E^_Z9@dLvo*) z@tjP$SrfhUKF;8ASS8$XZW&fOr9Jw^UCAW?_n|UP zmy|Z(%BfaXO8qam^h*eNMgx95bZTZWNYMAfM`v-cXt9*DP^o=lx_`h zn{b+4YY2Uv(3<`CSkGk1l4{Ym?6tHzIht3zwMm!Yjn~EY>}_!?P_L9OF7$}~EXa~> zVz0WmFk8o#J{s{X(%2wFZq??P0coy}-nkxZO;I{bewX!FR?83RK0o->i}7F%@G{G{ z@{uaN47&$n)~>Y)pR(s44ZnqZH&DUsKEa=2e89163Z*84*vPHddD$Jw90I_K8e$$Z zIA&L)9+#%Eqrm3wlH6$+Fd;(J!kO`jPRr*s~0B01(er>irS!ucU&sXgHw!# zV847Tbk^YZNq;&b(-v+u+uyYu4sGuty$UX=7K<*sq|*&b-oeYmM#ct2<#sv)XtoZm zqZc=1)xU8gA(J_(llnNr$Ii#C?!437-q>q&>ph;l}X;WQY*$nMPX1Ux6&Df)|Vr4_79n{^Lizkf9yXvYg*J8^pV>o!oL!Zsyz zVK58h4`p_e3Yf$g+y{RZlb3hg!>Usi=zakpDSMK4YHwYc>M^B^-TT5-vVB_lRbxJb zG727fH`h2ZwyKr&kFz#?QxlUEm70>+BkAJhKsjO7Jf-D3xm@p75-BH-q`Y3K$e#N3 zU|Gk?&$_y@f!QZ_d-07}|8*NAtb~eg!e^(d(+78*^Z!XYuZY#{;C=h{+5UJ7VDEtbJn#R@=9n5O aE${3nKrHz#22r@n?mJ`UVEND-b?qNT-C#-p literal 0 HcmV?d00001 From 7634f865bfe94b1cfbe74e101abdfaa75bc78f8d Mon Sep 17 00:00:00 2001 From: tomasdarri27 Date: Sun, 3 Dec 2017 22:10:47 +0000 Subject: [PATCH 10/11] small changes --- src/components/BookingTable/index.js | 1 + src/components/Header/index.js | 3 +- src/components/Login/index.js | 128 ++++++--------------------- 3 files changed, 31 insertions(+), 101 deletions(-) diff --git a/src/components/BookingTable/index.js b/src/components/BookingTable/index.js index 5ba3e43..c7409d4 100644 --- a/src/components/BookingTable/index.js +++ b/src/components/BookingTable/index.js @@ -151,6 +151,7 @@ const ModalWrapper = styled.div` .textArea { width: 278px; height: 93px; + resize: none; border-radius: 2px; border: none; text-align: initial; diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 1f4c72d..a505d82 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -28,7 +28,7 @@ const FlagWrapper = styled.div` `; const LogoHeader = styled.div` img { - width: 45%; + width: 200px; display: flex; justify-content: flex-start; align-items: flex-start; @@ -37,6 +37,7 @@ const LogoHeader = styled.div` const UserInfo = styled.div` margin-right: 160px; + display: flex; img { border-radius: 50%; margin-right: 10px; diff --git a/src/components/Login/index.js b/src/components/Login/index.js index 4fc5fda..bd53dbf 100644 --- a/src/components/Login/index.js +++ b/src/components/Login/index.js @@ -15,62 +15,30 @@ const PageWrapperLeft = styled.div` height: 100%; min-height: 100vh; float: left; - @media (max-width: 50%) { - ${'' /* display: none; */}; - } background-image: url(${mountainBackround}); background-size: cover; - ${'' /* background-position: left; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; */}; -`; - -const LogoHeader = styled.div` - ${'' /* display: flex; - flex-direction: row; - justify-content: flex-end; - align-items: baseline; - text-align: right; */} img { - height: 27%; - width: 27%; + img { + width: 200px; display: flex; justify-content: flex-start; align-items: flex-start; } - ${'' /* button { - top: 0; - width: 25%; - display: flex; - margin: 5px; - padding: 5px; - width: 100px; - background-color: #0085ff; - color: white; - border: none; + @media screen and (max-width: 750px) { + display: none; } - p { - font-family: 'Open Sans'; - width: 25%; - color: white; - } */}; `; - const PageWrapperRight = styled.div` height: 100%; width: 40%; float: left; - ${'' /* justify-content: center; - align-items: center; */}; + @media screen and (max-width: 750px) { + display: flex; + justify-content: center; + float: none; + width: 100%; + } `; -// const SlingWrapper = styled.div` -// font-family: Arial; -// color: #0085ff; -// justify-content: center; -// align-items: center; -// `; - const LoginWrapper = styled.div` margin: auto; display: flex; @@ -85,10 +53,7 @@ const LoginWrapper = styled.div` margin: 5px; padding: 5px; } - .forgotPasswordStyle { - font-size: 12px; - color: grey; - } + .buttonStyle { background-color: #0085ff; width: 250px; @@ -132,64 +97,27 @@ class Login extends Component { return (
- +
logo of the website - - {/*

Don´t have an account?

- - */} - +
- {/* -

Sling EBS

- */} - - -

Sling EBS

- this.onFbCallback(response)} - /> - - {/*

Sling EBS

- -

Log in

- -

- Enter your email address and password -

- - - - - - - -

- Forgot your{' '} - - password? - -

*/} -

OR

- - +
+ +

Sling EBS

+ this.onFbCallback(response)} + /> + +

OR

+ + +
); From 3b5de5e7e5df26b6256c43d747249eb9e636ea6c Mon Sep 17 00:00:00 2001 From: Bjorgvin Gudjonsson Date: Tue, 5 Dec 2017 18:00:59 +0000 Subject: [PATCH 11/11] test --- src/components/Login/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Login/index.js b/src/components/Login/index.js index bd53dbf..ba2b55a 100644 --- a/src/components/Login/index.js +++ b/src/components/Login/index.js @@ -28,6 +28,7 @@ const PageWrapperLeft = styled.div` } `; const PageWrapperRight = styled.div` + background-color: red; height: 100%; width: 40%; float: left;