diff --git a/ui/src/onboarding/containers/LoginPage.scss b/ui/src/onboarding/containers/LoginPage.scss index 6a2df64d619..5bfd8eb61ca 100644 --- a/ui/src/onboarding/containers/LoginPage.scss +++ b/ui/src/onboarding/containers/LoginPage.scss @@ -1,12 +1,3 @@ -.clockface--app-wrapper.sign-up--page { - .cf-funnel-page { - background-image: url('../../assets/images/influxLogoBg.svg'); - background-position: center; - background-repeat: none; - background-size: cover; - } -} - .create-account--button { margin: 15px 0; } @@ -39,7 +30,7 @@ } .heading--margins { - margin-bottom: $ix-marg-c; + margin: $ix-marg-c 0; } .login--forgot-password { diff --git a/ui/src/onboarding/containers/LoginPage.tsx b/ui/src/onboarding/containers/LoginPage.tsx index 0ca57506566..d795f3d32af 100644 --- a/ui/src/onboarding/containers/LoginPage.tsx +++ b/ui/src/onboarding/containers/LoginPage.tsx @@ -16,14 +16,15 @@ import LoginPageContents from 'src/onboarding/containers/LoginPageContents' export const LoginPage: FC = () => ( - + } > Create your Free InfluxDB Cloud Account diff --git a/ui/src/onboarding/containers/LoginPageContents.tsx b/ui/src/onboarding/containers/LoginPageContents.tsx index f6656613ccd..1925ccfe059 100644 --- a/ui/src/onboarding/containers/LoginPageContents.tsx +++ b/ui/src/onboarding/containers/LoginPageContents.tsx @@ -8,11 +8,15 @@ import { ComponentStatus, FlexBox, FlexDirection, + FontWeight, Grid, + Heading, + HeadingElement, JustifyContent, Method, Panel, SelectGroup, + Typeface, } from '@influxdata/clockface' import auth0js, {WebAuth} from 'auth0-js' @@ -88,6 +92,10 @@ class LoginPageContents extends PureComponent { }) } catch (error) { console.error(error) + // TODO: uncomment after demo day + // redirect to universal login page if there's an error + // window.location.href = + // 'https://auth.a.influxcloud.net/' throw error } } @@ -122,7 +130,14 @@ class LoginPageContents extends PureComponent { size={ComponentSize.Large} justifyContent={JustifyContent.Center} > -

Continue with

+ + Continue with + @@ -153,7 +168,14 @@ class LoginPageContents extends PureComponent { -
OR
+ + OR + { ...errors, emailError: 'Please enter a valid email address', }) - } else if (auth0Err.code === 'user_exists') { + } else if ( + auth0Err.code === 'access_denied' || + auth0Err.code === 'user_exists' + ) { const emailError = `An account with that email address already exists. Try logging in instead.` this.setState({...errors, emailError}) } else { @@ -407,7 +432,19 @@ class LoginPageContents extends PureComponent { } private handleTabChange = (value: ActiveTab) => { - this.setState({activeTab: value}) + this.setState({ + activeTab: value, + confirmPassword: '', + confirmPasswordError: '', + email: '', + emailError: '', + firstName: '', + firstNameError: '', + lastName: '', + lastNameError: '', + password: '', + passwordError: '', + }) } private handleSocialClick = (connection: Auth0Connection) => { diff --git a/ui/src/shared/utils/pageTitles.ts b/ui/src/shared/utils/pageTitles.ts index 9506e14d9b2..fbfb6de8cc0 100644 --- a/ui/src/shared/utils/pageTitles.ts +++ b/ui/src/shared/utils/pageTitles.ts @@ -1,10 +1,12 @@ import {getOrg} from 'src/organizations/selectors' import {store} from 'src/index' +import {CLOUD} from 'src/shared/constants' export const pageTitleSuffixer = (pageTitles: string[]): string => { const state = store.getState() const {name} = getOrg(state) || null - const titles = [...pageTitles, name, 'InfluxDB 2.0'] + const title = CLOUD ? 'InfluxDB Cloud' : 'InfluxDB' + const titles = [...pageTitles, name, title] return titles.join(' | ') }