Merge branch 'sitetest' of https://github.com/Rowblox/rowblox into sitetest

.github/workflows/production.yml

@@ -2,9 +2,6 @@ name: "production deploy"
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - master
 
 jobs:
   deploy:

.github/workflows/sitetest.yml

@@ -2,9 +2,6 @@ name: "sitetest deploy"
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - sitetest
 
 jobs:
   deploy:

src/hooks.server.js

@@ -1,6 +1,6 @@
 /** @type {import('@sveltejs/kit').Handle} */
 export async function handle({ event, resolve }) {
-	if (event.url.pathname !== "/maintenance" && process.env.MAINTENANCE == "true" && process.env.PRODUCTION == "true") {
+	if (event.url.pathname !== "/maintenance" && process.env.MAINTENANCE) {
 		return new Response("", { status: 302, headers: { Location: "/maintenance" } });
 	}
 

src/routes/(nolayout)/login/+page.svelte

@@ -3,25 +3,10 @@
 </svelte:head>
 
 <div class="max-w-lg mx-auto text-center text-white">
-	<img class="mx-auto" src="/favicon.png" alt="">
+	<img class="mx-auto" src="/favicon.png" alt="" />
-	<p class="text-5xl font-bold">Login to Rowblox!</p>
+	<div class="flex flex-col">
-	<input
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" />
-	class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-4 py-2"
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="password" id="password" placeholder="Password" />
-			type="text"
-			name="username"
-			id="username"
-			placeholder="Username" 
-			/>
-			<input
-			class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-5 py-2"
-					type="password"
-					name="pass"
-					id="password"
-					placeholder="Password" 
-					/>			
-
-	<div class="text-xl text-white">
-		<a class="px-5 py-1 rounded shadow-lg border-2 border-blue-500" href="/my/profile">Login</a>
 	</div>
-
+	<button class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500">Login</button>
-</div>
+</div>

src/routes/(nolayout)/register/+page.svelte

@@ -3,39 +3,12 @@
 </svelte:head>
 
 <div class="max-w-lg mx-auto text-center text-white">
-	<img class="mx-auto" src="/favicon.png" alt="">
+	<img class="mx-auto" src="/favicon.png" alt="" />
-	<p class="text-5xl font-bold">Create an Account!</p>
+	<div class="flex flex-col">
-	<input
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" />
-	class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-4 py-2"
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="password" id="password" placeholder="Password" />
-			type="text"
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="passwordconfirm" id="passwordconfirm" placeholder="Confirm Password" />
-			name="username"
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="text" name="invite" id="invite" placeholder="Invite Key" />
-			id="username"
-			placeholder="Username" 
-			/>
-			<input
-			class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-5 py-2"
-					type="password"
-					name="pass"
-					id="password"
-					placeholder="Password" 
-					/>
-					<input
-			class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-5 py-2"
-					type="password"
-					name="password"
-					id="passwordconfirm"
-					placeholder="Confirm Password" 
-					/>
-					<input
-			        class="rounded-lg px-10 border-2 border-blue-500 text-black flex flex-col mx-auto my-4 py-2"
-					type="text"
-					name="invite"
-					id="invitekey"
-					placeholder="Invite key" 
-					/>
-
-	<div class="text-xl text-white">
-		<a class="px-5 py-1 rounded shadow-lg border-2 border-blue-500" href="/login">Register</a>
 	</div>
-
+	<button class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500">Register</button>
 </div>

vite.config.js

@@ -1,10 +1,7 @@
 import { sveltekit } from "@sveltejs/kit/vite";
 
 const config = {
-	plugins: [sveltekit()],
+	plugins: [sveltekit()]
-	define: {
-		"process.env": process.env
-	}
 };
 
 export default config;