From 639cece8f55e4304fb78a770209629818789af56 Mon Sep 17 00:00:00 2001
From: Aelita4 <kontakt@mikorosa.pl>
Date: Fri, 15 Nov 2024 22:53:09 +0100
Subject: [PATCH] Implement layout for logged user and cleanup styles

---
 src/components/Card.astro                     |  61 ---
 src/components/NavBar.astro                   |   5 +-
 src/components/ResourceBar.astro              |   2 -
 src/env.d.ts                                  |   9 +
 src/layouts/Layout.astro                      |  32 +-
 src/layouts/LoggedIn.astro                    |  34 ++
 src/middleware.ts                             |  35 ++
 src/pages/game/buildings.astro                | 204 +++-------
 src/pages/game/fleet.astro                    | 358 ++++++------------
 src/pages/game/galaxyView.astro               | 126 +++---
 src/pages/game/index.astro                    | 105 +----
 src/pages/game/profile.astro                  | 166 ++------
 src/pages/game/research.astro                 | 186 +++------
 src/pages/game/ships.astro                    | 187 +++------
 src/pages/game/systemManager/index.astro      | 133 +++----
 src/pages/game/systemManager/select.astro     |  78 ++--
 src/pages/game/systemManager/structures.astro | 157 ++++----
 tsconfig.json                                 |   8 +-
 18 files changed, 625 insertions(+), 1261 deletions(-)
 delete mode 100644 src/components/Card.astro
 create mode 100644 src/layouts/LoggedIn.astro
 create mode 100644 src/middleware.ts

diff --git a/src/components/Card.astro b/src/components/Card.astro
deleted file mode 100644
index bd6d597..0000000
--- a/src/components/Card.astro
+++ /dev/null
@@ -1,61 +0,0 @@
----
-interface Props {
-	title: string;
-	body: string;
-	href: string;
-}
-
-const { href, title, body } = Astro.props;
----
-
-<li class="link-card">
-	<a href={href}>
-		<h2>
-			{title}
-			<span>&rarr;</span>
-		</h2>
-		<p>
-			{body}
-		</p>
-	</a>
-</li>
-<style>
-	.link-card {
-		list-style: none;
-		display: flex;
-		padding: 1px;
-		background-color: #23262d;
-		background-image: none;
-		background-size: 400%;
-		border-radius: 7px;
-		background-position: 100%;
-		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
-		box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-	}
-	.link-card > a {
-		width: 100%;
-		text-decoration: none;
-		line-height: 1.4;
-		padding: calc(1.5rem - 1px);
-		border-radius: 8px;
-		color: white;
-		background-color: #23262d;
-		opacity: 0.8;
-	}
-	h2 {
-		margin: 0;
-		font-size: 1.25rem;
-		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
-	}
-	p {
-		margin-top: 0.5rem;
-		margin-bottom: 0;
-	}
-	.link-card:is(:hover, :focus-within) {
-		background-position: 0;
-		background-image: var(--accent-gradient);
-	}
-	.link-card:is(:hover, :focus-within) h2 {
-		color: rgb(var(--accent-light));
-	}
-</style>
diff --git a/src/components/NavBar.astro b/src/components/NavBar.astro
index 5ec9a2e..8faf30c 100644
--- a/src/components/NavBar.astro
+++ b/src/components/NavBar.astro
@@ -1,5 +1,6 @@
 ---
 import { getHighestWeightedLanguage, getLocales, getName } from '../lib/utils/langDriver';
