Skip to content

Commit

Permalink
feat: revamp login screen
Browse files Browse the repository at this point in the history
Update the login screen for better usability, especially with OpenID
Connect and Plex login, allowing one-click login and removing the
accordion layout. Additionally, ensures that media server login is
hidden when disabled in the settings.
  • Loading branch information
michaelhthomas committed Jan 19, 2025
1 parent 4d7eba8 commit 8bce211
Show file tree
Hide file tree
Showing 17 changed files with 781 additions and 613 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"react-spring": "9.7.1",
"react-tailwindcss-datepicker-sct": "1.3.4",
"react-toast-notifications": "2.5.1",
"react-transition-group": "^4.4.5",
"react-truncate-markup": "5.1.2",
"react-use-clipboard": "1.0.9",
"reflect-metadata": "0.1.13",
Expand All @@ -94,6 +95,7 @@
"sqlite3": "5.1.4",
"swagger-ui-express": "4.6.2",
"swr": "2.2.5",
"tailwind-merge": "^2.6.0",
"typeorm": "0.3.11",
"undici": "^6.20.1",
"web-push": "3.5.0",
Expand Down
27 changes: 19 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/lib/settings/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ class Settings {
hideAvailable: this.data.main.hideAvailable,
localLogin: this.data.main.localLogin,
mediaServerLogin: this.data.main.mediaServerLogin,
jellyfinExternalHost: this.data.jellyfin.externalHostname,
jellyfinForgotPasswordUrl: this.data.jellyfin.jellyfinForgotPasswordUrl,
movie4kEnabled: this.data.radarr.some(
(radarr) => radarr.is4k && radarr.isDefault
Expand Down
24 changes: 24 additions & 0 deletions src/assets/services/jellyfin-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/components/Common/Button/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ForwardedRef } from 'react';
import React from 'react';
import { twMerge } from 'tailwind-merge';

export type ButtonType =
| 'default'
Expand Down Expand Up @@ -97,7 +98,7 @@ function Button<P extends ElementTypes = 'button'>(
if (as === 'a') {
return (
<a
className={buttonStyle.join(' ')}
className={twMerge(buttonStyle)}
{...(props as React.ComponentProps<'a'>)}
ref={ref as ForwardedRef<HTMLAnchorElement>}
>
Expand All @@ -107,7 +108,7 @@ function Button<P extends ElementTypes = 'button'>(
} else {
return (
<button
className={buttonStyle.join(' ')}
className={twMerge(buttonStyle)}
{...(props as React.ComponentProps<'button'>)}
ref={ref as ForwardedRef<HTMLButtonElement>}
>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Common/LabeledCheckbox/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Field } from 'formik';
import { twMerge } from 'tailwind-merge';

interface LabeledCheckboxProps {
id: string;
Expand All @@ -19,7 +20,7 @@ const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({
}) => {
return (
<>
<div className={`relative flex items-start ${className}`}>
<div className={twMerge('relative flex items-start', className)}>
<div className="flex h-6 items-center">
<Field type="checkbox" id={id} name={id} onChange={onChange} />
</div>
Expand Down
Loading

0 comments on commit 8bce211

Please sign in to comment.