Skip to content

Commit

Permalink
Menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@veneliniliev
veneliniliev committed Jan 6, 2020
1 parent 5e2ba4b commit f324665
Show file tree
Hide file tree
Showing 26 changed files with 23,416 additions and 108 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"barryvdh/laravel-debugbar": "^3.2",
"laravel/framework": "^6.0.0",
"laravelcollective/html": "^6.0",
"lavary/laravel-menu": "^1.7",
"mcamara/laravel-localization": "^1.4",
"nwidart/laravel-modules": "^6.0.0",
"spatie/laravel-permission": "^3.0"
Expand Down Expand Up @@ -55,8 +56,7 @@
"extra": {
"laravel": {
"providers": [
"ProVision\\Administration\\Providers\\AdministrationServiceProvider",
"ProVision\\Administration\\Providers\\AdministrationRouteServiceProvider"
"ProVision\\Administration\\Providers\\AdministrationServiceProvider"
],
"aliases": {
"Administration": "ProVision\\Administration\\AdministrationFacade"
Expand Down
10 changes: 5 additions & 5 deletions config/modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@
'config' => ['path' => 'Config', 'generate' => true],
'command' => ['path' => 'Console', 'generate' => true],
'migration' => ['path' => 'Database/Migrations', 'generate' => true],
'seeder' => ['path' => 'Database/Seeders', 'generate' => true],
'factory' => ['path' => 'Database/factories', 'generate' => true],
'model' => ['path' => 'Entities', 'generate' => true],
'seeder' => ['path' => 'Database/Seeds', 'generate' => true],
'factory' => ['path' => 'Database/Factories', 'generate' => true],
'model' => ['path' => 'Models', 'generate' => true],
'routes' => ['path' => 'Routes', 'generate' => true],
'controller' => ['path' => 'Http/Controllers', 'generate' => true],
'filter' => ['path' => 'Http/Middleware', 'generate' => true],
Expand All @@ -124,7 +124,7 @@
'jobs' => ['path' => 'Jobs', 'generate' => false],
'emails' => ['path' => 'Emails', 'generate' => false],
'notifications' => ['path' => 'Notifications', 'generate' => false],
'resource' => ['path' => 'Transformers', 'generate' => false],
'resource' => ['path' => 'Http/Resources', 'generate' => true],
],
],
/*
Expand All @@ -138,7 +138,7 @@
*/

'scan' => [
'enabled' => false,
'enabled' => true,
'paths' => [
base_path('vendor/*/*'),
],
Expand Down
4,462 changes: 4,457 additions & 5 deletions public/css/app.css
View file

Large diffs are not rendered by default.

18,599 changes: 18,598 additions & 1 deletion public/js/app.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=78e20b48e08e9af7c2e3",
"/css/app.css": "/css/app.css?id=0250bbaccf435f461838"
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
}
6 changes: 6 additions & 0 deletions resources/lang/en/base.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?php

return [
'modules_menu_title' => 'Modules',
'system_menu_title' => 'System',
];
8 changes: 4 additions & 4 deletions resources/sass/pages/errors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

body.error-layout {
footer {
margin-left: 0;
}
}
footer {
margin-left: 0 !important;
}
}
4 changes: 2 additions & 2 deletions resources/views/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="card-body login-card-body">
<p class="login-box-msg">@lang('administration::auth.login_title')</p>

{{Form::open(['route' => Administration::routeName('auth.login.post')])}}
{{Form::open(['route' => \ProVision\Administration\Facades\AdministrationFacade::routeName('auth.login.post')])}}
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="@lang('administration::auth.email')">
<div class="input-group-append">
Expand Down Expand Up @@ -61,7 +61,7 @@ class="btn btn-primary btn-block">@lang('administration::auth.sign_in')</button>
{{-- </div>--}}

<p class="mb-1">
<a href="{{Administration::route('auth.password.request')}}">@lang('administration::auth.forgot_password_link')</a>
<a href="{{\ProVision\Administration\Facades\AdministrationFacade::route('auth.password.request')}}">@lang('administration::auth.forgot_password_link')</a>
</p>
</div>
<!-- /.login-card-body -->
Expand Down
4 changes: 2 additions & 2 deletions resources/views/errors/403.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

<p>
Required permission: <b>{{$permission}}</b>
Meanwhile, you may <a href="{{Administration::route('dashboard')}}">return to home</a>.
Meanwhile, you may <a href="{{\ProVision\Administration\Facades\AdministrationFacade::route('dashboard')}}">return to home</a>.
</p>

