From 10b7d28293f6524ea30ea4148d5594c2bc736f30 Mon Sep 17 00:00:00 2001
From: Halvor <halvor@Debian-Linux.myguest.virtualbox.org>
Date: Fri, 18 Sep 2026 00:42:10 +0200
Subject: [PATCH 1/5] Added footer to about page

---
 PTG/src/About.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/PTG/src/About.css b/PTG/src/About.css
index dbf579a..36b1b82 100644
--- a/PTG/src/About.css
+++ b/PTG/src/About.css
@@ -3,6 +3,13 @@
     flex-direction: column;
     align-items: center;
     margin: 0 15vw;
+    min-height: calc(89.5vh - 60px);
+}
+
+.footer-pin{
+    position: relative;
+    bottom: 0;
+    left: 0;
 }
 
 p{

From 0bde36a3ce4eb3de5dbb93f36551e4bb8e0ba9cb Mon Sep 17 00:00:00 2001
From: Halvor <halvor@Debian-Linux.myguest.virtualbox.org>
Date: Fri, 18 Sep 2026 00:43:33 +0200
Subject: [PATCH 2/5] Added footer to about page

---
 PTG/src/About.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PTG/src/About.tsx b/PTG/src/About.tsx
index c77756e..6c8a6d0 100644
--- a/PTG/src/About.tsx
+++ b/PTG/src/About.tsx
@@ -1,4 +1,5 @@
 import Header from "./Header.tsx";
+import Footer from "./Footer.tsx";
 import "./About.css";
 
 export default function About(){
@@ -23,6 +24,9 @@ export default function About(){
                     second project.
                 </p>
             </div>
+            <div className="footer-pin">
+                <Footer />
+            </div>
         </>
     );
 }
\ No newline at end of file

From e2c9a8c55c37239ade49aef993ef9ffe3f525c80 Mon Sep 17 00:00:00 2001
From: Halvor <halvor@Debian-Linux.myguest.virtualbox.org>
Date: Fri, 18 Sep 2026 00:44:14 +0200
Subject: [PATCH 3/5] fix: Made footer stick to bottom

---
 PTG/src/App.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/PTG/src/App.css b/PTG/src/App.css
index e69de29..aa05d28 100644
--- a/PTG/src/App.css
+++ b/PTG/src/App.css
@@ -0,0 +1,9 @@
+.content{
+    min-height: calc(100vh - 60px);
+}
+
+.footer-pin{
+    position: relative;
+    bottom: 0;
+    left: 0;
+}
\ No newline at end of file

From 52b19fed196fb8ef58e97931510f2d74c2e65a40 Mon Sep 17 00:00:00 2001
From: Halvor <halvor@Debian-Linux.myguest.virtualbox.org>
Date: Fri, 18 Sep 2026 00:44:35 +0200
Subject: [PATCH 4/5] Added extra divs for App.css file

---
 PTG/src/App.tsx | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/PTG/src/App.tsx b/PTG/src/App.tsx
index 7b160d6..7824600 100644
--- a/PTG/src/App.tsx
+++ b/PTG/src/App.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
 import Header from "./Header.tsx"
 import Footer from "./Footer.tsx"
+import "./App.css"
 import ChoosePokemon from "./ChoosePokemon.tsx";
 import Team from "./Team.tsx";
 import PokemonGrid from "./PokemonGrid.tsx";
@@ -20,25 +21,29 @@ export default function App(){
 
 	return(
 		<div>
-			<Header />
-			<ChoosePokemon
-				selectedGame={selectedGame}
-				selectedType={selectedType}
-				selectedName={selectedName}
-				onGameChange={setSelectedGame}
-				onTypeChange={setSelectedType}
-				onNameChange={setSelectedName}
-			/>
-			<Team
-				team={team}
-				pokemonById={pokemonById}
-				typeMap={typeMap}
-				allFavourited={allFavourited}
-				generateTeam={generateTeam}
-				toggleFavourite={toggleFavourite}
-			/>
-			<PokemonGrid selectedGame={selectedGame} selectedType={selectedType} selectedName={selectedName} />
-			<Footer/>
+			<div className="content">
+				<Header />
+				<ChoosePokemon
+					selectedGame={selectedGame}
+					selectedType={selectedType}
+					selectedName={selectedName}
+					onGameChange={setSelectedGame}
+					onTypeChange={setSelectedType}
+					onNameChange={setSelectedName}
+				/>
+				<Team
+					team={team}
+					pokemonById={pokemonById}
+					typeMap={typeMap}
+					allFavourited={allFavourited}
+					generateTeam={generateTeam}
+					toggleFavourite={toggleFavourite}
+				/>
+				<PokemonGrid selectedGame={selectedGame} selectedType={selectedType} selectedName={selectedName} />
+			</div>
+			<div className="footer-pin">
+				<Footer/>
+			</div>
 		</div>
 
 	);

From 15c9ae48c99d301bafbdef3b34889f16d00ae98b Mon Sep 17 00:00:00 2001
From: Ayse Zeynep Aydin <ayseza@stud.ntnu.no>
Date: Fri, 18 Sep 2026 08:58:45 +0200
Subject: [PATCH 5/5] Text update

Text said footer was in the home page, changed that so it says it is in this page too.
---
 PTG/src/About.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PTG/src/About.tsx b/PTG/src/About.tsx
index 6c8a6d0..f99f398 100644
--- a/PTG/src/About.tsx
+++ b/PTG/src/About.tsx
@@ -19,7 +19,7 @@ export default function About(){
                 <p>
                     This website is made by students, and is made for training reasons,
                     also for lazy people not wanting to pick a team themselves. Contact information
-                    can be found at the footer of the home page. Any feedback will be deeply appreciated,
+                    can be found at the footer of the home page and this page. Any feedback will be deeply appreciated,
                     as it will be used as a tool to sharpen our skills and improve our work in the
                     second project.
                 </p>
@@ -29,4 +29,4 @@ export default function About(){
             </div>
         </>
     );
-}
\ No newline at end of file
+}