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

package.json

@@ -4,18 +4,16 @@
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
-		"package": "svelte-kit package",
 		"preview": "vite preview",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-		"lint": "prettier --check --plugin-search-dir=. .",
-		"format": "prettier --write --plugin-search-dir=. ."
+		"format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
 		"@iconify-json/fa6-solid": "^1.1.6",
 		"@iconify-json/simple-icons": "^1.1.24",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.454",
+		"@sveltejs/adapter-static": "1.0.0-next.41",
+		"@sveltejs/kit": "1.0.0-next.460",
 		"dayjs": "^1.11.5",
 		"mdsvex": "^0.10.6",
 		"prettier": "^2.7.1",
@@ -30,7 +28,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.8.2",
 		"unocss": "^0.45.13",
-		"vite": "^3.1.0-beta.1"
+		"vite": "3.1.0-beta.1"
 	},
 	"type": "module"
 }

src/lib/Card/Link.svelte

@@ -16,10 +16,7 @@
 	.link {
 		background-color: var(--alt);
 		color: var(--alt-text);
-		font-size: 20px;
 		transition: all 0.25s;
-		display: flex;
-		align-items: center;
 	}
 
 	.web:hover,
@@ -33,25 +30,21 @@
 	.matrixcolored {
 		background-color: var(--alt);
 		color: var(--alt-text);
-		font-size: 20px;
-		display: flex;
-		align-items: center;
 	}
 
 	.discordcolored {
 		background-color: #5865f2;
 		color: #fff;
-		font-size: 20px;
-		display: flex;
-		align-items: center;
 	}
 
 	.gitcolored {
 		background-color: #f05032;
 		color: #fff;
-		font-size: 20px;
-		display: flex;
-		align-items: center;
+	}
+
+	.githubcolored {
+		background-color: var(--alt);
+		color: var(--alt-text);
 	}
 
 	a {
@@ -63,5 +56,8 @@
 		color: var(--secondary);
 		text-decoration: none;
 		width: fit-content;
+		font-size: 20px;
+		display: flex;
+		align-items: center;
 	}
 </style>

src/lib/Projects.json

@@ -2,13 +2,13 @@
 	{
 		"name": "Website",
 		"description": "Our website written in SvelteKit.",
-		"git": "https://git.projectsegfau.lt/ProjectSegfault/website/",
+		"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.",
-		"git": "https://git.projectsegfau.lt/ProjectSegfault/Segfautils/",
+		"github": "https://github.com/ProjectSegfault/segfautils/",
 		"website": "https://segfautils.projectsegfau.lt/"
 	}
 ]

src/routes/+layout.ts

@@ -0,0 +1 @@
+export const prerender = true;

src/routes/projects/+page.svelte

@@ -10,7 +10,7 @@
 
 <h1>Our projects</h1>
 <CardOuter>
-	{#each projects as { name, description, git, website }}
+	{#each projects as { name, description, git, github, website }}
 		<CardInner title={name} {description}>
 			<LinksOuter>
 				{#if website}
@@ -19,6 +19,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" />

svelte.config.js

@@ -17,11 +17,7 @@ const config = {
 	],
 
 	kit: {
-		adapter: adapter(),
-
-		prerender: {
-			default: true
-		}
+		adapter: adapter()
 	}
 };