Skip to content

Commit 244517c

Browse files
authored
Merge pull request #307 from suppermancool/issue-2739
New Login view for unregistered customers #2739
2 parents 51f49e5 + cd11d51 commit 244517c

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

components/Wizard/Wizard.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const Wizard = ({ type, vm, children, wrapperClass }) => {
3232
return (
3333
<div className={wrapperClasses}>
3434
<WizardTop type={type} vm={vm} />
35-
<WizardLeft type={type} />
36-
<WizardMiddle>
35+
<WizardLeft type={type} vm={vm} />
36+
<WizardMiddle vm={vm} >
3737
{(type === ViewTypes.register) && (<RegistrationScreen vm={vm} />)}
3838
{(type === ViewTypes.pin) && (<PinVerificationScreen vm={vm} />)}
3939
{(type === ViewTypes.welcome) && (<WelcomeScreen vm={vm} />)}

components/Wizard/Wizard.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
width: 100%;
77
display: flex;
88
flex-direction: row;
9-
justify-content: stretch;
9+
justify-content: center;
1010
flex-wrap: wrap;
1111
font-family: "Roboto", Arial, Helvetica, sans-serif;
1212
min-height: 100vh;
@@ -41,6 +41,10 @@
4141

4242
@include tablet {
4343
width : 23%;
44+
45+
&.hide-left-progress {
46+
display: none;
47+
}
4448
}
4549

4650
@media (max-width: 645px) {
@@ -60,10 +64,18 @@
6064

6165
@include tablet {
6266
width : 77%;
67+
68+
&.hide-left-progress {
69+
width : 100%;
70+
}
6371
}
6472

6573
@media (max-width: 645px) {
6674
width: 60%;
75+
76+
&.hide-left-progress {
77+
width : 100%;
78+
}
6779
}
6880

6981
@include mobile {

components/Wizard/WizardLeft/index.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require('./style.scss')
55
import { ViewTypes } from '../Wizard'
66
import ConnectLogo from '../../Icons/ConnectLogoWhite'
77

8-
const WizardLeft = ({type}) => {
8+
const WizardLeft = ({type, vm}) => {
99
const step1ContainerClass = cn({
1010
selected: (type === ViewTypes.welcome) || (type === ViewTypes.register) || (type === ViewTypes.pin),
1111
'bottom-line': true, step1: true,
@@ -26,14 +26,14 @@ const WizardLeft = ({type}) => {
2626
flex: true, middle: true, center: true
2727
})
2828
return (
29-
<div className="WizardLeft">
29+
<div className={'WizardLeft ' + (vm.hideLeftProgress ? 'hide-left-progress' : '')}>
3030
<div className="logo flex column middle center">
3131
<ConnectLogo fill="#47474F" wrapperClass="top-logo with-text" title="CONNECT" />
3232
</div>
33-
<div className="title">
33+
{!vm.hideLeftProgress && (<div className="title">
3434
CREATE A NEW PROJECT
35-
</div>
36-
<div className="step-container">
35+
</div>)}
36+
{!vm.hideLeftProgress && (<div className="step-container">
3737
<div className={step1ContainerClass}>
3838
<div className="number">1</div>
3939
<div className="name">Create account</div>
@@ -50,7 +50,7 @@ const WizardLeft = ({type}) => {
5050
<div className="number">4</div>
5151
<div className="name">Project submitted</div>
5252
</div>
53-
</div>
53+
</div>)}
5454
<div className="bottom">
5555
© 2018 Topcoder. All Rights Reserved
5656
</div>

components/Wizard/WizardMiddle/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import React from 'react'
22

33
require('./style.scss')
44

5-
const WizardMiddle = ({ children }) => {
5+
const WizardMiddle = ({ children, vm }) => {
66
return (
7-
<div className="WizardMiddle">
7+
<div className={'WizardMiddle ' + (vm.hideLeftProgress ? 'hide-left-progress' : '')}>
88
{children}
99
</div>
1010
)

0 commit comments

Comments
 (0)