This commit is contained in:
Mathieu Lagace
2019-09-13 16:25:36 -04:00
parent b7c2b8a632
commit 7dedd9586b
30 changed files with 834 additions and 423 deletions

View File

@@ -22,12 +22,9 @@ class LoginController extends Controller
protected function redirectTo()
{
if(\Auth::User()->getAcces(2))
{
return '/admin';
} else if(\Auth::User()->getAcces(1)){
return '/ecc';
}
return '/admin';
}
/**
* Where to redirect users after login.

View File

@@ -84,7 +84,7 @@ class EventController extends Controller
}
}
clog('add','success','a ajouté un évènement',null,'App\Event',$event->id);
return redirect('/admin/calendar')->with('success','Événement ajouter à l\'horaire');
return redirect('/admin/schedule')->with('success','Événement ajouter à l\'horaire');
}
/**
@@ -175,7 +175,7 @@ class EventController extends Controller
}
}
clog('edit','success','a modifié un évènement',null,'App\Event',$event->id);
return redirect('/admin/calendar')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
return redirect('/admin/schedule')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
}
/**

View File

@@ -24,7 +24,7 @@ class RankController extends Controller
*/
public function create()
{
//
return view('admin.configs.ranks.add');
}
/**
@@ -35,7 +35,25 @@ class RankController extends Controller
*/
public function store(Request $request)
{
//
$r = new Rank();
$r->name = $request->name;
$r->desc = $request->desc;
$r->acces_level = 1;
$tpermission = [];
foreach (\App\Permission::all() as $perm)
{
$tkey = $perm->ckey;
$tpermission[$tkey] = $request->$tkey;
}
$r->permissions = json_encode($tpermission);
$r->save();
clog('add','success','Grade ajouté avec succès');
return redirect('/admin/config/ranks')->with('success','Grade ajouté avec succès');
}
/**
@@ -57,7 +75,7 @@ class RankController extends Controller
*/
public function edit(Rank $rank)
{
//
}
/**
@@ -67,9 +85,26 @@ class RankController extends Controller
* @param \App\Rank $rank
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Rank $rank)
public function update(Request $request, $rank)
{
//
$r = Rank::find($rank);
$r->name = $request->name;
$r->desc = $request->desc;
$tpermission = [];
foreach (\App\Permission::all() as $perm)
{
$tkey = $perm->ckey;
$tpermission[$tkey] = $request->$tkey;
}
$r->permissions = json_encode($tpermission);
$r->save();
clog('edit','success','Grade modifié avec succès');
return redirect('/admin/config/ranks')->with('success','Grade modifié avec succès');
}
/**

View File

@@ -69,7 +69,7 @@ class UserController extends Controller
}
$user->avatar = rand(1,16);
$user->rank = request('rank');
$user->rank_id = request('rank');
$user->job = request('job');
$user->password = bcrypt(request('psw'));
$user->api_token = str_random(60);
@@ -141,7 +141,7 @@ class UserController extends Controller
$user->age = request('age');
}
$user->rank = request('rank');
$user->rank_id = request('rank');
$user->job = request('job');
if (request('psw') != null) {
$user->password = bcrypt(request('psw'));
@@ -231,7 +231,7 @@ class UserController extends Controller
$user->save();
return back()->with('success', 'Modification enregistré');
return redirect('/admin/profil')->with('success', 'Modification enregistré');
}
public function UserAdress()
@@ -247,7 +247,7 @@ class UserController extends Controller
$user->save();
return back()->with('success', 'Modification enregistré');
return redirect('/admin/profil')->with('success', 'Modification enregistré');
}
public function apiList()