Skip to content

P
packagist
Commit a594d4b7 authored by Sylvain's avatar Sylvain
Browse files
Options

Connection à Modulus

parent 09119ce3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 537 additions and 308 deletions
README.md
View file @ a594d4b7
......@@ -54,6 +54,20 @@ npm run dev
Edit `config/modulus.js` file
Ajouter au fichier `app/Http/Kernel.php [$routeMiddleware]` les lignes suivantes :
```php
/* Middlewares ajoutés */
'auth.active' => \Goldenscarab\Modulus\App\Http\Middleware\RedirectIfNotActive::class,
'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class,
```
### Route
Vous pouvez personnaliser l'url de base d'accès à Modulus depuis le fichier de config `config/modulus.php`.
Si vous souhaitez personnaliser l'URL de Modulus à la racine du nom de domaine, penser à nettoyer la route par défaut du fichier `routes/web.php`
## Security
If you discover any security related issues, please email contact@goldenscarab.fr instead of using the issue tracker.
......
src/App/Http/Controllers/Back/DashboardController.php → src/App/Http/Controllers/App/DashboardController.php
View file @ a594d4b7
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Back;
namespace Goldenscarab\Modulus\App\Http\Controllers\App;
use App\Http\Controllers\Controller;
......
src/App/Http/Controllers/Back/ModuleController.php → src/App/Http/Controllers/App/ModuleController.php
View file @ a594d4b7
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Back;
namespace Goldenscarab\Modulus\App\Http\Controllers\App;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
......
src/App/Http/Controllers/Back/PermissionController.php → src/App/Http/Controllers/App/PermissionController.php
View file @ a594d4b7
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Back;
namespace Goldenscarab\Modulus\App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use Goldenscarab\Modulus\App\Models\Permission;
......@@ -25,7 +25,7 @@ class PermissionController extends Controller
$this->middleware('permission:permission-update')->only(['update']);
$this->middleware('permission:permission-delete')->only('delete');
view()->share('route_prefix', "back.user.permission");
view()->share('route_prefix', "modulus.user.permission");
}
public function index(Request $request)
......@@ -42,8 +42,8 @@ class PermissionController extends Controller
$permissions = $permissions->unique('short_name');
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Permissions' => null
);
......@@ -59,18 +59,18 @@ class PermissionController extends Controller
$permission = $this->permission_repo->new();
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Permissions' => route('back.user.permission.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Permissions' => route('modulus.user.permission.index'),
'Ajouter' => null
);
return view('modulus::app.user.permission.form')->with([
'title' => '<i class="fa fa-unlock-alt mr-1" aria-hidden="true"></i>Permission',
'subtitle' => $permission->display_name,
'action' => '<i class="fa fa-plus mr-2"></i>Ajouter',
'breadcrumb' => $breadcrumb,
'item' => $permission,
'title' => '<i class="fa fa-unlock-alt mr-1" aria-hidden="true"></i>Permission',
'subtitle' => $permission->display_name,
'action' => '<i class="fa fa-plus mr-2"></i>Ajouter',
'breadcrumb' => $breadcrumb,
'item' => $permission,
]);
}
......@@ -79,9 +79,9 @@ class PermissionController extends Controller
$permission = $this->permission_repo->findOrFail($id);
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Permissions' => route('back.user.permission.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Permissions' => route('modulus.user.permission.index'),
'Modifier' => null
);
......@@ -120,7 +120,7 @@ class PermissionController extends Controller
Session::flash('success', "Permission ". (is_null($id) ? 'créée' : 'modifiée') ." avec succès");
return Redirect::route('back.user.permission.index');
return Redirect::route('modulus.user.permission.index');
}
public function delete($id)
......@@ -136,7 +136,7 @@ class PermissionController extends Controller
Session::flash('success', 'Permission supprimée avec succès');
return Redirect::route('back.user.permission.index');
return Redirect::route('modulus.user.permission.index');
}
}
src/App/Http/Controllers/Back/RoleController.php → src/App/Http/Controllers/App/RoleController.php
View file @ a594d4b7
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Back;
namespace Goldenscarab\Modulus\App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
......@@ -29,7 +29,7 @@ class RoleController extends Controller
$this->middleware('permission:role-update')->only(['update']);
$this->middleware('permission:role-delete')->only('delete');
view()->share('route_prefix', "back.user.role");
view()->share('route_prefix', "modulus.user.role");
}
public function index(Request $request)
......@@ -44,8 +44,8 @@ class RoleController extends Controller
$roles = $this->role_repo->list($sorting, $direction, $perpage, $search);
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Rôles' => null
);
......@@ -65,9 +65,9 @@ class RoleController extends Controller
$permissions = $this->formatPermissions($perms);
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Rôles' => route('back.user.role.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Rôles' => route('modulus.user.role.index'),
'Ajouter' => null
);
......@@ -89,9 +89,9 @@ class RoleController extends Controller
$permissions = $this->formatPermissions($perms);
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Rôles' => route('back.user.role.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Rôles' => route('modulus.user.role.index'),
'Modifier' => null
);
......@@ -139,7 +139,7 @@ class RoleController extends Controller
Session::flash('success', "Rôle ". (is_null($id) ? 'crée' : 'modifié') ." avec succès");
return Redirect::route('back.user.role.index');
return Redirect::route('modulus.user.role.index');
}
public function delete($id)
......@@ -148,7 +148,7 @@ class RoleController extends Controller
Session::flash('success', 'Rôle supprimé avec succès');
return Redirect::route('back.user.role.index');
return Redirect::route('modulus.user.role.index');
}
}
src/App/Http/Controllers/Back/UserController.php → src/App/Http/Controllers/App/UserController.php
View file @ a594d4b7
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Back;
namespace Goldenscarab\Modulus\App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use Illuminate\Support\Str;
......@@ -35,7 +35,7 @@ class UserController extends Controller
$this->middleware('permission:user-update')->only('update');
$this->middleware('permission:user-delete')->only('delete');
view()->share('route_prefix', "back.user");
view()->share('route_prefix', "modulus.user");
}
public function index(Request $request)
......@@ -54,7 +54,7 @@ class UserController extends Controller
$roles = $this->role_repo->all();
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => null,
);
......@@ -73,8 +73,8 @@ class UserController extends Controller
$roles = $this->role_repo->all();
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Ajouter' => null
);
......@@ -95,8 +95,8 @@ class UserController extends Controller
$roles = $this->role_repo->all();
$breadcrumb = array(
'Accueil' => route('back.dashboard'),
'Utilisateurs' => route('back.user.index'),
'Accueil' => route('modulus.dashboard'),
'Utilisateurs' => route('modulus.user.index'),
'Modifier' => null
);
......@@ -125,12 +125,12 @@ class UserController extends Controller
Session::flash('success', "Utilisateur ajouté avec succès");
return Redirect::route('back.user.index');
return Redirect::route('modulus.user.index');
}
Session::flash('success', "Utilisateur modifié avec succès");
return Redirect::route('back.user.index', $request->query());
return Redirect::route('modulus.user.index', $request->query());
}
/**
......@@ -222,7 +222,7 @@ class UserController extends Controller
{
$item = auth()->user();
return view('back.user.profil')->with([
return view('modulus::app.user.profil')->with([
'title' => '<i class="fa fa-user mr-1"></i>Profil utilisateur',
'item' => $item,
]);
......@@ -235,7 +235,7 @@ class UserController extends Controller
Session::flash('success', "Profil enregistré avec succès");
return Redirect::app();
return Redirect::back();
}
public function delete($id)
......@@ -244,7 +244,7 @@ class UserController extends Controller
Session::flash('success', 'Utilisateur supprimé avec succès');
return Redirect::route('back.user.index');
return Redirect::route('modulus.user.index');
}
public function sendCreatedAccountMail($id)
......@@ -255,7 +255,7 @@ class UserController extends Controller
Session::flash('success', 'Mail de création de compte envoyé avec succès');
return Redirect::route('back.user.index');
return Redirect::route('modulus.user.index');
}
private function passwordReset($user)
......
src/App/Http/Controllers/Auth/ConfirmablePasswordController.php
View file @ a594d4b7
......@@ -40,6 +40,6 @@ class ConfirmablePasswordController extends Controller
$request->session()->put('auth.password_confirmed_at', time());
return redirect()->intended(RouteServiceProvider::HOME);
return redirect()->intended(AUTH_HOME);
}
}
src/App/Http/Controllers/Auth/EmailVerificationNotificationController.php
View file @ a594d4b7
......@@ -3,7 +3,6 @@
namespace Goldenscarab\Modulus\App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Http\Request;
class EmailVerificationNotificationController extends Controller
......@@ -17,7 +16,7 @@ class EmailVerificationNotificationController extends Controller
public function store(Request $request)
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(RouteServiceProvider::HOME);
return redirect()->intended(AUTH_HOME);
}
$request->user()->sendEmailVerificationNotification();
......
src/App/Http/Controllers/Auth/EmailVerificationPromptController.php
View file @ a594d4b7
......@@ -3,7 +3,6 @@
namespace Goldenscarab\Modulus\App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Http\Request;
class EmailVerificationPromptController extends Controller
......@@ -17,7 +16,7 @@ class EmailVerificationPromptController extends Controller
public function __invoke(Request $request)
{
return $request->user()->hasVerifiedEmail()
? redirect()->intended(RouteServiceProvider::HOME)
? redirect()->intended(AUTH_HOME)
: view('modulus::auth.verify-email');
}
}
src/App/Http/Controllers/Auth/RegisteredUserController.php
View file @ a594d4b7
......@@ -46,6 +46,6 @@ class RegisteredUserController extends Controller
event(new Registered($user));
return redirect(RouteServiceProvider::HOME);
return redirect(AUTH_HOME);
}
}
src/App/Http/Controllers/Auth/VerifyEmailController.php
View file @ a594d4b7
......@@ -3,7 +3,6 @@
namespace Goldenscarab\Modulus\App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Auth\Events\Verified;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
......@@ -18,13 +17,13 @@ class VerifyEmailController extends Controller
public function __invoke(EmailVerificationRequest $request)
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
return redirect()->intended(AUTH_HOME.'?verified=1');
}
if ($request->user()->markEmailAsVerified()) {
event(new Verified($request->user()));
}
return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
return redirect()->intended(AUTH_HOME.'?verified=1');
}
}
src/App/Http/Controllers/Front/IndexController.php deleted 100644 → 0
View file @ 09119ce3
<?php
namespace Goldenscarab\Modulus\App\Http\Controllers\Front;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\View;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Redirect;
use Goldenscarab\Modulus\App\Jobs\Tracker;
use Goldenscarab\Modulus\App\Http\Services\Compiler\Facade\CompilerService;
use Modules\Setting\Http\Services\Facades\SettingService;
class IndexController extends Controller
{
public function __construct()
{
if (request()->route('segment1') == 'extranet') {
//if (Route::current()->parameter('segment1') == 'extranet') {
$this->middleware('auth');
}
}
/**
* Methode par defaut pour affichage des différentes vues demandées
* @param String $slug Slug de la vue demandée (facultatif)
* @return View La vue demandée
*/
public function index($segment1 = null, $segment2 = null, $segment3 = null)
{
if ($segment1 == str_replace('/', '', SettingService::get('homepage'))) {
return Redirect::to('/');
}
$uri = ($segment1 ? '/' . $segment1 : '') .
($segment2 ? '/' . $segment2 : '') .
($segment3 ? '/' . $segment3 : '');
if (empty($uri)) {
$uri = SettingService::get('homepage');
}
// Recherche d'une surcharge
$override_path = 'front.overrides.';
$override_name = implode('_', array_filter([$segment1, $segment2, $segment3]));
$override_path_name = $override_path . $override_name;
if (View::exists($override_path_name)) {
return view($override_path_name);
}
CompilerService::createViewIfNotExists($uri);
// Un peu de tracking
dispatch(new Tracker);
// Chargement de la vue
return view(config('modulus.compiled_folder') . Str::slug($uri));
}
}
src/App/Providers/LoadServiceProvider.php
View file @ a594d4b7
......@@ -15,7 +15,7 @@ class LoadServiceProvider extends ServiceProvider
*/
public function boot()
{
$this->loadMigrationsFrom(__DIR__.'/../../database/migrations');
//$this->loadMigrationsFrom(__DIR__.'/../../database/migrations');
$this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'modulus');
$this->loadViewsFrom(__DIR__.'/../../resources/views', 'modulus');
}
......
src/App/Providers/PublishesServiceProvider.php
View file @ a594d4b7
......@@ -30,12 +30,23 @@ class PublishesServiceProvider extends ServiceProvider
__DIR__.'/../../config' => base_path('config')
]);
// Database
$this->publishes([
__DIR__.'/../../database/migrations/' => base_path('database/migrations/'),
__DIR__.'/../../database/seeders/' => base_path('database/seeders/')
]);
// Assets
$this->publishes([
__DIR__.'/../../resources/js/publishes.js' => base_path('resources/js/modulus.js'),
__DIR__.'/../../resources/sass/publishes.scss' => base_path('resources/sass/modulus.scss')
]);
// Images
$this->publishes([
__DIR__.'/../../public/images/' => public_path('images/'),
]);
// Views
// $this->publishes([
// __DIR__.'/../views' => base_path('resources/views'),
......
src/App/Providers/RouteServiceProvider.php
View file @ a594d4b7
......@@ -20,7 +20,7 @@ class RouteServiceProvider extends ServiceProvider
*/
public function boot()
{
define('HOME', config('modulus.route_prefix'));
define('AUTH_HOME', config('modulus.url_prefix'));
$router = $this->app->router;
......@@ -40,7 +40,7 @@ class RouteServiceProvider extends ServiceProvider
});
// Modulus
$router->prefix(config('modulus.route_prefix'))
$router->prefix(trim(AUTH_HOME, '/'))
->middleware(['web'])
->namespace($this->base_namespace)
->group(function($router) {
......
src/config/modulus.php
View file @ a594d4b7
......@@ -3,13 +3,17 @@
return [
/**
* Préfixe des routes de Modulus
* Icone du nom de l'application
*/
'route_prefix' => 'backend',
'label_icon' => '<i class="fa fa-puzzle-piece align-middle ml-3" style="font-size: 26px;"></i>',
/**
* Chemin vers les vues compilées de pages
* Nom de l'application
*/
'compiled_folder' => 'front/compiled/'
'label_name' => '<b>M</b>odulus',
/**
* Préfixe des url de Modulus
*/
'url_prefix' => '/backend',
];
src/database/migrations/2014_10_12_000000_create_users_table.php 0 → 100644
View file @ a594d4b7
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
$table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable();
$table->string('password');
$table->string('api_token', 80)->unique()->nullable()->default(null);
$table->string('avatar')->nullable();
$table->string('lastname');
$table->string('firstname');
$table->mediumText('comment')->nullable();
$table->string('company')->nullable();
$table->string('activity')->nullable();
$table->string('telephone')->nullable();
$table->mediumText('address')->nullable();
$table->string('zipcode')->nullable();
$table->string('city')->nullable();
$table->boolean('active')->default(false);
$table->rememberToken();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('users');
}
}
src/database/seeder/DatabaseSeeder.php → src/database/seeders/DatabaseSeeder.php
View file @ a594d4b7
......@@ -17,6 +17,6 @@ class DatabaseSeeder extends Seeder
$this->call(PermissionsTablesSeeder::class);
$this->call(ModulesTableSeeder::class);
//$this->call(ModulesTableSeeder::class);
}
}
src/database/seeder/PermissionsTablesSeeder.php → src/database/seeders/PermissionsTablesSeeder.php
View file @ a594d4b7
......@@ -2,8 +2,8 @@
namespace Database\Seeders;
use App\Models\User;
use App\Models\Permission;
use Goldenscarab\Modulus\App\Models\User;
use Goldenscarab\Modulus\App\Models\Permission;
use Spatie\Permission\Models\Role;
use Illuminate\Database\Seeder;
......@@ -39,10 +39,7 @@ class PermissionsTablesSeeder extends Seeder
'user',
'role',
'permission',
'module',
'module-building',
'module-device',
'module-campaign'
'module'
);
// Création des permissions
......@@ -85,23 +82,7 @@ class PermissionsTablesSeeder extends Seeder
$role->display_name = 'Client';
$role->description = 'Utilisateur classique';
$role->save();
$role->givePermissionTo([
// Ici les permissions pour un éditeur ex : page-read
'module-building-read',
'module-building-create',
'module-building-update',
'module-building-delete',
'module-device-read',
'module-device-create',
'module-device-update',
'module-device-delete',
'module-campaign-read',
'module-campaign-create',
'module-campaign-update',
'module-campaign-delete'
]);
$role->givePermissionTo([]);
$role = new Role;
$role->name = 'visitor';
......@@ -110,13 +91,7 @@ class PermissionsTablesSeeder extends Seeder
$role->save();
$role->givePermissionTo([]);
$user = User::findOrfail(1);
$user->assignRole(['visitor']);
$user = User::findOrfail(2);
$user = User::findOrfail(1);
$user->assignRole(['admin']);
$user = User::findOrfail(3);
$user->assignRole(['client']);
}
}
src/database/seeder/UsersTableSeeder.php → src/database/seeders/UsersTableSeeder.php
View file @ a594d4b7
......@@ -15,20 +15,6 @@ class UsersTableSeeder extends Seeder
*/
public function run()
{
DB::table('users')->insert([
'avatar' => '/images/modulus/man.svg',
'lastname' => 'Visiteur',
'firstname' => 'Utilisateur',
'email' => 'visiteur@goldenscarab.fr',
'password' => bcrypt('password'),
'api_token' => Str::random(60),
'comment' => "Visiteur par défaut - NE PAS SUPPRIMER !!",
'email_verified_at' => \Carbon\Carbon::now(),
'active' => "1",
'updated_at' => \Carbon\Carbon::now(),
'created_at' => \Carbon\Carbon::now(),
]);
DB::table('users')->insert([
'avatar' => '/images/modulus/man.svg',
'lastname' => 'CARRE',
......@@ -43,19 +29,5 @@ class UsersTableSeeder extends Seeder
'updated_at' => \Carbon\Carbon::now(),
'created_at' => \Carbon\Carbon::now(),
]);
DB::table('users')->insert([
'avatar' => '/images/modulus/man.svg',
'lastname' => 'NOM',
'firstname' => 'Prenom',
'email' => 'client@goldenscarab.fr',
'password' => bcrypt('password'),
'api_token' => Str::random(60),
'comment' => "Client test",
'email_verified_at' => \Carbon\Carbon::now(),
'active' => "1",
'updated_at' => \Carbon\Carbon::now(),
'created_at' => \Carbon\Carbon::now(),
]);
}
}
src/resources/sass/_app.scss
View file @ a594d4b7
......@@ -388,3 +388,33 @@ div.form-action {
.opacity-25 {
opacity: 0.25
}
/*
____ _ _
/ ___|___ ___ | | _(_) ___
| | / _ \ / _ \| |/ / |/ _ \
| |__| (_) | (_) | <| | __/
\____\___/ \___/|_|\_\_|\___|
*/
.cookie-consent {
width: 100%;
padding-top: 15px;
padding-bottom: 15px;
background-color: #f7e8d4;
color: #b27221;
text-align: center;
position: fixed;
bottom: 0;
left: 0;
z-index: 9999;
}
.cookie-consent button.cookie-consent__agree {
margin-left: 20px;
background-color: #f7d1a1;
color: #b27221;
border: none;
}
.cookie-consent button.cookie-consent__agree:hover {
color: #d8994a;
background-color: #fff4e7;
}
src/resources/views/app/user/form.blade.php
View file @ a594d4b7
@extends('layouts.back.form')
@extends('modulus::layouts.app.form')
@section('fields')
<input type="hidden" name="id" value="{{ $item->id }}">
<div class="row">
<div class="col-lg-6">
<div class="card card-success">
<div class="card-header">
......@@ -15,7 +15,7 @@
<div class="form-row">
<div class="col-md-6">
{!! \Field::input([
'label' => 'Nom',
'label' => 'Nom',
'name' => 'lastname',
'value' => $item->lastname,
'prefix' => '<i class="fa fa-bookmark"></i>',
......@@ -25,7 +25,7 @@
</div>
<div class="col-md-6">
{!! \Field::input([
'label' => 'Prénom',
'label' => 'Prénom',
'name' => 'firstname',
'value' => $item->firstname,
'prefix' => '<i class="fa fa-bookmark"></i>',
......@@ -35,9 +35,9 @@
</div>
</div>
<div class="form-row">
<div class="col">
<div class="col">
{!! \Field::textarea([
'label' => 'Commentaire',
'label' => 'Commentaire',
'name' => 'comment',
'value' => $item->comment,
'rows' => 3
......@@ -47,7 +47,7 @@
<div class="form-row mb-3">
<div class="col-md-6">
{!! \Field::select([
'label' => 'Avatar',
'label' => 'Avatar',
'name' => 'avatar',
'prefix' => '<img class="thumb" src="' . $item->avatar . '" style="height: 20px;"/>',
'value' => $item->avatar,
......@@ -61,7 +61,7 @@
</div>
<div class="col-md-6">
{!! \Field::select([
'label' => 'Statut',
'label' => 'Statut',
'name' => 'active',
'prefix' => '<i class="fa fa-check"></i>',
'value' => $item->active,
......@@ -86,7 +86,7 @@
<div class="form-row">
<div class="col-md-6">
{!! \Field::input([
'label' => 'Société',
'label' => 'Société',
'name' => 'company',
'value' => $item->company,
'prefix' => '<i class="fa fa-industry"></i>',
......@@ -95,7 +95,7 @@
</div>
<div class="col-md-6">
{!! \Field::input([
'label' => 'Domaine d\'activité',
'label' => 'Domaine d\'activité',
'name' => 'activity',
'value' => $item->activity,
'prefix' => '<i class="fa fa-pie-chart"></i>',
......@@ -106,7 +106,7 @@
<div class="form-row">
<div class="col-md-6">
{!! \Field::input([
'label' => 'Téléphone',
'label' => 'Téléphone',
'name' => 'telephone',
'value' => $item->telephone,
'prefix' => '<i class="fa fa-phone"></i>',
......@@ -128,7 +128,7 @@
<div class="form-row">
<div class="col">
{!! \Field::input([
'label' => 'Adresse',
'label' => 'Adresse',
'name' => 'address',
'value' => $item->address,
'prefix' => '<i class="fa fa-map-marker"></i>',
......@@ -139,7 +139,7 @@
<div class="form-row">
<div class="col-md-4">
{!! \Field::input([
'label' => 'Code postal',
'label' => 'Code postal',
'name' => 'zipcode',
'value' => $item->zipcode,
'placeholder' => 'ex : 01234'
......@@ -147,7 +147,7 @@
</div>
<div class="col-md-8">
{!! \Field::input([
'label' => 'Ville',
'label' => 'Ville',
'name' => 'city',
'value' => $item->city,
'placeholder' => 'ex : TOULOUSE'
......@@ -168,7 +168,7 @@
<div class="form-row mb-3">
<div class="col">
{!! \Field::select([
'label' => 'Rôle',
'label' => 'Rôle',
'name' => 'role',
'class' => 'select2',
'values' => $item->getRoleNames()->toArray(),
......@@ -185,7 +185,7 @@
<div class="form-row">
<div class="col">
{!! \Field::input([
'label' => 'Email',
'label' => 'Email',
'name' => 'email',
'type' => 'email',
'prefix' => '<i class="fa fa-envelope"></i>',
......@@ -200,7 +200,7 @@
<div class="form-row">
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Mot de passe',
'label' => 'Mot de passe',
'name' => 'password',
'type' => 'password',
'prefix' => '<i class="fa fa-key"></i>',
......@@ -209,7 +209,7 @@
</div>
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Confirmation mot de passe',
'label' => 'Confirmation mot de passe',
'name' => 'password_confirmation',
'type' => 'password',
'prefix' => '<i class="fa fa-key"></i>',
......
src/resources/views/app/user/list.blade.php
View file @ a594d4b7
@extends('layouts.back.list')
@extends('modulus::layouts.app.list')
@php
// Paramétrage de la liste
......@@ -72,13 +72,13 @@
@section('menu-header')
@can('permission-read')
<a class="dropdown-item" href="{{ route('back.user.permission.index') }}" title="Administration des permissions">
<a class="dropdown-item" href="{{ route('modulus.user.permission.index') }}" title="Administration des permissions">
<i class="fa fa-unlock-alt mr-2" aria-hidden="true"></i> Gestion des permissions
</a>
@endcan
@can('role-read')
<a class="dropdown-item" href="{{ route('back.user.role.index') }}" title="Administration des rôles">
<a class="dropdown-item" href="{{ route('modulus.user.role.index') }}" title="Administration des rôles">
<i class="fa fa-tags mr-1" aria-hidden="true"></i>Gestion des rôles
</a>
@endcan
......
src/resources/views/app/user/permission/form.blade.php
View file @ a594d4b7
@extends('layouts.back.form')
@extends('modulus::layouts.app.form')
@section('fields')
......@@ -10,7 +10,7 @@
<div class="form-row">
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Étiquette',
'label' => 'Étiquette',
'name' => 'display_name',
'type' => 'text',
'prefix' => '<i class="fa fa-bookmark"></i>',
......@@ -22,7 +22,7 @@
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Nom',
'label' => 'Nom',
'name' => 'name',
'type' => 'text',
'prefix' => '<i class="fa fa-magnet"></i>',
......
src/resources/views/app/user/permission/list.blade.php
View file @ a594d4b7
@extends('layouts.back.list')
@extends('modulus::layouts.app.list')
@php
// Paramétrage de la liste
extract([
'list_name' => 'permission',
'url_back' => route('back.user.index'),
'url_back' => route('modulus.user.index'),
'can_prefix' => 'permission',
'is_creatable' => true,
'has_menu' => false,
......
src/resources/views/app/user/role/form.blade.php
View file @ a594d4b7
@extends('layouts.back.form')
@extends('modulus::layouts.app.form')
@section('fields')
<div class="card">
{{-- <form action="{{ route('back.user.role.store', $role->id) }}" method="post" enctype="multipart/form-data">
{{ csrf_field() }} --}}
<div class="card-header d-flex p-0">
......@@ -16,11 +16,11 @@
<div class="card-body">
<div class="tab-content">
<div class="tab-pane active show" id="tab_1" role="tabpanel">
<div class="form-row">
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Étiquette',
'label' => 'Étiquette',
'name' => 'display_name',
'type' => 'text',
'prefix' => '<i class="fa fa-bookmark"></i>',
......@@ -32,7 +32,7 @@
<div class="col-sm-6">
{!! \Field::input([
'label' => 'Nom',
'label' => 'Nom',
'name' => 'name',
'type' => 'text',
'prefix' => '<i class="fa fa-magnet"></i>',
......@@ -77,7 +77,7 @@
</tr>
</thead>
<tbody>
@forelse ($permissions as $name => $perm)
<tr>
<td>
......@@ -87,37 +87,37 @@
@php
$id_perm = collect($perm)->get('read');
@endphp
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
$item->permissions->contains($id_perm) ? 'checked' : '' }}>
</td>
<td class="text-center">
@php
$id_perm = collect($perm)->get('create');
@endphp
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
$item->permissions->contains($id_perm) ? 'checked' : '' }}>
</td>
<td class="text-center">
@php
$id_perm = collect($perm)->get('update');
@endphp
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
$item->permissions->contains($id_perm) ? 'checked' : '' }}>
</td>
<td class="text-center">
@php
$id_perm = collect($perm)->get('delete');
@endphp
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
<input type="checkbox" name="permissions[{{ $id_perm }}]" value="{{ $id_perm }}"
{{ old('permissions.'.$id_perm) == collect($perm)->get('read') ||
$item->permissions->contains($id_perm) ? 'checked' : '' }}>
</td>
<td>
</td>
</tr>
......@@ -125,7 +125,7 @@
Aucune permissions n'est disponible
@endforelse
</tbody>
</table>
</div>
......
src/resources/views/app/user/role/list.blade.php
View file @ a594d4b7
@extends('layouts.back.list')
@extends('modulus::layouts.app.list')
@php
// Paramétrage de la liste
extract([
'list_name' => 'rôle',
'url_back' => route('back.user.index'),
'url_back' => route('modulus.user.index'),
'can_prefix' => 'role',
'is_creatable' => true,
'has_menu' => false,
......
src/resources/views/auth/login.blade.php
View file @ a594d4b7
......@@ -5,7 +5,7 @@
<div class="login-box">
<div class="login-logo">
<img src="{{ asset('/images/isidiag_logo.png') }}" alt="Isidiag" style="max-width: 300px;">
<a href="{{ url('/') }}"><b>M</b>odulus</a>
</div>
<div class="card">
......
src/resources/views/layouts/app/partials/content.blade.php
View file @ a594d4b7
......@@ -31,7 +31,7 @@
@endisset
</div>
<div class="mt-1">
@include('layouts/back/partials/flash')
@include('modulus::layouts/app/partials/flash')
</div>
</div>
</div>
......
src/resources/views/layouts/app/partials/sidebar-left.blade.php
View file @ a594d4b7
{{-- Logo --}}
<a href="{{ route('back.dashboard') }}" class="brand-link bg-light text-center py-1">
{{-- <i class="fa fa-area-chart align-middle ml-3" style="font-size: 26px;"></i> --}}
{{-- <span class="brand-text font-weight-light ml-1"><b>Isi</b>diag</span> --}}
<img src="{{ asset('/images/isidiag_logo.png') }}" alt="Isidiag" style="height: 57px;">
<a href="{{ route('modulus.dashboard') }}" class="brand-link bg-info">
{!! config('modulus.label_icon') !!}
<span class="brand-text font-weight-light ml-1">{!! config('modulus.label_name') !!}</span>
</a>
<!-- Sidebar -->
......@@ -16,7 +14,7 @@
<img src="{{ asset(auth()->user()->avatar) }}" class="img-circle elevation-2" alt="User Image">
</div>
<div class="info">
<a href="{{ route('back.user.profil') }}" class="d-block">{{ auth()->user()->firstname }}</a>
<a href="{{ route('modulus.user.profil') }}" class="d-block">{{ auth()->user()->firstname }}</a>
</div>
<div class="logout">
<a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
......
src/resources/views/layouts/app/partials/sidebar-right.blade.php
View file @ a594d4b7
......@@ -6,7 +6,7 @@
<ul class="nav nav-sidebar flex-column control-sidebar-menu" data-widget="treeview" role="menu" data-accordion="false">
@can ('user-read')
<li class="nav-item">
<a href="{{ route('back.user.index') }}" class="nav-link">
<a href="{{ route('modulus.user.index') }}" class="nav-link">
<i class="item-icon fa fa-th bg-danger elevation-1"></i>
<div class="item-info">
<h6 class="control-sidebar-subheading">Utilisateurs</h6>
......@@ -18,7 +18,7 @@
@can ('module-read')
<li class="nav-item">
<a href="{{ route('back.module.index') }}" class="nav-link">
<a href="{{ route('modulus.module.index') }}" class="nav-link">
<i class="item-icon fa fa-puzzle-piece bg-info elevation-1"></i>
<div class="item-info">
<h6 class="control-sidebar-subheading">Modules</h6>
......
src/routes/web.php
View file @ a594d4b7
......@@ -14,35 +14,13 @@ use Illuminate\Support\Facades\Route;
*/
/*
_____ _
| ___| __ ___ _ __ | |_
| |_ | '__/ _ \| '_ \| __|
| _|| | | (_) | | | | |_
|_| |_| \___/|_| |_|\__|
*/
Route::group(
[
'middleware' => ['compiler'],
'namespace' => 'Front',
], function ($router) {
Route::get('{segment1?}/{segment2?}/{segment3?}', 'IndexController@index')->name('index')->where('segment1', '^((?!backend|module).)+$');
});
/*
____ _
| __ ) __ _ ___| | __
| _ \ / _` |/ __| |/ /
| |_) | (_| | (__| <
|____/ \__,_|\___|_|\_\
*/
Route::group(
[
'middleware' => ['auth', 'auth.active', 'role:admin|client'],
'prefix' => '/',
'namespace' => 'Back',
'as' => 'back.'
'namespace' => 'App',
'as' => 'modulus.'
], function ($router) {
// Dashboard
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment