From ec4fe744904f26e780702f09ff66621754fe1d88 Mon Sep 17 00:00:00 2001 From: EETagent Date: Thu, 26 Jan 2023 22:51:33 +0100 Subject: [PATCH] feat: formatting --- frontend/.typesafe-i18n.json | 12 +- .../checkbox/AccountLinkCheckBox.svelte | 4 +- .../components/checkbox/GdprCheckBox.svelte | 4 +- .../checkbox/PersonalIdConfirmCheckBox.svelte | 8 +- .../dashboard/DashboardInfoCard.svelte | 35 ++--- .../dashboard/DashboardUploadCard.svelte | 14 +- .../lib/components/grades/GradesTable.svelte | 2 +- frontend/src/lib/stores/candidate.ts | 5 +- frontend/src/lib/utils/personalIdFormat.ts | 121 +++++++++--------- .../[code=application]/+page.server.ts | 4 +- .../(candidate)/auth/login/+page.svelte | 6 +- frontend/src/routes/+layout.ts | 2 +- frontend/src/translations/formatters.ts | 11 +- frontend/svelte.config.js | 5 +- frontend/tsconfig.json | 2 +- 15 files changed, 127 insertions(+), 108 deletions(-) diff --git a/frontend/.typesafe-i18n.json b/frontend/.typesafe-i18n.json index 12eb8a1..7511ef9 100644 --- a/frontend/.typesafe-i18n.json +++ b/frontend/.typesafe-i18n.json @@ -1,7 +1,7 @@ { - "baseLocale": "cs", - "adapter": "svelte", - "esmImports": true, - "outputPath": "./src/translations", - "$schema": "https://unpkg.com/typesafe-i18n@5.20.0/schema/typesafe-i18n.json" -} \ No newline at end of file + "baseLocale": "cs", + "adapter": "svelte", + "esmImports": true, + "outputPath": "./src/translations", + "$schema": "https://unpkg.com/typesafe-i18n@5.20.0/schema/typesafe-i18n.json" +} diff --git a/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte b/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte index 2009579..920a707 100644 --- a/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte +++ b/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte @@ -6,7 +6,7 @@ export let applications: Array; let title1 = $LL.components.checkbox.accountLinkCheckBox.multiple.title({ first: applications[0], - second: applications[1], + second: applications[1] }); let title2 = $LL.components.checkbox.accountLinkCheckBox.multiple.title2({ first: applications[0] @@ -14,7 +14,7 @@ if (applications.length === 1) { title1 = $LL.components.checkbox.accountLinkCheckBox.single.title({ - first: applications[0], + first: applications[0] }); title2 = $LL.components.checkbox.accountLinkCheckBox.single.title2(); } diff --git a/frontend/src/lib/components/checkbox/GdprCheckBox.svelte b/frontend/src/lib/components/checkbox/GdprCheckBox.svelte index 90aa6cd..19a4998 100644 --- a/frontend/src/lib/components/checkbox/GdprCheckBox.svelte +++ b/frontend/src/lib/components/checkbox/GdprCheckBox.svelte @@ -13,7 +13,9 @@
{$LL.components.checkbox.gdprCheckBox.title()}
{$LL.components.checkbox.gdprCheckBox.description()}
-
{$LL.components.checkbox.gdprCheckBox.here()}
+
+ {$LL.components.checkbox.gdprCheckBox.here()} +
diff --git a/frontend/src/lib/components/checkbox/PersonalIdConfirmCheckBox.svelte b/frontend/src/lib/components/checkbox/PersonalIdConfirmCheckBox.svelte index d0efed5..5d04c01 100644 --- a/frontend/src/lib/components/checkbox/PersonalIdConfirmCheckBox.svelte +++ b/frontend/src/lib/components/checkbox/PersonalIdConfirmCheckBox.svelte @@ -5,10 +5,10 @@ export let personalIdErr: boolean = false; export let personalIdNumber: string; let titleOk = $LL.components.checkbox.personalIdConfirmCheckBox.titleOk({ - personalId: personalIdNumber, + personalId: personalIdNumber }); let titleErr = $LL.components.checkbox.personalIdConfirmCheckBox.titleErr({ - personalId: personalIdNumber, + personalId: personalIdNumber }); export let error: string = ''; @@ -61,7 +61,9 @@
{titleErr}
-
{$LL.components.checkbox.personalIdConfirmCheckBox.whatHappened()}
+
+ {$LL.components.checkbox.personalIdConfirmCheckBox.whatHappened()} +
diff --git a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte index 1dae389..ff635f4 100644 --- a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte @@ -160,30 +160,33 @@ {$baseCandidateData.applications[1]} {/if} - {$LL.input.address()}: {$candidateData.candidate.address} {$LL.input.birthDate()}: {$candidateData.candidate.birthdate}{$LL.input.address()}: + {$candidateData.candidate.address} {$LL.input.birthPlace()}: {$candidateData.candidate.birthplace}{$LL.input.birthDate()}: + {$candidateData.candidate.birthdate} {$LL.input.personalIdentificationNumber()}: {$candidateData.candidate.personalIdNumber}{$LL.input.birthPlace()}: + {$candidateData.candidate.birthplace} {$LL.input.schoolIzo()}: {$candidateData.candidate.schoolName}{$LL.input.personalIdentificationNumber()}: + {$candidateData.candidate.personalIdNumber} {$LL.input.insuranceNumber()}: {$candidateData.candidate.healthInsurance}{$LL.input.schoolIzo()}: + {$candidateData.candidate.schoolName} - {$LL.input.telephone()}: {$candidateData.candidate.telephone}{$LL.input.insuranceNumber()}: + {$candidateData.candidate.healthInsurance} + {$LL.input.telephone()}: + {$candidateData.candidate.telephone}
{parent.name + ' ' + parent.surname} {$LL.input.email()}: {parent.email} - {$LL.input.telephone()}: {parent.telephone} + {$LL.input.telephone()}: {parent.telephone}
{/each} diff --git a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte index 9541b93..b1aefa8 100644 --- a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte @@ -105,7 +105,8 @@ {#if status === 'uploaded'} dispatch('delete'), 150)} + >{$LL.components.dashboard.dashboardUploadCard.delete()} {/if} @@ -133,9 +134,16 @@ > diff --git a/frontend/src/lib/components/grades/GradesTable.svelte b/frontend/src/lib/components/grades/GradesTable.svelte index 165fd4c..0628d1e 100644 --- a/frontend/src/lib/components/grades/GradesTable.svelte +++ b/frontend/src/lib/components/grades/GradesTable.svelte @@ -29,7 +29,7 @@ } return grades; }; - + let gradesLocal: Array = grades.length > 0 ? convertGradeBackendToGrade(grades) diff --git a/frontend/src/lib/stores/candidate.ts b/frontend/src/lib/stores/candidate.ts index 16dca75..dcf9a30 100644 --- a/frontend/src/lib/stores/candidate.ts +++ b/frontend/src/lib/stores/candidate.ts @@ -1,7 +1,6 @@ import type { GradeBackend } from '$lib/components/grades/GradesTable.svelte'; import { writable } from 'svelte/store'; - export interface School { name: string; field: string; @@ -88,8 +87,8 @@ export const candidateData = writable({ schoolName: '', healthInsurance: '', grades: [], - firstSchool: {name: '', field: ''}, - secondSchool: {name: '', field: ''}, + firstSchool: { name: '', field: '' }, + secondSchool: { name: '', field: '' }, testLanguage: '' }, parents: [] diff --git a/frontend/src/lib/utils/personalIdFormat.ts b/frontend/src/lib/utils/personalIdFormat.ts index 2cb6282..e3e072e 100644 --- a/frontend/src/lib/utils/personalIdFormat.ts +++ b/frontend/src/lib/utils/personalIdFormat.ts @@ -1,74 +1,75 @@ // TODO: nefunguje pro lidi nar. pred 1.1.1954 :D export const isPersonalIdNumberValid = (personalIdNumber: string): boolean => { - const idFmt = personalIdNumber.split('/').join(''); + const idFmt = personalIdNumber.split('/').join(''); - const lastDigitCheck = - Number(idFmt.slice(0, 9)) % 11 === Number(idFmt.at(-1)) || - Number(idFmt.slice(0, 9)) % 11 === 10; // an edge case that could occur - const divisibleBy11 = Number(idFmt) % 11 === 0; + const lastDigitCheck = + Number(idFmt.slice(0, 9)) % 11 === Number(idFmt.at(-1)) || + Number(idFmt.slice(0, 9)) % 11 === 10; // an edge case that could occur + const divisibleBy11 = Number(idFmt) % 11 === 0; - if (lastDigitCheck && divisibleBy11) { - return true; - } else { - return false; - } + if (lastDigitCheck && divisibleBy11) { + return true; + } else { + return false; + } }; export const isPersonalIdNumberWithBirthdateValid = ( - personalIdNumber: string, - birthdate: string + personalIdNumber: string, + birthdate: string ): boolean => { - const dateFmt = birthdate - .split('.') - .map((x) => x.padStart(2, '0')) - .reverse() - .join('') - .slice(2); - const idFmt = personalIdNumber.split('/').join(''); + const dateFmt = birthdate + .split('.') + .map((x) => x.padStart(2, '0')) + .reverse() + .join('') + .slice(2); + const idFmt = personalIdNumber.split('/').join(''); - const divisionValid = isPersonalIdNumberValid(personalIdNumber); + const divisionValid = isPersonalIdNumberValid(personalIdNumber); - const idMonth = Number(idFmt.slice(2, 4)); - const dateMonth = Number(dateFmt.slice(2, 4)); - const monthValid = - idMonth === dateMonth || - idMonth === dateMonth + 50 || - idMonth === dateMonth + 20 || - idMonth === dateMonth + 70; + const idMonth = Number(idFmt.slice(2, 4)); + const dateMonth = Number(dateFmt.slice(2, 4)); + const monthValid = + idMonth === dateMonth || + idMonth === dateMonth + 50 || + idMonth === dateMonth + 20 || + idMonth === dateMonth + 70; - if ( - idFmt.slice(0, 2) === dateFmt.slice(0, 2) && - monthValid && - idFmt.slice(4, 6) === dateFmt.slice(4, 6) && - divisionValid - ) { - return true; - } else { - return false; - } + if ( + idFmt.slice(0, 2) === dateFmt.slice(0, 2) && + monthValid && + idFmt.slice(4, 6) === dateFmt.slice(4, 6) && + divisionValid + ) { + return true; + } else { + return false; + } }; -export const deriveBirthdateFromPersonalId = (personalIdNumber: string): - [birthdate: string, sex: 'MUŽ' | 'ŽENA'] => { - const year = Number(personalIdNumber.slice(0, 2)); - const idMonth = Number(personalIdNumber.slice(2, 4)); - let month; - let sex: 'MUŽ' | 'ŽENA'; - if (idMonth > 12 && idMonth <= 32) { - month = idMonth - 20; - sex = 'MUŽ'; - } else if (idMonth > 50 && idMonth <= 52) { - month = idMonth - 50; - sex = 'ŽENA'; - } else if (idMonth > 70 && idMonth <= 82) { - month = idMonth - 70; - sex = 'ŽENA'; - } else { - month = idMonth; - sex = 'MUŽ'; - }; - const day = Number(personalIdNumber.slice(4, 6)); +export const deriveBirthdateFromPersonalId = ( + personalIdNumber: string +): [birthdate: string, sex: 'MUŽ' | 'ŽENA'] => { + const year = Number(personalIdNumber.slice(0, 2)); + const idMonth = Number(personalIdNumber.slice(2, 4)); + let month; + let sex: 'MUŽ' | 'ŽENA'; + if (idMonth > 12 && idMonth <= 32) { + month = idMonth - 20; + sex = 'MUŽ'; + } else if (idMonth > 50 && idMonth <= 52) { + month = idMonth - 50; + sex = 'ŽENA'; + } else if (idMonth > 70 && idMonth <= 82) { + month = idMonth - 70; + sex = 'ŽENA'; + } else { + month = idMonth; + sex = 'MUŽ'; + } + const day = Number(personalIdNumber.slice(4, 6)); - const birthdate = `${day}.${month}.${year}`; - return [birthdate, sex]; -} \ No newline at end of file + const birthdate = `${day}.${month}.${year}`; + return [birthdate, sex]; +}; diff --git a/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts b/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts index 5bc7eea..15c6959 100644 --- a/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts +++ b/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts @@ -23,8 +23,8 @@ export const load: PageServerLoad = async ({ fetch, params }) => { schoolName: '', healthInsurance: '', grades: [], - firstSchool: {name: '', field: ''}, - secondSchool: {name: '', field: ''}, + firstSchool: { name: '', field: '' }, + secondSchool: { name: '', field: '' }, testLanguage: '' }, parents: [] diff --git a/frontend/src/routes/(candidate)/auth/login/+page.svelte b/frontend/src/routes/(candidate)/auth/login/+page.svelte index 05045e4..6920fa8 100644 --- a/frontend/src/routes/(candidate)/auth/login/+page.svelte +++ b/frontend/src/routes/(candidate)/auth/login/+page.svelte @@ -25,7 +25,11 @@ {$LL.candidate.auth.login.description()}

- +
diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.ts index 62407af..6d0e370 100644 --- a/frontend/src/routes/+layout.ts +++ b/frontend/src/routes/+layout.ts @@ -5,7 +5,7 @@ import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ url }) => { await loadAllLocalesAsync(); setLocale('cs'); - + return { url: url.pathname }; diff --git a/frontend/src/translations/formatters.ts b/frontend/src/translations/formatters.ts index 9e0741e..0e53a39 100644 --- a/frontend/src/translations/formatters.ts +++ b/frontend/src/translations/formatters.ts @@ -1,11 +1,10 @@ -import type { FormattersInitializer } from 'typesafe-i18n' -import type { Locales, Formatters } from './i18n-types.js' +import type { FormattersInitializer } from 'typesafe-i18n'; +import type { Locales, Formatters } from './i18n-types.js'; export const initFormatters: FormattersInitializer = (locale: Locales) => { - const formatters: Formatters = { // add your formatter functions here - } + }; - return formatters -} + return formatters; +}; diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js index a3f4721..d10b6ac 100644 --- a/frontend/svelte.config.js +++ b/frontend/svelte.config.js @@ -1,6 +1,6 @@ import adapter from '@sveltejs/adapter-node'; import preprocess from 'svelte-preprocess'; -import path from "path"; +import path from 'path'; import { windi } from 'svelte-windicss-preprocess'; /** @type {import('@sveltejs/kit').Config} */ @@ -11,9 +11,8 @@ const config = { kit: { adapter: adapter({ out: 'build' }), alias: { - $i18n: path.resolve('./src/translations'), + $i18n: path.resolve('./src/translations') } - } }; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index ab896ad..8793475 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -9,6 +9,6 @@ "resolveJsonModule": true, "skipLibCheck": true, "sourceMap": true, - "strict": true, + "strict": true } }