From 169a3fbfc9f3bbe8bf2661ad9d372d7f1e425dc8 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Tue, 18 Jul 2023 10:50:11 +0200
Subject: [PATCH] Fix publix certificates page

---
 src/lib/CertificateCard.svelte                   | 1 +
 src/lib/Navigation.svelte                        | 5 +++++
 src/routes/+layout.ts                            | 8 +++++++-
 src/routes/catalogs/[id]/categories/+page.svelte | 1 -
 src/routes/public/certificates/+page.ts          | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/lib/CertificateCard.svelte b/src/lib/CertificateCard.svelte
index 2f364fe..9cdcb6f 100644
--- a/src/lib/CertificateCard.svelte
+++ b/src/lib/CertificateCard.svelte
@@ -51,6 +51,7 @@ export let certificate: Certificate;
 						</td>
 						<td>{state.timestamp}</td>
 						<!-- When it is a new certificate, there is no tree yet -->
+						<!-- svelte-ignore empty-block -->
 						{#if state.state == 'new'}
 						{:else}
 							<td><a href="https://cce-test.k8s.medina.esilab.org/#/?treeStateId={state.treeId}">{state.treeId}</a></td>
diff --git a/src/lib/Navigation.svelte b/src/lib/Navigation.svelte
index 0cc0897..e9c7bc1 100644
--- a/src/lib/Navigation.svelte
+++ b/src/lib/Navigation.svelte
@@ -67,6 +67,8 @@ console.log($page.url);
 					</NavLink>
 				</NavItem>
 			{/each} -->
+			<!--TODO: if not logged in, don't show-->
+			{#if loggedIn}
 			<NavItem>
 				<NavLink active={$page.url.pathname.startsWith("/cloud")} href="{base}{"/cloud"}">
 					<Fa icon={faCloud} /> Cloud Services
@@ -87,12 +89,14 @@ console.log($page.url);
 					<Fa icon={faCertificate} /> Certificates
 				</NavLink>
 			</NavItem>
+			{/if}
 			<!--TODO: if logged in, don't show-->
 			{#if !loggedIn}
 			<NavItem>
 				<NavLink href="{base}/login">Login</NavLink>
 			</NavItem>
 			{/if}
+			
 			<NavItem>
 				<NavLink href="https://medina-project.eu/wp-content/uploads/MEDINA_User_Manuals/MEDINA_Orchestrator_UserManual.pdf" target="_blank">
 					<Fa icon={faQuestion} /> Help
@@ -110,6 +114,7 @@ console.log($page.url);
 		</Nav>
 	</Collapse>
 </Navbar>
+
 <div style="clear: both;"></div>
 
 <style>
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index ed18ed9..24ac37f 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -15,6 +15,8 @@ export const load: LayoutLoad = async ({ fetch }) => {
     })
         .catch(() => {
             // ignore, we will catch it later
+            console.error("error getting metrics")
+            return
         });
 
     listControls(null, null, fetch).then((list) => {
@@ -22,6 +24,8 @@ export const load: LayoutLoad = async ({ fetch }) => {
     })
         .catch(() => {
             // ignore, we will catch it later
+            console.error("error getting controls")
+            return
         });
 
         try {
@@ -34,7 +38,9 @@ export const load: LayoutLoad = async ({ fetch }) => {
                 redirect: '/cloud'
             }
         } catch (error) {
-            return redirectLogin('/cloud');
+            console.warn("error start page load function")
+            return
+            // return redirectLogin('/cloud');
         }
 }
 
diff --git a/src/routes/catalogs/[id]/categories/+page.svelte b/src/routes/catalogs/[id]/categories/+page.svelte
index b76b097..0fbba99 100644
--- a/src/routes/catalogs/[id]/categories/+page.svelte
+++ b/src/routes/catalogs/[id]/categories/+page.svelte
@@ -1,3 +1,2 @@
 <script lang="ts">
-export let data: import('./$types').PageData;
 </script>
diff --git a/src/routes/public/certificates/+page.ts b/src/routes/public/certificates/+page.ts
index 2d9e1e8..46f2417 100644
--- a/src/routes/public/certificates/+page.ts
+++ b/src/routes/public/certificates/+page.ts
@@ -4,7 +4,7 @@ import { redirectLogin } from '$lib/oauth';
 /**
  * @type {import('@sveltejs/kit').PageLoad}
  */
-export async function load({ params, fetch, context }) {
+export async function load({ params, fetch }) {
 	return listPublicCertificates()
 		.then((certificates) => {
 			return {