mv components top lv

app/[locale]/[slug]/page.tsx

@@ -1,5 +1,5 @@
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
-import StoryblokPage, { StoryblokPageProps } from '@/lib/components/storyblok/StoryblokPage';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
+import StoryblokPage, { StoryblokPageProps } from '@/components/storyblok/StoryblokPage';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 
 import { routing } from '@/i18n/routing';

app/[locale]/account/about-you/page.tsx

@@ -1,9 +1,9 @@
 'use client';
 
+import AboutYouDemographicForm from '@/components/forms/AboutYouDemographicForm';
+import AboutYouSetAForm from '@/components/forms/AboutYouSetAForm';
+import PartnerHeader from '@/components/layout/PartnerHeader';
 import { Link as i18nLink } from '@/i18n/routing';
-import AboutYouDemographicForm from '@/lib/components/forms/AboutYouDemographicForm';
-import AboutYouSetAForm from '@/lib/components/forms/AboutYouSetAForm';
-import PartnerHeader from '@/lib/components/layout/PartnerHeader';
 import { SURVEY_FORMS } from '@/lib/constants/enums';
 import { ABOUT_YOU_VIEWED, SIGNUP_SURVEY_SKIPPED } from '@/lib/constants/events';
 import logEvent from '@/lib/utils/logEvent';

app/[locale]/account/apply-a-code/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
+import ApplyCodeForm from '@/components/forms/ApplyCodeForm';
+import Header from '@/components/layout/Header';
 import { Link as i18nLink } from '@/i18n/routing';
-import ApplyCodeForm from '@/lib/components/forms/ApplyCodeForm';
-import Header from '@/lib/components/layout/Header';
 import { ASSIGN_NEW_PARTNER_VIEWED } from '@/lib/constants/events';
 import { PartnerContent, getAllPartnersContent } from '@/lib/constants/partners';
 import { getImageSizes } from '@/lib/utils/imageSizes';

app/[locale]/account/disable-service-emails/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import Header from '@/components/layout/Header';
 import { useUpdateUserMutation } from '@/lib/api';
-import Header from '@/lib/components/layout/Header';
 import { ErrorDisplay, FEEDBACK_FORM_URL } from '@/lib/constants/common';
 import { USER_DISABLED_SERVICE_EMAILS } from '@/lib/constants/events';
 import { useTypedSelector } from '@/lib/hooks/store';

app/[locale]/account/settings/page.tsx

@@ -1,10 +1,10 @@
 'use client';
 
-import AccountActionsCard from '@/lib/components/cards/AccountActionsCard';
-import EmailRemindersSettingsCard from '@/lib/components/cards/EmailRemindersSettingsCard';
-import EmailSettingsCard from '@/lib/components/cards/EmailSettingsCard';
-import ProfileSettingsCard from '@/lib/components/cards/ProfileSettingsCard';
-import Header from '@/lib/components/layout/Header';
+import AccountActionsCard from '@/components/cards/AccountActionsCard';
+import EmailRemindersSettingsCard from '@/components/cards/EmailRemindersSettingsCard';
+import EmailSettingsCard from '@/components/cards/EmailSettingsCard';
+import ProfileSettingsCard from '@/components/cards/ProfileSettingsCard';
+import Header from '@/components/layout/Header';
 import phoneIllustration from '@/public/phone.svg';
 import { columnStyle, rowStyle } from '@/styles/common';
 import { Box, Container } from '@mui/material';

app/[locale]/action-handler/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import LoadingContainer from '@/components/common/LoadingContainer';
 import { useRouter } from '@/i18n/routing';
-import LoadingContainer from '@/lib/components/common/LoadingContainer';
 import { LANGUAGES } from '@/lib/constants/enums';
 import { useSearchParams } from 'next/navigation';
 

