topaLE
/
Heimdall
1
0
Fork 0
Code Issues 163 Pull Requests 18 Projects Releases 47 Wiki Activity
Browse Source

remove false from routes

pull/370/head
Chris 5 years ago
parent
51d89dae82
commit
ac8fe7012b
21 changed files with 62 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      app/Http/Controllers/ItemController.php
  2. 8
      app/Http/Controllers/SettingsController.php
  3. 8
      app/Http/Controllers/TagController.php
  4. 6
      app/Http/Controllers/UserController.php
  5. 2
      app/Http/Middleware/TrustProxies.php
  6. 2
      resources/views/item.blade.php
  7. 4
      resources/views/items/form.blade.php
  8. 10
      resources/views/items/list.blade.php
  9. 2
      resources/views/items/preview.blade.php
  10. 4
      resources/views/items/trash.blade.php
  11. 16
      resources/views/layouts/app.blade.php
  12. 4
      resources/views/settings/form.blade.php
  13. 2
      resources/views/settings/list.blade.php
  14. 4
      resources/views/tags/form.blade.php
  15. 8
      resources/views/tags/list.blade.php
  16. 4
      resources/views/tags/trash.blade.php
  17. 4
      resources/views/users/form.blade.php
  18. 8
      resources/views/users/index.blade.php
  19. 4
      resources/views/users/trash.blade.php
  20. 2
      resources/views/welcome.blade.php
  21. 4
      routes/web.php

14
app/Http/Controllers/ItemController.php
View File

@ -66,7 +66,7 @@ class ItemController extends Controller
$item = Item::findOrFail($id); $item = Item::findOrFail($id);
$item->pinned = true; $item->pinned = true;
$item->save(); $item->save();
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route); return redirect($route);
} }
@ -80,7 +80,7 @@ class ItemController extends Controller
$item = Item::findOrFail($id); $item = Item::findOrFail($id);
$item->pinned = false; $item->pinned = false;
$item->save(); $item->save();
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route); return redirect($route);
} }
@ -105,7 +105,7 @@ class ItemController extends Controller
$data['ajax'] = true; $data['ajax'] = true;
return view('sortable', $data); return view('sortable', $data);
} else { } else {
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route); return redirect($route);
} }
} }
@ -188,7 +188,7 @@ class ItemController extends Controller
$item->parents()->sync($request->tags); $item->parents()->sync($request->tags);
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route) return redirect($route)
->with('success', __('app.alert.success.item_created')); ->with('success', __('app.alert.success.item_created'));
} }
@ -265,7 +265,7 @@ class ItemController extends Controller
$item->parents()->sync($request->tags); $item->parents()->sync($request->tags);
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_updated')); ->with('success',__('app.alert.success.item_updated'));
} }
@ -288,7 +288,7 @@ class ItemController extends Controller
Item::find($id)->delete(); Item::find($id)->delete();
} }
$route = route('items.index', [], false); $route = route('items.index', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_deleted')); ->with('success',__('app.alert.success.item_deleted'));
} }
@ -306,7 +306,7 @@ class ItemController extends Controller
->where('id', $id) ->where('id', $id)
->restore(); ->restore();
$route = route('items.inded', [], false); $route = route('items.inded', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_restored')); ->with('success',__('app.alert.success.item_restored'));
} }

8
app/Http/Controllers/SettingsController.php
View File

