From e10a09c8907e29bb7ffb69f170c828f386b08e4e Mon Sep 17 00:00:00 2001 From: Luca Favini Date: Tue, 23 Apr 2024 01:27:27 +0200 Subject: [PATCH] fix(fe/ssr): fix CI warning on env variable --- frontend/src/routes/+page.server.js | 4 ++-- frontend/src/routes/login/+page.server.js | 6 +++--- frontend/src/routes/profile/+page.server.js | 6 +++--- frontend/src/routes/register/+page.server.js | 6 +++--- frontend/src/routes/review/[toilet]/+page.server.js | 6 +++--- frontend/src/routes/reviews/+page.server.js | 4 ++-- frontend/src/routes/toilets/+page.server.js | 4 ++-- frontend/src/routes/toilets/new/+page.server.js | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/frontend/src/routes/+page.server.js b/frontend/src/routes/+page.server.js index b6ae7bc..3fbfeb2 100644 --- a/frontend/src/routes/+page.server.js +++ b/frontend/src/routes/+page.server.js @@ -1,10 +1,10 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { error } from "@sveltejs/kit" import f from "../utils/customFetch" export async function load() { - const data = await f.get(`${API_URL}/api/stats`, {}) + const data = await f.get(`${env.API_URL}/api/stats`, {}) if (!data.ok) { return error(500, "Error fetching homepage, please try again later.") diff --git a/frontend/src/routes/login/+page.server.js b/frontend/src/routes/login/+page.server.js index 7de3036..0228d10 100644 --- a/frontend/src/routes/login/+page.server.js +++ b/frontend/src/routes/login/+page.server.js @@ -1,4 +1,4 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { fail, redirect, error } from "@sveltejs/kit" import schemas from "../../utils/schemas" import f from "../../utils/customFetch" @@ -6,7 +6,7 @@ import f from "../../utils/customFetch" export async function load({ cookies }) { const headers = { Cookie: `_session=${cookies.get("_session")}` } - const data = await f.get(`${API_URL}/api/login/verify`, headers) + const data = await f.get(`${env.API_URL}/api/login/verify`, headers) if (data.ok) { return redirect(302, "/profile") // TODO: notification @@ -35,7 +35,7 @@ export const actions = { const headers = { Cookie: `_session=${cookies.get("_session")}` } const response = await f.post( - `${API_URL}/api/login`, + `${env.API_URL}/api/login`, headers, { username, password } ) diff --git a/frontend/src/routes/profile/+page.server.js b/frontend/src/routes/profile/+page.server.js index 7692afd..de86828 100644 --- a/frontend/src/routes/profile/+page.server.js +++ b/frontend/src/routes/profile/+page.server.js @@ -1,11 +1,11 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { error, redirect } from "@sveltejs/kit" import f from "../../utils/customFetch" export async function load({ cookies }) { const headers = { Cookie: `_session=${cookies.get("_session")}` } - const data = await f.get(`${API_URL}/api/users/me`, headers) + const data = await f.get(`${env.API_URL}/api/users/me`, headers) if (!data.ok) { if (data.status === 401) { @@ -24,7 +24,7 @@ export const actions = { const headers = { Cookie: `_session=${cookies.get("_session")}` } const response = await f.post( - `${API_URL}/api/logout`, + `${env.API_URL}/api/logout`, headers, {} ) diff --git a/frontend/src/routes/register/+page.server.js b/frontend/src/routes/register/+page.server.js index 49c4e3e..add9615 100644 --- a/frontend/src/routes/register/+page.server.js +++ b/frontend/src/routes/register/+page.server.js @@ -1,4 +1,4 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { fail, redirect, error } from "@sveltejs/kit" import schemas from "../../utils/schemas" import f from "../../utils/customFetch" @@ -6,7 +6,7 @@ import f from "../../utils/customFetch" export async function load({ cookies }) { const headers = { Cookie: `_session=${cookies.get("_session")}` } - const data = await f.get(`${API_URL}/api/login/verify`, headers) + const data = await f.get(`${env.API_URL}/api/login/verify`, headers) if (data.ok) { return redirect(302, "/profile") // TODO: notification @@ -35,7 +35,7 @@ export const actions = { const headers = { Cookie: `_session=${cookies.get("_session")}` } const response = await f.post( - `${API_URL}/api/users/create`, + `${env.API_URL}/api/users/create`, headers, { username, password } ) diff --git a/frontend/src/routes/review/[toilet]/+page.server.js b/frontend/src/routes/review/[toilet]/+page.server.js index 18ecd00..4e8f579 100644 --- a/frontend/src/routes/review/[toilet]/+page.server.js +++ b/frontend/src/routes/review/[toilet]/+page.server.js @@ -1,4 +1,4 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { fail, redirect, error } from "@sveltejs/kit" import schemas from "../../../utils/schemas" import f from "../../../utils/customFetch" @@ -6,7 +6,7 @@ import f from "../../../utils/customFetch" export async function load({ params, cookies }) { const headers = { Cookie: `_session=${cookies.get("_session")}` } - const data = await f.get(`${API_URL}/api/login/verify`, headers) + const data = await f.get(`${env.API_URL}/api/login/verify`, headers) if (!data.ok) { if (data.status === 401) { @@ -43,7 +43,7 @@ export const actions = { const headers = { Cookie: `_session=${cookies.get("_session")}` } const response = await f.post( - `${API_URL}/api/reviews/create`, + `${env.API_URL}/api/reviews/create`, headers, { toilet, rating, description, paper, soap, dryer, hotwater, clean, temperature } ) diff --git a/frontend/src/routes/reviews/+page.server.js b/frontend/src/routes/reviews/+page.server.js index 49aee14..f02fab3 100644 --- a/frontend/src/routes/reviews/+page.server.js +++ b/frontend/src/routes/reviews/+page.server.js @@ -1,10 +1,10 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { error } from "@sveltejs/kit" import f from "../../utils/customFetch" export async function load() { - const data = await f.get(`${API_URL}/api/reviews`, {}) + const data = await f.get(`${env.API_URL}/api/reviews`, {}) if (!data.ok) { return error(500, "Error fetching reviews, please try again later.") diff --git a/frontend/src/routes/toilets/+page.server.js b/frontend/src/routes/toilets/+page.server.js index 1b7357e..be65f3f 100644 --- a/frontend/src/routes/toilets/+page.server.js +++ b/frontend/src/routes/toilets/+page.server.js @@ -1,10 +1,10 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { error } from "@sveltejs/kit" import f from "../../utils/customFetch" export async function load() { - const data = await f.get(`${API_URL}/api/toilets`, {}) + const data = await f.get(`${env.API_URL}/api/toilets`, {}) if (!data.ok) { return error(500, "Error fetching toilets, please try again later.") diff --git a/frontend/src/routes/toilets/new/+page.server.js b/frontend/src/routes/toilets/new/+page.server.js index d2aa432..6eb5996 100644 --- a/frontend/src/routes/toilets/new/+page.server.js +++ b/frontend/src/routes/toilets/new/+page.server.js @@ -1,4 +1,4 @@ -import { API_URL } from "$env/static/private" +import { env } from "$env/dynamic/private" import { fail, redirect, error } from "@sveltejs/kit" import schemas from "../../../utils/schemas" import f from "../../../utils/customFetch" @@ -6,7 +6,7 @@ import f from "../../../utils/customFetch" export async function load({ cookies }) { const headers = { Cookie: `_session=${cookies.get("_session")}` } - const data = await f.get(`${API_URL}/api/login/verify`, headers) + const data = await f.get(`${env.API_URL}/api/login/verify`, headers) if (!data.ok) { if (data.status === 401) { @@ -38,7 +38,7 @@ export const actions = { const headers = { Cookie: `_session=${cookies.get("_session")}` } const response = await f.post( - `${API_URL}/api/toilets/create`, + `${env.API_URL}/api/toilets/create`, headers, { title, building, place, description } )