merge

6621c7cd · Tondon César · 7e5951e8 · e2c79107 · 6621c7cd · 6621c7cd
Commit 6621c7cd authored 5 years ago by Tondon César
--- a/Seance5-6/seance/src/controller/IndexController.php
+++ b/Seance5-6/seance/src/controller/IndexController.php
@@ -33,8 +33,8 @@ class IndexController
        $game = Game::select('id','name','alias','deck')->where('id','<=','200')->get();
        // $game = Game::where('id','=',1)->get();
         // $json = json_encode($game,JSON_FORCE_OBJECT);
-         $json = '{ "games" : [ ';
         foreach($game as $key => $value) {
+<<<<<<< HEAD
             $json = $json . json_encode($value) . ',';
             /*$json = $json .  '{
                 "id": ' . $value->id . ',
@@ -53,6 +53,11 @@ class IndexController
             }
             }
         $json = $json . ']}';
+=======
+                $value->description = "...";
+         }
+         $json = json_encode($game);
+>>>>>>> e2c791070c5330916f63fb55c2b639a71a327bcb
         $cq2 = new VuePartie2($json);
         $cq2->render();*/
    }

--- a/Seance5-6/seance/src/view/VuePartie2.php
+++ b/Seance5-6/seance/src/view/VuePartie2.php
@@ -21,12 +21,11 @@ class VuePartie2
            
            <link rel="stylesheet" href="css/main.css">
        
-            <title>photobox</title>
+            <title>AppliBD</title>
        </head>

        <body>
-            <h1>Titre</h1>
-            <p>$json</p>
+            $json
        </body>

 END;