+
 interface Props {
     loggedIn: string;
     active: string;
@@ -133,7 +134,6 @@ const bottomRow = filteredList.filter(element => element.position === "bottom");
 
 const username = Astro.cookies.get('username')?.value ?? "";
 ---
-
 <nav>
     <div class="row">
         <ul>
@@ -166,7 +166,6 @@ const username = Astro.cookies.get('username')?.value ?? "";
         </ul>
     </div>
 </nav>
-
 <style>
 nav {
     background-color: rgb(56, 59, 99);
@@ -213,8 +212,6 @@ nav ul {
 }
 
 .avatar-icon {
-    /* object-fit: contain; */
-    /* width: 100%; */
     height: 50px;
     border-radius: 50%;
     border: 1px solid white;
diff --git a/src/components/ResourceBar.astro b/src/components/ResourceBar.astro
index 61dcfc1..8b81b93 100644
--- a/src/components/ResourceBar.astro
+++ b/src/components/ResourceBar.astro
@@ -54,7 +54,6 @@ for(const key of planet.resources.resources) {
         )}
     </div>
 </div>
-
 <style>
 #resourcebar {
     color: white;
@@ -144,7 +143,6 @@ for(const key of planet.resources.resources) {
     opacity: 1;
 }
 </style>
-
 <script>
     function numWithPrefix(x: number) {
         x = Math.floor(x);
diff --git a/src/env.d.ts b/src/env.d.ts
index acef35f..89d0bda 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1,2 +1,11 @@
 /// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
+
+declare namespace App {
+    interface Locals {
+        token: string;
+        lang: { [key: string]: { id: string; name: string; description: string | null; }[]; };
+        user: User;
+        active: SystemManager | Planet;
+    }
+}
\ No newline at end of file
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index c1d8aa8..ee4108a 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -19,7 +19,6 @@ if(!Astro.cookies.has('language')) {
 	});
 }
 ---
-
 <!doctype html>
 <html lang="en">
 	<head>
@@ -35,33 +34,4 @@ if(!Astro.cookies.has('language')) {
 		<slot />
 		<!-- <PlanetView /> -->
 	</body>
-</html>
-<style is:global>
-	:root {
-		--accent: 136, 58, 234;
-		--accent-light: 224, 204, 250;
-		--accent-dark: 49, 10, 101;
-		--accent-gradient: linear-gradient(
-			45deg,
-			rgb(var(--accent)),
-			rgb(var(--accent-light)) 30%,
-			white 60%
-		);
-	}
-	html {
-		font-family: system-ui, sans-serif;
-		background: #13151a;
-		background-size: 224px;
-	}
-	code {
-		font-family:
-			Menlo,
-			Monaco,
-			Lucida Console,
-			Liberation Mono,
-			DejaVu Sans Mono,
-			Bitstream Vera Sans Mono,
-			Courier New,
-			monospace;
-	}
-</style>
+</html>
\ No newline at end of file
diff --git a/src/layouts/LoggedIn.astro b/src/layouts/LoggedIn.astro
new file mode 100644
index 0000000..7a36b9f
--- /dev/null
+++ b/src/layouts/LoggedIn.astro
@@ -0,0 +1,34 @@
+---
+import NavBar from '../components/NavBar.astro';
+import ResourceBar from '../components/ResourceBar.astro';
+
+interface Props {
+	id: string;
+	title: string;
+}
+
+const { title } = Astro.props;
+---
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="description" content="Astro description" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<link rel="stylesheet" href="/css/markdown.css" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body>
+	    <NavBar loggedIn="true" active={Astro.props.id} />
+	    <ResourceBar />
+		<slot />
+	</body>
+</html>
+<style>
+    html {
+		font-family: system-ui, sans-serif;
+		background: #13151a;
+	}
+</style>
\ No newline at end of file
diff --git a/src/middleware.ts b/src/middleware.ts
new file mode 100644
index 0000000..a4c33b1
--- /dev/null
+++ b/src/middleware.ts
@@ -0,0 +1,35 @@
+import { getUserByAccessToken } from "./lib/db/users";
+import { getHighestWeightedLanguage, getLocales } from "./lib/utils/langDriver";
+import locationManager from "./lib/classes/managers/LocationManager";
+import { defineMiddleware } from "astro/middleware";
+import { APIContext, MiddlewareNext } from "astro";
+import { ObjectId } from "mongodb";
+
+const frontend = async (context: APIContext, next: MiddlewareNext) => {
+    const loggedToken = context.cookies.get('sessionToken')?.value ?? null;
+    const username = context.cookies.get('username')?.value ?? "";
+    if(loggedToken === null || username === "") return context.redirect('/logout');
+
+    const checkUser = await getUserByAccessToken(loggedToken);
+    if(checkUser === null || checkUser.username !== username) return context.redirect('/logout');
+    const user = locationManager.getUser(checkUser._id);
+    if(user === null) return context.redirect('/logout');
+
+    const lang = await getLocales(context.cookies.get('language')?.value ?? await getHighestWeightedLanguage(context.request.headers.get('accept-language')));
+
+    const activeId = context.cookies.get('currentPlanet')?.value ?? "0";
+    const active = locationManager.findId(new ObjectId(activeId));
+
+    if(active === null) return context.redirect('/logout');
+
+    context.locals.token = loggedToken;
+    context.locals.lang = lang;
+    context.locals.user = user;
+    context.locals.active = active;
+
+    return next();
+}
+
+export const onRequest = defineMiddleware(async (context, next) => {
+    return context.url.pathname.startsWith('/game') ? frontend(context, next) : next();
+});
\ No newline at end of file
diff --git a/src/pages/game/buildings.astro b/src/pages/game/buildings.astro
index 493a2be..b249792 100644
--- a/src/pages/game/buildings.astro
+++ b/src/pages/game/buildings.astro
@@ -1,34 +1,21 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
 import ItemCard from '../../components/ItemCard.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
-import { getHighestWeightedLanguage, getLocales, getName, getObj } from '../../lib/utils/langDriver';
-import ResourceBar from '../../components/ResourceBar.astro';
+import LoggedIn from '../../layouts/LoggedIn.astro';
+import { Planet } from '../../lib/classes/managers/PlanetManager';
+import SystemManager from '../../lib/classes/managers/SystemManager';
 import { getAllBuildings } from '../../lib/db/buildings';
-import locationManager from '../../lib/classes/managers/LocationManager';
-import { ObjectId } from 'mongodb';
+import { getName, getObj } from '../../lib/utils/langDriver';
 import DBBuilding from '../../types/db/DBBuilding';
 
+const { token, lang } = Astro.locals;
+const active: SystemManager | Planet = Astro.locals.active;
+
+if(active instanceof SystemManager) {
+	return Astro.redirect('/game');
+}
+
 const buildingsList = await getAllBuildings();
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
-
-const locale = Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language'));
-
-const lang = await getLocales(locale);
-
-const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
-if(planetId === "") return "No planet selected";
-
-const planet = locationManager.getPlanet(new ObjectId(planetId));
-if(!planet) return "Planet not found";
-
 if(Astro.request.method === "POST") {
     const selectedBuildingId = (await Astro.request.formData()).get('id') as string | null;
 
@@ -36,10 +23,10 @@ if(Astro.request.method === "POST") {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
-            'Authorization': 'Bearer ' + loggedToken
+            'Authorization': 'Bearer ' + token
         },
         body: JSON.stringify({
-            planet: planetId,
+            planet: active._id,
             building: selectedBuildingId
         })
     })).json();
