diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php index dea4004..5eee80d 100755 --- a/SRC/app/Http/Controllers/GameController.php +++ b/SRC/app/Http/Controllers/GameController.php @@ -3,6 +3,7 @@ use App\Models\User; use Response; use App\Models\Oeuvre; +use App\Models\ListeOeuvre; class GameController extends Controller { @@ -35,7 +36,13 @@ class GameController extends Controller { */ public function showReferentGames($id) { - return view('referent_games', ['referent' => $id]); + $listeOeuvre = $ListeOeuvre = ListeOeuvre::ofUser($id)->activeListOeuvre()->first(); + if($listeOeuvre == '') + $games = []; + else + $games = $listeOeuvre->jeux()->get(); + + return view('referent_games', ['games' => $games]); } diff --git a/SRC/app/Models/ListeOeuvre.php b/SRC/app/Models/ListeOeuvre.php index 5219930..8946cb2 100755 --- a/SRC/app/Models/ListeOeuvre.php +++ b/SRC/app/Models/ListeOeuvre.php @@ -24,4 +24,14 @@ class ListeOeuvre extends Model { $idUser = Auth::user()->id; return $query->where('iduser', $idUser); } + + public function scopeOfUser($query, $idUser) + { + return $query->where('iduser', $idUser); + } + + public function scopeActiveListOeuvre($query) + { + return $query->where('etat', 1); + } } diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css index c567024..4a179cf 100644 --- a/SRC/public/css/memory.css +++ b/SRC/public/css/memory.css @@ -120,7 +120,7 @@ img { */ .mg__start-screen { text-align: center; - padding: 80px 20px; + padding: 5% 20px; } .mg__start-screen--heading { @@ -167,14 +167,17 @@ img { */ .mg__wrapper { margin: 0 auto; + margin: 0; + padding: 0; width: 100%; + text-align: center; } .mg__contents { position: relative; - padding-bottom: 47%; - margin-left: -5px; - margin-right: -5px; + padding-bottom: 50%; + margin-left: 0%; + margin-right: 0%; } /** @@ -239,43 +242,45 @@ img { .mg__level-2 .mg__tile-1 { top: 0%; - left: 0%; + left: 23%; } .mg__level-2 .mg__tile-2 { top: 0%; - left: 16.66667%; + left: 39.66667%; } .mg__level-2 .mg__tile-3 { top: 0%; - left: 33.33333%; + left: 56.33333%; } +/* .mg__level-2 .mg__tile-4 { top: 0%; - left: 50%; + left: 73%; } .mg__level-2 .mg__tile-5 { top: 0%; - left: 66.66667%; + left: 89.66667%; } .mg__level-2 .mg__tile-6 { top: 0%; left: 83.33333%; -} +}*/ .mg__level-2 .mg__tile-7 { top: 33.33333%; - left: 0%; + left: 23%; } .mg__level-2 .mg__tile-8 { top: 33.33333%; - left: 16.66667%; + left: 39.66667%; } .mg__level-2 .mg__tile-9 { top: 33.33333%; - left: 33.33333%; + left: 56.33333%; } +/* .mg__level-2 .mg__tile-10 { top: 33.33333%; - left: 50%; + left: 73%; } .mg__level-2 .mg__tile-11 { top: 33.33333%; @@ -309,7 +314,7 @@ img { top: 66.66667%; left: 83.33333%; } - +*/ /* game__level-3 styles */ .mg__level-3 .mg__tile { width: 12.5%; @@ -318,20 +323,21 @@ img { .mg__level-3 .mg__tile-1 { top: 0%; - left: 0%; + left: 23%; } .mg__level-3 .mg__tile-2 { top: 0%; - left: 12.5%; + left: 35.5%; } .mg__level-3 .mg__tile-3 { top: 0%; - left: 25%; + left: 48%; } .mg__level-3 .mg__tile-4 { top: 0%; - left: 37.5%; + left: 60.5%; } +/* .mg__level-3 .mg__tile-5 { top: 0%; left: 50%; @@ -347,26 +353,26 @@ img { .mg__level-3 .mg__tile-8 { top: 0%; left: 87.5%; -} +}*/ .mg__level-3 .mg__tile-9 { top: 25%; - left: 0%; + left: 23%; } .mg__level-3 .mg__tile-10 { top: 25%; - left: 12.5%; + left: 35.5%; } .mg__level-3 .mg__tile-11 { top: 25%; - left: 25%; + left: 48%; } .mg__level-3 .mg__tile-12 { top: 25%; - left: 37.5%; + left: 60.5%; } .mg__level-3 .mg__tile-13 { top: 25%; - left: 50%; + left: 73%; } .mg__level-3 .mg__tile-14 { top: 25%; diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js index c5e1d98..82442fd 100644 --- a/SRC/public/js/memory.js +++ b/SRC/public/js/memory.js @@ -198,7 +198,7 @@ \ \
\ - \ + \
'; this.gameMeta.innerHTML = this.gameMetaHTML; this.game.appendChild(this.gameMeta); @@ -207,8 +207,8 @@ // - this.gameStartScreenHTML = '

Welcome to the Memory Game!

\ -

Choisir niveau

\ + this.gameStartScreenHTML = '

JEU MEMORY

\ +

Choisir un niveau :

\