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/lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte
+2 -3
View File
@@ -6,7 +6,7 @@
import { VARIANTS } from '$lib/components/PrimaryButton/constants';
import Preview from './Preview.svelte';
import { SELECTABLE_STATUS } from './constants';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { snackbar } from '$lib/components/Snackbar/store';
export let open = false;
export let onClose = () => {};
@@ -38,8 +38,7 @@
total
});
$snackbarStore.open = true;
$snackbarStore.message = `Submission updated to '${status.label}'`;
snackbar.success(`Submission updated to '${status.label}'`);
}
function setStatus(data) {
src/lib/components/Course/components/Lesson/Exercise/index.svelte
+5 -10
View File
@@ -17,14 +17,12 @@
import RoleBasedSecurity from '$lib/components/RoleBasedSecurity/index.svelte';
import ViewMode from './ViewMode.svelte';
import EditMode from './EditMode.svelte';
import MODES from '$lib/utils/constants/mode.js';
import { VARIANTS } from '$lib/components/PrimaryButton/constants';
import { deleteExercise, upsertExercise } from '$lib/utils/services/courses';
import { upsertExercise } from '$lib/utils/services/courses';
import UpdateDescription from './UpdateDescription.svelte';
import { TrashCan } from 'carbon-icons-svelte';
import { exerciseMode } from './store';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
export let exerciseId;
export let goBack = () => {};
@@ -52,13 +50,10 @@
is_description_dirty: false,
questions: updatedQuestions
}));
$snackbarStore.open = true;
$snackbarStore.message = 'Saved Successfully';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Saved Successfully');
} catch (error) {
$snackbarStore.open = true;
$snackbarStore.message = `An Error Occurred`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
console.error(error);
snackbar.error();
}
isSaving = false;
}
src/lib/components/Course/components/Settings/index.svelte
+6 -17
View File
@@ -18,8 +18,7 @@
import { isObject } from '$lib/utils/functions/isObject';
import { lessons } from '../Lesson/store/lessons';
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';
let uploadingImage = false;
let isSaving = false;
@@ -109,13 +108,9 @@
a.click();
a.remove();
$snackbarStore.message = 'Download Complete';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
$snackbarStore.open = true;
snackbar.success('Download Complete');
} catch (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;
};
@@ -131,9 +126,7 @@
isDeleting = false;
goto($currentOrgPath + '/courses');
} catch (error) {
$snackbarStore.message = 'Something went wrong - Please try later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error('Something went wrong - Please try later');
isDeleting = false;
}
}
@@ -171,13 +164,9 @@
grading: grading,
lessonDownload: lesson_download
};
$snackbarStore.message = 'saved successfully';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
$snackbarStore.open = true;
snackbar.success('Saved successfully');
} catch (error) {
$snackbarStore.message = 'Something went wrong - Please try later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error();
}
isSaving = false;
src/lib/components/Courses/components/CopyCourseModal/index.svelte
+3 -6
View File
@@ -2,8 +2,7 @@
import { goto } from '$app/navigation';
import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import Modal from '$lib/components/Modal/index.svelte';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import TextField from '$lib/components/Form/TextField.svelte';
import { copyCourseModalInitialState, copyCourseModal } from '$lib/components/Courses/store';
import { cloneCourse } from '$lib/utils/services/courses/clone';
@@ -22,11 +21,9 @@
} catch (error) {
console.error(error);
// IIFI of snackbarStore to Show notification error
// IIFI of snackbar to Show notification error
(() => {
$snackbarStore.message = "Something's not right - Please try later";
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error();
})();
// Stop loader
src/lib/components/LMS/components/Profile.svelte
+4 -8
View File
@@ -7,8 +7,7 @@
import UploadImage from '$lib/components/UploadImage/index.svelte';
import { supabase } from '$lib/utils/functions/supabase';
import { profile } from '$lib/utils/store/user';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
let avatar;
let loading = false;
@@ -50,9 +49,7 @@
..._profile,
...updates
}));
$snackbarStore.open = true;
$snackbarStore.message = 'Update successful';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
if (error) throw error;
} catch (error) {
@@ -60,9 +57,8 @@
if (message.includes('profile_username_key')) {
message = 'username already exists';
}
$snackbarStore.open = true;
$snackbarStore.message = `Update failed: ${message}`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error(`Update failed: ${message}`);
loading = false;
} finally {
loading = false;
src/lib/components/Org/AddOrgModal/AddOrgModal.svelte
+2 -6
View File
@@ -8,8 +8,7 @@
import { getOrganizations } from '$lib/utils/services/org';
import { blockedSubdomain } from '$lib/utils/constants/app';
import { newOrgModal } from '../store';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import { createOrgValidation } from '$lib/utils/functions/validator';
type Error = {
@@ -93,10 +92,7 @@
return;
}
$snackbarStore.open = true;
$snackbarStore.message = 'Org created Successfully';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
await getOrganizations($profile.id);
resetForm();
src/lib/components/Org/Quiz/NewQuizModal.svelte
+2 -5
View File
@@ -3,8 +3,7 @@
import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import Modal from '$lib/components/Modal/index.svelte';
import TextField from '$lib/components/Form/TextField.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';
import { currentOrg, createQuizModal, currentOrgPath, quizesStore } from '$lib/utils/store/org';
import { createQuizValidation } from '$lib/utils/functions/validator';
@@ -23,9 +22,7 @@
}
function errorNotification() {
$snackbarStore.message = "Something's not right - Please try later";
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error();
}
async function createQuiz() {
src/lib/components/Org/Quiz/Quizzes.svelte
+3 -8
View File
@@ -4,8 +4,7 @@
import QuizLoader from './Loader.svelte';
import QuizCard from './QuizCard.svelte';
import CoursesEmptyIcon from '$lib/components/Icons/CoursesEmptyIcon.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';
import { currentOrg, quizesStore } from '$lib/utils/store/org';
@@ -22,9 +21,7 @@
.order('updated_at', { ascending: false });
if (error) {
$snackbarStore.message = "Something's not right - Please try later";
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
$snackbarStore.open = true;
snackbar.error();
return;
}
console.log('data', data);
@@ -35,9 +32,7 @@
$: fetchQuizes($currentOrg.id);
</script>
<div
class="flex items-center justify-center lg:justify-start flex-wrap my-4 m-auto"
>
<div class="flex items-center justify-center lg:justify-start flex-wrap my-4 m-auto">
{#if isLoading}
<QuizLoader />
<QuizLoader />
src/lib/components/Org/Settings/Domains.svelte
+2 -5
View File
@@ -8,8 +8,7 @@
import { currentOrg } from '$lib/utils/store/org';
import { supabase } from '$lib/utils/functions/supabase';
import { blockedSubdomain } from '$lib/utils/constants/app';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import SectionTitle from '../SectionTitle.svelte';
import VisitOrgSiteButton from '$lib/components/Buttons/VisitOrgSite.svelte';
@@ -34,9 +33,7 @@
console.log('Error: create organisation', error);
errors = 'Sitename already exists.';
} else {
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
$currentOrg.siteName = siteName;
goto(`/org/${$currentOrg.siteName}/settings/domains`);
src/lib/components/Org/Settings/Integrations.svelte
+26 -44
View File
@@ -3,8 +3,7 @@
import CheckmarkFilled from 'carbon-icons-svelte/lib/CheckmarkFilled.svelte';
import { supabase } from '$lib/utils/functions/supabase';
import { profile } from '$lib/utils/store/user';
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 PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import { VARIANTS } from '$lib/components/PrimaryButton/constants';
@@ -14,54 +13,37 @@
let chatId: number | null;
async function addChatId() {
const updates = {
telegram_chat_id: chatId
};
if ($profile.telegram_chat_id === null) {
let { error } = await supabase.from('profile').update(updates).match({ id: $profile.id });
// Update the telegram_chat_id in the profile store with the value from the TextField
profile.update((profileData) => ({
...profileData,
...updates
}));
// Clear the chatId variable after updating the store
chatId = null;
if (!chatId || `${chatId}`.length < 5) return;
if (error) {
$snackbarStore.open = true;
$snackbarStore.message = 'Integration Failed, please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
console.log(error);
} else {
$snackbarStore.open = true;
$snackbarStore.message = 'Integration successful';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
}
const { error } = await supabase
.from('profile')
.update({
telegram_chat_id: chatId
})
.match({ id: $profile.id });
if (error) {
console.log(error);
snackbar.error('Integration Failed, please try again later');
} else {
$profile.telegram_chat_id = chatId;
chatId = null;
snackbar.success('Integration successful');
}
}
async function deleteChatId() {
const updates = {
telegram_chat_id: null
};
let { error } = await supabase.from('profile').update(updates).match({ id: $profile.id });
if (typeof $profile.telegram_chat_id !== null) {
profile.update((profileData) => ({
...profileData,
telegram_chat_id: null
}));
const { error } = await supabase
.from('profile')
.update({ telegram_chat_id: null })
.match({ id: $profile.id });
if (error) {
$snackbarStore.open = true;
$snackbarStore.message = 'Deletion Failed, please try again later';
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
console.log(error);
} else {
// Show a success message in the snackbar
$snackbarStore.open = true;
$snackbarStore.message = 'Integration deleted';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
}
if (error) {
snackbar.error('Deletion Failed, please try again later');
console.log(error);
} else {
$profile.telegram_chat_id = null;
snackbar.success('Integration deleted');
}
}
</script>
src/lib/components/Org/Settings/LandingpageSettings.svelte
+9 -15
View File
@@ -10,8 +10,7 @@
import TextArea from '$lib/components/Form/TextArea.svelte';
import { currentOrg } from '$lib/utils/store/org';
import { getSupabase } from '$lib/utils/functions/supabase';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import { FileUploader } from 'carbon-components-svelte';
import { landingPageSettings } from './store';
import type { OrgLandingPageJson } from './store';
@@ -101,26 +100,21 @@
};
async function handleSave() {
isSaving = true;
$landingPageSettings.footer.twitter = checkPrefix($landingPageSettings.footer.twitter);
$landingPageSettings.footer.linkedin = checkPrefix($landingPageSettings.footer.linkedin);
$landingPageSettings.footer.facebook = checkPrefix($landingPageSettings.footer.facebook);
console.log($landingPageSettings.footer.twitter);
const { data, error } = await supabase
$landingPageSettings.footer.twitter = checkPrefix($landingPageSettings.footer.twitter) || '';
$landingPageSettings.footer.linkedin = checkPrefix($landingPageSettings.footer.linkedin) || '';
$landingPageSettings.footer.facebook = checkPrefix($landingPageSettings.footer.facebook) || '';
const { error } = await supabase
.from('organization')
.update({ landingpage: $landingPageSettings })
.match({ id: $currentOrg.id });
if (error) {
let message = error?.message || 'Please try again';
$snackbarStore.open = true;
$snackbarStore.message = `Update failed: ${message}`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
const message = error?.message || 'Please try again';
snackbar.error(`Update failed: ${message}`);
} else {
$currentOrg.landingpage = $landingPageSettings;
$snackbarStore.open = true;
$snackbarStore.message = 'Saved successful';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success();
}
isSaving = false;
src/lib/components/Org/Settings/OrgSettings.svelte
+5 -8
View File
@@ -6,8 +6,7 @@
import { VARIANTS } from '$lib/components/PrimaryButton/constants';
import UploadImage from '$lib/components/UploadImage/index.svelte';
import { supabase } from '$lib/utils/functions/supabase';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
import { currentOrg, currentOrgPath } from '$lib/utils/store/org';
import SectionTitle from '../SectionTitle.svelte';
@@ -73,9 +72,8 @@
..._currentOrg,
...updates
}));
$snackbarStore.open = true;
$snackbarStore.message = 'Update successful';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Update successful');
if (error) throw error;
} catch (error) {
@@ -83,9 +81,8 @@
if (message.includes('profile_username_key')) {
message = 'username already exists';
}
$snackbarStore.open = true;
$snackbarStore.message = `Update failed: ${message}`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error(`Update failed: ${message}`);
loading = false;
} finally {
loading = false;
src/lib/components/Org/Settings/Profile.svelte
+3 -8
View File
@@ -8,8 +8,7 @@
import UploadImage from '$lib/components/UploadImage/index.svelte';
import { supabase } from '$lib/utils/functions/supabase';
import { profile } from '$lib/utils/store/user';
import { snackbarStore } from '$lib/components/Snackbar/store';
import { SNACKBAR_SEVERITY } from '$lib/components/Snackbar/constants';
import { snackbar } from '$lib/components/Snackbar/store';
let avatar;
let loading = false;
@@ -51,9 +50,7 @@
..._profile,
...updates
}));
$snackbarStore.open = true;
$snackbarStore.message = 'Update successful';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Update successful');
if (error) throw error;
} catch (error) {
@@ -61,9 +58,7 @@
if (message.includes('profile_username_key')) {
message = 'username already exists';
}
$snackbarStore.open = true;
$snackbarStore.message = `Update failed: ${message}`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.success(`Update failed: ${message}`);
loading = false;
} finally {
loading = false;
src/lib/components/Org/Settings/TeamMembers.svelte
+4 -12
View File
@@ -9,8 +9,7 @@
import { validateEmailInString } from '$lib/utils/functions/validator';
import { ROLE_LABEL, ROLE } from '$lib/utils/constants/roles';
import { currentOrg, orgTeam } 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 { getOrgTeam } from '$lib/utils/services/org';
import { profile } from '$lib/utils/store/user';
import { supabase } from '$lib/utils/functions/supabase';
@@ -51,10 +50,7 @@
apiError = error;
console.error('onSendInvite:', error);
$snackbarStore.open = true;
$snackbarStore.message = `Failed to send invite, please try again`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error(`Failed to send invite, please try again`);
isLoading = false;
return;
}
@@ -81,9 +77,7 @@
const isLast = index === emails.length - 1;
if (isLast) {
$snackbarStore.open = true;
$snackbarStore.message = 'Success';
$snackbarStore.severity = SNACKBAR_SEVERITY.SUCCESS;
snackbar.success('Success');
emailsStr = '';
isLoading = false;
@@ -98,9 +92,7 @@
if (error) {
console.error('onRemove:', error);
$snackbarStore.open = true;
$snackbarStore.message = `Failed to remove user, please try again`;
$snackbarStore.severity = SNACKBAR_SEVERITY.ERROR;
snackbar.error('Failed to remove user, please try again');
} else {
orgTeam.update((team) => [...team.filter((member) => member.id !== id)]);
}
src/lib/components/Snackbar/store.js
+22 -1
View File
@@ -6,7 +6,28 @@ export const snackbarStoreInitialState = {
message: '',
severity: SNACKBAR_SEVERITY.DEFAULT,
handleClose: () => {},
autoHideDuration: 6000,
autoHideDuration: 6000
};
export const snackbarStore = writable({ ...snackbarStoreInitialState });
export const snackbar = {
success(message = 'Success') {
snackbarStore.update((store) => {
store.open = true;
store.message = message;
store.severity = SNACKBAR_SEVERITY.SUCCESS;
return store;
});
},
error(message = 'Something went wrong - Please try later') {
snackbarStore.update((store) => {
store.open = true;
store.message = message;
store.severity = SNACKBAR_SEVERITY.ERROR;
return store;
});
}
};