@@ -54,7 +41,7 @@ for(const building of buildingsList) {
 		resources: building.requirements.resources.map(resource => {
 			return {
 				id: resource.id,
-				amount: Math.pow(building.multiplier, (planet.buildings.getBuildingById(building.id)?.level ?? 0) ) * resource.amount
+				amount: Math.pow(building.multiplier, (active.buildings.getBuildingById(building.id)?.level ?? 0) ) * resource.amount
 			};
 		}),
 		research: building.requirements.research,
@@ -65,15 +52,12 @@ for(const building of buildingsList) {
 
 const buildingsByCategory = buildingsList.reduce((acc: { [key: string]: Array<DBBuilding & { level: number }> }, building) => {
 	if(!acc[building.category]) acc[building.category] = [];
-	acc[building.category].push({ ...building, level: planet.buildings.getBuildingById(building.id)?.level ?? 0 });
+	acc[building.category].push({ ...building, level: active.buildings.getBuildingById(building.id)?.level ?? 0 });
 	return acc;
 }, {});
 ---
 
-<Layout title="Buildings">
-	<NavBar loggedIn="true" active="buildings" />
-	<ResourceBar />
-
+<LoggedIn id="buildings" title="Buildings">
 	<div id="building-modal-background">
 		<div id="building-modal-details" data-building-id="">
 			<h3>Required resources</h3>
@@ -84,7 +68,6 @@ const buildingsByCategory = buildingsList.reduce((acc: { [key: string]: Array<DB
 			<div class="building-modal-text" id="building-modal-req-research">None</div>
 		</div>
 	</div>
-
 	{Object.entries(buildingsByCategory).map(([category, buildings]) => <>
 		<h1>{getName(lang, 'buildings', `cat-${category}`)}</h1>
 		<div class="building-cat">
@@ -101,124 +84,55 @@ const buildingsByCategory = buildingsList.reduce((acc: { [key: string]: Array<DB
 			))}
 		</div>
 	</>)}
-</Layout>
-
+</LoggedIn>
 <style>
-	* {
-		color: white;
-	}
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
+.building-cat {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	row-gap: 40px;
+	column-gap: 2%;
+}
 
-	.building-cat {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		row-gap: 40px;
-		column-gap: 2%;
-	}
+#building-modal-background {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 100;
+}
 
-	#building-modal-background {
-		display: none;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100;
-	}
+#building-modal-details {
+	display: none;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 80%;
+	max-width: 800px;
+	background: rgba(0, 0, 0, 0.9);
+	border-radius: 8px;
+	padding: 1rem;
+	z-index: 101;
+}
 
-	#building-modal-details {
-		display: none;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 80%;
-		max-width: 800px;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 8px;
-		padding: 1rem;
-		z-index: 101;
-	}
+h1 {
+	font-size: 2rem;
+	font-weight: 700;
+	line-height: 1;
+	text-align: center;
+	margin-bottom: 1em;
+	color: white;
+}
 
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
-
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-
-	.building-modal-text {
-		font-size: 1.5rem;
-	}
-
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
-
-	.a-button {
-		text-decoration: none;
-    	color: green;
-	}
-
-	.a-button:hover {
-		color: lime;
-	}
+.building-modal-text {
+	font-size: 1.5rem;
+}
 </style>
-<script define:vars={{ modalSet, lang, planetId }}>
+<script define:vars={{ modalSet, lang }}>
 	const modalResources = document.getElementById("building-modal-req-resources");
 	const modalBuildings = document.getElementById("building-modal-req-buildings");
 	const modalResearch = document.getElementById("building-modal-req-research");
diff --git a/src/pages/game/fleet.astro b/src/pages/game/fleet.astro
index 9281c44..82a4884 100644
--- a/src/pages/game/fleet.astro
+++ b/src/pages/game/fleet.astro
@@ -1,30 +1,14 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
-import { getHighestWeightedLanguage, getLocales, getName, getObj } from '../../lib/utils/langDriver';
-import ResourceBar from '../../components/ResourceBar.astro';
+import LoggedIn from '../../layouts/LoggedIn.astro';
 import locationManager from '../../lib/classes/managers/LocationManager';
+import { Planet } from '../../lib/classes/managers/PlanetManager';
+import SystemManager from '../../lib/classes/managers/SystemManager';
 import { getAllFleetByUser } from '../../lib/db/fleet';
 import { getAllShips } from '../../lib/db/ships';
-import { ObjectId } from 'mongodb';
-import SystemManager from '../../lib/classes/managers/SystemManager';
+import { getName } from '../../lib/utils/langDriver';
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
-
-const user = locationManager.getUser(checkUser._id);
-if(!user) return Astro.redirect('/logout');
-
-const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
-if(planetId === "") return "No planet selected";
-
-const planet = locationManager.findId(new ObjectId(planetId));
-if(!planet) return "Planet not found";
+const { token, user, lang } = Astro.locals;
+const active: SystemManager | Planet = Astro.locals.active;
 
 const ships = await getAllShips();
 
@@ -47,7 +31,7 @@ if(Astro.request.method === "POST") {
 	});
 
 	const fleetData = {
-		source: planet instanceof SystemManager ? planet.data._id : planet._id,
+		source: active instanceof SystemManager ? active.data._id : active._id,
 		destination: form.get('toSystem') ? form.get('destination-system')?.toString() : form.get('destination-planet')?.toString(),
 		mission: form.get('mission')?.toString() ?? "NULL",
 		ships: ships.map(ship => {
@@ -64,7 +48,7 @@ if(Astro.request.method === "POST") {
 		method: 'POST',
 		headers: {
 			'Content-Type': 'application/json',
-			'Authorization': `Bearer ${loggedToken}`
+			'Authorization': `Bearer ${token}`
 		},
 		body: JSON.stringify(fleetData)
 	});
@@ -79,7 +63,6 @@ await locationManager.updateFleet();
 const fleet = (await getAllFleetByUser(user.id)).filter(f => new Date().getTime() - f.arrivalTime.getTime() < 0);
 fleet.sort((a, b) => a.departureTime.getTime() - b.departureTime.getTime());
 
-const userSystems = locationManager.getSystemsOwnedBy(user.id);
 const galaxies = locationManager.galaxies;
 
 let own = 0;
@@ -99,28 +82,6 @@ for(const f of fleet) {
 	}
 }
 
-// for(const system of userSystems) {
-// 	for(const planet of system.planets) {
-// 		for(const f of fleet) {
-// 			if(f.source.equals(planet._id) || f.source.equals(system.data._id)) own++;
-// 			else if(f.destination.equals(planet._id) || f.destination.equals(system.data._id)) {
-// 				if(f.mission === 'ATTACK') enemy++;
-// 				else {
-// 					const sourceObj = locationManager.findId(f.source);
-// 					const destinationObj = locationManager.findId(f.destination);
-
-// 					if(!sourceObj || !destinationObj) continue;
-
-// 					const source = sourceObj instanceof SystemManager ? sourceObj.data.ownedBy.id : sourceObj.system.data.ownedBy.id;
-// 					const destination = destinationObj instanceof SystemManager ? destinationObj.data.ownedBy.id : destinationObj.system.data.ownedBy.id;
-
-// 					if(!source?.equals(destination)) friendly++;
-// 				}
-// 			}
-// 		}
-// 	}
-// }
-
 const sectorsList = galaxies.map(galaxy => {
 	return {
 		_id: galaxy._id,
@@ -145,13 +106,8 @@ const sectorsList = galaxies.map(galaxy => {
 		})
 	}
 });
-
-const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language')));
 ---
-
-<Layout title="Fleet">
-	<NavBar loggedIn="true" active="fleet" />
-	<ResourceBar />
+<LoggedIn id="fleet" title="Fleet">
 	<label for="fleet-toggle">
 		<input type="checkbox" id="fleet-toggle">
 		<div class="fleet-status">
@@ -179,11 +135,11 @@ const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getH
 	</label>
 	<div class="fleet-send-container">
 		<form method="post">
-			<h1>Sending fleet from {planet instanceof SystemManager ? planet.data.name : planet.name}</h1>
+			<h1>Sending fleet from {active instanceof SystemManager ? active.data.name : active.name}</h1>
 			<hr />
 			<h2>Ships</h2>
 			<div class="fleet-send-ships">
-				{planet.ships.ships.map(ship => <div class="fleet-ship-card">
+				{active.ships.ships.map(ship => <div class="fleet-ship-card">
 					<h3>{getName(lang, 'ships', ship.data.id)} - {ship.amount}</h3>
 					<input type="number" value="0" min="0" max={ship.amount} id={ship.data.id} name={`ship-amount-${ship.data.id}`} />
 				</div>)}
@@ -233,207 +189,132 @@ const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getH
 			<button type="submit">Send fleet</button>
 		</form>
 	</div>
-</Layout>
+</LoggedIn>
 
 <style>
-	* {
-		color: white;
-	}
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
+* {
+	color: white;
+}
 
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
+.ship-cards {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	row-gap: 40px;
+	column-gap: 2%;
+}
 
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
+#ship-modal-background {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 100;
+}
 
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
+#ship-modal-details {
+	display: none;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 80%;
+	max-width: 800px;
+	background: rgba(0, 0, 0, 0.9);
+	border-radius: 8px;
+	padding: 1rem;
+	z-index: 101;
+}
 
-	.a-button {
-		text-decoration: none;
-    	color: green;
-		height: fit-content;
-	}
+.fleet-status {
+	margin-top: 40px;
+	background-color: gray;
+	border-radius: 10px;
+	padding: 2px;
+}
 
-	.a-button:hover {
-		color: lime;
-	}
+.fleet-status ul {
+	list-style-type: none;
+	padding: 0;
+	opacity: 0;
+	max-height: 0;
+	overflow: hidden;
+	transition-property: max-height;
+	transition-duration: 0.5s;
+	transition-timing-function: ease;
+}
 
-	.ship-cards {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		row-gap: 40px;
-		column-gap: 2%;
-	}
+#fleet-toggle {
+	position: absolute;
+ 	top: -9999px;
+	left: -9999px;
+}
 
