diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 5892e1d5..e1c2000a 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -66,7 +66,7 @@ class ItemController extends Controller $item = Item::findOrFail($id); $item->pinned = true; $item->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } @@ -80,7 +80,7 @@ class ItemController extends Controller $item = Item::findOrFail($id); $item->pinned = false; $item->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } @@ -105,7 +105,7 @@ class ItemController extends Controller $data['ajax'] = true; return view('sortable', $data); } else { - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } } @@ -188,7 +188,7 @@ class ItemController extends Controller $item->parents()->sync($request->tags); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success', __('app.alert.success.item_created')); } @@ -265,7 +265,7 @@ class ItemController extends Controller $item->parents()->sync($request->tags); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.item_updated')); } @@ -288,7 +288,7 @@ class ItemController extends Controller Item::find($id)->delete(); } - $route = route('items.index', [], false); + $route = route('items.index', []); return redirect($route) ->with('success',__('app.alert.success.item_deleted')); } @@ -306,7 +306,7 @@ class ItemController extends Controller ->where('id', $id) ->restore(); - $route = route('items.inded', [], false); + $route = route('items.inded', []); return redirect($route) ->with('success',__('app.alert.success.item_restored')); } diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 71297a5a..3d79db50 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -47,7 +47,7 @@ class SettingsController extends Controller 'setting' => $setting, ]); } else { - $route = route('settings.list', [], false); + $route = route('settings.list', []); return redirect($route) ->with([ 'error' => __('app.alert.error.not_exist'), @@ -85,13 +85,13 @@ class SettingsController extends Controller $user->settings()->detach($setting->id); $user->settings()->save($setting, ['uservalue' => $setting_value]); - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'success' => __('app.alert.success.setting_updated'), ]); } else { - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'error' => __('app.alert.error.not_exist'), @@ -111,7 +111,7 @@ class SettingsController extends Controller $user->settings()->detach($setting->id); $user->settings()->save($setting, ['uservalue' => '']); } - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'success' => __('app.alert.success.setting_updated'), diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 324cfabe..77723911 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -74,7 +74,7 @@ class TagController extends Controller //die(print_r($request->all())); Item::create($request->all()); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success', __('app.alert.success.tag_created')); } @@ -139,7 +139,7 @@ class TagController extends Controller Item::find($id)->update($request->all()); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.tag_updated')); } @@ -162,7 +162,7 @@ class TagController extends Controller Item::find($id)->delete(); } - $route = route('tags.index', [], false); + $route = route('tags.index', []); return redirect($route) ->with('success',__('app.alert.success.item_deleted')); } @@ -179,7 +179,7 @@ class TagController extends Controller Item::withTrashed() ->where('id', $id) ->restore(); - $route = route('tags.index', [], false); + $route = route('tags.index', []); return redirect($route) ->with('success',__('app.alert.success.item_restored')); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index df28a1f8..7448cd22 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -80,7 +80,7 @@ class UserController extends Controller $user->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_updated')); } @@ -150,7 +150,7 @@ class UserController extends Controller $user->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_updated')); @@ -166,7 +166,7 @@ class UserController extends Controller { if($user->id !== 1) { $user->delete(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_deleted')); diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 4d7d39c8..7945af40 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -12,7 +12,7 @@ class TrustProxies extends Middleware * * @var array */ - protected $proxies = ['192.168.0.0/16', '172.16.0.0/12','10.0.0.0/8']; + protected $proxies = ['192.168.0.0/16', '172.16.0.0/12','10.0.0.0/8', '127.0.0.1']; /** * The current proxy header mappings. diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php index c6b21582..738dbe96 100644 --- a/resources/views/item.blade.php +++ b/resources/views/item.blade.php @@ -13,6 +13,6 @@ link_target !!} href="{{ $app->link }}"> - + diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index be2656bb..45fb3415 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -16,7 +16,7 @@ - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
@@ -105,7 +105,7 @@
 
