diff --git a/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte b/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte index e40cdc3..c616515 100644 --- a/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte +++ b/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte @@ -4,7 +4,6 @@ import DashboardUploadCard from './DashboardUploadCard.svelte'; import type { ApiError } from '$lib/@api'; - export let compact: boolean = false; let error: string | null = null; const onFileDrop = async (detail: any) => { @@ -27,7 +26,6 @@ onFileDrop(e.detail)} on:delete={onDelete} title="Motivační dopis" diff --git a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte index 1f780c6..a95499d 100644 --- a/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardInfoCard.svelte @@ -12,7 +12,7 @@ export let title: string; export let status: Status; - export let showDetails = true; + export let showDetails = false; let loading = false; const submitPortfolio = async () => { @@ -43,80 +43,94 @@ const url = window.URL.createObjectURL(new Blob([portfolioBlob])); const link = document.createElement('a'); link.href = url; - link.setAttribute('download', 'PORTFOLIO' + '_' + $candidateData.candidate.name + '_' + $candidateData.candidate.surname + '.zip'); + link.setAttribute( + 'download', + 'PORTFOLIO' + + '_' + + $candidateData.candidate.name + + '_' + + $candidateData.candidate.surname + + '.zip' + ); document.body.appendChild(link); link.click(); } catch (e) { console.log(e); } - } + }; - - +
-
+
-
- showDetails = !showDetails}> +
+ (showDetails = !showDetails)} + />
-
+
-
+

{title}

{#if showDetails} - -
Vámi vyplněné osobní údaje", - allowHTML: true, - placement: 'top', - showOnCreate: false, - delay: 0 - }} - class="flex flex-col justify-around mt-10"> - Adresa: {$candidateData.candidate.address} - Datum narození: {$candidateData.candidate.birthdate} - Místo narození: {$candidateData.candidate.birthplace} - Rodné číslo: {$candidateData.candidate.personalIdNumber} - Telefon: {$candidateData.candidate.telephone} -
-
Vámi vyplněné osobní údaje", - allowHTML: true, - placement: 'top', - showOnCreate: false, - delay: 0 - }} - class="ml-10 - {#each $candidateData.parents as parent} -
- {parent.name + " " + parent.surname} - Email: {parent.email} - Telefon: {parent.telephone} +
+
Vámi vyplněné osobní údaje', + allowHTML: true, + placement: 'top', + showOnCreate: false, + delay: 0 + }} + class="flex flex-col justify-between leading-10 mt-4" + > + Adresa: {$candidateData.candidate.address} + Datum narození: {$candidateData.candidate.birthdate} + Místo narození: {$candidateData.candidate.birthplace} + Rodné číslo: {$candidateData.candidate.personalIdNumber} + Telefon: {$candidateData.candidate.telephone} +
+
Vámi vyplněné osobní údaje', + allowHTML: true, + placement: 'top', + showOnCreate: false, + delay: 0 + }} + class="flex flex-col leading-10 mt-4" + > + {#each $candidateData.parents as parent} +
+ {parent.name + ' ' + parent.surname} + Email: {parent.email} + Telefon: {parent.telephone} +
+ {/each} +
- {/each} -
{/if}
diff --git a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte index f511801..f1126cc 100644 --- a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte +++ b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte @@ -20,7 +20,6 @@ export let filesize: number; export let fileType: number; export let placeholder: string = ''; - export let compact: boolean = false; let fileDropped: boolean = false; let progress: number = 1; @@ -102,11 +101,9 @@

{title}

- {#if !compact} -
- -
- {/if} +
+ +
{#if status === 'uploaded'}
- {#if fileDropped && error === null} + {#if fileDropped && error === null}
- {#if !compact} -
- Icon -
- - {/if} +
+ Icon +
+ {:else} diff --git a/frontend/src/lib/components/dashboard/InfoButton.svelte b/frontend/src/lib/components/dashboard/InfoButton.svelte index 15402d6..400a87c 100644 --- a/frontend/src/lib/components/dashboard/InfoButton.svelte +++ b/frontend/src/lib/components/dashboard/InfoButton.svelte @@ -3,6 +3,8 @@ import 'tippy.js/dist/tippy.css'; import { createEventDispatcher } from 'svelte'; import { submissionProgress, UploadStatus } from '$lib/stores/portfolio'; + import Document from '../icons/Document.svelte'; + import Download from '../icons/Download.svelte'; export let showDetails: boolean; @@ -10,53 +12,76 @@ const showInfo = () => { dispatch('showInfo'); - } + }; const download = () => { dispatch('download'); - } + }; -
- -
- showInfo()} on:keydown={(_) => showInfo()} - use:tippy={{ - content: (showDetails ? "Skrýt" : "Zobrazit") + " osobní údaje", - placement: 'top', - showOnCreate: false, - delay: 0 - }}> - - + showInfo()} + on:keydown={(_) => showInfo()} + use:tippy={{ + content: (showDetails ? 'Skrýt' : 'Zobrazit') + ' osobní údaje', + placement: 'top', + showOnCreate: false, + delay: 0 + }} + class="icon" + class:showDetails +> + + - {#if $submissionProgress.status === UploadStatus.Submitted} - download()} on:keydown={(_) => download()} use:tippy={{ - content: "Stáhnout portfolio", - placement: 'top', - showOnCreate: false, - delay: 0 - }}> - - - {:else} - download()} + on:keydown={(_) => download()} + use:tippy={{ + content: 'Stáhnout portfolio', placement: 'top', showOnCreate: false, delay: 0 - }}> - - - {/if} -
-
+ }} + > + + +{:else} + + + +{/if} diff --git a/frontend/src/lib/components/dashboard/ProgressBar.svelte b/frontend/src/lib/components/dashboard/ProgressBar.svelte index 91446ba..f423da6 100644 --- a/frontend/src/lib/components/dashboard/ProgressBar.svelte +++ b/frontend/src/lib/components/dashboard/ProgressBar.svelte @@ -1,5 +1,6 @@
@@ -13,27 +14,30 @@ > - {#if progress === 1} - - {:else} - - {/if} + + >
+ + diff --git a/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte b/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte index a0292a2..537d617 100644 --- a/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte +++ b/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte @@ -24,7 +24,7 @@
- {title} + {title} {#if loading}
+ + diff --git a/frontend/src/lib/components/icons/Download.svelte b/frontend/src/lib/components/icons/Download.svelte new file mode 100644 index 0000000..1ad629b --- /dev/null +++ b/frontend/src/lib/components/icons/Download.svelte @@ -0,0 +1,16 @@ + + + diff --git a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte index b4c9064..60906c9 100644 --- a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte +++ b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte @@ -1,4 +1,5 @@
-
- - {$candidateData.candidate.email} - Uchazeč na SSPŠ - -
-
- -
-
- -
-
- + {#each [0] as animated (animated)} +
+ + {$candidateData.candidate.email} + Uchazeč na SSPŠ + +
+ {/each} + +
+
+ {#each [0] as animated (animated)} +
+ +
+ {/each} + + {#each [0] as animated (animated)} +
+ +
+ {/each}
- + {$candidateData.candidate.email} Uchazeč na SSPŠ @@ -81,14 +114,17 @@