-	#ship-modal-background {
-		display: none;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100;
-	}
+label { 
+	-webkit-appearance: push-button;
+	-moz-appearance: button; 
+	margin: 60px 0 10px 0;
+	cursor: pointer;
+}
 
-	#ship-modal-details {
-		display: none;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 80%;
-		max-width: 800px;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 8px;
-		padding: 1rem;
-		z-index: 101;
-	}
+#fleet-toggle:checked ~ .fleet-status ul {
+	opacity: 1;
+	height: auto;
+	max-height: 1000px;
+}
 
-	.fleet-status {
-		margin-top: 40px;
-		background-color: gray;
-		border-radius: 10px;
-		padding: 2px;
-	}
+.fleet-send-container {
+	margin-top: 40px;
+	background-color: gray;
+	border-radius: 10px;
+	padding: 2px;
+}
 
-	.fleet-status ul {
-		list-style-type: none;
-		padding: 0;
-		opacity: 0;
-		max-height: 0;
-		overflow: hidden;
+.fleet-send-ships {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	row-gap: 40px;
+	column-gap: 2%;
+	margin-top: 40px;
+}
 
-		transition-property: max-height;
-		transition-duration: 0.5s;
-		transition-timing-function: ease;
-	}
+.fleet-ship-card {
+	background-color: gray;
+	border-radius: 10px;
+	padding: 2px;
+}
 
-	#fleet-toggle {
-  		position: absolute;
-  	 	top: -9999px;
-		left: -9999px;
-	}
+.fleet-ship-card h3 {
+	margin: 0;
+}
 
-	label { 
-		-webkit-appearance: push-button;
-		-moz-appearance: button; 
-		margin: 60px 0 10px 0;
-		cursor: pointer;
-	}
+.fleet-ship-card input {
+	width: 10rem;
+	color: black;
+}
 
-	#fleet-toggle:checked ~ .fleet-status ul {
-		opacity: 1;
-		height: auto;
-		max-height: 1000px;
-	}
+.fleet-destination select {
+	width: 10rem;
+	height: 3rem;
+	color: black;
+	background-color: darkgray;
+}
 
-	.fleet-send-container {
-		margin-top: 40px;
-		background-color: gray;
-		border-radius: 10px;
-		padding: 2px;
-	}
+.cargo-add-new {
+	background-color: #aaaaaa;
+	border-radius: 10px;
+	padding: 2px;
+	width: fit-content;
+	color: black;
+}
 
-	.fleet-send-ships {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		row-gap: 40px;
-		column-gap: 2%;
-		margin-top: 40px;
-	}
-
-	.fleet-ship-card {
-		background-color: gray;
-		border-radius: 10px;
-		padding: 2px;
-	}
-
-	.fleet-ship-card h3 {
-		margin: 0;
-	}
-
-	.fleet-ship-card input {
-		width: 10rem;
-		color: black;
-	}
-
-	.fleet-destination select {
-		width: 10rem;
-		height: 3rem;
-		color: black;
-		background-color: darkgray;
-	}
-
-	.cargo-add-new {
-		background-color: #aaaaaa;
-		border-radius: 10px;
-		padding: 2px;
-		width: fit-content;
-		color: black;
-	}
-
-	.select, .input {
-		color: black;
-	}
+.select, .input {
+	color: black;
+}
 </style>
 <script define:vars={{ sectorsList }}>
 	const destinationGalaxy = document.getElementById('destination-galaxy');
@@ -565,5 +446,4 @@ const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getH
 
 		cargoContainer.appendChild(cargoItem);
 	});
-				
 </script>
\ No newline at end of file
diff --git a/src/pages/game/galaxyView.astro b/src/pages/game/galaxyView.astro
index 13ca768..b31db4d 100644
--- a/src/pages/game/galaxyView.astro
+++ b/src/pages/game/galaxyView.astro
@@ -1,16 +1,6 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
+import LoggedIn from '../../layouts/LoggedIn.astro';
 import locationManager from '../../lib/classes/managers/LocationManager';
-import ResourceBar from '../../components/ResourceBar.astro';
-
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
 
 const allGalaxies = locationManager.galaxies;
 
@@ -33,10 +23,7 @@ const galaxies = allGalaxies.map(galaxy => {
 	};
 })
 ---
