Skip to content
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

Added roku disclaimer in new Subtext to clients #663

Merged
merged 4 commits into from
Sep 18, 2023
Merged

Added roku disclaimer in new Subtext to clients #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0584536
Added description as helptext for clients
JPVenson Sep 17, 2023
3012a3b
Amended Text for Roku
JPVenson Sep 17, 2023
18798ba
Removed double point
JPVenson Sep 17, 2023
c97347b
Happy now lint?
JPVenson Sep 17, 2023
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
1 change: 1 addition & 0 deletions src/components/clients/ClientDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const ClientDetails = ({ client }: { client: Client }) => (
<DetailsCard
title={client.name}
description={client.description}
smallDescription={client.smallDescription}
badges={
<>
<ClientTypeBadge clientType={client.clientType} />
Expand Down
3 changes: 3 additions & 0 deletions src/components/common/DetailsCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
.details-card__footer .button:first-child {
margin-left: 0;
}
.details-card .card__body .card__body__helptext {
color: rgb(157, 148, 136);
}

@media (max-width: 420px) {
.details-card__header {
Expand Down
7 changes: 6 additions & 1 deletion src/components/common/DetailsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type DetailsCardProps = {
id?: string;
title: string;
description: ReactNode;
smallDescription?: ReactNode;
badges?: ReactNode;
icons?: ReactNode;
primaryButtons?: Array<ReactNode>;
Expand All @@ -17,6 +18,7 @@ const DetailsCard: FunctionComponent<DetailsCardProps> = ({
id,
title,
description,
smallDescription,
badges = [],
icons = [],
primaryButtons = [],
Expand All @@ -31,7 +33,10 @@ const DetailsCard: FunctionComponent<DetailsCardProps> = ({
</div>
<div className='details-card__icons'>{icons}</div>
</div>
<div className='card__body padding-top--sm'>{description}</div>
<div className='card__body padding-top--sm'>
<p>{description}</p>
{smallDescription && <p className='card__body__helptext'>{smallDescription}</p>}
</div>
<div className='card__footer details-card__footer container'>
<div className='row'>
<div className='details-card__footer__buttons col'>
Expand Down
3 changes: 3 additions & 0 deletions src/data/clients.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export type Client = {
id: string;
name: string;
description: string;
smallDescription?: string;
clientType: ClientType;
deviceTypes: Array<DeviceType>;
licenseType: LicenseType;
Expand Down Expand Up @@ -534,6 +535,8 @@ export const Clients: Array<Client> = [
id: 'jellyfin-roku',
name: 'Jellyfin for Roku',
description: 'The official Jellyfin app for Roku devices.',
smallDescription:
'Due to a technical limitation of the Roku store, the Jellyfin app for Roku may state that a cable or satellite subscription is required. However, no subscription of any form is required to use the Jellyfin server or any official client.',
clientType: ClientType.Official,
deviceTypes: [DeviceType.TV],
licenseType: LicenseType.OpenSource,
Expand Down