QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

Browse Source
This commit is contained in:
sidya82
2015-03-18 09:10:27 +01:00
parent 9fd3d627f8 b8a1a2ae66
commit d740e57d56
30 changed files with 431 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SRC/app/Http/Controllers/APIController.php
View File

@ -24,7 +24,7 @@ class APIController extends Controller {
if(!empty($reg))
$res = Referent::where('nom', 'like', '%'.$reg.'%')->orWhere('prenom', 'like', '%'.$reg.'%')->select(['nom', 'prenom', 'image', 'id'])->get();
else
$res = Referent::get(5);
$res = Referent::take(5)->select(['nom', 'prenom', 'image', 'id'])->get();
return Response::json($res->toArray());
}

4
SRC/app/Http/Controllers/GameController.php
View File

@ -23,7 +23,8 @@ class GameController extends Controller {
* @return Response
*/
public function chooseDifMemo() {
return view('frontend/memo_level');
$nbOr = Cookie::get('referent');
return view('frontend/memo_level', ['nbOr' => $nbOr]);
}
public function playMemo($niveau) {
@ -94,7 +95,6 @@ class GameController extends Controller {
return view('referent_games', ['games' => $games]);
}
/**
* Show one referent game
*

3
SRC/app/Http/Controllers/HomeController.php
View File

@ -29,7 +29,8 @@ class HomeController extends Controller {
public function choisirRef()
{
return view('frontend/home',['referents' => Referent::get()]);
$refs = Referent::take(5)->select(['nom', 'prenom', 'image', 'id'])->get();
return view('frontend/home',['referents' => $refs]);
}
public function changerRef($idRef)

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

@ -65,7 +65,7 @@ class LoginController extends Controller {
{
Session::forget('admin');
Auth::logout();
return redirect('login');
return redirect()->guest('login');
}
public function forgottenPassword()

8
SRC/app/Http/Controllers/ReferentController.php
View File

@ -117,8 +117,12 @@ class ReferentController extends Controller {
Auth::user()->configjeu()->update(array('actifMemo' => 0));
Auth::user()->configjeu()->update(array('actifPuzzle' => 0));
if(Input::get('memo') != 0)
ConfigJeu::where('referent_id', '=', Auth::user()->id)->find(Input::get('memo'))->update(array('actifMemo' => 1));
if(Input::get('puzzle') != 0)
ConfigJeu::where('referent_id', '=', Auth::user()->id)->find(Input::get('puzzle'))->update(array('actifPuzzle' => 1));
Session::flash('message', 'Vous avez modifié les listes associées aux jeux avec succès.');
return redirect()->back();
}
@ -126,7 +130,8 @@ class ReferentController extends Controller {
//todo verifier user
$cj = ConfigJeu::find($id);
$cj->oeuvres()->attach(Input::get('toadd'));
Session::flash('message', 'Vous avez ajouter des oeuvres dans votre liste.');
return redirect()->back();
}
@ -137,6 +142,7 @@ class ReferentController extends Controller {
if(count(Input::get('todel')) >= 1)
$cj->oeuvres()->detach(Input::get('todel'));
Session::flash('erreur', 'Vous avez supprimer des oeuvres de votre liste.');
return redirect()->back();
}