Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pricing change #1763

Merged
merged 8 commits into from
Jan 21, 2025
Merged

Pricing change #1763

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e527d6
redirect to choose program from pricing if you are on an active bootcamp
gustavomm19 Jan 3, 2025
549b23f
use myCohorts on profile page
gustavomm19 Jan 3, 2025
fef69db
Show available mentoring sessions for non-saas students
gustavomm19 Jan 6, 2025
af71725
fix conflict
gustavomm19 Jan 6, 2025
d4d327a
fix conflict
gustavomm19 Jan 7, 2025
4e8952b
remove duplicated academies when fetching the services
gustavomm19 Jan 7, 2025
e61eb66
display non saas mentorships with saas mentorships
gustavomm19 Jan 7, 2025
467b366
fix infinit icon
gustavomm19 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions public/locales/en/profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
},
"subscription": {
"what-you-will-get": "What you will get:",
"bootcamp-mentorships": "You have unlimited access to this mentoring service because you belong to the bootcamp",
"mentoring-available": "Mentoring sessions available",
"your-mentoring-available": "Your mentoring services available",
"workshop-available": "Workshop sessions available",
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
},
"subscription": {
"what-you-will-get": "Lo que obtendrás:",
"bootcamp-mentorships": "Tienes acceso ilimitado a este servicio de mentorías porque eres miembro del bootcamp",
"mentoring-available": "Sesiones de mentorías disponibles",
"your-mentoring-available": "Tus servicios de mentorías disponibles",
"workshop-available": "Sesiones de workshops disponibles",
Expand Down
1 change: 1 addition & 0 deletions src/common/hooks/useCohortHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ function useCohortHandler() {
getTasksWithoutCohort,
userCapabilities,
state,
setMyCohorts,
};
}

