Merge pull request #364 from linuxserver/hometags

Allow apps to be tagged to the homepage

app/Http/Controllers/ItemController.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Storage;
 use App\SupportedApps;
 use App\Jobs\ProcessApps;
 use App\Search;
+use Illuminate\Support\Facades\Route;
 
 class ItemController extends Controller
 {
@@ -27,8 +28,16 @@ class ItemController extends Controller
      */
     public function dash()
     {
-        $data['apps'] = Item::doesntHave('parents')->pinned()->orderBy('order', 'asc')->get();
-        $data['all_apps'] = Item::doesntHave('parents')->get();
+        $data['apps'] = Item::whereHas('parents', function ($query) {
+            $query->where('id', 0);
+        })->pinned()->orderBy('order', 'asc')->get();
+
+        $data['all_apps'] = Item::whereHas('parents', function ($query) {
+            $query->where('id', 0);
+        })->orderBy('order', 'asc')->get();
+
+        //$data['all_apps'] = Item::doesntHave('parents')->get();
+        //die(print_r($data['apps']));
         return view('welcome', $data);
     }
 
@@ -80,20 +89,25 @@ class ItemController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function pinToggle($id, $ajax=false)
+    public function pinToggle($id, $ajax=false, $tag=false)
     {
         $item = Item::findOrFail($id);
         $new = ((bool)$item->pinned === true) ? false : true;
         $item->pinned = $new;
         $item->save();
         if($ajax) {
-            $data['apps'] = Item::pinned()->get();
+            if(is_numeric($tag) && $tag > 0) {
+                $item = Item::whereId($tag)->first();
+                $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+            } else {
+                $data['apps'] = Item::pinned()->orderBy('order', 'asc')->get();
+            }
             $data['ajax'] = true;
             return view('sortable', $data);
         } else {
             $route = route('dash', [], false);
             return redirect($route);
-            }
+        }
     }
 
    
@@ -125,6 +139,7 @@ class ItemController extends Controller
     {
         //
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['tags']->prepend(__('app.dashboard'), 0);
         $data['current_tags'] = [];
         return view('items.create', $data);
 
@@ -200,8 +215,10 @@ class ItemController extends Controller
         // Get the item
         $data['item'] = Item::find($id);
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
-        $data['current_tags'] = $data['item']->parents;
-
+        $data['tags']->prepend(__('app.dashboard'), 0);
+        $data['current_tags'] = $data['item']->tags();
+        //$data['current_tags'] = $data['item']->parent;
+        //die(print_r($data['current_tags']));
         // show the edit form and pass the nerd
         return view('items.edit', $data);    
     }

app/Http/Controllers/TagController.php

@@ -22,8 +22,8 @@ class TagController extends Controller
     {
         $trash = (bool)$request->input('trash');
 
-        $data['apps'] = Item::ofType('tag')->orderBy('title', 'asc')->get();
-        $data['trash'] = Item::ofType('tag')->onlyTrashed()->get();
+        $data['apps'] = Item::ofType('tag')->where('id', '>', 0)->orderBy('title', 'asc')->get();
+        $data['trash'] = Item::ofType('tag')->where('id', '>', 0)->onlyTrashed()->get();
         if($trash) {
             return view('tags.trash', $data);
         } else {
@@ -90,6 +90,7 @@ class TagController extends Controller
         $item = Item::whereUrl($slug)->first();
         //print_r($item);
         $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+        $data['tag'] = $item->id;
         $data['all_apps'] = $item->children;
         return view('welcome', $data);
     }

app/Item.php

@@ -7,6 +7,7 @@ use Symfony\Component\ClassLoader\ClassMapGenerator;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use App\User;
+use App\ItemTag;
 use App\Application;
 
 class Item extends Model
@@ -19,7 +20,7 @@ class Item extends Model
 
         static::addGlobalScope('user_id', function (Builder $builder) {
             $current_user = User::currentUser();
-            $builder->where('user_id', $current_user->id);
+            $builder->where('user_id', $current_user->id)->orWhere('user_id', 0);
         });
     }
 
@@ -70,6 +71,25 @@ class Item extends Model
 
     }
 
