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. */