- {content.attributes.scan_set.length > 0 ? (
+ {content.attributes.scan_set.length > 0 && (
- ) : (
- ""
)}
- {content.attributes.content.data ? (
+ {content.attributes.content.data && (
- ) : (
- ""
)}
{content.attributes.scan_set.length === 0 &&
diff --git a/src/components/Library/LibraryContentPreview.tsx b/src/components/Library/LibraryContentPreview.tsx
index bcebbce..8017528 100644
--- a/src/components/Library/LibraryContentPreview.tsx
+++ b/src/components/Library/LibraryContentPreview.tsx
@@ -33,14 +33,12 @@ export default function LibraryContentPreview(
)}
- {item.type.data ? (
+ {item.type.data && (
{item.type.data.attributes.titles.length > 0
? item.type.data.attributes.titles[0].title
: prettySlug(item.type.data.attributes.slug)}
- ) : (
- ""
)}
diff --git a/src/components/Library/LibraryItemsPreview.tsx b/src/components/Library/LibraryItemsPreview.tsx
index 718a625..85afd83 100644
--- a/src/components/Library/LibraryItemsPreview.tsx
+++ b/src/components/Library/LibraryItemsPreview.tsx
@@ -16,6 +16,7 @@ export type LibraryItemsPreviewProps = {
title: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["title"];
subtitle: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["subtitle"];
price?: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["price"];
+ categories: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["categories"];
release_date?: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["release_date"];
metadata?: GetLibraryItemsPreviewQuery["libraryItems"]["data"][number]["attributes"]["metadata"];
};
@@ -43,31 +44,36 @@ export default function LibraryItemsPreview(
)}
- {item.metadata && item.metadata.length > 0 ? (
+ {item.metadata && item.metadata.length > 0 && (
{prettyItemSubType(item.metadata[0])}
- ) : (
- ""
)}
{item.title}
{item.subtitle}
- {item.release_date || item.price ? (
+
+
+ {item.categories.data.map((category) => (
+
+ {category.attributes.short}
+
+ ))}
+
+
+ {(item.release_date || item.price) && (
- {item.release_date ? (
+ {item.release_date && (
event
{prettyDate(item.release_date)}
- ) : (
- ""
)}
- {item.price && props.currencies ? (
+ {item.price && props.currencies && (
shopping_cart
@@ -78,12 +84,8 @@ export default function LibraryItemsPreview(
appLayout.currency
)}
- ) : (
- ""
)}
- ) : (
- ""
)}
diff --git a/src/components/PanelComponents/PanelHeader.tsx b/src/components/PanelComponents/PanelHeader.tsx
index 94e32b3..925d46d 100644
--- a/src/components/PanelComponents/PanelHeader.tsx
+++ b/src/components/PanelComponents/PanelHeader.tsx
@@ -10,10 +10,8 @@ export default function PanelHeader(props: PanelHeaderProps): JSX.Element {
return (
<>
- {props.icon ? (
+ {props.icon && (
{props.icon}
- ) : (
- ""
)}
{props.title}
{props.description ?
{props.description}
: ""}
diff --git a/src/components/PanelComponents/ReturnButton.tsx b/src/components/PanelComponents/ReturnButton.tsx
index 35cbc26..c706da2 100644
--- a/src/components/PanelComponents/ReturnButton.tsx
+++ b/src/components/PanelComponents/ReturnButton.tsx
@@ -34,8 +34,10 @@ export default function ReturnButton(props: ReturnButtonProps): JSX.Element {
{props.horizontalLine &&
}
diff --git a/src/components/Panels/MainPanel.tsx b/src/components/Panels/MainPanel.tsx
index 0390ccf..f1928fa 100644
--- a/src/components/Panels/MainPanel.tsx
+++ b/src/components/Panels/MainPanel.tsx
@@ -192,10 +192,8 @@ export default function MainPanel(props: MainPanelProps): JSX.Element {
}`}
>
- {langui.licensing_notice ? (
+ {langui.licensing_notice && (
{langui.licensing_notice}
- ) : (
- ""
)}
- {langui.copyright_notice ? (
+ {langui.copyright_notice && (
{langui.copyright_notice}
- ) : (
- ""
)}
diff --git a/src/graphql/operation.graphql b/src/graphql/operation.graphql
index a671a29..0d7a7be 100644
--- a/src/graphql/operation.graphql
+++ b/src/graphql/operation.graphql
@@ -205,6 +205,15 @@ query getLibraryItemsPreview($language_code: String) {
}
}
}
+ categories {
+ data {
+ id
+ attributes {
+ name
+ short
+ }
+ }
+ }
metadata {
__typename
... on ComponentMetadataBooks {
@@ -354,6 +363,15 @@ query getLibraryItem($slug: String, $language_code: String) {
}
}
}
+ categories {
+ data {
+ id
+ attributes {
+ name
+ short
+ }
+ }
+ }
size {
width
height
@@ -523,6 +541,15 @@ query getLibraryItem($slug: String, $language_code: String) {
}
}
}
+ categories {
+ data {
+ id
+ attributes {
+ name
+ short
+ }
+ }
+ }
metadata {
__typename
... on ComponentMetadataBooks {
@@ -666,6 +693,7 @@ query getLibraryItem($slug: String, $language_code: String) {
data {
id
attributes {
+ name
short
}
}
@@ -736,6 +764,7 @@ query getContents($language_code: String) {
data {
id
attributes {
+ name
short
}
}
diff --git a/src/graphql/operations-types.ts b/src/graphql/operations-types.ts
index ea1f9ae..7735c06 100644
--- a/src/graphql/operations-types.ts
+++ b/src/graphql/operations-types.ts
@@ -317,6 +317,18 @@ export type GetLibraryItemsPreviewQuery = {
};
};
};
+ categories: {
+ __typename: "CategoryRelationResponseCollection";
+ data: Array<{
+ __typename: "CategoryEntity";
+ id: string;
+ attributes: {
+ __typename: "Category";
+ name: string;
+ short: string;
+ };
+ }>;
+ };
metadata: Array<
| {
__typename: "ComponentMetadataAudio";
@@ -510,6 +522,18 @@ export type GetLibraryItemQuery = {
};
};
};
+ categories: {
+ __typename: "CategoryRelationResponseCollection";
+ data: Array<{
+ __typename: "CategoryEntity";
+ id: string;
+ attributes: {
+ __typename: "Category";
+ name: string;
+ short: string;
+ };
+ }>;
+ };
size: {
__typename: "ComponentBasicsSize";
width: number;
@@ -726,6 +750,18 @@ export type GetLibraryItemQuery = {
};
};
};
+ categories: {
+ __typename: "CategoryRelationResponseCollection";
+ data: Array<{
+ __typename: "CategoryEntity";
+ id: string;
+ attributes: {
+ __typename: "Category";
+ name: string;
+ short: string;
+ };
+ }>;
+ };
metadata: Array<
| {
__typename: "ComponentMetadataAudio";
@@ -897,6 +933,7 @@ export type GetLibraryItemQuery = {
id: string;
attributes: {
__typename: "Category";
+ name: string;
short: string;
};
}>;
@@ -982,7 +1019,11 @@ export type GetContentsQuery = {
data: Array<{
__typename: "CategoryEntity";
id: string;
- attributes: { __typename: "Category"; short: string };
+ attributes: {
+ __typename: "Category";
+ name: string;
+ short: string;
+ };
}>;
};
type: {
diff --git a/src/pages/contents/[slug]/index.tsx b/src/pages/contents/[slug]/index.tsx
index 1c9726d..e3799bb 100644
--- a/src/pages/contents/[slug]/index.tsx
+++ b/src/pages/contents/[slug]/index.tsx
@@ -44,28 +44,22 @@ export default function ContentIndex(props: ContentIndexProps): JSX.Element {
- {content.text_set.length > 0 ? (
+ {content.text_set.length > 0 && (
- ) : (
- ""
)}
- {content.audio_set.length > 0 ? (
+ {content.audio_set.length > 0 && (
- ) : (
- ""
)}
- {content.video_set.length > 0 ? (
+ {content.video_set.length > 0 && (
- ) : (
- ""
)}
diff --git a/src/pages/contents/[slug]/read.tsx b/src/pages/contents/[slug]/read.tsx
index 8dc58cb..8a6fc0b 100644
--- a/src/pages/contents/[slug]/read.tsx
+++ b/src/pages/contents/[slug]/read.tsx
@@ -47,7 +47,7 @@ export default function ContentRead(props: ContentReadProps): JSX.Element {
horizontalLine
/>
- {content.text_set.length > 0 ? (
+ {content.text_set.length > 0 && (
{content.text_set[0].source_language.data.attributes.code ===
@@ -140,8 +140,6 @@ export default function ContentRead(props: ContentReadProps): JSX.Element {
)}
- ) : (
- ""
)}
);
@@ -159,10 +157,8 @@ export default function ContentRead(props: ContentReadProps): JSX.Element {
- {content.text_set.length > 0 ? (
+ {content.text_set.length > 0 && (