use client side routing for all links

teambtcmap · Dec 8, 2023 · 5c7b00e · 5c7b00e
1 parent 466bf8e
commit 5c7b00e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/src/components/AppCard.svelte b/src/components/AppCard.svelte
@@ -11,8 +11,8 @@
 	{#if link}
 		<a
 			href={link}
-			target={text === 'Web' ? '_self' : '_blank'}
-			rel="noreferrer"
+			target={text === 'Web' ? null : '_blank'}
+			rel={text === 'Web' ? null : 'noreferrer'}
 			class="text-2xl font-semibold text-link transition-colors hover:text-hover"
 		>
 			<div

diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
@@ -26,8 +26,8 @@
 		{#each links as link}
 			<a
 				href={link.link}
-				target={link.external ? '_blank' : '_self'}
-				rel="noreferrer"
+				target={link.external ? '_blank' : null}
+				rel={link.external ? 'noreferrer' : null}
 				class="mx-2.5 {link.name !== 'Cypherpunks'
 					? 'mb-2.5 xl:mb-0'
 					: ''} text-sm text-link transition-colors hover:text-hover dark:text-white/50 dark:hover:text-link"

diff --git a/src/components/LatestTagger.svelte b/src/components/LatestTagger.svelte
@@ -51,8 +51,8 @@
 					href={action === 'delete'
 						? `https://www.openstreetmap.org/${deleteLink[0]}/${deleteLink[1]}`
 						: `/merchant/${merchantId}`}
-					target={action === 'delete' ? '_blank' : '_self'}
-					rel="noreferrer"
+					target={action === 'delete' ? '_blank' : null}
+					rel={action === 'delete' ? 'noreferrer' : null}
 					class="break-all text-link transition-colors hover:text-hover"
 					>{location}
 					{#if action === 'delete'}

diff --git a/src/components/NavDropdownDesktop.svelte b/src/components/NavDropdownDesktop.svelte
@@ -32,8 +32,8 @@
 				{#each links as link}
 					<a
 						href={link.url}
-						target={link.external ? '_blank' : '_self'}
-						rel="noreferrer"
+						target={link.external ? '_blank' : null}
+						rel={link.external ? 'noreferrer' : null}
 						class="flex items-center justify-center bg-link p-4 text-xl font-semibold text-white hover:bg-hover {link.icon ===
 						top
 							? 'rounded-t-2xl'

diff --git a/src/components/NavDropdownMobile.svelte b/src/components/NavDropdownMobile.svelte
@@ -34,8 +34,8 @@
 			{#each links as link}
 				<a
 					href={link.url}
-					target={link.external ? '_blank' : '_self'}
-					rel="noreferrer"
+					target={link.external ? '_blank' : null}
+					rel={link.external ? 'noreferrer' : null}
 					class="flex w-full items-center text-xl text-link dark:text-white"
 				>
 					<span

diff --git a/src/components/PrimaryButton.svelte b/src/components/PrimaryButton.svelte
@@ -14,8 +14,8 @@
 {#if link}
 	<a
 		href={link}
-		target={external ? '_blank' : '_self'}
-		rel={external ? 'noreferrer' : ''}
+		target={external ? '_blank' : null}
+		rel={external ? 'noreferrer' : null}
 		class="block bg-link text-center font-semibold text-white hover:bg-hover {style} transition-colors"
 	>
 		{text}

diff --git a/src/components/ProfileActivity.svelte b/src/components/ProfileActivity.svelte
@@ -50,8 +50,8 @@
 					href={action === 'delete'
 						? `https://www.openstreetmap.org/${deleteLink[0]}/${deleteLink[1]}`
 						: `/merchant/${merchantId}`}
-					target={action === 'delete' ? '_blank' : '_self'}
-					rel="noreferrer"
+					target={action === 'delete' ? '_blank' : null}
+					rel={action === 'delete' ? 'noreferrer' : null}
 					class="break-all text-link transition-colors hover:text-hover"
 					>{location}
 					{#if action === 'delete'}

diff --git a/src/components/Tip.svelte b/src/components/Tip.svelte
@@ -11,8 +11,8 @@
 	<div class="!my-12">
 		<a
 			href={type === 'url' ? destination : `lightning:${destination}`}
-			target={type === 'url' ? '_blank' : '_self'}
-			rel="noreferrer"
+			target={type === 'url' ? '_blank' : null}
+			rel={type === 'url' ? 'noreferrer' : null}
 			class="w-full rounded-xl bg-link p-3 px-5 text-center font-semibold text-white transition-colors hover:bg-hover md:text-lg"
 		>
 			<!--  lightning icon -->
@@ -38,8 +38,8 @@
 {:else}
 	<a
 		href={type === 'url' ? destination : `lightning:${destination}`}
-		target={type === 'url' ? '_blank' : '_self'}
-		rel="noreferrer"
+		target={type === 'url' ? '_blank' : null}
+		rel={type === 'url' ? 'noreferrer' : null}
 		class="w-full rounded-lg border border-link py-2 text-center text-sm font-semibold text-link hover:border-white hover:bg-link hover:text-white md:w-20 md:py-1 {style} transition-colors"
 	>
 		<!--  lightning icon -->

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -47,8 +47,8 @@
 							<p>{app.type}</p>
 							<a
 								href={app.link}
-								target={app.type === 'Web' ? '_self' : '_blank'}
-								rel="noreferrer"
+								target={app.type === 'Web' ? null : '_blank'}
+								rel={app.type === 'Web' ? null : 'noreferrer'}
 								class="block rounded-full bg-link p-3 text-white transition-colors hover:bg-hover"
 							>
 								<Icon

diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte
@@ -151,7 +151,7 @@
 	};
 
 	const chartSync = (status: boolean) => {
-		if (!status && initialRenderComplete) {
+		if (!status) {
 			if (chartRendered) {
 				continentChart.data.datasets[0].data = [
 					africa?.length || 0,
@@ -168,7 +168,7 @@
 		}
 	};
 
-	$: $areas && $areas.length && communities && communities.length && chartSync($syncStatus);
+	$: $areas && $areas.length && communities && communities.length && initialRenderComplete && chartSync($syncStatus);
 
 	let section: string;
 	const sections = [