app/[locale]/admin/dashboard/page.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import CreatePartnerAdminForm from '@/lib/components/forms/CreatePartnerAdminForm';
-import UpdatePartnerAdminForm from '@/lib/components/forms/UpdatePartnerAdminForm';
-import UpdateTherapyAdminForm from '@/lib/components/forms/UpdateTherapyAdminForm';
-import AdminHeader from '@/lib/components/layout/PartnerAdminHeader';
+import CreatePartnerAdminForm from '@/components/forms/CreatePartnerAdminForm';
+import UpdatePartnerAdminForm from '@/components/forms/UpdatePartnerAdminForm';
+import UpdateTherapyAdminForm from '@/components/forms/UpdateTherapyAdminForm';
+import AdminHeader from '@/components/layout/PartnerAdminHeader';
 import { CREATE_PARTNER_ACCESS_VIEWED } from '@/lib/constants/events';
 import logEvent from '@/lib/utils/logEvent';
 import { rowStyle } from '@/styles/common';

app/[locale]/auth/login/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
+import LoginForm from '@/components/forms/LoginForm';
+import PartnerHeader from '@/components/layout/PartnerHeader';
 import { Link as i18nLink, useRouter } from '@/i18n/routing';
-import LoginForm from '@/lib/components/forms/LoginForm';
-import PartnerHeader from '@/lib/components/layout/PartnerHeader';
 import {
   GET_STARTED_WITH_BLOOM_CLICKED,
   RESET_PASSWORD_HERE_CLICKED,

app/[locale]/auth/register/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
+import RegisterForm, { PartnerRegisterForm } from '@/components/forms/RegisterForm';
+import PartnerHeader from '@/components/layout/PartnerHeader';
 import { Link as i18nLink, useRouter } from '@/i18n/routing';
-import RegisterForm, { PartnerRegisterForm } from '@/lib/components/forms/RegisterForm';
-import PartnerHeader from '@/lib/components/layout/PartnerHeader';
 import { generatePartnershipPromoLogoClick } from '@/lib/constants/events';
 import { PartnerContent, getAllPartnersContent, getPartnerContent } from '@/lib/constants/partners';
 import { useAppDispatch, useTypedSelector } from '@/lib/hooks/store';

app/[locale]/auth/reset-password/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import { EmailForm, PasswordForm } from '@/lib/components/forms/ResetPasswordForm';
-import PartnerHeader from '@/lib/components/layout/PartnerHeader';
+import { EmailForm, PasswordForm } from '@/components/forms/ResetPasswordForm';
+import PartnerHeader from '@/components/layout/PartnerHeader';
 import illustrationBloomHeadYellow from '@/public/illustration_bloom_head_yellow.svg';
 import welcomeToBloom from '@/public/welcome_to_bloom.svg';
 import { rowStyle } from '@/styles/common';

app/[locale]/conversations/[slug]/page.tsx

@@ -1,8 +1,8 @@
-import { routing } from '@/i18n/routing';
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokResourceConversationPage, {
   StoryblokResourceConversationPageProps,
-} from '@/lib/components/storyblok/StoryblokResourceConversationPage';
+} from '@/components/storyblok/StoryblokResourceConversationPage';
+import { routing } from '@/i18n/routing';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 

app/[locale]/courses/[slug]/[sessionSlug]/page.tsx

@@ -1,8 +1,8 @@
-import { routing } from '@/i18n/routing';
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokSessionPage, {
   StoryblokSessionPageProps,
-} from '@/lib/components/storyblok/StoryblokSessionPage';
+} from '@/components/storyblok/StoryblokSessionPage';
+import { routing } from '@/i18n/routing';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 

app/[locale]/courses/[slug]/page.tsx

@@ -1,8 +1,8 @@
-import { routing } from '@/i18n/routing';
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokCoursePage, {
   StoryblokCoursePageProps,
-} from '@/lib/components/storyblok/StoryblokCoursePage';
+} from '@/components/storyblok/StoryblokCoursePage';
+import { routing } from '@/i18n/routing';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 

app/[locale]/courses/page.tsx

@@ -2,7 +2,7 @@ import { LANGUAGES } from '@/lib/constants/enums';
 import { FeatureFlag } from '@/lib/featureFlag';
 import { getStoryblokStories } from '@/lib/storyblok';
 import { ISbStoriesParams, ISbStoryData } from '@storyblok/react/rsc';
-import CoursesPage from '../../../lib/components/pages/CoursesPage';
+import CoursesPage from '../../../components/pages/CoursesPage';
 
 export const revalidate = 14400; // invalidate every 4 hours
 

app/[locale]/layout.tsx

