Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'develop' #89

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Merge branch 'develop' #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import plexSvg from '@/assets/plex.svg'

Check failure on line 3 in src/app/page.tsx

View workflow job for this annotation

GitHub Actions / Lint & Test Build 

Cannot find module '@/assets/plex.svg' or its corresponding type declarations.

Check failure on line 3 in src/app/page.tsx

View workflow job for this annotation

GitHub Actions / Lint & Test Build 

Cannot find module '@/assets/plex.svg' or its corresponding type declarations.
import Loader from '@/components/Loader'
import { createPlexAuthUrl, getPlexAuthToken } from '@/lib/auth'
import { Library, TautulliUser } from '@/types'
Expand Down Expand Up @@ -45,6 +45,7 @@
if (res?.error) {
console.error('Failed to sign in:', res.error)
}

setIsLoading(false)
} catch (error) {
console.error('Error during sign-in:', error)
Expand Down Expand Up @@ -77,7 +78,7 @@

try {
const res = await fetch(
`/api/managed-users?userId=${session.user.id}`,
`/api/managed-users?userId=${session?.user.id}`,
)
const data = await res.json()

Expand All @@ -94,7 +95,7 @@
} else if (status !== 'loading') {
setIsLoading(false)
}
}, [status, session])
}, [status, session?.user.id])

if (isLoading) {
return <Loader />
Expand Down
Loading