geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

breadcrumbs

Browse Source
This commit is contained in:
Arno Kaimbacher 2018-08-31 16:47:04 +02:00
parent d65f7ced34
commit de9cb50084
38 changed files with 290 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -46,6 +46,6 @@ class LoginController extends Controller
$request->session()->regenerate();
return redirect('/settings');
return redirect('/');
}
}

11
app/Http/Controllers/Publish/IndexController.php
View File

@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
use App\License;
use App\Models\File;
use App\Person;
use App\Project;
use App\Models\Title;
use App\Rules\RdrFiletypes;
use App\Rules\RdrFilesize;
@ -44,8 +45,9 @@ class IndexController extends Controller
$persons = Person::where('status', 1)
->pluck('last_name', 'id');
$projects = Project::pluck('label', 'id');
return view('publish.create-step1', compact('licenses', 'languages', 'persons'));
return view('publish.create-step1', compact('licenses', 'languages', 'persons', 'projects'));
}
/**
@ -219,6 +221,8 @@ class IndexController extends Controller
'belongs_to_bibliography' => 'required|boolean',
'title_main.value' => 'required|min:5',
'title_main.language' => 'required',
'abstract_main.value' => 'required|min:5',
'abstract_main.language' => 'required',
];
if (null != $request->file('files')) {
$files = count($request->file('files')) - 1;
@ -288,8 +292,8 @@ class IndexController extends Controller
$dataset->addMainAbstract($abstract);
}
// $error = 'Always throw this error';
// throw new \Exception($error);
$error = 'Always throw this error';
throw new \Exception($error);
// all good//commit everything
DB::commit();
@ -318,6 +322,7 @@ class IndexController extends Controller
}
return response()->json(array(
'success' => true,
'redirect' => route('settings.document', ['state' => $dataset->server_state]),
));
} else {

4
app/Http/Controllers/Settings/HomeController.php → app/Http/Controllers/Settings/DashboardController.php
View File

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use Illuminate\View\View;
class HomeController extends Controller
class DashboardController extends Controller
{
/**
* Create a new controller instance.
@ -22,6 +22,6 @@ class HomeController extends Controller
*/
public function index(): View
{
return view('settings.home.index');
return view('settings.dashboard');
}
}

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

@ -80,7 +80,7 @@ class UserController extends Controller
}
return redirect()
->route('user.index')
->route('settings.user.index')
->with('success', 'User has been created successfully');
}
@ -150,7 +150,7 @@ class UserController extends Controller
//return back()->with('flash_message', 'user successfully updated.');
return redirect()
->route('user.index')
->route('settings.user.index')
->with('flash_message', 'User successfully edited.');
}
@ -167,7 +167,7 @@ class UserController extends Controller
$user->delete();
return redirect()
->route('user.index')
->route('settings.user.index')
->with('flash_message', 'User successfully deleted.');
}
}

11
composer.json
View File

@ -9,6 +9,7 @@
"type": "project",
"require": {
"php": ">=7.0.0",
"davejamesmiller/laravel-breadcrumbs": "4.x",
"fideloper/proxy": "~3.3",
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
@ -39,14 +40,14 @@
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-create-project-cmd": [
"php -r \"copy('.env.example', '.env');\"",
"php artisan key:generate"
]
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
"preferred-install": "dist",

61
composer.lock generated
View File

