[c] remove merge conflict überbleibsel

This reverts commit 7308de8728.

.eslintignore

@@ -7,7 +7,8 @@ node_modules
 .env.*
 !.env.example
 
-# Ignore files for PNPM, NPM and YARN
+# Ignore files for PNPM, NPM, YARN and BUN
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+bun.lockb

.forgejo/workflows/build.yml

@@ -0,0 +1,58 @@
+name: Build and push docker image
+
+# start workflow every time a tag/release is created
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+    defaults:
+      run:
+        working-directory: /tmp
+
+    # build the docker container
+    steps:
+      - name: ✨ Installing just command runner
+        run: |
+          # download and extract just to /bin/just
+          curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /bin
+          just --help || echo "Error: 'just' wasn't found. Maybe the download failed?"
+
+      - name: ⬇️ Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: ⚙️ Update website debug info
+        run: |
+          export TAG=$(echo "${{ github.ref }}" | sed 's/refs\/tags\///')
+          export SHA=$(echo "${{ github.sha }}")
+          echo 'sed -i "s|\"commit\": \"unavailable\"|\"commit\": \"$SHA\"|" /workspace/sangelo/website/static/assets/debug.json'
+          sed -i "s|\"commit\": \"unavailable\"|\"commit\": \"$SHA\"|" /workspace/sangelo/website/static/assets/debug.json || echo "Failed to plant debug info into debug.json. (commit hash)"
+          echo 'sed -i "s|\"tag\": \"unavailable\"|\"tag\": \"$TAG\"|" /workspace/sangelo/website/static/assets/debug.json'
+          sed -i "s|\"tag\": \"unavailable\"|\"tag\": \"$TAG\"|" /workspace/sangelo/website/static/assets/debug.json || echo "Failed to plant debug info into debug.json. (git tag)"
+          echo "Successfully planted debug info into debug.json"
+
+      - name: 🐋 Build Container
+        run: |
+          # extract tag name without the prefix
+          export TAG=$(echo "${{ github.ref }}" | sed 's/refs\/tags\///')
+          # build the container
+          just -f /workspace/sangelo/website/Justfile build "${TAG}"
+
+      - name: 🐳 Publish Container
+        run: |
+          export TAG=$(echo "${{ github.ref }}" | sed 's/refs\/tags\///')
+          echo "${{ secrets.PUBLISH_TOKEN }}" | docker login gitpot.org -u sangelo --password-stdin
+          docker push "gitpot.org/sangelo/website:${TAG}"
+
+          # publish tag latest as well
+          if echo "${{ github.ref }}" | grep -q "refs/tags/"; then
+            docker tag "gitpot.org/sangelo/website:${TAG}" "gitpot.org/sangelo/website:latest"
+            docker push "gitpot.org/sangelo/website:latest"
+          fi

.prettierignore

@@ -7,7 +7,8 @@ node_modules
 .env.*
 !.env.example
 
-# Ignore files for PNPM, NPM and YARN
+# Ignore files for PNPM, NPM, YARN and BUN
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+bun.lockb

Caddyfile

@@ -0,0 +1,26 @@
+:80 {
+	root * /app
+	try_files {path}.html {path}
+	file_server
+	handle_errors {
+		# handle 4xx errors
+		@4xx expression `{err.status_code} >= 400 && {err.status_code} < 500`
+		handle @4xx {
+			rewrite * /internal/error/400.html
+			templates
+			file_server
+		}
+
+		# handle 5xx errors
+		@5xx expression `{err.status_code} >= 500 && {err.status_code} < 600`
+		handle @5xx {
+			rewrite * /internal/error/500.html
+			templates
+			file_server
+		}
+	}
+}
+
+:8080 {
+	respond /health "OK" 200
+}

Dockerfile

