From d257749a9d316123b26b7c26b6c166cbf6d0a098 Mon Sep 17 00:00:00 2001
From: Akis <mavrommatisakis@gmail.com>
Date: Thu, 4 Aug 2022 17:30:24 +0300
Subject: [PATCH] lots of unfinished changes

---
 README.md                                  | 13 ++---
 shell.nix                                  | 13 -----
 src/lib/Nav.svelte                         | 61 ++++++++++------------
 src/lib/{Members.json => Team.json}        |  0
 src/lib/app.css                            |  9 ++--
 src/routes/contact.md                      |  4 +-
 src/routes/index.svelte                    |  2 +-
 src/routes/{members.svelte => team.svelte} | 20 +++----
 8 files changed, 48 insertions(+), 74 deletions(-)
 delete mode 100644 shell.nix
 rename src/lib/{Members.json => Team.json} (100%)
 rename src/routes/{members.svelte => team.svelte} (88%)

diff --git a/README.md b/README.md
index 6acea2a..29705af 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Project Segfault Website
+# Project Segfault website
 
 Live at [projectsegfau.lt](https://projectsegfau.lt).
 
@@ -10,17 +10,10 @@ Live at [projectsegfau.lt](https://projectsegfau.lt).
 -   Install [pnpm](https://pnpm.io/) (optional, although strongly recommended).
 -   Learn [Svelte](https://svelte.dev).
 
-### Universal
+### Running a dev server.
 
 1. Clone the repository using `git clone https://github.com/ProjectSegfault/website`.
 2. Change directory into the clone using `cd ./website`.
 3. Install dependencies using `pnpm i` (recommended) or `npm i`.
 4. Run the dev server using `pnpm dev` (recommended) or `npm run dev`.
-5. Open a browser on `http://localhost:5173/` and you should see the website running locally!
-
-### NixOS
-
-1. Clone the repository using `git clone https://github.com/ProjectSegfault/website`.
-2. Change directory into the clone using `cd ./website`.
-3. In the same terminal type `nix-shell`.
-4. Open a browser on `http://localhost:5173/` and you should see the website running locally!
+5. Open a browser on `http://localhost:5173/` and you should see the website running locally!
\ No newline at end of file
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index f740852..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs ? import <nixpkgs> {}
-}:
-pkgs.mkShell {
-    name="dev";
-    buildInputs = [
-        pkgs.nodejs-16_x
-    ];
-    shellHook = ''
-        echo "Installing dependencies using npm, please wait."
-        npm i
-        echo "You can now "run npm run dev" to start a dev server."
-    '';
-}
\ No newline at end of file
diff --git a/src/lib/Nav.svelte b/src/lib/Nav.svelte
index 3c7edb9..a80a3a9 100644
--- a/src/lib/Nav.svelte
+++ b/src/lib/Nav.svelte
@@ -5,13 +5,7 @@
 <nav>
 	<a class="brand" href="/">
 		<img src="/logo.png" alt="Project Segfault logo" />
-		<span
-			style="color: var(--accent-secondary); margin-left: 4px; margin-right: 4px;"
-			>Project</span
-		>
-		<span style="color: var(--accent-primary); margin-right: 8px;"
-			>Segfault</span
-		>
+		<span>Project Segfault</span>
 	</a>
 
 	<input type="checkbox" id="toggle-menu" />
@@ -22,13 +16,13 @@
 	</label>
 
 	<div class="links">
-		<a href="https://instances.projectsegfau.lt/">Instances & Gameservers</a
+		<a href="https://instances.projectsegfau.lt/">Hosted services</a
 		>
 		<a href="/minecraft">Minecraft</a>
 		<a href="/donate">Donate</a>
 		<a href="/faq">FAQ</a>
-		<a href="/contact">Contact</a>
-		<a href="/members">Members</a>
+		<a href="/contact">Contact us</a>
+		<a href="/members">Our team</a>
 		<a href="https://blog.projectsegfau.lt/">Blog</a>
 		<a href="/legal">Legal</a>
 	</div>
@@ -36,9 +30,10 @@
 
 <style>
 	nav {
-		background-color: var(--secondary);
-		padding: 1rem;
+		background-color: var(--primary);
+		border-bottom: 1px solid var(--grey);
 		display: flex;
+		padding: .5rem;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
@@ -47,6 +42,13 @@
 		display: flex;
 		align-items: center;
 		text-decoration: none;
+		color: var(--text);
+		gap: 8px;
+		transition: opacity .25s;
+	}
+
+	a.brand:hover {
+		opacity: .6;
 	}
 
 	.links {
@@ -55,32 +57,22 @@
 	}
 
 	.links > * {
-		background-color: var(--tertiary);
-		border: none;
-		border-radius: 10px;
-		padding: 1rem;
+		padding: .5rem;
 		cursor: pointer;
 		color: var(--text);
-		font-family: var(--font-primary);
 		text-decoration: none;
+		transition: color .25s;
+		font-size: 13px;
+		font-weight: 500;
 	}
 
 	.links > *:hover {
-		background-color: var(--accent-tertiary);
 		text-decoration: none;
-		transition: all 0.5s;
-		color: var(--secondary);
-	}
-
-	.links > *:active {
-		background-color: var(--accent-primary);
-		text-decoration: none;
-		transition: all 0.5s;
-		color: var(--secondary);
+		color: var(--accent-primary);
 	}
 
 	img {
-		height: 36px;
+		height: 30px;
 		border-radius: 50%;
 	}
 
@@ -97,8 +89,7 @@
 		.links {
 			display: none;
 			width: 100%;
-			background-color: var(--secondary);
-			padding-top: 2rem;
+			padding-top: 12px;
 		}
 
 		nav {
@@ -112,15 +103,17 @@
 		}
 
 		.menu-icon {
-			display: block;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 			z-index: 1;
 			position: absolute;
-			top: 0.45rem;
 			right: 1rem;
-			background-color: var(--tertiary);
+			top: .35rem;
 			border: none;
 			border-radius: 10px;
-			padding: 1rem;
+			height: 30px;
+			width: 30px;
 			cursor: pointer;
 			line-height: 1;
 		}
diff --git a/src/lib/Members.json b/src/lib/Team.json
similarity index 100%
rename from src/lib/Members.json
rename to src/lib/Team.json
diff --git a/src/lib/app.css b/src/lib/app.css
index 08faddf..7e59e93 100644
--- a/src/lib/app.css
+++ b/src/lib/app.css
@@ -14,10 +14,11 @@ html {
 	--primary: #151515;
 	--secondary: #252525;
 	--tertiary: #353535;
-	--accent-primary: #cfce73;
-	--accent-secondary: #9c6fd6;
-	--accent-tertiary: #fcc348;
-	--text: #fff;
+	--accent-primary: #00d4aa;
+	--accent-secondary: #00d4aa;
+	--accent-tertiary: #00d4aa;
+	--text: #ffffffde;
+	--grey: #5454547a;
 	--font-primary: Comfortaa;
 	--font-header: Inter
 
diff --git a/src/routes/contact.md b/src/routes/contact.md
index 1b03f86..e34bafd 100644
--- a/src/routes/contact.md
+++ b/src/routes/contact.md
@@ -1,5 +1,5 @@
 ---
-title: Contact Us
+title: Contact us
 description: Do you want to contact us?
 ---
 
@@ -23,4 +23,4 @@ _Please be aware that Microsoft often blocks non-popular emails, if you do conta
 
 ## People
 
-You can find ways to contact individual members [on our Members page](/members).
+You can find ways to contact individual team members [on our team page](/team).
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 26e6a28..7b95817 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -18,7 +18,7 @@
 <h2>What is this?</h2>
 
 <p>
-    We are 7 teenagers who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!
+    We are 7 humans who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!
 </p>
 
 <h2>Tell me more! What do you guys host? Where can I contact you? Can you fix my daughter's iPad?</h2>
diff --git a/src/routes/members.svelte b/src/routes/team.svelte
similarity index 88%
rename from src/routes/members.svelte
rename to src/routes/team.svelte
index e5a4923..adb2646 100644
--- a/src/routes/members.svelte
+++ b/src/routes/team.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import members from "$lib/Members.json";
+	import members from "$lib/Team.json";
 	import IconDiscord from "~icons/simple-icons/discord";
 	import IconMatrix from "~icons/simple-icons/matrix";
 	import IconGitHub from "~icons/simple-icons/github";
@@ -10,16 +10,16 @@
 </script>
 
 <svelte:head>
-	<title>Members | Project Segfault</title>
-	<meta name="description" content="Members of Project Segfault." />
+	<title>Our team | Project Segfault</title>
+	<meta name="description" content="Team members of Project Segfault." />
 </svelte:head>
 
-<div class="members">
-	<h1>Members</h1>
-	<p>Our excellent members!</p>
-	<div class="member-outer">
+<div class="team">
+	<h1>Our team</h1>
+	<p>Our excellent team members!</p>
+	<div class="team-outer">
 		{#each members as { name, discord, matrix, position, description, github, website, email, picture }}
-			<div class="member-inner">
+			<div class="team-inner">
 				<div class="main">
 					<span>{name} - {position}</span>
 
@@ -63,14 +63,14 @@
 </div>
 
 <style>
-	.member-outer {
+	.team-outer {
 		display: flex;
 		flex-direction: column;
 		gap: 2rem;
 		flex-flow: row wrap;
 	}
 
-	.member-inner {
+	.team-inner {
 		background-color: #252525;
 		border-radius: 10px;
 		padding: 1rem;