- {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
diff --git a/resources/views/items/list.blade.php b/resources/views/items/list.blade.php index fd76029a..f72e46f5 100644 --- a/resources/views/items/list.blade.php +++ b/resources/views/items/list.blade.php @@ -6,14 +6,14 @@
{{ __('app.apps.app_list') }} @if( isset($trash) && $trash->count() > 0 ) - {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) + {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) @endif
- {{ __('app.buttons.downloadapps') }} - {{ __('app.buttons.add') }} - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.downloadapps') }} + {{ __('app.buttons.add') }} + {{ __('app.buttons.cancel') }}
@@ -32,7 +32,7 @@ {{ $app->title }} {{ $app->link }} - target }} href="{!! route('items.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"> + target }} href="{!! route('items.edit', [$app->id]) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"> {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!} diff --git a/resources/views/items/preview.blade.php b/resources/views/items/preview.blade.php index 8ba1cfa3..0a3dc8cb 100644 --- a/resources/views/items/preview.blade.php +++ b/resources/views/items/preview.blade.php @@ -16,6 +16,6 @@
link_target !!} href="{{ $item->link }}"> - + diff --git a/resources/views/items/trash.blade.php b/resources/views/items/trash.blade.php index caed294d..16965086 100644 --- a/resources/views/items/trash.blade.php +++ b/resources/views/items/trash.blade.php @@ -7,7 +7,7 @@ Showing Deleted Applications
- {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
@@ -26,7 +26,7 @@ {{ $app->title }} {{ __('app.url') }} - + {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!} diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b54be845..c01f4c5d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -45,7 +45,7 @@ pinned === true) ? 'active' : ''; ?> -
  • {{ $app->title }}
  • +
  • {{ $app->title }}
  • @endforeach @@ -54,8 +54,8 @@
    @@ -96,13 +96,13 @@ @endif - + @if($current_user->id === 1) - + @endif - - - + + +
    diff --git a/resources/views/settings/form.blade.php b/resources/views/settings/form.blade.php index c3f58108..1ffacce1 100644 --- a/resources/views/settings/form.blade.php +++ b/resources/views/settings/form.blade.php @@ -3,7 +3,7 @@
    {{ __($setting->label) }}
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    @@ -23,7 +23,7 @@
     
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    diff --git a/resources/views/settings/list.blade.php b/resources/views/settings/list.blade.php index 81ce2432..40561cfa 100644 --- a/resources/views/settings/list.blade.php +++ b/resources/views/settings/list.blade.php @@ -29,7 +29,7 @@ @if((bool)$setting->system !== true) - + @endif diff --git a/resources/views/tags/form.blade.php b/resources/views/tags/form.blade.php index 41f3346e..90d2ed76 100644 --- a/resources/views/tags/form.blade.php +++ b/resources/views/tags/form.blade.php @@ -3,7 +3,7 @@
    {{ __('app.apps.add_tag') }}
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    @@ -59,7 +59,7 @@
     
    diff --git a/resources/views/tags/list.blade.php b/resources/views/tags/list.blade.php index 15b99098..c6cf37f0 100644 --- a/resources/views/tags/list.blade.php +++ b/resources/views/tags/list.blade.php @@ -6,13 +6,13 @@
    {{ __('app.apps.tag_list') }} @if( isset($trash) && $trash->count() > 0 ) - {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) + {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) @endif
    @@ -31,7 +31,7 @@ {{ $app->title }} target }} href="/tag/{{ $app->url }}">{{ $app->link }} - + {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!} diff --git a/resources/views/tags/trash.blade.php b/resources/views/tags/trash.blade.php index 85c834c0..2ea48120 100644 --- a/resources/views/tags/trash.blade.php +++ b/resources/views/tags/trash.blade.php @@ -7,7 +7,7 @@ Showing Deleted Applications
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    @@ -26,7 +26,7 @@ {{ $app->title }} {{ __('app.url') }} - + {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!} diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php index f7b1d4b0..45f3f866 100644 --- a/resources/views/users/form.blade.php +++ b/resources/views/users/form.blade.php @@ -3,7 +3,7 @@
    {{ __('app.user.add_user') }}
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    @@ -88,7 +88,7 @@
     
    diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 3384a023..ce4887f2 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -6,13 +6,13 @@
    {{ __('app.user.user_list') }} @if( isset($trash) && $trash->count() > 0 ) - {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) + {{ __('app.apps.view_trash') }} ({{ $trash->count() }}) @endif
    @@ -39,7 +39,7 @@ {{ route('user.autologin', $user->autologin) }} @endif - target }} href="{!! route('users.edit', [$user->id], false) !!}" title="{{ __('user.settings.edit') }} {!! $user->title !!}"> + target }} href="{!! route('users.edit', [$user->id]) !!}" title="{{ __('user.settings.edit') }} {!! $user->title !!}"> @if($user->id !== 1) {!! Form::open(['method' => 'DELETE','route' => ['users.destroy', $user->id],'style'=>'display:inline']) !!} diff --git a/resources/views/users/trash.blade.php b/resources/views/users/trash.blade.php index caed294d..16965086 100644 --- a/resources/views/users/trash.blade.php +++ b/resources/views/users/trash.blade.php @@ -7,7 +7,7 @@ Showing Deleted Applications
    - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
    @@ -26,7 +26,7 @@ {{ $app->title }} {{ __('app.url') }} - + {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!} diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index e1527f7e..4deb09df 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -10,7 +10,7 @@

    {!! __('app.dash.no_apps', [ - 'link1' => ''.__('app.dash.link1').'', + 'link1' => ''.__('app.dash.link1').'', 'link2' => ''.__('app.dash.link2').'' ]) !!}

    diff --git a/routes/web.php b/routes/web.php index ad050a9e..4eee6255 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,6 +13,10 @@ use Illuminate\Http\Request; | */ +if(\Config::get('app.url') !== 'http://localhost') { + URL::forceRootUrl(\Config::get('app.url')); +} + Route::get('/userselect/{user}', 'Auth\LoginController@setUser')->name('user.set'); Route::get('/userselect', 'UserController@selectUser')->name('user.select'); Route::get('/autologin/{uuid}', 'Auth\LoginController@autologin')->name('user.autologin');