From eac17f08f5580fc7916b1a269cf08cef6ecd9e51 Mon Sep 17 00:00:00 2001
From: Jaco <jaco@vancran.com>
Date: Tue, 23 Apr 2024 14:07:57 +0200
Subject: [PATCH 1/4] Basic admin authorization

---
 app/Http/Controllers/HomeController.php       | 14 +++---
 app/Http/Controllers/UserController.php       |  9 +++-
 app/Http/Kernel.php                           |  1 +
 app/Http/Middleware/AdminMiddleware.php       | 26 ++++++++++
 .../components/Admin/AdminSettingsLayout.vue  | 13 ++++-
 .../js/components/Admin/AdminUserSettings.vue | 16 +++----
 resources/js/components/Layout.vue            | 47 ++++++++++---------
 resources/views/home.blade.php                |  2 +-
 routes/web.php                                | 26 +++++-----
 9 files changed, 104 insertions(+), 50 deletions(-)
 create mode 100644 app/Http/Middleware/AdminMiddleware.php

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 9d666ccd..8ed7ffde 100755
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -14,7 +14,7 @@
 use App\Http\Requests\Home\GetConfigRequest;
 
 class HomeController extends Controller {
-    
+
     private $statisticsService;
     private $goalService;
 
@@ -29,12 +29,14 @@ public function index() {
         $selectedLanguage = Auth::user()->selected_language;
         $userCount = User::count();
         $userName = Auth::user()->name;
+        $isAdmin = Auth::user()->is_admin;
         $theme = $_COOKIE['theme'] ?? 'light';
-        
+
         return view('home', [
             'language' => $selectedLanguage,
             'userCount' => $userCount,
             'userName' => $userName,
+            'isAdmin' => $isAdmin,
             'theme' => $theme
         ]);
     }
@@ -78,7 +80,7 @@ public function getConfig($configPath, GetConfigRequest $request) {
 
     public function getUserManualTree() {
         $manualTree = [];
-        
+
         $path = public_path('./../manual/');
         $files = scandir($path);
 
@@ -108,7 +110,7 @@ public function getUserManualTree() {
                         $subPageName = str_replace("\r\n", '', $subPageName);
                         $subPageName = str_replace("\n", '', $subPageName);
                         $subPageName = str_replace("\n", '', $subPageName);
-                        
+
                         $subPage = new \stdClass();
                         $subPage->id = $index;
                         $subPage->name = $subPageName;
@@ -118,10 +120,10 @@ public function getUserManualTree() {
                         $index ++;
                     }
                 }
-            
+
                 fclose($handle);
             }
-            
+
             if (count($subPages)) {
                 $page->children = $subPages;
             }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8d4caef6..5caaa1d3 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -22,6 +22,11 @@ public function __construct(UserService $userService) {
 
     }
 
+    public function isAdmin() {
+        $isAdmin = Auth::user()->is_admin;
+        return response($isAdmin, 200);
+    }
+
     public function isUserPasswordChanged() {
         $passwordChanged = Auth::user()->password_changed;
         return response($passwordChanged, 200);
@@ -40,13 +45,13 @@ public function getUsers() {
     public function updatePassword(UpdatePasswordRequest $request) {
         $user = Auth::user();
         $password = $request->post('password');
-        
+
         try {
             $this->userService->updatePassword($user, $password);
         } catch(\Exception $e) {
             abort(500, $e->getMessage());
         }
-                
+
         return response()->json('Password has been updated successfully.', 200);
     }
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 30020a50..db5f5031 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -53,6 +53,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
+        'admin' => \App\Http\Middleware\AdminMiddleware::class,
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php
new file mode 100644
index 00000000..bdb8c25f
--- /dev/null
+++ b/app/Http/Middleware/AdminMiddleware.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AdminMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (!Auth::check() || !Auth::user()->is_admin) {
+            // If the user is not logged in or not an admin, redirect or handle as necessary
+            return response()->json(['error' => 'You do not have permission to access this resource.'], 403);
+        }
+        return $next($request);
+    }
+}
diff --git a/resources/js/components/Admin/AdminSettingsLayout.vue b/resources/js/components/Admin/AdminSettingsLayout.vue
index 16cd6265..18f0b751 100644
--- a/resources/js/components/Admin/AdminSettingsLayout.vue
+++ b/resources/js/components/Admin/AdminSettingsLayout.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-container>
+    <v-container v-if="isAdmin">
         <v-tabs v-model="tab" background-color="white" class="rounded-lg border overflow-hidden">
             <v-tab>Users</v-tab>
             <v-tab>Dictionaries</v-tab>
@@ -21,6 +21,9 @@
             </v-tab-item>
         </v-tabs-items>
     </v-container>
+    <v-container v-else-if="!loading">
+        You do not have permission to access this section.
+    </v-container>
 </template>
 
 <script>
@@ -28,11 +31,19 @@
         data: function() {
             return {
                 tab: 0,
+                isAdmin: false,
+                loading: true,
             }
         },
         props: {
             language: String
         },
+        beforeMount() {
+            axios.get('/users/is-admin').then((response) => {
+                this.isAdmin = response.data;
+                this.loading = false;
+            });
+        },
         mounted() {
         },
         methods: {
diff --git a/resources/js/components/Admin/AdminUserSettings.vue b/resources/js/components/Admin/AdminUserSettings.vue
index 12bba121..66586c19 100644
--- a/resources/js/components/Admin/AdminUserSettings.vue
+++ b/resources/js/components/Admin/AdminUserSettings.vue
@@ -1,7 +1,7 @@
 <template>
-    <div id="admin-user-settings">
+    <div id="admin-user-settings" v-if="!error && !loading">
         <!-- Add or edit user dialog -->
-        <admin-edit-user-dialog 
+        <admin-edit-user-dialog
             v-if="editDialog.active"
             v-model="editDialog.active"
             :_user-id="editDialog.userId"
@@ -10,12 +10,12 @@
             :_is-admin="editDialog.isAdmin"
             @user-saved="closeUserDialog"
         ></admin-edit-user-dialog>
-        
+
         <!-- Title subheader -->
         <div class="d-flex subheader mt-4 mb-4 px-2 ">
             Users
             <v-spacer />
-            <v-btn rounded dark color="primary" @click="addUser" disabled>
+            <v-btn rounded dark color="primary" @click="addUser" >
                 <v-icon class="mr-1">mdi-plus</v-icon>
                 Add user
             </v-btn>
@@ -41,15 +41,15 @@
                         {{ user.is_admin ? 'Yes' : 'No' }}
                     </td>
                     <td class="text-center">
-                        <v-btn 
-                            icon 
+                        <v-btn
+                            icon
                             title="Edit"
                             @click="editUser(user)"
                         >
                             <v-icon>mdi-pencil</v-icon>
                         </v-btn>
-                        <v-btn 
-                            icon 
+                        <v-btn
+                            icon
                             title="Delete"
                             color="error"
                         >
diff --git a/resources/js/components/Layout.vue b/resources/js/components/Layout.vue
index 94467e04..24f95cc2 100644
--- a/resources/js/components/Layout.vue
+++ b/resources/js/components/Layout.vue
@@ -1,6 +1,6 @@
 <template>
    <v-app :class="{'eink': theme == 'eink', 'dark': theme == 'dark'}">
-        
+
         <!-- Dialogs -->
         <start-review-dialog v-model="startReviewDialog" />
         <logout-dialog v-model="logoutDialog"/>
@@ -9,13 +9,13 @@
             <theme-selection-dialog v-model="themeSelectionDialog" @input="updateTheme"></theme-selection-dialog>
             <language-selection-dialog v-model="languageSelectionDialog"></language-selection-dialog>
             <v-navigation-drawer
-                id="navigation-drawer" 
-                app 
+                id="navigation-drawer"
+                app
                 dense
-                :class="{'eink': theme == 'eink'}" 
-                :mini-variant="$vuetify.breakpoint.md || navbarCollapsed" 
-                :permanent="$vuetify.breakpoint.mdAndUp" 
-                v-model="drawer" 
+                :class="{'eink': theme == 'eink'}"
+                :mini-variant="$vuetify.breakpoint.md || navbarCollapsed"
+                :permanent="$vuetify.breakpoint.mdAndUp"
+                v-model="drawer"
                 color="foreground"
             >
                 <!-- Logo -->
@@ -27,10 +27,10 @@
 
                 <v-list nav shaped dense class="pl-0">
                     <!-- Navigation buttons -->
-                    <v-list-item 
-                        class="navigation-button" 
-                        v-for="(item, index) in navigation" 
-                        :key="index" 
+                    <v-list-item
+                        class="navigation-button"
+                        v-for="(item, index) in navigation"
+                        :key="index"
                         :to="item.url"
                         @click="navigationClick(item.name, $event)"
                     >
@@ -72,7 +72,7 @@
                             <v-icon>mdi-palette</v-icon>
                         </v-btn>
                         <v-btn id="language" rounded text class="mini-drawer-button" @click="languageSelectionDialog = true" title="Select language">
-                            <v-img :src="'/images/flags/' + selectedLanguage.toLowerCase() + '.png'" max-width="31" height="20"></v-img> 
+                            <v-img :src="'/images/flags/' + selectedLanguage.toLowerCase() + '.png'" max-width="31" height="20"></v-img>
                         </v-btn>
                     </template>
                 </template>
@@ -84,9 +84,9 @@
                     <span>More</span>
                     <v-icon>mdi-menu</v-icon>
                 </v-btn><v-spacer></v-spacer>
-                <v-btn 
+                <v-btn
                     class="text-decoration-none"
-                    grow 
+                    grow
                     v-for="(item, index) in navigation"
                     :key="index"
                     :to="item.url"
@@ -97,7 +97,6 @@
                 </v-btn>
             </v-bottom-navigation>
         </template>
-        
         <v-main :style="{background: $vuetify.theme.currentTheme.background}" :class="{ eink: theme == 'eink'}">
             <router-view :user-count="$props._userCount" :language="selectedLanguage" :key="$route.fullPath"></router-view>
         </v-main>
@@ -157,12 +156,6 @@
                         icon: 'mdi-account-cog',
                         bottomNav: false,
                     },
-                    {
-                        name: 'Admin settings',
-                        url: '/admin',
-                        icon: 'mdi-shield-lock',
-                        bottomNav: false,
-                    },
                     {
                         name: 'User manual',
                         url: '/user-manual',
@@ -179,6 +172,7 @@
                 default: '',
             },
             _userCount: Number,
+            _isAdmin: Boolean,
         },
         beforeMount() {
             if (this.$props._selectedLanguage == 'japanese') {
@@ -190,6 +184,17 @@
                 });
             }
 
