fix routes

fixes to RP

app/Http/Controllers/ItemController.php

@@ -49,7 +49,8 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = true;
         $item->save();
-        return redirect()->route('dash');
+        $route = route('dash', [], false);
+        return redirect($route);
     }
 
      /**
@@ -62,7 +63,8 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = false;
         $item->save();
-        return redirect()->route('dash');
+        $route = route('dash', [], false);
+        return redirect($route);
     }
 
      /**
@@ -81,8 +83,9 @@ class ItemController extends Controller
             $data['ajax'] = true;
             return view('sortable', $data);
         } else {
-            return redirect()->route('dash');           
-        }
+            $route = route('dash', [], false);
+            return redirect($route);
+            }
     }
 
    
@@ -151,7 +154,8 @@ class ItemController extends Controller
 
         $item->parents()->sync($request->tags);
 
-        return redirect()->route('dash')
+        $route = route('dash', [], false);
+        return redirect($route)
             ->with('success', __('app.alert.success.item_created'));
     }
 
@@ -214,7 +218,8 @@ class ItemController extends Controller
 
         $item->parents()->sync($request->tags);
 
-        return redirect()->route('dash')
+        $route = route('dash', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_updated'));
     }
 
@@ -235,8 +240,9 @@ class ItemController extends Controller
         } else {
             Item::find($id)->delete();
         }
-        
-        return redirect()->route('items.index')
+
+        $route = route('items.index', [], false);
+        return redirect($route)       
             ->with('success',__('app.alert.success.item_deleted'));
     }
 
@@ -251,8 +257,10 @@ class ItemController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();        
-        return redirect()->route('items.index')
+                ->restore();      
+        
+        $route = route('items.inded', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_restored'));
     }
 

app/Http/Controllers/SettingsController.php

@@ -39,7 +39,9 @@ class SettingsController extends Controller
                 'setting' => $setting,
             ]);
         } else {
-            return redirect()->route('settings.list')->with([
+            $route = route('settings.list', [], false);
+            return redirect($route) 
+            ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
@@ -73,11 +75,15 @@ class SettingsController extends Controller
 
             $setting->save();
 
-            return redirect()->route('settings.index')->with([
+            $route = route('settings.index', [], false);
+            return redirect($route) 
+            ->with([
                 'success' => __('app.alert.success.setting_updated'),
             ]);
         } else {
-            return redirect()->route('settings.index')->with([
+            $route = route('settings.index', [], false);
+            return redirect($route) 
+            ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
@@ -94,7 +100,9 @@ class SettingsController extends Controller
             $setting->value = '';
             $setting->save();
         }
-        return redirect()->route('settings.index')->with([
+        $route = route('settings.index', [], false);
+        return redirect($route) 
+        ->with([
             'success' => __('app.alert.success.setting_updated'),
         ]);
     

app/Http/Controllers/TagController.php

@@ -66,7 +66,8 @@ class TagController extends Controller
         //die(print_r($request->all()));
         Item::create($request->all());
 
-        return redirect()->route('dash')
+        $route = route('dash', [], false);
+        return redirect($route)
             ->with('success', __('app.alert.success.tag_created'));
     }
 
@@ -129,7 +130,8 @@ class TagController extends Controller
 
         Item::find($id)->update($request->all());
 
-        return redirect()->route('dash')
+        $route = route('dash', [], false);
+        return redirect($route)
         ->with('success',__('app.alert.success.tag_updated'));
     }
 
@@ -151,7 +153,8 @@ class TagController extends Controller
             Item::find($id)->delete();
         }
         
-        return redirect()->route('tags.index')
+        $route = route('tags.index', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_deleted'));
     }
 
@@ -167,7 +170,8 @@ class TagController extends Controller
         Item::withTrashed()
                 ->where('id', $id)
                 ->restore();        
-        return redirect()->route('tags.index')
+        $route = route('tags.index', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_restored'));
     }
 

config/app.php

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

readme.md

@@ -5,7 +5,7 @@ ____
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)](https://hub.docker.com/r/linuxserver/heimdall/)
 [![firsttimersonly](http://img.shields.io/badge/first--timers--only-friendly-blue.svg?style=flat-square)](http://www.firsttimersonly.com/)
 
-[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/heimdall)
+[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo)
 
 ___
 
@@ -133,7 +133,7 @@ https://discord.gg/CCjHKn4 or through Github issues
 ## Donate
 If you would like to show your appreciation, feel free to use the link below.
 
-[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/heimdall)
+[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo)
 
 ## Credits
 - PHP Framework - [Laravel](https://laravel.com/)

resources/views/app.blade.php

@@ -37,7 +37,7 @@
                     <?php
                     $active = ((bool)$app->pinned === true) ? 'active' : '';
                     ?>
-                    <li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', $app->id) }}"><i class="fas fa-thumbtack"></i></a></li>
+                    <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>
                     
                     @endforeach
                 </ul>
@@ -46,8 +46,8 @@
             <div class="content">
                 <header class="appheader">
                     <ul>
-                        <li><a href="{{ route('dash') }}">Dash</a></li><li>
-                            <a href="{{ route('items.index') }}">Items</a></li>
+                        <li><a href="{{ route('dash', [], false) }}">Dash</a></li><li>
+                            <a href="{{ route('items.index', [], false) }}">Items</a></li>
                     </ul>
                 </header>
                 <main>
@@ -76,10 +76,10 @@
                         <a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a>
                         @endif
     
-                        <a id="dash" class="config" href="{{ route('dash') }}"><i class="fas fa-th"></i></a>
-                        <a id="items" class="config" href="{{ route('items.index') }}"><i class="fas fa-list"></i></a>
-                        <a id="folder" class="config" href="{{ route('tags.index') }}"><i class="fas fa-tag"></i></a>
-                        <a id="settings" class="config" href="{{ route('settings.index') }}"><i class="fas fa-cogs"></i></a>
+                        <a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a>
+                        <a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a>
+                        <a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a>
+                        <a id="settings" class="config" href="{{ route('settings.index', [], false) }}"><i class="fas fa-cogs"></i></a>
                     </div>
                 </main>
 

resources/views/item.blade.php

@@ -13,6 +13,6 @@
                             </div>
                             <a class="link"{{ $app->target }} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
                         </div>
-                        <a class="item-edit" href="{{ route($app->link_type.'.edit', $app->id) }}"><i class="fas fa-pencil"></i></a>
+                        <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
                         
                     </section>

resources/views/items/form.blade.php

@@ -3,7 +3,7 @@
             <div class="section-title">{{ __('app.apps.add_application') }}</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </header>
         <div id="create" class="create">
@@ -73,7 +73,7 @@
             <div class="section-title">&nbsp;</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('items.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('items.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </footer>
 

resources/views/items/list.blade.php

@@ -6,13 +6,13 @@
                 <div class="section-title">
                     {{ __('app.apps.app_list') }}
                     @if( isset($trash) && $trash->count() > 0 )
-                        <a class="trashed" href="{{ route('items.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
+                        <a class="trashed" href="{{ route('items.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
                     @endif
 
                 </div>
                 <div class="module-actions">
-                    <a href="{{ route('items.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
-                    <a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                    <a href="{{ route('items.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
+                    <a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
                 </div>
             </header>
 
@@ -31,7 +31,7 @@
                             <tr>
                                 <td>{{ $app->title }}</td>
                                 <td><a href="{{ $app->url }}">{{ $app->link }}</a></td>
-                                <td class="text-center"><a{{ $app->target }} href="{!! route('items.edit', $app->id) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
+                                <td class="text-center"><a{{ $app->target }} href="{!! route('items.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
                                 <td class="text-center">
                                         {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
                                         <button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

resources/views/items/trash.blade.php

@@ -7,7 +7,7 @@
                     Showing Deleted Applications
                 </div>
                 <div class="module-actions">
-                    <a href="{{ route('items.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                    <a href="{{ route('items.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
                 </div>
             </header>
 
@@ -26,7 +26,7 @@
                             <tr>
                                 <td>{{ $app->title }}</td>
                                 <td>{{ __('app.url') }}</td>
-                                <td class="text-center"><a href="{!! route('items.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
+                                <td class="text-center"><a href="{!! route('items.restore', [$app->id], false) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
                                 <td class="text-center">
                                         {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
                                         <input type="hidden" name="force" value="1" />

resources/views/settings/form.blade.php

@@ -3,7 +3,7 @@
             <div class="section-title">{{ __($setting->label) }}</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </header>
         <div class="create">
@@ -23,7 +23,7 @@
             <div class="section-title">&nbsp;</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('settings.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('settings.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </footer>
 

resources/views/settings/list.blade.php

@@ -29,7 +29,7 @@
                                 </td>
                                 <td class="text-center">
                                     @if((bool)$setting->system !== true)
-                                    <a href="{!! route('settings.edit', ['id' => $setting->id]) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a>
+                                    <a href="{!! route('settings.edit', ['id' => $setting->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $setting->label !!}" class="secondary"><i class="fa fa-pencil"></i></a>
                                     @endif
                                 </td>
                             </tr>

resources/views/tags/form.blade.php

@@ -3,7 +3,7 @@
             <div class="section-title">{{ __('app.apps.add_tag') }}</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </header>
         <div id="create" class="create">
@@ -11,7 +11,7 @@
 
             <div class="input">
                 <label>{{ __('app.apps.tag_name') }} *</label>
-                {!! Form::text('title', null, array('placeholder' => __('app.apps.title'), 'id' => 'appname', 'class' => 'form-control')) !!}
+                {!! Form::text('title', null, array('placeholder' => __('app.apps.title'), 'class' => 'form-control')) !!}
                 <hr />
                 <label>{{ __('app.apps.pinned') }}</label>
                 {!! Form::hidden('pinned', '0') !!}
@@ -67,7 +67,7 @@
             <div class="section-title">&nbsp;</div>
             <div class="module-actions">
                 <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
-                <a href="{{ route('tags.index') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                <a href="{{ route('tags.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
             </div>
         </footer>
 

resources/views/tags/list.blade.php

@@ -6,13 +6,13 @@
                 <div class="section-title">
                     {{ __('app.apps.tag_list') }}
                     @if( isset($trash) && $trash->count() > 0 )
-                        <a class="trashed" href="{{ route('tags.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
+                        <a class="trashed" href="{{ route('tags.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
                     @endif
 
                 </div>
                 <div class="module-actions">
-                    <a href="{{ route('tags.create') }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
-                    <a href="{{ route('dash') }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                    <a href="{{ route('tags.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
+                    <a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
                 </div>
             </header>
 
@@ -31,7 +31,7 @@
                             <tr>
                                 <td>{{ $app->title }}</td>
                                 <td><a{{ $app->target }} href="{{ $app->url }}">{{ $app->link }}</a></td>
-                                <td class="text-center"><a href="{!! route('tags.edit', $app->id) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
+                                <td class="text-center"><a href="{!! route('tags.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
                                 <td class="text-center">
                                         {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
                                         <button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>

resources/views/tags/scripts.blade.php

@@ -6,29 +6,5 @@
               // options
             });        
 
-            var availableTags = [
-            <?php
-                $supported = App\Item::supportedOptions();
-                foreach($supported as $sapp) {
-                    echo '"'.$sapp.'",';
-                }
-            ?>
-            ];
-            $( "#appname" ).autocomplete({
-                source: availableTags,
-                select: function( event, ui ) {
-                    $.post('/appload', { app: ui.item.value }, function(data) {
-                        $('#appimage').html("<img src='/storage/"+data.icon+"' /><input type='hidden' name='icon' value='"+data.icon+"' />");
-                        $('input[name=colour]').val(data.colour);
-                        hueb.setColor( data.colour );
-                        $('input[name=pinned]').prop('checked', true);
-                        if(data.config != null) {
-                            $.get('/view/'+data.config, function(getdata) {
-                                $('#sapconfig').html(getdata).show();
-                            });
-                        }
-                    }, "json");
-                }
-            });
         });
 </script>

resources/views/tags/trash.blade.php

@@ -7,7 +7,7 @@
                     Showing Deleted Applications
                 </div>
                 <div class="module-actions">
-                    <a href="{{ route('tags.index') }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                    <a href="{{ route('tags.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
                 </div>
             </header>
 
@@ -26,7 +26,7 @@
                             <tr>
                                 <td>{{ $app->title }}</td>
                                 <td>{{ __('app.url') }}</td>
-                                <td class="text-center"><a href="{!! route('tags.restore', $app->id) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
+                                <td class="text-center"><a href="{!! route('tags.restore', [ $app->id ], false) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
                                 <td class="text-center">
                                         {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}
                                         <input type="hidden" name="force" value="1" />

resources/views/welcome.blade.php

@@ -10,7 +10,7 @@
             <div class="alert alert-danger">
                     <p>{!! __('app.dash.no_apps', 
                         [
-                            'link1' => '<a href="'.route('items.create').'">'.__('app.dash.link1').'</a>', 
+                            'link1' => '<a href="'.route('items.create', [], false).'">'.__('app.dash.link1').'</a>', 
                             'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>'
                         ]) !!}</p>
                     </div>