Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/app/exicon/[entryId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export async function generateMetadata({
const description =
exiconEntry.description ||
`Learn about the ${exiconEntry.name} exercise in the F3 Exicon.`;
const url = `https://f3nation.com/exicon/${entryId}`;
const url = `https://codex.f3nation.com/exicon/${entryId}`;
const tags = exiconEntry.tags?.map((tag) => tag.name).join(", ") || "";

return {
Expand Down Expand Up @@ -130,9 +130,9 @@ export default async function ExiconEntryPage({
isHtmlContent(exiconEntry.description)
? exiconEntry.description
: convertPlainTextToHtml(
exiconEntry.description,
exiconEntry.references
)
exiconEntry.description,
exiconEntry.references
)
}
mentionedEntries={
exiconEntry.references?.reduce(
Expand Down
28 changes: 14 additions & 14 deletions src/app/exicon/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function generateMetadata({
const description =
entry.description ||
`Learn about the ${entry.name} exercise in the F3 Exicon.`;
const url = `https://f3nation.com/exicon?entryId=${entryId}`;
const url = `https://codex.f3nation.com/exicon?entryId=${entryId}`;
const tags = entry.tags?.map((tag) => tag.name).join(", ") || "";

return {
Expand Down Expand Up @@ -102,19 +102,19 @@ function normalizeAliases(
): { id: string; name: string }[] {
return Array.isArray(aliases)
? aliases
.map((alias, i) => {
if (typeof alias === "string") {
return { id: `alias-${entryId}-${i}`, name: alias };
}
if (alias && typeof alias.name === "string") {
return {
id: alias.id ?? `alias-${entryId}-${i}`,
name: alias.name,
};
}
return null;
})
.filter((a): a is { id: string; name: string } => a !== null)
.map((alias, i) => {
if (typeof alias === "string") {
return { id: `alias-${entryId}-${i}`, name: alias };
}
if (alias && typeof alias.name === "string") {
return {
id: alias.id ?? `alias-${entryId}-${i}`,
name: alias.name,
};
}
return null;
})
.filter((a): a is { id: string; name: string } => a !== null)
: [];
}

Expand Down
8 changes: 4 additions & 4 deletions src/app/lexicon/[entryId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export async function generateMetadata({
const description =
lexiconEntry.description ||
`Learn about ${lexiconEntry.name} in the F3 Lexicon.`;
const url = `https://f3nation.com/lexicon/${entryId}`;
const url = `https://codex.f3nation.com/lexicon/${entryId}`;

return {
title,
Expand Down Expand Up @@ -120,9 +120,9 @@ export default async function LexiconEntryPage({
isHtmlContent(lexiconEntry.description)
? lexiconEntry.description
: convertPlainTextToHtml(
lexiconEntry.description,
lexiconEntry.references
)
lexiconEntry.description,
lexiconEntry.references
)
}
mentionedEntries={
lexiconEntry.references?.reduce(
Expand Down
28 changes: 14 additions & 14 deletions src/app/lexicon/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function generateMetadata({
const title = `${entry.name} - F3 Lexicon`;
const description =
entry.description || `Learn about ${entry.name} in the F3 Lexicon.`;
const url = `https://f3nation.com/lexicon?entryId=${entryId}`;
const url = `https://codex.f3nation.com/lexicon?entryId=${entryId}`;

return {
title,
Expand Down Expand Up @@ -72,19 +72,19 @@ function normalizeAliases(
): { id: string; name: string }[] {
return Array.isArray(aliases)
? aliases
.map((alias, i) => {
if (typeof alias === "string") {
return { id: `alias-${entryId}-${i}`, name: alias };
}
if (alias && typeof alias.name === "string") {
return {
id: alias.id ?? `alias-${entryId}-${i}`,
name: alias.name,
};
}
return null;
})
.filter((a): a is { id: string; name: string } => a !== null)
.map((alias, i) => {
if (typeof alias === "string") {
return { id: `alias-${entryId}-${i}`, name: alias };
}
if (alias && typeof alias.name === "string") {
return {
id: alias.id ?? `alias-${entryId}-${i}`,
name: alias.name,
};
}
return null;
})
.filter((a): a is { id: string; name: string } => a !== null)
: [];
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/route-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function generateEntryUrl(
): string {
const baseRoute = getEntryBaseUrl(entryType);
const encodedId = encodeURIComponent(entryId);
return `https://f3nation.com/${baseRoute}?entryId=${encodedId}`;
return `https://codex.f3nation.com/${baseRoute}?entryId=${encodedId}`;
}

/**
Expand Down
Loading