From 83f2a81e91e6a8361114fa581166695d36593ea5 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 19:43:24 +0000 Subject: [PATCH 01/20] changes --- .gitignore | 5 ++- app/Http/Controllers/ItemController.php | 13 +++++++ app/Http/Middleware/VerifyCsrfToken.php | 3 +- app/SupportedApps/Plex.php | 2 +- public/css/app.css | 40 +++++++++++++++++++++ public/mix-manifest.json | 2 +- public/storage | 1 + resources/assets/sass/_app.scss | 48 ++++++++++++++++++++++++- resources/views/app.blade.php | 1 + resources/views/items/create.blade.php | 3 ++ resources/views/items/edit.blade.php | 3 ++ resources/views/items/form.blade.php | 4 ++- resources/views/items/scripts.blade.php | 20 +++++++++++ routes/web.php | 2 ++ 14 files changed, 141 insertions(+), 6 deletions(-) create mode 120000 public/storage create mode 100644 resources/views/items/scripts.blade.php diff --git a/.gitignore b/.gitignore index afaccac0..52cfef59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /node_modules /public/hot -/public/storage +/public/storage/backgrounds +/public/storage/icons /storage/*.key /.idea /.vagrant @@ -8,3 +9,5 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log + +storage/app/public/.DS_Store diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index cf1ddcb7..15f000aa 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -237,4 +237,17 @@ class ItemController extends Controller return redirect()->route('items.index') ->with('success','Item restored successfully'); } + + /** + * Return details for supported apps + * + * @return Json + */ + public function appload(Request $request) + { + $app = $request->input('app'); + return "a: ".$app; + } + + } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 1c2d114e..de4a4c37 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -13,6 +13,7 @@ class VerifyCsrfToken extends Middleware */ protected $except = [ // - 'order' + 'order', + 'appload' ]; } diff --git a/app/SupportedApps/Plex.php b/app/SupportedApps/Plex.php index d767f50c..fd724736 100644 --- a/app/SupportedApps/Plex.php +++ b/app/SupportedApps/Plex.php @@ -3,6 +3,6 @@ class Plex implements Contracts\Applications { public function defaultColour() { - return '#ccc'; + return '#222'; } } \ No newline at end of file diff --git a/public/css/app.css b/public/css/app.css index e9b1cfca..2b8ecb9b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -963,6 +963,46 @@ a.settinglink { background: #d64d55; } +.ui-autocomplete { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + float: left; + display: none; + min-width: 160px; + padding: 4px 0; + margin: 0 0 10px 25px; + list-style: none; + background-color: #ffffff; + border-color: #ccc; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 1px; + border-radius: 5px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; +} + +.ui-menu-item { + display: block; + padding: 3px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #555555; + white-space: nowrap; + text-decoration: none; +} + +.ui-state-hover, +.ui-state-active { + font-weight: 700; +} + /*! Huebee v2.0.0 http://huebee.buzz ---------------------------------------------- */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1fa7d8eb..4f70ff4e 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=2102f4e7317cba78bff5", + "/css/app.css": "/css/app.css?id=e01da6a30207cefea3dd", "/js/app.js": "/js/app.js?id=2dffa24cf7255229e085" } \ No newline at end of file diff --git a/public/storage b/public/storage new file mode 120000 index 00000000..72992a99 --- /dev/null +++ b/public/storage @@ -0,0 +1 @@ +/Users/admin/Sites/heimdall/storage/app/public \ No newline at end of file diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index f687f6bb..198b7086 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -594,4 +594,50 @@ div.create { text-transform: uppercase; background: $app-red; } - } \ No newline at end of file + } + + .ui-autocomplete { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + float: left; + display: none; + min-width: 160px; + padding: 4px 0; + margin: 0 0 10px 25px; + list-style: none; + background-color: #ffffff; + border-color: #ccc; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 1px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; + +} + +.ui-menu-item { + display: block; + padding: 3px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #555555; + white-space: nowrap; + text-decoration: none; +} + +.ui-state-hover, .ui-state-active { + font-weight: 700; + +} \ No newline at end of file diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index f7eaea38..f5ffc722 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -77,6 +77,7 @@ + @yield('scripts') diff --git a/resources/views/items/create.blade.php b/resources/views/items/create.blade.php index 2d9b6ac1..6bb200d0 100644 --- a/resources/views/items/create.blade.php +++ b/resources/views/items/create.blade.php @@ -6,4 +6,7 @@ @include('items.form') {!! Form::close() !!} +@endsection +@section('scripts') + @include('items.scripts') @endsection \ No newline at end of file diff --git a/resources/views/items/edit.blade.php b/resources/views/items/edit.blade.php index ddd009b8..edb864ca 100644 --- a/resources/views/items/edit.blade.php +++ b/resources/views/items/edit.blade.php @@ -6,4 +6,7 @@ @include('items.form') {!! Form::close() !!} +@endsection +@section('scripts') + @include('items.scripts') @endsection \ No newline at end of file diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index c5d3e1ab..9a74ddaa 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -15,7 +15,7 @@
- {!! Form::text('title', null, array('placeholder' => 'Title','class' => 'form-control')) !!} + {!! Form::text('title', null, array('placeholder' => 'Title', 'id' => 'appname', 'class' => 'form-control')) !!}
@@ -61,3 +61,5 @@ + + diff --git a/resources/views/items/scripts.blade.php b/resources/views/items/scripts.blade.php new file mode 100644 index 00000000..ba767781 --- /dev/null +++ b/resources/views/items/scripts.blade.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index d1fc1bb4..5d25f86f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -22,6 +22,8 @@ Route::get('items/unpin/{id}', 'ItemController@unpin')->name('items.unpin'); Route::get('items/pintoggle/{id}/{ajax?}', 'ItemController@pinToggle')->name('items.pintoggle'); Route::post('order', 'ItemController@setOrder')->name('items.order'); +Route::post('appload', 'ItemController@appload')->name('appload'); + /** * Settings. */ From b9d212ed58351ca5d1b1db3b6bd2f729132d4836 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 19:45:40 +0000 Subject: [PATCH 02/20] remove symlink --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 52cfef59..bb37dc55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /node_modules /public/hot -/public/storage/backgrounds -/public/storage/icons +/public/storage /storage/*.key /.idea /.vagrant From 5a0321cd4f7982d35dbb0a55a2dca52270e3bca5 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 19:47:36 +0000 Subject: [PATCH 03/20] don't ignore supported apps --- storage/app/public/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore index d6b7ef32..bc3c8e3c 100644 --- a/storage/app/public/.gitignore +++ b/storage/app/public/.gitignore @@ -1,2 +1,3 @@ * +!supportedapps !.gitignore From 91ecd03c4ebd44dc4948926e478f146adc96ef64 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 19:49:20 +0000 Subject: [PATCH 04/20] supported apps --- storage/app/public/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore index bc3c8e3c..3edda924 100644 --- a/storage/app/public/.gitignore +++ b/storage/app/public/.gitignore @@ -1,3 +1,3 @@ * -!supportedapps +!supportedapps/ !.gitignore From bd8bac162f20af3c172de14ec073795e368b0ade Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 20:14:16 +0000 Subject: [PATCH 05/20] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bb37dc55..56f301ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /node_modules /public/hot /public/storage +!/public/storage/supportedapps/ /storage/*.key /.idea /.vagrant From 0cd8f551a128f953ab3c1436a5b0857f6f4533ab Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 20:29:56 +0000 Subject: [PATCH 06/20] git supported apps --- .gitignore | 1 - storage/app/.gitignore | 3 --- storage/app/public/supportedapps/plex.png | Bin 0 -> 11864 bytes 3 files changed, 4 deletions(-) create mode 100644 storage/app/public/supportedapps/plex.png diff --git a/.gitignore b/.gitignore index 56f301ac..bb37dc55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /node_modules /public/hot /public/storage -!/public/storage/supportedapps/ /storage/*.key /.idea /.vagrant diff --git a/storage/app/.gitignore b/storage/app/.gitignore index 8f4803c0..e69de29b 100644 --- a/storage/app/.gitignore +++ b/storage/app/.gitignore @@ -1,3 +0,0 @@ -* -!public/ -!.gitignore diff --git a/storage/app/public/supportedapps/plex.png b/storage/app/public/supportedapps/plex.png new file mode 100644 index 0000000000000000000000000000000000000000..3277ab1e7d29bdee342a11a8b0a5a9bfd9b2b35f GIT binary patch literal 11864 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 SA!Pvo0000 Date: Mon, 5 Feb 2018 20:59:38 +0000 Subject: [PATCH 07/20] Initial supported apps support --- app/Http/Controllers/ItemController.php | 8 +++++++- app/Item.php | 4 ++-- app/SupportedApps/Contracts/Applications.php | 2 ++ app/SupportedApps/Nzbget.php | 5 +++++ app/SupportedApps/Plex.php | 4 ++++ public/css/app.css | 4 ++++ public/mix-manifest.json | 2 +- resources/assets/sass/_app.scss | 6 ++++++ resources/views/items/form.blade.php | 4 +++- resources/views/items/scripts.blade.php | 5 +++-- 10 files changed, 37 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 15f000aa..0c863244 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -246,7 +246,13 @@ class ItemController extends Controller public function appload(Request $request) { $app = $request->input('app'); - return "a: ".$app; + if($app) { + $all_supported = Item::supportedList(); + $app_details = new $all_supported[$app]; + } + $output['icon'] = $app_details->icon(); + $output['colour'] = $app_details->defaultColour(); + return json_encode($output); } diff --git a/app/Item.php b/app/Item.php index 2121698d..9abc4971 100644 --- a/app/Item.php +++ b/app/Item.php @@ -26,8 +26,8 @@ class Item extends Model public static function supportedList() { return [ - 'NZBGet' => App\SupportedApps\Nzbget::class, - 'Plex' => App\SupportedApps\Plex::class, + 'NZBGet' => \App\SupportedApps\Nzbget::class, + 'Plex' => \App\SupportedApps\Plex::class, ]; } public static function supportedOptions() diff --git a/app/SupportedApps/Contracts/Applications.php b/app/SupportedApps/Contracts/Applications.php index 31fe5e58..535c7958 100644 --- a/app/SupportedApps/Contracts/Applications.php +++ b/app/SupportedApps/Contracts/Applications.php @@ -3,5 +3,7 @@ interface Applications { public function defaultColour(); + + public function icon(); } \ No newline at end of file diff --git a/app/SupportedApps/Nzbget.php b/app/SupportedApps/Nzbget.php index 529b2d8d..91a13b71 100644 --- a/app/SupportedApps/Nzbget.php +++ b/app/SupportedApps/Nzbget.php @@ -5,4 +5,9 @@ class Nzbget implements Contracts\Applications { { return '#ccc'; } + public function icon() + { + return 'supportedapps/nzbget.png'; + } + } \ No newline at end of file diff --git a/app/SupportedApps/Plex.php b/app/SupportedApps/Plex.php index fd724736..669d36d5 100644 --- a/app/SupportedApps/Plex.php +++ b/app/SupportedApps/Plex.php @@ -5,4 +5,8 @@ class Plex implements Contracts\Applications { { return '#222'; } + public function icon() + { + return 'supportedapps/plex.png'; + } } \ No newline at end of file diff --git a/public/css/app.css b/public/css/app.css index 2b8ecb9b..ec198820 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1003,6 +1003,10 @@ a.settinglink { font-weight: 700; } +#appimage img { + max-width: 150px; +} + /*! Huebee v2.0.0 http://huebee.buzz ---------------------------------------------- */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 4f70ff4e..2c387c10 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=e01da6a30207cefea3dd", + "/css/app.css": "/css/app.css?id=69336a09561650860b52", "/js/app.js": "/js/app.js?id=2dffa24cf7255229e085" } \ No newline at end of file diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index 198b7086..7bf5a22d 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -640,4 +640,10 @@ div.create { .ui-state-hover, .ui-state-active { font-weight: 700; +} + +#appimage { + img { + max-width: 150px; + } } \ No newline at end of file diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index 9a74ddaa..1c065f4c 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -28,10 +28,12 @@
+
@if(isset($item->icon) && !empty($item->icon)) - View current icon + {!! Form::hidden('icon', $item->icon, ['class' => 'form-control']) !!} @endif +
diff --git a/resources/views/items/scripts.blade.php b/resources/views/items/scripts.blade.php index ba767781..821238dc 100644 --- a/resources/views/items/scripts.blade.php +++ b/resources/views/items/scripts.blade.php @@ -12,8 +12,9 @@ source: availableTags, select: function( event, ui ) { $.post('/appload', { app: ui.item.value }, function(data) { - alert(data); - }); + $('#appimage').html(""); + $('input[name=colour]').val(data.colour); + }, "json"); } }); }); From 983cf98b9ed02b48cbb377f194ad4c1116e35ef2 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 21:13:56 +0000 Subject: [PATCH 08/20] Delete storage --- public/storage | 1 - 1 file changed, 1 deletion(-) delete mode 120000 public/storage diff --git a/public/storage b/public/storage deleted file mode 120000 index 72992a99..00000000 --- a/public/storage +++ /dev/null @@ -1 +0,0 @@ -/Users/admin/Sites/heimdall/storage/app/public \ No newline at end of file From ade028767a0674f7862b6327ecc3e0f0794d6455 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Mon, 5 Feb 2018 23:08:37 +0000 Subject: [PATCH 09/20] 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 @@
+
+