@ -47,7 +47,7 @@ class SettingsController extends Controller
'setting' => $setting, 'setting' => $setting,
]); ]);
} else { } else {
$route = route('settings.list', [], false); $route = route('settings.list', []);
return redirect($route) return redirect($route)
->with([ ->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
@ -85,13 +85,13 @@ class SettingsController extends Controller
$user->settings()->detach($setting->id); $user->settings()->detach($setting->id);
$user->settings()->save($setting, ['uservalue' => $setting_value]); $user->settings()->save($setting, ['uservalue' => $setting_value]);
$route = route('settings.index', [], false); $route = route('settings.index', []);
return redirect($route) return redirect($route)
->with([ ->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),
]); ]);
} else { } else {
$route = route('settings.index', [], false); $route = route('settings.index', []);
return redirect($route) return redirect($route)
->with([ ->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
@ -111,7 +111,7 @@ class SettingsController extends Controller
$user->settings()->detach($setting->id); $user->settings()->detach($setting->id);
$user->settings()->save($setting, ['uservalue' => '']); $user->settings()->save($setting, ['uservalue' => '']);
} }
$route = route('settings.index', [], false); $route = route('settings.index', []);
return redirect($route) return redirect($route)
->with([ ->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),

8
app/Http/Controllers/TagController.php
View File

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

6
app/Http/Controllers/UserController.php
View File

@ -80,7 +80,7 @@ class UserController extends Controller
$user->save(); $user->save();
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.user_updated')); ->with('success',__('app.alert.success.user_updated'));
} }
@ -150,7 +150,7 @@ class UserController extends Controller
$user->save(); $user->save();
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.user_updated')); ->with('success',__('app.alert.success.user_updated'));
@ -166,7 +166,7 @@ class UserController extends Controller
{ {
if($user->id !== 1) { if($user->id !== 1) {
$user->delete(); $user->delete();
$route = route('dash', [], false); $route = route('dash', []);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.user_deleted')); ->with('success',__('app.alert.success.user_deleted'));

2
app/Http/Middleware/TrustProxies.php
View File

@ -12,7 +12,7 @@ class TrustProxies extends Middleware
* *
* @var array * @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. * The current proxy header mappings.

2
resources/views/item.blade.php
View File

@ -13,6 +13,6 @@
</div> </div>
<a title="{{ App\Item::getApplicationDescription($app->class) }}" class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a> <a title="{{ App\Item::getApplicationDescription($app->class) }}" class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
</div> </div>
<a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a> <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ]) }}"><i class="fas fa-pencil"></i></a>
</section> </section>

4
resources/views/items/form.blade.php
View File

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

10
resources/views/items/list.blade.php
View File

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

2
resources/views/items/preview.blade.php
View File

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

4
resources/views/items/trash.blade.php
View File

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

16
resources/views/layouts/app.blade.php
View File

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

4
resources/views/settings/form.blade.php
View File

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

2
resources/views/settings/list.blade.php
View File

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

4
resources/views/tags/form.blade.php
View File

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

8
resources/views/tags/list.blade.php
View File

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

4
resources/views/tags/trash.blade.php
View File

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

4
resources/views/users/form.blade.php
View File

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

8
resources/views/users/index.blade.php
View File

@ -6,13 +6,13 @@
<div class="section-title"> <div class="section-title">
{{ __('app.user.user_list') }} {{ __('app.user.user_list') }}
@if( isset($trash) && $trash->count() > 0 ) @if( isset($trash) && $trash->count() > 0 )
<a class="trashed" href="{{ route('users.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a> <a class="trashed" href="{{ route('users.index', ['trash' => true]) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
@endif @endif
</div> </div>
<div class="module-actions"> <div class="module-actions">
<a href="{{ route('users.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a> <a href="{{ route('users.create', []) }}" 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> <a href="{{ route('dash', []) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
</div> </div>
</header> </header>
@ -39,7 +39,7 @@
<a href="{{ route('user.autologin', $user->autologin) }}">{{ route('user.autologin', $user->autologin) }}</a> <a href="{{ route('user.autologin', $user->autologin) }}">{{ route('user.autologin', $user->autologin) }}</a>
@endif @endif
</td> </td>
<td class="text-center"><a{{ $user->target }} href="{!! route('users.edit', [$user->id], false) !!}" title="{{ __('user.settings.edit') }} {!! $user->title !!}"><i class="fas fa-edit"></i></a></td> <td class="text-center"><a{{ $user->target }} href="{!! route('users.edit', [$user->id]) !!}" title="{{ __('user.settings.edit') }} {!! $user->title !!}"><i class="fas fa-edit"></i></a></td>
<td class="text-center"> <td class="text-center">
@if($user->id !== 1) @if($user->id !== 1)
{!! Form::open(['method' => 'DELETE','route' => ['users.destroy', $user->id],'style'=>'display:inline']) !!} {!! Form::open(['method' => 'DELETE','route' => ['users.destroy', $user->id],'style'=>'display:inline']) !!}

4
resources/views/users/trash.blade.php
View File

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

2
resources/views/welcome.blade.php
View File

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

4
routes/web.php
View File

@ -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/{user}', 'Auth\LoginController@setUser')->name('user.set');
Route::get('/userselect', 'UserController@selectUser')->name('user.select'); Route::get('/userselect', 'UserController@selectUser')->name('user.select');
Route::get('/autologin/{uuid}', 'Auth\LoginController@autologin')->name('user.autologin'); Route::get('/autologin/{uuid}', 'Auth\LoginController@autologin')->name('user.autologin');

Write Preview
Loading…
Cancel
Save