Expand Down
151 changes: 95 additions & 56 deletions src/js_modules/profile/Subscriptions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable camelcase */
/* eslint-disable no-unsafe-optional-chaining */
/* eslint-disable react/jsx-no-useless-fragment */
import {
Box,
Flex,
Expand Down Expand Up @@ -44,6 +44,7 @@ function Subscriptions({ cohorts }) {
service_sets: [],
});
const [services, setServices] = useState({
nonSaasMentorships: [],
mentorships: [],
workshops: [],
});
Expand All @@ -64,6 +65,20 @@ function Subscriptions({ cohorts }) {

const getConsumables = async () => {
try {
const nonSaasCohorts = cohorts.filter(({ available_as_saas }) => !available_as_saas);

const allServices = {
nonSaasMentorships: [],
mentorships: [],
workshops: [],
};

const cohortsServices = nonSaasCohorts.map(({ academy }) => bc.mentorship({ academy: academy.id }, true).getService());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't you reduce this nonSaasCohorts array to avoid duplicate academies and avoid repeating the request?

const responseServices = await Promise.all(cohortsServices);
const nonSaasServices = responseServices.flatMap(({ data }) => data);

if (Array.isArray(nonSaasServices)) allServices.nonSaasMentorships = nonSaasServices;

const res = await bc.payment().service().consumable();
if (res.status === 200) {
const { data } = res;
Expand All @@ -81,11 +96,11 @@ function Subscriptions({ cohorts }) {
});
const resMentorships = await Promise.all(promiseMentorship);
const resWorkshops = await Promise.all(promiseEvents);
setServices({
mentorships: resMentorships.flat(),
workshops: resWorkshops.flat(),
});
allServices.mentorships = resMentorships.flat();
allServices.workshops = resWorkshops.flat();
}

setServices(allServices);
setLoadingServices(false);
} catch (e) {
setLoadingServices(false);
Expand All @@ -109,7 +124,7 @@ function Subscriptions({ cohorts }) {

const allSubscriptions = subscriptionData?.subscriptions
&& subscriptionData?.plan_financings
&& [...subscriptionData?.subscriptions, ...subscriptionData?.plan_financings]
&& [...subscriptionData.subscriptions, ...subscriptionData.plan_financings]
.filter((subscription) => subscription?.plans?.[0]?.slug !== undefined);

const prioritizeStatus = ['fully_paid', 'active', 'payment_issue', 'expired', 'cancelled', 'error'];
Expand Down Expand Up @@ -147,6 +162,10 @@ function Subscriptions({ cohorts }) {
icon: 'teacher1',
title: t('subscription.your-mentoring-available'),
},
nonSaasMentorships: {
icon: 'teacher1',
title: t('subscription.your-mentoring-available'),
},
workshops: {
icon: 'community',
title: t('subscription.your-workshop-available'),
Expand All @@ -156,7 +175,7 @@ function Subscriptions({ cohorts }) {
const totalMentorshipsAvailable = consumables.mentorship_service_sets.reduce((acum, service) => acum + service.balance.unit, 0);
const totalWorkshopsAvailable = consumables.event_type_sets.reduce((acum, service) => acum + service.balance.unit, 0);

const existsNoAvailableAsSaas = cohorts.some((c) => c?.cohort?.available_as_saas === false);
const existsNoAvailableAsSaas = cohorts.some((c) => c.available_as_saas === false);

return (
<>
Expand All @@ -165,59 +184,79 @@ function Subscriptions({ cohorts }) {
<title>{t('my-subscriptions')}</title>
</Head>
)}
{!existsNoAvailableAsSaas && (
<Box display="flex" flexWrap="wrap" gap="24px">
{loadingServices ? (
<>
<SimpleSkeleton borderRadius="17px" height="108px" width={{ base: '100%', md: '265px' }} />
<SimpleSkeleton borderRadius="17px" height="108px" width={{ base: '100%', md: '265px' }} />
</>
) : (
<>
<Box borderRadius="17px" padding="12px 16px" background={featuredLight} width={{ base: '100%', md: '265px' }}>
<Text size="sm" mb="10px" fontWeight="700">
{t('subscription.mentoring-available')}
</Text>
<Box display="flex" justifyContent="space-between" alignItems="end">
<Box display="flex" gap="10px" alignItems="center">
<Icon icon="teacher1" color={hexColor.blueDefault} width="34px" height="34px" />
{totalMentorshipsAvailable >= 0 ? (
<Heading color={hexColor.fontColor3} sieze="l" fontWeight="700">
{totalMentorshipsAvailable}
</Heading>
) : (
<Icon icon="infinite" color={hexColor.fontColor3} width="34px" height="34px" />
)}
<Box display="flex" flexWrap="wrap" gap="24px">
{services.nonSaasMentorships.length > 0 && (
<Box borderRadius="17px" padding="12px 16px" background={featuredLight} width={{ base: '100%', md: '265px' }}>
<Text size="sm" mb="10px" fontWeight="700">
{t('subscription.bootcamp-mentorships')}
</Text>
<Box display="flex" justifyContent="space-between" alignItems="end">
<Box display="flex" gap="10px" alignItems="center">
<Icon icon="teacher1" color={hexColor.blueDefault} width="34px" height="34px" />
<Heading color={hexColor.fontColor3} sieze="l" fontWeight="700">
{services.nonSaasMentorships.length}
</Heading>
</Box>
<Button variant="link" onClick={() => setServicesModal('nonSaasMentorships')}>
{t('subscription.see-details')}
</Button>
</Box>
</Box>
)}
{!existsNoAvailableAsSaas && (
<>
{loadingServices ? (
<>
<SimpleSkeleton borderRadius="17px" height="108px" width={{ base: '100%', md: '265px' }} />
<SimpleSkeleton borderRadius="17px" height="108px" width={{ base: '100%', md: '265px' }} />
</>
) : (
<>
<Box borderRadius="17px" padding="12px 16px" background={featuredLight} width={{ base: '100%', md: '265px' }}>
<Text size="sm" mb="10px" fontWeight="700">
{t('subscription.bootcamp-mentorships')}
</Text>
<Box display="flex" justifyContent="space-between" alignItems="end">
<Box display="flex" gap="10px" alignItems="center">
<Icon icon="teacher1" color={hexColor.blueDefault} width="34px" height="34px" />
{totalMentorshipsAvailable >= 0 ? (
<Heading color={hexColor.fontColor3} sieze="l" fontWeight="700">
{totalMentorshipsAvailable}
</Heading>
) : (
<Icon icon="infinite" color={hexColor.fontColor3} width="34px" height="34px" />
)}
</Box>
<Button variant="link" onClick={() => setServicesModal('mentorships')}>
{t('subscription.see-details')}
</Button>
</Box>
<Button variant="link" onClick={() => setServicesModal('mentorships')}>
{t('subscription.see-details')}
</Button>
</Box>
</Box>
<Box borderRadius="17px" padding="12px 16px" background={featuredLight} width={{ base: '100%', md: '265px' }}>
<Text size="sm" mb="10px" fontWeight="700">
{t('subscription.workshop-available')}
</Text>
<Box display="flex" justifyContent="space-between" alignItems="end">
<Box display="flex" gap="10px" alignItems="center">
<Icon icon="community" color={hexColor.blueDefault} fill="none" width="34px" height="34px" />
{totalWorkshopsAvailable >= 0 ? (
<Heading color={hexColor.fontColor3} sieze="l" fontWeight="700">
{totalWorkshopsAvailable}
</Heading>
) : (
<Icon icon="infinite" color={hexColor.fontColor3} width="34px" height="34px" />
)}
<Box borderRadius="17px" padding="12px 16px" background={featuredLight} width={{ base: '100%', md: '265px' }}>
<Text size="sm" mb="10px" fontWeight="700">
{t('subscription.workshop-available')}
</Text>
<Box display="flex" justifyContent="space-between" alignItems="end">
<Box display="flex" gap="10px" alignItems="center">
<Icon icon="community" color={hexColor.blueDefault} fill="none" width="34px" height="34px" />
{totalWorkshopsAvailable >= 0 ? (
<Heading color={hexColor.fontColor3} sieze="l" fontWeight="700">
{totalWorkshopsAvailable}
</Heading>
) : (
<Icon icon="infinite" color={hexColor.fontColor3} width="34px" height="34px" />
)}
</Box>
<Button variant="link" onClick={() => setServicesModal('workshops')}>
{t('subscription.see-details')}
</Button>
</Box>
<Button variant="link" onClick={() => setServicesModal('workshops')}>
{t('subscription.see-details')}
</Button>
</Box>
</Box>
</>
)}
</Box>
)}
</>
)}
</>
)}
</Box>
<Modal isOpen={servicesModal !== null} onClose={closeMentorshipsModal}>
<ModalOverlay />
<ModalContent>
Expand Down
37 changes: 36 additions & 1 deletion src/pages/pricing.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable camelcase */
import { Box, Flex, Container, Button, Img, Link, Image } from '@chakra-ui/react';
import { useEffect, useState } from 'react';
import useTranslation from 'next-translate/useTranslation';
Expand All @@ -8,8 +9,9 @@ import Heading from '../common/components/Heading';
import Text from '../common/components/Text';
import Faq from '../common/components/Faq';
import useStyle from '../common/hooks/useStyle';
import bc from '../common/services/breathecode';
import useAuth from '../common/hooks/useAuth';
import useCohortHandler from '../common/hooks/useCohortHandler';
import bc from '../common/services/breathecode';
import PricingCard from '../common/components/PricingCard';
import useSignup from '../common/store/actions/signupAction';
import LoaderScreen from '../common/components/LoaderScreen';
Expand Down Expand Up @@ -40,6 +42,8 @@ const getYearlyPlans = (originalPlans, suggestedPlans, allFeaturedPlans) => {

function PricingView() {
const { t, lang } = useTranslation('pricing');
const { state, setMyCohorts } = useCohortHandler();
const { myCohorts } = state;
const { getSelfAppliedCoupon } = useSignup();
const [activeType, setActiveType] = useState('monthly');
const { isAuthenticated } = useAuth();
Expand Down Expand Up @@ -169,6 +173,36 @@ function PricingView() {
staleTime: Infinity,
});

const initializeCohorts = async () => {
try {
const { data } = await bc.admissions().me();
if (!data) throw new Error('No data');
const { cohorts } = data;

const parsedCohorts = cohorts.map(((elem) => {
const { cohort, ...cohort_user } = elem;
const { syllabus_version } = cohort;
return {
...cohort,
selectedProgramSlug: `/cohort/${cohort.slug}/${syllabus_version.slug}/v${syllabus_version.version}`,
cohort_role: elem.role,
cohort_user,
};
}));
setMyCohorts(parsedCohorts);
} catch (e) {
console.log(e);
}
};

useEffect(() => {
const hasActiveBootcamp = myCohorts.some((cohort) => !cohort.available_as_saas
&& cohort.ending_date && new Date(cohort.ending_date) > new Date()
&& cohort.cohort_user.educational_status === 'ACTIVE');

if (hasActiveBootcamp) router.push('/choose-program');
}, [myCohorts]);

useEffect(() => {
const mktQueryString = parseQuerys({
featured: true,
Expand Down Expand Up @@ -239,6 +273,7 @@ function PricingView() {
useEffect(() => {
if (isAuthenticated) {
fetchMySubscriptions();
initializeCohorts();
}
}, [isAuthenticated, allFeaturedPlansSelected]);

Expand Down
Loading