ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor snackbar

Browse Source
This commit is contained in:
Rotimi Best
2023-09-27 05:35:06 +01:00
parent ff2ba21de1
commit a391af49a3
26 changed files with 143 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/+layout.svelte
+15 -17
View File
@@ -45,7 +45,7 @@
let supabase = getSupabase();
let path = $page.url?.pathname?.replace('/', '');
let theme = 'white';
let carbonTheme = 'white';
const delayedPreloading = derived(navigating, (currentPreloading, set) => {
setTimeout(() => set(currentPreloading), 250);
@@ -166,7 +166,7 @@
if (data.isOrgSite) {
if (params.has('redirect')) {
goto(params.get('redirect') || '');
} else {
} else if (!path.includes('lms')) {
goto('/lms');
}
} else {
@@ -179,10 +179,9 @@
// By default redirect to first organization
goto(`/org/${orgRes.currentOrg.siteName}`);
}
if (typeof orgRes?.currentOrg?.theme === 'string') {
setTheme(orgRes.currentOrg.theme);
}
}
if (typeof orgRes?.currentOrg?.theme === 'string') {
setTheme(orgRes.currentOrg.theme);
}
}
}
@@ -197,11 +196,6 @@
$page.url.host,
`\nIs student domain: ${data.isOrgSite}`
);
// Disable GA on localhost
if (dev) {
console.log('disable GA');
window['ga-disable-G-C7WBN0S06R'] = true;
}
if (browser) {
// Update theme - dark or light mode
@@ -209,7 +203,11 @@
toggleBodyByMode($appStore.isDark);
const theme = localStorage.getItem('theme');
if (theme) setTheme(theme);
if (data.isOrgSite && data.org?.theme) {
setTheme(data.org?.theme);
} else if (theme) {
setTheme(theme);
}
}
setupSentry();
@@ -250,7 +248,6 @@
});
if (data.isOrgSite) {
console.log('data', data);
if (!data.org) {
goto('/404');
} else {
@@ -258,18 +255,19 @@
$appStore.isOrgSite = data.isOrgSite;
currentOrg.set(data.org);
setTheme(data.org.theme);
}
}
return () => {
console.log('unsubscribed');
authListener?.unsubscribe();
if (typeof authListener?.unsubscribe === 'function') {
authListener?.unsubscribe();
}
};
});
$: path = $page.url?.pathname?.replace('/', '');
$: theme = $appStore.isDark ? 'g100' : 'white';
$: carbonTheme = $appStore.isDark ? 'g100' : 'white';
</script>
<svelte:window on:resize={handleResize} />
@@ -278,7 +276,7 @@
<link href="/css/carbon.css" rel="stylesheet" />
</svelte:head>
<Theme bind:theme />
<Theme bind:theme={carbonTheme} />
<Snackbar />
src/routes/courses/[id]/attendance/+page.svelte
+3 -11
View File
@@ -21,14 +21,12 @@
import { lessons } from '$lib/components/Course/components/Lesson/store/lessons';
import { ROLE } from '$lib/utils/constants/roles';
import { takeAttendance } from '$lib/utils/services/attendance';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import { attendance } from '$lib/utils/store/attendance';
import { profile } from '$lib/utils/store/user';
export let data;
let borderBottomGrey = 'border-r-0 border-b border-l-0 border-gray-300';
let students = [];
let isStudent;
let searchValue = '';
@@ -65,12 +63,8 @@
This validation is useless. We shouldn't assume we already have an attendance item id
because it might be a new attendance.
if (!attendanceItem.id) {
$snackbarStore.open = true;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.message =
"Something isn't right. Please reload and take attendance again";
snackbar.error("Something isn't right. Please reload and take attendance again");
console.error(`Attendance Id Missing`, courseId, student.id, lesson.id);
return;
}
*/
@@ -86,9 +80,7 @@
takeAttendance(_data).then((res) => {
if (res.error) {
console.error(`res.error`, res.error);
$snackbarStore.open = true;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.message = "Something isn't right. Please reload and take attendance again";
snackbar.error("Something isn't right. Please reload and take attendance again");
} else {
// console.log('res', JSON.stringify(res));
const { id, is_present } = res.data[0];
src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
+3 -8
View File
@@ -24,8 +24,7 @@
} from '$lib/components/Course/components/Lesson/store/lessons';
import { browser } from '$app/environment';
import { currentOrg } from '$lib/utils/store/org';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import type { LessonCompletion, LessonPage } from '$lib/utils/types';
import { profile } from '$lib/utils/store/user.js';
import { getIsLessonComplete } from '$lib/components/Course/components/Lesson/functions';
@@ -157,14 +156,10 @@
a.click();
a.remove();
$snackbarStore.message = 'Download Complete';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
$snackbarStore.open = true;
snackbar.success('Download Complete');
} catch (error) {
console.log('error downloading lesson', error);
$snackbarStore.message = "Something's not right - Please try later";
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error("Something's not right - Please try later");
}
isLoading = false;
src/routes/courses/[id]/people/+page.svelte
+2 -5
View File
@@ -1,11 +1,9 @@
<script lang="ts">
import TextChip from '$lib/components/Chip/Text.svelte';
import ComingSoon from '$lib/components/ComingSoon/index.svelte';
import Filter from 'carbon-icons-svelte/lib/Filter.svelte';
import { onMount } from 'svelte';
import copy from 'copy-to-clipboard';
import {
Pagination,
CopyButton,
Search,
StructuredList,
@@ -33,7 +31,7 @@
import type { Person, ProfileRole } from '$lib/components/Course/components/People/types';
import { ROLE_LABEL, ROLES } from '$lib/utils/constants/roles';
import { profile } from '$lib/utils/store/user';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
import Avatar from '$lib/components/Avatar/index.svelte';
export let data;
@@ -101,8 +99,7 @@
}
function copyToClipboard(studentAssignedId: string | null) {
$snackbarStore.open = true;
$snackbarStore.message = `Copied to clipboard`;
snackbar.success(`Copied to clipboard`);
if (studentAssignedId) {
copy(studentAssignedId);
src/routes/courses/[id]/submissions/+page.svelte
+2 -5
View File
@@ -18,8 +18,7 @@
updateQuestionAnswer
} from '$lib/utils/services/submissions';
import { formatAnswers } from '$lib/components/Course/function';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import isSubmissionEarly from '$lib/utils/functions/isSubmissionEarly';
import formatDate from '$lib/utils/functions/formatDate';
@@ -157,9 +156,7 @@
total: totalPoints
}).then((res) => console.log('Updated submission', res));
$snackbarStore.open = true;
$snackbarStore.message = `Saved successfully`;
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
await Promise.all(updates);
}
src/routes/lms/community/[slug]/+page.svelte
+5 -15
View File
@@ -20,8 +20,7 @@
askCommunityValidation,
commentInCommunityValidation
} from '$lib/utils/functions/validator';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
import TextField from '$lib/components/Form/TextField.svelte';
import DeleteCommentModal from '$lib/components/Org/Community/DeleteCommentModal.svelte';
import TextEditor from '$lib/components/TextEditor/index.svelte';
@@ -133,16 +132,11 @@
if (error) {
console.error('Error: commenting', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Error - Please try again later');
} else {
console.log('Success: commenting', data);
// Notification
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
// Add to comment
const _c = data?.[0];
@@ -189,9 +183,7 @@
const { error } = await supabase.from(table).update({ votes }).match({ id: matchId });
if (error) {
console.error('Error: upvoteQuestion', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error();
} else {
if (isQuestion) {
voted.question = true;
@@ -229,9 +221,7 @@
.match({ id: question.id });
if (error) {
console.error('Error: handleQuestionEdit', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error();
} else {
question.title = fields.title;
question.body = fields.body;
src/routes/lms/community/ask/+page.svelte
+3 -8
View File
@@ -5,8 +5,7 @@
import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import { askCommunityValidation } from '$lib/utils/functions/validator';
import { supabase } from '$lib/utils/functions/supabase';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
import generateSlug from '$lib/utils/functions/generateSlug';
import TextEditor from '$lib/components/TextEditor/index.svelte';
@@ -37,14 +36,10 @@
if (error) {
console.error('Error: asking question', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error();
} else {
console.log('Success: asking question', question);
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
goto(`/lms/community/${question[0].slug}`);
}
src/routes/lms/exercises/+page.svelte
+1 -47
View File
@@ -1,34 +1,11 @@
<script>
import { onMount } from 'svelte';
import { flip } from 'svelte/animate';
import { dndzone } from 'svelte-dnd-action';
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import PageNav from '$lib/components/PageNav/index.svelte';
import RoleBasedSecurity from '$lib/components/RoleBasedSecurity/index.svelte';
import MarkExerciseModal from '$lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte';
import Chip from '$lib/components/Chip/index.svelte';
import PageBody from '$lib/components/PageBody/index.svelte';
import CourseContainer from '$lib/components/CourseContainer/index.svelte';
import { fetchCourse } from '$lib/utils/services/courses';
import { setCourse, course } from '$lib/components/Course/store';
import {
fetchSubmissions,
updateSubmission,
updateQuestionAnswer
} from '$lib/utils/services/submissions';
import { formatAnswers } from '$lib/components/Course/function';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import isSubmissionEarly from '$lib/utils/functions/isSubmissionEarly';
import formatDate from '$lib/utils/functions/formatDate';
const flipDurationMs = 300;
// export let data;
// const { courseId } = data;
let items;
let sections = [
{
id: 1,
@@ -124,24 +101,6 @@
return item;
});
// // Update backend
// if (itemToWithNewStatus) {
// // Update key mapping for each submission also
// submissionIdData[itemToWithNewStatus.id] = {
// ...submissionIdData[itemToWithNewStatus.id],
// status_id: itemToWithNewStatus.statusId
// };
// console.log(
// `submissionIdData[itemToWithNewStatus.id]`,
// submissionIdData[itemToWithNewStatus.id]
// );
// updateSubmission({
// id: itemToWithNewStatus.id,
// status_id: itemToWithNewStatus.statusId
// }).then((res) => console.log('Updated submission', res));
// }
}
function handleDndConsiderCards(columnIdx) {
@@ -204,17 +163,12 @@
class="flex w-full items-center cursor-pointer text-black mb-2"
href={`${$page.url.pathname}?submissionId=${item.id}`}
>
<!-- <img
alt="Student avatar"
class="block rounded-full h-6 w-6"
src={item.student.avatar_url}
/> -->
<p class="dark:text-white ml-2 text-sm">
{item.student.username}
</p>
</a>
<a
class="text-primary-700 text-md font-bold"
class="text-primary-700 dark:text-white text-md font-bold"
href="{$page.url.pathname}?submissionId={item.id}"
>
{item.exercise.title}
src/routes/org/[slug]/community/[slug]/+page.svelte
+5 -15
View File
@@ -19,8 +19,7 @@
askCommunityValidation,
commentInCommunityValidation
} from '$lib/utils/functions/validator';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
import TextField from '$lib/components/Form/TextField.svelte';
import DeleteCommentModal from '$lib/components/Org/Community/DeleteCommentModal.svelte';
import TextEditor from '$lib/components/TextEditor/index.svelte';
@@ -132,16 +131,11 @@
if (error) {
console.error('Error: commenting', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Error - Please try again later');
} else {
console.log('Success: commenting', data);
// Notification
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Success');
// Add to comment
const _c = data?.[0];
@@ -188,9 +182,7 @@
const { error } = await supabase.from(table).update({ votes }).match({ id: matchId });
if (error) {
console.error('Error: upvoteQuestion', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Error - Please try again later');
} else {
if (isQuestion) {
voted.question = true;
@@ -228,9 +220,7 @@
.match({ id: question.id });
if (error) {
console.error('Error: handleQuestionEdit', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Error - Please try again later');
} else {
question.title = fields.title;
question.body = fields.body;
src/routes/org/[slug]/community/ask/+page.svelte
+3 -9
View File
@@ -5,8 +5,7 @@
import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import { askCommunityValidation } from '$lib/utils/functions/validator';
import { supabase } from '$lib/utils/functions/supabase';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
import generateSlug from '$lib/utils/functions/generateSlug';
import TextEditor from '$lib/components/TextEditor/index.svelte';
@@ -37,15 +36,10 @@
if (error) {
console.error('Error: asking question', error);
$snackbarStore.open = true;
$snackbarStore.message = 'Error - Please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Error - Please try again later');
} else {
console.log('Success: asking question', question);
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Success');
goto(`${$currentOrgPath}/community/${question[0].slug}`);
}
}
src/routes/org/[slug]/quiz/[slug]/+page.svelte
+3 -8
View File
@@ -16,8 +16,7 @@
import DeleteModal from '$lib/components/Org/Quiz/DeleteModal.svelte';
import Preview from '$lib/components/Org/Quiz/Play/Preview.svelte';
import QuizQuestion from '$lib/components/Org/Quiz/QuizQuestion.svelte';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import { supabase } from '$lib/utils/functions/supabase';
export let data;
@@ -147,14 +146,10 @@
console.log('data', data);
console.log('error', error);
if (error) {
$snackbarStore.message = "Something's not right - Please try later";
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error("Something's not right - Please try later");
return;
} else {
$snackbarStore.message = 'Saved Successfully';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
$snackbarStore.open = true;
snackbar.success('Saved Successfully');
}
}