chrisryn/requestarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(rebase): rebasse

Browse Source
This commit is contained in:
Aiden Vigue
2021-02-15 11:33:12 -05:00
parent 9582196e1f
commit 01cd9d3872
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/PlexLoginButton/index.tsx
View File

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

8
src/components/Setup/index.tsx
View File

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

3
src/i18n/locale/en.json
View File

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

6
src/styles/globals.css
View File

@@ -13,13 +13,17 @@ body {
.jellyfin-button { .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; @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 { .plex-button:hover {
background: #f19a30; background: #f19a30;
} }
.jellyfin-button:hover {
background: #00a4dc;
}
ul.cardList { ul.cardList {
@apply grid gap-4; @apply grid gap-4;
grid-template-columns: repeat(auto-fill, minmax(9.375rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(9.375rem, 1fr));