diff --git a/.env.example b/.env.example
index 72da78f..9cb5020 100644
--- a/.env.example
+++ b/.env.example
@@ -10,4 +10,4 @@ DISCORD_LINK=http://example.com
PAYPAL_LINK=http://example.com
SERVER_IP=1.1.1.1
-BASE_PATH=http://localhost:4321
+BASE_PATH=http://localhost:4321/varo
diff --git a/astro.config.mjs b/astro.config.mjs
index b92bfa0..9412aeb 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -33,17 +33,18 @@ export default defineConfig({
ADMIN_USER: envField.string({ context: 'server', access: 'secret', optional: true }),
ADMIN_PASSWORD: envField.string({ context: 'server', access: 'secret', optional: true }),
- START_DATE: envField.string({ context: 'client', access: 'public', default: '1970-01-01' }),
+ START_DATE: envField.string({ context: 'server', access: 'secret', default: '1970-01-01' }),
- WEBHOOK_ENDPOINT: envField.string({ context: 'client', access: 'public', optional: true }),
+ WEBHOOK_ENDPOINT: envField.string({ context: 'server', access: 'secret', optional: true }),
- TEAMSPEAK_LINK: envField.string({ context: 'client', access: 'public', default: 'http://example.com' }),
- DISCORD_LINK: envField.string({ context: 'client', access: 'public', default: 'http://example.com' }),
- PAYPAL_LINK: envField.string({ context: 'client', access: 'public', default: 'http://example.com' }),
- SERVER_IP: envField.string({ context: 'client', access: 'public', default: 'http://example.com' }),
+ TEAMSPEAK_LINK: envField.string({ context: 'server', access: 'secret', default: 'http://example.com' }),
+ DISCORD_LINK: envField.string({ context: 'server', access: 'secret', default: 'http://example.com' }),
+ PAYPAL_LINK: envField.string({ context: 'server', access: 'secret', default: 'http://example.com' }),
+ SERVER_IP: envField.string({ context: 'server', access: 'secret', default: 'http://example.com' }),
DATABASE_URI: envField.string({ context: 'server', access: 'secret' }),
- BASE_PATH: envField.string({ context: 'client', access: 'public', default: '' })
+
+ BASE_PATH: envField.string({ context: 'server', access: 'secret', default: '/' })
}
},
diff --git a/src/app/admin/feedback/Feedback.svelte b/src/app/admin/feedback/Feedback.svelte
index 1b51773..4e9a477 100644
--- a/src/app/admin/feedback/Feedback.svelte
+++ b/src/app/admin/feedback/Feedback.svelte
@@ -39,7 +39,7 @@
{#each $feedbacks as feedback, i (feedback.id)}
(activeFeedback = feedback)}>
- {(i + 1)} |
+ {i + 1} |
{feedback.event} |
{feedback.user?.username} |
{dateFormat.format(new Date(feedback.lastChanged))} |
diff --git a/src/components/website/layout/Menu.svelte b/src/components/website/layout/Menu.svelte
index 23a809b..00d7b34 100644
--- a/src/components/website/layout/Menu.svelte
+++ b/src/components/website/layout/Menu.svelte
@@ -1,5 +1,4 @@
diff --git a/src/pages/admin/admins.astro b/src/pages/admin/admins.astro
index 8536c3f..f7517b2 100644
--- a/src/pages/admin/admins.astro
+++ b/src/pages/admin/admins.astro
@@ -4,7 +4,7 @@ import Admins from '@app/admin/admins/Admins.svelte';
import SidebarActions from '@app/admin/admins/SidebarActions.svelte';
import { Session } from '@util/session.ts';
import { Permissions } from '@util/permissions.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const session = Session.sessionFromCookies(Astro.cookies, Permissions.Admin);
if (!session) return Astro.redirect(`${BASE_PATH}/admin`);
diff --git a/src/pages/admin/feedback.astro b/src/pages/admin/feedback.astro
index 2e93a5e..cd34d44 100644
--- a/src/pages/admin/feedback.astro
+++ b/src/pages/admin/feedback.astro
@@ -3,7 +3,7 @@ import Feedback from '@app/admin/feedback/Feedback.svelte';
import AdminLayout from '@layouts/admin/AdminLayout.astro';
import { Session } from '@util/session.ts';
import { Permissions } from '@util/permissions.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const session = Session.sessionFromCookies(Astro.cookies, Permissions.Feedback);
if (!session) return Astro.redirect(`${BASE_PATH}/admin`);
diff --git a/src/pages/admin/index.astro b/src/pages/admin/index.astro
index cfecca4..f1fa10b 100644
--- a/src/pages/admin/index.astro
+++ b/src/pages/admin/index.astro
@@ -1,6 +1,6 @@
---
import { Session } from '@util/session.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
import AdminLayout from '@layouts/admin/AdminLayout.astro';
const session = Session.sessionFromCookies(Astro.cookies);
diff --git a/src/pages/admin/login.astro b/src/pages/admin/login.astro
index a3cb821..fa5c4f5 100644
--- a/src/pages/admin/login.astro
+++ b/src/pages/admin/login.astro
@@ -27,7 +27,6 @@ import Popup from '@components/popup/Popup.svelte';
diff --git a/src/pages/admin/reports.astro b/src/pages/admin/reports.astro
index 2afe1ea..51aeb23 100644
--- a/src/pages/admin/reports.astro
+++ b/src/pages/admin/reports.astro
@@ -1,7 +1,7 @@
---
import { Session } from '@util/session';
import { Permissions } from '@util/permissions';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
import AdminLayout from '@layouts/admin/AdminLayout.astro';
import SidebarActions from '@app/admin/reports/SidebarActions.svelte';
import Reports from '@app/admin/reports/Reports.svelte';
diff --git a/src/pages/admin/settings.astro b/src/pages/admin/settings.astro
index 35e5988..c024386 100644
--- a/src/pages/admin/settings.astro
+++ b/src/pages/admin/settings.astro
@@ -4,7 +4,7 @@ import Settings from '@app/admin/settings/Settings.svelte';
import { db } from '@db/database.ts';
import { Session } from '@util/session.ts';
import { Permissions } from '@util/permissions.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const session = Session.sessionFromCookies(Astro.cookies, Permissions.Settings);
if (!session) return Astro.redirect(`${BASE_PATH}/admin`);
diff --git a/src/pages/admin/teams.astro b/src/pages/admin/teams.astro
index eb8b436..226067f 100644
--- a/src/pages/admin/teams.astro
+++ b/src/pages/admin/teams.astro
@@ -4,7 +4,7 @@ import SidebarActions from '@app/admin/teams/SidebarActions.svelte';
import Teams from '@app/admin/teams/Teams.svelte';
import { Session } from '@util/session.ts';
import { Permissions } from '@util/permissions.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const session = Session.sessionFromCookies(Astro.cookies, Permissions.Admin);
if (!session) return Astro.redirect(`${BASE_PATH}/admin`);
diff --git a/src/pages/admin/users.astro b/src/pages/admin/users.astro
index b11fb62..5d3cbdd 100644
--- a/src/pages/admin/users.astro
+++ b/src/pages/admin/users.astro
@@ -4,7 +4,7 @@ import Users from '@app/admin/users/Users.svelte';
import SidebarActions from '@app/admin/users/SidebarActions.svelte';
import { Session } from '@util/session.ts';
import { Permissions } from '@util/permissions.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const session = Session.sessionFromCookies(Astro.cookies, Permissions.Admin);
if (!session) return Astro.redirect(`${BASE_PATH}/admin`);
diff --git a/src/pages/api/feedback/index.ts b/src/pages/api/feedback/index.ts
index d7652d2..7bfb0e0 100644
--- a/src/pages/api/feedback/index.ts
+++ b/src/pages/api/feedback/index.ts
@@ -2,7 +2,7 @@ import { z } from 'astro:schema';
import type { APIRoute } from 'astro';
import { API_SECRET } from 'astro:env/server';
import { db } from '@db/database.ts';
-import { BASE_PATH } from 'astro:env/client';
+import { BASE_PATH } from 'astro:env/server';
const postSchema = z.object({
event: z.string(),
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index 4dc4970..f06c700 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -8,6 +8,7 @@ import TeamPopup from '@components/website/signup/TeamPopup.svelte';
import RegisteredPopup from '@components/website/signup/RegisteredPopup.svelte';
import { getSettings, SettingKey } from '@util/settings';
import { db } from '@db/database.ts';
+import { DISCORD_LINK, PAYPAL_LINK, START_DATE, TEAMSPEAK_LINK } from 'astro:env/client';
const signupSetting = await getSettings(db, [
SettingKey.SignupEnabled,
@@ -123,7 +124,13 @@ const signupDisabledSubMessage = signupSetting[SettingKey.SignupDisabledSubMessa
-
+
{
!signupEnabled && (