</div>
</div>
</section>
@stop
@stop
11 changes: 5 additions & 6 deletions resources/views/layouts/error.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@include('administration::partials.head')
<body class="hold-transition login-page error-layout">

<div class="d-flex flex-column w-100 h-100">

<div class="wrapper">

@yield('content')
<div class="d-flex flex-column h-100 justify-content-center">
@yield('content')
</div>

@include('administration::partials.footer')
</div>

@include('administration::partials.footer')


</body>
</html>
81 changes: 23 additions & 58 deletions resources/views/layouts/master.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
</li>
{{-- <li class="nav-item d-none d-sm-inline-block">--}}
{{-- <a href="index3.html" class="nav-link">Home</a>--}}
{{-- </li>--}}
{{-- <li class="nav-item d-none d-sm-inline-block">--}}
{{-- <a href="#" class="nav-link">Contact</a>--}}
{{-- </li>--}}
{{-- <li class="nav-item d-none d-sm-inline-block">--}}
{{-- <a href="index3.html" class="nav-link">Home</a>--}}
{{-- </li>--}}
{{-- <li class="nav-item d-none d-sm-inline-block">--}}
{{-- <a href="#" class="nav-link">Contact</a>--}}
{{-- </li>--}}
</ul>

<!-- SEARCH FORM -->
Expand All @@ -42,7 +42,8 @@
<a href="#" class="dropdown-item">
<!-- Message Start -->
<div class="media">
<img src="https://www.provision.bg/placeholder?size=128x128" alt="User Avatar" class="img-size-50 mr-3 img-circle">
<img src="https://www.provision.bg/placeholder?size=128x128" alt="User Avatar"
class="img-size-50 mr-3 img-circle">
<div class="media-body">
<h3 class="dropdown-item-title">
John Doe
Expand Down Expand Up @@ -96,64 +97,28 @@ class="fas fa-th-large"></i></a>
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<!-- Brand Logo -->
<a href="{{Administration::route('dashboard')}}" class="brand-link">
<img src="https://www.provision.bg/placeholder?size=128x128" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
<a href="{{\ProVision\Administration\Facades\AdministrationFacade::route('dashboard')}}" class="brand-link">
<img src="https://www.provision.bg/placeholder?size=128x128" alt="AdminLTE Logo"
class="brand-image img-circle elevation-3"
style="opacity: .8">
<span class="brand-text font-weight-light">Administration</span>
</a>

<!-- Sidebar -->
<div class="sidebar">
<!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<img src="https://www.provision.bg/placeholder?size=160x160" class="img-circle elevation-2" alt="User Image">
</div>
<div class="info">
<a href="#" class="d-block">Alexander Pierce</a>
</div>
</div>
{{-- <div class="user-panel mt-3 pb-3 mb-3 d-flex">--}}
{{-- <div class="image">--}}
{{-- <img src="https://www.provision.bg/placeholder?size=160x160" class="img-circle elevation-2"--}}
{{-- alt="User Image">--}}
{{-- </div>--}}
{{-- <div class="info">--}}
{{-- <a href="#" class="d-block">Alexander Pierce</a>--}}
{{-- </div>--}}
{{-- </div>--}}

@include('administration::partials.sidebar_menu')

<!-- Sidebar Menu -->
<nav class="mt-2">
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<!-- Add icons to the links using the .nav-icon class
with font-awesome or any other icon font library -->
<li class="nav-item has-treeview menu-open">
<a href="#" class="nav-link active">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
Starter Pages
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="#" class="nav-link active">
<i class="far fa-circle nav-icon"></i>
<p>Active Page</p>
</a>
</li>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Inactive Page</p>
</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-th"></i>
<p>
Simple Link
<span class="right badge badge-danger">New</span>
</p>
</a>
</li>
</ul>
</nav>
<!-- /.sidebar-menu -->
</div>
<!-- /.sidebar -->
</aside>
Expand Down Expand Up @@ -190,7 +155,7 @@ class="fas fa-th-large"></i></a>

@include('administration::partials.footer')
@include('administration::partials.control_sidebar')

</div>
<!-- ./wrapper -->

Expand Down
43 changes: 43 additions & 0 deletions resources/views/partials/menu_render.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@foreach($items as $item)
<li @lm_attrs($item)
@if($item->hasChildren())
class="nav-item has-treeview @if($item->isActive) menu-open @endif"
@else
class="nav-item @if($item->isActive) menu-open @endif"
@endif @lm_endattrs
>

