feat(rebase): rebasse

src/components/PlexLoginButton/index.tsx

@@ -3,7 +3,7 @@ import PlexOAuth from '../../utils/plex';
 import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
-  signinwithplex: 'Sign In with Plex',
+  signinwithplex: 'Sign In',
   loading: 'Loading…',
   signingin: 'Signing in…',
 });

src/components/Setup/index.tsx

@@ -19,8 +19,8 @@ const messages = defineMessages({
   finish: 'Finish Setup',
   finishing: 'Finishing…',
   continue: 'Continue',
-  authorize: 'Authorize',
-  connectmediaserver: 'Connect Media Server',
+  signin: 'Sign In',
+  configuremediaserver: 'Configure Media Server',
   configureservices: 'Configure Services',
   tip: 'Tip',
   syncingbackground:
@@ -83,13 +83,13 @@ const Setup: React.FC = () => {
           >
             <SetupSteps
               stepNumber={1}
-              description={intl.formatMessage(messages.authorize)}
+              description={intl.formatMessage(messages.signin)}
               active={currentStep === 1}
               completed={currentStep > 1}
             />
             <SetupSteps
               stepNumber={2}
-              description={intl.formatMessage(messages.connectmediaserver)}
+              description={intl.formatMessage(messages.configuremediaserver)}
               active={currentStep === 2}
               completed={currentStep > 2}
             />

src/i18n/locale/en.json

@@ -590,12 +590,9 @@
   "components.Settings.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.validationHostnameRequired": "You must provide a hostname/IP",
   "components.Settings.validationPortRequired": "You must provide a port",
-<<<<<<< HEAD
   "components.Settings.webhook": "Webhook",
   "components.Setup.configureplex": "Configure Plex",
-=======
   "components.Setup.authorize": "Authorize",
->>>>>>> feat(all): add initial Jellyfin/Emby support
   "components.Setup.configureservices": "Configure Services",
   "components.Setup.connectmediaserver": "Connect Media Server",
   "components.Setup.continue": "Continue",

src/styles/globals.css

@@ -13,13 +13,17 @@ body {
 
 .jellyfin-button {
   @apply flex justify-center w-full px-4 py-2 text-sm font-medium text-center text-white transition duration-150 ease-in-out bg-indigo-600 border border-transparent rounded-md disabled:opacity-50;
-  background-color: #00A4DC;
+  background-color: #0083b0;
 }
 
 .plex-button:hover {
   background: #f19a30;
 }
 
+.jellyfin-button:hover {
+  background: #00a4dc;
+}
+
 ul.cardList {
   @apply grid gap-4;
   grid-template-columns: repeat(auto-fill, minmax(9.375rem, 1fr));