From 5a746a946d4a2a4460a30c3d17e3fd9e147084ae Mon Sep 17 00:00:00 2001 From: swve Date: Mon, 25 Nov 2024 23:26:33 +0100 Subject: [PATCH] chore: refactor frontend components folder --- apps/web/app/auth/forgot/forgot.tsx | 2 +- apps/web/app/auth/layout.tsx | 2 +- apps/web/app/auth/login/login.tsx | 2 +- apps/web/app/auth/reset/reset.tsx | 2 +- apps/web/app/auth/signup/InviteOnlySignUp.tsx | 2 +- apps/web/app/auth/signup/OpenSignup.tsx | 2 +- apps/web/app/auth/signup/signup.tsx | 2 +- apps/web/app/install/install.tsx | 2 +- .../app/install/steps/account_creation.tsx | 2 +- apps/web/app/install/steps/org_creation.tsx | 2 +- .../collection/[collectionid]/error.tsx | 2 +- .../collection/[collectionid]/page.tsx | 2 +- .../[orgslug]/(withmenu)/collections/page.tsx | 8 +++--- .../activity/[activityid]/activity.tsx | 4 +-- .../activity/[activityid]/error.tsx | 2 +- .../(withmenu)/course/[courseuuid]/course.tsx | 2 +- .../[orgslug]/(withmenu)/courses/courses.tsx | 8 +++--- .../[orgslug]/(withmenu)/courses/error.tsx | 2 +- .../app/orgs/[orgslug]/(withmenu)/error.tsx | 2 +- .../app/orgs/[orgslug]/(withmenu)/layout.tsx | 4 +-- .../app/orgs/[orgslug]/(withmenu)/page.tsx | 10 ++++---- .../orgs/[orgslug]/(withmenu)/trail/trail.tsx | 4 +-- .../orgs/[orgslug]/dash/ClientAdminLayout.tsx | 4 +-- .../Subs/AssignmentTaskGeneralEdit.tsx | 2 +- .../[assignmentuuid]/_components/Tasks.tsx | 2 +- .../assignments/[assignmentuuid]/page.tsx | 4 +-- .../subpages/AssignmentSubmissionsSubPage.tsx | 2 +- .../orgs/[orgslug]/dash/assignments/page.tsx | 2 +- .../orgs/[orgslug]/dash/courses/client.tsx | 6 ++--- .../course/[courseuuid]/[subpage]/page.tsx | 8 +++--- .../dash/org/settings/[subpage]/page.tsx | 4 +-- .../dash/payments/[subpage]/page.tsx | 8 +++--- .../user-account/settings/[subpage]/page.tsx | 6 ++--- .../dash/users/settings/[subpage]/page.tsx | 10 ++++---- apps/web/app/orgs/[orgslug]/layout.tsx | 4 +-- apps/web/components/Contexts/OrgContext.tsx | 4 +-- .../Dashboard/{UI => Menus}/DashLeftMenu.tsx | 2 +- .../{UI => Menus}/DashMobileMenu.tsx | 2 +- .../Dashboard/{UI => Misc}/BreadCrumbs.tsx | 0 .../{UI => Misc}/CourseOverviewTop.tsx | 0 .../Dashboard/{UI => Misc}/SaveState.tsx | 0 .../EditCourseAccess/EditCourseAccess.tsx | 4 +-- .../EditCourseGeneral/EditCourseGeneral.tsx | 4 +-- .../EditCourseGeneral/ThumbnailUpdate.tsx | 0 .../EditCourseGeneral/UnsplashImagePicker.tsx | 2 +- .../Buttons/NewActivityButton.tsx | 2 +- .../DraggableElements/ActivityElement.tsx | 4 +-- .../DraggableElements/ChapterElement.tsx | 2 +- .../EditCourseStructure.tsx | 2 +- .../Org/OrgEditGeneral/OrgEditGeneral.tsx | 2 +- .../Payments/PaymentsConfigurationPage.tsx | 10 ++++---- .../Payments/PaymentsCustomersPage.tsx | 6 ++--- .../Payments/PaymentsProductPage.tsx | 25 ++++++++----------- .../SubComponents/CreateProductForm.tsx | 10 ++++---- .../SubComponents/LinkCourseModal.tsx | 4 +-- .../SubComponents/ProductLinkedCourses.tsx | 4 +-- .../UserEditGeneral/UserEditGeneral.tsx | 0 .../UserEditPassword/UserEditPassword.tsx | 0 .../{ => Pages}/Users/OrgAccess/OrgAccess.tsx | 4 +-- .../Users/OrgUserGroups/OrgUserGroups.tsx | 4 +-- .../{ => Pages}/Users/OrgUsers/OrgUsers.tsx | 6 ++--- .../Users/OrgUsersAdd/OrgUsersAdd.tsx | 4 +-- .../{AI => }/Hooks/useGetAIFeatures.tsx | 0 .../Objects/Activities/AI/AIActivityAsk.tsx | 2 +- .../DynamicCanva/AI/AICanvaToolkit.tsx | 4 +-- .../{ => Objects}/ContentPlaceHolder.tsx | 2 +- .../CourseActions/CoursePaidOptions.tsx | 4 +-- .../Courses/CourseActions/CoursesActions.tsx | 2 +- .../Courses/CourseUpdates/CourseUpdates.tsx | 4 +-- .../Objects/Editor/AI/AIEditorToolkit.tsx | 2 +- apps/web/components/Objects/Editor/Editor.tsx | 4 +-- .../Objects/Editor/EditorWrapper.tsx | 2 +- .../Objects/Editor/Toolbar/ToolbarButtons.tsx | 2 +- .../Objects/Menus/{OrgMenu => }/OrgMenu.tsx | 0 .../Menus/{OrgMenu => }/OrgMenuLinks.tsx | 0 .../Create/NewActivityModal/Assignment.tsx | 2 +- .../Create/NewActivityModal/DocumentPdf.tsx | 2 +- .../Create/NewActivityModal/DynamicCanva.tsx | 2 +- .../Create/NewActivityModal/Video.tsx | 2 +- .../Objects/Modals/Chapters/NewChapter.tsx | 2 +- .../Modals/Course/Create/CreateCourse.tsx | 14 +++++------ .../Dash/OrgUserGroups/AddUserGroup.tsx | 2 +- .../Dash/OrgUserGroups/EditUserGroup.tsx | 2 +- .../Modals/Dash/OrgUsers/RolesUpdate.tsx | 2 +- .../{ => Objects}/Onboarding/Onboarding.tsx | 2 +- .../Buttons/NewCollectionButton.tsx | 0 .../Buttons/NewCourseButton.tsx | 0 .../ConfirmationModal/ConfirmationModal.tsx | 0 .../StyledElements/Error/Error.tsx | 0 .../StyledElements/Form/Form.tsx | 0 .../StyledElements/Info/Info.tsx | 0 .../StyledElements/Modal/Modal.tsx | 2 +- .../Titles/TypeOfContentTitle.tsx | 0 .../StyledElements/Toast/Toast.tsx | 0 .../StyledElements/Tooltip/Tooltip.tsx | 0 .../Wrappers/GeneralWrapper.tsx | 0 .../Thumbnails/CollectionThumbnail.tsx | 2 +- .../Objects/Thumbnails/CourseThumbnail.tsx | 4 +-- .../components/{ => Objects}/Watermark.tsx | 2 +- .../Pages/CourseEdit/Draggables/Activity.tsx | 2 +- .../Pages/CourseEdit/Draggables/Chapter.tsx | 2 +- .../Pages/Courses/ActivityIndicators.tsx | 2 +- .../UnconfiguredPaymentsDisclaimer.tsx | 2 +- .../components/Security/HeaderProfileBox.tsx | 2 +- apps/web/components/ui/toggle-group.tsx | 2 +- apps/web/services/courses/chapters.ts | 2 +- 106 files changed, 159 insertions(+), 164 deletions(-) rename apps/web/components/Dashboard/{UI => Menus}/DashLeftMenu.tsx (99%) rename apps/web/components/Dashboard/{UI => Menus}/DashMobileMenu.tsx (97%) rename apps/web/components/Dashboard/{UI => Misc}/BreadCrumbs.tsx (100%) rename apps/web/components/Dashboard/{UI => Misc}/CourseOverviewTop.tsx (100%) rename apps/web/components/Dashboard/{UI => Misc}/SaveState.tsx (100%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseAccess/EditCourseAccess.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseGeneral/EditCourseGeneral.tsx (97%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseGeneral/ThumbnailUpdate.tsx (100%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseGeneral/UnsplashImagePicker.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseStructure/Buttons/NewActivityButton.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Course/EditCourseStructure/EditCourseStructure.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Org/OrgEditGeneral/OrgEditGeneral.tsx (99%) rename apps/web/components/Dashboard/{ => Pages}/Payments/PaymentsConfigurationPage.tsx (97%) rename apps/web/components/Dashboard/{ => Pages}/Payments/PaymentsCustomersPage.tsx (96%) rename apps/web/components/Dashboard/{ => Pages}/Payments/PaymentsProductPage.tsx (94%) rename apps/web/components/Dashboard/{ => Pages}/Payments/SubComponents/CreateProductForm.tsx (96%) rename apps/web/components/Dashboard/{ => Pages}/Payments/SubComponents/LinkCourseModal.tsx (97%) rename apps/web/components/Dashboard/{ => Pages}/Payments/SubComponents/ProductLinkedCourses.tsx (96%) rename apps/web/components/Dashboard/{ => Pages}/UserAccount/UserEditGeneral/UserEditGeneral.tsx (100%) rename apps/web/components/Dashboard/{ => Pages}/UserAccount/UserEditPassword/UserEditPassword.tsx (100%) rename apps/web/components/Dashboard/{ => Pages}/Users/OrgAccess/OrgAccess.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Users/OrgUserGroups/OrgUserGroups.tsx (98%) rename apps/web/components/Dashboard/{ => Pages}/Users/OrgUsers/OrgUsers.tsx (96%) rename apps/web/components/Dashboard/{ => Pages}/Users/OrgUsersAdd/OrgUsersAdd.tsx (98%) rename apps/web/components/{AI => }/Hooks/useGetAIFeatures.tsx (100%) rename apps/web/components/{ => Objects}/ContentPlaceHolder.tsx (87%) rename apps/web/components/Objects/Menus/{OrgMenu => }/OrgMenu.tsx (100%) rename apps/web/components/Objects/Menus/{OrgMenu => }/OrgMenuLinks.tsx (100%) rename apps/web/components/{ => Objects}/Onboarding/Onboarding.tsx (99%) rename apps/web/components/{ => Objects}/StyledElements/Buttons/NewCollectionButton.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Buttons/NewCourseButton.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/ConfirmationModal/ConfirmationModal.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Error/Error.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Form/Form.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Info/Info.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Modal/Modal.tsx (96%) rename apps/web/components/{ => Objects}/StyledElements/Titles/TypeOfContentTitle.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Toast/Toast.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Tooltip/Tooltip.tsx (100%) rename apps/web/components/{ => Objects}/StyledElements/Wrappers/GeneralWrapper.tsx (100%) rename apps/web/components/{ => Objects}/Watermark.tsx (94%) diff --git a/apps/web/app/auth/forgot/forgot.tsx b/apps/web/app/auth/forgot/forgot.tsx index ecfce06e..c37af352 100644 --- a/apps/web/app/auth/forgot/forgot.tsx +++ b/apps/web/app/auth/forgot/forgot.tsx @@ -6,7 +6,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { getOrgLogoMediaDirectory } from '@services/media/media' import { AlertTriangle, Info } from 'lucide-react' diff --git a/apps/web/app/auth/layout.tsx b/apps/web/app/auth/layout.tsx index 37fbd3a3..95dbe69b 100644 --- a/apps/web/app/auth/layout.tsx +++ b/apps/web/app/auth/layout.tsx @@ -1,6 +1,6 @@ 'use client' import { OrgProvider } from '@components/Contexts/OrgContext' -import ErrorUI from '@components/StyledElements/Error/Error' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' import { useSearchParams } from 'next/navigation' diff --git a/apps/web/app/auth/login/login.tsx b/apps/web/app/auth/login/login.tsx index 6420396e..24fec8ea 100644 --- a/apps/web/app/auth/login/login.tsx +++ b/apps/web/app/auth/login/login.tsx @@ -4,7 +4,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import Image from 'next/image' import * as Form from '@radix-ui/react-form' import { useFormik } from 'formik' diff --git a/apps/web/app/auth/reset/reset.tsx b/apps/web/app/auth/reset/reset.tsx index c275f98f..c9d16bb9 100644 --- a/apps/web/app/auth/reset/reset.tsx +++ b/apps/web/app/auth/reset/reset.tsx @@ -6,7 +6,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { getOrgLogoMediaDirectory } from '@services/media/media' import { AlertTriangle, Info } from 'lucide-react' diff --git a/apps/web/app/auth/signup/InviteOnlySignUp.tsx b/apps/web/app/auth/signup/InviteOnlySignUp.tsx index c7a8bfc0..41a21618 100644 --- a/apps/web/app/auth/signup/InviteOnlySignUp.tsx +++ b/apps/web/app/auth/signup/InviteOnlySignUp.tsx @@ -7,7 +7,7 @@ import FormLayout, { FormLabelAndMessage, Input, Textarea, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { AlertTriangle, Check, User } from 'lucide-react' import Link from 'next/link' diff --git a/apps/web/app/auth/signup/OpenSignup.tsx b/apps/web/app/auth/signup/OpenSignup.tsx index 36a2e821..20fe9c91 100644 --- a/apps/web/app/auth/signup/OpenSignup.tsx +++ b/apps/web/app/auth/signup/OpenSignup.tsx @@ -7,7 +7,7 @@ import FormLayout, { FormLabelAndMessage, Input, Textarea, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { AlertTriangle, Check, User } from 'lucide-react' import Link from 'next/link' diff --git a/apps/web/app/auth/signup/signup.tsx b/apps/web/app/auth/signup/signup.tsx index 1ed093c9..71e977e1 100644 --- a/apps/web/app/auth/signup/signup.tsx +++ b/apps/web/app/auth/signup/signup.tsx @@ -14,7 +14,7 @@ import InviteOnlySignUpComponent from './InviteOnlySignUp' import { useRouter, useSearchParams } from 'next/navigation' import { validateInviteCode } from '@services/organizations/invites' import PageLoading from '@components/Objects/Loaders/PageLoading' -import Toast from '@components/StyledElements/Toast/Toast' +import Toast from '@components/Objects/StyledElements/Toast/Toast' import toast from 'react-hot-toast' import { BarLoader } from 'react-spinners' import { joinOrg } from '@services/organizations/orgs' diff --git a/apps/web/app/install/install.tsx b/apps/web/app/install/install.tsx index d5753dd9..f2d7b1aa 100644 --- a/apps/web/app/install/install.tsx +++ b/apps/web/app/install/install.tsx @@ -1,7 +1,7 @@ 'use client' import React, { useEffect } from 'react' import { INSTALL_STEPS } from './steps/steps' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { useRouter, useSearchParams } from 'next/navigation' import { Suspense } from 'react' diff --git a/apps/web/app/install/steps/account_creation.tsx b/apps/web/app/install/steps/account_creation.tsx index 1a8d8531..492b492c 100644 --- a/apps/web/app/install/steps/account_creation.tsx +++ b/apps/web/app/install/steps/account_creation.tsx @@ -4,7 +4,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { getAPIUrl } from '@services/config/config' import { createNewUserInstall, updateInstall } from '@services/install/install' diff --git a/apps/web/app/install/steps/org_creation.tsx b/apps/web/app/install/steps/org_creation.tsx index 5efd2c93..66e5fd6b 100644 --- a/apps/web/app/install/steps/org_creation.tsx +++ b/apps/web/app/install/steps/org_creation.tsx @@ -3,7 +3,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { useFormik } from 'formik' import { BarLoader } from 'react-spinners' diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx index d5320406..058142f5 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx @@ -1,6 +1,6 @@ 'use client' // Error components must be Client Components -import ErrorUI from '@components/StyledElements/Error/Error' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' import { useEffect } from 'react' export default function Error({ diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/page.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/page.tsx index 523ca9bd..aebb4872 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/page.tsx @@ -1,4 +1,4 @@ -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { getUriWithOrg } from '@services/config/config' import { getCollectionById } from '@services/courses/collections' import { getCourseThumbnailMediaDirectory } from '@services/media/media' diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/collections/page.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/collections/page.tsx index 343bfacf..dfa4b147 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/collections/page.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/collections/page.tsx @@ -1,17 +1,17 @@ import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' -import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import TypeOfContentTitle from '@components/Objects/StyledElements/Titles/TypeOfContentTitle' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { getUriWithOrg } from '@services/config/config' import { getOrganizationContextInfo } from '@services/organizations/orgs' import { Metadata } from 'next' import Link from 'next/link' import CollectionThumbnail from '@components/Objects/Thumbnails/CollectionThumbnail' -import NewCollectionButton from '@components/StyledElements/Buttons/NewCollectionButton' -import ContentPlaceHolderIfUserIsNotAdmin from '@components/ContentPlaceHolder' +import NewCollectionButton from '@components/Objects/StyledElements/Buttons/NewCollectionButton' import { nextAuthOptions } from 'app/auth/options' import { getServerSession } from 'next-auth' import { getOrgCollections } from '@services/courses/collections' import { getOrgThumbnailMediaDirectory } from '@services/media/media' +import ContentPlaceHolderIfUserIsNotAdmin from '@components/Objects/ContentPlaceHolder' type MetadataProps = { params: { orgslug: string; courseid: string } diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/activity.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/activity.tsx index fa37a3aa..20d03e54 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/activity.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/activity.tsx @@ -7,7 +7,7 @@ import { BookOpenCheck, Check, CheckCircle, MoreVertical, UserRoundPen } from 'l import { markActivityAsComplete } from '@services/courses/activity' import DocumentPdfActivity from '@components/Objects/Activities/DocumentPdf/DocumentPdf' import ActivityIndicators from '@components/Pages/Courses/ActivityIndicators' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { usePathname, useRouter } from 'next/navigation' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' import { getCourseThumbnailMediaDirectory } from '@services/media/media' @@ -24,7 +24,7 @@ import { AssignmentsTaskProvider } from '@components/Contexts/Assignments/Assign import AssignmentSubmissionProvider, { useAssignmentSubmission } from '@components/Contexts/Assignments/AssignmentSubmissionContext' import toast from 'react-hot-toast' import { mutate } from 'swr' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { useMediaQuery } from 'usehooks-ts' import PaidCourseActivityDisclaimer from '@components/Objects/Courses/CourseActions/PaidCourseActivityDisclaimer' diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/error.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/error.tsx index d5320406..058142f5 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/error.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/activity/[activityid]/error.tsx @@ -1,6 +1,6 @@ 'use client' // Error components must be Client Components -import ErrorUI from '@components/StyledElements/Error/Error' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' import { useEffect } from 'react' export default function Error({ diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx index 01b8e753..b98bb364 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx @@ -6,7 +6,7 @@ import PageLoading from '@components/Objects/Loaders/PageLoading' import { revalidateTags } from '@services/utils/ts/requests' import ActivityIndicators from '@components/Pages/Courses/ActivityIndicators' import { useRouter } from 'next/navigation' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { getCourseThumbnailMediaDirectory, getUserAvatarMediaDirectory, diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/courses/courses.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/courses/courses.tsx index a8a28136..bb17ecd6 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/courses/courses.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/courses/courses.tsx @@ -1,13 +1,13 @@ 'use client' import CreateCourseModal from '@components/Objects/Modals/Course/Create/CreateCourse' -import Modal from '@components/StyledElements/Modal/Modal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import React from 'react' import { useSearchParams } from 'next/navigation' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' -import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' +import TypeOfContentTitle from '@components/Objects/StyledElements/Titles/TypeOfContentTitle' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' import CourseThumbnail from '@components/Objects/Thumbnails/CourseThumbnail' -import NewCourseButton from '@components/StyledElements/Buttons/NewCourseButton' +import NewCourseButton from '@components/Objects/StyledElements/Buttons/NewCourseButton' import useAdminStatus from '@components/Hooks/useAdminStatus' interface CourseProps { diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/courses/error.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/courses/error.tsx index d5320406..058142f5 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/courses/error.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/courses/error.tsx @@ -1,6 +1,6 @@ 'use client' // Error components must be Client Components -import ErrorUI from '@components/StyledElements/Error/Error' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' import { useEffect } from 'react' export default function Error({ diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx index d5320406..058142f5 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx @@ -1,6 +1,6 @@ 'use client' // Error components must be Client Components -import ErrorUI from '@components/StyledElements/Error/Error' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' import { useEffect } from 'react' export default function Error({ diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/layout.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/layout.tsx index f532da02..a825e3a5 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/layout.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/layout.tsx @@ -1,8 +1,8 @@ 'use client' import '@styles/globals.css' import { SessionProvider } from 'next-auth/react' -import Watermark from '@components/Watermark' -import { OrgMenu } from '@components/Objects/Menus/OrgMenu/OrgMenu' +import Watermark from '@components/Objects/Watermark' +import { OrgMenu } from '@components/Objects/Menus/OrgMenu' export default function RootLayout({ children, diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/page.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/page.tsx index 004ce80b..294614ce 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/page.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/page.tsx @@ -4,14 +4,14 @@ import { getUriWithOrg } from '@services/config/config' import { getOrgCourses } from '@services/courses/courses' import Link from 'next/link' import { getOrganizationContextInfo } from '@services/organizations/orgs' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' -import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' +import TypeOfContentTitle from '@components/Objects/StyledElements/Titles/TypeOfContentTitle' import CourseThumbnail from '@components/Objects/Thumbnails/CourseThumbnail' import CollectionThumbnail from '@components/Objects/Thumbnails/CollectionThumbnail' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' -import NewCourseButton from '@components/StyledElements/Buttons/NewCourseButton' -import NewCollectionButton from '@components/StyledElements/Buttons/NewCollectionButton' -import ContentPlaceHolderIfUserIsNotAdmin from '@components/ContentPlaceHolder' +import NewCourseButton from '@components/Objects/StyledElements/Buttons/NewCourseButton' +import NewCollectionButton from '@components/Objects/StyledElements/Buttons/NewCollectionButton' +import ContentPlaceHolderIfUserIsNotAdmin from '@components/Objects/ContentPlaceHolder' import { getOrgCollections } from '@services/courses/collections' import { getServerSession } from 'next-auth' import { nextAuthOptions } from 'app/auth/options' diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/trail/trail.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/trail/trail.tsx index 2d5a44c7..dbf3bb33 100644 --- a/apps/web/app/orgs/[orgslug]/(withmenu)/trail/trail.tsx +++ b/apps/web/app/orgs/[orgslug]/(withmenu)/trail/trail.tsx @@ -3,8 +3,8 @@ import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' import PageLoading from '@components/Objects/Loaders/PageLoading' import TrailCourseElement from '@components/Pages/Trail/TrailCourseElement' -import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle' -import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper' +import TypeOfContentTitle from '@components/Objects/StyledElements/Titles/TypeOfContentTitle' +import GeneralWrapperStyled from '@components/Objects/StyledElements/Wrappers/GeneralWrapper' import { getAPIUrl } from '@services/config/config' import { swrFetcher } from '@services/utils/ts/requests' import React, { useEffect } from 'react' diff --git a/apps/web/app/orgs/[orgslug]/dash/ClientAdminLayout.tsx b/apps/web/app/orgs/[orgslug]/dash/ClientAdminLayout.tsx index e5a8945f..a65f6c02 100644 --- a/apps/web/app/orgs/[orgslug]/dash/ClientAdminLayout.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/ClientAdminLayout.tsx @@ -1,6 +1,6 @@ 'use client'; -import DashLeftMenu from '@components/Dashboard/UI/DashLeftMenu' -import DashMobileMenu from '@components/Dashboard/UI/DashMobileMenu' +import DashLeftMenu from '@components/Dashboard/Menus/DashLeftMenu'; +import DashMobileMenu from '@components/Dashboard/Menus/DashMobileMenu'; import AdminAuthorization from '@components/Security/AdminAuthorization' import { SessionProvider } from 'next-auth/react' import React from 'react' diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/TaskEditor/Subs/AssignmentTaskGeneralEdit.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/TaskEditor/Subs/AssignmentTaskGeneralEdit.tsx index f7bae0ef..f346e469 100644 --- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/TaskEditor/Subs/AssignmentTaskGeneralEdit.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/TaskEditor/Subs/AssignmentTaskGeneralEdit.tsx @@ -3,7 +3,7 @@ import { useAssignments } from '@components/Contexts/Assignments/AssignmentConte import { useAssignmentsTask, useAssignmentsTaskDispatch } from '@components/Contexts/Assignments/AssignmentsTaskContext'; import { useLHSession } from '@components/Contexts/LHSessionContext'; import { useOrg } from '@components/Contexts/OrgContext'; -import FormLayout, { FormField, FormLabelAndMessage, Input, Textarea } from '@components/StyledElements/Form/Form'; +import FormLayout, { FormField, FormLabelAndMessage, Input, Textarea } from '@components/Objects/StyledElements/Form/Form'; import * as Form from '@radix-ui/react-form'; import { getActivityByID } from '@services/courses/activities'; import { updateAssignmentTask, updateReferenceFile } from '@services/courses/assignments'; diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/Tasks.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/Tasks.tsx index 63997abe..5a816ab2 100644 --- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/Tasks.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/_components/Tasks.tsx @@ -1,5 +1,5 @@ import { useAssignments } from '@components/Contexts/Assignments/AssignmentContext' -import Modal from '@components/StyledElements/Modal/Modal'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; import { FileUp, ListTodo, PanelLeftOpen, Plus } from 'lucide-react'; import React, { useEffect } from 'react' import NewTaskModal from './Modals/NewTaskModal'; diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx index 7c3144a5..fe6f4bdf 100644 --- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx @@ -1,9 +1,9 @@ 'use client'; -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import { BookOpen, BookX, EllipsisVertical, Eye, Layers2, Monitor, UserRoundPen } from 'lucide-react' import React, { useEffect } from 'react' import { AssignmentProvider, useAssignments } from '@components/Contexts/Assignments/AssignmentContext'; -import ToolTip from '@components/StyledElements/Tooltip/Tooltip'; +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip'; import { updateAssignment } from '@services/courses/assignments'; import { useLHSession } from '@components/Contexts/LHSessionContext'; import { mutate } from 'swr'; diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/subpages/AssignmentSubmissionsSubPage.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/subpages/AssignmentSubmissionsSubPage.tsx index 33a55715..4cc32f02 100644 --- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/subpages/AssignmentSubmissionsSubPage.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/subpages/AssignmentSubmissionsSubPage.tsx @@ -1,6 +1,6 @@ import { useLHSession } from '@components/Contexts/LHSessionContext'; import UserAvatar from '@components/Objects/UserAvatar'; -import Modal from '@components/StyledElements/Modal/Modal'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; import { getAPIUrl } from '@services/config/config'; import { getUserAvatarMediaDirectory } from '@services/media/media'; import { swrFetcher } from '@services/utils/ts/requests'; diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/page.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/page.tsx index 8e11e60b..0ee94fd6 100644 --- a/apps/web/app/orgs/[orgslug]/dash/assignments/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/assignments/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { useLHSession } from '@components/Contexts/LHSessionContext'; import { useOrg } from '@components/Contexts/OrgContext'; -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import { getAPIUrl, getUriWithOrg } from '@services/config/config'; import { getAssignmentsFromACourse } from '@services/courses/assignments'; import { getCourseThumbnailMediaDirectory } from '@services/media/media'; diff --git a/apps/web/app/orgs/[orgslug]/dash/courses/client.tsx b/apps/web/app/orgs/[orgslug]/dash/courses/client.tsx index 57f1ba2a..766c978b 100644 --- a/apps/web/app/orgs/[orgslug]/dash/courses/client.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/courses/client.tsx @@ -1,10 +1,10 @@ 'use client' -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import CreateCourseModal from '@components/Objects/Modals/Course/Create/CreateCourse' import CourseThumbnail, { removeCoursePrefix } from '@components/Objects/Thumbnails/CourseThumbnail' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' -import NewCourseButton from '@components/StyledElements/Buttons/NewCourseButton' -import Modal from '@components/StyledElements/Modal/Modal' +import NewCourseButton from '@components/Objects/StyledElements/Buttons/NewCourseButton' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import { useSearchParams } from 'next/navigation' import React from 'react' import useAdminStatus from '@components/Hooks/useAdminStatus' diff --git a/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx index 9b44a988..0c37a366 100644 --- a/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx @@ -1,14 +1,14 @@ 'use client' -import EditCourseStructure from '../../../../../../../../components/Dashboard/Course/EditCourseStructure/EditCourseStructure' import { getUriWithOrg } from '@services/config/config' import React from 'react' import { CourseProvider } from '../../../../../../../../components/Contexts/CourseContext' import Link from 'next/link' -import { CourseOverviewTop } from '@components/Dashboard/UI/CourseOverviewTop' +import { CourseOverviewTop } from '@components/Dashboard/Misc/CourseOverviewTop' import { motion } from 'framer-motion' -import EditCourseGeneral from '@components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral' import { GalleryVerticalEnd, Info, UserRoundCog } from 'lucide-react' -import EditCourseAccess from '@components/Dashboard/Course/EditCourseAccess/EditCourseAccess' +import EditCourseStructure from '@components/Dashboard/Pages/Course/EditCourseStructure/EditCourseStructure' +import EditCourseGeneral from '@components/Dashboard/Pages/Course/EditCourseGeneral/EditCourseGeneral' +import EditCourseAccess from '@components/Dashboard/Pages/Course/EditCourseAccess/EditCourseAccess' export type CourseOverviewParams = { orgslug: string diff --git a/apps/web/app/orgs/[orgslug]/dash/org/settings/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/org/settings/[subpage]/page.tsx index d748809b..6054523b 100644 --- a/apps/web/app/orgs/[orgslug]/dash/org/settings/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/org/settings/[subpage]/page.tsx @@ -1,11 +1,11 @@ 'use client' -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import { getUriWithOrg } from '@services/config/config' import { Info } from 'lucide-react' import Link from 'next/link' import React, { useEffect } from 'react' import { motion } from 'framer-motion' -import OrgEditGeneral from '@components/Dashboard/Org/OrgEditGeneral/OrgEditGeneral' +import OrgEditGeneral from '@components/Dashboard/Pages/Org/OrgEditGeneral/OrgEditGeneral' export type OrgParams = { subpage: string diff --git a/apps/web/app/orgs/[orgslug]/dash/payments/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/payments/[subpage]/page.tsx index 93d9a156..d305180e 100644 --- a/apps/web/app/orgs/[orgslug]/dash/payments/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/payments/[subpage]/page.tsx @@ -1,15 +1,15 @@ 'use client' import React, { useState, useEffect } from 'react' import { motion } from 'framer-motion' -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import Link from 'next/link' import { getUriWithOrg } from '@services/config/config' import { CreditCard, Settings, Repeat, BookOpen, Users, DollarSign, Gem } from 'lucide-react' import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' -import PaymentsConfigurationPage from '@components/Dashboard/Payments/PaymentsConfigurationPage' -import PaymentsProductPage from '@components/Dashboard/Payments/PaymentsProductPage' -import PaymentsCustomersPage from '@components/Dashboard/Payments/PaymentsCustomersPage' +import PaymentsConfigurationPage from '@components/Dashboard/Pages/Payments/PaymentsConfigurationPage' +import PaymentsProductPage from '@components/Dashboard/Pages/Payments/PaymentsProductPage' +import PaymentsCustomersPage from '@components/Dashboard/Pages/Payments/PaymentsCustomersPage' diff --git a/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx index 6162f70e..357bbd39 100644 --- a/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx @@ -1,12 +1,12 @@ 'use client' import React, { useEffect } from 'react' import { motion } from 'framer-motion' -import UserEditGeneral from '@components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral' -import UserEditPassword from '@components/Dashboard/UserAccount/UserEditPassword/UserEditPassword' +import UserEditGeneral from '@components/Dashboard/Pages/UserAccount/UserEditGeneral/UserEditGeneral' +import UserEditPassword from '@components/Dashboard/Pages/UserAccount/UserEditPassword/UserEditPassword' import Link from 'next/link' import { getUriWithOrg } from '@services/config/config' import { Info, Lock } from 'lucide-react' -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import { useLHSession } from '@components/Contexts/LHSessionContext' export type SettingsParams = { diff --git a/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx index d6342e38..30e74c0a 100644 --- a/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx +++ b/apps/web/app/orgs/[orgslug]/dash/users/settings/[subpage]/page.tsx @@ -5,13 +5,13 @@ import Link from 'next/link' import { useMediaQuery } from 'usehooks-ts' import { getUriWithOrg } from '@services/config/config' import { Monitor, ScanEye, SquareUserRound, UserPlus, Users } from 'lucide-react' -import BreadCrumbs from '@components/Dashboard/UI/BreadCrumbs' +import BreadCrumbs from '@components/Dashboard/Misc/BreadCrumbs' import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' -import OrgUsers from '@components/Dashboard/Users/OrgUsers/OrgUsers' -import OrgAccess from '@components/Dashboard/Users/OrgAccess/OrgAccess' -import OrgUsersAdd from '@components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd' -import OrgUserGroups from '@components/Dashboard/Users/OrgUserGroups/OrgUserGroups' +import OrgUsers from '@components/Dashboard/Pages/Users/OrgUsers/OrgUsers' +import OrgAccess from '@components/Dashboard/Pages/Users/OrgAccess/OrgAccess' +import OrgUsersAdd from '@components/Dashboard/Pages/Users/OrgUsersAdd/OrgUsersAdd' +import OrgUserGroups from '@components/Dashboard/Pages/Users/OrgUserGroups/OrgUserGroups' export type SettingsParams = { subpage: string diff --git a/apps/web/app/orgs/[orgslug]/layout.tsx b/apps/web/app/orgs/[orgslug]/layout.tsx index 56735360..42912f32 100644 --- a/apps/web/app/orgs/[orgslug]/layout.tsx +++ b/apps/web/app/orgs/[orgslug]/layout.tsx @@ -1,9 +1,9 @@ 'use client' import { OrgProvider } from '@components/Contexts/OrgContext' import NextTopLoader from 'nextjs-toploader'; -import Toast from '@components/StyledElements/Toast/Toast' +import Toast from '@components/Objects/StyledElements/Toast/Toast' import '@styles/globals.css' -import Onboarding from '@components/Onboarding/Onboarding'; +import Onboarding from '@components/Objects/Onboarding/Onboarding'; export default function RootLayout({ children, diff --git a/apps/web/components/Contexts/OrgContext.tsx b/apps/web/components/Contexts/OrgContext.tsx index 8b50e39a..60a76144 100644 --- a/apps/web/components/Contexts/OrgContext.tsx +++ b/apps/web/components/Contexts/OrgContext.tsx @@ -4,8 +4,8 @@ import { swrFetcher } from '@services/utils/ts/requests' import React, { createContext, useContext, useMemo } from 'react' import useSWR from 'swr' import { useLHSession } from '@components/Contexts/LHSessionContext' -import ErrorUI from '@components/StyledElements/Error/Error' -import InfoUI from '@components/StyledElements/Info/Info' +import ErrorUI from '@components/Objects/StyledElements/Error/Error' +import InfoUI from '@components/Objects/StyledElements/Info/Info' import { usePathname } from 'next/navigation' export const OrgContext = createContext(null) diff --git a/apps/web/components/Dashboard/UI/DashLeftMenu.tsx b/apps/web/components/Dashboard/Menus/DashLeftMenu.tsx similarity index 99% rename from apps/web/components/Dashboard/UI/DashLeftMenu.tsx rename to apps/web/components/Dashboard/Menus/DashLeftMenu.tsx index f4c5458d..5d90e4e5 100644 --- a/apps/web/components/Dashboard/UI/DashLeftMenu.tsx +++ b/apps/web/components/Dashboard/Menus/DashLeftMenu.tsx @@ -1,7 +1,7 @@ 'use client' import { useOrg } from '@components/Contexts/OrgContext' import { signOut } from 'next-auth/react' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' import LearnHouseDashboardLogo from '@public/dashLogo.png' import { Backpack, BadgeDollarSign, BookCopy, Home, LogOut, Package2, School, Settings, Users, Vault } from 'lucide-react' import Image from 'next/image' diff --git a/apps/web/components/Dashboard/UI/DashMobileMenu.tsx b/apps/web/components/Dashboard/Menus/DashMobileMenu.tsx similarity index 97% rename from apps/web/components/Dashboard/UI/DashMobileMenu.tsx rename to apps/web/components/Dashboard/Menus/DashMobileMenu.tsx index 8e66df1e..e354be7f 100644 --- a/apps/web/components/Dashboard/UI/DashMobileMenu.tsx +++ b/apps/web/components/Dashboard/Menus/DashMobileMenu.tsx @@ -7,7 +7,7 @@ import React from 'react' import AdminAuthorization from '@components/Security/AdminAuthorization' import { useLHSession } from '@components/Contexts/LHSessionContext' import { getUriWithOrg, getUriWithoutOrg } from '@services/config/config' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' function DashMobileMenu() { const org = useOrg() as any diff --git a/apps/web/components/Dashboard/UI/BreadCrumbs.tsx b/apps/web/components/Dashboard/Misc/BreadCrumbs.tsx similarity index 100% rename from apps/web/components/Dashboard/UI/BreadCrumbs.tsx rename to apps/web/components/Dashboard/Misc/BreadCrumbs.tsx diff --git a/apps/web/components/Dashboard/UI/CourseOverviewTop.tsx b/apps/web/components/Dashboard/Misc/CourseOverviewTop.tsx similarity index 100% rename from apps/web/components/Dashboard/UI/CourseOverviewTop.tsx rename to apps/web/components/Dashboard/Misc/CourseOverviewTop.tsx diff --git a/apps/web/components/Dashboard/UI/SaveState.tsx b/apps/web/components/Dashboard/Misc/SaveState.tsx similarity index 100% rename from apps/web/components/Dashboard/UI/SaveState.tsx rename to apps/web/components/Dashboard/Misc/SaveState.tsx diff --git a/apps/web/components/Dashboard/Course/EditCourseAccess/EditCourseAccess.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseAccess/EditCourseAccess.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseAccess/EditCourseAccess.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseAccess/EditCourseAccess.tsx index a682bef5..1770b180 100644 --- a/apps/web/components/Dashboard/Course/EditCourseAccess/EditCourseAccess.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseAccess/EditCourseAccess.tsx @@ -1,7 +1,7 @@ import { useCourse, useCourseDispatch } from '@components/Contexts/CourseContext' import LinkToUserGroup from '@components/Objects/Modals/Dash/EditCourseAccess/LinkToUserGroup' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' -import Modal from '@components/StyledElements/Modal/Modal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import { getAPIUrl } from '@services/config/config' import { unLinkResourcesToUserGroup } from '@services/usergroups/usergroups' import { swrFetcher } from '@services/utils/ts/requests' diff --git a/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/EditCourseGeneral.tsx similarity index 97% rename from apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/EditCourseGeneral.tsx index 8535fd83..e8c8cbf4 100644 --- a/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/EditCourseGeneral.tsx @@ -3,13 +3,13 @@ import FormLayout, { FormLabelAndMessage, Input, Textarea, -} from '@components/StyledElements/Form/Form'; +} from '@components/Objects/StyledElements/Form/Form'; import { useFormik } from 'formik'; import { AlertTriangle } from 'lucide-react'; import * as Form from '@radix-ui/react-form'; import React, { useEffect, useState } from 'react'; -import { useCourse, useCourseDispatch } from '../../../Contexts/CourseContext'; import ThumbnailUpdate from './ThumbnailUpdate'; +import { useCourse, useCourseDispatch } from '@components/Contexts/CourseContext'; type EditCourseStructureProps = { orgslug: string diff --git a/apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/ThumbnailUpdate.tsx similarity index 100% rename from apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/ThumbnailUpdate.tsx diff --git a/apps/web/components/Dashboard/Course/EditCourseGeneral/UnsplashImagePicker.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/UnsplashImagePicker.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseGeneral/UnsplashImagePicker.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/UnsplashImagePicker.tsx index b288c507..68abb289 100644 --- a/apps/web/components/Dashboard/Course/EditCourseGeneral/UnsplashImagePicker.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseGeneral/UnsplashImagePicker.tsx @@ -3,7 +3,7 @@ import { createApi } from 'unsplash-js'; import { Search, X, Cpu, Briefcase, GraduationCap, Heart, Palette, Plane, Utensils, Dumbbell, Music, Shirt, Book, Building, Bike, Camera, Microscope, Coins, Coffee, Gamepad, Flower} from 'lucide-react'; -import Modal from '@components/StyledElements/Modal/Modal'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; const unsplash = createApi({ accessKey: process.env.NEXT_PUBLIC_UNSPLASH_ACCESS_KEY as string, diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/Buttons/NewActivityButton.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/Buttons/NewActivityButton.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseStructure/Buttons/NewActivityButton.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseStructure/Buttons/NewActivityButton.tsx index 896632ff..63e8f0f5 100644 --- a/apps/web/components/Dashboard/Course/EditCourseStructure/Buttons/NewActivityButton.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/Buttons/NewActivityButton.tsx @@ -1,6 +1,6 @@ import { useCourse } from '@components/Contexts/CourseContext' import NewActivityModal from '@components/Objects/Modals/Activities/Create/NewActivity' -import Modal from '@components/StyledElements/Modal/Modal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import { getAPIUrl } from '@services/config/config' import { createActivity, diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx index e167c198..294fc2fb 100644 --- a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx @@ -1,4 +1,4 @@ -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { getAPIUrl, getUriWithOrg } from '@services/config/config' import { deleteActivity, updateActivity } from '@services/courses/activities' import { revalidateTags } from '@services/utils/ts/requests' @@ -28,7 +28,7 @@ import { useOrg } from '@components/Contexts/OrgContext' import { useCourse } from '@components/Contexts/CourseContext' import toast from 'react-hot-toast' import { useMediaQuery } from 'usehooks-ts' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' type ActivitiyElementProps = { orgslug: string diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx index b3d27980..f035b937 100644 --- a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/DraggableElements/ChapterElement.tsx @@ -1,4 +1,4 @@ -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { Hexagon, MoreHorizontal, diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/EditCourseStructure.tsx similarity index 98% rename from apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx rename to apps/web/components/Dashboard/Pages/Course/EditCourseStructure/EditCourseStructure.tsx index f9b5b24a..834a0d1f 100644 --- a/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx +++ b/apps/web/components/Dashboard/Pages/Course/EditCourseStructure/EditCourseStructure.tsx @@ -13,7 +13,7 @@ import { useCourseDispatch, } from '@components/Contexts/CourseContext' import { Hexagon } from 'lucide-react' -import Modal from '@components/StyledElements/Modal/Modal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import NewChapterModal from '@components/Objects/Modals/Chapters/NewChapter' import { useLHSession } from '@components/Contexts/LHSessionContext' diff --git a/apps/web/components/Dashboard/Org/OrgEditGeneral/OrgEditGeneral.tsx b/apps/web/components/Dashboard/Pages/Org/OrgEditGeneral/OrgEditGeneral.tsx similarity index 99% rename from apps/web/components/Dashboard/Org/OrgEditGeneral/OrgEditGeneral.tsx rename to apps/web/components/Dashboard/Pages/Org/OrgEditGeneral/OrgEditGeneral.tsx index 36c0fb20..7a9fc491 100644 --- a/apps/web/components/Dashboard/Org/OrgEditGeneral/OrgEditGeneral.tsx +++ b/apps/web/components/Dashboard/Pages/Org/OrgEditGeneral/OrgEditGeneral.tsx @@ -12,7 +12,7 @@ import { useRouter } from 'next/navigation' import { useOrg } from '@components/Contexts/OrgContext' import { useLHSession } from '@components/Contexts/LHSessionContext' import { getOrgLogoMediaDirectory, getOrgThumbnailMediaDirectory } from '@services/media/media' -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs" +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Ui/tabs" import { Toaster, toast } from 'react-hot-toast'; import { constructAcceptValue } from '@/lib/constants'; diff --git a/apps/web/components/Dashboard/Payments/PaymentsConfigurationPage.tsx b/apps/web/components/Dashboard/Pages/Payments/PaymentsConfigurationPage.tsx similarity index 97% rename from apps/web/components/Dashboard/Payments/PaymentsConfigurationPage.tsx rename to apps/web/components/Dashboard/Pages/Payments/PaymentsConfigurationPage.tsx index b1d0ccb2..840d55f3 100644 --- a/apps/web/components/Dashboard/Payments/PaymentsConfigurationPage.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/PaymentsConfigurationPage.tsx @@ -4,14 +4,14 @@ import { useOrg } from '@components/Contexts/OrgContext'; import { SiStripe } from '@icons-pack/react-simple-icons' import { useLHSession } from '@components/Contexts/LHSessionContext'; import { getPaymentConfigs, initializePaymentConfig, updatePaymentConfig, deletePaymentConfig, updateStripeAccountID, getStripeOnboardingLink } from '@services/payments/payments'; -import FormLayout, { ButtonBlack, Input, Textarea, FormField, FormLabelAndMessage, Flex } from '@components/StyledElements/Form/Form'; +import FormLayout, { ButtonBlack, Input, Textarea, FormField, FormLabelAndMessage, Flex } from '@components/Objects/StyledElements/Form/Form'; import { AlertTriangle, BarChart2, Check, Coins, CreditCard, Edit, ExternalLink, Info, Loader2, RefreshCcw, Trash2, UnplugIcon } from 'lucide-react'; import toast from 'react-hot-toast'; import useSWR, { mutate } from 'swr'; -import Modal from '@components/StyledElements/Modal/Modal'; -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal'; -import { Button } from '@components/ui/button'; -import { Alert, AlertDescription, AlertTitle } from '@components/ui/alert'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal'; +import { Button } from '@components/Ui/button'; +import { Alert, AlertDescription, AlertTitle } from '@components/Ui/alert'; import { useRouter } from 'next/navigation'; import { getUriWithoutOrg } from '@services/config/config'; diff --git a/apps/web/components/Dashboard/Payments/PaymentsCustomersPage.tsx b/apps/web/components/Dashboard/Pages/Payments/PaymentsCustomersPage.tsx similarity index 96% rename from apps/web/components/Dashboard/Payments/PaymentsCustomersPage.tsx rename to apps/web/components/Dashboard/Pages/Payments/PaymentsCustomersPage.tsx index a7481d0a..6b436183 100644 --- a/apps/web/components/Dashboard/Payments/PaymentsCustomersPage.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/PaymentsCustomersPage.tsx @@ -9,15 +9,15 @@ import { TableHead, TableHeader, TableRow, -} from "@/components/ui/table" +} from "@components/Ui/table" import { getOrgCustomers } from '@services/payments/payments' -import { Badge } from '@/components/ui/badge' +import { Badge } from '@components/Ui/badge' import PageLoading from '@components/Objects/Loaders/PageLoading' import { RefreshCcw, SquareCheck } from 'lucide-react' import { getUserAvatarMediaDirectory } from '@services/media/media' import UserAvatar from '@components/Objects/UserAvatar' import { usePaymentsEnabled } from '@hooks/usePaymentsEnabled' -import UnconfiguredPaymentsDisclaimer from '../../Pages/Payments/UnconfiguredPaymentsDisclaimer' +import UnconfiguredPaymentsDisclaimer from '@components/Pages/Payments/UnconfiguredPaymentsDisclaimer' interface PaymentUserData { payment_user_id: number; diff --git a/apps/web/components/Dashboard/Payments/PaymentsProductPage.tsx b/apps/web/components/Dashboard/Pages/Payments/PaymentsProductPage.tsx similarity index 94% rename from apps/web/components/Dashboard/Payments/PaymentsProductPage.tsx rename to apps/web/components/Dashboard/Pages/Payments/PaymentsProductPage.tsx index 25ad3b04..cc465c02 100644 --- a/apps/web/components/Dashboard/Payments/PaymentsProductPage.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/PaymentsProductPage.tsx @@ -5,26 +5,23 @@ import { useOrg } from '@components/Contexts/OrgContext'; import { useLHSession } from '@components/Contexts/LHSessionContext'; import useSWR, { mutate } from 'swr'; import { getProducts, updateProduct, archiveProduct } from '@services/payments/products'; -import CreateProductForm from '@components/Dashboard/Payments/SubComponents/CreateProductForm'; -import { Plus, Trash2, Pencil, Info, RefreshCcw, SquareCheck, ChevronDown, ChevronUp, Archive } from 'lucide-react'; -import Modal from '@components/StyledElements/Modal/Modal'; -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal'; +import { Plus, Pencil, Info, RefreshCcw, SquareCheck, ChevronDown, ChevronUp, Archive } from 'lucide-react'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal'; import toast from 'react-hot-toast'; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select" -import { Button } from "@/components/ui/button" -import { Input } from "@/components/ui/input" -import { Textarea } from "@/components/ui/textarea" +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@components/Ui/select" +import { Button } from "@components/Ui/button" +import { Input } from "@components/Ui/input" +import { Textarea } from "@components/Ui/textarea" import { Formik, Form, Field, ErrorMessage } from 'formik'; import * as Yup from 'yup'; -import { Label } from '@components/ui/label'; -import { Badge } from '@components/ui/badge'; +import { Label } from '@components/Ui/label'; +import { Badge } from '@components/Ui/badge'; import { getPaymentConfigs } from '@services/payments/payments'; import ProductLinkedCourses from './SubComponents/ProductLinkedCourses'; -import { AlertTriangle, Settings, CreditCard, ShoppingCart, Users, ChevronRight } from 'lucide-react'; -import Link from 'next/link'; import { usePaymentsEnabled } from '@hooks/usePaymentsEnabled'; -import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert" -import UnconfiguredPaymentsDisclaimer from '../../Pages/Payments/UnconfiguredPaymentsDisclaimer'; +import UnconfiguredPaymentsDisclaimer from '@components/Pages/Payments/UnconfiguredPaymentsDisclaimer'; +import CreateProductForm from './SubComponents/CreateProductForm'; const validationSchema = Yup.object().shape({ name: Yup.string().required('Name is required'), diff --git a/apps/web/components/Dashboard/Payments/SubComponents/CreateProductForm.tsx b/apps/web/components/Dashboard/Pages/Payments/SubComponents/CreateProductForm.tsx similarity index 96% rename from apps/web/components/Dashboard/Payments/SubComponents/CreateProductForm.tsx rename to apps/web/components/Dashboard/Pages/Payments/SubComponents/CreateProductForm.tsx index c8c420fa..114fd598 100644 --- a/apps/web/components/Dashboard/Payments/SubComponents/CreateProductForm.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/SubComponents/CreateProductForm.tsx @@ -6,11 +6,11 @@ import { Formik, Form, Field, ErrorMessage } from 'formik'; import * as Yup from 'yup'; import toast from 'react-hot-toast'; import { mutate } from 'swr'; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; -import { Textarea } from "@/components/ui/textarea"; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; -import { Label } from "@/components/ui/label"; +import { Button } from "@components/Ui/button"; +import { Input } from "@components/Ui/input"; +import { Textarea } from "@components/Ui/textarea"; +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@components/Ui/select"; +import { Label } from "@components/Ui/label"; import currencyCodes from 'currency-codes'; const validationSchema = Yup.object().shape({ diff --git a/apps/web/components/Dashboard/Payments/SubComponents/LinkCourseModal.tsx b/apps/web/components/Dashboard/Pages/Payments/SubComponents/LinkCourseModal.tsx similarity index 97% rename from apps/web/components/Dashboard/Payments/SubComponents/LinkCourseModal.tsx rename to apps/web/components/Dashboard/Pages/Payments/SubComponents/LinkCourseModal.tsx index 16c18d70..d4332268 100644 --- a/apps/web/components/Dashboard/Payments/SubComponents/LinkCourseModal.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/SubComponents/LinkCourseModal.tsx @@ -2,8 +2,8 @@ import React, { useState } from 'react'; import { useOrg } from '@components/Contexts/OrgContext'; import { useLHSession } from '@components/Contexts/LHSessionContext'; import { linkCourseToProduct } from '@services/payments/products'; -import { Button } from "@/components/ui/button"; -import { Input } from "@/components/ui/input"; +import { Button } from "@components/Ui/button"; +import { Input } from "@components/Ui/input"; import { Search } from 'lucide-react'; import toast from 'react-hot-toast'; import { mutate } from 'swr'; diff --git a/apps/web/components/Dashboard/Payments/SubComponents/ProductLinkedCourses.tsx b/apps/web/components/Dashboard/Pages/Payments/SubComponents/ProductLinkedCourses.tsx similarity index 96% rename from apps/web/components/Dashboard/Payments/SubComponents/ProductLinkedCourses.tsx rename to apps/web/components/Dashboard/Pages/Payments/SubComponents/ProductLinkedCourses.tsx index a1d2e7fc..bad51987 100644 --- a/apps/web/components/Dashboard/Payments/SubComponents/ProductLinkedCourses.tsx +++ b/apps/web/components/Dashboard/Pages/Payments/SubComponents/ProductLinkedCourses.tsx @@ -3,10 +3,10 @@ import { getCoursesLinkedToProduct, unlinkCourseFromProduct } from '@services/pa import { useLHSession } from '@components/Contexts/LHSessionContext'; import { useOrg } from '@components/Contexts/OrgContext'; import { Trash2, Plus, BookOpen } from 'lucide-react'; -import { Button } from "@/components/ui/button"; +import { Button } from "@components/Ui/button"; import toast from 'react-hot-toast'; import { mutate } from 'swr'; -import Modal from '@components/StyledElements/Modal/Modal'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; import LinkCourseModal from './LinkCourseModal'; interface ProductLinkedCoursesProps { diff --git a/apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx b/apps/web/components/Dashboard/Pages/UserAccount/UserEditGeneral/UserEditGeneral.tsx similarity index 100% rename from apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx rename to apps/web/components/Dashboard/Pages/UserAccount/UserEditGeneral/UserEditGeneral.tsx diff --git a/apps/web/components/Dashboard/UserAccount/UserEditPassword/UserEditPassword.tsx b/apps/web/components/Dashboard/Pages/UserAccount/UserEditPassword/UserEditPassword.tsx similarity index 100% rename from apps/web/components/Dashboard/UserAccount/UserEditPassword/UserEditPassword.tsx rename to apps/web/components/Dashboard/Pages/UserAccount/UserEditPassword/UserEditPassword.tsx diff --git a/apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx b/apps/web/components/Dashboard/Pages/Users/OrgAccess/OrgAccess.tsx similarity index 98% rename from apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx rename to apps/web/components/Dashboard/Pages/Users/OrgAccess/OrgAccess.tsx index 9c609c77..b5221e66 100644 --- a/apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx +++ b/apps/web/components/Dashboard/Pages/Users/OrgAccess/OrgAccess.tsx @@ -1,6 +1,6 @@ import { useOrg } from '@components/Contexts/OrgContext' import PageLoading from '@components/Objects/Loaders/PageLoading' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { getAPIUrl, getUriWithOrg } from '@services/config/config' import { swrFetcher } from '@services/utils/ts/requests' import { Globe, Ticket, UserSquare, Users, X } from 'lucide-react' @@ -14,7 +14,7 @@ import { } from '@services/organizations/invites' import toast from 'react-hot-toast' import { useRouter } from 'next/navigation' -import Modal from '@components/StyledElements/Modal/Modal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import OrgInviteCodeGenerate from '@components/Objects/Modals/Dash/OrgAccess/OrgInviteCodeGenerate' import { useLHSession } from '@components/Contexts/LHSessionContext' diff --git a/apps/web/components/Dashboard/Users/OrgUserGroups/OrgUserGroups.tsx b/apps/web/components/Dashboard/Pages/Users/OrgUserGroups/OrgUserGroups.tsx similarity index 98% rename from apps/web/components/Dashboard/Users/OrgUserGroups/OrgUserGroups.tsx rename to apps/web/components/Dashboard/Pages/Users/OrgUserGroups/OrgUserGroups.tsx index d0d7b7c2..ba586ada 100644 --- a/apps/web/components/Dashboard/Users/OrgUserGroups/OrgUserGroups.tsx +++ b/apps/web/components/Dashboard/Pages/Users/OrgUserGroups/OrgUserGroups.tsx @@ -4,8 +4,8 @@ import { useOrg } from '@components/Contexts/OrgContext' import AddUserGroup from '@components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup' import EditUserGroup from '@components/Objects/Modals/Dash/OrgUserGroups/EditUserGroup' import ManageUsers from '@components/Objects/Modals/Dash/OrgUserGroups/ManageUsers' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' -import Modal from '@components/StyledElements/Modal/Modal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import { getAPIUrl } from '@services/config/config' import { deleteUserGroup } from '@services/usergroups/usergroups' import { swrFetcher } from '@services/utils/ts/requests' diff --git a/apps/web/components/Dashboard/Users/OrgUsers/OrgUsers.tsx b/apps/web/components/Dashboard/Pages/Users/OrgUsers/OrgUsers.tsx similarity index 96% rename from apps/web/components/Dashboard/Users/OrgUsers/OrgUsers.tsx rename to apps/web/components/Dashboard/Pages/Users/OrgUsers/OrgUsers.tsx index c25e5d84..7d5bee0b 100644 --- a/apps/web/components/Dashboard/Users/OrgUsers/OrgUsers.tsx +++ b/apps/web/components/Dashboard/Pages/Users/OrgUsers/OrgUsers.tsx @@ -2,9 +2,9 @@ import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' import PageLoading from '@components/Objects/Loaders/PageLoading' import RolesUpdate from '@components/Objects/Modals/Dash/OrgUsers/RolesUpdate' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' -import Modal from '@components/StyledElements/Modal/Modal' -import Toast from '@components/StyledElements/Toast/Toast' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' +import Toast from '@components/Objects/StyledElements/Toast/Toast' import { getAPIUrl } from '@services/config/config' import { removeUserFromOrg } from '@services/organizations/orgs' import { swrFetcher } from '@services/utils/ts/requests' diff --git a/apps/web/components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd.tsx b/apps/web/components/Dashboard/Pages/Users/OrgUsersAdd/OrgUsersAdd.tsx similarity index 98% rename from apps/web/components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd.tsx rename to apps/web/components/Dashboard/Pages/Users/OrgUsersAdd/OrgUsersAdd.tsx index b724a350..496d25d9 100644 --- a/apps/web/components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd.tsx +++ b/apps/web/components/Dashboard/Pages/Users/OrgUsersAdd/OrgUsersAdd.tsx @@ -1,8 +1,8 @@ import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' import PageLoading from '@components/Objects/Loaders/PageLoading' -import Toast from '@components/StyledElements/Toast/Toast' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import Toast from '@components/Objects/StyledElements/Toast/Toast' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' import { getAPIUrl } from '@services/config/config' import { inviteBatchUsers } from '@services/organizations/invites' import { swrFetcher } from '@services/utils/ts/requests' diff --git a/apps/web/components/AI/Hooks/useGetAIFeatures.tsx b/apps/web/components/Hooks/useGetAIFeatures.tsx similarity index 100% rename from apps/web/components/AI/Hooks/useGetAIFeatures.tsx rename to apps/web/components/Hooks/useGetAIFeatures.tsx diff --git a/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx b/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx index e0b3c454..69a344b8 100644 --- a/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx +++ b/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx @@ -15,7 +15,7 @@ import { useAIChatBot, useAIChatBotDispatch, } from '@components/Contexts/AI/AIChatBotContext' -import useGetAIFeatures from '../../../AI/Hooks/useGetAIFeatures' +import useGetAIFeatures from '../../../Hooks/useGetAIFeatures' import UserAvatar from '@components/Objects/UserAvatar' type AIActivityAskProps = { diff --git a/apps/web/components/Objects/Activities/DynamicCanva/AI/AICanvaToolkit.tsx b/apps/web/components/Objects/Activities/DynamicCanva/AI/AICanvaToolkit.tsx index 67692c0c..8a9bb0c9 100644 --- a/apps/web/components/Objects/Activities/DynamicCanva/AI/AICanvaToolkit.tsx +++ b/apps/web/components/Objects/Activities/DynamicCanva/AI/AICanvaToolkit.tsx @@ -4,7 +4,7 @@ import learnhouseAI_icon from 'public/learnhouse_ai_simple.png' import Image from 'next/image' import { BookOpen, FormInput, Languages, MoreVertical } from 'lucide-react' import { BubbleMenu } from '@tiptap/react' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' import { AIChatBotStateTypes, useAIChatBot, @@ -14,7 +14,7 @@ import { sendActivityAIChatMessage, startActivityAIChatSession, } from '@services/ai/ai' -import useGetAIFeatures from '../../../../AI/Hooks/useGetAIFeatures' +import useGetAIFeatures from '../../../../Hooks/useGetAIFeatures' import { useLHSession } from '@components/Contexts/LHSessionContext' type AICanvaToolkitProps = { diff --git a/apps/web/components/ContentPlaceHolder.tsx b/apps/web/components/Objects/ContentPlaceHolder.tsx similarity index 87% rename from apps/web/components/ContentPlaceHolder.tsx rename to apps/web/components/Objects/ContentPlaceHolder.tsx index 68c5aa18..b9cb6547 100644 --- a/apps/web/components/ContentPlaceHolder.tsx +++ b/apps/web/components/Objects/ContentPlaceHolder.tsx @@ -1,6 +1,6 @@ 'use client'; import React from 'react' -import useAdminStatus from './Hooks/useAdminStatus' +import useAdminStatus from '../Hooks/useAdminStatus' // Terrible name and terible implementation, need to be refactored asap diff --git a/apps/web/components/Objects/Courses/CourseActions/CoursePaidOptions.tsx b/apps/web/components/Objects/Courses/CourseActions/CoursePaidOptions.tsx index c2537497..67813140 100644 --- a/apps/web/components/Objects/Courses/CourseActions/CoursePaidOptions.tsx +++ b/apps/web/components/Objects/Courses/CourseActions/CoursePaidOptions.tsx @@ -4,8 +4,8 @@ import { useLHSession } from '@components/Contexts/LHSessionContext' import useSWR from 'swr' import { getProductsByCourse, getStripeProductCheckoutSession } from '@services/payments/products' import { RefreshCcw, SquareCheck, ChevronDown, ChevronUp } from 'lucide-react' -import { Badge } from '@components/ui/badge' -import { Button } from '@components/ui/button' +import { Badge } from '@components/Ui/badge' +import { Button } from '@components/Ui/button' import toast from 'react-hot-toast' import { useRouter } from 'next/navigation' import { getUriWithOrg } from '@services/config/config' diff --git a/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx b/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx index 4d5713d5..bbcabe0d 100644 --- a/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx +++ b/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx @@ -9,7 +9,7 @@ import { useMediaQuery } from 'usehooks-ts' import { getUriWithOrg } from '@services/config/config' import { getProductsByCourse } from '@services/payments/products' import { LogIn, LogOut, ShoppingCart, AlertCircle } from 'lucide-react' -import Modal from '@components/StyledElements/Modal/Modal' +import Modal from '@components/Objects/StyledElements/Modal/Modal' import CoursePaidOptions from './CoursePaidOptions' import { checkPaidAccess } from '@services/payments/payments' diff --git a/apps/web/components/Objects/Courses/CourseUpdates/CourseUpdates.tsx b/apps/web/components/Objects/Courses/CourseUpdates/CourseUpdates.tsx index a0709a6e..917f233b 100644 --- a/apps/web/components/Objects/Courses/CourseUpdates/CourseUpdates.tsx +++ b/apps/web/components/Objects/Courses/CourseUpdates/CourseUpdates.tsx @@ -8,7 +8,7 @@ import FormLayout, { FormLabelAndMessage, Input, Textarea, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import { useCourse } from '@components/Contexts/CourseContext' import useSWR, { mutate } from 'swr' import { getAPIUrl } from '@services/config/config' @@ -17,7 +17,7 @@ import useAdminStatus from '@components/Hooks/useAdminStatus' import { useOrg } from '@components/Contexts/OrgContext' import { createCourseUpdate, deleteCourseUpdate } from '@services/courses/updates' import toast from 'react-hot-toast' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import dayjs from 'dayjs'; import relativeTime from 'dayjs/plugin/relativeTime'; import { useLHSession } from '@components/Contexts/LHSessionContext' diff --git a/apps/web/components/Objects/Editor/AI/AIEditorToolkit.tsx b/apps/web/components/Objects/Editor/AI/AIEditorToolkit.tsx index 4b12b60b..e8dd3953 100644 --- a/apps/web/components/Objects/Editor/AI/AIEditorToolkit.tsx +++ b/apps/web/components/Objects/Editor/AI/AIEditorToolkit.tsx @@ -23,7 +23,7 @@ import { sendActivityAIChatMessage, startActivityAIChatSession, } from '@services/ai/ai' -import useGetAIFeatures from '@components/AI/Hooks/useGetAIFeatures' +import useGetAIFeatures from '@components/Hooks/useGetAIFeatures' import { useLHSession } from '@components/Contexts/LHSessionContext' type AIEditorToolkitProps = { diff --git a/apps/web/components/Objects/Editor/Editor.tsx b/apps/web/components/Objects/Editor/Editor.tsx index ddd40192..29d3fd8d 100644 --- a/apps/web/components/Objects/Editor/Editor.tsx +++ b/apps/web/components/Objects/Editor/Editor.tsx @@ -29,7 +29,7 @@ import Table from '@tiptap/extension-table' import TableCell from '@tiptap/extension-table-cell' import TableHeader from '@tiptap/extension-table-header' import TableRow from '@tiptap/extension-table-row' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' import Link from 'next/link' import { getCourseThumbnailMediaDirectory } from '@services/media/media' @@ -47,7 +47,7 @@ import java from 'highlight.js/lib/languages/java' import { CourseProvider } from '@components/Contexts/CourseContext' import { useLHSession } from '@components/Contexts/LHSessionContext' import AIEditorToolkit from './AI/AIEditorToolkit' -import useGetAIFeatures from '@components/AI/Hooks/useGetAIFeatures' +import useGetAIFeatures from '@components/Hooks/useGetAIFeatures' import Collaboration from '@tiptap/extension-collaboration' import CollaborationCursor from '@tiptap/extension-collaboration-cursor' import ActiveAvatars from './ActiveAvatars' diff --git a/apps/web/components/Objects/Editor/EditorWrapper.tsx b/apps/web/components/Objects/Editor/EditorWrapper.tsx index e51180a3..b9c3d7f1 100644 --- a/apps/web/components/Objects/Editor/EditorWrapper.tsx +++ b/apps/web/components/Objects/Editor/EditorWrapper.tsx @@ -3,7 +3,7 @@ import { default as React, useEffect, useRef, useState } from 'react' import Editor from './Editor' import { updateActivity } from '@services/courses/activities' import { toast } from 'react-hot-toast' -import Toast from '@components/StyledElements/Toast/Toast' +import Toast from '@components/Objects/StyledElements/Toast/Toast' import { OrgProvider } from '@components/Contexts/OrgContext' import { useLHSession } from '@components/Contexts/LHSessionContext' diff --git a/apps/web/components/Objects/Editor/Toolbar/ToolbarButtons.tsx b/apps/web/components/Objects/Editor/Toolbar/ToolbarButtons.tsx index 5819bad6..0dc54119 100644 --- a/apps/web/components/Objects/Editor/Toolbar/ToolbarButtons.tsx +++ b/apps/web/components/Objects/Editor/Toolbar/ToolbarButtons.tsx @@ -29,7 +29,7 @@ import { Video, } from 'lucide-react' import { SiYoutube } from '@icons-pack/react-simple-icons' -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' export const ToolbarButtons = ({ editor, props }: any) => { if (!editor) { diff --git a/apps/web/components/Objects/Menus/OrgMenu/OrgMenu.tsx b/apps/web/components/Objects/Menus/OrgMenu.tsx similarity index 100% rename from apps/web/components/Objects/Menus/OrgMenu/OrgMenu.tsx rename to apps/web/components/Objects/Menus/OrgMenu.tsx diff --git a/apps/web/components/Objects/Menus/OrgMenu/OrgMenuLinks.tsx b/apps/web/components/Objects/Menus/OrgMenuLinks.tsx similarity index 100% rename from apps/web/components/Objects/Menus/OrgMenu/OrgMenuLinks.tsx rename to apps/web/components/Objects/Menus/OrgMenuLinks.tsx diff --git a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Assignment.tsx b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Assignment.tsx index 17ea3fbe..f11a4323 100644 --- a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Assignment.tsx +++ b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Assignment.tsx @@ -7,7 +7,7 @@ import FormLayout, { FormMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { BarLoader } from 'react-spinners' import { useOrg } from '@components/Contexts/OrgContext' diff --git a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx index 06d14e55..8c978577 100644 --- a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx +++ b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx @@ -5,7 +5,7 @@ import FormLayout, { FormLabel, FormMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import React, { useState } from 'react' import * as Form from '@radix-ui/react-form' import BarLoader from 'react-spinners/BarLoader' diff --git a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx index 7d6082ab..492d125c 100644 --- a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx +++ b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx @@ -6,7 +6,7 @@ import FormLayout, { FormMessage, Input, Textarea, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import React, { useState } from 'react' import * as Form from '@radix-ui/react-form' import BarLoader from 'react-spinners/BarLoader' diff --git a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx index 0d9ce796..3cc61bd1 100644 --- a/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx +++ b/apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx @@ -5,7 +5,7 @@ import FormLayout, { FormLabel, FormMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import React, { useState } from 'react' import * as Form from '@radix-ui/react-form' import BarLoader from 'react-spinners/BarLoader' diff --git a/apps/web/components/Objects/Modals/Chapters/NewChapter.tsx b/apps/web/components/Objects/Modals/Chapters/NewChapter.tsx index 9976a3a8..dfa4dd86 100644 --- a/apps/web/components/Objects/Modals/Chapters/NewChapter.tsx +++ b/apps/web/components/Objects/Modals/Chapters/NewChapter.tsx @@ -5,7 +5,7 @@ import FormLayout, { Textarea, FormLabel, ButtonBlack, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import { FormMessage } from '@radix-ui/react-form' import * as Form from '@radix-ui/react-form' import React, { useState } from 'react' diff --git a/apps/web/components/Objects/Modals/Course/Create/CreateCourse.tsx b/apps/web/components/Objects/Modals/Course/Create/CreateCourse.tsx index 0d388689..0eb79918 100644 --- a/apps/web/components/Objects/Modals/Course/Create/CreateCourse.tsx +++ b/apps/web/components/Objects/Modals/Course/Create/CreateCourse.tsx @@ -1,12 +1,11 @@ 'use client' -import { Input } from "@/components/ui/input" -import { Textarea } from "@/components/ui/textarea" -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select" -import { Label } from "@/components/ui/label" +import { Input } from "@components/Ui/input" +import { Textarea } from "@components/Ui/textarea" +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@components/Ui/select" import FormLayout, { FormField, FormLabelAndMessage, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { createNewCourse } from '@services/courses/courses' import { getOrganizationContextInfoWithoutCredentials } from '@services/organizations/orgs' @@ -18,9 +17,8 @@ import { useLHSession } from '@components/Contexts/LHSessionContext' import toast from 'react-hot-toast' import { useFormik } from 'formik' import * as Yup from 'yup' -import { getCourseThumbnailMediaDirectory } from '@services/media/media' -import { ArrowBigUpDash, UploadCloud, Image as ImageIcon } from 'lucide-react' -import UnsplashImagePicker from "@components/Dashboard/Course/EditCourseGeneral/UnsplashImagePicker" +import { UploadCloud, Image as ImageIcon } from 'lucide-react' +import UnsplashImagePicker from "@components/Dashboard/Pages/Course/EditCourseGeneral/UnsplashImagePicker" const validationSchema = Yup.object().shape({ name: Yup.string() diff --git a/apps/web/components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup.tsx b/apps/web/components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup.tsx index 705a82bb..7389f50d 100644 --- a/apps/web/components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup.tsx +++ b/apps/web/components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup.tsx @@ -3,7 +3,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { useOrg } from '@components/Contexts/OrgContext' import React from 'react' diff --git a/apps/web/components/Objects/Modals/Dash/OrgUserGroups/EditUserGroup.tsx b/apps/web/components/Objects/Modals/Dash/OrgUserGroups/EditUserGroup.tsx index b0d20fe0..c950415b 100644 --- a/apps/web/components/Objects/Modals/Dash/OrgUserGroups/EditUserGroup.tsx +++ b/apps/web/components/Objects/Modals/Dash/OrgUserGroups/EditUserGroup.tsx @@ -3,7 +3,7 @@ import FormLayout, { FormField, FormLabelAndMessage, Input, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { useOrg } from '@components/Contexts/OrgContext' import React from 'react' diff --git a/apps/web/components/Objects/Modals/Dash/OrgUsers/RolesUpdate.tsx b/apps/web/components/Objects/Modals/Dash/OrgUsers/RolesUpdate.tsx index 681f1d85..9168a7a2 100644 --- a/apps/web/components/Objects/Modals/Dash/OrgUsers/RolesUpdate.tsx +++ b/apps/web/components/Objects/Modals/Dash/OrgUsers/RolesUpdate.tsx @@ -6,7 +6,7 @@ import FormLayout, { Flex, FormField, FormLabel, -} from '@components/StyledElements/Form/Form' +} from '@components/Objects/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { FormMessage } from '@radix-ui/react-form' import { getAPIUrl } from '@services/config/config' diff --git a/apps/web/components/Onboarding/Onboarding.tsx b/apps/web/components/Objects/Onboarding/Onboarding.tsx similarity index 99% rename from apps/web/components/Onboarding/Onboarding.tsx rename to apps/web/components/Objects/Onboarding/Onboarding.tsx index 9fd26726..43b1fd2e 100644 --- a/apps/web/components/Onboarding/Onboarding.tsx +++ b/apps/web/components/Objects/Onboarding/Onboarding.tsx @@ -1,4 +1,4 @@ -import Modal from '@components/StyledElements/Modal/Modal'; +import Modal from '@components/Objects/StyledElements/Modal/Modal'; import Image, { StaticImageData } from 'next/image'; import React, { useEffect, useState } from 'react'; import OnBoardWelcome from '@public/onboarding/OnBoardWelcome.png'; diff --git a/apps/web/components/StyledElements/Buttons/NewCollectionButton.tsx b/apps/web/components/Objects/StyledElements/Buttons/NewCollectionButton.tsx similarity index 100% rename from apps/web/components/StyledElements/Buttons/NewCollectionButton.tsx rename to apps/web/components/Objects/StyledElements/Buttons/NewCollectionButton.tsx diff --git a/apps/web/components/StyledElements/Buttons/NewCourseButton.tsx b/apps/web/components/Objects/StyledElements/Buttons/NewCourseButton.tsx similarity index 100% rename from apps/web/components/StyledElements/Buttons/NewCourseButton.tsx rename to apps/web/components/Objects/StyledElements/Buttons/NewCourseButton.tsx diff --git a/apps/web/components/StyledElements/ConfirmationModal/ConfirmationModal.tsx b/apps/web/components/Objects/StyledElements/ConfirmationModal/ConfirmationModal.tsx similarity index 100% rename from apps/web/components/StyledElements/ConfirmationModal/ConfirmationModal.tsx rename to apps/web/components/Objects/StyledElements/ConfirmationModal/ConfirmationModal.tsx diff --git a/apps/web/components/StyledElements/Error/Error.tsx b/apps/web/components/Objects/StyledElements/Error/Error.tsx similarity index 100% rename from apps/web/components/StyledElements/Error/Error.tsx rename to apps/web/components/Objects/StyledElements/Error/Error.tsx diff --git a/apps/web/components/StyledElements/Form/Form.tsx b/apps/web/components/Objects/StyledElements/Form/Form.tsx similarity index 100% rename from apps/web/components/StyledElements/Form/Form.tsx rename to apps/web/components/Objects/StyledElements/Form/Form.tsx diff --git a/apps/web/components/StyledElements/Info/Info.tsx b/apps/web/components/Objects/StyledElements/Info/Info.tsx similarity index 100% rename from apps/web/components/StyledElements/Info/Info.tsx rename to apps/web/components/Objects/StyledElements/Info/Info.tsx diff --git a/apps/web/components/StyledElements/Modal/Modal.tsx b/apps/web/components/Objects/StyledElements/Modal/Modal.tsx similarity index 96% rename from apps/web/components/StyledElements/Modal/Modal.tsx rename to apps/web/components/Objects/StyledElements/Modal/Modal.tsx index cbfc342f..fe839f61 100644 --- a/apps/web/components/StyledElements/Modal/Modal.tsx +++ b/apps/web/components/Objects/StyledElements/Modal/Modal.tsx @@ -1,7 +1,7 @@ 'use client' import React from 'react' -import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger, DialogFooter } from "@/components/ui/dialog" +import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger, DialogFooter } from "@components/Ui/dialog" import { ButtonBlack } from '../Form/Form' import { cn } from "@/lib/utils" diff --git a/apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx b/apps/web/components/Objects/StyledElements/Titles/TypeOfContentTitle.tsx similarity index 100% rename from apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx rename to apps/web/components/Objects/StyledElements/Titles/TypeOfContentTitle.tsx diff --git a/apps/web/components/StyledElements/Toast/Toast.tsx b/apps/web/components/Objects/StyledElements/Toast/Toast.tsx similarity index 100% rename from apps/web/components/StyledElements/Toast/Toast.tsx rename to apps/web/components/Objects/StyledElements/Toast/Toast.tsx diff --git a/apps/web/components/StyledElements/Tooltip/Tooltip.tsx b/apps/web/components/Objects/StyledElements/Tooltip/Tooltip.tsx similarity index 100% rename from apps/web/components/StyledElements/Tooltip/Tooltip.tsx rename to apps/web/components/Objects/StyledElements/Tooltip/Tooltip.tsx diff --git a/apps/web/components/StyledElements/Wrappers/GeneralWrapper.tsx b/apps/web/components/Objects/StyledElements/Wrappers/GeneralWrapper.tsx similarity index 100% rename from apps/web/components/StyledElements/Wrappers/GeneralWrapper.tsx rename to apps/web/components/Objects/StyledElements/Wrappers/GeneralWrapper.tsx diff --git a/apps/web/components/Objects/Thumbnails/CollectionThumbnail.tsx b/apps/web/components/Objects/Thumbnails/CollectionThumbnail.tsx index d1f92fe4..66847776 100644 --- a/apps/web/components/Objects/Thumbnails/CollectionThumbnail.tsx +++ b/apps/web/components/Objects/Thumbnails/CollectionThumbnail.tsx @@ -1,7 +1,7 @@ 'use client' import { useOrg } from '@components/Contexts/OrgContext' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { getUriWithOrg } from '@services/config/config' import { deleteCollection } from '@services/courses/collections' import { getCourseThumbnailMediaDirectory } from '@services/media/media' diff --git a/apps/web/components/Objects/Thumbnails/CourseThumbnail.tsx b/apps/web/components/Objects/Thumbnails/CourseThumbnail.tsx index dbb2a85d..9871dff4 100644 --- a/apps/web/components/Objects/Thumbnails/CourseThumbnail.tsx +++ b/apps/web/components/Objects/Thumbnails/CourseThumbnail.tsx @@ -1,7 +1,7 @@ 'use client' import { useOrg } from '@components/Contexts/OrgContext' import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { getUriWithOrg } from '@services/config/config' import { deleteCourseFromBackend } from '@services/courses/courses' import { getCourseThumbnailMediaDirectory } from '@services/media/media' @@ -17,7 +17,7 @@ import { DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, -} from "@/components/ui/dropdown-menu" +} from "@components/Ui/dropdown-menu" type Course = { course_uuid: string diff --git a/apps/web/components/Watermark.tsx b/apps/web/components/Objects/Watermark.tsx similarity index 94% rename from apps/web/components/Watermark.tsx rename to apps/web/components/Objects/Watermark.tsx index ff06fb4c..9d4998b0 100644 --- a/apps/web/components/Watermark.tsx +++ b/apps/web/components/Objects/Watermark.tsx @@ -2,7 +2,7 @@ import Image from 'next/image' import Link from 'next/link' import blacklogo from '@public/black_logo.png' import React, { useEffect } from 'react' -import { useOrg } from './Contexts/OrgContext' +import { useOrg } from '../Contexts/OrgContext' function Watermark() { const org = useOrg() as any diff --git a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx index e45c75e5..95eef6ad 100644 --- a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx +++ b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx @@ -15,7 +15,7 @@ import { import { mutate } from 'swr' import { revalidateTags } from '@services/utils/ts/requests' import { useRouter } from 'next/navigation' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { deleteActivity, updateActivity } from '@services/courses/activities' import { useLHSession } from '@components/Contexts/LHSessionContext' diff --git a/apps/web/components/Pages/CourseEdit/Draggables/Chapter.tsx b/apps/web/components/Pages/CourseEdit/Draggables/Chapter.tsx index 2e449210..fa8b6cea 100644 --- a/apps/web/components/Pages/CourseEdit/Draggables/Chapter.tsx +++ b/apps/web/components/Pages/CourseEdit/Draggables/Chapter.tsx @@ -3,7 +3,7 @@ import styled from 'styled-components' import { Droppable, Draggable } from 'react-beautiful-dnd' import Activity from './Activity' import { Hexagon, MoreVertical, Pencil, Save, Sparkles, X } from 'lucide-react' -import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal' +import ConfirmationModal from '@components/Objects/StyledElements/ConfirmationModal/ConfirmationModal' import { useRouter } from 'next/navigation' import { updateChapter } from '@services/courses/chapters' import { mutate } from 'swr' diff --git a/apps/web/components/Pages/Courses/ActivityIndicators.tsx b/apps/web/components/Pages/Courses/ActivityIndicators.tsx index 43362651..a979c612 100644 --- a/apps/web/components/Pages/Courses/ActivityIndicators.tsx +++ b/apps/web/components/Pages/Courses/ActivityIndicators.tsx @@ -1,4 +1,4 @@ -import ToolTip from '@components/StyledElements/Tooltip/Tooltip' +import ToolTip from '@components/Objects/StyledElements/Tooltip/Tooltip' import { getUriWithOrg } from '@services/config/config' import Link from 'next/link' import React from 'react' diff --git a/apps/web/components/Pages/Payments/UnconfiguredPaymentsDisclaimer.tsx b/apps/web/components/Pages/Payments/UnconfiguredPaymentsDisclaimer.tsx index 1ed9bc08..a87f0df2 100644 --- a/apps/web/components/Pages/Payments/UnconfiguredPaymentsDisclaimer.tsx +++ b/apps/web/components/Pages/Payments/UnconfiguredPaymentsDisclaimer.tsx @@ -1,5 +1,5 @@ import { Settings, ChevronRight, CreditCard } from 'lucide-react' -import { Alert, AlertTitle, AlertDescription } from '@components/ui/alert' +import { Alert, AlertTitle, AlertDescription } from '@components/Ui/alert' import { AlertTriangle, ShoppingCart, Users } from 'lucide-react' import React from 'react' import Link from 'next/link' diff --git a/apps/web/components/Security/HeaderProfileBox.tsx b/apps/web/components/Security/HeaderProfileBox.tsx index df9337f1..6fbddd2b 100644 --- a/apps/web/components/Security/HeaderProfileBox.tsx +++ b/apps/web/components/Security/HeaderProfileBox.tsx @@ -8,7 +8,7 @@ import useAdminStatus from '@components/Hooks/useAdminStatus' import { useLHSession } from '@components/Contexts/LHSessionContext' import { useOrg } from '@components/Contexts/OrgContext' import { getUriWithoutOrg } from '@services/config/config' -import Tooltip from '@components/StyledElements/Tooltip/Tooltip' +import Tooltip from '@components/Objects/StyledElements/Tooltip/Tooltip' export const HeaderProfileBox = () => { const session = useLHSession() as any diff --git a/apps/web/components/ui/toggle-group.tsx b/apps/web/components/ui/toggle-group.tsx index 1c876bbe..41063bda 100644 --- a/apps/web/components/ui/toggle-group.tsx +++ b/apps/web/components/ui/toggle-group.tsx @@ -5,7 +5,7 @@ import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group" import { type VariantProps } from "class-variance-authority" import { cn } from "@/lib/utils" -import { toggleVariants } from "@/components/ui/toggle" +import { toggleVariants } from "@components/Ui/toggle" const ToggleGroupContext = React.createContext< VariantProps diff --git a/apps/web/services/courses/chapters.ts b/apps/web/services/courses/chapters.ts index f04c5b37..6b924904 100644 --- a/apps/web/services/courses/chapters.ts +++ b/apps/web/services/courses/chapters.ts @@ -1,4 +1,4 @@ -import { OrderPayload } from '@components/Dashboard/Course/EditCourseStructure/EditCourseStructure' +import { OrderPayload } from '@components/Dashboard/Pages/Course/EditCourseStructure/EditCourseStructure' import { getAPIUrl } from '@services/config/config' import { RequestBodyWithAuthHeader,