Merge pull request #24 from containerish/adhoc-changes

Adhoc changes

Author: guacamole

src/components/high-level-architecture.svelte

@@ -35,7 +35,7 @@
 					Arweave and Storj
 				</p>
 				<div class="flex justify-center pt-2 cursor-pointer">
-					<a class="text-brown-900 text-xl mt-1" href="https://blog.openregistry.dev/overview" target="_blank">More</a>
+					<a class="text-brown-900 text-xl mt-1" href="https://blog.openregistry.dev/posts/overview" target="_blank">More</a>
 					<button
 						class="transition duration-500 ease-in-out
                        bg-transparent hover: transform

src/components/overview.svelte

@@ -49,7 +49,7 @@
 						target="_blank">More</a
 					>
 					<button
-						class="transition duration-500 ease-in-out bg-transparent hover: transform hover:translate-x-2 
+						class="transition duration-500 ease-in-out bg-transparent hover: transform hover:translate-x-2
             hover:scale-110 pb-3 border border-none"
 					>
 						<Arrow />
@@ -71,8 +71,8 @@
 				<p class="font-lato text-[17.5px] text-center font-normal leading-6 tracking-wide">
 					Want to Collaborate? It's super easy with OpenRegistry. Our code is OpenSource and free to
 					use. We are open to collaborations with projects that share similar vision and can be
-					integrated together to serve larger audience. You can also, simply contribute to
-					OpenRegistry by helping with on of the
+					integrated together to serve larger audience. Simply contribute to
+					OpenRegistry by helping with one of the
 					<a
 						class="font-semibold text-lg capitalize"
 						href="https://github.com/containerish/OpenRegistry/issues"
@@ -83,7 +83,7 @@
 						class="font-semibold capitalize text-lg"
 						href="https://github.com/containerish/OpenRegistry/discussions/47"
 						target="_blank">github discussions</a
-					>
+					>. We would love to hear from you.
 				</p>
 				<div class="flex justify-center pt-2 cursor-pointer">
 					<a

src/components/signin.svelte

@@ -69,6 +69,7 @@
 	};
 
 	const onClickSignIn = async (e: any) => {
+		e.preventDefault();
 		isLoading = true;
 		const email = e.target.email.value;
 		const password = e.target.password.value;
@@ -124,7 +125,7 @@
 			<span class="w-1/5 border-b lg:w-1/4" />
 		</div>
 		{#if !showForgotPasswordForm}
-			<form on:submit|preventDefault={(e) => onClickSignIn(e)}>
+			<form on:submit={(e) => onClickSignIn(e)}>
 				<div class="mt-4">
 					<Textfield
 						error={emailErr}
@@ -155,7 +156,6 @@
 				<div class="flex mt-4 w-full">
 					<Button
 						disabled={!!emailErr || !!passwordErr}
-						onClick={onClickSignIn}
 						{isLoading}
 						styles="text-gray-50 w-full mr-2 disabled:cursor-not-allowed disabled:bg-opacity-20"
 						label="Sign In"

src/hooks.ts

@@ -1,6 +1,6 @@
 <script lang="ts">
 	export let label = '';
-	export let onClick: Function;
+	export let onClick: Function = () => {};
 	export let styles = '';
 	export let isLoading = false;
 	export let type = '';

src/lib/button.svelte

@@ -1,13 +1,13 @@
 <script context="module" lang="ts">
 	export const load = async ({ url }) => {
-		const pathname = url.pathname === '/search' ? url.pathname : undefined;
-
+		const signinPath = url.pathname === '/search' ? url.pathname : undefined;
 		const u = new URLSearchParams(url.search);
 		const signin = u.get('signin');
 
 		return {
 			props: {
-				pathname: pathname,
+				signinPath: signinPath,
+				pathname: url.pathname,
 				openSignInModal: signin
 			}
 		};
@@ -22,11 +22,12 @@
 	import Navbar from '$lib/navbar.svelte';
 	import { Auth } from '../apis/auth';
 	export let pathname: string;
+	export let signinPath: string;
 	export let openSignInModal: boolean;
 
 	const auth = new Auth();
 	onMount(async () => {
-		if (pathname === '/' || pathname === '/about' || pathname === '/faq') {
+		if (!pathname || pathname === '/' || pathname === '/about' || pathname === '/faq') {
 			return;
 		}
 
@@ -45,7 +46,7 @@
 	class="prose lg:w-screen uw:min-w-[55vw] uw:max-w-[50vw] flex justify-center flex-col selection:bg-brown-800
       selection:text-cream-50"
 >
-	<Navbar {pathname} {openSignInModal} />
+	<Navbar pathname={signinPath} {openSignInModal} />
 	<slot />
 	<Footer />
 </main>

src/routes/__layout.svelte

@@ -6,7 +6,8 @@
 		return {
 			props: {
 				slug: slug,
-				token: u.get('token')
+				token: u.get('token'),
+				unhandledErr: u.get('error')
 			}
 		};
 	}
@@ -20,6 +21,7 @@
 	import Button from '$lib/button.svelte';
 	import Pulse from '../../components/pulse.svelte';
 	import CrossIcon from '$lib/icons/crossIcon.svelte';
+	export let unhandledErr: string;
 	let showModal = false;
 	let password = '';
 	let confirmPassword = '';
@@ -66,6 +68,7 @@
 
 	const verifyEmail = 'verify';
 	const forgotPassword = 'forgot-password';
+	const unhandled = 'unhandled';
 
 	let showErrorModal = false;
 	const handleCallback = async () => {
@@ -86,6 +89,9 @@
 			case forgotPassword:
 				showModal = true;
 				break;
+			case unhandled:
+				showErrorModal = true;
+				formErr = unhandledErr;
 		}
 	};
 

src/routes/auth/[slug].svelte

@@ -11,6 +11,7 @@
 	import { RegistryBackend } from '../../apis/registry';
 	import type { Catalog } from '../../apis/registry';
 	import type { User } from '../../apis/auth';
+	import { session } from '$app/stores';
 	export let u: User;
 	const backend = new RegistryBackend();
 	const pageSize = 10;
@@ -24,7 +25,6 @@
 		modifiers: [{ name: 'offset', options: { offset: [0, 8] } }]
 	};
 
-	import { session } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import Pulse from '../../components/pulse.svelte';
 	// @ts-ignore