+            console.log("is admin: " + this.$props._isAdmin);
+
+            if(this.$props._isAdmin == true) {
+                this.navigation.push({
+                    name: 'Admin settings',
+                    url: '/admin',
+                    icon: 'mdi-shield-lock',
+                    bottomNav: false,
+                });
+            }
+
             // load theme
             ThemeService.loadTheme(defaultThemes, this.$cookie, this.$vuetify);
 
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index f8d8c6bd..1780676c 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,2 +1,2 @@
 @extends('layouts.user')
-@section('content')<layout _user-name="{{ $userName }}" :_user-count="{{ $userCount }}" _selected-language="{{ $language }}"></layout>@endsection
\ No newline at end of file
+@section('content')<layout _user-name="{{ $userName }}" :_user-count="{{ $userCount }}" _is-admin="{{ $isAdmin }}" _selected-language="{{ $language }}"></layout>@endsection
diff --git a/routes/web.php b/routes/web.php
index 2d07acac..e144656b 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -26,12 +26,17 @@
 Route::group(['middleware' => 'web'], function () {
     Route::post('/users/create', [App\Http\Controllers\UserController::class, 'createUser']);
 });
-
 Route::group(['middleware' => ['auth', 'web']], function () {
-    Route::get ('/users/get', [App\Http\Controllers\UserController::class, 'getUsers']);
+
+    Route::group(['middleware' => 'admin'], function () {
+        Route::get ('/users/get', [App\Http\Controllers\UserController::class, 'getUsers']);
+        Route::post('/dictionary/update', [App\Http\Controllers\DictionaryController::class, 'updateDictionary']);
+        // Add other routes that need admin permission here.
+        // Or break this up into multple groups so that we can keep them organised in their relevant sections
+    });
 
     // users
-    Route::get ('/users/get', [App\Http\Controllers\UserController::class, 'getUsers']);
+    Route::get('/users/is-admin',  [App\Http\Controllers\UserController::class, 'isAdmin']); // Adding a isAdmin check endpoint which is used on the admin settings adminLayout page.
     Route::post('/users/update', [App\Http\Controllers\UserController::class, 'updateUser']);
     Route::post('/users/update-password', [App\Http\Controllers\UserController::class, 'updatePassword']);
     Route::get ('/users/is-password-changed', [App\Http\Controllers\UserController::class, 'isUserPasswordChanged']);
@@ -67,7 +72,7 @@
     Route::get('/vocabulary/search/{text}/{stage}/{book}/{chapter}/{translation}/{phrases}/{orderBy}/{page}', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/kanji/search', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/kanji/{character}', [App\Http\Controllers\HomeController::class, 'index']);
-    
+
     // home
     Route::post('/statistics/get', [App\Http\Controllers\HomeController::class, 'getStatistics']);
     Route::get('/language/change/{language}', [App\Http\Controllers\HomeController::class, 'changeLanguage']);
@@ -90,8 +95,8 @@
     Route::post('/settings/global/update', [App\Http\Controllers\SettingsController::class, 'updateGlobalSettings']);
     Route::post('/settings/user/get', [App\Http\Controllers\SettingsController::class, 'getUserSettingsByName']);
     Route::post('/settings/user/update', [App\Http\Controllers\SettingsController::class, 'updateUserSettings']);
-    
-    // images 
+
+    // images
     Route::get('/images/book_images/{fileName}', [App\Http\Controllers\ImageController::class, 'getBookImage']);
 
     // dictionaries
@@ -103,7 +108,6 @@
     Route::get('/dictionaries/deepl/is-enabled', [App\Http\Controllers\DictionaryController::class, 'isDeeplEnabled']);
     Route::get('/dictionaries/get', [App\Http\Controllers\DictionaryController::class, 'getDictionaries']);
     Route::get('/dictionary/get/{dictionaryId}', [App\Http\Controllers\DictionaryController::class, 'getDictionary']);
-    Route::post('/dictionary/update', [App\Http\Controllers\DictionaryController::class, 'updateDictionary']);
     Route::post('/dictionary/search', [App\Http\Controllers\DictionaryController::class, 'searchDefinitions']);
     Route::post('/dictionary/search-for-hover-vocabulary', [App\Http\Controllers\DictionaryController::class, 'searchDefinitionsForHoverVocabulary']);
     Route::post('/dictionary/search/inflections', [App\Http\Controllers\DictionaryController::class, 'searchInflections']);
@@ -126,7 +130,7 @@
     Route::get ('/vocabulary/example-sentence/{targetType}/{targetId}', [App\Http\Controllers\VocabularyController::class, 'getExampleSentence']);
     Route::post('/kanji/search', [App\Http\Controllers\VocabularyController::class, 'searchKanji']);
     Route::post('/kanji/details', [App\Http\Controllers\VocabularyController::class, 'getKanjiDetails']);
-    
+
     // review
     Route::post('/reviews', [App\Http\Controllers\ReviewController::class, 'getReviewItems']);
     Route::post('/reviews/update', [App\Http\Controllers\ReviewController::class, 'updateReadWordsGoal']);
@@ -136,7 +140,7 @@
     Route::post('/flashcards/delete', [App\Http\Controllers\FlashcardController::class, 'deleteFlashcardCollection']);
     Route::post('/flashcards/get', [App\Http\Controllers\FlashcardController::class, 'getFlashcardCollection']);
     Route::post('/flashcards/save', [App\Http\Controllers\FlashcardController::class, 'saveFlashcardCollection']);
-    
+
     // anki
     Route::post('/anki/add-card', [App\Http\Controllers\AnkiController::class, 'addCardToAnki']);
 
@@ -146,7 +150,7 @@
     Route::post('/books/create', [App\Http\Controllers\BookController::class, 'createBook']);
     Route::post('/books/update', [App\Http\Controllers\BookController::class, 'updateBook']);
     Route::post('/books/delete', [App\Http\Controllers\BookController::class, 'deleteBook']);
-    
+
     // chapters
     Route::post('/chapters', [App\Http\Controllers\ChapterController::class, 'getChaptersForBook']);
     Route::post('/chapters/get/reader', [App\Http\Controllers\ChapterController::class, 'getChapterForReader']);
@@ -161,4 +165,4 @@
     Route::post('/youtube/get-subtitle-list', [App\Http\Controllers\ImportController::class, 'getYoutubeSubtitles']);
     Route::post('/subtitle/get-subtitle-file-content', [App\Http\Controllers\ImportController::class, 'getSubtitleFileContent']);
     Route::post('/website/get-text', [App\Http\Controllers\ImportController::class, 'getWebsiteText']);
-});
\ No newline at end of file
+});

