-
-
+
+
+
(showDetails = !showDetails)}
+ on:showInfo={() => (showDetails = !showDetails)}
on:logout={logout}
/>
@@ -108,9 +108,9 @@
@@ -227,7 +227,7 @@
>
{#each $candidateData.parents as parent}
- {parent.name + ' ' + parent.surname}
{$LL.input.email()}: {parent.email}
@@ -238,7 +238,7 @@
{/each}
-
editDetails()}
- on:keydown={(_) => editDetails()}
+ on:click={editDetails}
class="mt-4 hover:cursor-pointer"
>
-
+
{/if}
@@ -276,15 +275,18 @@
@apply bg-[#f8fbfc];
@apply rounded-3xl;
- @apply <2xl:px-5 <2xl:py-5 px-7 py-10;
@apply transition-all duration-300;
+
+ /* TODO: < unocss */
+ --at-apply: '<2xl:px-5 <2xl:py-5 px-7 py-10';
}
.card:hover {
@apply shadow-2xl;
@apply m-0;
}
.card h3 {
- @apply text-sspsBlue text-4xl font-semibold md:text-2xl xl:text-4xl;
+ @apply text-sspsBlue text-4xl font-semibold;
+ --at-apply: 'md:text-2xl xl:text-4xl';
}
diff --git a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
index b09e3ded..7178f7e3 100644
--- a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
@@ -21,11 +21,11 @@
export let filetype: 'PDF' | 'ZIP';
export let filesize: number;
export let fileType: number;
- export let placeholder: string = '';
+ export let placeholder = '';
- let fileDropped: boolean = false;
- let progress: number = 1;
- let bytesTotal: number = 0;
+ let fileDropped = false;
+ let progress = 1;
+ let bytesTotal = 0;
let status: Status;
@@ -117,7 +117,7 @@
alt="Icon"
/>
-
-
{Math.round(progress * 100)} %
+
{Math.round(progress * 100)} %
onFileDrop(e.detail.files)}
on:filedragenter={dashAnimationStart}
@@ -212,7 +213,8 @@
backdrop-filter: blur(15px) saturate(0.86);
-webkit-backdrop-filter: blur(15px) saturate(0.86);
- @apply flex flex-col justify-between sm:flex-row sm:items-center;
+ @apply flex flex-col justify-between;
+ --at-apply: "sm:flex-row sm:items-center";
}
.body {
@apply bg-[#f8fbfc];
@@ -221,10 +223,11 @@
@apply p-7;
}
.uploaded {
- @apply 2xl:px-14;
+ --at-apply: "2xl:px-14";
}
.card h3 {
- @apply text-sspsBlue text-2xl font-semibold xl:text-4xl;
+ @apply text-sspsBlue text-2xl font-semibold;
+ --at-apply: "xl:text-4xl";
}
.card span {
@apply text-sm opacity-60;
@@ -236,10 +239,10 @@
@apply flex flex-col items-center justify-center;
border-radius: 9px;
- @apply hover:cursor-pointer;
-
/* TODO: Fix this hack */
- @apply p-10 sm:p-20 md:p-0;
+ @apply p-10;
+ --at-apply: "sm:p-20 md:p-0";
+ --at-apply: "hover:cursor-pointer";
}
.card .drag:hover span {
@apply opacity-100;
diff --git a/frontend/src/lib/components/dashboard/FileType.svelte b/frontend/src/lib/components/dashboard/FileType.svelte
index 0b42bbaa..92c48a02 100644
--- a/frontend/src/lib/components/dashboard/FileType.svelte
+++ b/frontend/src/lib/components/dashboard/FileType.svelte
@@ -4,9 +4,9 @@
- {filetype}
- /
- Max {filesize}
+ {filetype}
+ /
+ Max {filesize}
diff --git a/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte b/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
index 824fbb95..fce69a33 100644
--- a/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
@@ -3,12 +3,18 @@
import type { ApiError } from '$lib/@api';
import { fetchSubmProgress } from '$lib/stores/portfolio';
+ import type { AxiosProgressEvent } from 'axios';
import { apiDeletePortfolioLetter, apiUploadPortfolioLetter } from '../../@api/candidate';
import DashboardUploadCard from './DashboardUploadCard.svelte';
let error: string | null = null;
- const onFileDrop = async (detail: any) => {
+ type Detail = {
+ file: File;
+ callback: (progress: AxiosProgressEvent) => void;
+ };
+
+ const onFileDrop = async (detail: Detail) => {
const file = detail.file;
const callback = detail.callback;
try {
diff --git a/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte b/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
index 54037475..0a4ca801 100644
--- a/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
@@ -5,10 +5,16 @@
import { apiDeletePortfolioZip, apiUploadPortfolioZip } from '$lib/@api/candidate';
import DashboardUploadCard from './DashboardUploadCard.svelte';
import type { ApiError } from '$lib/@api';
+ import type { AxiosProgressEvent } from 'axios';
let error: string | null = null;
- const onFileDrop = async (detail: any) => {
+ type Detail = {
+ file: File;
+ callback: (progress: AxiosProgressEvent) => void;
+ };
+
+ const onFileDrop = async (detail: Detail) => {
const file = detail.file;
const callback = detail.callback;
try {
diff --git a/frontend/src/lib/components/dashboard/ProgressBar.svelte b/frontend/src/lib/components/dashboard/ProgressBar.svelte
index 916a8247..ff5ee53e 100644
--- a/frontend/src/lib/components/dashboard/ProgressBar.svelte
+++ b/frontend/src/lib/components/dashboard/ProgressBar.svelte
@@ -1,6 +1,6 @@
diff --git a/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte b/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte
index b444c1a0..8e8e3332 100644
--- a/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte
+++ b/frontend/src/lib/components/dashboard/StatusNotificationBig.svelte
@@ -3,7 +3,7 @@
import type { Status } from '$lib/stores/portfolio';
- export let loading: boolean = false;
+ export let loading = false;
export let status: Status;
let title: string;
@@ -24,14 +24,14 @@
}
-
-
+
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 50e58a7a..90718249 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -3,7 +3,8 @@
export let data: { url: string };
- import 'virtual:windi.css';
+ import 'virtual:uno.css'
+ import '@unocss/reset/tailwind.css'
diff --git a/frontend/src/translations/formatters.ts b/frontend/src/translations/formatters.ts
index 0e53a398..596f597d 100644
--- a/frontend/src/translations/formatters.ts
+++ b/frontend/src/translations/formatters.ts
@@ -1,7 +1,7 @@
import type { FormattersInitializer } from 'typesafe-i18n';
import type { Locales, Formatters } from './i18n-types.js';
-export const initFormatters: FormattersInitializer
= (locale: Locales) => {
+export const initFormatters: FormattersInitializer = () => {
const formatters: Formatters = {
// add your formatter functions here
};
diff --git a/frontend/tests/test.ts b/frontend/tests/test.ts
index 46ad8113..649f0fc2 100644
--- a/frontend/tests/test.ts
+++ b/frontend/tests/test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@playwright/test';
+//import { expect, test } from '@playwright/test';
/*test('index page has expected h1', async ({ page }) => {
await page.goto('/');
diff --git a/frontend/uno.config.ts b/frontend/uno.config.ts
new file mode 100644
index 00000000..0b12e33a
--- /dev/null
+++ b/frontend/uno.config.ts
@@ -0,0 +1,41 @@
+import { defineConfig } from 'unocss';
+
+import presetWind from '@unocss/preset-wind';
+
+import transformerVariantGroup from '@unocss/transformer-variant-group';
+import transformerDirectives from '@unocss/transformer-directives';
+import transformerCompileClass from '@unocss/transformer-compile-class';
+
+import extractorSvelte from '@unocss/extractor-svelte';
+
+export default defineConfig({
+ presets: [presetWind()],
+ transformers: [
+ transformerVariantGroup(),
+ transformerDirectives({
+ applyVariable: ['--at-apply', '--uno-apply', '--uno']
+ }),
+ transformerCompileClass()
+ ],
+ extractors: [extractorSvelte()],
+ content: {
+ pipeline: {
+ exclude: [
+ 'node_modules',
+ '.git',
+ 'dist',
+ 'build',
+ 'public',
+ 'src/translations',
+ 'src/lib/assets'
+ ]
+ }
+ },
+ theme: {
+ colors: {
+ sspsBlue: '#406280',
+ sspsBlueDark: '#243a55',
+ sspsGray: '#e6e6e6'
+ }
+ }
+});
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index de4d9147..6713da1f 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,9 +1,10 @@
-import { sveltekit } from '@sveltejs/kit/vite';
import type { UserConfig } from 'vite';
-import windicss from 'vite-plugin-windicss';
+
+import { sveltekit } from '@sveltejs/kit/vite';
+import unocss from 'unocss/vite';
const config: UserConfig = {
- plugins: [sveltekit(), windicss()],
+ plugins: [unocss(), sveltekit()],
server: {
proxy: {
'/api': {
diff --git a/frontend/windi.config.ts b/frontend/windi.config.ts
deleted file mode 100644
index 7f131e56..00000000
--- a/frontend/windi.config.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { defineConfig } from 'windicss/helpers';
-
-export default defineConfig({
- extract: {
- include: ['src/**/*.{svelte,html,js,ts}'],
- exclude: [
- 'node_modules',
- '.git',
- 'dist',
- 'build',
- 'public',
- 'src/translations',
- 'src/lib/assets'
- ]
- },
- theme: {
- extend: {
- colors: {
- sspsBlue: '#406280',
- sspsBlueDark: '#243a55',
- sspsGray: '#e6e6e6'
- }
- }
- }
-});