Skip to content

Commit

Permalink
Cleanup in dashboard and menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@PovilasKorop
PovilasKorop committed Sep 13, 2019
1 parent 342a015 commit e9b57bb
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 65 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/LoginController.php
View file
Expand Up @@ -25,7 +25,7 @@ class LoginController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/admin/expenses';

/**
* Create a new controller instance.
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/RegisterController.php
View file
Expand Up @@ -28,7 +28,7 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/admin/expenses';

/**
* Create a new controller instance.
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/cruds.php
View file
Expand Up @@ -88,7 +88,7 @@
],
],
'incomeCategory' => [
'title' => 'Income categories',
'title' => 'Income Categories',
'title_singular' => 'Income Category',
'fields' => [
'id' => 'ID',
Expand Down
104 changes: 43 additions & 61 deletions resources/views/partials/menu.blade.php
View file
Expand Up @@ -2,14 +2,6 @@
<nav class="sidebar-nav">

<ul class="nav">
<li class="nav-item">
<a href="{{ route("admin.home") }}" class="nav-link">
<i class="nav-icon fas fa-fw fa-tachometer-alt">

</i>
{{ trans('global.dashboard') }}
</a>
</li>
@can('user_management_access')
<li class="nav-item nav-dropdown">
<a class="nav-link nav-dropdown-toggle" href="#">
Expand Down Expand Up @@ -52,68 +44,58 @@
</ul>
</li>
@endcan
@can('expense_management_access')
<li class="nav-item nav-dropdown">
<a class="nav-link nav-dropdown-toggle" href="#">
<i class="fa-fw fas fa-money-bill nav-icon">

@can('expense_category_access')
<li class="nav-item">
<a href="{{ route("admin.expense-categories.index") }}" class="nav-link {{ request()->is('admin/expense-categories') || request()->is('admin/expense-categories/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-list nav-icon">

</i>
{{ trans('cruds.expenseManagement.title') }}
{{ trans('cruds.expenseCategory.title') }}
</a>
<ul class="nav-dropdown-items">
@can('expense_category_access')
<li class="nav-item">
<a href="{{ route("admin.expense-categories.index") }}" class="nav-link {{ request()->is('admin/expense-categories') || request()->is('admin/expense-categories/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-list nav-icon">

</i>
{{ trans('cruds.expenseCategory.title') }}
</a>
</li>
@endcan
@can('income_category_access')
<li class="nav-item">
<a href="{{ route("admin.income-categories.index") }}" class="nav-link {{ request()->is('admin/income-categories') || request()->is('admin/income-categories/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-list nav-icon">
</li>
@endcan
@can('income_category_access')
<li class="nav-item">
<a href="{{ route("admin.income-categories.index") }}" class="nav-link {{ request()->is('admin/income-categories') || request()->is('admin/income-categories/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-list nav-icon">

</i>
{{ trans('cruds.incomeCategory.title') }}
</a>
</li>
@endcan
@can('expense_access')
<li class="nav-item">
<a href="{{ route("admin.expenses.index") }}" class="nav-link {{ request()->is('admin/expenses') || request()->is('admin/expenses/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-arrow-circle-right nav-icon">
</i>
{{ trans('cruds.incomeCategory.title') }}
</a>
</li>
@endcan
@can('expense_access')
<li class="nav-item">
<a href="{{ route("admin.expenses.index") }}" class="nav-link {{ request()->is('admin/expenses') || request()->is('admin/expenses/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-arrow-circle-right nav-icon">

</i>
{{ trans('cruds.expense.title') }}
</a>
</li>
@endcan
@can('income_access')
<li class="nav-item">
<a href="{{ route("admin.incomes.index") }}" class="nav-link {{ request()->is('admin/incomes') || request()->is('admin/incomes/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-arrow-circle-right nav-icon">
</i>
{{ trans('cruds.expense.title') }}
</a>
</li>
@endcan
@can('income_access')
<li class="nav-item">
<a href="{{ route("admin.incomes.index") }}" class="nav-link {{ request()->is('admin/incomes') || request()->is('admin/incomes/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-arrow-circle-right nav-icon">

</i>
{{ trans('cruds.income.title') }}
</a>
</li>
@endcan
@can('expense_report_access')
<li class="nav-item">
<a href="{{ route("admin.expense-reports.index") }}" class="nav-link {{ request()->is('admin/expense-reports') || request()->is('admin/expense-reports/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-chart-line nav-icon">
</i>
{{ trans('cruds.income.title') }}
</a>
</li>
@endcan
@can('expense_report_access')
<li class="nav-item">
<a href="{{ route("admin.expense-reports.index") }}" class="nav-link {{ request()->is('admin/expense-reports') || request()->is('admin/expense-reports/*') ? 'active' : '' }}">
<i class="fa-fw fas fa-chart-line nav-icon">

</i>
{{ trans('cruds.expenseReport.title') }}
</a>
</li>
@endcan
</ul>
</i>
{{ trans('cruds.expenseReport.title') }}
</a>
</li>
@endcan

<li class="nav-item">
<a href="#" class="nav-link" onclick="event.preventDefault(); document.getElementById('logoutform').submit();">
<i class="nav-icon fas fa-fw fa-sign-out-alt">
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
View file
Expand Up @@ -5,7 +5,7 @@
Auth::routes();

Route::group(['prefix' => 'admin', 'as' => 'admin.', 'namespace' => 'Admin', 'middleware' => ['auth']], function () {
Route::get('/', 'HomeController@index')->name('home');
Route::redirect('/', '/admin/expenses');
// Permissions
Route::delete('permissions/destroy', 'PermissionsController@massDestroy')->name('permissions.massDestroy');
Route::resource('permissions', 'PermissionsController');
Expand Down

0 comments on commit e9b57bb

Please sign in to comment.