@if($item->link)
<a @lm_attrs($item->link)
@if($item->hasChildren())
class="nav-link @if($item->isActive) active @endif"
@else
class="nav-link @if($item->isActive) active @endif"
@endif
@lm_endattrs
href="{!! $item->url() !!}">

<i class="nav-icon fas {{\ProVision\Administration\Facades\MenuFacade::getItemIcon($item)}}"></i>

<p>
{!! $item->title !!}
@if($item->hasChildren()) <i class="right fas fa-angle-left"></i> @endif
</p>
</a>
@else
<span class="navbar-text">{!! $item->title !!}</span>
@endif

@if($item->hasChildren())
<ul class="nav nav-treeview">
@include('administration::partials.menu_render', array('items' => $item->children()))
</ul>
@endif

</li>

@if($item->divider)
<li{!! Lavary\Menu\Builder::attributes($item->divider) !!}></li>
@endif

@endforeach
47 changes: 47 additions & 0 deletions resources/views/partials/sidebar_menu.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!-- Sidebar Menu -->
<nav class="mt-2">

<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
@include('administration::partials.menu_render', ['items' => \ProVision\Administration\Facades\MenuFacade::getModulesMenu()->roots()])
@include('administration::partials.menu_render', ['items' => \ProVision\Administration\Facades\MenuFacade::getSystemMenu()->roots()])
</ul>

{{-- <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"--}}
{{-- data-accordion="false">--}}
{{-- <!-- Add icons to the links using the .nav-icon class--}}
{{-- with font-awesome or any other icon font library -->--}}
{{-- <li class="nav-item has-treeview menu-open">--}}
{{-- <a href="#" class="nav-link active">--}}
{{-- <i class="nav-icon fas fa-tachometer-alt"></i>--}}
{{-- <p>--}}
{{-- Starter Pages--}}
{{-- <i class="right fas fa-angle-left"></i>--}}
{{-- </p>--}}
{{-- </a>--}}
{{-- <ul class="nav nav-treeview">--}}
{{-- <li class="nav-item">--}}
{{-- <a href="#" class="nav-link active">--}}
{{-- <i class="far fa-circle nav-icon"></i>--}}
{{-- <p>Active Page</p>--}}
{{-- </a>--}}
{{-- </li>--}}
{{-- <li class="nav-item">--}}
{{-- <a href="#" class="nav-link">--}}
{{-- <i class="far fa-circle nav-icon"></i>--}}
{{-- <p>Inactive Page</p>--}}
{{-- </a>--}}
{{-- </li>--}}
{{-- </ul>--}}
{{-- </li>--}}
{{-- <li class="nav-item">--}}
{{-- <a href="#" class="nav-link">--}}
{{-- <i class="nav-icon fas fa-th"></i>--}}
{{-- <p>--}}
{{-- Simple Link--}}
{{-- <span class="right badge badge-danger">New</span>--}}
{{-- </p>--}}
{{-- </a>--}}
{{-- </li>--}}
{{-- </ul>--}}
</nav>
<!-- /.sidebar-menu -->
1 change: 0 additions & 1 deletion routes/web.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
'admin_permission'
])->group(function () {
Route::get('/', 'DashboardController@dashboard')->name('dashboard');

});

4 changes: 2 additions & 2 deletions src/Administration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Administration
/**
* Check request URL is in administration.
*
* @return bool
* @return boolean
*/
public function routeInAdministration(): bool
{
Expand All @@ -41,7 +41,7 @@ public function routeInAdministration(): bool
* Get route in administration namespace
*
* @param string $name
* @param array $parameters
* @param array $parameters
* @return string
*/
public function route(string $name, array $parameters = []): string
Expand Down
2 changes: 1 addition & 1 deletion src/Console/AdministratorCreateCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

use Illuminate\Console\Command;
use Illuminate\Support\Facades\Hash;
use ProVision\Administration\AdministrationFacade as Administration;
use ProVision\Administration\Facades\AdministrationFacade as Administration;
use ProVision\Administration\Models\Administrator;

class AdministratorCreateCommand extends Command
Expand Down
20 changes: 20 additions & 0 deletions src/Contracts/AdministrationModule.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace ProVision\Administration\Contracts;

use Lavary\Menu\Builder;

/**
* Interface AdministrationModule
*/
interface AdministrationModule
{

/**
* Init administration menu.
*
* @param Builder $moduleMenu
* @return mixed
*/
public function administrationMenu(Builder $moduleMenu);
}
Loading

0 comments on commit f324665

Please sign in to comment.