@@ -1,5 +1,5 @@
+import BaseLayout from '@/components/layout/BaseLayout';
 import { routing } from '@/i18n/routing';
-import BaseLayout from '@/lib/components/layout/BaseLayout';
 import type { Viewport } from 'next';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { notFound } from 'next/navigation';

app/[locale]/meet-the-team/page.tsx

@@ -1,7 +1,7 @@
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokMeetTheTeamPage, {
   StoryblokMeetTheTeamPageProps,
-} from '@/lib/components/storyblok/StoryblokMeetTheTeamPage';
+} from '@/components/storyblok/StoryblokMeetTheTeamPage';
 import { getStoryblokStory } from '@/lib/storyblok';
 
 export const revalidate = 14400; // invalidate every 4 hours

app/[locale]/messaging/page.tsx

@@ -1,7 +1,7 @@
 import { getStoryblokStory } from '@/lib/storyblok';
 
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
-import MessagingPage from '../../../lib/components/pages/MessagingPage';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
+import MessagingPage from '../../../components/pages/MessagingPage';
 
 export const revalidate = 14400; // invalidate every 4 hours
 

app/[locale]/not-found.tsx

@@ -1,4 +1,4 @@
 // Note that `app/[locale]/[...rest]/page.tsx`
 // is necessary for this page to render.
 
-export { default } from '@/lib/components/pages/NotFound';
+export { default } from '@/components/pages/NotFound';

app/[locale]/page.tsx

@@ -1,5 +1,5 @@
 import { getStoryblokStory } from '@/lib/storyblok';
-import HomePage from '../../lib/components/pages/HomePage';
+import HomePage from '../../components/pages/HomePage';
 
 export const revalidate = 14400; // invalidate every 4 hours
 

app/[locale]/partner-admin/create-access-code/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import CreateAccessCodeForm from '@/lib/components/forms/CreateAccessCodeForm';
-import AdminHeader from '@/lib/components/layout/PartnerAdminHeader';
+import CreateAccessCodeForm from '@/components/forms/CreateAccessCodeForm';
+import AdminHeader from '@/components/layout/PartnerAdminHeader';
 import { CREATE_PARTNER_ACCESS_VIEWED } from '@/lib/constants/events';
 import { useTypedSelector } from '@/lib/hooks/store';
 import logEvent from '@/lib/utils/logEvent';

app/[locale]/shorts/[slug]/page.tsx

@@ -1,8 +1,8 @@
-import { routing } from '@/i18n/routing';
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokResourceShortPage, {
   StoryblokResourceShortPageProps,
-} from '@/lib/components/storyblok/StoryblokResourceShortPage';
+} from '@/components/storyblok/StoryblokResourceShortPage';
+import { routing } from '@/i18n/routing';
 import { getStoryblokStories, getStoryblokStory } from '@/lib/storyblok';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 

app/[locale]/subscription/whatsapp/page.tsx

@@ -1,6 +1,6 @@
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import { getStoryblokStory } from '@/lib/storyblok';
-import NotesPage from '../../../../lib/components/pages/NotesPage';
+import NotesPage from '../../../../components/pages/NotesPage';
 
 export const revalidate = 14400; // invalidate every 4 hours
 

app/[locale]/therapy/book-session/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
-import Faqs from '@/lib/components/common/Faqs';
-import ImageTextGrid, { ImageTextItem } from '@/lib/components/common/ImageTextGrid';
-import Header from '@/lib/components/layout/Header';
+import Faqs from '@/components/common/Faqs';
+import ImageTextGrid, { ImageTextItem } from '@/components/common/ImageTextGrid';
+import Header from '@/components/layout/Header';
 import { THERAPY_BOOKING_OPENED, THERAPY_BOOKING_VIEWED } from '@/lib/constants/events';
 import { therapyFaqs } from '@/lib/constants/faqs';
 import { useTypedSelector } from '@/lib/hooks/store';

app/[locale]/therapy/confirmed-session/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 
+import Faqs from '@/components/common/Faqs';
+import Header from '@/components/layout/Header';
 import { Link as i18nLink } from '@/i18n/routing';
