Skip to content

Eop card browser/refactor mentor followups #3331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ayman-art wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Eop card browser/refactor mentor followups #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2fcc91
Extracted the duplicated getEdition() function into a shared EDITION_…
ayman-art Aug 8, 2026
ebfed74
Extracted editionName into a $derived binding.
ayman-art Aug 8, 2026
3ae8570
Used DeckService.getCards() instead of manually listing each edition.
ayman-art Aug 8, 2026
25256d6
Merge branch 'master' into eop-card-browser/refactor-mentor-followups
ayman-art Aug 11, 2026
96e8e52
Merge branch 'master' into eop-card-browser/refactor-mentor-followups
ayman-art Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cornucopia.owasp.org/src/lib/services/deckServiceConsts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,13 @@ export const EDITION_NAMES: Record<string, string> = {
[VERSION_DBD]: "Cornucopia",
[VERSION_EOP]: "Elevation of Privilege"
};

/**
* Full edition name, used in card detail page titles and social meta tags in <svelte:head>.
*/
export const EDITION_FULL_NAMES: Record<string, string> = {

@sydseter sydseter Aug 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be moved to yaml

[VERSION_WEBAPP]: "Website App Edition",
[VERSION_MOBILEAPP]: "Mobile App Edition",
[VERSION_COMPANION]: "Companion Edition",
[VERSION_EOP]: "Elevation of Privilege Edition"
};
12 changes: 2 additions & 10 deletions cornucopia.owasp.org/src/routes/cards/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,12 @@ import { getCardImagesByEdition, getSuitStylingByEdition } from '$lib/services/c

