From 05845368023bfeef0f0cd689476a1bdc105f0bf7 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 17 Sep 2023 20:02:21 +0000 Subject: [PATCH 1/6] Added description as helptext for clients --- src/components/clients/ClientDetails.tsx | 1 + src/components/common/DetailsCard.scss | 3 +++ src/components/common/DetailsCard.tsx | 6 +++++- src/data/clients.ts | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/clients/ClientDetails.tsx b/src/components/clients/ClientDetails.tsx index 6139fe346..d37753fbb 100644 --- a/src/components/clients/ClientDetails.tsx +++ b/src/components/clients/ClientDetails.tsx @@ -27,6 +27,7 @@ const ClientDetails = ({ client }: { client: Client }) => ( diff --git a/src/components/common/DetailsCard.scss b/src/components/common/DetailsCard.scss index a97086ca5..2f8cec43f 100644 --- a/src/components/common/DetailsCard.scss +++ b/src/components/common/DetailsCard.scss @@ -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 { diff --git a/src/components/common/DetailsCard.tsx b/src/components/common/DetailsCard.tsx index af11d3b3b..59f241f49 100644 --- a/src/components/common/DetailsCard.tsx +++ b/src/components/common/DetailsCard.tsx @@ -17,6 +17,7 @@ const DetailsCard: FunctionComponent = ({ id, title, description, + smallDescription, badges = [], icons = [], primaryButtons = [], @@ -31,7 +32,10 @@ const DetailsCard: FunctionComponent = ({
{icons}
-
{description}
+
+

{description}

+ {smallDescription &&

{smallDescription}

} +
diff --git a/src/data/clients.ts b/src/data/clients.ts index 84146d02b..859ea3a36 100644 --- a/src/data/clients.ts +++ b/src/data/clients.ts @@ -27,6 +27,7 @@ export type Client = { id: string; name: string; description: string; + smallDescription?: string; clientType: ClientType; deviceTypes: Array; licenseType: LicenseType; @@ -534,6 +535,8 @@ export const Clients: Array = [ 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 any official client or the Jellyfin server.', clientType: ClientType.Official, deviceTypes: [DeviceType.TV], licenseType: LicenseType.OpenSource, From 3012a3b886c9e7ed7aa3d8cc5df36adfe93701f4 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 17 Sep 2023 20:03:10 +0000 Subject: [PATCH 2/6] Amended Text for Roku --- src/data/clients.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/clients.ts b/src/data/clients.ts index 859ea3a36..fefdb38b9 100644 --- a/src/data/clients.ts +++ b/src/data/clients.ts @@ -536,7 +536,7 @@ export const Clients: Array = [ 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 any official client or the Jellyfin server.', + '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, From 18798bac37b37bebdcbb7436f2ae1ee051ea857f Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 17 Sep 2023 20:03:32 +0000 Subject: [PATCH 3/6] Removed double point --- src/data/clients.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/clients.ts b/src/data/clients.ts index fefdb38b9..2afc49e36 100644 --- a/src/data/clients.ts +++ b/src/data/clients.ts @@ -536,7 +536,7 @@ export const Clients: Array = [ 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..', + '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, From c97347b58a8f8651e8eddb16d884ae472c7d65ba Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 17 Sep 2023 20:09:41 +0000 Subject: [PATCH 4/6] Happy now lint? --- src/components/common/DetailsCard.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/common/DetailsCard.tsx b/src/components/common/DetailsCard.tsx index 59f241f49..6565a1c47 100644 --- a/src/components/common/DetailsCard.tsx +++ b/src/components/common/DetailsCard.tsx @@ -6,6 +6,7 @@ type DetailsCardProps = { id?: string; title: string; description: ReactNode; + smallDescription?: ReactNode; badges?: ReactNode; icons?: ReactNode; primaryButtons?: Array; From 67caa21c264ca5b27ef171a3bf71f9e18870bc2f Mon Sep 17 00:00:00 2001 From: George Miao Date: Mon, 18 Sep 2023 00:08:38 -0400 Subject: [PATCH 5/6] Fix: missing quote in css-customization.md --- docs/general/clients/css-customization.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/general/clients/css-customization.md b/docs/general/clients/css-customization.md index 97a1e2a2d..559f6f506 100644 --- a/docs/general/clients/css-customization.md +++ b/docs/general/clients/css-customization.md @@ -731,19 +731,19 @@ Material Icons: - Outlined: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Outline.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Outline.css"); ``` - Rounded: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/round.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/round.css"); ``` - Sharp: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Sharp.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Sharp.css"); ``` Fontawesome Icons: @@ -751,25 +751,25 @@ Fontawesome Icons: - Solid: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/solid.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/solid.css"); ``` - Regular: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/regular.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/regular.css"); ``` - Light: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/light.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/light.css"); ``` - duotone: ```css - @import url(https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/duotone.css"); + @import url("https://cdn.jsdelivr.net/gh/prayag17/Jellyfin-Icons/Font%20Awesome/duotone.css"); ``` ## Community Links From 95a714a6d6963cfaa9d411d80fe16056eaa26c45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:05:18 +0000 Subject: [PATCH 6/6] Update Linters to v6.7.0 --- package-lock.json | 94 +++++++++++++++++++++++------------------------ package.json | 4 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac90e07f5..bbd72610a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,8 +38,8 @@ "@types/react": "17.0.65", "@types/react-helmet": "6.1.6", "@types/react-router-dom": "5.3.3", - "@typescript-eslint/eslint-plugin": "6.6.0", - "@typescript-eslint/parser": "6.6.0", + "@typescript-eslint/eslint-plugin": "6.7.0", + "@typescript-eslint/parser": "6.7.0", "eslint": "8.49.0", "eslint-config-prettier": "8.10.0", "eslint-config-standard": "17.1.0", @@ -3936,9 +3936,9 @@ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" }, "node_modules/@types/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==", "dev": true }, "node_modules/@types/serve-index": { @@ -3980,16 +3980,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz", - "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz", + "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/type-utils": "6.6.0", - "@typescript-eslint/utils": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/type-utils": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -4015,15 +4015,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz", - "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz", + "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/typescript-estree": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4" }, "engines": { @@ -4043,13 +4043,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz", - "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz", + "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0" + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4060,13 +4060,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz", - "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz", + "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.6.0", - "@typescript-eslint/utils": "6.6.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/utils": "6.7.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -4087,9 +4087,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz", - "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz", + "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4100,13 +4100,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz", - "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz", + "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4127,17 +4127,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz", - "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz", + "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/typescript-estree": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", "semver": "^7.5.4" }, "engines": { @@ -4152,12 +4152,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz", - "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz", + "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", + "@typescript-eslint/types": "6.7.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { diff --git a/package.json b/package.json index 7326ee4db..24be11af1 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "@types/react": "17.0.65", "@types/react-helmet": "6.1.6", "@types/react-router-dom": "5.3.3", - "@typescript-eslint/eslint-plugin": "6.6.0", - "@typescript-eslint/parser": "6.6.0", + "@typescript-eslint/eslint-plugin": "6.7.0", + "@typescript-eslint/parser": "6.7.0", "eslint": "8.49.0", "eslint-config-prettier": "8.10.0", "eslint-config-standard": "17.1.0",