@@ -0,0 +1,47 @@
+# Builder stage
+FROM node:20-alpine AS builder
+
+# Set the working directory in the container
+WORKDIR /git
+
+# Copy the repository contents into the container
+COPY . .
+
+# Install dependencies and build the site. Output directory will be /git/build
+RUN yarn install && yarn run build
+
+# Final stage
+FROM caddy:2-alpine
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the build directory from the builder stage to /app
+COPY --from=builder /git/build /app
+
+# Create a dedicated user 'web' and change ownership of /app to 'web'
+RUN addgroup -S web && adduser -S web -G web && chown -R web:web /app
+
+# Caddyfile configuration to serve files from /app
+COPY --from=builder /git/Caddyfile /etc/caddy/Caddyfile
+
+# Expose port 80
+EXPOSE 80
+
+# Switch to the 'web' user
+USER web
+
+# Start Caddy with the specified Caddyfile as the 'web' user
+CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
+
+# Docker Container Labels
+LABEL org.opencontainers.image.title="Sangelo's Space"
+LABEL org.opencontainers.image.description="Sangelo's Space website, packaged as a docker container, with the Caddy webserver."
+LABEL org.opencontainers.image.url="https://sangelo.space"
+LABEL org.opencontainers.image.documentation="https://gitpot.org/sangelo/website"
+LABEL org.opencontainers.image.vendor="Sangelo"
+LABEL org.opencontainers.image.licenses="GPL-v3"
+LABEL org.opencontainers.image.source="https://gitpot.org/sangelo/website"
+
+# Remove intermediate images after build
+ONBUILD RUN rm -rf /git

Justfile

@@ -0,0 +1,89 @@
+# settings
+set dotenv-load
+
+# defaults
+default_runner := 'docker'
+default_tag := 'latest'
+default_image := 'gitpot.org/sangelo/website:latest'
+
+# run development server by default
+default: dev
+
+# aliases
+alias c := clean
+alias b := build
+alias r := run
+alias d := dev
+alias p := preview
+
+# building
+
+# run all docker related recipes (clean, build, run) (default runner: docker)
+all tag=default_tag runner=default_runner:
+    just -f {{justfile()}} clean {{runner}} {{tag}}
+    just -f {{justfile()}} build {{tag}} {{runner}}
+    just -f {{justfile()}} run {{tag}} {{runner}}
+
+# clean containers, images and temporary svelte dirs with specified runner (default runner: docker)
+clean runner=default_runner tag=default_tag:
+    @echo "Cleaning dev environment..."
+    rm -rf build/ .svelte-kit/
+    @echo "Cleaning containers with '{{runner}}'..."
+    TAG="{{tag}}" {{runner}} compose -f docker-compose.build.yml down
+    @echo "Cleaning images with '{{runner}}'..."
+    just -f {{justfile()}} _clean_images {{runner}}
+
+# clean images function
+_clean_images runner=default_runner:
+    #!/usr/bin/env bash
+    set -o pipefail
+    image_ids=$({{runner}} image ls | grep gitpot.org/sangelo/website | awk '{print $3}')
+    if [ -n "$image_ids" ]; then
+        for image_id in $image_ids; do
+            {{runner}} image rm $image_id
+            echo "Image with ID $image_id deleted successfully."
+        done
+    else
+        echo "No images matching the repository and tag found."
+    fi
+
+# build container image with specified runner (default runner: docker)
+build tag=default_tag runner=default_runner:
+    @echo "Running with '{{runner}}' and tagging as '{{tag}}'..."
+    TAG="{{tag}}" {{runner}} compose -f docker-compose.build.yml build --no-cache
+
+# run container image with specified runner (default runner: docker)
+run tag=default_tag runner=default_runner:
+    @echo "Running with '{{runner}}'..."
+    TAG={{tag}} {{runner}} compose -f docker-compose.build.yml up -d --force-recreate
+    @# watch -n 1 {{runner}} compose -f docker-compose.build.yml ps
+
+publish image=default_image runner=default_runner:
+    @echo "Publishing with '{{runner}}'..."
+    @# log into gitpot
+    echo "$GITPOT_TOKEN" | {{runner}} login gitpot.org -u $GITPOT_USERNAME --password-stdin
+    @# push the specified image to the container registry
+    {{runner}} push {{image}}
+    @echo "Published {{image}} successfuly! Use '{{runner}} pull {{image}}' to pull the container."
+
+# development
+
+# install dependencies
+_install:
+    yarn install
+
+# run vite dev server
+dev: _install
+    @echo "Running vite development server..."
+    yarn run dev --open
+
+# run vite preview server
+preview: _install
+    @echo "Running vite preview server..."
+    yarn run build
+    yarn run preview --open
+
+# upgrade dependencies for the project interactively with yarn
+upgrade-interactive: _install
+    @echo "Interactively upgrading packages..."
+    yarn upgrade-interactive --latest

