CLASSROOMIO-T-30:Developed the UI for the video upload

CLASSROOMIO-T-30: UI cleanup CLASSROOMIO-T-30: Improve UX Merge branch 'CLASSROOMIO-T-30' of https://gitlab.com/thenextgreat/classroomio into CLASSROOMIO-T-30 CLASSROOMIO-T-30:Made the input clear after upload and also chnged the icons CLASSROOMIO-T-30: Remove console log CLASSROOMIO-T-30: Better trim out white spaces in url CLASSROOMIO-T-30:Fixed the bug between the save and edit CLASSROOMIO-T-30:Trying to fix the bug between edit and save Merge branch 'main' of https://gitlab.com/thenextgreat/classroomio CLASSROOMIO-T-30:Stil working on the reviews CLASSROOMIO-T-30:Still working on some of the reviews and updates CLASSROOMIO-T-30: Remove unnessecary values in store CLASSROOMIO-T-30: Change button to div in modal CLASSROOMIO-T-100: Select only courses belonging to current org and current user is a member CLASSROOMIO-T-100: Update condition for fetchCourses CLASSROOMIO-T-100: Select only courses belonging to current org and current user is a member Co-authored-by: Rotimi Best <[email protected]> Merge-request: CLASSROOMIO-MR-35 Merged-by: Best Admin <[email protected]> Remove netlify app from redirect rule Add redirect to layout's load Redirect to about domain CLASSROOMIO-T-97: UX again? 😇 CLASSROOMIO-T-97: Better course UX 😍😍 CLASSROOMIO-T-97: Better button style and fix route not found CLASSROOMIO-T-97: Course UI improvement 😁😁😁 CLASSROOMIO-T-30: Add plyr CLASSROOMIO-T-30:Merged main into branch Merge branch 'main' of https://gitlab.com/thenextgreat/classroomio CLASSROOMIO-T-30:Wotking on the lms dashboard CLASSROOMIO-T-30:Made some changes based on the reviews Merge branch 'main' of https://gitlab.com/thenextgreat/classroomio CLASSROOMIO-T-30:Made some refactoring to keep the code DRY CLASSROOMIO-T-30:Developed the UI for the video upload Merge branch 'main' of https://gitlab.com/thenextgreat/classroomio Merge branch 'main' of https://gitlab.com/thenextgreat/classroomio CLASSROOMIO-T-27: Review Section for Instructors on landing page CLASSROOMIO-T-27: Remove unused variable Merge branch 'CLASSROOMIO-T-27' of https://gitlab.com/thenextgreat/classroomio into CLASSROOMIO-T-27 CLASSROOMIO-T-27: Complete reviews functionality CLASSROOMIO-T-27: Review Render Update CLASSROOMIO-T-27: - Resolved Feedbacks CLASSROOMIO-T-27: Fixed Ratings Data CLASSROOMIO-T-27: - Added Ratings Svg - Fixed avatar_url feedback CLASSROOMIO-T-27: Import Adjustment CLASSROOMIO-T-27: Code Review CLASSROOM-T-27: Added Add Review Functionality CLASSROOMIO-T-27: - Unresolved Review - Enhance Code Redability CLASSROOMIO-T-27: Completed the delete functionality CLASSROOMIO-T-27: Hide/Show functionality CLASSROOMIO-T-27: Double Quotation Update CLASSROOMIO-T-27: Testing toggle functinality CLASSROOMIO-T-27: Added the icons CLASSROOMIO-T-27: Completion of the hide/show functionality CLASSROOMIO-T-27: Display the store data on the review page for styling CLASSROOMIO-T-27: Styling of the review component & connecting it's data CLASSROOMIO-T-27: - Add ReviewsForm - Completion of the Reviews Form Structure/Styling CLASSROOMIO-T-27: Added a reviews modal CLASSROOMIO-T-27: Logic update for review section CLASSROOMIO-T-50: Logic for overlapping reviews CLASSROOMIO-T-27: - Completion of the structure & styling with mock data. - Addition of custom ratings assets CLASSROOMIO-T-27: - Review Section Code Structure - Import Profile Picture Assets Co-authored-by: Rotimi Best <[email protected]> Co-authored-by: Tunji Adeyemi <[email protected]> Co-authored-by: tunny17 <[email protected]> Merge-request: CLASSROOMIO-MR-22 Merged-by: Best Admin <[email protected]> CLASSROOMIO-T-62: Dark Mode Bug Fix CLASSROOMIO-T-62: Delete Unused class CLASSROOMIO-T-62: Dark Mode Bug Fix Co-authored-by: Tunji Adeyemi <[email protected]> Merge-request: CLASSROOMIO-MR-23 Merged-by: Best Admin <[email protected]> Co-authored-by: Ifeanyi Nwosu <[email protected]> Co-authored-by: Rotimi Best <[email protected]> Co-authored-by: Tunji Adeyemi <[email protected]> Co-authored-by: tunny17 <[email protected]> Merge-request: CLASSROOMIO-MR-33 Merged-by: Best Admin <[email protected]>
2023-08-07 19:44:26 +00:00
parent 4910ec4f56
commit a27bc32c63
27 changed files with 495 additions and 99 deletions
@@ -6,6 +6,7 @@
  import { setCourse, course } from '$lib/components/Course/store';
  import { lessons } from '$lib/components/Course/components/Lesson/store/lessons';
  import { fetchCourse } from '$lib/utils/services/courses';
