Merge pull request #1612 from breatheco-de/main

Merge main into dev
breatheco-de · Sep 20, 2024 · cf17d89 · cf17d89
2 parents 97bfa86 + 3a28d29
commit cf17d89
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 136 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -236,6 +236,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
@@ -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 about coding workshops, events, courses, and other marketing materials. We'll never share your email,"
+    "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
@@ -235,6 +235,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
@@ -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 mi correo electrónico sobre talleres de programación, eventos, cursos y otros materiales de marketing. Nunca compartiremos tu correo electrónico,"
+    "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
@@ -2,26 +2,26 @@
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>https://4geeks.com/pages-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/howto-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/lessons-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/projects-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/exercises-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/technologies-sitemap.xml</loc>
-    <lastmod>2024-08-06T16:07:22.641Z</lastmod>
+    <lastmod>2024-09-18T15:38:55.380Z</lastmod>
   </sitemap>
 </sitemapindex>
diff --git a/src/common/components/Forms/Register.jsx b/src/common/components/Forms/Register.jsx
@@ -314,115 +314,9 @@ function Register({ setIsLoggedFromRegister }) {
                   </FormControl>
                 )}
               </Field>
-
-              {/* <FormControl>
-                <FormLabel margin="0px" color="gray.default" fontSize="sm" float="left">
-                  Date of Birth
-                </FormLabel>
-                <Input
-                  type="date"
-                  placeholder="29 / 10 / 1990"
-                  height="50px"
-                  borderColor="gray.default"
-                  borderRadius="3px"
-                />
-              </FormControl> */}
-
-              {/* <Field name="password">
-                {({ field, form }) => (
-                  <FormControl isInvalid={form.errors.password && form.touched.password}>
-                    <FormLabel
-                      margin="0px"
-                      color="gray.default"
-                      fontSize="sm"
-                      float="left"
-                      htmlFor="password"
-                    >
-                      Password
-                    </FormLabel>
-                    <Input
-                      {...field}
-                      type={showPSW ? 'text' : 'password'}
-                      placeholder="***********"
-                      height="50px"
-                      borderColor="gray.default"
-                      borderRadius="3px"
-                    />
-                    <InputRightElement width="2.5rem" top="33.5px" right="10px">
-                      <Button
-                        background="transparent"
-                        width="100%"
-                        height="100%"
-                        padding="0"
-                        onClick={toggleShowPSW}
-                        _hover={{
-                          background: 'transparent',
-                        }}
-                        _active={{
-                          background: 'transparent',
-                        }}
-                      >
-                        {showPSW ? (
-                          <Icon icon="eyeOpen" color="#A4A4A4" width="24px" height="24px" />
-                        ) : (
-                          <Icon icon="eyeClosed" color="#A4A4A4" width="24px" height="24px" />
-                        )}
-                      </Button>
-                    </InputRightElement>
-                    <FormErrorMessage>{form.errors.password}</FormErrorMessage>
-                  </FormControl>
-                )}
-              </Field>
-              <Field name="passwordConfirmation">
-                {({ field, form }) => (
-                  <FormControl
-                    isInvalid={form.errors.passwordConfirmation && form.touched.passwordConfirmation}
-                  >
-                    <FormLabel
-                      margin="0px"
-                      color="gray.default"
-                      fontSize="sm"
-                      htmlFor="repeatPassword"
-                    >
-                      Repeat Password
-                    </FormLabel>
-                    <Input
-                      {...field}
-                      type={showRepeatPSW ? 'text' : 'password'}
-                      placeholder="***********"
-                      height="50px"
-                      borderColor="gray.default"
-                      borderRadius="3px"
-                    />
-                    <InputRightElement width="2.5rem" top="33.5px" right="10px">
-                      <Button
-                        background="transparent"
-                        width="100%"
-                        height="100%"
-                        padding="0"
-                        onClick={toggleShowRepeatPSW}
-                        _hover={{
-                          background: 'transparent',
-                        }}
-                        _active={{
-                          background: 'transparent',
-                        }}
-                      >
-                        {showRepeatPSW ? (
-                          <Icon icon="eyeOpen" color="#A4A4A4" width="24px" height="24px" />
-                        ) : (
-                          <Icon icon="eyeClosed" color="#A4A4A4" width="24px" height="24px" />
-                        )}
-                      </Button>
-                    </InputRightElement>
-                    <FormErrorMessage>{form.errors.passwordConfirmation}</FormErrorMessage>
-                  </FormControl>
-                )}
-              </Field> */}
-
               <Checkbox size="md" spacing="8px" colorScheme="green" isChecked={isChecked} onChange={() => setIsChecked(!isChecked)}>
                 <Text size="10px">
-                  {t('signup:validators.termns-and-conditions-required')}
+                  {t('signup:validators.receive-information')}
                   {' '}
                   <NextChakraLink variant="default" fontSize="10px" href="/privacy-policy" target="_blank">
                     {t('common:privacy-policy')}

diff --git 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({
               </Box>
               <Checkbox size="md" spacing="8px" colorScheme="green" isChecked={isChecked} onChange={() => setIsChecked(!isChecked)}>
                 <Text size="10px" textAlign="left">
-                  {t('validators.termns-and-conditions-required')}
-                  {' '}
-                  <NextChakraLink variant="default" fontSize="10px" href={t('common:privacy-policy-link')} target="_blank">
-                    {t('common:privacy-policy')}
-                  </NextChakraLink>
-                  .
+                  {t('validators.receive-information')}
                 </Text>
               </Checkbox>
               {!invertHandlerPosition && showLoginLink && (
@@ -328,17 +324,33 @@ function SignupForm({
                 </Flex>
               )}
             </Box>
-            <Button
-              width="100%"
-              type="submit"
-              variant="default"
-              isDisabled={isDisabled}
-              isLoading={isSubmitting}
-              alignSelf="flex-end"
-              {...buttonStyles}
-            >
-              {t('create-account')}
-            </Button>
+            <Box>
+              <Button
+                width="100%"
+                type="submit"
+                variant="default"
+                isDisabled={isDisabled}
+                isLoading={isSubmitting}
+                alignSelf="flex-end"
+                {...buttonStyles}
+              >
+                {t('create-account')}
+              </Button>
+              <Text size="10px" textAlign="left">
+                {t('agree-terms-and-conditions')}
+                {' '}
+                <NextChakraLink variant="default" fontSize="10px" href={t('common:terms-and-conditions-link')} target="_blank">
+                  {t('common:terms-and-conditions')}
+                </NextChakraLink>
+                {' '}
+                {t('common:word-connector.and')}
+                {' '}
+                <NextChakraLink variant="default" fontSize="10px" href={t('common:privacy-policy-link')} target="_blank">
+                  {t('common:privacy-policy')}
+                </NextChakraLink>
+                .
+              </Text>
+            </Box>
             {invertHandlerPosition && showLoginLink && (
               <Flex fontSize="13px" backgroundColor={featuredColor} justifyContent="center" alignItems="center" borderRadius="4px" gridGap="6px">
                 {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/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,

diff --git a/src/pages/accept-invite.jsx b/src/pages/accept-invite.jsx
@@ -321,7 +321,7 @@ function AcceptInvite() {
                 onChange={() => setIsChecked(!isChecked)}
               />
               <Text fontSize="10px">
-                {t('signup:validators.termns-and-conditions-required')}
+                {t('signup:validators.receive-information')}
                 {' '}
                 <NextChakraLink
                   variant="default"