Commit 6621c7cd authored by Tondon César's avatar Tondon César
Browse files

merge

parents 7e5951e8 e2c79107
......@@ -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();*/
}
......
......@@ -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;
......
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