+
+    public function tags()
+    {
+        $id = $this->id;
+        $tags = ItemTag::select('tag_id')->where('item_id', $id)->pluck('tag_id')->toArray();
+        $tagdetails = Item::select('id', 'title', 'url', 'pinned')->whereIn('id', $tags)->get();
+        //print_r($tags);
+        if(in_array(0, $tags)) {
+            $details = new Item([
+                "id" => 0,
+                "title" => __('app.dashboard'),
+                "url" => '',
+                "pinned" => 0
+            ]);
+            $tagdetails->prepend($details);
+        }
+        return $tagdetails;
+    }
+
     public function parents()
     {
         return $this->belongsToMany('App\Item', 'item_tag', 'item_id', 'tag_id');

app/ItemTag.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class ItemTag extends Pivot
+{
+    
+}

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.2.0',
+    'version' => '2.2.1',
 
     /*
     |--------------------------------------------------------------------------

database/seeds/SettingsSeeder.php

@@ -194,5 +194,22 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
+        if(!$home_tag = \App\Item::find(0)) {
+            $home_tag = new \App\Item;
+            $home_tag->id = 0;
+            $home_tag->title = 'app.dashboard';
+            $home_tag->pinned = 0;
+            $home_tag->url = '';
+            $home_tag->type = 1;
+            $home_tag->user_id = 0;
+            $home_tag->save();
+
+            $homeapps = \App\Item::withoutGlobalScope('user_id')->doesntHave('parents')->get();
+            foreach($homeapps as $app) {
+                if($app->id === 0) continue;
+                $app->parents()->attach(0);
+            }
+        }
+
     }
 }

package.json

@@ -13,7 +13,9 @@
         "bootstrap-sass": "^3.4.1",
         "cross-env": "^5.2.0",
         "jquery": "^3.4.1",
-        "laravel-mix": "^4.0.16"
+        "laravel-mix": "^4.0.16",
+        "sass": "^1.21.0",
+        "sass-loader": "7.*"
     },
     "dependencies": {
         "select2": "^4.0.7"

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=c067b0b68e4516e903e1",
-    "/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d"
+    "/css/app.css": "/css/app.css?id=62b46d36567ec0e3418f",
+    "/js/app.js": "/js/app.js?id=d8215a9716aec5f9e409"
 }

resources/assets/js/app.js

@@ -182,7 +182,8 @@ $.when( $.ready ).then(function() {
         e.preventDefault();
         var current = $(this);
         var id = current.data('id');
-        $.get('items/pintoggle/'+id+'/true', function(data) {
+        var tag = current.data('tag');
+        $.get('/items/pintoggle/'+id+'/true/'+tag, function(data) {
             var inner = $(data).filter('#sortable').html();
             $('#sortable').html(inner);
             current.toggleClass('active');

resources/lang/en/app.php

@@ -79,6 +79,8 @@ return [
     'apps.preview' => 'Preview',
     'apps.apptype' => 'Application Type',
 
+    'dashboard' => 'Home dashboard',
+
     'user.user_list' => 'Users',
     'user.add_user' => 'Add user',
     'user.username' => 'Username',

resources/views/layouts/app.blade.php

@@ -26,7 +26,7 @@
         <meta name="theme-color" content="#ffffff">
         <meta name="mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-capable" content="yes">
-        <link rel="stylesheet" href="{{ asset('css/app.css') }}" type="text/css" />
+        <link rel="stylesheet" href="{{ asset('css/app.css?v=2') }}" type="text/css" />
         <script src="{{ asset('js/fontawesome.js') }}"></script>
     </head>
     <body>
@@ -40,7 +40,7 @@
                     <?php
                     $active = ((bool)$app->pinned === true) ? 'active' : '';
                     ?>
-                    <li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', [$app->id], false) }}"><i class="fas fa-thumbtack"></i></a></li>
+                    <li>{{ $app->title }}<a class="{{ $active }}" data-tag="{{ $tag ?? 0 }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', [$app->id], false, false) }}"><i class="fas fa-thumbtack"></i></a></li>
                     
                     @endforeach
                 </ul>
@@ -105,7 +105,7 @@
         </div>
         <script src="{{ asset('js/jquery-3.3.1.min.js') }}"></script>
         <script src="{{ asset('js/jquery-ui.min.js') }}"></script>
-        <script src="{{ asset('js/app.js?v=2') }}"></script>
+        <script src="{{ asset('js/app.js?v=4') }}"></script>
         @yield('scripts')
         
     </body>

routes/web.php

@@ -35,7 +35,7 @@ Route::get('tag/restore/{id}', 'TagController@restore')->name('tags.restore');
 Route::get('items/pin/{id}', 'ItemController@pin')->name('items.pin');
 Route::get('items/restore/{id}', 'ItemController@restore')->name('items.restore');
 Route::get('items/unpin/{id}', 'ItemController@unpin')->name('items.unpin');
-Route::get('items/pintoggle/{id}/{ajax?}', 'ItemController@pinToggle')->name('items.pintoggle');
+Route::get('items/pintoggle/{id}/{ajax?}/{tag?}', 'ItemController@pinToggle')->name('items.pintoggle');
 Route::post('order', 'ItemController@setOrder')->name('items.order');
 
 Route::post('appload', 'ItemController@appload')->name('appload');