feat: improve activity indicators UI + remove all course progress

This commit is contained in:
swve 2025-06-12 16:21:46 +02:00
parent 59bae82ee7
commit 1dd100352b
3 changed files with 157 additions and 41 deletions

View file

@ -274,7 +274,7 @@ function ActivityClient(props: ActivityClientProps) {
for (let j = 0; j < chapter.activities.length; j++) {
let activity = chapter.activities[j]
if (activity.id === activity_id) {
return chapter.name
return `Chapter ${i + 1} : ${chapter.name}`
}
}
}
@ -570,7 +570,7 @@ function ActivityClient(props: ActivityClientProps) {
<div className="flex flex-1/3 items-center space-x-3">
<div className="flex flex-col -space-y-1">
<p className="font-bold text-gray-700 text-md">
Chapter : {getChapterNameByActivityId(course, activity.id)}
{getChapterNameByActivityId(course, activity.id)}
</p>
<h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase">
{activity.name}

View file

@ -7,8 +7,11 @@ import TypeOfContentTitle from '@components/Objects/StyledElements/Titles/TypeOf
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'
import React, { useEffect, useState } from 'react'
import useSWR from 'swr'
import { removeCourse } from '@services/courses/activity'
import { revalidateTags } from '@services/utils/ts/requests'
import { useRouter } from 'next/navigation'
function Trail(params: any) {
let orgslug = params.orgslug
@ -16,28 +19,73 @@ function Trail(params: any) {
const access_token = session?.data?.tokens?.access_token;
const org = useOrg() as any
const orgID = org?.id
const { data: trail, error: error } = useSWR(
const router = useRouter()
const [isQuittingAll, setIsQuittingAll] = useState(false)
const [quittingProgress, setQuittingProgress] = useState(0)
const { data: trail, error: error, mutate } = useSWR(
`${getAPIUrl()}trail/org/${orgID}/trail`,
(url) => swrFetcher(url, access_token)
)
const handleQuitAllCourses = async () => {
if (!trail?.runs?.length || isQuittingAll) return;
setIsQuittingAll(true)
const totalCourses = trail.runs.length;
try {
for (let i = 0; i < trail.runs.length; i++) {
const run = trail.runs[i];
await removeCourse(run.course.course_uuid, orgslug, access_token);
setQuittingProgress(Math.round(((i + 1) / totalCourses) * 100));
}
await revalidateTags(['courses'], orgslug);
router.refresh();
await mutate();
} catch (error) {
console.error('Error quitting courses:', error);
} finally {
setIsQuittingAll(false)
setQuittingProgress(0)
}
}
useEffect(() => { }, [trail, org])
return (
<GeneralWrapperStyled>
<TypeOfContentTitle title="Trail" type="tra" />
<div className="flex justify-between items-center mb-6">
<TypeOfContentTitle title="Trail" type="tra" />
{trail?.runs?.length > 0 && (
<button
onClick={handleQuitAllCourses}
disabled={isQuittingAll}
className={`px-4 py-2 rounded-lg font-medium text-sm transition-all
${isQuittingAll
? 'bg-gray-100 text-gray-500 cursor-not-allowed'
: 'bg-red-100 text-red-700 hover:bg-red-200'
}`}
>
{isQuittingAll
? `Quitting Courses (${quittingProgress}%)`
: 'Quit All Courses'
}
</button>
)}
</div>
{!trail ? (
<PageLoading></PageLoading>
) : (
<div className="space-y-6">
{trail.runs.map((run: any) => (
<>
<TrailCourseElement
run={run}
course={run.course}
orgslug={orgslug}
/>
</>
<TrailCourseElement
key={run.course.course_uuid}
run={run}
course={run.course}
orgslug={orgslug}
/>
))}
</div>
)}