From cc5fa60c62232226808f0bc7663ac15c95311516 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Sat, 4 Feb 2023 15:35:42 +0100 Subject: [PATCH] feat: use SvelteToast instead of console, console.log() cleanup --- frontend/src/lib/@api/candidate.ts | 2 -- .../admin/list/CandidateDetails.svelte | 18 ++++++++++++++++-- .../dashboard/DashboardInfoCard.svelte | 3 ++- .../dashboard/DashboardUploadCard.svelte | 4 ---- .../components/textfield/TelephoneField.svelte | 1 - frontend/src/lib/utils/countries.ts | 1 + frontend/src/lib/utils/toast.ts | 11 +++++++++++ .../(authenticated)/dashboard/+page.svelte | 7 +++++-- .../(admin)/admin/auth/login/+page.svelte | 5 ++++- .../(authenticated)/register/+page.svelte | 7 +------ .../auth/login/[code=application]/+page.svelte | 1 - 11 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 frontend/src/lib/utils/countries.ts create mode 100644 frontend/src/lib/utils/toast.ts diff --git a/frontend/src/lib/@api/candidate.ts b/frontend/src/lib/@api/candidate.ts index 4f78b88..4427054 100644 --- a/frontend/src/lib/@api/candidate.ts +++ b/frontend/src/lib/@api/candidate.ts @@ -54,7 +54,6 @@ export const apiFetchSubmissionProgress = async (fetchSsr?: Fetch): Promise => { const apiFetch = fetchSsr || fetch; try { - console.log(API_URL + '/candidate/whoami'); const res = await apiFetch(API_URL + '/candidate/whoami', { method: 'GET', credentials: 'include' @@ -100,7 +99,6 @@ export const apiFillDetails = async (data: CandidateData): Promise import { apiGetCandidatePortfolio, apiResetCandidatePassword } from '$lib/@api/admin'; import type { CandidateData } from '$lib/stores/candidate'; + import { SvelteToast, toast } from '@zerodevx/svelte-toast'; export let id: number; export let candidateData: CandidateData; @@ -13,7 +14,13 @@ const res = await apiResetCandidatePassword(id); alert('Nove heslo: ' + res.password); } catch { - console.log('error'); + toast.push('Rodné číslo neodpovídá oficiální specifikaci či datumu narození', { + theme: { + '--toastColor': 'mintcream', + '--toastBackground': '#b91c1c', + '--toastBarBackground': '#7f1d1d' + } + }); } } @@ -27,11 +34,18 @@ document.body.appendChild(link); link.click(); } catch (e) { - console.log(e); + toast.push('Rodné číslo neodpovídá oficiální specifikaci či datumu narození', { + theme: { + '--toastColor': 'mintcream', + '--toastBackground': '#b91c1c', + '--toastBarBackground': '#7f1d1d' + } + }); } } +
diff --git a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte index c51376d..b23d645 100644 --- a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte @@ -15,6 +15,7 @@ import { baseCandidateData, candidateData } from '$lib/stores/candidate'; import tippy, { sticky } from 'tippy.js'; import { goto } from '$app/navigation'; + import { pushErrorText } from '$lib/utils/toast'; export let title: string; export let status: Status; @@ -62,7 +63,7 @@ document.body.appendChild(link); link.click(); } catch (e) { - console.log(e); + pushErrorText("Chyba při stahování portfolia"); } }; diff --git a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte index b1aefa8..07aa9f1 100644 --- a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte @@ -31,12 +31,10 @@ $: if ($submissionProgress) { status = getStatus(); - // console.log('type' + fileType + ' status: ' + status); fileDropped = status === 'uploaded' || status === 'submitted'; } const getStatus = (): Status => { - console.log($submissionProgress); switch ($submissionProgress.status) { case UploadStatus.None: return 'missing'; @@ -71,7 +69,6 @@ }; const onFileDrop = (dropped: Files) => { - console.log(dropped); if (dropped.accepted.length > 0) { fileDropped = true; const file = dropped.accepted[0]; @@ -79,7 +76,6 @@ dispatch('filedrop', { file: file, callback: (progressEvent: AxiosProgressEvent) => { - console.log(progressEvent.bytes); progress = progressEvent.progress!; bytesTotal = progressEvent.total ?? 0; } diff --git a/frontend/src/lib/components/textfield/TelephoneField.svelte b/frontend/src/lib/components/textfield/TelephoneField.svelte index ed5c28c..c4a9873 100644 --- a/frontend/src/lib/components/textfield/TelephoneField.svelte +++ b/frontend/src/lib/components/textfield/TelephoneField.svelte @@ -20,7 +20,6 @@ if (number !== null && number !== undefined) { country = number.country!; } - // console.log(country); } // Validity diff --git a/frontend/src/lib/utils/countries.ts b/frontend/src/lib/utils/countries.ts new file mode 100644 index 0000000..2ea26c4 --- /dev/null +++ b/frontend/src/lib/utils/countries.ts @@ -0,0 +1 @@ +export const countries = ["Afghanistan","Albania","Algeria","Andorra","Angola","Anguilla","Antigua & Barbuda","Argentina","Armenia","Aruba","Australia","Austria","Azerbaijan","Bahamas","Bahrain","Bangladesh","Barbados","Belarus","Belgium","Belize","Benin","Bermuda","Bhutan","Bolivia","Bosnia & Herzegovina","Botswana","Brazil","British Virgin Islands","Brunei","Bulgaria","Burkina Faso","Burundi","Cambodia","Cameroon","Cape Verde","Cayman Islands","Chad","Chile","China","Colombia","Congo","Cook Islands","Costa Rica","Cote D Ivoire","Croatia","Cruise Ship","Cuba","Cyprus","Czech Republic","Denmark","Djibouti","Dominica","Dominican Republic","Ecuador","Egypt","El Salvador","Equatorial Guinea","Estonia","Ethiopia","Falkland Islands","Faroe Islands","Fiji","Finland","France","French Polynesia","French West Indies","Gabon","Gambia","Georgia","Germany","Ghana","Gibraltar","Greece","Greenland","Grenada","Guam","Guatemala","Guernsey","Guinea","Guinea Bissau","Guyana","Haiti","Honduras","Hong Kong","Hungary","Iceland","India","Indonesia","Iran","Iraq","Ireland","Isle of Man","Israel","Italy","Jamaica","Japan","Jersey","Jordan","Kazakhstan","Kenya","Kuwait","Kyrgyz Republic","Laos","Latvia","Lebanon","Lesotho","Liberia","Libya","Liechtenstein","Lithuania","Luxembourg","Macau","Macedonia","Madagascar","Malawi","Malaysia","Maldives","Mali","Malta","Mauritania","Mauritius","Mexico","Moldova","Monaco","Mongolia","Montenegro","Montserrat","Morocco","Mozambique","Namibia","Nepal","Netherlands","Netherlands Antilles","New Caledonia","New Zealand","Nicaragua","Niger","Nigeria","Norway","Oman","Pakistan","Palestine","Panama","Papua New Guinea","Paraguay","Peru","Philippines","Poland","Portugal","Puerto Rico","Qatar","Reunion","Romania","Russia","Rwanda","Saint Pierre & Miquelon","Samoa","San Marino","Satellite","Saudi Arabia","Senegal","Serbia","Seychelles","Sierra Leone","Singapore","Slovakia","Slovenia","South Africa","South Korea","Spain","Sri Lanka","St Kitts & Nevis","St Lucia","St Vincent","St. Lucia","Sudan","Suriname","Swaziland","Sweden","Switzerland","Syria","Taiwan","Tajikistan","Tanzania","Thailand","Timor L'Este","Togo","Tonga","Trinidad & Tobago","Tunisia","Turkey","Turkmenistan","Turks & Caicos","Uganda","Ukraine","United Arab Emirates","United Kingdom","Uruguay","Uzbekistan","Venezuela","Vietnam","Virgin Islands (US)","Yemen","Zambia","Zimbabwe"]; \ No newline at end of file diff --git a/frontend/src/lib/utils/toast.ts b/frontend/src/lib/utils/toast.ts new file mode 100644 index 0000000..096af11 --- /dev/null +++ b/frontend/src/lib/utils/toast.ts @@ -0,0 +1,11 @@ +import { toast } from "@zerodevx/svelte-toast"; + +export const pushErrorText = (text: string) => { + toast.push(text, { + theme: { + '--toastColor': 'mintcream', + '--toastBackground': '#b91c1c', + '--toastBarBackground': '#7f1d1d' + } + }); +}; \ No newline at end of file diff --git a/frontend/src/routes/(admin)/admin/(authenticated)/dashboard/+page.svelte b/frontend/src/routes/(admin)/admin/(authenticated)/dashboard/+page.svelte index 9738767..ba4f391 100644 --- a/frontend/src/routes/(admin)/admin/(authenticated)/dashboard/+page.svelte +++ b/frontend/src/routes/(admin)/admin/(authenticated)/dashboard/+page.svelte @@ -11,6 +11,8 @@ import bacgkround from '$lib/assets/background.jpg'; import Logout from '$lib/components/icons/Logout.svelte'; import { goto } from '$app/navigation'; + import { pushErrorText } from '$lib/utils/toast'; + import { SvelteToast } from '@zerodevx/svelte-toast'; export let data: PageServerData; @@ -20,7 +22,7 @@ try { candidates = await apiListCandidates(undefined, activeFilter.filter); } catch { - console.log('error'); + pushErrorText('Nepodařilo se načíst uchazeče'); } }; @@ -93,7 +95,7 @@ link.setAttribute('download', 'UCHAZECI' + '.csv'); link.click(); } catch (e) { - console.log(e); + pushErrorText('Nepodařilo se stáhnout CSV'); } }; @@ -110,6 +112,7 @@ {/if}
+
Background
diff --git a/frontend/src/routes/(admin)/admin/auth/login/+page.svelte b/frontend/src/routes/(admin)/admin/auth/login/+page.svelte index ce16af7..c9af6e9 100644 --- a/frontend/src/routes/(admin)/admin/auth/login/+page.svelte +++ b/frontend/src/routes/(admin)/admin/auth/login/+page.svelte @@ -10,6 +10,8 @@ import { goto } from '$app/navigation'; import Submit from '$lib/components/button/Submit.svelte'; import PasswordField from '$lib/components/textfield/PasswordField.svelte'; + import { SvelteToast } from '@zerodevx/svelte-toast'; + import { pushErrorText } from '$lib/utils/toast'; let adminIdValue = ''; let adminPasswordValue = ''; @@ -19,11 +21,12 @@ await apiLogin({ adminId: Number(adminIdValue), password: adminPasswordValue }); goto('/admin/dashboard'); } catch (e) { - console.log(e); + pushErrorText('Neplatné heslo nebo ID!'); } }; +
{ - console.log('submit button clicked'); - console.log(pagesFilled.map((_, i) => !isPageInvalid(i))); - if (pageIndex === pageCount) { - console.log('submitting'); // clone values to oldValues let oldValues = JSON.parse(JSON.stringify(values)); try { @@ -793,11 +790,9 @@ { if (pageIndex === 4) { - console.log('validating personal id'); validatePersonalId(); } await handleSubmit(e); - console.log(pagesFilled.map((_, i) => !isPageInvalid(i))); if (isPageInvalid(pageIndex)) return; if (pageIndex !== pageCount) { pagesFilled[pageIndex] = true; diff --git a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte index 278dde8..cdf9d40 100644 --- a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte +++ b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte @@ -47,7 +47,6 @@ } const submit = async () => { - console.log('submitting: ', codeValueArray); try { await apiLogin({ applicationId, password: codeValueMobile }); goto('/dashboard');