-
-<Layout title="Galaxy view">
-	<NavBar loggedIn="true" active="galaxyView" />
-	<ResourceBar />
+<LoggedIn id="galaxyView" title="Galaxy view">
 	<div class="container">
 		<div class="galaxy-container">
 			{galaxies.map(galaxy => <>
@@ -49,73 +36,70 @@ const galaxies = allGalaxies.map(galaxy => {
 		</div>
 		<div class="galaxy-details">
 			<h2></h2>
-			<div class="galaxy-sector-list">
-				
-			</div>
+			<div class="galaxy-sector-list"></div>
 		</div>
 	</div>
-</Layout>
-
+</LoggedIn>
 <style is:global>
-	.container {
-		display: flex;
-		flex-direction: row;
-		color: white;
-	}
+.container {
+	display: flex;
+	flex-direction: row;
+	color: white;
+}
 
-	.galaxy-container {
-		width: 70%;
-		height: 500px;
-		background-color: blue;
-		margin-left: 50px;
-		margin-right: auto;
-		margin-top: 50px;
-		position: relative;
-	}
+.galaxy-container {
+	width: 70%;
+	height: 500px;
+	background-color: blue;
+	margin-left: 50px;
+	margin-right: auto;
+	margin-top: 50px;
+	position: relative;
+}
 
-	.galaxy-icon {
-		position:absolute;
-		width: 40px;
-		height: 40px;
-		background-color: white;
-		border-radius: 20px;
-	}
+.galaxy-icon {
+	position:absolute;
+	width: 40px;
+	height: 40px;
+	background-color: white;
+	border-radius: 20px;
+}
 
-	.galaxy-icon:hover {
-		background-color: yellow !important;
-	}
+.galaxy-icon:hover {
+	background-color: yellow !important;
+}
 
-	.galaxy-name {
-		position: absolute;
-		top: 40px;
-		left: -5px;
-		color: white;
-	}
+.galaxy-name {
+	position: absolute;
+	top: 40px;
+	left: -5px;
+	color: white;
+}
 
-	.galaxy-details {
-		width: 23%;
-		height: 500px;
-		margin-top: 50px;
-		margin-right: 50px;
-	}
+.galaxy-details {
+	width: 23%;
+	height: 500px;
+	margin-top: 50px;
+	margin-right: 50px;
+}
 
-	.galaxy-details h2 {
-		text-align: center;
-	}
+.galaxy-details h2 {
+	text-align: center;
+}
 
-	.galaxy-sector-list {
-		display: flex;
-		flex-direction: column;
-	}
+.galaxy-sector-list {
+	display: flex;
+	flex-direction: column;
+}
 
-	.galaxy-sector-list div {
-		text-align: center;
-		background-color: gray;
-		margin-top: 10px;
-		border-radius: 10px;
-		padding-top: 10px;
-		padding-bottom: 10px;
-	}
+.galaxy-sector-list div {
+	text-align: center;
+	background-color: gray;
+	margin-top: 10px;
+	border-radius: 10px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
 </style>
 <script>
 	function gvinit() {
diff --git a/src/pages/game/index.astro b/src/pages/game/index.astro
index 3bc8273..158eb21 100644
--- a/src/pages/game/index.astro
+++ b/src/pages/game/index.astro
@@ -1,100 +1,15 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import ResourceBar from '../../components/ResourceBar.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
-import locationManager from '../../lib/classes/managers/LocationManager';
-import { ObjectId } from 'mongodb';
+import LoggedIn from '../../layouts/LoggedIn.astro';
+import { Planet } from '../../lib/classes/managers/PlanetManager';
+import SystemManager from '../../lib/classes/managers/SystemManager';
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
-
-const currentPlanetId = Astro.cookies.get('currentPlanet')?.value ?? null;
-if(currentPlanetId === null) return Astro.redirect('/logout');
-const currentPlanet = locationManager.getPlanet(new ObjectId(currentPlanetId));
-if(currentPlanet === undefined) {
-	Astro.cookies.delete('planetid');
-	return Astro.redirect('/logout');
-}
+const active: SystemManager | Planet = Astro.locals.active;
 ---
-
-<Layout title="Overview">
-	<NavBar loggedIn="true" active="overview" />
-	<ResourceBar />
-
-	<h1>{currentPlanet.name} in {currentPlanet.system.data.name}</h1>
-</Layout>
-
+<LoggedIn id="overview" title="Overview">
+	<h1>{active instanceof SystemManager ? `${active.data.name} system` : `${active.name} in ${active.system.data.name}`}</h1>
+</LoggedIn>
 <style>
-	* {
-		color: white;
-	}
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
-
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
-	
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-	
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
+h1 {
+	color: white;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/game/profile.astro b/src/pages/game/profile.astro
index ecd8957..11e79c6 100644
--- a/src/pages/game/profile.astro
+++ b/src/pages/game/profile.astro
@@ -1,10 +1,11 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import { getUserByAccessToken, getUserByNickOrEmail } from '../../lib/db/users';
-import { getHighestWeightedLanguage, getLocales, getName, getSupportedLanguages } from '../../lib/utils/langDriver';
-import ResourceBar from '../../components/ResourceBar.astro';
+import LoggedIn from '../../layouts/LoggedIn.astro';
+import User from '../../lib/classes/User';
 import format from '../../lib/utils/format';
+import { getName, getSupportedLanguages } from '../../lib/utils/langDriver';
+
+const { token, lang } = Astro.locals;
+const user: User = Astro.locals.user;
 
 const availableLanguages = await getSupportedLanguages();
 
@@ -23,28 +24,10 @@ if(Astro.request.method === "POST") {
         secure: true
     });
 }
-
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
-
-const locale = Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language') ?? "en");
-
-const user = await getUserByNickOrEmail(username);
-
-const lang = await getLocales(locale);
-
 const currentLanguage = Astro.cookies.get('language')?.value ?? "en";
-
 ---
-
-<Layout title="Profile">
-	<NavBar loggedIn="true" active="profile" />
-	<ResourceBar loggedIn="true" />
-    {loggedToken}
+<LoggedIn id="profile" title="Profile">
+    {token}
     <div class="wrapper">
         <h3>{format(getName(lang, 'general', 'user-creation-date'), user?.createdAt.toISOString().slice(0, 19).replace(/-/g, "/").replace("T", " ").toString() ?? "")}</h3>
         <a href="/logout" class="a-button">{getName(lang, 'general', 'nav-logout')}</a>
@@ -66,7 +49,7 @@ const currentLanguage = Astro.cookies.get('language')?.value ?? "en";
         <input class="data-form-button" type="button" value={getName(lang, 'general', 'change-password')} />
     </form>
     <form id="changeLanguageForm" class="data-form" method="post">
-        <h4>{getName(lang, 'general', 'current-language')}: {availableLanguages.find(l => l.id === currentLanguage)?.name ?? "N/A"}</h4>
+        <h3>{getName(lang, 'general', 'current-language')}: {availableLanguages.find(l => l.id === currentLanguage)?.name ?? "N/A"}</h3>
         <select class="data-form-input" name="language">
             {availableLanguages.map((lang) => (
                 <option value={lang.id}>{lang.name}</option>
@@ -74,111 +57,46 @@ const currentLanguage = Astro.cookies.get('language')?.value ?? "en";
         </select>
         <input type="submit" class="data-form-button" value={getName(lang, 'general', 'change-language')} />
     </form>
-</Layout>
-
+</LoggedIn>
 <style>
-	* {
-		color: white;
-	}
+h3 {
+    color: white;
+}
 
-    .data-form {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        margin-top: 2rem;
-    }
+.data-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin-top: 2rem;
+}
 
-    .data-form-input {
-        color: black;
-    }
+.data-form-input {
+    color: black;
+}
 
-    .data-form-button {
-        color: red;
-        font-weight: 700;
-    }
+.data-form-button {
+    color: red;
+    font-weight: 700;
+}
 
-    .wrapper {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        margin-top: 2rem;
-        color: white;
-    }
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
+.wrapper {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin-top: 2rem;
+    color: white;
+}
 
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
-	
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-	
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
+.a-button {
+	text-decoration: none;
+	color: green;
+}
 
-    .a-button {
-		text-decoration: none;
-    	color: green;
-	}
-
-	.a-button:hover {
-		color: lime;
-	}
+.a-button:hover {
+	color: lime;
+}
 </style>
 <script>
     const changeUsernameForm = document.getElementById('changeUsernameForm');
diff --git a/src/pages/game/research.astro b/src/pages/game/research.astro
index 2022209..4b4c74f 100644
--- a/src/pages/game/research.astro
+++ b/src/pages/game/research.astro
@@ -1,24 +1,18 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
-import { getHighestWeightedLanguage, getLocales, getName, getObj } from '../../lib/utils/langDriver';
-import ResourceBar from '../../components/ResourceBar.astro';
 import ItemCard from '../../components/ItemCard.astro';
+import LoggedIn from '../../layouts/LoggedIn.astro';
+import User from '../../lib/classes/User';
+import { Planet } from '../../lib/classes/managers/PlanetManager';
+import SystemManager from '../../lib/classes/managers/SystemManager';
 import { getAllResearch } from '../../lib/db/research';
+import { getObj } from '../../lib/utils/langDriver';
+
+const { token, lang } = Astro.locals;
+const active: SystemManager | Planet = Astro.locals.active;
+const user: User = Astro.locals.user;
 
 const researchList = await getAllResearch();
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
-
-const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
-if(planetId === "") return Astro.redirect('/logout');
-
 if(Astro.request.method === "POST") {
     const selectedResearchId = (await Astro.request.formData()).get('id') as string | null;
 
@@ -26,21 +20,17 @@ if(Astro.request.method === "POST") {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
-            'Authorization': 'Bearer ' + loggedToken
+            'Authorization': 'Bearer ' + token
         },
         body: JSON.stringify({
             research: selectedResearchId,
-			planetId
+			planetId: active instanceof SystemManager ? active.data._id : active._id
         })
     })).json();
 
     console.log(request);
 }
 
-const locale = Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language'));
-
-const lang = await getLocales(locale);
-
 const modalSet: { [key: string]: { resources: Array<any>, research: Array<any>, buildings: Array<any> } } = {};
 
 for(const research of researchList) {
@@ -52,11 +42,7 @@ for(const research of researchList) {
 	};
 }
 ---
-
-<Layout title="Research">
-	<NavBar loggedIn="true" active="research" />
-	<ResourceBar />
-
+<LoggedIn id="research" title="Research">
 	<div id="research-modal-background">
 		<div id="research-modal-details" data-building-id="">
 			<h3>Required resources</h3>
@@ -67,136 +53,56 @@ for(const research of researchList) {
 			<div class="research-modal-text" id="research-modal-req-research">None</div>
 		</div>
 	</div>
-
 	<div class="research-cards">
 		{researchList.map(research => <>
 			<ItemCard
 				category="research"
 				id={research.id}
 				name={getObj(lang, "research", research.id).name}
-				level={checkUser.research.find(x => x.id === research.id)?.level.toString() ?? "0"}
+				level={user.research.getResearchById(research.id)?.level.toString() ?? "0"}
 				description={getObj(lang, "research", research.id).description ?? ""}
 				image={`/images/research/${research.id}.jpeg`}
 				button_type="general"
 				button_name="nav-research" />
 		</>)}
 	</div>
-</Layout>
-
+</LoggedIn>
 <style>
-	* {
-		color: white;
-	}
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
+.research-cards {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	row-gap: 40px;
+	column-gap: 2%;
+	margin-top: 40px;
+}
 
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
+#research-modal-background {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 100;
+}
 
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
-
-	.a-button {
-		text-decoration: none;
-    	color: green;
-		height: fit-content;
-	}
-
-	.a-button:hover {
-		color: lime;
-	}
-
-	.research-cards {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		row-gap: 40px;
-		column-gap: 2%;
-		margin-top: 40px;
-	}
-
-	#research-modal-background {
-		display: none;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100;
-	}
-
-	#research-modal-details {
-		display: none;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 80%;
-		max-width: 800px;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 8px;
-		padding: 1rem;
-		z-index: 101;
-	}
+#research-modal-details {
+	display: none;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 80%;
+	max-width: 800px;
+	background: rgba(0, 0, 0, 0.9);
+	border-radius: 8px;
+	padding: 1rem;
+	z-index: 101;
+}
 </style>
-<script define:vars={{ modalSet, lang, planetId }}>
+<script define:vars={{ modalSet, lang }}>
 	const modalResources = document.getElementById("research-modal-req-resources");
 	const modalBuildings = document.getElementById("research-modal-req-buildings");
 	const modalResearch = document.getElementById("research-modal-req-research");
diff --git a/src/pages/game/ships.astro b/src/pages/game/ships.astro
index aa2aea8..721c992 100644
--- a/src/pages/game/ships.astro
+++ b/src/pages/game/ships.astro
@@ -1,37 +1,16 @@
 ---
-import Layout from '../../layouts/Layout.astro';
-import NavBar from '../../components/NavBar.astro';
-import { getUserByAccessToken } from '../../lib/db/users';
-import { getHighestWeightedLanguage, getLocales, getObj } from '../../lib/utils/langDriver';
-import ResourceBar from '../../components/ResourceBar.astro';
-import { getAllShips } from '../../lib/db/ships';
 import ItemCard from '../../components/ItemCard.astro';
-import locationManager from '../../lib/classes/managers/LocationManager';
-import { ObjectId } from 'mongodb';
+import LoggedIn from '../../layouts/LoggedIn.astro';
+import { Planet } from '../../lib/classes/managers/PlanetManager';
+import SystemManager from '../../lib/classes/managers/SystemManager';
+import { getAllShips } from '../../lib/db/ships';
+import { getObj } from '../../lib/utils/langDriver';
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
+const { lang } = Astro.locals;
+const active: SystemManager | Planet = Astro.locals.active;
 
 const ships = await getAllShips();
 
-const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
-if(planetId === "") {
-	console.error("No planet selected");
-	return Astro.redirect('/logout');
-}
-
-const planet = locationManager.getPlanet(new ObjectId(planetId));
-if(!planet) {
-	console.error("Planet not found");
-	return Astro.redirect('/logout');
-}
-
-const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language')));
-
 const modalSet: { [key: string]: { resources: Array<any>, research: Array<any>, buildings: Array<any> } } = {};
 
 for(const ship of ships) {
@@ -42,12 +21,10 @@ for(const ship of ships) {
 		// energy: building.energy
 	};
 }
+
+const planetId = active instanceof SystemManager ? active.data._id : active._id;
 ---
-
-<Layout title="Ships">
-	<NavBar loggedIn="true" active="ships" />
-	<ResourceBar />
-
+<LoggedIn id="ships" title="Ships">
     <div id="ship-modal-background">
 		<div id="ship-modal-details" data-building-id="">
 			<h3>Required resources</h3>
@@ -65,127 +42,49 @@ for(const ship of ships) {
 				category="ships"
 				id={ship.id}
 				name={getObj(lang, "ships", ship.id).name}
-				level={planet.ships.getShipById(ship.id)?.amount.toString() ?? "0"}
+				level={active.ships.getShipById(ship.id)?.amount.toString() ?? "0"}
 				description={getObj(lang, "ships", ship.id).description ?? ""}
 				image={`/images/ships/${ship.id}.jpeg`}
 				button_type="general"
 				button_name="nav-build" />
 		</>)}
 	</div>
