diff --git a/public/artefact.png b/public/artefact.png index f64abca..2245f84 100644 Binary files a/public/artefact.png and b/public/artefact.png differ diff --git a/public/observe.png b/public/observe.png new file mode 100644 index 0000000..1e34bf5 Binary files /dev/null and b/public/observe.png differ diff --git a/src/app/contact-us/page.tsx b/src/app/contact-us/page.tsx index b8688b2..68e9abd 100644 --- a/src/app/contact-us/page.tsx +++ b/src/app/contact-us/page.tsx @@ -98,7 +98,7 @@ const ContactUs = () => { }; return ( -
+
{/* Lava Flood Overlay */} {lavaActive && (
@@ -106,7 +106,7 @@ const ContactUs = () => { src="/lava.jpg" alt="Lava flood" draggable={false} - className="w-full h-full object-cover opacity-80 pointer-events-none" + className="w-full min-h-screen object-cover opacity-80 pointer-events-none" />
)} @@ -117,7 +117,7 @@ const ContactUs = () => { src="/pulsatingMap.jpg" alt="Pulsating Map" draggable={false} - className="w-full h-full object-cover opacity-80 pointer-events-none" + className="w-full min-h-screen object-cover opacity-80 pointer-events-none" />
)} @@ -153,7 +153,7 @@ const ContactUs = () => { src="/tsunamiWaves.jpg" /> {/* Overlay for readability */} -
+
{/* Container */}
{/* Header */} diff --git a/src/app/earthquakes/page.tsx b/src/app/earthquakes/page.tsx index e25174d..ec92374 100644 --- a/src/app/earthquakes/page.tsx +++ b/src/app/earthquakes/page.tsx @@ -127,7 +127,7 @@ export default function Earthquakes() { .map( (x: Earthquake): GeologicalEvent => ({ id: x.code, - title: `Earthquake in ${x.code.split("-")[2]}`, + title: `Earthquake in ${x.location || (x.code && x.code.split("-")[2])}`, magnitude: x.magnitude, longitude: x.longitude, latitude: x.latitude, diff --git a/src/app/our-mission/page.tsx b/src/app/our-mission/page.tsx index 3116340..3b35e4b 100644 --- a/src/app/our-mission/page.tsx +++ b/src/app/our-mission/page.tsx @@ -1,20 +1,21 @@ "use client"; import Image from "next/image"; +import BottomFooter from "@components/BottomFooter"; function OurMission() { return (
{/* Overlay for Readability */} -
+ {/*
*/} {/* Centered content */} -
+
{/* Title & Mission Statement */}
-

Our Mission

-

Earthquake awareness accessible for everyone

+

Our Mission

+

Earthquake awareness accessible for everyone

{/* Content Area */}
@@ -23,6 +24,15 @@ function OurMission() { and why earthquakes occur to enable better preparation and recovery. Education, cutting-edge research, and innovative technology combine together.

+
+ Tremor Tracker Logo +

We combine scientific insights with public awareness, delivering resources, tools, and real-time updates to enhance preparedness for earthquakes in order to save lives, improve recovery efficiency, and build resilience against seismic @@ -53,6 +63,7 @@ function OurMission() {

+
); } diff --git a/src/app/page.tsx b/src/app/page.tsx index a114388..12abff7 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -69,14 +69,14 @@ export default function Home() { href="/observatories" className="icon-link flex flex-col items-center p-6 rounded-xl transition-colors duration-300" > - Research Icon + Research Icon

Observatories

Find recently active observatories, and newly opened/closed sites

- Technology Icon + Technology Icon

Artefacts

View or purchase recently discovered artefacts from seismic events diff --git a/src/app/the-team/page.tsx b/src/app/the-team/page.tsx index 2422329..f26bddd 100644 --- a/src/app/the-team/page.tsx +++ b/src/app/the-team/page.tsx @@ -1,73 +1,84 @@ "use client"; +import BottomFooter from "@components/BottomFooter"; const teamMembers = [ - { - name: "Tim Howitz", - title: "Chief Crack Inspector", - description: - "Tim is responsible for analysing structures on a day-to-day basis. In his home life he is a keen outdoors enthusiast, with three kids and a dog.", - image: "/Timthescientist.PNG", - }, - { - name: "Emily Neighbour", - title: "Chief Software Engineer", - description: - "Emily focuses on vital earthquake prediction models. In her personal life, her hobbies include knitting, birdwatching, and becoming a mute.", - image: "/Emilythescientist.PNG", - }, - { - name: "Izzy Patterson", - title: "Chief Geologist", - description: - "Izzy's team are responsible for inspecting the rocks that make up our planet. For enjoyment she likes to look at rocks, sometimes she likes to lick them.", - image: "/Izzythescientist.PNG", - }, - { - name: "Lukeshan Thananchayan", - title: "Chief Duster", - description: - "Lukeshan and his team look at the dust particles created by an earthquake and how to minimise their damage. For pleasure, he likes to play Monopoly on repeat. Maybe one day he'll get a hotel!", - image: "/Lukeshanthescientist.PNG", - }, + { + name: "Tim Howitz", + title: "Chief Crack Inspector", + description: + "Tim is responsible for analysing structures on a day-to-day basis. In his home life he is a keen outdoors enthusiast, with three kids and a dog.", + image: "/Timthescientist.PNG", + }, + { + name: "Emily Neighbour", + title: "Chief Software Engineer", + description: + "Emily focuses on vital earthquake prediction models. In her personal life, her hobbies include knitting, birdwatching, and becoming a mute.", + image: "/Emilythescientist.PNG", + }, + { + name: "Izzy Patterson", + title: "Chief Geologist", + description: + "Izzy's team are responsible for inspecting the rocks that make up our planet. For enjoyment she likes to look at rocks, sometimes she likes to lick them.", + image: "/Izzythescientist.PNG", + }, + { + name: "Lukeshan Thananchayan", + title: "Chief Duster", + description: + "Lukeshan and his team look at the dust particles created by an earthquake and how to minimise their damage. For pleasure, he likes to play Monopoly on repeat. Maybe one day he'll get a hotel!", + image: "/Lukeshanthescientist.PNG", + }, ]; + export default function Page() { - return ( -

- {/* Overlay */} -
- {/* Header */} -
-

Meet the Team

-

- Our world-class scientists and engineers drive innovation across the globe. Meet our four department heads: -

-
- {/* Team Members Section */} -
- {teamMembers.map((member, index) => ( -
- {/* Image */} -
-
-
- {member.name} -
-
-
- {/* Text Content */} -
-

{member.name}

-

{member.title}

-

{member.description}

-
-
- ))} -
-
- ); + return ( + <> +
+ {/* Overlay */} +
+ {/* Header */} +
+

Meet the Team

+

+ Our world-class scientists and engineers drive innovation across the globe. Meet our four department heads: +

+
+ {/* Team Members Section */} +
+ {teamMembers.map((member, index) => ( +
+ {/* Image */} +
+
+
+ {member.name} +
+
+
+ {/* Text Content */} +
+

{member.name}

+

{member.title}

+

{member.description}

+
+
+ ))} +
+
+ + {/* Footer goes OUTSIDE the flex/padded container, so it spans full width */} + + + ); }