diff --git a/front/app/editor/course/[courseid]/activity/[activityid]/edit/loading.tsx b/front/app/editor/course/[courseid]/activity/[activityid]/edit/loading.tsx index b3fd3bc3..3f902486 100644 --- a/front/app/editor/course/[courseid]/activity/[activityid]/edit/loading.tsx +++ b/front/app/editor/course/[courseid]/activity/[activityid]/edit/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { // Or a custom loading skeleton component diff --git a/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx b/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx index 2be18fae..37c19000 100644 --- a/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx +++ b/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx @@ -1,7 +1,7 @@ import { default as React, } from "react"; import { useRouter } from "next/navigation"; import AuthProvider from "@components/Security/AuthProvider"; -import EditorWrapper from "@components/Editor/EditorWrapper"; +import EditorWrapper from "@components/Objects/Editor/EditorWrapper"; import { getAPIUrl } from "@services/config/config"; import { swrFetcher } from "@services/utils/ts/requests"; import { getOrganizationContextInfo } from "@services/organizations/orgs"; diff --git a/front/app/layout.tsx b/front/app/layout.tsx index dfad1471..84c73f3a 100644 --- a/front/app/layout.tsx +++ b/front/app/layout.tsx @@ -1,6 +1,6 @@ "use client"; import "../styles/globals.css"; -import StyledComponentsRegistry from "../components/UI/libs/styled-registry"; +import StyledComponentsRegistry from "../components/Utils/libs/styled-registry"; import { motion } from "framer-motion"; export default function RootLayout({ children }: { children: React.ReactNode }) { diff --git a/front/app/organizations/new/page.tsx b/front/app/organizations/new/page.tsx index d80467e0..df43c47b 100644 --- a/front/app/organizations/new/page.tsx +++ b/front/app/organizations/new/page.tsx @@ -1,6 +1,5 @@ "use client"; import React from "react"; -import { Title } from "../../../components/UI/Elements/Styles/Title"; import { createNewOrganization } from "../../../services/organizations/orgs"; const Organizations = () => { @@ -35,7 +34,7 @@ const Organizations = () => { return (
- New Organization +
New Organization
Name:
Description: diff --git a/front/app/organizations/page.tsx b/front/app/organizations/page.tsx index 84b3fb64..e2654448 100644 --- a/front/app/organizations/page.tsx +++ b/front/app/organizations/page.tsx @@ -1,7 +1,6 @@ "use client"; //todo: use server components import Link from "next/link"; import React from "react"; -import { Title } from "../../components/UI/Elements/Styles/Title"; import { deleteOrganizationFromBackend } from "@services/organizations/orgs"; import useSWR, { mutate } from "swr"; import { swrFetcher } from "@services/utils/ts/requests"; @@ -19,14 +18,14 @@ const Organizations = () => { return ( <> - + <div className="font-bold text-lg"> Your Organizations{" "} <Link href="/organizations/new"> <button className="bg-blue-500 text-white px-2 py-1 rounded-md hover:bg-blue-600 focus:outline-none"> + </button> </Link> - +
{error &&

Failed to load

} diff --git a/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx b/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx index 9e4c3efb..8bac23db 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx @@ -1,6 +1,6 @@ 'use client'; // Error components must be Client Components -import ErrorUI from '@components/UI/Error/Error'; +import ErrorUI from '@components/StyledElements/Error/Error'; import { useEffect } from 'react'; export default function Error({ diff --git a/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/loading.tsx b/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/loading.tsx index 9a7cafe9..ec352ab7 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/loading.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { return ( diff --git a/front/app/orgs/[orgslug]/(withmenu)/collections/loading.tsx b/front/app/orgs/[orgslug]/(withmenu)/collections/loading.tsx index b3fd3bc3..3f902486 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/collections/loading.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/collections/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { // Or a custom loading skeleton component diff --git a/front/app/orgs/[orgslug]/(withmenu)/collections/new/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/collections/new/page.tsx index 553d3468..62b20dfe 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/collections/new/page.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/collections/new/page.tsx @@ -1,7 +1,6 @@ "use client"; import { useRouter } from "next/navigation"; import React from "react"; -import { Title } from "@components/UI/Elements/Styles/Title"; import { createCollection } from "@services/courses/collections"; import useSWR from "swr"; import { getAPIUrl, getUriWithOrg } from "@services/config/config"; @@ -54,7 +53,7 @@ function NewCollection(params: any) { return ( <>
- Add new +
Add new
{ const collections = await getOrgCollectionsWithAuthHeader(org_id, access_token_cookie ? access_token_cookie.value : null); return ( -
+
- + <TypeOfContentTitle title="Collections" type="col" /> <Link className="flex justify-center" href={getUriWithOrg(orgslug, "/collections/new")}> <button className="rounded-md bg-black antialiased ring-offset-purple-800 p-2 px-5 my-auto font text-sm font-bold text-white drop-shadow-lg">Add Collection + </button> </Link> </div> <div className="home_collections flex flex-wrap"> {collections.map((collection: any) => ( - <div className="pr-8 flex flex-col" key={collection.collection_id}> + <div className="flex flex-col py-3 px-3" key={collection.collection_id}> <CollectionAdminEditsArea org_id={org_id} collection_id={collection.collection_id} collection={collection} /> <Link href={getUriWithOrg(orgslug, "/collection/" + removeCollectionPrefix(collection.collection_id))}> <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-[249px] h-[180px] bg-cover flex flex-col items-center justify-center bg-indigo-600 font-bold text-zinc-50" > @@ -68,7 +69,7 @@ const CollectionsPage = async (params: any) => { </div> ))} </div> - </div> + </GeneralWrapperStyled> ); } diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/activity.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/activity.tsx index 285784c1..068cd078 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/activity.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/activity.tsx @@ -8,7 +8,7 @@ import VideoActivity from "@components/Pages/Activities/Video/Video"; import useSWR, { mutate } from "swr"; import { Check } from "lucide-react"; import { markActivityAsComplete } from "@services/courses/activity"; -import ToolTip from "@components/UI/Tooltip/Tooltip"; +import ToolTip from "@components/StyledElements/Tooltip/Tooltip"; import DocumentPdfActivity from "@components/Pages/Activities/DocumentPdf/DocumentPdf"; import ActivityIndicators from "@components/Pages/Courses/ActivityIndicators"; diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/error.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/error.tsx index 9e4c3efb..8bac23db 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/error.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/error.tsx @@ -1,6 +1,6 @@ 'use client'; // Error components must be Client Components -import ErrorUI from '@components/UI/Error/Error'; +import ErrorUI from '@components/StyledElements/Error/Error'; import { useEffect } from 'react'; export default function Error({ diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/loading.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/loading.tsx index b3fd3bc3..3f902486 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/loading.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { // Or a custom loading skeleton component diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/course.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/course.tsx index cb29bdcb..2e2580a4 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/course.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/course.tsx @@ -6,11 +6,12 @@ import React, { use } from "react"; import styled from "styled-components"; import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config"; import useSWR, { mutate } from "swr"; -import ToolTip from "@components/UI/Tooltip/Tooltip"; -import PageLoading from "@components/Pages/PageLoading"; +import ToolTip from "@components/StyledElements/Tooltip/Tooltip"; +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"; const CourseClient = (props: any) => { const courseid = props.courseid; @@ -40,7 +41,7 @@ const CourseClient = (props: any) => { {!course ? ( <PageLoading></PageLoading> ) : ( - <div className="max-w-7xl mx-auto px-4 py-10 tracking-tight"> + <GeneralWrapperStyled> <div className="pb-3"> <p className="text-md font-bold text-gray-400 pb-2">Course</p> <h1 className="text-3xl -mt-3 font-bold"> @@ -107,7 +108,7 @@ const CourseClient = (props: any) => { )} </div> </div> - </div> + </GeneralWrapperStyled> )} </> ); diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx index 3d9790c0..423fa6f9 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx @@ -3,17 +3,16 @@ import React from "react"; import { useState, useEffect } from "react"; import styled from "styled-components"; -import { Title } from "@components/UI/Elements/Styles/Title"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; import { initialData, initialData2 } from "@components/Pages/CourseEdit/Draggables/data"; import Chapter from "@components/Pages/CourseEdit/Draggables/Chapter"; import { createChapter, deleteChapter, getCourseChaptersMetadata, updateChaptersMetadata } from "@services/courses/chapters"; import { useRouter } from "next/navigation"; -import NewChapterModal from "@components/Modals/Chapters/NewChapter"; -import NewActivityModal from "@components/Modals/Activities/Create/NewActivity"; +import NewChapterModal from "@components/Objects/Modals/Chapters/NewChapter"; +import NewActivityModal from "@components/Objects/Modals/Activities/Create/NewActivity"; import { createActivity, createFileActivity, createExternalVideoActivity } from "@services/courses/activities"; import { getOrganizationContextInfo } from "@services/organizations/orgs"; -import Modal from "@components/UI/Modal/Modal"; +import Modal from "@components/StyledElements/Modal/Modal"; import { denyAccessToUser } from "@services/utils/react/middlewares/views"; import { Folders, Package2 } from "lucide-react"; @@ -242,7 +241,7 @@ function CourseEdit(params: any) { return ( <> <Page> - <Title> + <div className="font-bold text-lg"> Edit Course {" "} @@ -253,7 +252,7 @@ function CourseEdit(params: any) { > Save </button> - +
-
+
- + <TypeOfContentTitle title="Courses" type="cou" /> <Modal isDialogOpen={newCourseModal} onOpenChange={setNewCourseModal} @@ -79,24 +79,13 @@ function Courses(props: CourseProps) { ))} </div> - </div> + </GeneralWrapperStyled> </div> ) } -export const Title = (props: any) => { - return ( - <div className="home_category_title flex my-5"> - <div className="rounded-full ring-1 ring-slate-900/5 shadow-sm p-2 my-auto mr-4"> - <Image className="" src={props.type == "col" ? CollectionsLogo : CoursesLogo} alt="Courses logo" /> - </div> - <h1 className="font-bold text-lg">{props.title}</h1> - </div> - ) -} - const AdminEditsArea = (props: any) => { const org_roles_values = ["admin", "owner"]; const user_roles_values = ["role_admin"]; diff --git a/front/app/orgs/[orgslug]/(withmenu)/courses/error.tsx b/front/app/orgs/[orgslug]/(withmenu)/courses/error.tsx index 9e4c3efb..8bac23db 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/courses/error.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/courses/error.tsx @@ -1,6 +1,6 @@ 'use client'; // Error components must be Client Components -import ErrorUI from '@components/UI/Error/Error'; +import ErrorUI from '@components/StyledElements/Error/Error'; import { useEffect } from 'react'; export default function Error({ diff --git a/front/app/orgs/[orgslug]/(withmenu)/courses/loading.tsx b/front/app/orgs/[orgslug]/(withmenu)/courses/loading.tsx index b3fd3bc3..3f902486 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/courses/loading.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/courses/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { // Or a custom loading skeleton component diff --git a/front/app/orgs/[orgslug]/(withmenu)/error.tsx b/front/app/orgs/[orgslug]/(withmenu)/error.tsx index 9e4c3efb..8bac23db 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/error.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/error.tsx @@ -1,6 +1,6 @@ 'use client'; // Error components must be Client Components -import ErrorUI from '@components/UI/Error/Error'; +import ErrorUI from '@components/StyledElements/Error/Error'; import { useEffect } from 'react'; export default function Error({ diff --git a/front/app/orgs/[orgslug]/(withmenu)/layout.tsx b/front/app/orgs/[orgslug]/(withmenu)/layout.tsx index 05df761a..f26f3813 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/layout.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/layout.tsx @@ -1,5 +1,5 @@ import "@styles/globals.css"; -import { Menu } from "@components/UI/Elements/Menu/Menu"; +import { Menu } from "@components/Objects/Menu/Menu"; import AuthProvider from "@components/Security/AuthProvider"; export default async function RootLayout({ children, params }: { children: React.ReactNode , params:any}) { diff --git a/front/app/orgs/[orgslug]/(withmenu)/loading.tsx b/front/app/orgs/[orgslug]/(withmenu)/loading.tsx index 9a7cafe9..ec352ab7 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/loading.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/loading.tsx @@ -1,4 +1,4 @@ -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; export default function Loading() { return ( diff --git a/front/app/orgs/[orgslug]/(withmenu)/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/page.tsx index d9484001..046bda78 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/page.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/page.tsx @@ -2,14 +2,15 @@ export const dynamic = 'force-dynamic'; import { Metadata, ResolvingMetadata } from 'next'; import { getBackendUrl, getUriWithOrg } from "@services/config/config"; import { getCourse, getOrgCourses, getOrgCoursesWithAuthHeader } from "@services/courses/courses"; -import CoursesLogo from "public/svg/courses.svg"; -import CollectionsLogo from "public/svg/collections.svg"; + import Link from "next/link"; import Image from "next/image"; import { getOrgCollections, getOrgCollectionsWithAuthHeader } from "@services/courses/collections"; import { getOrganizationContextInfo } from '@services/organizations/orgs'; import { cookies } from 'next/headers'; +import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper'; +import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle'; type MetadataProps = { params: { orgslug: string }; @@ -50,12 +51,12 @@ const OrgHomePage = async (params: any) => { return ( <div> - <div className="max-w-7xl mx-auto px-4 py-10"> + <GeneralWrapperStyled> {/* Collections */} - <Title title="Collections" type="col" /> + <TypeOfContentTitle title="Collections" type="col" /> <div className="home_collections flex flex-wrap"> {collections.map((collection: any) => ( - <div className="pr-8 flex flex-col" key={collection.collection_id}> + <div className="flex flex-col py-3 px-3" key={collection.collection_id}> <Link href={getUriWithOrg(orgslug, "/collection/" + removeCollectionPrefix(collection.collection_id))}> <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-[249px] h-[180px] bg-cover flex flex-col items-center justify-center bg-indigo-600 font-bold text-zinc-50" > <h1 className="font-bold text-lg py-2 justify-center mb-2">{collection.name}</h1> @@ -74,35 +75,23 @@ const OrgHomePage = async (params: any) => { {/* Courses */} <div className='h-5'></div> - <Title title="Courses" type="cou" /> + <TypeOfContentTitle title="Courses" type="cou" /> <div className="home_courses flex flex-wrap"> {courses.map((course: any) => ( - <div className="pr-8" key={course.course_id}> + <div className="py-3 px-3" key={course.course_id}> <Link href={getUriWithOrg(orgslug, "/course/" + removeCoursePrefix(course.course_id))}> - <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-[249px] h-[131px] bg-cover" style={{ backgroundImage: `url(${getBackendUrl()}content/uploads/img/${course.thumbnail})` }}> + <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-[249px] h-[131px] bg-cover transition-all hover:scale-102" style={{ backgroundImage: `url(${getBackendUrl()}content/uploads/img/${course.thumbnail})` }}> </div> </Link> <h2 className="font-bold text-lg w-[250px] py-2">{course.name}</h2> </div> ))} </div> - </div> + </GeneralWrapperStyled> </div> ); }; - const Title = (props: any) => { - return ( - <div className="home_category_title flex my-5 items-center"> - <div className="rounded-full ring-1 ring-slate-900/5 shadow-sm p-2 my-auto mr-4"> - <Image className="" src={props.type == "col" ? CollectionsLogo : CoursesLogo} alt="Courses logo" /> - </div> - <h1 className="font-bold text-2xl">{props.title}</h1> - </div> - ) -} - - export default OrgHomePage; diff --git a/front/app/orgs/[orgslug]/(withmenu)/trail/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/trail/page.tsx index b44645af..b32c1463 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/trail/page.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/trail/page.tsx @@ -1,5 +1,7 @@ "use client"; -import PageLoading from "@components/Pages/PageLoading"; +import PageLoading from "@components/Objects/Loaders/PageLoading"; +import TypeOfContentTitle from "@components/StyledElements/Titles/TypeOfContentTitle"; +import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper"; import { getAPIUrl, getBackendUrl } from "@services/config/config"; import { swrFetcher } from "@services/utils/ts/requests"; import React from "react"; @@ -12,10 +14,8 @@ function Trail(params: any) { return ( - <TrailLayout> - <h1>Trail</h1> - <br /> - {error && <p>Failed to load</p>} + <GeneralWrapperStyled> + <TypeOfContentTitle title="Trail" type="tra" /> {!trail ? ( <PageLoading></PageLoading> ) : ( @@ -36,19 +36,13 @@ function Trail(params: any) { ))} </div> )} - </TrailLayout> + </GeneralWrapperStyled> ); } export default Trail; -const TrailLayout = styled.div` - display: flex; - margin: 0 auto; - width: 1300px; - height: 100%; - flex-direction: column; -`; + const TrailMetadata = styled.div` display: flex; diff --git a/front/app/orgs/[orgslug]/login/page.tsx b/front/app/orgs/[orgslug]/login/page.tsx index f64a72a2..fed24301 100644 --- a/front/app/orgs/[orgslug]/login/page.tsx +++ b/front/app/orgs/[orgslug]/login/page.tsx @@ -4,10 +4,10 @@ import React, { useState } from "react"; import { styled } from '@stitches/react'; import { Title } from "../../../../components/UI/Elements/Styles/Title"; import { loginAndGetToken } from "../../../../services/auth/auth"; -import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input } from '@components/UI/Form/Form'; +import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input } from '@components/StyledElements/Form/Form'; import * as Form from '@radix-ui/react-form'; import { BarLoader } from 'react-spinners'; -import Toast from '@components/UI/Toast/Toast'; +import Toast from '@components/StyledElements/Toast/Toast'; import { toast } from 'react-hot-toast'; const Login = () => { diff --git a/front/app/orgs/[orgslug]/signup/page.tsx b/front/app/orgs/[orgslug]/signup/page.tsx index 3f0fc0db..29e13ff8 100644 --- a/front/app/orgs/[orgslug]/signup/page.tsx +++ b/front/app/orgs/[orgslug]/signup/page.tsx @@ -1,6 +1,5 @@ "use client"; import React from "react"; -import { Title } from "../../../../components/UI/Elements/Styles/Title"; import { signup } from "../../../../services/auth/auth"; import { useRouter } from "next/navigation"; @@ -39,9 +38,8 @@ const SignUp = (params: any) => { return ( <div> <div title="Sign up"> - <Title>Sign up +
Sign up
- {/* Create a login ui with tailwindcss */}
diff --git a/front/components/Editor/Editor.tsx b/front/components/Objects/Editor/Editor.tsx similarity index 98% rename from front/components/Editor/Editor.tsx rename to front/components/Objects/Editor/Editor.tsx index 19cfee84..a9b77fb8 100644 --- a/front/components/Editor/Editor.tsx +++ b/front/components/Objects/Editor/Editor.tsx @@ -4,7 +4,7 @@ import { useEditor, EditorContent } from "@tiptap/react"; import StarterKit from "@tiptap/starter-kit"; import Collaboration from "@tiptap/extension-collaboration"; import CollaborationCursor from "@tiptap/extension-collaboration-cursor"; -import { AuthContext } from "../Security/AuthProvider"; +import { AuthContext } from "../../Security/AuthProvider"; import learnhouseIcon from "public/learnhouse_icon.png"; import { ToolbarButtons } from "./Toolbar/ToolbarButtons"; import { motion, AnimatePresence } from "framer-motion"; @@ -23,7 +23,7 @@ import { Eye, Save } from "lucide-react"; import MathEquationBlock from "./Extensions/MathEquation/MathEquationBlock"; import PDFBlock from "./Extensions/PDF/PDFBlock"; import QuizBlock from "./Extensions/Quiz/QuizBlock"; -import ToolTip from "@components/UI/Tooltip/Tooltip"; +import ToolTip from "@components/StyledElements/Tooltip/Tooltip"; import Link from "next/link"; interface Editor { diff --git a/front/components/Editor/EditorWrapper.tsx b/front/components/Objects/Editor/EditorWrapper.tsx similarity index 96% rename from front/components/Editor/EditorWrapper.tsx rename to front/components/Objects/Editor/EditorWrapper.tsx index 3119a71e..ed09a6d9 100644 --- a/front/components/Editor/EditorWrapper.tsx +++ b/front/components/Objects/Editor/EditorWrapper.tsx @@ -5,7 +5,7 @@ import { WebrtcProvider } from "y-webrtc"; import Editor from "./Editor"; import { updateActivity } from "@services/courses/activities"; import { toast } from "react-hot-toast"; -import Toast from "@components/UI/Toast/Toast"; +import Toast from "@components/StyledElements/Toast/Toast"; interface EditorWrapperProps { content: string; diff --git a/front/components/Editor/Extensions/Callout/Info/InfoCallout.ts b/front/components/Objects/Editor/Extensions/Callout/Info/InfoCallout.ts similarity index 100% rename from front/components/Editor/Extensions/Callout/Info/InfoCallout.ts rename to front/components/Objects/Editor/Extensions/Callout/Info/InfoCallout.ts diff --git a/front/components/Editor/Extensions/Callout/Info/InfoCalloutComponent.tsx b/front/components/Objects/Editor/Extensions/Callout/Info/InfoCalloutComponent.tsx similarity index 100% rename from front/components/Editor/Extensions/Callout/Info/InfoCalloutComponent.tsx rename to front/components/Objects/Editor/Extensions/Callout/Info/InfoCalloutComponent.tsx diff --git a/front/components/Editor/Extensions/Callout/Warning/WarningCallout.ts b/front/components/Objects/Editor/Extensions/Callout/Warning/WarningCallout.ts similarity index 100% rename from front/components/Editor/Extensions/Callout/Warning/WarningCallout.ts rename to front/components/Objects/Editor/Extensions/Callout/Warning/WarningCallout.ts diff --git a/front/components/Editor/Extensions/Callout/Warning/WarningCalloutComponent.tsx b/front/components/Objects/Editor/Extensions/Callout/Warning/WarningCalloutComponent.tsx similarity index 100% rename from front/components/Editor/Extensions/Callout/Warning/WarningCalloutComponent.tsx rename to front/components/Objects/Editor/Extensions/Callout/Warning/WarningCalloutComponent.tsx diff --git a/front/components/Editor/Extensions/Image/ImageBlock.ts b/front/components/Objects/Editor/Extensions/Image/ImageBlock.ts similarity index 100% rename from front/components/Editor/Extensions/Image/ImageBlock.ts rename to front/components/Objects/Editor/Extensions/Image/ImageBlock.ts diff --git a/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx b/front/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx similarity index 95% rename from front/components/Editor/Extensions/Image/ImageBlockComponent.tsx rename to front/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx index 0751e19c..0825fa13 100644 --- a/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx +++ b/front/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx @@ -5,8 +5,8 @@ import { Resizable } from 're-resizable'; import * as AspectRatio from '@radix-ui/react-aspect-ratio'; import { AlertCircle, AlertTriangle, Image, ImagePlus, Info } from "lucide-react"; -import { getImageFile, uploadNewImageFile } from "../../../../services/blocks/Image/images"; -import { getBackendUrl } from "../../../../services/config/config"; +import { getImageFile, uploadNewImageFile } from "../../../../../services/blocks/Image/images"; +import { getBackendUrl } from "../../../../../services/config/config"; function ImageBlockComponent(props: any) { const [image, setImage] = React.useState(null); diff --git a/front/components/Editor/Extensions/MathEquation/MathEquationBlock.ts b/front/components/Objects/Editor/Extensions/MathEquation/MathEquationBlock.ts similarity index 100% rename from front/components/Editor/Extensions/MathEquation/MathEquationBlock.ts rename to front/components/Objects/Editor/Extensions/MathEquation/MathEquationBlock.ts diff --git a/front/components/Editor/Extensions/MathEquation/MathEquationBlockComponent.tsx b/front/components/Objects/Editor/Extensions/MathEquation/MathEquationBlockComponent.tsx similarity index 100% rename from front/components/Editor/Extensions/MathEquation/MathEquationBlockComponent.tsx rename to front/components/Objects/Editor/Extensions/MathEquation/MathEquationBlockComponent.tsx diff --git a/front/components/Editor/Extensions/PDF/PDFBlock.ts b/front/components/Objects/Editor/Extensions/PDF/PDFBlock.ts similarity index 100% rename from front/components/Editor/Extensions/PDF/PDFBlock.ts rename to front/components/Objects/Editor/Extensions/PDF/PDFBlock.ts diff --git a/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx b/front/components/Objects/Editor/Extensions/PDF/PDFBlockComponent.tsx similarity index 93% rename from front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx rename to front/components/Objects/Editor/Extensions/PDF/PDFBlockComponent.tsx index eaf8bc7f..52c125d0 100644 --- a/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx +++ b/front/components/Objects/Editor/Extensions/PDF/PDFBlockComponent.tsx @@ -2,8 +2,8 @@ import { NodeViewWrapper } from "@tiptap/react"; import React from "react"; import styled from "styled-components"; import { AlertCircle, AlertTriangle, FileText, Image, ImagePlus, Info } from "lucide-react"; -import { getPDFFile, uploadNewPDFFile } from "../../../../services/blocks/Pdf/pdf"; -import { getBackendUrl } from "../../../../services/config/config"; +import { getPDFFile, uploadNewPDFFile } from "../../../../../services/blocks/Pdf/pdf"; +import { getBackendUrl } from "../../../../../services/config/config"; function PDFBlockComponent(props: any) { const [pdf, setPDF] = React.useState(null); diff --git a/front/components/Editor/Extensions/Quiz/QuizBlock.ts b/front/components/Objects/Editor/Extensions/Quiz/QuizBlock.ts similarity index 100% rename from front/components/Editor/Extensions/Quiz/QuizBlock.ts rename to front/components/Objects/Editor/Extensions/Quiz/QuizBlock.ts diff --git a/front/components/Editor/Extensions/Quiz/QuizBlockComponent.tsx b/front/components/Objects/Editor/Extensions/Quiz/QuizBlockComponent.tsx similarity index 100% rename from front/components/Editor/Extensions/Quiz/QuizBlockComponent.tsx rename to front/components/Objects/Editor/Extensions/Quiz/QuizBlockComponent.tsx diff --git a/front/components/Editor/Extensions/Video/VideoBlock.ts b/front/components/Objects/Editor/Extensions/Video/VideoBlock.ts similarity index 100% rename from front/components/Editor/Extensions/Video/VideoBlock.ts rename to front/components/Objects/Editor/Extensions/Video/VideoBlock.ts diff --git a/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx b/front/components/Objects/Editor/Extensions/Video/VideoBlockComponent.tsx similarity index 94% rename from front/components/Editor/Extensions/Video/VideoBlockComponent.tsx rename to front/components/Objects/Editor/Extensions/Video/VideoBlockComponent.tsx index cb324c52..2911d8ec 100644 --- a/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx +++ b/front/components/Objects/Editor/Extensions/Video/VideoBlockComponent.tsx @@ -2,8 +2,8 @@ import { NodeViewWrapper } from "@tiptap/react"; import { AlertTriangle, Image, Video } from "lucide-react"; import React from "react"; import styled from "styled-components"; -import { getBackendUrl } from "../../../../services/config/config"; -import { uploadNewVideoFile } from "../../../../services/blocks/Video/video"; +import { getBackendUrl } from "../../../../../services/config/config"; +import { uploadNewVideoFile } from "../../../../../services/blocks/Video/video"; function VideoBlockComponents(props: any) { const [video, setVideo] = React.useState(null); diff --git a/front/components/Editor/Toolbar/ToolbarButtons.tsx b/front/components/Objects/Editor/Toolbar/ToolbarButtons.tsx similarity index 98% rename from front/components/Editor/Toolbar/ToolbarButtons.tsx rename to front/components/Objects/Editor/Toolbar/ToolbarButtons.tsx index 3dd9fcac..7f04b6c7 100644 --- a/front/components/Editor/Toolbar/ToolbarButtons.tsx +++ b/front/components/Objects/Editor/Toolbar/ToolbarButtons.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import { FontBoldIcon, FontItalicIcon, StrikethroughIcon, ArrowLeftIcon, ArrowRightIcon, OpacityIcon, DividerVerticalIcon } from "@radix-ui/react-icons"; import { AlertCircle, AlertTriangle, FileText, GraduationCap, ImagePlus, Info, Sigma, Video, Youtube } from "lucide-react"; -import ToolTip from "@components/UI/Tooltip/Tooltip"; +import ToolTip from "@components/StyledElements/Tooltip/Tooltip"; export const ToolbarButtons = ({ editor, props }: any) => { if (!editor) { diff --git a/front/components/Pages/PageLoading.tsx b/front/components/Objects/Loaders/PageLoading.tsx similarity index 100% rename from front/components/Pages/PageLoading.tsx rename to front/components/Objects/Loaders/PageLoading.tsx diff --git a/front/components/UI/Elements/Menu/Menu.tsx b/front/components/Objects/Menu/Menu.tsx similarity index 99% rename from front/components/UI/Elements/Menu/Menu.tsx rename to front/components/Objects/Menu/Menu.tsx index 52e8dbf3..4baf3e1d 100644 --- a/front/components/UI/Elements/Menu/Menu.tsx +++ b/front/components/Objects/Menu/Menu.tsx @@ -3,7 +3,7 @@ import React from "react"; import Link from "next/link"; import { getBackendUrl, getUriWithOrg } from "@services/config/config"; import { getOrganizationContextInfo } from "@services/organizations/orgs"; -import ClientComponentSkeleton from "@components/UI/Utils/ClientComp"; +import ClientComponentSkeleton from "@components/Utils/ClientComp"; import { HeaderProfileBox } from "@components/Security/HeaderProfileBox"; export const Menu = async (props: any) => { diff --git a/front/components/UI/Elements/Menu/ProfileArea.tsx b/front/components/Objects/Menu/ProfileArea.tsx similarity index 100% rename from front/components/UI/Elements/Menu/ProfileArea.tsx rename to front/components/Objects/Menu/ProfileArea.tsx diff --git a/front/components/Modals/Activities/Create/NewActivity.tsx b/front/components/Objects/Modals/Activities/Create/NewActivity.tsx similarity index 100% rename from front/components/Modals/Activities/Create/NewActivity.tsx rename to front/components/Objects/Modals/Activities/Create/NewActivity.tsx diff --git a/front/components/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx b/front/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx similarity index 96% rename from front/components/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx rename to front/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx index 01310a84..c231271d 100644 --- a/front/components/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx +++ b/front/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx @@ -1,4 +1,4 @@ -import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/UI/Form/Form"; +import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/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/front/components/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx b/front/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx similarity index 96% rename from front/components/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx rename to front/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx index c4e711e0..72722376 100644 --- a/front/components/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx +++ b/front/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx @@ -1,4 +1,4 @@ -import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/UI/Form/Form"; +import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/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/front/components/Modals/Activities/Create/NewActivityModal/Video.tsx b/front/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx similarity index 98% rename from front/components/Modals/Activities/Create/NewActivityModal/Video.tsx rename to front/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx index a510ae11..ef855e4a 100644 --- a/front/components/Modals/Activities/Create/NewActivityModal/Video.tsx +++ b/front/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx @@ -1,4 +1,4 @@ -import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/UI/Form/Form"; +import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/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/front/components/Modals/Chapters/NewChapter.tsx b/front/components/Objects/Modals/Chapters/NewChapter.tsx similarity index 97% rename from front/components/Modals/Chapters/NewChapter.tsx rename to front/components/Objects/Modals/Chapters/NewChapter.tsx index 6f6c0cfa..3d4b563b 100644 --- a/front/components/Modals/Chapters/NewChapter.tsx +++ b/front/components/Objects/Modals/Chapters/NewChapter.tsx @@ -1,4 +1,4 @@ -import FormLayout, { Flex, FormField, Input, Textarea, FormLabel, ButtonBlack } from "@components/UI/Form/Form"; +import FormLayout, { Flex, FormField, Input, Textarea, FormLabel, ButtonBlack } from "@components/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/front/components/Modals/Course/Create/CreateCourse.tsx b/front/components/Objects/Modals/Course/Create/CreateCourse.tsx similarity index 98% rename from front/components/Modals/Course/Create/CreateCourse.tsx rename to front/components/Objects/Modals/Course/Create/CreateCourse.tsx index 3cf34896..f4a49c82 100644 --- a/front/components/Modals/Course/Create/CreateCourse.tsx +++ b/front/components/Objects/Modals/Course/Create/CreateCourse.tsx @@ -1,4 +1,4 @@ -import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, Input, Textarea } from '@components/UI/Form/Form' +import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, Input, Textarea } from '@components/StyledElements/Form/Form' import * as Form from '@radix-ui/react-form' import { getAPIUrl, getUriWithOrg } from '@services/config/config'; import { FormMessage } from "@radix-ui/react-form"; diff --git a/front/components/Pages/Activities/DynamicCanva/DynamicCanva.tsx b/front/components/Pages/Activities/DynamicCanva/DynamicCanva.tsx index b988b488..c79b99fd 100644 --- a/front/components/Pages/Activities/DynamicCanva/DynamicCanva.tsx +++ b/front/components/Pages/Activities/DynamicCanva/DynamicCanva.tsx @@ -4,12 +4,12 @@ import StarterKit from "@tiptap/starter-kit"; import { styled } from "styled-components"; import Youtube from "@tiptap/extension-youtube"; // Custom Extensions -import InfoCallout from "@editor/Extensions/Callout/Info/InfoCallout"; -import WarningCallout from "@editor/Extensions/Callout/Warning/WarningCallout"; -import ImageBlock from "@editor/Extensions/Image/ImageBlock"; -import VideoBlock from "@editor/Extensions/Video/VideoBlock"; -import MathEquationBlock from "@components/Editor/Extensions/MathEquation/MathEquationBlock"; -import PDFBlock from "@components/Editor/Extensions/PDF/PDFBlock"; +import InfoCallout from "@components/Objects/Editor/Extensions/Callout/Info/InfoCallout"; +import WarningCallout from "@components/Objects/Editor/Extensions/Callout/Warning/WarningCallout"; +import ImageBlock from "@components/Objects/Editor/Extensions/Image/ImageBlock"; +import VideoBlock from "@components/Objects/Editor/Extensions/Video/VideoBlock"; +import MathEquationBlock from "@components/Objects/Editor/Extensions/MathEquation/MathEquationBlock"; +import PDFBlock from "@components/Objects/Editor/Extensions/PDF/PDFBlock"; interface Editor { content: string; diff --git a/front/components/Pages/Courses/ActivityIndicators.tsx b/front/components/Pages/Courses/ActivityIndicators.tsx index b0fe82cf..9e738e54 100644 --- a/front/components/Pages/Courses/ActivityIndicators.tsx +++ b/front/components/Pages/Courses/ActivityIndicators.tsx @@ -1,4 +1,4 @@ -import ToolTip from '@components/UI/Tooltip/Tooltip' +import ToolTip from '@components/StyledElements/Tooltip/Tooltip' import { getUriWithOrg } from '@services/config/config' import Link from 'next/link' import React from 'react' diff --git a/front/components/UI/Error/Error.tsx b/front/components/StyledElements/Error/Error.tsx similarity index 100% rename from front/components/UI/Error/Error.tsx rename to front/components/StyledElements/Error/Error.tsx diff --git a/front/components/UI/Form/Form.tsx b/front/components/StyledElements/Form/Form.tsx similarity index 100% rename from front/components/UI/Form/Form.tsx rename to front/components/StyledElements/Form/Form.tsx diff --git a/front/components/UI/Modal/Modal.tsx b/front/components/StyledElements/Modal/Modal.tsx similarity index 100% rename from front/components/UI/Modal/Modal.tsx rename to front/components/StyledElements/Modal/Modal.tsx diff --git a/front/components/StyledElements/Titles/TypeOfContentTitle.tsx b/front/components/StyledElements/Titles/TypeOfContentTitle.tsx new file mode 100644 index 00000000..a06da92b --- /dev/null +++ b/front/components/StyledElements/Titles/TypeOfContentTitle.tsx @@ -0,0 +1,32 @@ +import Image from 'next/image' +import CoursesLogo from "public/svg/courses.svg"; +import CollectionsLogo from "public/svg/collections.svg"; +import TrailLogo from "public/svg/trail.svg"; + +function TypeOfContentTitle(props: { title: string, type: string }) { + + function getLogo() { + if (props.type == "col") { + return CollectionsLogo; + } + + else if (props.type == "cou") { + return CoursesLogo; + } + + else if (props.type == "tra") { + return TrailLogo; + } + } + + return ( +
+
+ Courses logo +
+

{props.title}

+
+ ) +} + +export default TypeOfContentTitle \ No newline at end of file diff --git a/front/components/UI/Toast/Toast.tsx b/front/components/StyledElements/Toast/Toast.tsx similarity index 100% rename from front/components/UI/Toast/Toast.tsx rename to front/components/StyledElements/Toast/Toast.tsx diff --git a/front/components/UI/Tooltip/Tooltip.tsx b/front/components/StyledElements/Tooltip/Tooltip.tsx similarity index 100% rename from front/components/UI/Tooltip/Tooltip.tsx rename to front/components/StyledElements/Tooltip/Tooltip.tsx diff --git a/front/components/StyledElements/Wrappers/GeneralWrapper.tsx b/front/components/StyledElements/Wrappers/GeneralWrapper.tsx new file mode 100644 index 00000000..e6eb908c --- /dev/null +++ b/front/components/StyledElements/Wrappers/GeneralWrapper.tsx @@ -0,0 +1,10 @@ + +function GeneralWrapperStyled({ children }: { children: React.ReactNode }) { + return ( +
{children}
+ ) +} + +export default GeneralWrapperStyled \ No newline at end of file diff --git a/front/components/UI/Elements/Styles/Title.tsx b/front/components/UI/Elements/Styles/Title.tsx deleted file mode 100644 index 89144b91..00000000 --- a/front/components/UI/Elements/Styles/Title.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import styled from "styled-components"; - -export const Title = styled.h1` - font-size: 1.5em; - padding-left: 20px; - font-weight: 500; -`; diff --git a/front/components/UI/Utils/ClientComp.tsx b/front/components/Utils/ClientComp.tsx similarity index 100% rename from front/components/UI/Utils/ClientComp.tsx rename to front/components/Utils/ClientComp.tsx diff --git a/front/components/UI/libs/styled-registry.tsx b/front/components/Utils/libs/styled-registry.tsx similarity index 100% rename from front/components/UI/libs/styled-registry.tsx rename to front/components/Utils/libs/styled-registry.tsx diff --git a/front/public/svg/collections.svg b/front/public/svg/collections.svg index c8c608f5..3997e8b0 100644 --- a/front/public/svg/collections.svg +++ b/front/public/svg/collections.svg @@ -1,3 +1,3 @@ - + diff --git a/front/public/svg/courses.svg b/front/public/svg/courses.svg index 1fe47207..822447d5 100644 --- a/front/public/svg/courses.svg +++ b/front/public/svg/courses.svg @@ -1,3 +1,3 @@ - + diff --git a/front/public/svg/trail.svg b/front/public/svg/trail.svg new file mode 100644 index 00000000..0012f34b --- /dev/null +++ b/front/public/svg/trail.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/front/tsconfig.json b/front/tsconfig.json index e8fc70c6..beb1d3e4 100644 --- a/front/tsconfig.json +++ b/front/tsconfig.json @@ -26,7 +26,7 @@ "@images/*": ["public/img/*"], "@styles/*": ["styles/*"], "@services/*": ["services/*"], - "@editor/*": ["components/Editor/*"] + "@editor/*": ["components/Objects/Editor/*"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx","**/**/*.tsx", ".next/types/**/*.ts"],