From 672061cd646c97c9954790c8e50eac88ea2666e9 Mon Sep 17 00:00:00 2001 From: Jesse Boswell Date: Mon, 5 Jun 2023 10:59:32 -0500 Subject: [PATCH 1/4] feat(src/components/externallinkblock/index.tsx): support Emby icon Display the Emby icon instead of Jellyfin when mediaserver type is Emby --- src/assets/services/emby.svg | 78 ++++++++++++++++++++++ src/components/ExternalLinkBlock/index.tsx | 6 +- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 src/assets/services/emby.svg diff --git a/src/assets/services/emby.svg b/src/assets/services/emby.svg new file mode 100644 index 000000000..e68d69ac5 --- /dev/null +++ b/src/assets/services/emby.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/components/ExternalLinkBlock/index.tsx b/src/components/ExternalLinkBlock/index.tsx index d7c4b4602..f6c4caf68 100644 --- a/src/components/ExternalLinkBlock/index.tsx +++ b/src/components/ExternalLinkBlock/index.tsx @@ -1,3 +1,4 @@ +import EmbyLogo from '@app/assets/services/emby.svg'; import ImdbLogo from '@app/assets/services/imdb.svg'; import JellyfinLogo from '@app/assets/services/jellyfin.svg'; import PlexLogo from '@app/assets/services/plex.svg'; @@ -41,8 +42,11 @@ const ExternalLinkBlock = ({ > {settings.currentSettings.mediaServerType === MediaServerType.PLEX ? ( - ) : ( + ) : settings.currentSettings.mediaServerType === + MediaServerType.JELLYFIN ? ( + ) : ( + )} )} From 46cd4d01d9a3cf17d79350c5e678202820272299 Mon Sep 17 00:00:00 2001 From: Jesse Boswell Date: Mon, 5 Jun 2023 12:10:25 -0500 Subject: [PATCH 2/4] fix: externalLinkBlock --- src/components/ExternalLinkBlock/index.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/ExternalLinkBlock/index.tsx b/src/components/ExternalLinkBlock/index.tsx index f6c4caf68..1de0b5a36 100644 --- a/src/components/ExternalLinkBlock/index.tsx +++ b/src/components/ExternalLinkBlock/index.tsx @@ -10,6 +10,7 @@ import useLocale from '@app/hooks/useLocale'; import useSettings from '@app/hooks/useSettings'; import { MediaType } from '@server/constants/media'; import { MediaServerType } from '@server/constants/server'; +import getConfig from 'next/config'; interface ExternalLinkBlockProps { mediaType: 'movie' | 'tv'; @@ -29,6 +30,7 @@ const ExternalLinkBlock = ({ mediaUrl, }: ExternalLinkBlockProps) => { const settings = useSettings(); + const { publicRuntimeConfig } = getConfig(); const { locale } = useLocale(); return ( @@ -42,11 +44,10 @@ const ExternalLinkBlock = ({ > {settings.currentSettings.mediaServerType === MediaServerType.PLEX ? ( - ) : settings.currentSettings.mediaServerType === - MediaServerType.JELLYFIN ? ( - - ) : ( + ) : publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? ( + ) : ( + )} )} From ad69d6715e976630092bfbbb1843886523551014 Mon Sep 17 00:00:00 2001 From: Jesse Boswell Date: Mon, 5 Jun 2023 13:21:00 -0500 Subject: [PATCH 3/4] fix(ui): Resize Emby icon and add margins --- src/assets/services/emby.svg | 73 +++++++++--------------------------- 1 file changed, 17 insertions(+), 56 deletions(-) diff --git a/src/assets/services/emby.svg b/src/assets/services/emby.svg index e68d69ac5..9db728426 100644 --- a/src/assets/services/emby.svg +++ b/src/assets/services/emby.svg @@ -1,61 +1,15 @@ + viewBox="0 0 712.60077 712.5481" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - - - - - - - - + id="defs4" /> @@ -64,15 +18,22 @@ image/svg+xml - + + id="layer1" + transform="matrix(0.70249853,0,0,0.70249853,88.77116,96.84571)"> From 1fe4bb8a0415a72791ced75a2fba1027287398d5 Mon Sep 17 00:00:00 2001 From: Jesse Boswell Date: Mon, 5 Jun 2023 18:44:42 -0500 Subject: [PATCH 4/4] fix(ui): Make play symbol white --- src/assets/services/emby.svg | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/assets/services/emby.svg b/src/assets/services/emby.svg index 9db728426..eddc540cd 100644 --- a/src/assets/services/emby.svg +++ b/src/assets/services/emby.svg @@ -26,11 +26,18 @@ id="rect249" width="712.60077" height="712.5481" - x="1e-06" - y="-2.8421709e-14" /> + x="-0.00071160076" + y="2.0223413e-11" /> + + transform="matrix(0.70249853,0,0,0.70249853,88.770447,96.84571)">