From 755f5291c03c8e8836b9bfda4eea74aa98488163 Mon Sep 17 00:00:00 2001
From: Jaco <jaco@vancran.com>
Date: Tue, 23 Apr 2024 16:28:50 +0200
Subject: [PATCH 2/4] Add Jellyfin "Enable" toggle

---
 .../Controllers/MediaPlayerController.php     | 15 +++--
 app/Http/Controllers/SettingsController.php   |  8 +--
 database/seeders/SettingsSeeder.php           |  8 +++
 .../js/components/Admin/AdminApiSettings.vue  | 58 +++++++++++++------
 4 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/MediaPlayerController.php b/app/Http/Controllers/MediaPlayerController.php
index a7508917..09784425 100644
--- a/app/Http/Controllers/MediaPlayerController.php
+++ b/app/Http/Controllers/MediaPlayerController.php
@@ -16,6 +16,7 @@ class MediaPlayerController extends Controller
     // production
     private $apiKey = '0000';
     private $apiHost = 'http://jellyfin:8096';
+    private $enabled = false;
 
     private $jellyfinLanguageCodes = [];
 
@@ -23,6 +24,8 @@ function __construct() {
         $this->jellyfinLanguageCodes = config('linguacafe.languages.jellyfin_language_codes');
 
         // retrieve api key and host from database
+        $setting = Setting::where('name', 'jellyfinEnabled')->firstOrNull();
+        $this->enabled = $setting->value;
         $setting = Setting::where('name', 'jellyfinApiKey')->first();
         $this->apiKey = json_decode($setting->value);
         $setting = Setting::where('name', 'jellyfinHost')->first();
@@ -56,7 +59,7 @@ private function makeJellyfinRequest ($method, $url) {
     public function jellyfinRequest (Request $request) {
         return $this->makeJellyfinRequest($request->method, $request->url);
     }
-    
+
     /*
         Returns a list of subtitles of the media currently being played
         on the jellyfin server.
@@ -90,7 +93,7 @@ public function getJellyfinCurrentlyPlayedSubtitles () {
             } else {
                 $session->movieName = $sessions[$sessionCounter]['NowPlayingItem']['Name'];
             }
-            
+
             $session->runTimeTicks = $sessions[$sessionCounter]['NowPlayingItem']['RunTimeTicks'];
             $session->nowPlayingItemId = $sessions[$sessionCounter]['NowPlayingItem']['Id'];
             $session->sessionId = $sessions[$sessionCounter]['Id'];
@@ -109,14 +112,14 @@ public function getJellyfinCurrentlyPlayedSubtitles () {
                 }
 
                 $subtitleText = $this->makeJellyfinRequest('GET', '/Videos/' . $session->nowPlayingItemId . '/' . $session->mediaSourceId . '/Subtitles/ ' . $mediaSource['MediaStreams'][$subtitleCounter]['Index'] . '/0/Stream.js');
-                
+
                 // add language for subtitles that Jellyfin did not recognise
                 if (!isset($mediaSource['MediaStreams'][$subtitleCounter]['Language'])) {
                     $mediaSource['MediaStreams'][$subtitleCounter]['Language'] = 'unrecognised by jellyfin: ' . $mediaSource['MediaStreams'][$subtitleCounter]['Title'];
                 }
-                
+
                 // retrieve language. if not possible, use the jellyfin language code instead,
-                // so it can be viewed as an error message in the console and added to 
+                // so it can be viewed as an error message in the console and added to
                 // jellyfinLanguageCodes.
                 if (array_key_exists($mediaSource['MediaStreams'][$subtitleCounter]['Language'], $this->jellyfinLanguageCodes)) {
                     $language = $this->jellyfinLanguageCodes[$mediaSource['MediaStreams'][$subtitleCounter]['Language']];
@@ -125,7 +128,7 @@ public function getJellyfinCurrentlyPlayedSubtitles () {
                     $language = $mediaSource['MediaStreams'][$subtitleCounter]['Language'];
                     $supportedLanguage = false;
                 }
-                
+
                 $subtitle = new \stdClass();
                 $subtitle->language = $language;
                 $subtitle->supportedLanguage = $supportedLanguage;
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 0365e1bd..f321d8b9 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -31,7 +31,7 @@ public function getGlobalSettingsByName(GetGlobalSettingsByNameRequest $request)
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
-        
+
         return response()->json($settings, 200);
     }
 
@@ -44,7 +44,7 @@ public function updateGlobalSettings(UpdateGlobalSettingsRequest $request) {
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
-        
+
         return response()->json('Settings have been updated successfully.', 200);
     }
 
@@ -58,7 +58,7 @@ public function getUserSettingsByName(GetUserSettingsByNameRequest $request) {
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
-        
+
         return response()->json($settings, 200);
     }
 
@@ -72,7 +72,7 @@ public function updateUserSettings(UpdateUserSettingsRequest $request) {
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
-        
+
         return response()->json('Settings have been updated successfully.', 200);
     }
 }
diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php
index dc5c4303..be66706f 100644
--- a/database/seeders/SettingsSeeder.php
+++ b/database/seeders/SettingsSeeder.php
@@ -23,6 +23,14 @@ public function run()
         }
 
         // jellyfin api settings
+        $setting = Setting::where('name', 'jellyfinEnabled')->first();
+        if (!$setting) {
+            DB::table('settings')->insert([
+                'name' => 'jellyfinEnabled',
+                'value' => json_encode(false)
+            ]);
+        }
+
         $setting = Setting::where('name', 'jellyfinApiKey')->first();
         if (!$setting) {
             DB::table('settings')->insert([
diff --git a/resources/js/components/Admin/AdminApiSettings.vue b/resources/js/components/Admin/AdminApiSettings.vue
index 90caf249..7685e8c2 100644
--- a/resources/js/components/Admin/AdminApiSettings.vue
+++ b/resources/js/components/Admin/AdminApiSettings.vue
@@ -8,7 +8,7 @@
                 <label class="font-weight-bold"">
                     DeepL Cache
                 </label>
-                
+
                 <div v-if="characterLimitLoading">
                     <v-skeleton-loader
                         id="skeleton-cached-translations"
@@ -16,14 +16,14 @@
                         type="image"
                     ></v-skeleton-loader>
                 </div>
-                
+
                 <div v-if="!characterLimitLoading">
                     {{ formatNumber(cachedDeeplTranslations).replace('&nbsp;', '') }} cached translations.
                 </div>
 
                 <!-- DeepL API key input -->
                 <label class="font-weight-bold mt-4">DeepL API key</label>
-                <v-text-field 
+                <v-text-field
                     v-model="settings.deeplApiKey"
                     class="mb-4"
                     hide-details
@@ -35,9 +35,9 @@
                 ></v-text-field>
 
                 <!-- DeepL API usage -->
-                <label 
+                <label
                     v-if="!['error', 'default'].includes(characterLimitStatus)"
-                    class="font-weight-bold mt-4" 
+                    class="font-weight-bold mt-4"
                 >
                     DeepL character usage
                 </label>
@@ -75,9 +75,9 @@
                         <div class="font-weight-bold mt-2 mb-3" style="font-size: 36px;">
                             {{ formatNumber(characterUsed).replace('&nbsp;', '') }}
                         </div>
-                        
+
                         <div>Out of max.{{ formatNumber(characterLimit) }} characters</div>
-                        
+
                         <v-progress-linear
                             color="primary"
                             height="36"
@@ -109,7 +109,7 @@
         <v-card outlined class="rounded-lg pa-4 pt-0">
             <v-card-text id="jellyfin-card-text">
                 <label class="font-weight-bold">Anki-connect host</label>
-                <v-text-field 
+                <v-text-field
                     v-model="settings.ankiConnectHost"
                     hide-details
                     filled
@@ -123,7 +123,7 @@
                 <!-- Auto add cards label -->
                 <label class="font-weight-bold mt-4 mb-0">
                     Auto add cards while reading
-                    
+
                     <!-- Auto add cards info box -->
                     <v-menu offset-y nudge-top="-12px">
                         <template v-slot:activator="{ on, attrs }">
@@ -148,7 +148,7 @@
                 <!-- Update existing cards label -->
                 <label class="font-weight-bold mt-4 mb-0">
                     Update existing cards
-                    
+
                     <!-- Update existing cards info box -->
                     <v-menu offset-y nudge-top="-12px">
                         <template v-slot:activator="{ on, attrs }">
@@ -159,7 +159,7 @@
                         </v-card>
                     </v-menu>
                 </label>
-                
+
                 <!-- Update existing cards input -->
                 <v-switch
                     v-model="settings.ankiUpdateCards"
@@ -173,7 +173,7 @@
                 <!-- Show notifications label -->
                 <label class="font-weight-bold mt-4 mb-0">
                     Show notifications
-                    
+
                     <!-- Show notifications info box -->
                     <v-menu offset-y nudge-top="-12px">
                         <template v-slot:activator="{ on, attrs }">
@@ -201,8 +201,30 @@
         <div class="subheader subheader-margin-top">Jellyfin</div>
         <v-card outlined class="rounded-lg pa-4 pt-0">
             <v-card-text id="jellyfin-card-text">
+                <label clas="font-weight-bold mt-4 mb-0">
+                    Enable Jellyfin
+
+                    <v-menu offset-y nudge-top="-12px">
+                        <template v-slot:activator="{ on, attrs }">
+                            <v-icon class="ml-1" v-bind="attrs" v-on="on">mdi-help-circle-outline</v-icon>
+                        </template>
+                        <v-card outlined class="rounded-lg pa-4" width="320px">
+                           You may want to disable Jellyfin if hosting LinguaCafe for multiple users.
+                        </v-card>
+                    </v-menu>
+                </label>
+
+                <v-switch
+                    v-model="settings.jellyfinEnabled"
+                    class="mt-0"
+                    color="primary"
+                    hide-hints
+                    dense
+                    label="Enable Jellyfin"
+                ></v-switch>
+
                 <label class="font-weight-bold">Jellyfin host address</label>
-                <v-text-field 
+                <v-text-field
                     v-model="settings.jellyfinHost"
                     hide-details
                     filled
@@ -213,7 +235,7 @@
                 ></v-text-field>
 
                 <label class="font-weight-bold mt-4">Jellyfin API key</label>
-                <v-text-field 
+                <v-text-field
                     v-model="settings.jellyfinApiKey"
                     hide-details
                     filled
@@ -240,8 +262,8 @@
         <!-- Save button -->
         <div class="d-flex">
             <v-spacer />
-            <v-btn 
-                rounded 
+            <v-btn
+                rounded
                 :class="{'my-2': saving || saveStatus == '' || saveStatus == 'success'}"
                 color="primary"
                 @click="saveSettings"
@@ -298,6 +320,7 @@
                 axios.post('/settings/global/get', {
                     'settingNames': [
                         'deeplApiKey',
+                        'jellyfinEnabled',
                         'jellyfinHost',
                         'jellyfinApiKey',
                         'ankiConnectHost',
@@ -312,7 +335,7 @@
             },
             saveSettings() {
                 this.saving = true;
-                
+
                 this.characterLimitLoading = true;
                 this.characterUsed = 0;
                 this.characterLimit = 0;
@@ -321,6 +344,7 @@
                 axios.post('/settings/global/update', {
                     'settings': {
                         'deeplApiKey': this.settings.deeplApiKey,
+                        'jellyfinEnabled': this.settings.jellyfinEnabled,
                         'jellyfinHost': this.settings.jellyfinHost,
                         'jellyfinApiKey': this.settings.jellyfinApiKey,
                         'ankiConnectHost': this.settings.ankiConnectHost,

From 99390898ebe488ac4a5928a92aa144b02aafa1cf Mon Sep 17 00:00:00 2001
From: Jaco <jaco@vancran.com>
Date: Tue, 23 Apr 2024 16:55:58 +0200
Subject: [PATCH 3/4] Remove debug

---
 resources/js/components/Layout.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/js/components/Layout.vue b/resources/js/components/Layout.vue
index 24f95cc2..903ee2c9 100644
--- a/resources/js/components/Layout.vue
+++ b/resources/js/components/Layout.vue
@@ -184,8 +184,6 @@
                 });
             }
 
-            console.log("is admin: " + this.$props._isAdmin);
-
             if(this.$props._isAdmin == true) {
                 this.navigation.push({
                     name: 'Admin settings',

From e26326163cccc1a45e26a8fde022658378c86e19 Mon Sep 17 00:00:00 2001
From: Jaco <jaco@vancran.com>
Date: Tue, 23 Apr 2024 18:28:43 +0200
Subject: [PATCH 4/4] Missing json_decode and fix

---
 app/Http/Controllers/MediaPlayerController.php      | 4 ++--
 resources/js/components/Admin/AdminUserSettings.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/MediaPlayerController.php b/app/Http/Controllers/MediaPlayerController.php
index 09784425..078c823a 100644
--- a/app/Http/Controllers/MediaPlayerController.php
+++ b/app/Http/Controllers/MediaPlayerController.php
@@ -24,8 +24,8 @@ function __construct() {
         $this->jellyfinLanguageCodes = config('linguacafe.languages.jellyfin_language_codes');
 
         // retrieve api key and host from database
-        $setting = Setting::where('name', 'jellyfinEnabled')->firstOrNull();
-        $this->enabled = $setting->value;
+        $setting = Setting::where('name', 'jellyfinEnabled')->first();
+        $this->enabled = json_decode($setting->value);
         $setting = Setting::where('name', 'jellyfinApiKey')->first();
         $this->apiKey = json_decode($setting->value);
         $setting = Setting::where('name', 'jellyfinHost')->first();
diff --git a/resources/js/components/Admin/AdminUserSettings.vue b/resources/js/components/Admin/AdminUserSettings.vue
index 66586c19..ba5afd9d 100644
--- a/resources/js/components/Admin/AdminUserSettings.vue
+++ b/resources/js/components/Admin/AdminUserSettings.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="admin-user-settings" v-if="!error && !loading">
+    <div id="admin-user-settings">
         <!-- Add or edit user dialog -->
         <admin-edit-user-dialog
             v-if="editDialog.active"