diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 55614fa..aef2f7a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,7 +29,7 @@ jobs: file: ./apps/web/Dockerfile # Only push on 'push' event (merge to master), not on 'pull_request' push: ${{ github.event_name == 'push' }} - tags: killercf/sgc:latest + tags: sgsedevs/sgse-app:latest platforms: linux/amd64 build-args: | PUBLIC_CONVEX_URL=${{ secrets.PUBLIC_CONVEX_URL }} diff --git a/apps/web/src/routes/(dashboard)/almoxarifado/+page.svelte b/apps/web/src/routes/(dashboard)/almoxarifado/+page.svelte index d55b30b..aee471f 100644 --- a/apps/web/src/routes/(dashboard)/almoxarifado/+page.svelte +++ b/apps/web/src/routes/(dashboard)/almoxarifado/+page.svelte @@ -3,6 +3,7 @@ import { useConvexClient, useQuery } from 'convex-svelte'; import { goto } from '$app/navigation'; import { resolve } from '$app/paths'; + import { SvelteMap } from 'svelte/reactivity'; import { Package, AlertTriangle, @@ -23,8 +24,8 @@ // Criar mapa de materiais para lookup eficiente const materiaisMap = $derived.by(() => { - if (!materiaisQuery.data) return new Map(); - const map = new Map(); + if (!materiaisQuery.data) return new SvelteMap(); + const map = new SvelteMap(); for (const material of materiaisQuery.data) { map.set(material._id, material); } @@ -41,7 +42,7 @@ } const produtos = ultimosProdutosQuery.data; - + // Ordenar do mais antigo para o mais recente (para o gráfico) const produtosOrdenados = [...produtos].reverse(); @@ -56,7 +57,7 @@ '#f43f5e', // red '#fb7185', // pink-400 '#f87171', // red-400 - '#fb923c' // orange-400 + '#fb923c' // orange-400 ]; return { @@ -89,14 +90,12 @@
-
- +
+

Almoxarifado

-

- Controle de estoque e gestão de materiais -

+

Controle de estoque e gestão de materiais

@@ -108,69 +107,77 @@
{:else if statsQuery.data}
-
+
-
Total de Materiais
-
+
Total de Materiais
+
{statsQuery.data.totalMateriais}
-
Materiais cadastrados
+
Materiais cadastrados
-
- +
+
-
+
-
Materiais Ativos
-
+
Materiais Ativos
+
{statsQuery.data.totalMateriaisAtivos}
-
Em estoque
+
Em estoque
-
- +
+
-
+
-
Alertas Ativos
-
+
Alertas Ativos
+
{statsQuery.data.totalAlertasAtivos}
-
Estoque baixo
+
Estoque baixo
-
- +
+
-
+
-
Movimentações
-
+
Movimentações
+
{statsQuery.data.movimentacoesMes}
-
Este mês
+
Este mês
-
- +
+
@@ -180,11 +187,11 @@
-
+
-

-
- +

+
+
Últimos 10 Produtos Cadastrados

@@ -196,7 +203,7 @@
-
+

Mostrando os últimos 10 produtos cadastrados ordenados por data de criação

{:else} @@ -211,11 +218,11 @@
-
+
-

-
- +

+
+
Alertas de Estoque

@@ -225,7 +232,7 @@
{:else if alertasQuery.data && alertasQuery.data.length > 0}
- +
@@ -236,13 +243,13 @@ - {#each alertasQuery.data.slice(0, 5) as alerta} + {#each alertasQuery.data.slice(0, 5) as alerta (alerta._id)} {@const material = materiaisMap.get(alerta.materialId)}
Material
{material?.nome || 'Carregando...'}
{#if material?.codigo} -
{material.codigo}
+
{material.codigo}
{/if} 		@@ -255,7 +262,7 @@ {/if} - {alerta.quantidadeAtual} + {alerta.quantidadeAtual} {alerta.quantidadeMinima} @@ -273,11 +280,8 @@
-
-
@@ -294,64 +298,63 @@
- diff --git a/bun.lock b/bun.lock index 645aa1c..3c95e50 100644 --- a/bun.lock +++ b/bun.lock @@ -1,5 +1,6 @@ { "lockfileVersion": 1, + "configVersion": 0, "workspaces": { "": { "name": "sgse-app", @@ -14,6 +15,7 @@ "svelte-sonner": "^1.0.7", }, "devDependencies": { + "@types/bun": "^1.3.5", "eslint": "^9.39.1", "eslint-plugin-svelte": "^3.13.1", "globals": "^16.5.0", @@ -669,6 +671,8 @@ "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], + "@types/bun": ["@types/bun@1.3.5", "", { "dependencies": { "bun-types": "1.3.5" } }, "sha512-RnygCqNrd3srIPEWBd5LFeUYG7plCoH2Yw9WaZGyNmdTEei+gWaHqydbaIRkIkcbXwhBT94q78QljxN0Sk838w=="], + "@types/cookie": ["@types/cookie@1.0.0", "", { "dependencies": { "cookie": "*" } }, "sha512-mGFXbkDQJ6kAXByHS7QAggRXgols0mAdP4MuXgloGY1tXokvzaFFM4SMqWvf7AH0oafI7zlFJwoGWzmhDqTZ9w=="], "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], @@ -937,6 +941,8 @@ "buffers": ["buffers@0.1.1", "", {}, "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="], + "bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="], + "call-bind": ["call-bind@1.0.8", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", "get-intrinsic": "^1.2.4", "set-function-length": "^1.2.2" } }, "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww=="], "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="], diff --git a/package.json b/package.json index 26912c9..2faaed7 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,11 @@ "dev:native": "turbo -F native dev", "dev:web": "turbo -F web dev", "dev:server": "turbo -F @sgse-app/backend dev", - "dev:setup": "turbo -F @sgse-app/backend dev:setup" + "dev:setup": "turbo -F @sgse-app/backend dev:setup", + "deploy:convex:prod": "bun scripts/convex-deploy-prod.ts" }, "devDependencies": { + "@types/bun": "^1.3.5", "eslint": "^9.39.1", "eslint-plugin-svelte": "^3.13.1", "globals": "^16.5.0", diff --git a/scripts/convex-deploy-prod.ts b/scripts/convex-deploy-prod.ts new file mode 100644 index 0000000..3fb9477 --- /dev/null +++ b/scripts/convex-deploy-prod.ts @@ -0,0 +1,6 @@ +import { $ } from 'bun'; + +await $`bunx convex deploy`.cwd('packages/backend'); +// await $`bun --env-file=.env.prod -e 'console.log(process.env.CONVEX_SELF_HOSTED_URL)'`.cwd( +// 'packages/backend' +// );