2017-09-09 19:39:10 -06:00
|
|
|
import PropTypes from 'prop-types';
|
2018-07-23 17:13:34 -04:00
|
|
|
import React from 'react';
|
2019-03-15 10:19:57 -04:00
|
|
|
import styled from '@emotion/styled';
|
WIP - Global UI (#785)
* update top bar and collections sidebar UI
* update collection entries UI
* improve global layout
* merge search page into collection page
* enable new entry button
* search fixup
* wip -initial editor update
* update editor scrolling and markdown toolbar position
* wip
* editor toolbar progress
* editor toolbar wip
* finished basic editor toolbar
* add standalone toggle component
* improve markdown toolbar spacing
* add user avatar placeholder
* finish markdown toggle styling
* refactor icon setup, add new icons
* add new icons to markdown editor toolbar
* remove extra app container
* add markdown active mark style
* relation and text widget styling
* widget design updates, basic list/object design update
* widget style updates, image widget improvements
* refactor widget directory, fix file removal
* widget focus styles
* finish editor widget focus styles
* migrate media library modal to react-modal
* wip - migrate editor component form to modal
* wip - move editor component form to modal
* wip - embed plugin forms in the editor
* inline shortcode forms working
* disable react hot loading, its breaking things
* improve shortcode form styles
* make shortcode form collapsible, improve styling
* add close functionality to shortcode blocks
* improve base media library styling
* fix shortcode label
* migrate unstyled workflow to new UI
* wip - reorganizing everything
* more work moving everything
* finish more moving and eliminating stuff
* restructure, remove react-toolbox
* wip - removing old stuff, more restructure
* finish restructure
* wip - css arch
* switch back to test repo
* update react-datetime to ^2.11.0
* remove leftover react-toolbox button
* more restructuring clean-up
* fix UI component directory case
* wip -css editor control style
* wip - consolidate widget styles
* wip - use a single control renderer
* fixed object values breaking
* wip - editor control active styles
* pass control wrapper to widgets
* ensure branch name is trimmed
* wip - improve widget authoring support
* import Map to Widget component
* refactor toolbar buttons
* wip - more widget active styles
* break out editor toggle component
* add local scroll sync back
* update editor toggle icons
* limit editor control pane content width
* fix editor control spacing
* migrate markdown toolbar stickiness to css
* fix markdown toolbar border radius
* temporarily use test backend
* stop markdown toolbar from going to bottom
* restore disabled markdown toolbar buttons for raw
* test markdown widget without focus styles
* more widget updates
* remove card visuals from editor
* disable dragging editor split off screen
* use editorControl component for shortcode fields
* make header site link configurable
* add configurable collection descriptions
* temporarily add example assets
* add basic list view
* remove outdated css mixins
* add and implement search icon
* activate quick add menu
* visualize usable space in editor view
* fix entry close, other improvements
* wip - editorial workflow updates
* some dropshadow and other CSS tweaks
* workflow ui updates
* add worfklow card buttons
* fix workflow card button handlers
* some dropshadow and other CSS tweaks
* make workflow board wider
* center workflow and collection views
* add basic responsiveness
* a bunch of fun UI fixes! a BUNCH! (#875)
* give `.nc-entryEditor-toolbar-mainSection` left and right child divs
* a bunch of fun UI fixes! a BUNCH!
* remove obscure --buttonShadow
* revert to test repo
* fix not found page styling
* allow workflow publishing from any column
* disallow publishing from all columns, with feedback
* fix new entry button
* fix markdown state persisting across entries
* enable simple workflow save and new from editor
* update slug in address bar when saving new entry
* wip - workflow updates, deletion working
* add status change functionality to editor
* wip - improving status change from editor
* editor toolbar back button improvements, loading improvements, cleanup
* progress on the media library UI cleanup
* remove font smothing css
* a quick fix for these buttons
* tweaks
* progress on media library modal— broken FYI
* fix media library functionality, finish migrating footer
* remove media library footer files
* remove leftover css import
* fix media library
* editor publishing functionality complete (unstyled)
* remove leftover loader var from media library
* wip - editor publishing styles
* add status dropdown styling
* editor toolbar style updates
* editor toolbar state improvements
* progress on the media library UI cleanup, style improvements
* finish editorial workflow editor styling
* finish media library styling
* fix config
* add what-input to optimize focus styling
* fix button
* fix navigation blocking for simple workflow
* improve simple workflow publishing
* add avatar dropdown to editor top bar
* style github and test-repo auth pages
* add git gateway auth page styles
* improve editor error styling
2017-12-07 12:37:10 -05:00
|
|
|
import { partial } from 'lodash';
|
2018-07-23 17:13:34 -04:00
|
|
|
import {
|
|
|
|
AuthenticationPage,
|
|
|
|
buttons,
|
|
|
|
shadows,
|
|
|
|
colors,
|
|
|
|
colorsRaw,
|
2018-08-07 14:46:54 -06:00
|
|
|
lengths,
|
2020-03-24 09:46:47 -04:00
|
|
|
zIndex,
|
2018-07-23 17:13:34 -04:00
|
|
|
} from 'netlify-cms-ui-default';
|
|
|
|
|
|
|
|
const LoginButton = styled.button`
|
|
|
|
${buttons.button};
|
|
|
|
${shadows.dropDeep};
|
|
|
|
${buttons.default};
|
|
|
|
${buttons.gray};
|
|
|
|
|
|
|
|
padding: 0 30px;
|
|
|
|
display: block;
|
|
|
|
margin-top: 20px;
|
|
|
|
margin-left: auto;
|
2018-08-07 14:46:54 -06:00
|
|
|
`;
|
2018-07-23 17:13:34 -04:00
|
|
|
|
|
|
|
const AuthForm = styled.form`
|
|
|
|
width: 350px;
|
|
|
|
margin-top: -80px;
|
2018-08-07 14:46:54 -06:00
|
|
|
`;
|
2018-07-23 17:13:34 -04:00
|
|
|
|
|
|
|
const AuthInput = styled.input`
|
|
|
|
background-color: ${colorsRaw.white};
|
|
|
|
border-radius: ${lengths.borderRadius};
|
|
|
|
|
|
|
|
font-size: 14px;
|
|
|
|
padding: 10px 10px;
|
|
|
|
margin-bottom: 15px;
|
|
|
|
margin-top: 6px;
|
|
|
|
width: 100%;
|
|
|
|
position: relative;
|
2020-03-24 09:46:47 -04:00
|
|
|
z-index: ${zIndex.zIndex1};
|
2018-07-23 17:13:34 -04:00
|
|
|
|
|
|
|
&:focus {
|
|
|
|
outline: none;
|
|
|
|
box-shadow: inset 0 0 0 2px ${colors.active};
|
|
|
|
}
|
2018-08-07 14:46:54 -06:00
|
|
|
`;
|
2018-07-23 17:13:34 -04:00
|
|
|
|
|
|
|
const ErrorMessage = styled.p`
|
|
|
|
color: ${colors.errorText};
|
2018-08-07 14:46:54 -06:00
|
|
|
`;
|
2016-12-23 16:59:48 -02:00
|
|
|
|
2017-09-05 19:30:03 -07:00
|
|
|
let component = null;
|
|
|
|
|
|
|
|
if (window.netlifyIdentity) {
|
2018-08-07 14:46:54 -06:00
|
|
|
window.netlifyIdentity.on('login', user => {
|
2017-09-05 19:30:03 -07:00
|
|
|
component && component.handleIdentityLogin(user);
|
|
|
|
});
|
|
|
|
window.netlifyIdentity.on('logout', () => {
|
|
|
|
component && component.handleIdentityLogout();
|
|
|
|
});
|
2020-01-06 21:10:37 +02:00
|
|
|
window.netlifyIdentity.on('error', err => {
|
|
|
|
component && component.handleIdentityError(err);
|
|
|
|
});
|
2017-09-05 19:30:03 -07:00
|
|
|
}
|
|
|
|
|
2018-07-23 17:13:34 -04:00
|
|
|
export default class GitGatewayAuthenticationPage extends React.Component {
|
2020-01-15 00:15:14 +02:00
|
|
|
static authClient;
|
|
|
|
|
2017-09-05 14:07:56 -07:00
|
|
|
constructor(props) {
|
|
|
|
super(props);
|
2017-09-06 17:58:32 -07:00
|
|
|
component = this;
|
2017-09-05 14:07:56 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
componentDidMount() {
|
2017-09-05 19:30:03 -07:00
|
|
|
if (!this.loggedIn && window.netlifyIdentity && window.netlifyIdentity.currentUser()) {
|
|
|
|
this.props.onLogin(window.netlifyIdentity.currentUser());
|
2017-09-06 17:58:32 -07:00
|
|
|
window.netlifyIdentity.close();
|
2017-09-05 14:07:56 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-05 19:30:03 -07:00
|
|
|
componentWillUnmount() {
|
|
|
|
component = null;
|
|
|
|
}
|
|
|
|
|
2018-08-07 14:46:54 -06:00
|
|
|
handleIdentityLogin = user => {
|
2017-09-05 19:30:03 -07:00
|
|
|
this.props.onLogin(user);
|
|
|
|
window.netlifyIdentity.close();
|
2018-08-07 14:46:54 -06:00
|
|
|
};
|
2017-09-05 19:30:03 -07:00
|
|
|
|
|
|
|
handleIdentityLogout = () => {
|
|
|
|
window.netlifyIdentity.open();
|
2018-08-07 14:46:54 -06:00
|
|
|
};
|
2017-09-05 19:30:03 -07:00
|
|
|
|
2020-01-06 21:10:37 +02:00
|
|
|
handleIdentityError = err => {
|
|
|
|
if (err?.message?.match(/^Failed to load settings from.+\.netlify\/identity$/)) {
|
|
|
|
window.netlifyIdentity.close();
|
|
|
|
this.setState({
|
|
|
|
errors: { identity: this.props.t('auth.errors.identitySettings') },
|
|
|
|
});
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-09-06 17:58:32 -07:00
|
|
|
handleIdentity = () => {
|
2018-04-11 18:05:31 -06:00
|
|
|
const user = window.netlifyIdentity.currentUser();
|
|
|
|
if (user) {
|
2017-09-06 17:58:32 -07:00
|
|
|
this.props.onLogin(user);
|
|
|
|
} else {
|
|
|
|
window.netlifyIdentity.open();
|
|
|
|
}
|
2018-08-07 14:46:54 -06:00
|
|
|
};
|
2017-09-06 17:58:32 -07:00
|
|
|
|
2016-12-23 16:59:48 -02:00
|
|
|
static propTypes = {
|
2017-09-09 19:39:10 -06:00
|
|
|
onLogin: PropTypes.func.isRequired,
|
2017-08-31 13:46:02 -06:00
|
|
|
inProgress: PropTypes.bool.isRequired,
|
2018-08-27 10:23:21 -06:00
|
|
|
error: PropTypes.node,
|
2020-01-15 00:15:14 +02:00
|
|
|
config: PropTypes.object.isRequired,
|
2020-01-06 21:10:37 +02:00
|
|
|
t: PropTypes.func.isRequired,
|
2016-12-23 16:59:48 -02:00
|
|
|
};
|
|
|
|
|
2018-08-07 14:46:54 -06:00
|
|
|
state = { email: '', password: '', errors: {} };
|
2017-09-05 14:07:56 -07:00
|
|
|
|
WIP - Global UI (#785)
* update top bar and collections sidebar UI
* update collection entries UI
* improve global layout
* merge search page into collection page
* enable new entry button
* search fixup
* wip -initial editor update
* update editor scrolling and markdown toolbar position
* wip
* editor toolbar progress
* editor toolbar wip
* finished basic editor toolbar
* add standalone toggle component
* improve markdown toolbar spacing
* add user avatar placeholder
* finish markdown toggle styling
* refactor icon setup, add new icons
* add new icons to markdown editor toolbar
* remove extra app container
* add markdown active mark style
* relation and text widget styling
* widget design updates, basic list/object design update
* widget style updates, image widget improvements
* refactor widget directory, fix file removal
* widget focus styles
* finish editor widget focus styles
* migrate media library modal to react-modal
* wip - migrate editor component form to modal
* wip - move editor component form to modal
* wip - embed plugin forms in the editor
* inline shortcode forms working
* disable react hot loading, its breaking things
* improve shortcode form styles
* make shortcode form collapsible, improve styling
* add close functionality to shortcode blocks
* improve base media library styling
* fix shortcode label
* migrate unstyled workflow to new UI
* wip - reorganizing everything
* more work moving everything
* finish more moving and eliminating stuff
* restructure, remove react-toolbox
* wip - removing old stuff, more restructure
* finish restructure
* wip - css arch
* switch back to test repo
* update react-datetime to ^2.11.0
* remove leftover react-toolbox button
* more restructuring clean-up
* fix UI component directory case
* wip -css editor control style
* wip - consolidate widget styles
* wip - use a single control renderer
* fixed object values breaking
* wip - editor control active styles
* pass control wrapper to widgets
* ensure branch name is trimmed
* wip - improve widget authoring support
* import Map to Widget component
* refactor toolbar buttons
* wip - more widget active styles
* break out editor toggle component
* add local scroll sync back
* update editor toggle icons
* limit editor control pane content width
* fix editor control spacing
* migrate markdown toolbar stickiness to css
* fix markdown toolbar border radius
* temporarily use test backend
* stop markdown toolbar from going to bottom
* restore disabled markdown toolbar buttons for raw
* test markdown widget without focus styles
* more widget updates
* remove card visuals from editor
* disable dragging editor split off screen
* use editorControl component for shortcode fields
* make header site link configurable
* add configurable collection descriptions
* temporarily add example assets
* add basic list view
* remove outdated css mixins
* add and implement search icon
* activate quick add menu
* visualize usable space in editor view
* fix entry close, other improvements
* wip - editorial workflow updates
* some dropshadow and other CSS tweaks
* workflow ui updates
* add worfklow card buttons
* fix workflow card button handlers
* some dropshadow and other CSS tweaks
* make workflow board wider
* center workflow and collection views
* add basic responsiveness
* a bunch of fun UI fixes! a BUNCH! (#875)
* give `.nc-entryEditor-toolbar-mainSection` left and right child divs
* a bunch of fun UI fixes! a BUNCH!
* remove obscure --buttonShadow
* revert to test repo
* fix not found page styling
* allow workflow publishing from any column
* disallow publishing from all columns, with feedback
* fix new entry button
* fix markdown state persisting across entries
* enable simple workflow save and new from editor
* update slug in address bar when saving new entry
* wip - workflow updates, deletion working
* add status change functionality to editor
* wip - improving status change from editor
* editor toolbar back button improvements, loading improvements, cleanup
* progress on the media library UI cleanup
* remove font smothing css
* a quick fix for these buttons
* tweaks
* progress on media library modal— broken FYI
* fix media library functionality, finish migrating footer
* remove media library footer files
* remove leftover css import
* fix media library
* editor publishing functionality complete (unstyled)
* remove leftover loader var from media library
* wip - editor publishing styles
* add status dropdown styling
* editor toolbar style updates
* editor toolbar state improvements
* progress on the media library UI cleanup, style improvements
* finish editorial workflow editor styling
* finish media library styling
* fix config
* add what-input to optimize focus styling
* fix button
* fix navigation blocking for simple workflow
* improve simple workflow publishing
* add avatar dropdown to editor top bar
* style github and test-repo auth pages
* add git gateway auth page styles
* improve editor error styling
2017-12-07 12:37:10 -05:00
|
|
|
handleChange = (name, e) => {
|
|
|
|
this.setState({ ...this.state, [name]: e.target.value });
|
2016-12-23 16:59:48 -02:00
|
|
|
};
|
|
|
|
|
2018-08-07 14:46:54 -06:00
|
|
|
handleLogin = e => {
|
2016-12-23 16:59:48 -02:00
|
|
|
e.preventDefault();
|
2016-12-27 16:58:02 -02:00
|
|
|
|
2017-09-05 14:07:56 -07:00
|
|
|
const { email, password } = this.state;
|
2020-01-06 21:10:37 +02:00
|
|
|
const { t } = this.props;
|
2016-12-27 16:58:02 -02:00
|
|
|
const errors = {};
|
2017-09-05 14:07:56 -07:00
|
|
|
if (!email) {
|
2020-01-06 21:10:37 +02:00
|
|
|
errors.email = t('auth.errors.email');
|
2016-12-27 16:58:02 -02:00
|
|
|
}
|
|
|
|
if (!password) {
|
2020-01-06 21:10:37 +02:00
|
|
|
errors.password = t('auth.errors.password');
|
2016-12-27 16:58:02 -02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (Object.keys(errors).length > 0) {
|
|
|
|
this.setState({ errors });
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-02-26 10:11:15 -08:00
|
|
|
GitGatewayAuthenticationPage.authClient
|
2018-08-07 14:46:54 -06:00
|
|
|
.login(this.state.email, this.state.password, true)
|
|
|
|
.then(user => {
|
|
|
|
this.props.onLogin(user);
|
|
|
|
})
|
|
|
|
.catch(error => {
|
|
|
|
this.setState({
|
|
|
|
errors: { server: error.description || error.msg || error },
|
|
|
|
loggingIn: false,
|
|
|
|
});
|
|
|
|
});
|
2016-12-23 16:59:48 -02:00
|
|
|
};
|
|
|
|
|
|
|
|
render() {
|
2016-12-27 16:58:02 -02:00
|
|
|
const { errors } = this.state;
|
2020-01-06 21:10:37 +02:00
|
|
|
const { error, inProgress, config, t } = this.props;
|
2017-09-05 14:07:56 -07:00
|
|
|
|
2017-09-05 19:30:03 -07:00
|
|
|
if (window.netlifyIdentity) {
|
2020-01-06 21:10:37 +02:00
|
|
|
if (errors.identity) {
|
|
|
|
return (
|
|
|
|
<AuthenticationPage
|
2020-01-15 00:15:14 +02:00
|
|
|
logoUrl={config.logo_url}
|
2020-03-23 13:09:06 +02:00
|
|
|
siteUrl={config.site_url}
|
2020-01-06 21:10:37 +02:00
|
|
|
onLogin={this.handleIdentity}
|
|
|
|
renderPageContent={() => (
|
|
|
|
<a
|
|
|
|
href="https://docs.netlify.com/visitor-access/git-gateway/#setup-and-settings"
|
|
|
|
target="_blank"
|
|
|
|
rel="noopener noreferrer"
|
|
|
|
>
|
|
|
|
{errors.identity}
|
|
|
|
</a>
|
|
|
|
)}
|
2020-03-23 13:09:06 +02:00
|
|
|
t={t}
|
2020-01-06 21:10:37 +02:00
|
|
|
/>
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
return (
|
|
|
|
<AuthenticationPage
|
2020-01-15 00:15:14 +02:00
|
|
|
logoUrl={config.logo_url}
|
2020-03-23 13:09:06 +02:00
|
|
|
siteUrl={config.site_url}
|
2020-01-06 21:10:37 +02:00
|
|
|
onLogin={this.handleIdentity}
|
|
|
|
renderButtonContent={() => t('auth.loginWithNetlifyIdentity')}
|
2020-03-23 13:09:06 +02:00
|
|
|
t={t}
|
2020-01-06 21:10:37 +02:00
|
|
|
/>
|
|
|
|
);
|
|
|
|
}
|
2017-09-05 19:30:03 -07:00
|
|
|
}
|
|
|
|
|
2016-12-23 16:59:48 -02:00
|
|
|
return (
|
2018-08-07 14:46:54 -06:00
|
|
|
<AuthenticationPage
|
2020-01-15 00:15:14 +02:00
|
|
|
logoUrl={config.logo_url}
|
|
|
|
siteUrl={config.site_url}
|
2018-08-07 14:46:54 -06:00
|
|
|
renderPageContent={() => (
|
|
|
|
<AuthForm onSubmit={this.handleLogin}>
|
|
|
|
{!error ? null : <ErrorMessage>{error}</ErrorMessage>}
|
2020-02-11 19:39:17 +01:00
|
|
|
{!errors.server ? null : <ErrorMessage>{String(errors.server)}</ErrorMessage>}
|
2018-08-07 14:46:54 -06:00
|
|
|
<ErrorMessage>{errors.email || null}</ErrorMessage>
|
|
|
|
<AuthInput
|
|
|
|
type="text"
|
|
|
|
name="email"
|
|
|
|
placeholder="Email"
|
|
|
|
value={this.state.email}
|
|
|
|
onChange={partial(this.handleChange, 'email')}
|
|
|
|
/>
|
|
|
|
<ErrorMessage>{errors.password || null}</ErrorMessage>
|
|
|
|
<AuthInput
|
|
|
|
type="password"
|
|
|
|
name="password"
|
|
|
|
placeholder="Password"
|
|
|
|
value={this.state.password}
|
|
|
|
onChange={partial(this.handleChange, 'password')}
|
|
|
|
/>
|
|
|
|
<LoginButton disabled={inProgress}>
|
2020-01-06 21:10:37 +02:00
|
|
|
{inProgress ? t('auth.loggingIn') : t('auth.login')}
|
2018-08-07 14:46:54 -06:00
|
|
|
</LoginButton>
|
|
|
|
</AuthForm>
|
|
|
|
)}
|
2020-02-28 18:12:10 +08:00
|
|
|
t={t}
|
2018-08-07 14:46:54 -06:00
|
|
|
/>
|
2016-12-23 16:59:48 -02:00
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|