-</Layout>
+</LoggedIn>
 
 <style>
-	* {
-		color: white;
-	}
-	
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
+.ship-cards {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	row-gap: 40px;
+	column-gap: 2%;
+	margin-top: 40px;
+}
 
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
+#ship-modal-background {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 100;
+}
 
-	h3 {
-		font-size: 2rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-
-	.text-gradient {
-		background-image: var(--accent-gradient);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-size: 400%;
-		background-position: 0%;
-	}
-	
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
-
-	.a-button {
-		text-decoration: none;
-    	color: green;
-		height: fit-content;
-	}
-
-	.a-button:hover {
-		color: lime;
-	}
-
-	.ship-cards {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		row-gap: 40px;
-		column-gap: 2%;
-		margin-top: 40px;
-	}
-
-	#ship-modal-background {
-		display: none;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100;
-	}
-
-	#ship-modal-details {
-		display: none;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 80%;
-		max-width: 800px;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 8px;
-		padding: 1rem;
-		z-index: 101;
-	}
+#ship-modal-details {
+	display: none;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 80%;
+	max-width: 800px;
+	background: rgba(0, 0, 0, 0.9);
+	border-radius: 8px;
+	padding: 1rem;
+	z-index: 101;
+}
 </style>
 <script define:vars={{ modalSet, lang, planetId }}>
 	const modalResources = document.getElementById("ship-modal-req-resources");