README.md

@@ -1,3 +1,5 @@
+<div align="center"> <img src="https://gitpot.org/sangelo/website/raw/branch/main/static/assets/img/sangelos-space-readme.png"/ width=11%> </div>
+
 # Sangelo's Space
 
 This is the source-code for my website, written in Svelte & SCSS.<br>
@@ -5,9 +7,23 @@ Feel free to explore!
 
 ## Contributing
 
-You're welcome to contribute to this website if you have a Lunivity account (see homepage for details if registrations aren't open).<br>
+You're welcome to contribute to this website if you have a Lunivity account (see Gitpot's homepage for details if registrations aren't open).<br>
 Once you fork and clone the repository, follow the next steps.
 
+If you have [`just`](https://github.com/casey/just/) installed, setting up is pretty easy:
+
+```bash
+# setup dependencies and run dev server
+just
+
+# you can also run `just dev`
+just dev
+```
+
+View a list of all possible `just` recipes with `just -l`.
+
+Otherwise, if you don't already have or don't want to install `just`, you can run the commands manually:
+
 ```bash
 # install dependencies
 yarn install
@@ -23,14 +39,44 @@ Once you've made your changes, you can create a Pull Request and I'll make sure
 
 ## Building
 
-To create a production version of this website:
+### Build locally
+
+To create a production version of this website without docker:
 
 ```bash
+# automatically build & preview
+just preview
+
+# or, manually build
 yarn run build
 ```
 
-You can preview the production build with `yarn run preview`.
+You can then preview the production build locally with `yarn run preview --open`.
+
+The files will be available in the repo, in the `build/` directory.
+
+### Build with Docker
+
+To build a docker container image with `just`:
+
+```bash
+# build and run container image with docker, tag: latest
+just build
+
+# build with podman
+just build <tag> podman
+
+# clean, build, and run container image with docker, tag: latest
+just all
+# clean, build, and run container image with podman, tag: dev
+just all dev podman
+```
+
+You can preview the produced docker build with `just run [tag] [runner]`.
 
 ## License
 
-You can view this project's license [here](./LICENSE).
+You can view this project's source code license [here](./LICENSE).
+
+All assets (images, logos, etc.) created by me (Sangelo) are Copyright (c) 2019-2024 Sangelo unless otherwise stated.<br>
+Brand logos and icons (such as Discord, Github, YouTube, etc.) are trademarked by and copyright of their respective owners.

docker-compose.build.yml

@@ -0,0 +1,11 @@
+services:
+  web:
+    image: gitpot.org/sangelo/website:${TAG}
+    build:
+      context: .
+      dockerfile: Dockerfile
+      no_cache: true
+    ports:
+      - "3000:80"
+      - "3080:8080"
+

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  watchtower:
+    image: containrrr/watchtower
+    container_name: watchtower
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  website:
+    image: gitpot.org/sangelo/website:latest
+    container_name: website
+    restart: unless-stopped
+    ports:
+      - "3000:80"

package.json

@@ -12,22 +12,23 @@
 		"format": "prettier --plugin-search-dir . --write ."
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^2.0.0",
+		"@sveltejs/adapter-auto": "^3.2.0",
-		"@sveltejs/adapter-static": "^2.0.3",
+		"@sveltejs/adapter-static": "^3.0.1",
-		"@sveltejs/kit": "^1.20.4",
+		"@sveltejs/kit": "^2.5.5",
-		"@typescript-eslint/eslint-plugin": "^6.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.1.0",
-		"@typescript-eslint/parser": "^6.0.0",
+		"@typescript-eslint/eslint-plugin": "^7.6.0",
-		"eslint": "^8.28.0",
+		"@typescript-eslint/parser": "^7.6.0",
-		"eslint-config-prettier": "^8.5.0",
+		"eslint": "^9.0.0",
-		"eslint-plugin-svelte": "^2.30.0",
+		"eslint-config-prettier": "^9.1.0",
-		"prettier": "^2.8.0",
+		"eslint-plugin-svelte": "^2.37.0",
-		"prettier-plugin-svelte": "^2.10.1",
+		"prettier": "^3.2.5",
-		"sass": "^1.63.6",
+		"prettier-plugin-svelte": "^3.2.2",
-		"svelte": "^4.0.5",
+		"sass": "^1.75.0",
-		"svelte-check": "^3.4.3",
+		"svelte": "^4.2.13",
+		"svelte-check": "^3.6.9",
 		"tslib": "^2.4.1",
-		"typescript": "^5.0.0",
+		"typescript": "^5.4.5",
-		"vite": "^4.4.2"
+		"vite": "^5.2.8"
 	},
 	"type": "module",
 	"dependencies": {

src/app.html

@@ -17,6 +17,7 @@
 
 		<link rel="icon" href="%sveltekit.assets%/favicon.ico" />
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+		<link href="https://chaos.social/@sangelo" rel="me" />
 		<script
 			type="module"
 			src="https://cdn.jsdelivr.net/gh/zerodevx/zero-md@2/dist/zero-md.min.js"

src/lib/components/Home.svelte

@@ -1,6 +1,11 @@
 <script lang='ts'>
     import IconChevronDown from 'svelte-material-icons/ChevronDown.svelte';
-    import { smoothScrollTo, handleKeydown } from '$lib/index';
+    import { smoothScrollTo, handleKeydown, helloWorld } from '$lib/index';
+    import { onMount } from 'svelte';
+
+    onMount(() => {
+        helloWorld("ascii", "hi there, curious one. have fun exploring! :D")
+    });
 </script>
 
 <div id="home" class="section">
@@ -19,7 +24,7 @@
                     style="mask-type: alpha"
                     maskUnits="userSpaceOnUse"
                     x="27"
-                    y="0"
+                    y="0"t
                     width="90"
                     height="145"
                 >
@@ -56,4 +61,4 @@
 <style lang="scss">
     @import '$styles/index.scss';
 	@import '$styles/home.scss';
-</style>
+</style>

src/lib/components/Projects.svelte

@@ -1,18 +1,17 @@
 <script lang="ts">
-
 	import { smoothScrollTo, handleKeydown } from '$lib/index';
-	
+
 	// 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';
 	import MoreProjectsModal from '$lib/modals/more.svelte';
-	
+
 	let showModal = false;
 	let selectedModule: any = null;
 
@@ -24,7 +23,6 @@
 	function handleModalClose() {
 		showModal = false;
 	}
-
 </script>
 
 <div id="projects" class="section">
@@ -77,7 +75,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/components/Socials.svelte

@@ -15,8 +15,12 @@
 	import IconMastodon from 'svelte-material-icons/Mastodon.svelte';
 	import IconSteam from 'svelte-material-icons/Steam.svelte';
 
+	// Variables
 	let showMore = false;
 	let emoji = '';
+	let commitHash = '';
+	let gitTag = '';
+	let showDebugInfo = false;
 
 	export function changeEmoji() {
 		emoji = emojis[Math.floor(Math.random() * emojis.length)];
@@ -33,9 +37,25 @@
 		}
 	}
 
-	onMount(() => {
+	onMount(async () => {
+		const urlParams = new URLSearchParams(window.location.search);
+		showDebugInfo = urlParams.has('debug') && urlParams.get('debug') === 'true';
+
+		if (showDebugInfo) {
+			try {
+				const response = await fetch('/assets/debug.json');
+				const jsonData = await response.json();
+
+				commitHash = jsonData.commit;
+				gitTag = jsonData.tag;
+			} catch (error) {
+				console.error('Error loading data:', error);
+				// Display an error message or loading state
+			}
+		}
+
         changeEmoji();
-    });
+	});
 </script>
 
 <div id="socials" class="section">
@@ -45,7 +65,7 @@
 				<a
 					href="https://discord.com/users/373525255102136341"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button discord"
 					aria-label="Discord"
@@ -58,7 +78,7 @@
 				<a
 					href="https://youtube.com/@Sangeloo"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button youtube"
 					aria-label="YouTube"
@@ -71,7 +91,7 @@
 				<a
 					href="https://github.com/SangeloDev"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button github"
 					aria-label="GitHub"
@@ -84,7 +104,7 @@
 				<a
 					href="mailto:contact@sangelo.space"
 					target="_blank"
-					rel="noopener noreferrer"
+					rel="noopener noreferrer me"
 					tabindex="0"
 					class="round-button button email"
 					aria-label="Email"
@@ -99,22 +119,22 @@
 				<div class="button-container below" transition:slide>
 					<div class="tooltip">
 						<a
-							href="https://steamcommunity.com/id/sangeloo"
+							href="https://steamcommunity.com/id/Sangelo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button steam"
 							aria-label="Steam"
 						>
 							<IconSteam class="icon" size="2.5em" />
 						</a>
-						<span class="tooltiptext">@sangeloo</span>
+						<span class="tooltiptext">@Sangelo</span>
 					</div>
 					<div class="tooltip">
 						<a
 							href="https://matrix.to/#/@sangelo:stardust.foo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button matrix"
 							aria-label="Matrix"
@@ -125,9 +145,9 @@
 					</div>
 					<div class="tooltip">
 						<a
-							href="https://gitpot.dev/Sangelo"
+							href="https://gitpot.org/sangelo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button gitpot"
 							aria-label="Gitpot"
@@ -195,16 +215,16 @@
 					</div>
 					<div class="tooltip">
 						<a
-							href="https://mas.to/@sangelo"
+							href="https://chaos.social/@sangelo"
 							target="_blank"
-							rel="noopener noreferrer"
+							rel="noopener noreferrer me"
 							tabindex="0"
 							class="round-button button mastodon"
 							aria-label="Mastodon"
 						>
 							<IconMastodon class="icon" size="2.5em" />
 						</a>
-						<span class="tooltiptext">@sangelo@mas.to</span>
+						<span class="tooltiptext">@sangelo@chaos.social</span>
 					</div>
 				</div>
 			{/if}
@@ -266,6 +286,16 @@
 			<span class="dynamic-icon" on:click={() => openWebsite('/old')}
 				>{@html emoji}</span
 			> by Sangelo.
+			{#if showDebugInfo}
+				<div class="debug-ct">
+					<div class="debug-info">
+						Commit: <pre>{commitHash}</pre>
+					</div>
+					<div class="debug-info">
+						<p>Git Tag: </p><pre>{gitTag}</pre>
+					</div>
+				</div>
+			{/if}
 		</p>
 	</footer>
 </div>

src/lib/index.ts

@@ -26,3 +26,32 @@ export function handleKeydown(event: KeyboardEvent) {
 export function openWebsite(url: string) {
     goto(url);
 }
+
+export function helloWorld(type: string, msg: string) {
+    if (type == "ascii") {
+        console.log(`
+                                            :=*#%%#=
+                                         -+#@@@@@@@@@.
+                                     .=#@@@@@@@@@@@@+
+                                   =%@@@@@@@@@@@@%+.
+                                  +@@@@@@@@@@@%=:
+                                  +@@@@@@@@@@@%=.
+                                   =#@@@@@@@@@@@@#+:
+                                     .-*%@@@@@@@@@@@%*:
+                                         .-%@@@@@@@@@@@#.
+                                          :*@@@@@@@@@@@@=
+                                       -*%@@@@@@@@@@@@%+
+                                    =#@@@@@@@@@@@@@#+:
+                                  +@@@@@@@@@@@@%+-
+                                 =@@@@@@@@@@%=.
+                                 .#@@@@@@@@*
+                                   =%@@@@@%
+                                    :@@@@@#
+                                     %@@@@:
+                                     .*%#-
+
+        `)
+    }
+
+    console.log(msg)
+}

src/lib/modals/dashinit.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/dashinit.svg";
-    let projectReadme = "https://gitpot.dev/dashinit/cli/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/dashinit/cli/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev/dashinit/cli";
+    let projectSite = "https://gitpot.org/dashinit/cli";
 </script>
 
 <content>

src/lib/modals/explorecraft.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/explorecraft.svg";
-    let projectReadme = "https://gitpot.dev/ExploreCraft/website/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/ExploreCraft/website/raw/branch/main/README.md";
     let projectSite = "https://explorecraft.net";
 </script>
 

src/lib/modals/gitpot.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/gitpot-color.svg";
-    let projectReadme = "https://gitpot.dev/gitpot/.profile/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/gitpot/.profile/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev"
+    let projectSite = "https://gitpot.org"
 </script>
 
 <content>

src/lib/modals/lunivity.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/lunivity.svg";
-    let projectReadme = "https://gitpot.dev/lunivity/.profile/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/lunivity/.profile/raw/branch/main/README.md";
     let projectSite = "https://lunivity.com"
 </script>
 

src/lib/modals/more.svelte

@@ -17,7 +17,7 @@
 			<h1 class="modal-title no-select">All Projects</h1>
 			<p class="modal-title">These are all of my projects, including the ones that didn't fit in the homepage. Take a look!</p>
 			<ul class="item-list">
-				<a class="item" href="https://gitpot.dev/sangelo/website" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org/sangelo/website" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/sangelos-space-website.svg" alt="Sangelo's Logo" /></div>
 					<div class="item-details">
 						<h2>Sangelo's Space</h2>
@@ -31,14 +31,14 @@
 						<p class="item-description">Open-source by nature, self-hosted by choice. Self-hosted cloud services.</p>
 					</div>
 				</a>
-				<a class="item" href="https://gitpot.dev" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/gitpot-color.svg" alt="Gitpot Logo" /></div>
 					<div class="item-details">
 						<h2>Gitpot</h2>
 						<p class="item-description">Code so sweet, bugs can't compete! A Forgejo-powered git forge which is part of the Lunivity Circle.</p>
 					</div>
 				</a>
-				<a class="item" href="https://gitpot.dev/dashinit/cli" rel="noopener noreferrer" target="_blank" tabindex="0">
+				<a class="item" href="https://gitpot.org/dashinit/cli" rel="noopener noreferrer" target="_blank" tabindex="0">
 					<div class="thumbnail"><img src="assets/logos/dashinit.svg" alt="dashinit Logo" /></div>
 					<div class="item-details">
 						<h2>dashinit</h2>
@@ -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/sangefault.svelte

@@ -1,7 +1,7 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/sangefault.svg";
-    let projectReadme = "https://gitpot.dev/sangelo/SangeFault/raw/branch/1.8.9/README.md";
+    let projectReadme = "https://gitpot.org/sangelo/SangeFault/raw/branch/1.8.9/README.md";
     let projectSite = "https://github.com/SangeloDev/SangeFault";
 </script>
 

src/lib/modals/sangelospace.svelte

@@ -1,8 +1,8 @@
 <script>
 	import IconOpenInNew from 'svelte-material-icons/OpenInNew.svelte';
     let projectLogo = "assets/logos/sangelos-space-website.svg";
-    let projectReadme = "https://gitpot.dev/sangelo/website/raw/branch/main/README.md";
+    let projectReadme = "https://gitpot.org/sangelo/website/raw/branch/main/README.md";
-    let projectSite = "https://gitpot.dev/sangelo/website";
+    let projectSite = "https://gitpot.org/sangelo/website";
 </script>
 
 <content>

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

@@ -58,19 +58,19 @@
 				cursor: default;
 				align-items: center;
 			}
-	
+
 			.one {
 				grid-area: one;
 			}
-	
+
 			.two {
 				grid-area: two;
 			}
-	
+
 			.thr {
 				grid-area: thr;
 			}
-	
+
 			.button {
 				width: 8em;
 				height: 8em;
@@ -89,39 +89,42 @@
 			.button:hover {
 				opacity: 0.9;
 			}
-	
+
 			.button:active {
 				opacity: 0.8;
 			}
-	
+
 			.inactive {
 				visibility: hidden;
 			}
-	
+
 			.sangelo {
 				background-image: url('/assets/logos/sangelos-space-website.svg');
 			}
-	
+
 			.lunivity {
 				background-image: url('/assets/logos/lunivity.svg');
 			}
-	
+
 			.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 {
 				background-image: url('/assets/logos/explorecraft.svg');
 			}
-	
+
 			.dashinit {
 				background-image: url('/assets/logos/dashinit.svg');
 			}
-	
+
 			.sangefault {
 				background-image: url('/assets/logos/sangefault.svg');
 			}
@@ -131,7 +134,7 @@
 				background-image: url('/assets/icons/next.svg');
 				background-size: 3em;
 			}
-			
+
 			.tip {
 				width: 10em;
 				text-align: left;
@@ -139,7 +142,7 @@
 				font-size: 25px;
 				z-index: 1;
 				margin-left: 1em;
-	
+
 				.capri {
 					color: $capri;
 				}

src/styles/socials.scss

@@ -178,6 +178,29 @@
 			font-weight: 800;
 			margin-bottom: -0.7em;
 		}
+
+		.debug-ct {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			gap: 0;
+			margin: 1em 0 1em 0;
+		}
+
+		.debug-info {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin: 0;
+			padding: 0;
+			gap: 0.5em;
+
+			p, pre {
+				margin: 0;
+				text-wrap: nowrap;
+			}
+		}
 	}
 
 	@import './mobile/socials.scss';

static/assets/debug.json

@@ -0,0 +1,4 @@
+{
+    "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

static/internal/countdown/index.html

@@ -1,10 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <!--
-    (c) Sangelo
+    (c) Sangelo 2024
+	v1.0.2
+	----------------
     Simple countdown webpage that can be used as a startpage
     You can feed the date the counter should be counting down to in the URL like this:
     http://<countdown>/?date=YYYY-MM-DDTHH:MM:SS
+    or you can display the current time using ?time parameter like this:
+    http://<countdown>/?time
 -->
 <head>
     <meta charset="UTF-8">
@@ -46,6 +50,7 @@
 
         const countdownElement = document.getElementById("countdown");
         const countdownDate = getDateFromUrl();
+        const showCurrentTime = getTimeFromUrl();
 
         function updateCountdown() {
             const now = new Date().getTime();
@@ -71,6 +76,16 @@
             requestAnimationFrame(updateCountdown);
         }
 
+        function updateTime() {
+            const now = new Date();
+            const hours = formatWithLeadingZeros(now.getHours(), 2);
+            const minutes = formatWithLeadingZeros(now.getMinutes(), 2);
+            const seconds = formatWithLeadingZeros(now.getSeconds(), 2);
+
+            countdownElement.innerHTML = `${hours}:${minutes}:${seconds}`;
+            requestAnimationFrame(updateTime);
+        }
+
         function getDateFromUrl() {
             const urlParams = new URLSearchParams(window.location.search);
             const dateParam = urlParams.get('date');
@@ -83,8 +98,16 @@
             return new Date("1970-01-01T00:00:00").getTime();
         }
 
-        requestAnimationFrame(updateCountdown);
+        function getTimeFromUrl() {
+            const urlParams = new URLSearchParams(window.location.search);
+            return urlParams.has('time');
+        }
+
+        if (showCurrentTime) {
+            requestAnimationFrame(updateTime);
+        } else {
+            requestAnimationFrame(updateCountdown);
+        }
     </script>
 </body>
 </html>
-

svelte.config.js

@@ -1,5 +1,5 @@
 import adapter from '@sveltejs/adapter-static';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 
 /** @type {import('@sveltejs/kit').Config} */