From ade028767a0674f7862b6327ecc3e0f0794d6455 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 23:08:37 +0000 Subject: [PATCH] supported apps stuff --- app/Http/Controllers/ItemController.php | 1 + app/SupportedApps/Contracts/Applications.php | 2 ++ app/SupportedApps/Nzbget.php | 6 +++++- app/SupportedApps/Plex.php | 4 ++++ public/css/app.css | 5 +++++ public/js/app.js | 5 ----- public/mix-manifest.json | 4 ++-- resources/assets/js/app.js | 5 ----- resources/assets/sass/_app.scss | 5 +++++ resources/views/items/form.blade.php | 2 ++ resources/views/items/scripts.blade.php | 13 +++++++++++++ resources/views/supportedapps/nzbget.blade.php | 1 + routes/web.php | 4 ++++ storage/app/public/supportedapps/nzbget.png | Bin 0 -> 4931 bytes 14 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 resources/views/supportedapps/nzbget.blade.php create mode 100644 storage/app/public/supportedapps/nzbget.png diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 0c863244..c5342568 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -252,6 +252,7 @@ class ItemController extends Controller } $output['icon'] = $app_details->icon(); $output['colour'] = $app_details->defaultColour(); + $output['config'] = $app_details->configDetails(); return json_encode($output); } diff --git a/app/SupportedApps/Contracts/Applications.php b/app/SupportedApps/Contracts/Applications.php index 535c7958..99ddb1b7 100644 --- a/app/SupportedApps/Contracts/Applications.php +++ b/app/SupportedApps/Contracts/Applications.php @@ -5,5 +5,7 @@ interface Applications { public function defaultColour(); public function icon(); + + public function configDetails(); } \ No newline at end of file diff --git a/app/SupportedApps/Nzbget.php b/app/SupportedApps/Nzbget.php index 91a13b71..0163384b 100644 --- a/app/SupportedApps/Nzbget.php +++ b/app/SupportedApps/Nzbget.php @@ -3,11 +3,15 @@ class Nzbget implements Contracts\Applications { public function defaultColour() { - return '#ccc'; + return '#124019'; } public function icon() { return 'supportedapps/nzbget.png'; } + public function configDetails() + { + return 'nzbget'; + } } \ No newline at end of file diff --git a/app/SupportedApps/Plex.php b/app/SupportedApps/Plex.php index 669d36d5..31b27c2e 100644 --- a/app/SupportedApps/Plex.php +++ b/app/SupportedApps/Plex.php @@ -9,4 +9,8 @@ class Plex implements Contracts\Applications { { return 'supportedapps/plex.png'; } + public function configDetails() + { + return null; + } } \ No newline at end of file diff --git a/public/css/app.css b/public/css/app.css index ec198820..82c67c51 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1007,6 +1007,11 @@ a.settinglink { max-width: 150px; } +#sapconfig { + display: none; + width: 100%; +} + /*! Huebee v2.0.0 http://huebee.buzz ---------------------------------------------- */ diff --git a/public/js/app.js b/public/js/app.js index 834be77c..7dfd6f33 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -34,11 +34,6 @@ $.when( $.ready ).then(function() { $("#sortable").sortable("disable"); - $('.color-picker').each( function( i, elem ) { - var hueb = new Huebee( elem, { - // options - }); - }); $('#app').on('click', '#config-button', function(e) { e.preventDefault(); var app = $('#app'); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2c387c10..0e9bea16 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=69336a09561650860b52", - "/js/app.js": "/js/app.js?id=2dffa24cf7255229e085" + "/css/app.css": "/css/app.css?id=d32556b7ae5fe4651548", + "/js/app.js": "/js/app.js?id=559585a774e3f088503a" } \ No newline at end of file diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 1eb4981b..76fbd503 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -25,11 +25,6 @@ $.when( $.ready ).then(function() { $("#sortable").sortable("disable"); - $('.color-picker').each( function( i, elem ) { - var hueb = new Huebee( elem, { - // options - }); - }); $('#app').on('click', '#config-button', function(e) { e.preventDefault(); var app = $('#app'); diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index 7bf5a22d..050a3ae0 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -646,4 +646,9 @@ div.create { img { max-width: 150px; } +} + +#sapconfig { + display: none; + width: 100%; } \ No newline at end of file diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index 1c065f4c..d2c713f2 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -52,6 +52,8 @@ +
+