@ -4,8 +4,67 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7de5582e0d6336834f655fa43be0ed7c",
"content-hash": "00e98bda68b015c9576d1e622624cb55",
"packages": [
{
"name": "davejamesmiller/laravel-breadcrumbs",
"version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
"reference": "368d7b3a2cd21fe2e648756e5d01d3fe4fbe98e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/368d7b3a2cd21fe2e648756e5d01d3fe4fbe98e1",
"reference": "368d7b3a2cd21fe2e648756e5d01d3fe4fbe98e1",
"shasum": ""
},
"require": {
"illuminate/support": "5.5.*",
"illuminate/view": "5.5.*",
"php": ">=7.0.0"
},
"require-dev": {
"laravel/framework": "5.5.*",
"orchestra/testbench": "3.5.*",
"phpunit/phpunit": "6.*",
"satooshi/php-coveralls": "1.0.*"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"DaveJamesMiller\\Breadcrumbs\\BreadcrumbsServiceProvider"
],
"aliases": {
"Breadcrumbs": "DaveJamesMiller\\Breadcrumbs\\Facades\\Breadcrumbs"
}
}
},
"autoload": {
"psr-4": {
"DaveJamesMiller\\Breadcrumbs\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT License"
],
"authors": [
{
"name": "Dave James Miller",
"email": "dave@davejamesmiller.com",
"homepage": "https://davejamesmiller.com/"
}
],
"description": "A simple Laravel-style way to create breadcrumbs.",
"homepage": "https://github.com/davejamesmiller/laravel-breadcrumbs",
"keywords": [
"laravel"
],
"time": "2017-09-14T08:23:50+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
"version": "0.1",

16
config/app.php
View File

@ -78,7 +78,7 @@ return [
|
*/
'locale' => 'en',
'locale' => env('APP_LOCALE', 'en'),
/*
|--------------------------------------------------------------------------
@ -91,7 +91,7 @@ return [
|
*/
'fallback_locale' => 'en',
'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
/*
|--------------------------------------------------------------------------
@ -140,7 +140,7 @@ return [
/*
* Laravel Framework Service Providers...
*/
'Illuminate\Auth\AuthServiceProvider',
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
'Illuminate\Bus\BusServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
@ -164,8 +164,12 @@ return [
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
/*
* Package Service Providers...
*/
// 'Illuminate\Html\HtmlServiceProvider',
// 'Collective\Html\HtmlServiceProvider',
Zizaco\Entrust\EntrustServiceProvider::class,
/*
* Application Service Providers...
@ -178,7 +182,7 @@ return [
// List off others providers...
App\Providers\SolariumServiceProvider::class,
Zizaco\Entrust\EntrustServiceProvider::class,
],
@ -228,10 +232,14 @@ return [
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
/*
* Third Party Aliases
*/
// 'Form' => 'Illuminate\Html\FormFacade',
// 'HTML' => 'Illuminate\Html\HtmlFacade',
// 'Form' => 'Collective\Html\FormFacade',
// 'Html' => 'Collective\Html\HtmlFacade',
'Breadcrumbs' => DaveJamesMiller\Breadcrumbs\Facade::class,
],

71
config/breadcrumbs.php Normal file
View File

@ -0,0 +1,71 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| View Name
|--------------------------------------------------------------------------
|
| Choose a view to display when Breadcrumbs::render() is called.
| Built in templates are:
|
| - 'breadcrumbs::bootstrap4' - Twitter Bootstrap v4
| - 'breadcrumbs::bootstrap3' - Twitter Bootstrap v3
| - 'breadcrumbs::bootstrap2' - Twitter Bootstrap v2
|
| Or a custom view, e.g. '_partials/breadcrumbs'.
|
*/
// 'view' => 'breadcrumbs::bootstrap4',
'view' => 'settings.includes.partials.breadcrumbs',
/*
|--------------------------------------------------------------------------
| Breadcrumbs File(s)
|--------------------------------------------------------------------------
|
| The file(s) where breadcrumbs are defined. e.g.
|
| - base_path('routes/breadcrumbs.php')
| - glob(base_path('breadcrumbs/*.php'))
|
*/
'files' => base_path('routes/breadcrumbs.php'),
/*
|--------------------------------------------------------------------------
| Exceptions
|--------------------------------------------------------------------------
|
| Determine when to throw an exception.
|
*/
// When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
'unnamed-route-exception' => true,
// When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException)
'missing-route-bound-breadcrumb-exception' => true,
// When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException)
'invalid-named-breadcrumb-exception' => true,
/*
|--------------------------------------------------------------------------
| Classes
|--------------------------------------------------------------------------
|
| Subclass the default classes for more advanced customisations.
|
*/
// Manager
'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
// Generator
'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
];

13
public/js/app.js
View File

@ -32,6 +32,7 @@ const app = new Vue({
type: '',
state: '',
rights: 0,
project_id: '',
creating_corporation: "GBA",
embargo_date: '',
@ -107,6 +108,7 @@ const app = new Vue({
formData.append('server_state', this.dataset.state);
formData.append('rights', this.dataset.rights);
formData.append('creating_corporation', this.dataset.creating_corporation);
formData.append('project_id', this.dataset.project_id);
formData.append('embargo_date', this.dataset.embargo_date);
formData.append('belongs_to_bibliography', this.dataset.belongs_to_bibliography);
formData.append('title_main[value]', this.dataset.title_main.value);
@ -217,14 +219,3 @@ const app = new Vue({
}
}
});
// const app = new Vue({
// el: '#app',
// data: {
// loading: false,
// downloading: false,
// items: [],
// message: "Just a test",
// }
// });

3
resources/views/auth/login.blade.php
View File

@ -1,8 +1,7 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-2-3">

4
resources/views/partials/nav.blade.php
View File

@ -91,9 +91,9 @@
<li class="pure-menu-item pure-menu-allow-hover custom-can-transform">
<a href="#" class="pure-menu-link">{{ Auth::user()->login }} <span class="fa fa-angle-down"></span></a>
<ul class="pure-menu-children" role="menu">
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a> </li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('settings.user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a> </li>
@role('administrator')
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('settings.user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> EDIT ROLES</a></li>
@endrole
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i> LOG OUT</a></li>

12
resources/views/publish/create-step1.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('title', 'Publish')
@ -10,7 +10,7 @@
</div>
<div id="app" class="box-content">
<form action={{ route('dataset.store1') }} method="post" class="pure-form" enctype="multipart/form-data">
<form action={{ route('publish.dataset.store1') }} method="post" class="pure-form" enctype="multipart/form-data">
{{ csrf_field() }}
<div v-if="step === 1">
@ -87,6 +87,14 @@
{!! Form::text('CreatingCorporation', null, ['class' => 'pure-u-23-24', 'v-model' => 'dataset.creating_corporation']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('project_id', 'Project..') !!}
<div class="select pure-u-23-24">
{!! Form::select('project_id', $projects, null, ['id' => 'project_id', 'placeholder' => '--no project--', 'v-model' => 'dataset.project_id']) !!}
</div>
<small id="projectHelp" class="pure-form-message-inline">project is optional</small>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('EmbargoDate', 'Embargo Date') !!}
{!! Form::date('EmbargoDate', null, ['placeholder' => date('y-m-d'), 'class' => 'pure-u-23-24', 'v-model' => 'dataset.embargo_date']) !!}

2
resources/views/publish/create-step1Old.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('title', 'Publish')

2
resources/views/publish/create-step2.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('title', 'Publish')

2
resources/views/publish/create-step3.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('title', 'Publish')

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

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

4
resources/views/settings/home/index.blade.php → resources/views/settings/dashboard.blade.php
View File

@ -1,4 +1,6 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
{{-- @section('breadcrumbs', Breadcrumbs::render('settings.dashboard')) --}}
@section('content')
<div class="header">

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

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/document/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/document/show.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

14
resources/views/settings/includes/partials/breadcrumbs.blade.php Normal file
View File

@ -0,0 +1,14 @@
@if ($breadcrumbs)
<div class="breadcrumb">
<i class="fa fa-home"></i>
<a href="{{route('settings.dashboard')}}" rel="Dashboard">Dashboard</a>
@for($i = 1; $i < count($breadcrumbs); $i++)
<?php
$breadcrumb = $breadcrumbs[$i];
?>
<i class="fa fa-angle-right"></i>
<a href="{{ $breadcrumb->url }}" rel="Dashboard">{{ $breadcrumb->title }}</a>
@endfor
</div>
@endif

26
resources/views/layouts/settings/layout.blade.php → resources/views/settings/layouts/app.blade.php
View File

@ -35,8 +35,8 @@
<h2 class="pure-menu-heading">Home</h2>
<ul class="pure-menu-list">
<li class="pure-menu-item {{ Route::is('settings.home.index') ? 'active' : '' }}">
<a href="{{ route('settings.home.index') }}" class="pure-menu-link">Reports</a>
<li class="pure-menu-item {{ Route::is('settings.dashboard') ? 'active' : '' }}">
<a href="{{ route('settings.dashboard') }}" class="pure-menu-link">Reports</a>
</li>
</ul>
@ -65,13 +65,13 @@
@permission('review')
<h2 class="pure-menu-heading">Publish</h2>
<ul class="pure-menu-list">
<li class="pure-menu-item {{ Route::is('dataset.*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('dataset.create1') }}"><i class="fa fa-upload"></i> Publish</a>
<li class="pure-menu-item {{ Route::is('publish.dataset.*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.dataset.create') }}"><i class="fa fa-upload"></i> Publish</a>
</li>
</ul>
@endpermission
<h2 class="pure-menu-heading">User</h2>
<h2 class="pure-menu-heading">Access Management</h2>
<ul class="pure-menu-list">
@if (Auth::guest())
<li class="pure-menu-item {{ Route::currentRouteName() == 'login' ? 'active' : '' }}">
@ -79,14 +79,14 @@
</li>
@else
@permission('settings')
<li class="pure-menu-item {{ Route::is('user.*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{route('user.index') }}"><i class="fa fa-users"></i> Edit Users</a>
<li class="pure-menu-item {{ Route::is('settings.user.*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{route('settings.user.index') }}"><i class="fa fa-users"></i> User Management</a>
</li>
<li class="pure-menu-item {{ Route::is('role.*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> Edit Roles</a>
<a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> Role Management</a>
</li>
<li class="pure-menu-item">
<a class="pure-menu-link" href="{{ route('user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a>
<a class="pure-menu-link" href="{{ route('settings.user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a>
</li>
@endpermission
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i>Logout</a></li>
@ -113,10 +113,14 @@
</div>
<div class="content">
<div class="breadcrumb">
{{-- <div class="breadcrumb">
<i class="fa fa-home"></i><a href="#" rel="Dashboard">Dashboard</a>
<i class="fa fa-angle-right"></i><a href="#" rel="Dashboard">Sales</a>
</div>
</div> --}}
{{-- @yield('breadcrumbs') --}}
@if(Breadcrumbs::exists())
{!! Breadcrumbs::render() !!}
@endif
{{-- <div class="pure-g"> --}}
<div class="box">
<div class="l-box">

2
resources/views/settings/license/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

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

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/person/add.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')

2
resources/views/settings/person/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

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

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/project/add.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/project/category.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/project/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/role/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

2
resources/views/settings/role/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

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

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">

6
resources/views/settings/user/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">
@ -20,12 +20,12 @@
<div class="box-content">
<div>
<a href="{{ route('user.index') }}" class="pure-button button-small">
<a href="{{ route('settings.user.index') }}" class="pure-button button-small">
<i class="fa fa-chevron-left"></i>
<span>BACK</span>
</a>
</div>
{!! Form::open(['route' => 'user.store', 'method'=>'POST', 'class' => 'pure-form pure-form-aligned']) !!}
{!! Form::open(['route' => 'settings.user.store', 'method'=>'POST', 'class' => 'pure-form pure-form-aligned']) !!}
<div class="pure-control-group @if ($errors->has('login')) field-validation-error @endif">
<label>Login:</label>

6
resources/views/settings/user/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">
@ -11,7 +11,7 @@
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-2-3">
<div>
<a href="{{ route('user.index') }}" class="pure-button button-small">
<a href="{{ route('settings.user.index') }}" class="pure-button button-small">
<i class="fa fa-chevron-left"></i>
<span>BACK</span>
</a>
@ -29,7 +29,7 @@
@endif
<div>
{!! Form::model($user, ['method' => 'PATCH','route' => ['user.update', $user->id], 'class' => 'pure-form pure-form-aligned']) !!}
{!! Form::model($user, ['method' => 'PATCH','route' => ['settings.user.update', $user->id], 'class' => 'pure-form pure-form-aligned']) !!}
<fieldset>
<div class="pure-control-group @if ($errors->has('login')) field-validation-error @endif">

8
resources/views/settings/user/user.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.settings.layout')
@extends('settings.layouts.app')
@section('content')
<div class="header">
@ -11,7 +11,7 @@
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-2-3">
<a class="pure-button button-small is-primary" href="{{ route('user.create') }}">
<a class="pure-button button-small is-primary" href="{{ route('settings.user.create') }}">
<i class="fa fa-plus-circle"></i>
<span>Create New User</span>
</a>
@ -47,9 +47,9 @@
@endif
</td>
<td>
<a class="edit" href="{{ route('user.edit',$user->id) }}">&nbsp;Edit</a>
<a class="edit" href="{{ route('settings.user.edit', $user->id) }}">&nbsp;Edit</a>
<span>&nbsp;</span>
<a class="delete" href="{{ route('user.destroy', $user->id) }}"><span>&nbsp;Delete</span></a>
<a class="delete" href="{{ route('settings.user.destroy', $user->id) }}"><span>&nbsp;Delete</span></a>
</td>
</tr>
@endforeach

26
routes/breadcrumbs.php Normal file
View File

@ -0,0 +1,26 @@
<?php
// Dashboard
Breadcrumbs::register('settings.dashboard', function ($trail) {
$trail->push('Dashboard', route('settings.dashboard'));
});
Breadcrumbs::register('publish.dataset.create', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Publish', route('publish.dataset.create'));
});
Breadcrumbs::register('settings.user.index', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Users Management', route('settings.user.index'));
});
Breadcrumbs::register('settings.user.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('settings.user.index');
$breadcrumbs->push("users.edit", route('settings.user.edit', $id));
});
Breadcrumbs::register('settings.user.create', function ($breadcrumbs) {
$breadcrumbs->parent('settings.user.index');
$breadcrumbs->push('users.create', route('settings.user.create'));
});

38
routes/web.php
View File

@ -16,41 +16,49 @@ use Illuminate\Support\Facades\Route;
Route::get('/oai', ['as' => 'oai', 'uses' => 'Oai\RequestController@index']);
Route::group(['middleware' => ['permission:review'], 'prefix' => 'publish'], function () {
Route::get('/dataset/create-step1', ['as' => 'dataset.create1', 'uses' => 'Publish\IndexController@createStep1']);
Route::post('/dataset/store-step1', ['as' => 'dataset.store1', 'uses' => 'Publish\IndexController@storeStep1']);
Route::group(
[
'namespace' => 'Publish',
'middleware' => ['permission:review'],
'prefix' => 'publish',
'as' => 'publish.'
],
function () {
Route::get('dataset/create-step1', ['as' => 'dataset.create', 'uses' => 'IndexController@createStep1']);
Route::post('dataset/store-step1', ['as' => 'dataset.store1', 'uses' => 'IndexController@storeStep1']);
Route::get('/dataset/create-step2', ['as' => 'dataset.create2', 'uses' => 'Publish\IndexController@createStep2']);
Route::post('/dataset/store-step2', ['as' => 'dataset.store2', 'uses' => 'Publish\IndexController@storeStep2']);
Route::get('dataset/create-step2', ['as' => 'dataset.create2', 'uses' => 'IndexController@createStep2']);
Route::post('dataset/store-step2', ['as' => 'dataset.store2', 'uses' => 'IndexController@storeStep2']);
Route::get('/dataset/create-step3', ['as' => 'dataset.create3', 'uses' => 'Publish\IndexController@createStep3']);
Route::post('/dataset/store', ['as' => 'dataset.store', 'uses' => 'Publish\IndexController@store']);
});
Route::get('dataset/create-step3', ['as' => 'dataset.create3', 'uses' => 'IndexController@createStep3']);
Route::post('dataset/store', ['as' => 'dataset.store', 'uses' => 'IndexController@store']);
}
);
//=================================================setting users====================================================
Route::get('settings/', [
'as' => 'settings.home.index', 'uses' => 'Settings\HomeController@index',
'as' => 'settings.dashboard', 'uses' => 'Settings\DashboardController@index',
]);
Route::group(['middleware' => ['permission:settings']], function () {
//Route::resource('users','UserController');
Route::get('settings/user', [
'as' => 'user.index', 'uses' => 'Settings\UserController@index',
'as' => 'settings.user.index', 'uses' => 'Settings\UserController@index',
]);
Route::get('settings/user/create', [
'as' => 'user.create', 'uses' => 'Settings\UserController@create',
'as' => 'settings.user.create', 'uses' => 'Settings\UserController@create',
]);
Route::post('settings/user/store', [
'as' => 'user.store', 'uses' => 'Settings\UserController@store',
'as' => 'settings.user.store', 'uses' => 'Settings\UserController@store',
]);
Route::get('settings/user/edit/{id}', [
'as' => 'user.edit', 'uses' => 'Settings\UserController@edit',
'as' => 'settings.user.edit', 'uses' => 'Settings\UserController@edit',
]);
Route::patch('settings/user/update/{id}', [
'as' => 'user.update', 'uses' => 'Settings\UserController@update',
'as' => 'settings.user.update', 'uses' => 'Settings\UserController@update',
]);
Route::get('settings/user/destroy/{id}', [
'as' => 'user.destroy', 'uses' => 'Settings\UserController@destroy',
'as' => 'settings.user.destroy', 'uses' => 'Settings\UserController@destroy',
]);
//Route::resource('users','RoleController');