Skip to content

Merge Develop onto Main #1464

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

Merged
merged 22 commits into from
May 29, 2025
Merged

Merge Develop onto Main #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e4c45e6
build(deps-dev): bump the dev-deps group with 4 updates
dependabot[bot] Apr 28, 2025
57da2dd
build(deps): bump the prod-deps group with 4 updates (#1462)
dependabot[bot] Apr 29, 2025
d2c3c77
Update sessionDetail translations in all language files to remove ses…
Abhishek-surya Apr 30, 2025
8b0991c
Feature/pwa detection (#1460)
niksanand1717 Apr 30, 2025
a0490d8
fix: storyblok version (#1475)
annarhughes May 5, 2025
f0c4cb1
build(deps-dev): bump the dev-deps group with 2 updates (#1472)
dependabot[bot] May 5, 2025
7862cd3
build(deps): bump newrelic in the prod-deps group (#1473)
dependabot[bot] May 5, 2025
59cb8e6
bugfix: realign breadcrumb in ui (#1469)
strawHat121 May 5, 2025
10f87ee
Update pt.json (#1478)
chaynteam May 6, 2025
d17b86c
Fix: Add getUserError to auth.form.firebase error translations (#1477)
kyleecodes May 6, 2025
b3e0921
Fix: Redirect /about-our-courses to /courses (#1480)
kyleecodes May 6, 2025
460bff5
added GA4 detection of events PWA_DISMISSED and PWA_INSTALLED (#1479)
shaishav007 May 7, 2025
caa31fe
Portug- messaging update (#1459)
chaynteam May 8, 2025
44bf38e
Api: fetch from GET /subscription_user endpoint (#1466)
kyleecodes May 8, 2025
13e86fc
refactor: replace deprecated images.domains with images.remotePattern…
moeedrafi May 19, 2025
db05f2b
Add Cypress integration test for new Conversations feature (#1488)
JingjieGao May 19, 2025
7cabae2
added Cypress test to ensure partner users exclusively see partner-sp…
shaishav007 May 19, 2025
517329b
build(deps): bump the prod-deps group with 5 updates (#1486)
dependabot[bot] May 19, 2025
cbb6a2a
feat: Add desktop PWA install banner (#1209) (#1484)
MartinGodzina May 19, 2025
7ee4a08
build(deps-dev): bump the dev-deps group across 1 directory with 10 u…
dependabot[bot] May 24, 2025
d4ce533
feat: therapy redesign (#1474)
annarhughes May 29, 2025
96c86f8
fix: therapy richtext link rendering (#1495)
annarhughes May 29, 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
3 changes: 2 additions & 1 deletion app/[locale]/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import StoryblokPage, { StoryblokPageProps } from '@/components/storyblok/Storyb
import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';

import { routing } from '@/i18n/routing';
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { getStoryblokStory } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
import { notFound } from 'next/navigation';
Expand Down Expand Up @@ -34,7 +35,7 @@ export async function generateStaticParams() {
const storyblokApi = getStoryblokApi();

let sbParams: ISbStoriesParams = {
version: 'published',
version: STORYBLOK_ENVIRONMENT,
};

const { data } = await storyblokApi.get('cdn/links/', sbParams);
Expand Down
3 changes: 2 additions & 1 deletion app/[locale]/conversations/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import StoryblokResourceConversationPage, {
StoryblokResourceConversationPageProps,
} from '@/components/storyblok/StoryblokResourceConversationPage';
import { routing } from '@/i18n/routing';
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { getStoryblokStory } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
Expand Down Expand Up @@ -40,7 +41,7 @@ export async function generateStaticParams() {
const storyblokApi = getStoryblokApi();

let sbParams: ISbStoriesParams = {
version: 'published',
version: STORYBLOK_ENVIRONMENT,
starts_with: 'conversations/',
filter_query: {
component: {
Expand Down
3 changes: 2 additions & 1 deletion app/[locale]/courses/[slug]/[sessionSlug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import StoryblokSessionPage, {
StoryblokSessionPageProps,
} from '@/components/storyblok/StoryblokSessionPage';
import { routing } from '@/i18n/routing';
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { getStoryblokStory } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
Expand Down Expand Up @@ -43,7 +44,7 @@ export async function generateStaticParams() {
const storyblokApi = getStoryblokApi();

let sbParams: ISbStoriesParams = {
version: 'published',
version: STORYBLOK_ENVIRONMENT,
starts_with: 'courses/',
};

Expand Down
3 changes: 2 additions & 1 deletion app/[locale]/courses/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import StoryblokCoursePage, {
StoryblokCoursePageProps,
} from '@/components/storyblok/StoryblokCoursePage';
import { routing } from '@/i18n/routing';
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { getStoryblokStory } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
Expand Down Expand Up @@ -40,7 +41,7 @@ export async function generateStaticParams() {
const storyblokApi = getStoryblokApi();

let sbParams: ISbStoriesParams = {
version: 'published',
version: STORYBLOK_ENVIRONMENT,
starts_with: 'courses/',
filter_query: {
component: {
Expand Down
3 changes: 2 additions & 1 deletion app/[locale]/courses/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { FeatureFlag } from '@/lib/featureFlag';
import { getStoryblokStories } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
Expand All @@ -21,7 +22,7 @@ export default async function Page({ params }: { params: Params }) {

const baseProps: Partial<ISbStoriesParams> = {
language: locale,
version: 'published',
version: STORYBLOK_ENVIRONMENT,
sort_by: 'position:description',
};

Expand Down
3 changes: 2 additions & 1 deletion app/[locale]/shorts/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import StoryblokResourceShortPage, {
StoryblokResourceShortPageProps,
} from '@/components/storyblok/StoryblokResourceShortPage';
import { routing } from '@/i18n/routing';
import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
import { COURSE_CATEGORIES } from '@/lib/constants/enums';
import { getStoryblokStories, getStoryblokStory } from '@/lib/storyblok';
import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
Expand Down Expand Up @@ -45,7 +46,7 @@ export async function generateStaticParams() {
const storyblokApi = getStoryblokApi();

let sbParams: ISbStoriesParams = {
version: 'published',
version: STORYBLOK_ENVIRONMENT,
starts_with: 'shorts/',
filter_query: {
component: {
Expand Down
Loading
Loading