Add sorting and filtering

This commit is contained in:
Rotimi Best
2023-09-27 04:23:45 +01:00
parent e3d0db15f2
commit 11958ae6f7
4 changed files with 124 additions and 62 deletions
@@ -50,15 +50,12 @@
<a <a
rel="prefetch" rel="prefetch"
href={isOnLandingPage ? `/course/${slug}` : `/courses/${id}`} href={isOnLandingPage ? `/course/${slug}` : `/courses/${id}`}
class=" text-black w-full" class="text-black border border-gray rounded w-full max-w-[320px] relative hover:shadow-lg transition-all ease-in-out"
> >
<div
class="border border-gray rounded w-full max-w-[350px] relative hover:shadow-lg transition-all ease-in-out"
>
<div class="p-4"> <div class="p-4">
<div class=" mb-5"> <div class=" mb-5">
<ImageLoader <ImageLoader
src={bannerImage ? bannerImage : '/images/classroomio-course-img-template.jpg'} src={bannerImage}
alt="Course Logo" alt="Course Logo"
class="h-[200px] w-full rounded dark:border dark:border-white" class="h-[200px] w-full rounded dark:border dark:border-white"
> >
@@ -91,7 +88,6 @@
{/if} {/if}
</p> </p>
</div> </div>
</div>
</a> </a>
<style> <style>
+11 -8
View File
@@ -1,26 +1,28 @@
<script> <script lang="ts">
import Box from '../Box/index.svelte'; import Box from '../Box/index.svelte';
import Card from './components/Card/index.svelte'; import Card from './components/Card/index.svelte';
import CardLoader from './components/Card/Loader.svelte'; import CardLoader from './components/Card/Loader.svelte';
import CoursesEmptyIcon from '../Icons/CoursesEmptyIcon.svelte'; import CoursesEmptyIcon from '../Icons/CoursesEmptyIcon.svelte';
import CopyCourseModal from './components/CopyCourseModal/index.svelte'; import CopyCourseModal from './components/CopyCourseModal/index.svelte';
import { courses, courseMetaDeta } from './store'; import { courseMetaDeta } from './store';
import type { Course } from '$lib/utils/types';
export let courses: Course[] = [];
</script> </script>
<CopyCourseModal /> <CopyCourseModal />
<div <div class={`w-full ${$courseMetaDeta.isLoading || courses ? 'cards-container' : ''} my-4 mx-auto`}>
class={`w-full ${$courseMetaDeta.isLoading || $courses ? 'cards-container' : ''} my-4 mx-auto`}
>
{#if $courseMetaDeta.isLoading} {#if $courseMetaDeta.isLoading}
<CardLoader /> <CardLoader />
<CardLoader /> <CardLoader />
<CardLoader /> <CardLoader />
{:else} {:else}
{#each $courses as courseData} {#each courses as courseData}
{#key courseData.id}
<Card <Card
id={courseData.id} id={courseData.id}
bannerImage={courseData.logo} bannerImage={courseData.logo || '/images/classroomio-course-img-template.jpg'}
title={courseData.title} title={courseData.title}
description={courseData.description} description={courseData.description}
role_id={courseData.role_id} role_id={courseData.role_id}
@@ -29,10 +31,11 @@
currency={courseData.currency} currency={courseData.currency}
totalLessons={courseData.total_lessons} totalLessons={courseData.total_lessons}
/> />
{/key}
{/each} {/each}
{/if} {/if}
</div> </div>
{#if !$courseMetaDeta.isLoading && !$courses.length} {#if !$courseMetaDeta.isLoading && !courses.length}
<Box className="w-full"> <Box className="w-full">
<CoursesEmptyIcon /> <CoursesEmptyIcon />
<h3 class="dark:text-white text-2xl my-5">No Courses Created</h3> <h3 class="dark:text-white text-2xl my-5">No Courses Created</h3>
+2 -2
View File
@@ -91,8 +91,8 @@ export interface Course {
description: string; // type unknown; description: string; // type unknown;
overview?: any; // type unknown; overview?: any; // type unknown;
id?: string /* primary key */; id?: string /* primary key */;
created_at?: string; created_at: string;
updated_at?: string; updated_at: string;
group_id?: string /* foreign key to group.id */; group_id?: string /* foreign key to group.id */;
is_template?: boolean; is_template?: boolean;
organization_id?: string /* foreign key to organization.id */; organization_id?: string /* foreign key to organization.id */;
+67 -4
View File
@@ -1,5 +1,6 @@
<script> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { Search, Dropdown } from 'carbon-components-svelte';
import { page } from '$app/stores'; import { page } from '$app/stores';
import { profile } from '$lib/utils/store/user'; import { profile } from '$lib/utils/store/user';
import { fetchCourses } from '$lib/components/Courses/api'; import { fetchCourses } from '$lib/components/Courses/api';
@@ -11,9 +12,14 @@
import { Add } from 'carbon-icons-svelte'; import { Add } from 'carbon-icons-svelte';
import { isMobile } from '$lib/utils/store/useMobile'; import { isMobile } from '$lib/utils/store/useMobile';
import { isOrgAdmin } from '$lib/utils/store/org'; import { isOrgAdmin } from '$lib/utils/store/org';
import type { Course } from '$lib/utils/types';
import { browser } from '$app/environment';
export let data; export let data;
let { allCourses, cantFetch } = data; let { allCourses, cantFetch } = data;
let searchValue = '';
let selectedId: string;
let filteredCourses: Course[];
const urlParams = new URLSearchParams($page.url.search); const urlParams = new URLSearchParams($page.url.search);
@@ -21,7 +27,7 @@
$createCourseModal.open = true; $createCourseModal.open = true;
} }
async function getCourses(userId, orgId) { async function getCourses(userId: string | null, orgId: string) {
if (cantFetch && typeof cantFetch === 'boolean' && !allCourses.length && orgId) { if (cantFetch && typeof cantFetch === 'boolean' && !allCourses.length && orgId) {
$courseMetaDeta.isLoading = true; $courseMetaDeta.isLoading = true;
@@ -36,10 +42,41 @@
} }
} }
function filterCourses(searchValue: string, _selectedId: string, courses: Course[]) {
if (browser) {
if (!selectedId) {
selectedId = localStorage.getItem('classroomio_filter_course_key') || '0';
} else {
localStorage.setItem('classroomio_filter_course_key', _selectedId);
}
}
filteredCourses = courses.filter((course) => {
if (!searchValue || course.title.toLowerCase().includes(searchValue)) {
return true;
}
return false;
});
if (_selectedId === '0') {
filteredCourses = filteredCourses.sort(
(a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
);
} else if (_selectedId === '1') {
filteredCourses = filteredCourses.sort((a, b) => b.is_published - a.is_published);
} else if (_selectedId === '2') {
filteredCourses = filteredCourses.sort((a, b) => b.total_lessons - a.total_lessons);
}
console.log('filteredCourses', filteredCourses);
}
onMount(() => { onMount(() => {
courses.set(allCourses); courses.set(allCourses);
}); });
$: filterCourses(searchValue, selectedId, $courses);
$: getCourses($profile.id, $currentOrg.id); $: getCourses($profile.id, $currentOrg.id);
</script> </script>
@@ -49,7 +86,7 @@
<section class="w-full md:max-w-6xl md:mx-auto"> <section class="w-full md:max-w-6xl md:mx-auto">
<div class="py-2 md:py-10 px-2 md:px-5"> <div class="py-2 md:py-10 px-2 md:px-5">
<div class="flex items-center justify-between mb-10"> <div class="flex items-center justify-between mb-5">
<h1 class="dark:text-white text-2xl md:text-3xl font-bold">Courses</h1> <h1 class="dark:text-white text-2xl md:text-3xl font-bold">Courses</h1>
{#if $isMobile} {#if $isMobile}
<PrimaryButton isDisabled={!$isOrgAdmin} onClick={() => ($createCourseModal.open = true)}> <PrimaryButton isDisabled={!$isOrgAdmin} onClick={() => ($createCourseModal.open = true)}>
@@ -63,9 +100,35 @@
/> />
{/if} {/if}
</div> </div>
<div class="flex flex-row-reverse mb-5">
<div class="flex items-end justify-start">
<Search
placeholder="Find course"
bind:value={searchValue}
searchClass="mr-2"
class=" bg-gray-100 dark:bg-neutral-800"
/>
<Dropdown
class="h-full"
bind:selectedId
items={[
{ id: '0', text: 'Date Created' },
{ id: '1', text: 'Published' },
{ id: '2', text: 'Lessons' }
]}
/>
</div>
</div>
<NewCourseModal /> <NewCourseModal />
<Courses /> <Courses bind:courses={filteredCourses} />
</div> </div>
</section> </section>
<style>
:global(.bx--dropdown) {
max-height: unset;
height: 100%;
}
</style>