From 03273a1e65513258b4d56a7bf96f82f9b570b727 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:25:49 -0400 Subject: [PATCH 1/6] Update AuthContext.jsx --- src/common/context/AuthContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/context/AuthContext.jsx b/src/common/context/AuthContext.jsx index 45a5f2b04..caebf9264 100644 --- a/src/common/context/AuthContext.jsx +++ b/src/common/context/AuthContext.jsx @@ -196,7 +196,7 @@ function AuthProvider({ children, pageProps }) { method: 'native', user_id: data.id, email: data.email, - // is_saas: data.roles.filter(r => r.role.toLowerCase() == "student" && r.) + is_academy_legacy: data.roles.some(r => r.academy.id === 6), first_name: data.first_name, last_name: data.last_name, avatar_url: data.profile?.avatar_url || data.github?.avatar_url, From 791ab1a9e1354332ea20adc2e0b3ee0278b6746c Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:35:17 -0400 Subject: [PATCH 2/6] Update AuthContext.jsx --- src/common/context/AuthContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/context/AuthContext.jsx b/src/common/context/AuthContext.jsx index caebf9264..2dc5262ef 100644 --- a/src/common/context/AuthContext.jsx +++ b/src/common/context/AuthContext.jsx @@ -196,7 +196,7 @@ function AuthProvider({ children, pageProps }) { method: 'native', user_id: data.id, email: data.email, - is_academy_legacy: data.roles.some(r => r.academy.id === 6), + is_academy_legacy: data.roles.some((r) => r.academy.id === 6), first_name: data.first_name, last_name: data.last_name, avatar_url: data.profile?.avatar_url || data.github?.avatar_url, From bc3becf691e2d3d9951d42257ba275366abf3a96 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:51:23 -0400 Subject: [PATCH 3/6] Update signup.json --- public/locales/en/signup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/en/signup.json b/public/locales/en/signup.json index 0bcbaeecd..bee82a300 100644 --- a/public/locales/en/signup.json +++ b/public/locales/en/signup.json @@ -146,7 +146,7 @@ "email-required": "Email is required", "confirm-email-required": "Confirm Email is required", "confirm-email-not-match": "Emails don't match", - "termns-and-conditions-required": "I agree to receive information in my email about coding workshops, events, courses, and other marketing materials. We'll never share your email," + "termns-and-conditions-required": "I agree to receive information in my Email, WhatsApp, and/or other channels about coding workshops, events, courses, and other marketing materials. We'll never share your contact information and you can easily opt out at any moment," }, "no-date-available": "We currently have no dates available for the location entered", "alert-message": { From 29104b9e4e6e1d59757d86211f349666e9738b5a Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:52:59 -0400 Subject: [PATCH 4/6] Update signup.json --- public/locales/es/signup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/es/signup.json b/public/locales/es/signup.json index 7732374cb..617b4daa0 100644 --- a/public/locales/es/signup.json +++ b/public/locales/es/signup.json @@ -146,7 +146,7 @@ "email-required": "Correo electronico es requerido", "confirm-email-required": "Confirmar Correo electrónico es requerido", "confirm-email-not-match": "Los correos electrónicos no coinciden", - "termns-and-conditions-required": "Acepto recibir información a mi correo electrónico sobre talleres de programación, eventos, cursos y otros materiales de marketing. Nunca compartiremos tu correo electrónico," + "termns-and-conditions-required": "Acepto recibir información a través de mi correo electrónico, WhatsApp y/o otros canales sobre talleres de programación, eventos, cursos y otros materiales promocionales. Nunca compartiremos tu información de contacto y podrás darte de baja fácilmente en cualquier momento," }, "no-date-available": "Actualmente no tenemos fechas disponibles para la ubicación ingresada", "alert-message": { From 27d4e9f82027652c1652215d595ec2da7b761d35 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:35:08 -0400 Subject: [PATCH 5/6] Update signup.json --- public/locales/en/signup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/en/signup.json b/public/locales/en/signup.json index bee82a300..75480e6ab 100644 --- a/public/locales/en/signup.json +++ b/public/locales/en/signup.json @@ -146,7 +146,7 @@ "email-required": "Email is required", "confirm-email-required": "Confirm Email is required", "confirm-email-not-match": "Emails don't match", - "termns-and-conditions-required": "I agree to receive information in my Email, WhatsApp, and/or other channels about coding workshops, events, courses, and other marketing materials. We'll never share your contact information and you can easily opt out at any moment," + "termns-and-conditions-required": "I agree to receive information in my email, WhatsApp, and/or other channels about coding workshops, events, courses, and other marketing materials. We'll never share your contact information and you can easily opt out at any moment," }, "no-date-available": "We currently have no dates available for the location entered", "alert-message": { From b6a6ad9b962a16cf248e028243072f4970cc8132 Mon Sep 17 00:00:00 2001 From: Tomas Gonzalez <56565994+tommygonzaleza@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:48:27 +0000 Subject: [PATCH 6/6] Add terms and conditions on signup button --- public/locales/en/common.json | 2 + public/locales/en/signup.json | 3 +- public/locales/es/common.json | 2 + public/locales/es/signup.json | 3 +- public/sitemap.xml | 12 +-- src/common/components/Forms/Register.jsx | 108 +---------------------- src/common/components/Forms/Signup.jsx | 50 +++++++---- src/pages/accept-invite.jsx | 2 +- 8 files changed, 47 insertions(+), 135 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 350c61dd5..3713495da 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -234,6 +234,8 @@ "logout-and-switch-user": "Logout and switch user", "free": "Free", "login": "Login", + "terms-and-conditions": "Terms and conditions", + "terms-and-conditions-link": "/terms-and-conditions", "privacy-policy": "Privacy policy", "privacy-policy-link": "/privacy-policy", "bootcamp": { diff --git a/public/locales/en/signup.json b/public/locales/en/signup.json index 75480e6ab..b5b074e0b 100644 --- a/public/locales/en/signup.json +++ b/public/locales/en/signup.json @@ -146,9 +146,10 @@ "email-required": "Email is required", "confirm-email-required": "Confirm Email is required", "confirm-email-not-match": "Emails don't match", - "termns-and-conditions-required": "I agree to receive information in my email, WhatsApp, and/or other channels about coding workshops, events, courses, and other marketing materials. We'll never share your contact information and you can easily opt out at any moment," + "receive-information": "I agree to receive information in my email, WhatsApp, and/or other channels about coding workshops, events, courses, and other marketing materials. We'll never share your contact information and you can easily opt out at any moment. " }, "no-date-available": "We currently have no dates available for the location entered", + "agree-terms-and-conditions": "By signing up, you agree to the", "alert-message": { "title": "Already a member?", "description": "It seems that you already have an account in 4geeks.com", diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 16947e566..5792d3565 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -233,6 +233,8 @@ "logout-and-switch-user": "Cerrar sesión e iniciar como otro usuario", "free": "Gratis", "login": "Iniciar sesión", + "terms-and-conditions": "Términos y condiciones", + "terms-and-conditions-link": "/es/terminos-y-condiciones", "privacy-policy": "Política de privacidad", "privacy-policy-link": "/es/politicas-de-privacidad", "bootcamp": { diff --git a/public/locales/es/signup.json b/public/locales/es/signup.json index 617b4daa0..d60bee094 100644 --- a/public/locales/es/signup.json +++ b/public/locales/es/signup.json @@ -146,9 +146,10 @@ "email-required": "Correo electronico es requerido", "confirm-email-required": "Confirmar Correo electrónico es requerido", "confirm-email-not-match": "Los correos electrónicos no coinciden", - "termns-and-conditions-required": "Acepto recibir información a través de mi correo electrónico, WhatsApp y/o otros canales sobre talleres de programación, eventos, cursos y otros materiales promocionales. Nunca compartiremos tu información de contacto y podrás darte de baja fácilmente en cualquier momento," + "receive-information": "Acepto recibir información a través de mi correo electrónico, WhatsApp y/o otros canales sobre talleres de programación, eventos, cursos y otros materiales promocionales. Nunca compartiremos tu información de contacto y podrás darte de baja fácilmente en cualquier momento." }, "no-date-available": "Actualmente no tenemos fechas disponibles para la ubicación ingresada", + "agree-terms-and-conditions": "Al registrarte estás aceptando nuestros", "alert-message": { "title": "¿Ya eres usuario?", "description": "Parece que ya tienes una cuenta", diff --git a/public/sitemap.xml b/public/sitemap.xml index 52b3d365d..3390c017d 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -2,26 +2,26 @@ https://4geeks.com/pages-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z https://4geeks.com/howto-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z https://4geeks.com/lessons-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z https://4geeks.com/projects-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z https://4geeks.com/exercises-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z https://4geeks.com/technologies-sitemap.xml - 2024-08-06T16:07:22.641Z + 2024-09-18T15:38:55.380Z \ No newline at end of file diff --git a/src/common/components/Forms/Register.jsx b/src/common/components/Forms/Register.jsx index 0b57a78a1..58a1c5d55 100644 --- a/src/common/components/Forms/Register.jsx +++ b/src/common/components/Forms/Register.jsx @@ -314,115 +314,9 @@ function Register({ setIsLoggedFromRegister }) { )} - - {/* - - Date of Birth - - - */} - - {/* - {({ field, form }) => ( - - - Password - - - - - - {form.errors.password} - - )} - - - {({ field, form }) => ( - - - Repeat Password - - - - - - {form.errors.passwordConfirmation} - - )} - */} - setIsChecked(!isChecked)}> - {t('signup:validators.termns-and-conditions-required')} + {t('signup:validators.receive-information')} {' '} {t('common:privacy-policy')} diff --git a/src/common/components/Forms/Signup.jsx b/src/common/components/Forms/Signup.jsx index a7b2c0424..ce51ba63e 100644 --- a/src/common/components/Forms/Signup.jsx +++ b/src/common/components/Forms/Signup.jsx @@ -1,6 +1,7 @@ import PropTypes from 'prop-types'; import * as Yup from 'yup'; -import { Avatar, Box, Button, Checkbox, useToast, +import { + Avatar, Box, Button, Checkbox, useToast, Spinner, InputGroup, InputRightElement, @@ -312,12 +313,7 @@ function SignupForm({ setIsChecked(!isChecked)}> - {t('validators.termns-and-conditions-required')} - {' '} - - {t('common:privacy-policy')} - - . + {t('validators.receive-information')} {!invertHandlerPosition && showLoginLink && ( @@ -328,17 +324,33 @@ function SignupForm({ )} - + + + + {t('agree-terms-and-conditions')} + {' '} + + {t('common:terms-and-conditions')} + + {' '} + {t('common:word-connector.and')} + {' '} + + {t('common:privacy-policy')} + + . + + {invertHandlerPosition && showLoginLink && ( {t('already-have-account')} @@ -449,7 +461,7 @@ SignupForm.propTypes = { formContainerStyle: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.any])), }; SignupForm.defaultProps = { - onHandleSubmit: () => {}, + onHandleSubmit: () => { }, planSlug: null, courseChoosed: '', showVerifyEmail: true, diff --git a/src/pages/accept-invite.jsx b/src/pages/accept-invite.jsx index 24a2d8495..58e4cfd63 100644 --- a/src/pages/accept-invite.jsx +++ b/src/pages/accept-invite.jsx @@ -321,7 +321,7 @@ function AcceptInvite() { onChange={() => setIsChecked(!isChecked)} /> - {t('signup:validators.termns-and-conditions-required')} + {t('signup:validators.receive-information')} {' '}