diff --git a/src/pages/game/systemManager/index.astro b/src/pages/game/systemManager/index.astro
index c792f66..8dae91c 100644
--- a/src/pages/game/systemManager/index.astro
+++ b/src/pages/game/systemManager/index.astro
@@ -1,24 +1,12 @@
 ---
 import { ObjectId } from "mongodb";
-import NavBar from "../../../components/NavBar.astro";
-import ResourceBar from "../../../components/ResourceBar.astro";
-import Layout from "../../../layouts/Layout.astro";
+import LoggedIn from "../../../layouts/LoggedIn.astro";
 import locationManager from "../../../lib/classes/managers/LocationManager";
-import { getUserByAccessToken } from "../../../lib/db/users";
-
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
 
 const currentSystemId = Astro.cookies.get('currentSystem')?.value ?? null;
-
 if(currentSystemId === null) return Astro.redirect('/game/systemManager/select');
 
 const currentSystem = locationManager.getSystem(new ObjectId(currentSystemId));
-
 if(currentSystem === undefined) {
     Astro.cookies.delete('currentSystem');
     return Astro.redirect('/game/systemManager/select');
@@ -39,10 +27,7 @@ if(Astro.request.method === "POST") {
     return Astro.redirect('/game/systemManager');
 }
 ---
-<Layout title="System Manager">
-    <NavBar loggedIn="true" active="systemManager" />
-    <ResourceBar />
-
+<LoggedIn id="systemManager" title="System Manager">
     <h1>Selected system: {currentSystem.data.name} in {currentSystem.data.sector.name} in {currentSystem.data.sector.galaxy.name} <a href="/game/systemManager/select">(change)</a></h1>
     <div class="system-links">
         <a href="/game/systemManager">Overview</a>
@@ -85,71 +70,71 @@ if(Astro.request.method === "POST") {
             </div>
         ))}
     </div>
-</Layout>
+</LoggedIn>
 <style>
-    * {
-        color: white;
-    }
+* {
+    color: white;
+}
 
-    h1 {
-        text-align: center;
-        color: white;
-    }
+h1 {
+    text-align: center;
+    color: white;
+}
 
-    h1 a {
-        color: lime;
-    }
+h1 a {
+    color: lime;
+}
 
-    .system-links {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        margin-bottom: 1rem;
-    }
+.system-links {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    margin-bottom: 1rem;
+}
 
-    .system-links a {
-        color: white;
-        background-color: #555;
-        padding: 0.5rem;
-        margin: 0 1rem;
-        border-radius: 5px;
-        text-decoration: none;
-    }
+.system-links a {
+    color: white;
+    background-color: #555;
+    padding: 0.5rem;
+    margin: 0 1rem;
+    border-radius: 5px;
+    text-decoration: none;
+}
 
-    .resources {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        margin-bottom: 1rem;
-    }
+.resources {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    margin-bottom: 1rem;
+}
 
-    .ships {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        margin-bottom: 1rem;
-    }
+.ships {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    margin-bottom: 1rem;
+}
 
-    .planet-list {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        justify-content: space-evenly;
-        color: white;
-    }
+.planet-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+    color: white;
+}
 
-    .system-card input {
-        background-color: #555;
-        color: white;
-        border: none;
-        padding: 0.5rem;
-        border-radius: 5px;
-        cursor: pointer;
-    }
+.system-card input {
+    background-color: #555;
+    color: white;
+    border: none;
+    padding: 0.5rem;
+    border-radius: 5px;
+    cursor: pointer;
+}
 