-import Faqs from '@/lib/components/common/Faqs';
-import Header from '@/lib/components/layout/Header';
 import { THERAPY_CONFIRMATION_VIEWED } from '@/lib/constants/events';
 import { therapyFaqs } from '@/lib/constants/faqs';
 import { useTypedSelector } from '@/lib/hooks/store';

app/[locale]/welcome/[partnerName]/page.tsx

@@ -1,8 +1,8 @@
-import { routing } from '@/i18n/routing';
-import NoDataAvailable from '@/lib/components/common/NoDataAvailable';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
 import StoryblokWelcomePage, {
   StoryblokWelcomePageProps,
-} from '@/lib/components/storyblok/StoryblokWelcomePage';
+} from '@/components/storyblok/StoryblokWelcomePage';
+import { routing } from '@/i18n/routing';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { ISbResult, ISbStoriesParams, getStoryblokApi } from '@storyblok/react/rsc';
 

app/not-found.tsx

@@ -1,6 +1,6 @@
+import BaseLayout from '@/components/layout/BaseLayout';
+import NotFoundPage from '@/components/pages/NotFound';
 import { routing } from '@/i18n/routing';
-import BaseLayout from '@/lib/components/layout/BaseLayout';
-import NotFoundPage from '@/lib/components/pages/NotFound';
 
 export default function GlobalNotFound() {
   return (

lib/components/banner/EmailRemindersSettingsBanner.tsx → components/banner/EmailRemindersSettingsBanner.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import EmailRemindersSettingsForm from '@/lib/components/forms/EmailRemindersSettingsForm';
+import EmailRemindersSettingsForm from '@/components/forms/EmailRemindersSettingsForm';
 import theme from '@/styles/theme';
 import { Container, Typography } from '@mui/material';
 import { useTranslations } from 'next-intl';

lib/components/cards/AccountActionsCard.tsx → components/cards/AccountActionsCard.tsx

@@ -1,8 +1,8 @@
 'use client';
 
+import ConfirmDialog from '@/components/forms/ConfirmDialog';
 import { useRouter } from '@/i18n/routing';
 import { useDeleteUserMutation } from '@/lib/api';
-import ConfirmDialog from '@/lib/components/forms/ConfirmDialog';
 import { ErrorDisplay, FEEDBACK_FORM_URL } from '@/lib/constants/common';
 import theme from '@/styles/theme';
 import { Box, Button, Card, CardContent, lighten, Link, Typography } from '@mui/material';

lib/components/cards/CourseCard.tsx → components/cards/CourseCard.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import ProgressStatus from '@/components/common/ProgressStatus';
 import { Link as i18nLink } from '@/i18n/routing';
-import ProgressStatus from '@/lib/components/common/ProgressStatus';
 import { PROGRESS_STATUS } from '@/lib/constants/enums';
 import { getImageSizes } from '@/lib/utils/imageSizes';
 import { iconTextRowStyle, rowStyle } from '@/styles/common';

lib/components/cards/EmailRemindersSettingsCard.tsx → components/cards/EmailRemindersSettingsCard.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import EmailRemindersSettingsForm from '@/lib/components/forms/EmailRemindersSettingsForm';
+import EmailRemindersSettingsForm from '@/components/forms/EmailRemindersSettingsForm';
 import { Card, CardContent, Typography } from '@mui/material';
 import { useTranslations } from 'next-intl';
 

lib/components/cards/EmailSettingsCard.tsx → components/cards/EmailSettingsCard.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import EmailSettingsForm from '@/lib/components/forms/EmailSettingsForm';
+import EmailSettingsForm from '@/components/forms/EmailSettingsForm';
 import { Card, CardContent, Typography } from '@mui/material';
 import { useTranslations } from 'next-intl';
 

lib/components/cards/ProfileSettingsCard.tsx → components/cards/ProfileSettingsCard.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import ProfileSettingsForm from '@/lib/components/forms/ProfileSettingsForm';
+import ProfileSettingsForm from '@/components/forms/ProfileSettingsForm';
 import { FEEDBACK_FORM_URL } from '@/lib/constants/common';
 import { Card, CardContent, Link, Typography } from '@mui/material';
 import { useTranslations } from 'next-intl';

lib/components/cards/SessionCard.tsx → components/cards/SessionCard.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import { SessionProgressDisplay } from '@/components/session/SessionProgressDisplay';
 import { useRouter } from '@/i18n/routing';
-import { SessionProgressDisplay } from '@/lib/components/session/SessionProgressDisplay';
 import { rowStyle } from '@/styles/common';
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import {

lib/components/common/ContentUnavailable.tsx → components/common/ContentUnavailable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { TextNode } from '@/lib/utils/helper-types/translations';
+import { TextNode } from '@/lib/types/types';
 import { getImageSizes } from '@/lib/utils/imageSizes';
 import illustrationPerson4Peach from '@/public/illustration_person4_peach.svg';
 import { columnStyle } from '@/styles/common';

lib/components/course/CourseHeader.tsx → components/course/CourseHeader.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import Header from '@/components/layout/Header';
 import { Link as i18nLink } from '@/i18n/routing';
-import Header from '@/lib/components/layout/Header';
 import { PROGRESS_STATUS } from '@/lib/constants/enums';
 import theme from '@/styles/theme';
 import { Button } from '@mui/material';

lib/components/course/CourseIntroduction.tsx → components/course/CourseIntroduction.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import Video from '@/lib/components/video/Video';
-import VideoTranscriptModal from '@/lib/components/video/VideoTranscriptModal';
+import Video from '@/components/video/Video';
+import VideoTranscriptModal from '@/components/video/VideoTranscriptModal';
 import {
   COURSE_INTRO_VIDEO_TRANSCRIPT_CLOSED,
   COURSE_INTRO_VIDEO_TRANSCRIPT_OPENED,

lib/components/guards/AuthGuard.tsx → components/guards/AuthGuard.tsx

@@ -1,7 +1,7 @@
 'use client';
 
+import LoadingContainer from '@/components/common/LoadingContainer';
 import { usePathname, useRouter } from '@/i18n/routing';
-import LoadingContainer from '@/lib/components/common/LoadingContainer';
 import { useTypedSelector } from '@/lib/hooks/store';
 import useLoadUser from '@/lib/hooks/useLoadUser';
 import { default as generateReturnUrlQuery } from '@/lib/utils/generateReturnQuery';

lib/components/layout/BaseLayout.tsx → components/layout/BaseLayout.tsx

@@ -1,10 +1,10 @@
-import { AuthGuard } from '@/lib/components/guards/AuthGuard';
-import Consent from '@/lib/components/layout/Consent';
-import Footer from '@/lib/components/layout/Footer';
-import LeaveSiteButton from '@/lib/components/layout/LeaveSiteButton';
-import TopBar from '@/lib/components/layout/TopBar';
-import { ReduxProvider } from '@/lib/components/providers/ReduxProvider';
-import StoryblokProvider from '@/lib/components/providers/StoryblokProvider';
+import { AuthGuard } from '@/components/guards/AuthGuard';
+import Consent from '@/components/layout/Consent';
+import Footer from '@/components/layout/Footer';
+import LeaveSiteButton from '@/components/layout/LeaveSiteButton';
+import TopBar from '@/components/layout/TopBar';
+import { ReduxProvider } from '@/components/providers/ReduxProvider';
+import StoryblokProvider from '@/components/providers/StoryblokProvider';
 import { ENVIRONMENT } from '@/lib/constants/common';
 import { ENVIRONMENTS } from '@/lib/constants/enums';
 import firebase from '@/lib/firebase';

lib/components/layout/Header.tsx → components/layout/Header.tsx

@@ -1,10 +1,10 @@
 'use client';
 
+import UserResearchBanner from '@/components/banner/UserResearchBanner';
+import ProgressStatus from '@/components/common/ProgressStatus';
 import { useRouter } from '@/i18n/routing';
-import UserResearchBanner from '@/lib/components/banner/UserResearchBanner';
-import ProgressStatus from '@/lib/components/common/ProgressStatus';
 import { PROGRESS_STATUS } from '@/lib/constants/enums';
-import { TextNode } from '@/lib/utils/helper-types/translations';
+import { TextNode } from '@/lib/types/types';
 import { getImageSizes } from '@/lib/utils/imageSizes';
 import { RichTextOptions } from '@/lib/utils/richText';
 import { columnStyle, rowStyle } from '@/styles/common';