Merge branch 'main' of gitpot.org:sangelo/website

This reverts commit 7308de8728.

src/lib/components/Projects.svelte

@@ -1,13 +1,17 @@
 <script lang="ts">
-
 	import { smoothScrollTo, handleKeydown } from '$lib/index';
 
+<<<<<<< HEAD
+=======
+	import { smoothScrollTo, handleKeydown } from '$lib/index';
+
+>>>>>>> 18dbba03a6b12b96e49fa2035d696de633ac3e6f
 	// Modal
 	import Modal from '$lib/components/Modal.svelte';
 	import DashinitModal from '$lib/modals/dashinit.svelte';
 	import SangeFaultModal from '$lib/modals/sangefault.svelte';
 	import ExploreCraftModal from '$lib/modals/explorecraft.svelte';
-	import UtilityClientModal from '$lib/modals/utilityclient.svelte';
+	import StelianNetModal from '$lib/modals/stelian-net.svelte';
 	import SangeloSpaceModal from '$lib/modals/sangelospace.svelte';
 	import LunivityModal from '$lib/modals/lunivity.svelte';
 	import GitpotModal from '$lib/modals/gitpot.svelte';
@@ -24,7 +28,6 @@
 	function handleModalClose() {
 		showModal = false;
 	}
-
 </script>
 
 <div id="projects" class="section">
@@ -77,7 +80,7 @@
 					<button class="button gitpot" on:click={() => openModalWith(GitpotModal)} />
 					<button class="button dashinit" on:click={() => openModalWith(DashinitModal)} />
 					<button class="button explorecraft" on:click={() => openModalWith(ExploreCraftModal)} />
-					<button class="button utility" on:click={() => openModalWith(UtilityClientModal)} />
+					<button class="button stelian" on:click={() => openModalWith(StelianNetModal)} />
 				</div>
 				<div class="thr">
 					<button class="button inactive" />

src/lib/modals/more.svelte

@@ -52,11 +52,11 @@
 						<p class="item-description">Minecraft 1.19.2 Quilt modpack oriented towards exploration. Powered by packwiz!</p>
 					</div>
 				</a>
-				<a class="item" href="https://uc.gamingcraft.de" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://stelian.net" rel="noopener noreferrer" target="_blank" tabindex="0">
-					<div class="thumbnail"><img src="assets/logos/utilityclient.svg" alt="UtilityClient Logo" /></div>
+					<div class="thumbnail"><img src="assets/logos/stelian-net.svg" alt="stelian.net Logo" /></div>
 					<div class="item-details">
-						<h2>UtilityClient</h2>
+						<h2>stelian.net</h2>
-						<p class="item-description">Performance oriented 1.8.9 Minecraft Client. I'm responsible for UI/UX.</p>
+						<p class="item-description">My portfolio/blog website for my non-internet personality.</p>
 					</div>
 				</a>
 				<a class="item" href="https://github.com/SangeloDev/SangeFault" rel="noopener noreferrer" target="_blank" tabindex="0">
@@ -66,6 +66,13 @@
 						<p class="item-description">Open-source Minecraft resourcepack for 1.8.9 </p>
 					</div>
 				</a>
+				<a class="item" href="https://utilityclient.org" rel="noopener noreferrer" target="_blank" tabindex="0">
+					<div class="thumbnail"><img src="assets/logos/utilityclient.svg" alt="UtilityClient Logo" /></div>
+					<div class="item-details">
+						<h2>UtilityClient</h2>
+						<p class="item-description">Performance oriented 1.8.9 Minecraft Client. I'm responsible for UI/UX.</p>
+					</div>
+				</a>
 			</ul>
 
 			<h2 class="modal-title no-select"><IconArchive /> Archive</h2>

src/lib/modals/stelian-net.svelte

@@ -0,0 +1,34 @@
+<script>
+	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
+	let projectLogo = 'assets/logos/stelian-net.svg';
+	let projectReadme = '/assets/markdown/stelian-net.md';
+	let projectSite = 'https://stelian.net';
+</script>
+
+<content>
+	<div class="parent">
+		<div class="gallery">
+			<img src={projectLogo} class="project-logo" alt="Project Logo" />
+		</div>
+		<div class="content">
+			<zero-md src={projectReadme}>
+				<template>
+					<link rel="stylesheet" href="/assets/style/markdown.css" />
+				</template>
+			</zero-md>
+		</div>
+	</div>
+	<div class="button-container">
+		<a class="button" target="_blank" rel="noopener noreferrer" href={projectSite} tabindex="-1"
+			><button>
+				<IconOpenInNew size="1.2em" />
+				<p>Visit Project</p>
+			</button>
+		</a>
+	</div>
+</content>
+
+<style lang="scss">
+	@import '$styles/modal.scss';
+	@import '$styles/mobile/modal.scss';
+</style>

