Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui): update oss login page #17291

Merged
merged 4 commits into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

1. [17240](https://github.com/influxdata/influxdb/pull/17240): NodeJS logo displays properly in Firefox

### UI Improvements

1. [17291](https://github.com/influxdata/influxdb/pull/17291): Redesign OSS Login page

## v2.0.0-beta.6 [2020-03-12]

### Features
Expand Down
34 changes: 32 additions & 2 deletions ui/src/onboarding/components/SigninForm.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
.cf-panel.signin-panel {
.signin-page {
.cf-funnel-page--content {
display: flex;
justify-content: center;
height: 100%;
}

.cf-dapper-scrollbars--content {
display: flex !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this !important necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately yes, in clockface there's an !important present to override styles from a library, so the madness trickles down

align-items: center;
}
}

.cf-panel.signin-page--panel {
width: 300px;

.cf-panel--body {
padding: $ix-marg-d;
text-align: center;
}
}
}

.signin-page--logo {
width: 70%;
height: auto;
margin-top: 1em;
margin-bottom: 3em;
}

.signin-page--cubo {
background-image: url('../../assets/images/auth-logo.svg');
background-size: 100% 100%;
background-position: center center;
background-repeat: no-repeat;
width: 100px;
height: 100px;
display: inline-block;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ninor nit: wanna alphabetize these selectors?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can do that, though makes me think we could benefit from more thorough CSS formatting. I think prettier supports that? Maybe a nice little tooling improvement

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexpaxton deffo. I usually just say "alphabetize absent any other organizing scheme. would be rad to have one in place"

13 changes: 7 additions & 6 deletions ui/src/onboarding/containers/SigninPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ import {dismissAllNotifications} from 'src/shared/actions/notifications'

// Components
import {ErrorHandling} from 'src/shared/decorators/errors'
import SplashPage from 'src/shared/components/splash_page/SplashPage'
import SigninForm from 'src/onboarding/components/SigninForm'
import {
SpinnerContainer,
TechnoSpinner,
Panel,
AlignItems,
FunnelPage,
InfluxDBCloudLogo,
} from '@influxdata/clockface'
import {RemoteDataState} from 'src/types'
import VersionInfo from 'src/shared/components/VersionInfo'
Expand Down Expand Up @@ -67,18 +68,18 @@ class SigninPage extends PureComponent<Props, State> {
loading={this.state.status}
spinnerComponent={<TechnoSpinner />}
>
<SplashPage>
<Panel className="signin-panel">
<FunnelPage className="signin-page">
<Panel className="signin-page--panel">
<Panel.Body alignItems={AlignItems.Center}>
<SplashPage.Logo />
<SplashPage.Header title="InfluxData" />
<div className="signin-page--cubo" />
<InfluxDBCloudLogo cloud={false} className="signin-page--logo" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is cloud={false} we have a CLOUD global variable that denotes whether we're in a cloud context or not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that prop controls whether the word "Cloud" renders in the image. https://influxdata.github.io/clockface/?path=/story/graphics-brand-logos--influxdb-cloud

In this instance I left it false cuz this page is OSS only

<SigninForm />
</Panel.Body>
<Panel.Footer>
<VersionInfo />
</Panel.Footer>
</Panel>
</SplashPage>
</FunnelPage>
</SpinnerContainer>
)
}
Expand Down
11 changes: 0 additions & 11 deletions ui/src/shared/components/splash_page/SplashHeader.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions ui/src/shared/components/splash_page/SplashLogo.tsx

This file was deleted.

91 changes: 0 additions & 91 deletions ui/src/shared/components/splash_page/SplashPage.scss

This file was deleted.

34 changes: 0 additions & 34 deletions ui/src/shared/components/splash_page/SplashPage.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions ui/src/shared/components/splash_page/SplashPanel.tsx

This file was deleted.

1 change: 0 additions & 1 deletion ui/src/style/chronograf.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import 'src/shared/components/threesizer/Threesizer.scss';
@import 'src/shared/components/graph_tips/GraphTips.scss';
@import 'src/shared/components/cells/Dashboards.scss';
@import 'src/shared/components/splash_page/SplashPage.scss';
@import 'src/shared/components/code_mirror/CodeMirror.scss';
@import 'src/shared/components/code_mirror/CodeMirrorTheme.scss';
@import 'src/dashboards/components/dashboard_empty/DashboardEmpty.scss';
Expand Down