Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-19 22:12:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Intro validations fixed

Browse source
This commit is contained in:
NikolaBorislavovHristov 2019-12-05 10:35:14 +02:00
parent bd9012cad6
commit ee1c00748e
3 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js
View file

@ -6,6 +6,10 @@ const styles = require('./styles');
const ConsentCheckbox = React.forwardRef(({ className, checked, label, link, href, toggle, ...props }, ref) => {
const checkboxOnClick = React.useCallback((event) => {
if (typeof props.onClick === 'function') {
props.onClick(event);
}
if (!event.nativeEvent.togglePrevented && typeof toggle === 'function') {
toggle(event);
}

5
src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js
View file

@ -1,5 +1,4 @@
const React = require('react');
const PropTypes = require('prop-types');
const { TextInput } = require('stremio/common');
const CredentialsTextInput = React.forwardRef((props, ref) => {
@ -24,8 +23,4 @@ const CredentialsTextInput = React.forwardRef((props, ref) => {
CredentialsTextInput.displayName = 'CredentialsTextInput';
CredentialsTextInput.propTYpes = {
onKeyDown: PropTypes.func
};
module.exports = CredentialsTextInput;

50
src/routes/Intro/Intro.js
View file

@ -9,6 +9,7 @@ const ConsentCheckbox = require('./ConsentCheckbox');
const styles = require('./styles');
const SIGNUP_FORM = 'signup';
const LOGIN_FORM = 'login';
const Intro = ({ queryParams }) => {
const { core } = useServices();
@ -59,7 +60,7 @@ const Intro = ({ queryParams }) => {
}
},
{
form: queryParams.get('form'),
form: [LOGIN_FORM, SIGNUP_FORM].includes(queryParams.get('form')) ? queryParams.get('form') : SIGNUP_FORM,
email: '',
password: '',
confirmPassword: '',
@ -71,21 +72,24 @@ const Intro = ({ queryParams }) => {
);
React.useEffect(() => {
const onEvent = ({ event, args }) => {
if (event === 'CtxActionErr') {
dispatch({ type: 'error', error: args[1].args.message });
}
if (event === 'CtxChanged') {
const state = core.getState();
if (state.ctx.content.auth !== null) {
window.location.replace('/');
}
switch (event) {
case 'CtxActionErr':
const [_action, error] = args;
dispatch({ type: 'error', error: error.args.message });
case 'CtxChanged':
const state = core.getState();
if (state.ctx.content.auth !== null) {
window.location.replace('#/');
}
}
};
core.on('Event', onEvent);
if (routeFocused) {
core.on('Event', onEvent);
}
return () => {
core.off('Event', onEvent);
};
}, []);
}, [routeFocused]);
const loginWithFacebook = React.useCallback(() => {
FB.login((response) => {
if (response.status === 'connected') {
@ -120,7 +124,7 @@ const Intro = ({ queryParams }) => {
dispatch({ type: 'error', error: 'Invalid email' });
return;
}
if (state.password.length === 0) {
if (typeof state.password !== 'string' || state.password.length === 0) {
dispatch({ type: 'error', error: 'Invalid password' });
return;
}
@ -146,9 +150,21 @@ const Intro = ({ queryParams }) => {
userOp: 'Logout'
}
});
location = '#/';
window.location.replace('#/');
}, [state.termsAccepted]);
const signup = React.useCallback(() => {
if (typeof state.email !== 'string' || state.email.length === 0) {
dispatch({ type: 'error', error: 'Invalid email' });
return;
}
if (typeof state.password !== 'string' || state.password.length === 0) {
dispatch({ type: 'error', error: 'Invalid password' });
return;
}
if (state.password !== state.confirmPassword) {
dispatch({ type: 'error', error: 'Passwords do not match' });
return;
}
if (!state.termsAccepted) {
dispatch({ type: 'error', error: 'You must accept the Terms of Service' });
return;
@ -157,10 +173,6 @@ const Intro = ({ queryParams }) => {
dispatch({ type: 'error', error: 'You must accept the Privacy Policy' });
return;
}
if (state.password !== state.confirmPassword) {
dispatch({ type: 'error', error: 'Passwords do not match' });
return;
}
core.dispatch({
action: 'UserOp',
args: {
@ -223,7 +235,9 @@ const Intro = ({ queryParams }) => {
dispatch({ type: 'toggle-checkbox', name: 'marketingAccepted' });
}, []);
React.useEffect(() => {
dispatch({ type: 'set-form', form: queryParams.get('form') });
if ([LOGIN_FORM, SIGNUP_FORM].includes(queryParams.get('form'))) {
dispatch({ type: 'set-form', form: queryParams.get('form') });
}
}, [queryParams]);
React.useEffect(() => {
if (typeof state.error === 'string' && state.error.length > 0) {