diff --git a/front/app/_orgs/[orgslug]/collections/new/page.tsx b/front/app/_orgs/[orgslug]/collections/new/page.tsx index 0a1c0b50..cf5a5052 100644 --- a/front/app/_orgs/[orgslug]/collections/new/page.tsx +++ b/front/app/_orgs/[orgslug]/collections/new/page.tsx @@ -1,11 +1,10 @@ "use client"; import { useRouter } from "next/navigation"; import React from "react"; -import { Title } from "../../../../../components/UI/Elements/Styles/Title"; -import Layout from "../../../../../components/UI/Layout"; -import { getOrganizationContextInfo } from "../../../../../services/orgs"; -import { getOrgCourses } from "../../../../../services/courses/courses"; -import { createCollection } from "../../../../../services/collections"; +import { Title } from "@components/UI/Elements/Styles/Title"; +import { getOrganizationContextInfo } from "@services/orgs"; +import { getOrgCourses } from "@services/courses/courses"; +import { createCollection } from "@services/collections"; function NewCollection(params : any) { const orgslug = params.params.orgslug; @@ -18,7 +17,6 @@ function NewCollection(params : any) { const router = useRouter(); async function getCourses() { - setIsLoading(true); const org = await getOrganizationContextInfo(orgslug); setOrg(org); diff --git a/front/app/_orgs/[orgslug]/course/[courseid]/edit/page.tsx b/front/app/_orgs/[orgslug]/course/[courseid]/edit/page.tsx index 66612aee..360beeab 100644 --- a/front/app/_orgs/[orgslug]/course/[courseid]/edit/page.tsx +++ b/front/app/_orgs/[orgslug]/course/[courseid]/edit/page.tsx @@ -2,17 +2,17 @@ import React from "react"; import { useState, useEffect } from "react"; import styled from "styled-components"; -import { Header } from "../../../../../../components/UI/Header"; -import Layout from "../../../../../../components/UI/Layout"; -import { Title } from "../../../../../../components/UI/Elements/Styles/Title"; +import { Header } from "@components/UI/Header"; +import Layout from "@components/UI/Layout"; +import { Title } from "@components/UI/Elements/Styles/Title"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; -import { initialData, initialData2 } from "../../../../../../components/Drags/data"; -import Chapter from "../../../../../../components/Drags/Chapter"; -import { createChapter, deleteChapter, getCourseChaptersMetadata, updateChaptersMetadata } from "../../../../../../services/courses/chapters"; +import { initialData, initialData2 } from "@components/Drags/data"; +import Chapter from "@components/Drags/Chapter"; +import { createChapter, deleteChapter, getCourseChaptersMetadata, updateChaptersMetadata } from "@services/courses/chapters"; import { useRouter } from "next/navigation"; -import NewChapterModal from "../../../../../../components/Modals/CourseEdit/NewChapter"; -import NewLectureModal from "../../../../../../components/Modals/CourseEdit/NewLecture"; -import { createLecture, createFileLecture } from "../../../../../../services/courses/lectures"; +import NewChapterModal from "@components/Modals/CourseEdit/NewChapter"; +import NewLectureModal from "@components/Modals/CourseEdit/NewLecture"; +import { createLecture, createFileLecture } from "@services/courses/lectures"; function CourseEdit(params: any) { const router = useRouter(); diff --git a/front/app/_orgs/[orgslug]/course/[courseid]/lecture/[lectureid]/page.tsx b/front/app/_orgs/[orgslug]/course/[courseid]/lecture/[lectureid]/page.tsx index 1148b6da..61939912 100644 --- a/front/app/_orgs/[orgslug]/course/[courseid]/lecture/[lectureid]/page.tsx +++ b/front/app/_orgs/[orgslug]/course/[courseid]/lecture/[lectureid]/page.tsx @@ -2,12 +2,12 @@ import { useRouter } from "next/navigation"; import Link from "next/link"; import React, { useMemo } from "react"; -import Layout from "../../../../../../../components/UI/Layout"; -import { getLecture } from "../../../../../../../services/courses/lectures"; -import { getBackendUrl } from "../../../../../../../services/config"; -import Canva from "../../../../../../../components/LectureViews/DynamicCanva/DynamicCanva"; +import Layout from "@components/UI/Layout"; +import { getLecture } from "@services/courses/lectures"; +import { getBackendUrl } from "@services/config"; +import Canva from "@components/LectureViews/DynamicCanva/DynamicCanva"; import styled from "styled-components"; -import { getCourse, getCourseMetadata } from "../../../../../../../services/courses/courses"; +import { getCourse } from "@services/courses/courses"; import VideoLecture from "@components/LectureViews/Video/Video"; import { Check } from "lucide-react"; import { maskLectureAsComplete } from "@services/courses/activity"; diff --git a/front/app/_orgs/[orgslug]/course/[courseid]/page.tsx b/front/app/_orgs/[orgslug]/course/[courseid]/page.tsx index a48256f6..a4fd7ddd 100644 --- a/front/app/_orgs/[orgslug]/course/[courseid]/page.tsx +++ b/front/app/_orgs/[orgslug]/course/[courseid]/page.tsx @@ -4,7 +4,7 @@ import { closeActivity, createActivity } from "@services/courses/activity"; import Link from "next/link"; import React from "react"; import styled from "styled-components"; -import { getAPIUrl, getBackendUrl } from "../../../../../services/config"; +import { getAPIUrl, getBackendUrl } from "@services/config"; import useSWR, { mutate } from "swr"; import { swrFetcher } from "@services/utils/requests"; diff --git a/front/app/_orgs/[orgslug]/layout.tsx b/front/app/_orgs/[orgslug]/layout.tsx index 523741f3..bf66f8aa 100644 --- a/front/app/_orgs/[orgslug]/layout.tsx +++ b/front/app/_orgs/[orgslug]/layout.tsx @@ -1,6 +1,6 @@ -import "../../../styles/globals.css"; -import { Menu } from "../../../components/UI/Elements/Menu"; -import AuthProvider from "../../../components/Security/AuthProvider"; +import "@styles/globals.css"; +import { Menu } from "@components/UI/Elements/Menu"; +import AuthProvider from "@components/Security/AuthProvider"; export default function RootLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/front/services/auth/auth.ts b/front/services/auth/auth.ts index c6a50845..68fa25e9 100644 --- a/front/services/auth/auth.ts +++ b/front/services/auth/auth.ts @@ -1,4 +1,4 @@ -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; interface LoginAndGetTokenResponse { access_token: "string"; diff --git a/front/services/courses/chapters.ts b/front/services/courses/chapters.ts index bb28ec1e..79819c95 100644 --- a/front/services/courses/chapters.ts +++ b/front/services/courses/chapters.ts @@ -1,5 +1,5 @@ import { initialData } from "../../components/Drags/data"; -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; export async function getCourseChaptersMetadata(course_id: any) { const HeadersConfig = new Headers({ "Content-Type": "application/json" }); diff --git a/front/services/courses/courses.ts b/front/services/courses/courses.ts index 1fdff696..d8e29f10 100644 --- a/front/services/courses/courses.ts +++ b/front/services/courses/courses.ts @@ -1,4 +1,4 @@ -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; /* This file includes only POST, PUT, DELETE requests diff --git a/front/services/courses/lectures.ts b/front/services/courses/lectures.ts index d5db065c..c46c351a 100644 --- a/front/services/courses/lectures.ts +++ b/front/services/courses/lectures.ts @@ -1,4 +1,4 @@ -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; export async function createLecture(data: any, chapter_id: any) { data.content = {}; diff --git a/front/services/files/images.ts b/front/services/files/images.ts index b9645dab..e661469e 100644 --- a/front/services/files/images.ts +++ b/front/services/files/images.ts @@ -1,4 +1,4 @@ -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; export async function uploadNewImageFile(file: any, lecture_id: string) { const HeadersConfig = new Headers(); diff --git a/front/services/files/video.ts b/front/services/files/video.ts index 0baec936..622e69c0 100644 --- a/front/services/files/video.ts +++ b/front/services/files/video.ts @@ -1,4 +1,4 @@ -import { getAPIUrl } from "../config"; +import { getAPIUrl } from "@services/config"; export async function uploadNewVideoFile(file: any, lecture_id: string) { const HeadersConfig = new Headers();