diff --git a/cornucopia.owasp.org/src/error.html b/cornucopia.owasp.org/src/error.html index 21c32f26..cc4ffc2c 100644 --- a/cornucopia.owasp.org/src/error.html +++ b/cornucopia.owasp.org/src/error.html @@ -10,13 +10,13 @@ -
-
+
+

Request failed. Even Cornucopia can't cope with infinity ∞

Status: %sveltekit.status%

Message: %sveltekit.error.message%

-
+
OWASP Cornucopia - In devs we Trust
diff --git a/cornucopia.owasp.org/src/lib/components/mobileAppCardTaxonomy.svelte b/cornucopia.owasp.org/src/lib/components/mobileAppCardTaxonomy.svelte index 9b67c518..659214a2 100644 --- a/cornucopia.owasp.org/src/lib/components/mobileAppCardTaxonomy.svelte +++ b/cornucopia.owasp.org/src/lib/components/mobileAppCardTaxonomy.svelte @@ -51,7 +51,7 @@ let mappings: MobileAppMapping = $state({} as MobileAppCardMapping); let attacks: Attack[] = $state([] as Attack[]); run(() => { - mappings = controller.getMobileAppCardMappings(card.id.replace('CM', 'COM')); + mappings = controller.getMobileAppCardMappings(card?.id); attacks = GetCardAttacks(card.id) as Attack[] | Attack[]; }); diff --git a/cornucopia.owasp.org/src/lib/services/deckService.ts b/cornucopia.owasp.org/src/lib/services/deckService.ts index fc71fa0e..5798b9f4 100644 --- a/cornucopia.owasp.org/src/lib/services/deckService.ts +++ b/cornucopia.owasp.org/src/lib/services/deckService.ts @@ -112,10 +112,10 @@ export class DeckService { let suitName: string = mapping['suits'][suit] != undefined ? mapping['suits'][suit]['name'] : 'WILD CARD'; for(let card in suitObject['cards']) { let cardObject = suitObject['cards'][card]; - cardObject.id = cardObject['id'].replace("COM", "CM"); + cardObject.id = cardObject['id']; cardObject.edition = deck.edition; - cardObject.suitName = suitName.replace("COM", "CM"); - cardObject.suitId = suitObject['id'].replace("COM", "CM"); + cardObject.suitName = suitName; + cardObject.suitId = suitObject['id']; cardObject.name = `${cardObject.suitName} (${cardObject.id})`; cardObject.suit = cardObject.suitName.replaceAll(' ', '-').toLocaleLowerCase(); cardObject.url = `/cards/${cardObject.id}`; @@ -140,8 +140,8 @@ export class DeckService { } else { cardObject.next = suitObject['cards'][+card+1]['id']; } - cardObject.prevous = cardObject.prevous.replace("COM", "CM"); - cardObject.next = cardObject.next.replace("COM", "CM"); + cardObject.prevous = cardObject.prevous; + cardObject.next = cardObject.next; cards.set(cardObject.id, cardObject); } diff --git a/cornucopia.owasp.org/static/css/base.css b/cornucopia.owasp.org/static/css/base.css index 266d5f8f..e43d4c06 100644 --- a/cornucopia.owasp.org/static/css/base.css +++ b/cornucopia.owasp.org/static/css/base.css @@ -78,7 +78,7 @@ a:visited aspect-ratio:16/9; } -.container { +.error-container { width: 90%; margin: auto; padding: 0rem; @@ -89,7 +89,7 @@ a:visited margin-top: 4rem; } -.text { +.error-text { outline: 1px rgb(231, 231, 231) solid; height: 100%; min-height: 22vw; @@ -101,37 +101,31 @@ a:visited box-shadow: var(--box-shadow); } -.text.desktop-left { +.error-text.desktop-left { padding: 1rem 1rem 1rem 2rem; } -.image { +.error-image { width: 50%; text-align: center; } -img { - width: 80%; - object-fit: cover; - border-radius: .3rem; -} - -.container.desktop-left { +.error.desktop-left { flex-direction: row; } @media (max-aspect-ratio: 1/1) { - .container { + .error-container { flex-direction: column; } - .image { + .error-image { width: 90%; padding: 0; margin: auto; } - .text { + .error-text { padding: 1rem; height: 100%; width: calc(100% - 2rem);