+  import { browser } from '$app/environment';

  export let data;

@@ -13,6 +14,7 @@
  let loading = false;

  async function triggerSetCourse(_profile) {
+    if (!browser) return;
    loading = true;
    const { data: _data } = await fetchCourse(undefined, data.slug);
    setCourse(_data);
@@ -14,12 +14,13 @@
  // import TabContent from 'carbon-components-svelte/src/Tabs/TabContent.svelte';
  import StudentCertificate from '$lib/components/Course/components/Ceritficate/StudentCertificate/Index.svelte';
  import { fetchCourse } from '$lib/utils/services/courses';
+  import { browser } from '$app/environment';

  export let courseId: string = '';
  let isStudent = false;

  onMount(async () => {
-    if ($course.id) return;
+    if ($course.id || !browser) return;
    const { data } = await fetchCourse(courseId);
    setCourse(data);
  });
@@ -7,6 +7,7 @@
  import { setCourse, course } from '$lib/components/Course/store';
  import { lessons } from '$lib/components/Course/components/Lesson/store/lessons';
  import { fetchCourse } from '$lib/utils/services/courses';
+  import { browser } from '$app/environment';

  export let data;
  const { courseId } = data;
@@ -14,7 +15,7 @@
  let courseData = {};

  async function triggerSetCourse(_profile) {
-    if ($course.id) return;
+    if ($course.id || !browser) return;
    const { data: _data } = await fetchCourse(courseId);
    setCourse(_data);
  }
@@ -13,6 +13,7 @@
  import MODES from '$lib/utils/constants/mode.js';
  import { setCourse, course } from '$lib/components/Course/store';
  import { lesson, handleSaveLesson } from '$lib/components/Course/components/Lesson/store/lessons';
+  import { browser } from '$app/environment';

  export let data;

@@ -62,9 +63,14 @@
    }));
  }

+  function toggleMode() {
+    prevMode = mode;
+    mode = mode === MODES.edit ? MODES.view : MODES.edit;
+  }
+
  $: path = $page.url.pathname.replace(/\/exercises[\/ 0-9 a-z -]*/, '');

-  $: if (data.courseId) {
+  $: if (data.courseId && browser) {
    mode = MODES.view;
    fetchReqData(data.lessonId);
  }
@@ -94,10 +100,7 @@
              className="mr-2"
              label={mode === MODES.edit ? 'Save' : 'Edit'}
              variant={VARIANTS.CONTAINED_INFO}
-              onClick={() => {
-                prevMode = mode;
-                mode = mode === MODES.edit ? MODES.view : MODES.edit;
-              }}
+              onClick={toggleMode}
            />
          </div>
        {/if}
@@ -109,7 +112,7 @@
    <Exercises lessonId={data.lessonId} exerciseId={data.exerciseId} path={`${path}/exercises`} />
  {:else if !!data.lessonId}
    <PageBody>
-      <Materials lessonId={data.lessonId} {mode} {prevMode} />
+      <Materials lessonId={data.lessonId} {mode} {prevMode} {toggleMode} />

      <div class="w-full flex flex-row-reverse">
        <PrimaryButton
@@ -1 +1,15 @@
-<h1>Your Journey into progress begins today. Welcome !!!</h1>
+<script>
+</script>
+
+<section class="m-5 w-[calc(100vw - 250px)] h-full gap-5">
+  <h1 class="text-3xl font-semibold">Dashboard</h1>
+
+  <main class="w-full h-full flex flex-row gap-3">
+    <div class="w-full h-full border-2 border-dashed flex items-center justify-center">
+      <p>Student section</p>
+    </div>
+    <div class="w-full h-full border-2 border-dashed flex items-center justify-center">
+      <p>Currently Learning</p>
+    </div>
+  </main>
+</section>
@@ -0,0 +1 @@
+community page
@@ -0,0 +1 @@
+reviews page