diff --git a/.gitignore b/.gitignore index 6542adf..fe40c64 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,5 @@ coverage *.tgz .cache tmp -temp \ No newline at end of file +temp +.eslintcache diff --git a/.vscode/settings.json b/.vscode/settings.json index cf7e14f..45d220c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,21 @@ // }, // "[svelte]": { // "editor.defaultFormatter": "biomejs.biome" - // } -} \ No newline at end of file + // }, + "eslint.useFlatConfig": true, + "eslint.workingDirectories": [ + { "pattern": "apps/*" }, + { "pattern": "packages/*" } + ], + "eslint.validate": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "svelte" + ], + "eslint.options": { + "cache": true, + "cacheLocation": ".eslintcache" + } +} diff --git a/apps/web/eslint.config.js b/apps/web/eslint.config.js index 25fd275..60d180a 100644 --- a/apps/web/eslint.config.js +++ b/apps/web/eslint.config.js @@ -7,14 +7,22 @@ import { defineConfig } from "eslint/config"; export default defineConfig([ ...svelteConfigBase, { - files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'], + files: ['**/*.svelte'], languageOptions: { parserOptions: { - projectService: true, - extraFileExtensions: ['.svelte'], parser: ts.parser, + extraFileExtensions: ['.svelte'], svelteConfig } } + }, + { + ignores: [ + '**/node_modules/**', + '**/.svelte-kit/**', + '**/build/**', + '**/dist/**', + '**/.turbo/**' + ] } -]) \ No newline at end of file +]) diff --git a/apps/web/src/lib/components/ferias/WizardSolicitacaoFerias.svelte b/apps/web/src/lib/components/ferias/WizardSolicitacaoFerias.svelte index 34f739c..0e2942c 100644 --- a/apps/web/src/lib/components/ferias/WizardSolicitacaoFerias.svelte +++ b/apps/web/src/lib/components/ferias/WizardSolicitacaoFerias.svelte @@ -140,11 +140,7 @@
-<<<<<<< HEAD - {#each Array(totalPassos) as _, i} -======= {#each Array(totalPassos) as _, i (i)} ->>>>>>> origin
-<<<<<<< HEAD - {#each anosDisponiveis as ano} -======= {#each anosDisponiveis as ano (ano)} ->>>>>>> origin -======= - ->>>>>>> origin {/if}
diff --git a/apps/web/src/routes/(dashboard)/perfil/+page.svelte b/apps/web/src/routes/(dashboard)/perfil/+page.svelte index 5291c99..9028496 100644 --- a/apps/web/src/routes/(dashboard)/perfil/+page.svelte +++ b/apps/web/src/routes/(dashboard)/perfil/+page.svelte @@ -7,7 +7,7 @@ import AprovarAusencias from '$lib/components/AprovarAusencias.svelte'; import CalendarioAusencias from '$lib/components/ausencias/CalendarioAusencias.svelte'; import { generateAvatarGallery } from '$lib/utils/avatars'; - import type { Doc, Id } from '@sgse-app/backend/convex/_generated/dataModel'; + import type { Id } from '@sgse-app/backend/convex/_generated/dataModel'; import { X, Calendar } from 'lucide-svelte'; import type { FunctionReturnType } from 'convex/server'; @@ -17,13 +17,11 @@ let abaAtiva = $state< 'meu-perfil' | 'minhas-ferias' | 'minhas-ausencias' | 'aprovar-ferias' | 'aprovar-ausencias' >('meu-perfil'); -<<<<<<< HEAD + let solicitacaoSelecionada = $state | null>( null ); -======= - let solicitacaoSelecionada = $state | null>(null); ->>>>>>> origin + let mostrarModalFoto = $state(false); let uploadandoFoto = $state(false); let erroUpload = $state(''); @@ -250,16 +248,8 @@ document.body.appendChild(toast); setTimeout(() => toast.remove(), 3000); } catch (e: unknown) { -<<<<<<< HEAD const error = e as Error; erroUpload = error.message || 'Erro ao fazer upload da foto'; -======= - const errorMessage = e instanceof Error ? e.message : String(e); - erroUpload = errorMessage || 'Erro ao fazer upload da foto'; - // Reverter mudança local se houver erro - fotoPerfilLocal = currentUser?.data?.fotoPerfil || null; - avatarLocal = currentUser?.data?.avatar || null; ->>>>>>> origin } finally { uploadandoFoto = false; } @@ -296,16 +286,8 @@ document.body.appendChild(toast); setTimeout(() => toast.remove(), 3000); } catch (e: unknown) { -<<<<<<< HEAD const error = e as Error; erroUpload = error.message || 'Erro ao salvar avatar'; -======= - const errorMessage = e instanceof Error ? e.message : String(e); - erroUpload = errorMessage || 'Erro ao salvar avatar'; - // Reverter mudança local se houver erro - avatarLocal = currentUser?.data?.avatar || null; - fotoPerfilLocal = currentUser?.data?.fotoPerfil || null; ->>>>>>> origin } finally { uploadandoFoto = false; } @@ -1343,14 +1325,7 @@ {solicitacao.anoReferencia} {solicitacao.periodos.length} período(s) {solicitacao.periodos.reduce((acc, p) => acc + p.diasCorridos, 0)} dias{solicitacao.periodos.reduce( - (acc: number, p: { diasCorridos: number }) => acc + p.diasCorridos, - 0 - )} dias>>>>>> origin >
@@ -1737,14 +1712,7 @@ {solicitacao.anoReferencia} {solicitacao.periodos.length} {solicitacao.periodos.reduce((acc, p) => acc + p.diasCorridos, 0)}{solicitacao.periodos.reduce( - (acc: number, p: { diasCorridos: number }) => acc + p.diasCorridos, - 0 - )}>>>>>> origin >
-<<<<<<< HEAD {#each avatarGallery as avatar (avatar.id)} -======= - {#each avatarGallery as avatar (avatar.url)} ->>>>>>> origin