Merge branch 'main' of github.com:ProjectSegfault/website

src/routes/+page.svelte

@@ -27,15 +27,10 @@
 >
 	<div class="buttons">
 		<LinkButton
-			url="/services"
-			title="Explore our services"
+			url="/instances"
+			title="Explore our instances"
 			icon="i-fa6-solid:bell-concierge"
 		/>
-		<LinkButton
-			url="/projects"
-			title="Explore our projects"
-			icon="i-fa6-solid:tractor"
-		/>
 		<LinkButton
 			url="/donate"
 			icon="i-fa6-solid:money-bill"
@@ -68,9 +63,11 @@
 					<h1>{announcements.title}</h1>
 				</div>
 
-				<div class="read-more">
-					<a href={announcements.link}>Read more...</a>
-				</div>
+				{#if announcements.link}
+					<div class="read-more">
+						<a href={announcements.link}>Read more...</a>
+					</div>
+				{/if}
 			</div>
 		</div>
 	{:catch}

src/routes/contact/+page.md

@@ -1,6 +1,6 @@
 ---
 title: Contact us
-description: Do you want to contact us?
+description: Do you want to contact us? (you don't)
 ---
 
 <script lang="ts">

src/routes/instances/+page.svelte

@@ -1,8 +1,8 @@
 <script>
 	import { CardInner, CardOuter, LinksOuter, Link } from "$lib/Card";
-	import services from "$lib/Services.json";
+	import instances from "$lib/Instances.json";
 
-	let groups = services.reduce((curr, val) => {
+	let groups = instances.reduce((curr, val) => {
 		let group = curr.find((g) => g.category === `${val.category}`);
 		if (group) {
 			group.values.push(val);
@@ -14,11 +14,11 @@
 </script>
 
 <svelte:head>
-	<title>Our services | Project Segfault</title>
-	<meta name="description" content="Our collection of services." />
+	<title>Our instances | Project Segfault</title>
+	<meta name="description" content="Our collection of instances." />
 </svelte:head>
 
-<h1>Our services</h1>
+<h1>Our instances</h1>
 <CardOuter>
 	<div class="wrapper">
 		{#each groups as group}

src/routes/projects/+page.svelte

@@ -1,36 +0,0 @@
-<script lang="ts">
-	import { CardInner, CardOuter, Link, LinksOuter } from "$lib/Card";
-	import projects from "$lib/Projects.json";
-</script>
-
-<svelte:head>
-	<title>Our projects | Project Segfault</title>
-	<meta name="description" content="Our collection of projects." />
-</svelte:head>
-
-<h1>Our projects</h1>
-<CardOuter>
-	{#each projects as { name, description, git, github, website }}
-		<CardInner title={name} {description}>
-			<LinksOuter>
-				{#if website}
-					<Link url={website} class="web">
-						<div class="i-fa6-solid:globe" />
-					</Link>
-				{/if}
-
-				{#if github}
-					<Link url={github} class="githubcolored">
-						<div class="i-simple-icons:github" />
-					</Link>
-				{/if}
-
-				{#if git}
-					<Link url={git} class="gitcolored">
-						<div class="i-simple-icons:git" />
-					</Link>
-				{/if}
-			</LinksOuter>
-		</CardInner>
-	{/each}
-</CardOuter>

src/routes/team/+page.svelte

@@ -10,7 +10,7 @@
 
 <h1>Our team</h1>
 <CardOuter>
-	{#each members as { name, discord, matrix, position, description, git, pgp, website, email, picture }}
+	{#each members as { name, discord, matrix, position, description, github, git, pgp, website, email, picture }}
 		<CardInner title={name} {position} {description}>
 			<LinksOuter>
 				{#if matrix}
@@ -25,6 +25,12 @@
 					</Link>
 				{/if}
 
+				{#if github}
+					<Link url={github} class="githubcolored">
+						<div class="i-simple-icons:github" />
+					</Link>
+				{/if}
+
 				{#if git}
 					<Link url={git} class="gitcolored">
 						<div class="i-simple-icons:git" />

src/routes/timeline/+page.svelte

@@ -184,7 +184,7 @@
 	</TimelineItem>
 	<TimelineItem>
 		<TimelineOppositeContent slot="opposite-content">
-			<p>Now</p>
+			<p>July 2022</p>
 		</TimelineOppositeContent>
 		<TimelineSeparator>
 			<TimelineDot style={"background-color: #fff; "} />
@@ -205,7 +205,7 @@
 	</TimelineItem>
 	<TimelineItem>
 		<TimelineOppositeContent slot="opposite-content">
-			<p>Now-er</p>
+			<p>August 2022</p>
 		</TimelineOppositeContent>
 		<TimelineSeparator>
 			<TimelineDot style={"background-color: #fff; "} />
@@ -223,6 +223,23 @@
 			</p>
 		</TimelineContent>
 	</TimelineItem>
+	<TimelineItem>
+		<TimelineOppositeContent slot="opposite-content">
+			<p>September 2022</p>
+		</TimelineOppositeContent>
+		<TimelineSeparator>
+			<TimelineDot style={"background-color: #fff; "} />
+			<TimelineConnector />
+		</TimelineSeparator>
+		<TimelineContent>
+			<h3>
+				Resignation of members and the start of a new era.
+			</h3>
+			<p>
+				Devnol, Odyssey and akisblack resigned from the team leading to a serious loss of manpower. To combat this, we decided to shut down some of our unused instances as well as the ones that were painful to deal with. You can read more over at <a href="https://blog.projectsegfau.lt/resignation-of-3-members-of-projectsegfault/">this blog post</a>.
+			</p>
+		</TimelineContent>
+	</TimelineItem>
 </Timeline>
 
 <style>