export const load = (({ params: _params }) => {
const deckService = new DeckService();
const decks = new Map<string, Map<string, unknown>>();
const lang = 'en';
const mobileCards = deckService.getCardDataForEditionVersionLang(
'mobileapp', DeckService.getLatestVersion('mobileapp'), lang);
const webappCards = deckService.getCardDataForEditionVersionLang(
'webapp', DeckService.getLatestVersion('webapp'), lang);
const companionCards = deckService.getCardDataForEditionVersionLang(
'companion', DeckService.getLatestVersion('companion'), lang);
const eopCards = deckService.getCardDataForEditionVersionLang(
'eop', DeckService.getLatestVersion('eop'), lang);
const decks = new Map<string, Map<string, unknown>>([[lang, deckService.getCards(lang)]]);

return {
suits: SuitController.getSuits(),
decks: decks.set(lang, new Map([...mobileCards, ...webappCards, ...companionCards, ...eopCards])),
decks: decks,
mappingData: (new MappingService()).getCardMappingForLatestEdtions(),
content: FileSystemHelper.getDataFromPath('data/website/pages/cards'),
cardImages: getCardImagesByEdition(),
Expand Down
28 changes: 2 additions & 26 deletions cornucopia.owasp.org/src/routes/cards/[card]/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,8 @@ export const load = (async ({ params }) => {
const lang = "en";
const deckService = new DeckService();

const mobileCards = deckService.getCardDataForEditionVersionLang(
"mobileapp",
DeckService.getLatestVersion("mobileapp"),
lang
);

const webappCards = deckService.getCardDataForEditionVersionLang(
"webapp",
DeckService.getLatestVersion("webapp"),
lang
);

const companionCards = deckService.getCardDataForEditionVersionLang(
"companion",
DeckService.getLatestVersion("companion"),
lang
);

const eopCards = deckService.getCardDataForEditionVersionLang(
"eop",
DeckService.getLatestVersion("eop"),
lang
);

const cards = new Map([...mobileCards, ...webappCards, ...companionCards, ...eopCards]);
const decks = new Map([["en", cards]]);
const cards = deckService.getCards(lang);
const decks = new Map([[lang, cards]]);

const fixedCode = legacyCardCodeFix(params.card?.toUpperCase() || "");

Expand Down
16 changes: 5 additions & 11 deletions cornucopia.owasp.org/src/routes/cards/[card]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import type { Card } from "../../../domain/card/card";
import { isKnownCardId } from "../../../domain/card/cardIds";
import { readLang, readTranslation } from "$lib/stores/stores";
import { EDITION_FULL_NAMES } from "$lib/services/deckServiceConsts";

interface Props {
data: PageData;
Expand All @@ -18,29 +19,22 @@
let card : Card = $derived(cards.get(data.card) as Card);
let language = $derived($lang ? $lang : data.lang);
const languages = $derived(data.languages);
let editionName = $derived(EDITION_FULL_NAMES[card?.edition] ?? card?.edition);

function cardFound()
{
return isKnownCardId(card?.id)
}

function getEdition(str: string) : string {
if (str == "webapp") return "Website App Edition";
if (str == "mobileapp") return "Mobile App Edition";
if (str == "companion") return "Companion Edition";
if (str == "eop") return "Elevation of Privilege Edition";
return str;
}
</script>
<svelte:head>
{#if cardFound()}
<link rel="canonical" href="https://cornucopia.owasp.org/card/{card.edition}/{card.id}" />
<title>OWASP Cornucopia - {getEdition(card.edition)} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<title>OWASP Cornucopia - {editionName} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<meta name="description" content="{card.desc}" />
<meta name="keywords" content="OWASP, Cornucopia,{card.edition}, {Text.convertToTitleCase(card.suitName)}, {card.id}" />
<meta property="og:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta property="og:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta property="og:description" content="{card.desc}">
<meta name="twitter:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta name="twitter:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta name="twitter:description" content="{card.desc}">
{/if}
</svelte:head>
Expand Down
16 changes: 5 additions & 11 deletions cornucopia.owasp.org/src/routes/edition/[edition]/[card]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { isKnownCardId } from "$domain/card/cardIds";
import { readLang, readTranslation } from "$lib/stores/stores";
import type { PageData } from './$types';
import { EDITION_FULL_NAMES } from "$lib/services/deckServiceConsts";

let { data }: { data: PageData } = $props();
let _t = readTranslation();
Expand All @@ -16,29 +17,22 @@
let versions = $derived(data.versions);

const languages = $derived(data.languages);
let editionName = $derived(EDITION_FULL_NAMES[card?.edition] ?? card?.edition);

function cardFound()
{
return isKnownCardId(card?.id)
}

function getEdition(str: string) : string {
if (str == "webapp") return "Website App Edition";
if (str == "mobileapp") return "Mobile App Edition";
if (str == "companion") return "Companion Edition";
if (str == "eop") return "Elevation of Privilege Edition";
return str;
}
</script>
<svelte:head>
{#if cardFound()}
<link rel="canonical" href="https://cornucopia.owasp.org/cards/{card.id}" />
<title>OWASP Cornucopia - {getEdition(card.edition)} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<title>OWASP Cornucopia - {editionName} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<meta name="description" content="{card.desc}" />
<meta name="keywords" content="OWASP, Cornucopia,{card.edition}, {Text.convertToTitleCase(card.suitName)}, {card.id}" />
<meta property="og:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta property="og:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta property="og:description" content="{card.desc}">
<meta name="twitter:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta name="twitter:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta name="twitter:description" content="{card.desc}">
{/if}
</svelte:head>
Expand Down
16 changes: 5 additions & 11 deletions cornucopia.owasp.org/src/routes/edition/[edition]/[card]/[version]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { isKnownCardId } from "$domain/card/cardIds";
import { readLang, readTranslation } from "$lib/stores/stores";
import type { PageData } from "./$types";
import { EDITION_FULL_NAMES } from "$lib/services/deckServiceConsts";
type Props = { data: PageData };


Expand All @@ -17,29 +18,22 @@
let languages = $derived(data.languages);
let language = $derived($lang ? $lang : data.lang);
let versions = $derived(data.versions);
let editionName = $derived(EDITION_FULL_NAMES[card?.edition] ?? card?.edition);

function cardFound()
{
return isKnownCardId(card?.id)
}

function getEdition(str: string) : string {
if (str == "webapp") return "Website App Edition";
if (str == "mobileapp") return "Mobile App Edition";
if (str == "companion") return "Companion Edition";
if (str == "eop") return "Elevation of Privilege Edition";
return str;
}
</script>
<svelte:head>
{#if cardFound()}
<link rel="canonical" href="https://cornucopia.owasp.org/cards/{card.id}" />
<title>OWASP Cornucopia - {getEdition(card.edition)} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<title>OWASP Cornucopia - {editionName} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<meta name="description" content="{card.desc}" />
<meta name="keywords" content="OWASP, Cornucopia,{card.edition}, {Text.convertToTitleCase(card.suitName)}, {card.id}" />
<meta property="og:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta property="og:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta property="og:description" content="{card.desc}">
<meta name="twitter:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta name="twitter:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta name="twitter:description" content="{card.desc}">
{/if}
</svelte:head>
Expand Down
16 changes: 5 additions & 11 deletions cornucopia.owasp.org/src/routes/edition/[edition]/[card]/[version]/[lang]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,30 @@
import type { Card } from "$domain/card/card";
import { isKnownCardId } from "$domain/card/cardIds";
import type { PageData } from './$types';
import { EDITION_FULL_NAMES } from "$lib/services/deckServiceConsts";

let { data }: { data: PageData } = $props();
const language = $derived(data?.lang);
let cards = $derived(data.cards);
let card : Card = $derived(cards.get(data.card) as Card);
let languages = $derived(data.languages);
let versions = $derived(data.versions);
let editionName = $derived(EDITION_FULL_NAMES[card?.edition] ?? card?.edition);

function cardFound()
{
return isKnownCardId(card?.id)
}

function getEdition(str: string) : string {
if (str == "webapp") return "Website App Edition";
if (str == "mobileapp") return "Mobile App Edition";
if (str == "companion") return "Companion Edition";
if (str == "eop") return "Elevation of Privilege Edition";
return str;
}
</script>
<svelte:head>
{#if cardFound()}
<link rel="canonical" href="https://cornucopia.owasp.org/cards/{card.id}" />
<title>OWASP Cornucopia - {getEdition(card.edition)} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<title>OWASP Cornucopia - {editionName} - {Text.convertToTitleCase(card.suitName)} ({card.id})</title>
<meta name="description" content="{card.desc}" />
<meta name="keywords" content="OWASP, Cornucopia,{card.edition}, {Text.convertToTitleCase(card.suitName)}, {card.id}" />
<meta property="og:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta property="og:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta property="og:description" content="{card.desc}">
<meta name="twitter:title" content="OWASP Cornucopia - {getEdition(card.edition)} - {card.name}">
<meta name="twitter:title" content="OWASP Cornucopia - {editionName} - {card.name}">
<meta name="twitter:description" content="{card.desc}">
{/if}
</svelte:head>
Expand Down
Loading