src/lib/modals/utilityclient.svelte

@@ -1,42 +0,0 @@
-<script>
-	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
-    let projectLogo = "assets/logos/utilityclient.svg";
-    let projectReadme = "https://raw.githubusercontent.com/Utility-Client/UtilityClient/development/README.md";
-    let projectSite = "https://uc.gamingcraft.de";
-</script>
-
-<content>
-	<div class="parent">
-        <div class="gallery">
-            <img src="{projectLogo}" class="project-logo" alt="Project Logo" />
-		</div>
-		<div class="content">
-			<zero-md src="{projectReadme}">
-				<template>
-                    <link
-                        rel="stylesheet"
-                        href="/assets/style/markdown.css"
-                    />
-				</template>
-			</zero-md>
-		</div>
-	</div>
-	<div class="button-container">
-		<a
-			class="button"
-			target="_blank"
-			rel="noopener noreferrer"
-			href="{projectSite}"
-			tabindex="-1"
-			><button>
-				<IconOpenInNew size="1.2em" />
-				<p>Visit Project</p>
-			</button>
-		</a>
-	</div>
-</content>
-
-<style lang="scss">
-	@import '$styles/modal.scss';
-	@import '$styles/mobile/modal.scss';
-</style>

src/styles/projects.scss

@@ -107,11 +107,14 @@
 			}
 
 			.gitpot {
-				background: url('/assets/icons/gitpot.svg') no-repeat center / 4.5em, radial-gradient(103.52% 103.52% at 34.04% 26.17%, #fa7042 24.28%, #d23652 120%) no-repeat center;
+				background:
+					url('/assets/icons/gitpot.svg') no-repeat center / 4.5em,
+					radial-gradient(103.52% 103.52% at 34.04% 26.17%, #fa7042 24.28%, #d23652 120%) no-repeat
+						center;
 			}
 
-			.utility {
+			.stelian {
-				background-image: url('/assets/logos/utilityclient.svg');
+				background-image: url('/assets/logos/stelian-net.svg');
 			}
 
 			.explorecraft {

static/assets/debug.json

@@ -1,5 +1,4 @@
 {
-    "__comment__": "Do not edit file directly, this will be populated by the build script.",
     "commit": "unavailable",
     "tag": "unavailable"
 }

static/assets/logos/stelian-net.svg

@@ -0,0 +1,11 @@
+<svg width="2000" height="2000" viewBox="0 0 2000 2000" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="2000" height="2000" fill="url(#paint0_linear_1002_2)"/>
+<path d="M1196.35 577.992C1260.95 543.059 1262.9 452.843 1190.5 440.513C1133.96 430.884 1076.07 432.487 1020.15 445.228C964.228 457.97 911.364 481.602 864.575 514.774C817.786 547.946 777.988 590.009 747.455 638.562C716.922 687.114 696.25 741.207 686.622 797.748C676.993 854.289 678.595 912.173 691.337 968.095C704.079 1024.02 727.71 1076.88 760.883 1123.67C803.36 1183.59 883.828 1142.75 887.327 1069.39C892.674 957.276 906.984 821.068 944.02 762.175C981.056 703.281 1097.62 631.378 1196.35 577.992Z" fill="#121316"/>
+<path d="M754.942 1371.04C690.337 1405.97 688.39 1496.19 760.793 1508.52C817.334 1518.15 875.218 1516.55 931.141 1503.8C987.063 1491.06 1039.93 1467.43 1086.72 1434.26C1133.51 1401.09 1173.3 1359.02 1203.84 1310.47C1234.37 1261.92 1255.04 1207.83 1264.67 1151.28C1274.3 1094.74 1272.7 1036.86 1259.95 980.936C1247.21 925.014 1223.58 872.149 1190.41 825.36C1147.93 765.445 1067.46 806.283 1063.96 879.644C1058.62 991.755 1044.31 1127.96 1007.27 1186.86C970.235 1245.75 853.671 1317.65 754.942 1371.04Z" fill="#121316"/>
+<defs>
+<linearGradient id="paint0_linear_1002_2" x1="1213.5" y1="496" x2="562.5" y2="1725.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#00C4FB"/>
+<stop offset="1" stop-color="#0075F7"/>
+</linearGradient>
+</defs>
+</svg>

static/assets/markdown/stelian-net.md

@@ -0,0 +1,6 @@
+# stelian.net
+
+This is a website I've been working on for a few months in 2024.\
+It should act as my digital corner on the internet where I'll write about many things regarding techology, gaming, and more.
+
+Go check it out, it has a lot more to explore if you're interested :D