Merge pull request #36 from containerish/hotfix

Fix: Container Pull Command

Author: guacamole

src/routes/__layout.svelte

@@ -7,9 +7,21 @@
 		const signinPath = url.pathname === '/search' ? url.pathname : undefined;
 		const u = new URLSearchParams(url.search);
 		const openSignInModal = u.get('signin');
-		const pathname = url.pathname;
+		const pathname: string = url.pathname;
 
 		const sessionCookiePresent = cookie.get('session_id');
+		const pubPath = pathname.startsWith('/u/') && pathname.split('/').length >= 3;
+		if (pubPath && !sessionCookiePresent) {
+			return {
+				props: {
+					signinPath: signinPath,
+					pathname: url.pathname,
+					openSignInModal: openSignInModal,
+					authenticated: false
+				}
+			};
+		}
+
 		if (auth.publicPaths.has(pathname) && !sessionCookiePresent) {
 			return {
 				props: {

src/routes/u/[username]/[repo].svelte

@@ -52,18 +52,15 @@
 	let timeout: any;
 
 	const handleCopy = (cmd: string) => {
+		const u = new URL(import.meta.env.VITE_OPEN_REGISTRY_BACKEND_URL);
 		switch (cmd) {
 			case 'push':
 				isCopied = 'push';
-				window.navigator.clipboard.writeText(
-					`docker push ${import.meta.env.VITE_OPEN_REGISTRY_BACKEND_URL}/${ns}`
-				);
+				window.navigator.clipboard.writeText(`docker push ${u.hostname}/${ns}`);
 				break;
 			case 'pull':
 				isCopied = 'pull';
-				window.navigator.clipboard.writeText(
-					`docker pull ${import.meta.env.VITE_OPEN_REGISTRY_BACKEND_URL}/${ns}`
-				);
+				window.navigator.clipboard.writeText(`docker pull ${u.hostname}/${ns}`);
 		}
 
 		timeout = setTimeout(() => {
@@ -130,6 +127,16 @@
 				</div>
 				<div class="flex flex-col w-4/12 rounded-md mx-4 bg-gray-50 px-4 py-8">
 					<h1 class="text-xl font-medium mb-4">Quick Docker Commands</h1>
+
+					<div class="my-2 text-center px-4 py-2 bg-brown-400 rounded-md">
+						<span
+							on:click={() => handleCopy('pull')}
+							class="{isCopied === 'pull' ? 'font-semibold' : ''} select-all text-sm text-gray-900 "
+						>
+							{isCopied === 'pull' ? 'Copied!!' : `docker pull openregistry.dev/${ns}`}
+						</span>
+					</div>
+
 					<div class="my-2 px-4 py-2 text-center bg-brown-400 rounded-md">
 						<span
 							on:click={() => handleCopy('push')}
@@ -140,15 +147,6 @@
 							{isCopied === 'push' ? 'Copied!!' : `docker push openregistry.dev/${ns}`}
 						</span>
 					</div>
-
-					<div class="my-2 text-center px-4 py-2 bg-brown-400 rounded-md">
-						<span
-							on:click={() => handleCopy('pull')}
-							class="{isCopied === 'pull' ? 'font-semibold' : ''} select-all text-sm text-gray-900 "
-						>
-							{isCopied === 'pull' ? 'Copied!!' : `docker pull openregistry.dev/${ns}`}
-						</span>
-					</div>
 				</div>
 			{/if}
 		</div>