From 672c34355e173b9b75a7b4900adbc0392b0e4a59 Mon Sep 17 00:00:00 2001 From: Francisco Sandoval Date: Thu, 14 Mar 2024 20:23:14 -0300 Subject: [PATCH] fix consulta api desde servidor --- README.md | 3 +++ package-lock.json | 14 +++++++++++++- package.json | 3 ++- .../paradero/{+page.js => +page.server.js} | 17 +++++++++-------- 4 files changed, 27 insertions(+), 10 deletions(-) rename src/routes/paradero/{+page.js => +page.server.js} (74%) diff --git a/README.md b/README.md index 884dac5..bae9e75 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,9 @@ services: - 4002:4002 environment: - PORT=4002 + - VITE_TRANSPORTE_API=https://transporte.hz.kursor.cl/api + - VITE_TRANSPORTE_USER=11111111-1 + - VITE_TRANSPORTE_PASS=usuario1 command: sh -c " [ -d node_modules ] || (npm install) ; npm run build && npm run preview diff --git a/package-lock.json b/package-lock.json index 9a0f350..b68dc16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,8 @@ "name": "app", "version": "0.0.1", "dependencies": { - "bootstrap": "^5.3.3" + "bootstrap": "^5.3.3", + "dotenv": "^16.4.5" }, "devDependencies": { "@fontsource/fira-mono": "^4.5.10", @@ -865,6 +866,17 @@ "integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==", "dev": true }, + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/esbuild": { "version": "0.19.12", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", diff --git a/package.json b/package.json index e31983b..be4306a 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "type": "module", "dependencies": { - "bootstrap": "^5.3.3" + "bootstrap": "^5.3.3", + "dotenv": "^16.4.5" } } diff --git a/src/routes/paradero/+page.js b/src/routes/paradero/+page.server.js similarity index 74% rename from src/routes/paradero/+page.js rename to src/routes/paradero/+page.server.js index 3680b09..5829659 100644 --- a/src/routes/paradero/+page.js +++ b/src/routes/paradero/+page.server.js @@ -1,23 +1,24 @@ -const base = 'https://transporte.hz.kursor.cl/api' +const { + VITE_TRANSPORTE_API: base, + VITE_TRANSPORTE_USER: user, + VITE_TRANSPORTE_PASS: password +} = import.meta.env; export async function load({ url }) { const id = url.searchParams.get('id'); if (!id) return null; - const token = await getToken() - return await fetchParaderoData(id, token) + const token = await getToken() // token de autorizacion + return await fetchParadero(id, token) // data de dispositivo } async function getToken() { try { - const rut = '11111111-1' - const password = 'usuario1' - const res = await fetch(`${base}/auth/`, { method: 'POST', - body: JSON.stringify({ rut, password }) + body: JSON.stringify({ rut: user, password }) }) if (!res.ok) throw await res.text() @@ -30,7 +31,7 @@ async function getToken() { } } -async function fetchParaderoData(id, token) { +async function fetchParadero(id, token) { try { const data = { GetInfoDevice: {