-    .system-card div {
-        margin-top: auto;
-        margin-bottom: auto;
-        margin-left: 2rem;
-    }
+.system-card div {
+    margin-top: auto;
+    margin-bottom: auto;
+    margin-left: 2rem;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/game/systemManager/select.astro b/src/pages/game/systemManager/select.astro
index b66f8cd..7f4a2a4 100644
--- a/src/pages/game/systemManager/select.astro
+++ b/src/pages/game/systemManager/select.astro
@@ -1,16 +1,9 @@
 ---
-import NavBar from "../../../components/NavBar.astro";
-import ResourceBar from "../../../components/ResourceBar.astro";
-import Layout from "../../../layouts/Layout.astro";
+import LoggedIn from "../../../layouts/LoggedIn.astro";
+import User from "../../../lib/classes/User";
 import locationManager from "../../../lib/classes/managers/LocationManager";
-import { getUserByAccessToken } from "../../../lib/db/users";
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
+const user: User = Astro.locals.user;
 
 if(Astro.request.method === "POST") {
     const selectedSystemId = (await Astro.request.formData()).get('systemId') as string | null;
@@ -27,12 +20,9 @@ if(Astro.request.method === "POST") {
     }
 }
 
-const systems = locationManager.getSystemsOwnedBy(checkUser._id);
+const systems = locationManager.getSystemsOwnedBy(user.id);
 ---
-<Layout title="System Manager">
-    <NavBar loggedIn="true" active="systemManager" />
-    <ResourceBar />
-
+<LoggedIn id="systemManager" title="System Manager">
     <div class="systems-list">
         {systems.map(system => (
             <div class="system-card">
@@ -41,37 +31,37 @@ const systems = locationManager.getSystemsOwnedBy(checkUser._id);
             </div>
         ))}
     </div>
-</Layout>
+</LoggedIn>
 <style>
-    .systems-list {
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        justify-content: center;
-    }
+.systems-list {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    justify-content: center;
+}
 
-    .system-card {
-        background-color: #333;
-        color: white;
-        padding: 1rem;
-        margin: 1rem;
-        border-radius: 5px;
-        display: flex;
-        flex-direction: row;
-    }
+.system-card {
+    background-color: #333;
+    color: white;
+    padding: 1rem;
+    margin: 1rem;
+    border-radius: 5px;
+    display: flex;
+    flex-direction: row;
+}
 
-    .system-card input {
-        background-color: #555;
-        color: white;
-        border: none;
-        padding: 0.5rem;
-        border-radius: 5px;
-        cursor: pointer;
-    }
+.system-card input {
+    background-color: #555;
+    color: white;
+    border: none;
+    padding: 0.5rem;
+    border-radius: 5px;
+    cursor: pointer;
+}
 
-    .system-card div {
-        margin-top: auto;
-        margin-bottom: auto;
-        margin-left: 2rem;
-    }
+.system-card div {
+    margin-top: auto;
+    margin-bottom: auto;
+    margin-left: 2rem;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/game/systemManager/structures.astro b/src/pages/game/systemManager/structures.astro
index 7aa6617..f71db8a 100644
--- a/src/pages/game/systemManager/structures.astro
+++ b/src/pages/game/systemManager/structures.astro
@@ -1,26 +1,16 @@
 ---
 import { ObjectId } from "mongodb";
-import NavBar from "../../../components/NavBar.astro";
-import ResourceBar from "../../../components/ResourceBar.astro";
-import Layout from "../../../layouts/Layout.astro";
-import locationManager from "../../../lib/classes/managers/LocationManager";
-import { getUserByAccessToken } from "../../../lib/db/users";
-import { getHighestWeightedLanguage, getLocales, getName, getObj } from "../../../lib/utils/langDriver";
 import ItemCard from "../../../components/ItemCard.astro";
+import LoggedIn from "../../../layouts/LoggedIn.astro";
+import locationManager from "../../../lib/classes/managers/LocationManager";
+import { getName, getObj } from "../../../lib/utils/langDriver";
 
-const loggedToken = Astro.cookies.get('sessionToken')?.value ?? null;
-const username = Astro.cookies.get('username')?.value ?? "";
-if(loggedToken === null || username === "") return Astro.redirect('/logout');
-
-const checkUser = await getUserByAccessToken(loggedToken);
-if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
+const { token, lang } = Astro.locals;
 
 const currentSystemId = Astro.cookies.get('currentSystem')?.value ?? null;
-
 if(currentSystemId === null) return Astro.redirect('/game/systemManager/select');
 
 const currentSystem = locationManager.getSystem(new ObjectId(currentSystemId));
-
 if(currentSystem === undefined) {
     Astro.cookies.delete('currentSystem');
     return Astro.redirect('/game/systemManager/select');
@@ -33,7 +23,7 @@ if(Astro.request.method === "POST") {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
-            'Authorization': 'Bearer ' + loggedToken
+            'Authorization': 'Bearer ' + token
         },
         body: JSON.stringify({
             system: currentSystemId,
@@ -44,8 +34,6 @@ if(Astro.request.method === "POST") {
     console.log(request);
 }
 
-const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language')));
-
 const modalSet: { [key: string]: { resources: Array<any>, research: Array<any>, structures: Array<any>, energy: number } } = {};
 
 const structureList = currentSystem.structures.structuresDB;
@@ -63,10 +51,7 @@ for(const structure of structureList) {
 	};
 }
 ---
-<Layout title="System Manager">
-    <NavBar loggedIn="true" active="systemManager" />
-    <ResourceBar />
-
+<LoggedIn id="systemManager" title="System Manager">
     <h1>Selected system: {currentSystem.data.name} <a href="/game/systemManager/select">(change)</a></h1>
     <div class="system-links">
         <a href="/game/systemManager">Overview</a>
@@ -98,81 +83,81 @@ for(const structure of structureList) {
             />
         ))}
     </div>    
-</Layout>
+</LoggedIn>
 <style>
-    * {
-		color: white;
-	}
+* {
+	color: white;
+}
 
-    h1 {
-        text-align: center;
-        color: white;
-    }
+h1 {
+    text-align: center;
+    color: white;
+}
 
-    h1 a {
-        color: lime;
-    }
+h1 a {
+    color: lime;
+}
 
-    #structure-modal-background {
-		display: none;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100;
-	}
+#structure-modal-background {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 100;
+}
 
-	#structure-modal-details {
-		display: none;
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 80%;
-		max-width: 800px;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 8px;
-		padding: 1rem;
-		z-index: 101;
-	}
+#structure-modal-details {
+	display: none;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	width: 80%;
+	max-width: 800px;
+	background: rgba(0, 0, 0, 0.9);
+	border-radius: 8px;
+	padding: 1rem;
+	z-index: 101;
+}
 
-	.structure-modal-text {
-		font-size: 1.5rem;
-	}
+.structure-modal-text {
+	font-size: 1.5rem;
+}
 
-    .system-links {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        margin-bottom: 1rem;
-    }
+.system-links {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    margin-bottom: 1rem;
+}
 
-    .system-links a {
-        color: white;
-        background-color: #555;
-        padding: 0.5rem;
-        margin: 0 1rem;
-        border-radius: 5px;
-        text-decoration: none;
-    }
+.system-links a {
+    color: white;
+    background-color: #555;
+    padding: 0.5rem;
+    margin: 0 1rem;
+    border-radius: 5px;
+    text-decoration: none;
+}
 
-    .structure-list {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        justify-content: space-evenly;
-        color: white;
-		row-gap: 40px;
-		column-gap: 2%;
-    }
+.structure-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+    color: white;
+	row-gap: 40px;
+	column-gap: 2%;
+}
 
-    .structure-card div {
-        margin-top: auto;
-        margin-bottom: auto;
-        margin-left: 2rem;
-    }
+.structure-card div {
+    margin-top: auto;
+    margin-bottom: auto;
+    margin-left: 2rem;
+}
 </style>
 <script define:vars={{ modalSet, lang }}>
 	const modalResources = document.getElementById("structure-modal-req-resources");
diff --git a/tsconfig.json b/tsconfig.json
index 33a3d42..0d598dc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,5 +4,11 @@
     "verbatimModuleSyntax": false,
     "module": "ES2022",
     "moduleResolution": "node"
-  }
+  },
+  "include": [
+    "src/env.d.ts",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.astro"
+  ]
 }
\ No newline at end of file