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

src/lib/Form/TextArea.svelte

@@ -13,3 +13,9 @@
 	class="form-textbox"
 	{placeholder}
 />
+
+<style>
+	textarea {
+		resize: vertical;
+	}
+</style>

src/lib/Instances.json

@@ -4,7 +4,7 @@
 		"description": "A frontend for YouTube.",
 		"website": "https://invidious.projectsegfau.lt/",
 		"icon": "https://github.com/iv-org/invidious/raw/master/assets/invidious-colored-vector.svg",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://invidious.io/"
 	},
 	{
@@ -12,7 +12,7 @@
 		"description": "A frontend for Odysee.",
 		"website": "https://lbry.projectsegfau.lt/",
 		"icon": "https://codeberg.org/avatars/dd785d92b4d4df06d448db075cd29274",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://codeberg.org/librarian/librarian"
 	},
 	{
@@ -20,7 +20,7 @@
 		"description": "A frontend for Reddit.",
 		"website": "https://libreddit.projectsegfau.lt/",
 		"icon": "https://github.com/spikecodes/libreddit/raw/master/static/logo.png",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://github.com/spikecodes/libreddit"
 	},
 	{
@@ -28,7 +28,7 @@
 		"description": "A frontend for Twitter.",
 		"website": "https://nitter.projectsegfau.lt/",
 		"icon": "https://github.com/zedeus/nitter/raw/master/public/logo.png",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://github.com/zedeus/nitter"
 	},
 	{
@@ -36,7 +36,7 @@
 		"description": "An open source and decentralized chat application.",
 		"website": "https://chat.projectsegfau.lt/",
 		"icon": "https://element.io/images/logo-mark-primary.svg",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://element.io/"
 	},
 	{
@@ -44,7 +44,7 @@
 		"description": "Another frontend for YouTube.",
 		"website": "https://piped.projectsegfau.lt/",
 		"icon": "https://github.com/TeamPiped/Piped/raw/master/public/img/icons/logo.svg",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://github.com/TeamPiped/Piped"
 	},
 	{
@@ -52,7 +52,7 @@
 		"description": "A private meta-search engine.",
 		"website": "https://search.projectsegfau.lt/search",
 		"icon": "https://docs.searxng.org/_static/searxng-wordmark.svg",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://searxng.org/"
 	},
 	{
@@ -60,7 +60,7 @@
 		"description": "A web interface for Git, alternative to GitHub.",
 		"website": "https://git.projectsegfau.lt",
 		"icon": "https://gitea.io/images/gitea.png",
-		"category": "Instances",
+		"category": "General",
 		"projectWebsite": "https://gitea.io/"
 	},
 	{

src/lib/Nav.svelte

@@ -5,8 +5,7 @@
 	$: currentPage = $page.url.pathname;
 
 	const menus = [
-		{ name: "Services", url: "/services" },
+		{ name: "Instances", url: "/instances" },
-		{ name: "Projects", url: "/projects" },
 		{ name: "Donate", url: "/donate" },
 		{ name: "FAQ", url: "/faq" },
 		{ name: "Contact us", url: "/contact" },
@@ -39,14 +38,17 @@
 				href={url}>{name}</a
 			>
 		{/each}
-		<a href="https://matrix.to/#/#project-segfault:projectsegfau.lt/">
+		<a href="https://matrix.to/#/#project-segfault:projectsegfau.lt/" class="icon">
 			<div class="i-simple-icons:matrix" />
+			<span>Matrix</span>
 		</a>
-		<a href="https://github.com/ProjectSegfault/">
+		<a href="https://github.com/ProjectSegfault/" class="icon">
 			<div class="i-simple-icons:github" />
+			<span>GitHub</span>
 		</a>
-		<div class="theme-toggle">
+		<div class="theme-toggle icon">
 			<ThemeToggle />
+			<span>Toggle theme</span>
 		</div>
 	</div>
 </nav>
@@ -122,7 +124,11 @@
 		display: none;
 	}
 
-	@media screen and (max-width: 1058px) {
+	.icon > span {
+		display: none;
+	}
+
+	@media screen and (max-width: 900px) {
 		.links {
 			display: none;
 			width: 100%;
@@ -166,5 +172,16 @@
 			flex-direction: column;
 			gap: 1rem;
 		}
+
+		.icon > span {
+			display: block;
+		}
+
+		.icon {
+			display: flex !important;
+			align-items: center;
+			flex-direction: row;
+			gap: 0.5rem;
+		}
 	}
 </style>

src/lib/Projects.json

@@ -1,14 +0,0 @@
-[
-	{
-		"name": "Website",
-		"description": "Our website written in SvelteKit.",
-		"github": "https://github.com/ProjectSegfault/website/",
-		"website": "https://projectsegfau.lt/"
-	},
-	{
-		"name": "Segfautils",
-		"description": "Web utilities (APIs) for Project Segfault, but you could probably use them too.",
-		"github": "https://github.com/ProjectSegfault/segfautils/",
-		"website": "https://segfautils.projectsegfau.lt/"
-	}
-]

src/lib/Team.json

@@ -2,7 +2,7 @@
 	{
 		"name": "Midou",
 		"matrix": "https://matrix.to/#/@midou:projectsegfau.lt/",
-		"position": "System administrator",
+		"position": "Sysadmin",
 		"description": "I don't need to describe myself.",
 		"git": "https://github.com/Midou36O/",
 		"website": "https://miicord.com/",
@@ -19,7 +19,7 @@
 	{
 		"name": "openssl_rand",
 		"matrix": "https://matrix.to/#/@openssl_rand:projectsegfau.lt/",
-		"position": "System administrator",
+		"position": "Sysadmin",
 		"description": "\"I am openssl_rand, a system administrator of the project Segfau.lt.\" - GitHub Copilot",
 		"email": "mailto:openssl_rand@projectsegfau.lt"
 	},
@@ -29,12 +29,5 @@
 		"position": "Backup host",
 		"description": "I am Stephenvk and I host a server that takes our backups.",
 		"website": "https://stephenvk.xyz"
-	},
-	{
-		"name": "Segfault",
-		"position": "Support for cats",
-		"description": "meow meow meow mrrp",
-		"email": "mailto:cat-support@projectsegfau.lt",
-		"picture": "https://projectsegfau.lt:8448/_matrix/media/r0/download/projectsegfau.lt/tRNGfetEFQhDchqzhfBbxtUi"
 	}
 ]

src/routes/+page.svelte

@@ -27,15 +27,10 @@
 >
 	<div class="buttons">
 		<LinkButton
-			url="/services"
+			url="/instances"
-			title="Explore our services"
+			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">
+				{#if announcements.link}
-					<a href={announcements.link}>Read more...</a>
+					<div class="read-more">
-				</div>
+						<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>
+	<title>Our instances | Project Segfault</title>
-	<meta name="description" content="Our collection of services." />
+	<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>