📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added sso to basic sign up
Blue Mousecfdf327755bd
diff --git a/public/locales/en.json b/public/locales/en.jsonindex fa72eb5c7..36906bf57 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -279,7 +279,8 @@"success": "Your email has been successfully verified!"},"socialisation": {- "success": "Socialisation successful"+ "success": "Socialisation successful",+ "orSingUpWith": "or sign up with"},"common": {"signinInstead": "Sign in instead",diff --git a/src/components/GoogleAuth.tsx b/src/components/GoogleAuth.tsxindex d3b75c7b6..6c70bd69e 100644--- a/src/components/GoogleAuth.tsx+++ b/src/components/GoogleAuth.tsx@@ -6,13 +6,14 @@ import GoogleGSVG from 'ui/icons/GoogleG'interface IGoogleAuth {setIsLoading: (isLoading: boolean) => void,- callback: any, // TODO add typesauthSSO: any, // TODO add types+ callback?: any, // TODO add typesdontRemember?: boolean,+ isMiniButton?: boolean,}const GoogleAuth: React.FC<IGoogleAuth> = ({- setIsLoading, authSSO, dontRemember, callback,+ setIsLoading, authSSO, dontRemember, callback, isMiniButton,}) => {const { t } = useTranslation()@@ -21,9 +22,22 @@ const GoogleAuth: React.FC<IGoogleAuth> = ({authSSO(dontRemember, t, callback)}+ console.log('isMiniButton', isMiniButton)++ if (isMiniButton) {+ <Button+ className='border-indigo-100 dark:text-gray-50 dark:border-gray-700 dark:bg-gray-700 dark:hover:bg-gray-600'+ onClick={googleLogin}+ secondary+ regular+ >+ <GoogleGSVG className='w-5 h-5 mr-2' />+ </Button>+ }+return (<Button- className='mr-2 border-indigo-100 dark:text-gray-50 dark:border-gray-700 dark:bg-gray-700 dark:hover:bg-gray-600'+ className='border-indigo-100 dark:text-gray-50 dark:border-gray-700 dark:bg-gray-700 dark:hover:bg-gray-600'onClick={googleLogin}secondaryregular@@ -38,6 +52,8 @@ const GoogleAuth: React.FC<IGoogleAuth> = ({GoogleAuth.defaultProps = {dontRemember: false,+ isMiniButton: false,+ callback: () => { },}export default GoogleAuthdiff --git a/src/pages/Auth/Signup/BasicSignup.tsx b/src/pages/Auth/Signup/BasicSignup.tsxindex aca9637b3..3ceed5fc3 100644--- a/src/pages/Auth/Signup/BasicSignup.tsx+++ b/src/pages/Auth/Signup/BasicSignup.tsx@@ -4,6 +4,7 @@ import { useTranslation, Trans } from 'react-i18next'import _size from 'lodash/size'import _keys from 'lodash/keys'import _isEmpty from 'lodash/isEmpty'+import _omit from 'lodash/omit'import Input from 'ui/Input'import Button from 'ui/Button'@@ -15,7 +16,7 @@ import {import { HAVE_I_BEEN_PWNED_URL } from 'redux/constants'import { trackCustom } from 'utils/analytics'import { useAppDispatch } from 'redux/store'-import _omit from 'lodash/omit'+import GoogleAuth from 'components/GoogleAuth'interface ISignUpForm {email: string,@@ -51,16 +52,22 @@ const BasicSignup = (): JSX.Element => {const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)const [isLoading, setIsLoading] = useState<boolean>(false)+ const signUpCallback = (result: boolean) => {+ if (result) {+ trackCustom('SIGNUP_BASIC')+ } else {+ setIsLoading(false)+ }+ }++ const authSSO = () => {+ dispatch(sagaActions.authSSO(form.dontRemember, t, signUpCallback))+ }+const onSubmit = (data: ISignUpForm) => {if (!isLoading) {setIsLoading(true)- dispatch(sagaActions.signupAsync(_omit(data, 'tos'), t, (result) => {- if (result) {- trackCustom('SIGNUP_BASIC')- } else {- setIsLoading(false)- }- }))+ dispatch(sagaActions.signupAsync(_omit(data, 'tos'), t, signUpCallback))}}@@ -177,6 +184,20 @@ const BasicSignup = (): JSX.Element => {<Button className='w-full flex justify-center' type='submit' loading={isLoading} primary giant>{t('auth.signup.create')}</Button>+ {/* SSO options */}+ <div>+ <hr className='mt-8 xs:mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />+ <p className='text-sm mt-2 text-center text-gray-500 dark:text-gray-100'>+ {t('auth.socialisation.orSingUpWith')}+ </p>+ </div>+ <div>+ <GoogleAuth+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ isMiniButton+ />+ </div></form>)}diff --git a/src/pages/Auth/Signup/Signup.container.tsx b/src/pages/Auth/Signup/Signup.container.tsxindex 6322b069b..3fbaba0ec 100644--- a/src/pages/Auth/Signup/Signup.container.tsx+++ b/src/pages/Auth/Signup/Signup.container.tsx@@ -16,7 +16,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({dispatch(sagaActions.signupAsync(data, t, callback))},authSSO: (dontRemember: boolean, t: (key: string) => string, callback: (res: any) => void) => {- console.log('dispatching authSSO')dispatch(sagaActions.authSSO(dontRemember, t, callback))},})