chore: merge with dev

This commit is contained in:
Chris Holland 2024-10-23 20:06:17 -07:00
parent b678ac86e8
commit 3430cfdb3a
No known key found for this signature in database
GPG key ID: 68B0A864B1B0A0D2
34 changed files with 3515 additions and 2600 deletions

View file

@ -25,43 +25,42 @@ const removeCollectionPrefix = (collectionid: string) => {
function CollectionThumbnail(props: PropsType) {
const org = useOrg() as any
return (
<div className="">
<div className="flex flex-row space-x-4 inset-0 ring-1 ring-inset my-auto ring-black/10 rounded-xl shadow-xl relative w-[300px] h-[80px] bg-cover items-center justify-center bg-indigo-600 font-bold text-zinc-50">
<div className="flex -space-x-5">
{props.collection.courses.slice(0, 2).map((course: any) => (
<>
<Link
href={getUriWithOrg(
props.orgslug,
'/collection/' +
removeCollectionPrefix(props.collection.collection_uuid)
)}
>
<div
className="inset-0 rounded-full shadow-2xl bg-cover w-12 h-8 justify-center ring-indigo-800 ring-4"
style={{
backgroundImage: `url(${getCourseThumbnailMediaDirectory(
org?.org_uuid,
course.course_uuid,
course.thumbnail_image
)})`,
}}
></div>
</Link>
</>
))}
<div className="group relative overflow-hidden rounded-xl shadow-lg transition-all duration-300 hover:shadow-xl">
<div className="flex h-full w-full items-center justify-between bg-indigo-600 p-4">
<div className="flex items-center space-x-5">
<div className="flex -space-x-3">
{props.collection.courses.slice(0, 3).map((course: any, index: number) => (
<div
key={course.course_uuid}
className="relative h-12 w-12 overflow-hidden rounded-full border-2 border-white shadow-md transition-all duration-300 hover:z-10 hover:scale-110"
style={{
backgroundImage: `url(${getCourseThumbnailMediaDirectory(
org?.org_uuid,
course.course_uuid,
course.thumbnail_image
)})`,
backgroundSize: 'cover',
backgroundPosition: 'center',
zIndex: 3 - index,
}}
></div>
))}
</div>
<div className="flex flex-col">
<Link
href={getUriWithOrg(
props.orgslug,
'/collection/' + removeCollectionPrefix(props.collection.collection_uuid)
)}
className="text-2xl font-bold text-white hover:underline"
>
{props.collection.name}
</Link>
<span className="mt-1 text-sm font-medium text-indigo-200">
{props.collection.courses.length} course{props.collection.courses.length !== 1 ? 's' : ''}
</span>
</div>
</div>
<Link
href={getUriWithOrg(
props.orgslug,
'/collection/' +
removeCollectionPrefix(props.collection.collection_uuid)
)}
>
<h1 className="font-bold text-md justify-center">
{props.collection.name}
</h1>
</Link>
<CollectionAdminEditsArea
orgslug={props.orgslug}
org_id={props.org_id}
@ -91,18 +90,18 @@ const CollectionAdminEditsArea = (props: any) => {
orgId={props.org_id}
checkMethod="roles"
>
<div className="flex space-x-1 justify-center mx-auto z-20 ">
<div className="z-20">
<ConfirmationModal
confirmationMessage="Are you sure you want to delete this collection?"
confirmationButtonText="Delete Collection"
dialogTitle={'Delete ' + props.collection.name + ' ?'}
dialogTitle={'Delete ' + props.collection.name + '?'}
dialogTrigger={
<div
className="hover:cursor-pointer p-1 px-2 bg-red-600 rounded-xl items-center justify-center flex shadow-xl"
<button
className="absolute right-2 top-2 rounded-full bg-red-500 p-2 text-white transition-colors duration-300 hover:bg-red-600"
rel="noopener noreferrer"
>
<X size={10} className="text-rose-200 font-bold" />
</div>
<X size={18} />
</button>
}
functionToExecute={() => deleteCollectionUI(props.collection_uuid)}
status="warning"

View file

@ -6,146 +6,125 @@ import { getUriWithOrg } from '@services/config/config'
import { deleteCourseFromBackend } from '@services/courses/courses'
import { getCourseThumbnailMediaDirectory } from '@services/media/media'
import { revalidateTags } from '@services/utils/ts/requests'
import { BookMinus, FilePenLine, Settings2, EllipsisVertical } from 'lucide-react'
import { BookMinus, FilePenLine, Settings2, MoreVertical } from 'lucide-react'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import Link from 'next/link'
import { useRouter } from 'next/navigation'
import React, { useEffect } from 'react'
import React from 'react'
import toast from 'react-hot-toast'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
type Course = {
course_uuid: string
name: string
description: string
thumbnail_image: string
org_id: string
}
type PropsType = {
course: any
course: Course
orgslug: string
customLink?: string
}
// function to remove "course_" from the course_uuid
function removeCoursePrefix(course_uuid: string) {
return course_uuid.replace('course_', '')
}
export const removeCoursePrefix = (course_uuid: string) => course_uuid.replace('course_', '')
function CourseThumbnail(props: PropsType) {
const router = useRouter()
function CourseThumbnail({ course, orgslug, customLink }: PropsType) {
const router = useRouter()
const org = useOrg() as any
const session = useLHSession() as any;
const session = useLHSession() as any
async function deleteCourses(course_uuid: any) {
const toast_loading = toast.loading('Deleting course...')
await deleteCourseFromBackend(course_uuid, session.data?.tokens?.access_token)
toast.dismiss(toast_loading)
toast.success('Course deleted successfully')
await revalidateTags(['courses'], props.orgslug)
router.refresh()
const deleteCourse = async () => {
const toastId = toast.loading('Deleting course...')
try {
await deleteCourseFromBackend(course.course_uuid, session.data?.tokens?.access_token)
await revalidateTags(['courses'], orgslug)
toast.success('Course deleted successfully')
router.refresh()
} catch (error) {
toast.error('Failed to delete course')
} finally {
toast.dismiss(toastId)
}
}
useEffect(() => { }, [org])
const thumbnailImage = course.thumbnail_image
? getCourseThumbnailMediaDirectory(org?.org_uuid, course.course_uuid, course.thumbnail_image)
: '../empty_thumbnail.png'
return (
<div className="relative">
<AdminEditsArea
course={props.course}
orgSlug={props.orgslug}
courseId={props.course.course_uuid}
deleteCourses={deleteCourses}
<AdminEditOptions
course={course}
orgSlug={orgslug}
deleteCourse={deleteCourse}
/>
<Link
href={getUriWithOrg(
props.orgslug,
'/course/' + removeCoursePrefix(props.course.course_uuid)
)}
>
{props.course.thumbnail_image ? (
<div
className="inset-0 ring-1 ring-inset ring-black/10 rounded-xl shadow-xl w-[249px] h-[131px] bg-cover"
style={{
backgroundImage: `url(${getCourseThumbnailMediaDirectory(
org?.org_uuid,
props.course.course_uuid,
props.course.thumbnail_image
)})`,
}}
/>
) : (
<div
className="inset-0 ring-1 ring-inset ring-black/10 rounded-xl shadow-xl w-[249px] h-[131px] bg-cover"
style={{
backgroundImage: `url('../empty_thumbnail.png')`,
backgroundSize: 'contain',
}}
/>
)}
<Link prefetch href={customLink ? customLink : getUriWithOrg(orgslug, `/course/${removeCoursePrefix(course.course_uuid)}`)}>
<div
className="inset-0 ring-1 ring-inset ring-black/10 rounded-xl shadow-xl w-full aspect-video bg-cover bg-center"
style={{ backgroundImage: `url(${thumbnailImage})` }}
/>
</Link>
<div className='flex flex-col w-[250px] pt-3 space-y-2'>
<h2 className="font-bold text-gray-800 max-h-[80px] h-fit line-clamp-2 leading-tight text-lg capitalize">{props.course.name}</h2>
<h3 className='text-sm text-gray-700 leading-normal line-clamp-3'>{props.course.description}</h3>
<div className='flex flex-col w-full pt-3 space-y-2'>
<h2 className="font-bold text-gray-800 line-clamp-2 leading-tight text-lg capitalize">{course.name}</h2>
<p className='text-sm text-gray-700 leading-normal line-clamp-3'>{course.description}</p>
</div>
</div>
)
}
const AdminEditsArea = (props: {
const AdminEditOptions = ({ course, orgSlug, deleteCourse }: {
course: Course
orgSlug: string
courseId: string
course: any
deleteCourses: any
deleteCourse: () => Promise<void>
}) => {
return (
<AuthenticatedClientElement
action="update"
ressourceType="courses"
checkMethod="roles"
orgId={props.course.org_id}
orgId={course.org_id}
>
<div
className="flex items-center space-x-2 absolute z-20 overflow-hidden rounded-xl pt-0 mx-auto justify-center transform w-full h-[60px] bg-gradient-to-t from-transparent from-10% to-gray-900/60">
<Link
href={getUriWithOrg(
props.orgSlug,
'/dash/courses/course/' +
removeCoursePrefix(props.courseId) +
'/content'
)}
prefetch
>
<div
className="hover:cursor-pointer p-1 px-4 bg-blue-600 rounded-xl items-center flex shadow-2xl"
rel="noopener noreferrer"
>
<FilePenLine size={14} className="text-blue-200 font-bold" />
</div>
</Link>
<Link
href={getUriWithOrg(
props.orgSlug,
'/dash/courses/course/' +
removeCoursePrefix(props.courseId) +
'/general'
)}
prefetch
>
<div
className=" hover:cursor-pointer p-1 px-4 bg-gray-800 rounded-xl items-center flex shadow-2xl"
rel="noopener noreferrer"
>
<Settings2 size={14} className="text-gray-200 font-bold" />
</div>
</Link>
<EllipsisVertical size={14} className='text-gray-200 font-bold' />
<ConfirmationModal
confirmationButtonText="Delete Course"
confirmationMessage="Are you sure you want to delete this course?"
dialogTitle={'Delete ' + props.course.name + ' ?'}
dialogTrigger={
<div
className="hover:cursor-pointer p-1 px-4 bg-rose-600 h-fit rounded-xl items-center flex shadow-2xl"
rel="noopener noreferrer"
>
<BookMinus size={14} className="text-rose-200 font-bold" />
</div>
}
functionToExecute={() => props.deleteCourses(props.courseId)}
status="warning"
></ConfirmationModal>
<div className="absolute top-2 right-2 z-20">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="p-1 bg-white rounded-full hover:bg-gray-100 transition-colors shadow-md">
<MoreVertical size={20} className="text-gray-700" />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-56">
<DropdownMenuItem asChild>
<Link prefetch href={getUriWithOrg(orgSlug, `/dash/courses/course/${removeCoursePrefix(course.course_uuid)}/content`)}>
<FilePenLine className="mr-2 h-4 w-4" /> Edit Content
</Link>
</DropdownMenuItem>
<DropdownMenuItem asChild>
<Link prefetch href={getUriWithOrg(orgSlug, `/dash/courses/course/${removeCoursePrefix(course.course_uuid)}/general`)}>
<Settings2 className="mr-2 h-4 w-4" /> Settings
</Link>
</DropdownMenuItem>
<DropdownMenuItem asChild>
<ConfirmationModal
confirmationButtonText="Delete Course"
confirmationMessage="Are you sure you want to delete this course?"
dialogTitle={`Delete ${course.name}?`}
dialogTrigger={
<button className="w-full text-left flex items-center px-2 py-1 rounded-md text-sm bg-rose-500/10 hover:bg-rose-500/20 transition-colors text-red-600">
<BookMinus className="mr-4 h-4 w-4" /> Delete Course
</button>
}
functionToExecute={deleteCourse}
status="warning"
/>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</AuthenticatedClientElement>
)