Merge branch 'master' into make-event

Author: dandynaufaldi

.env.example

@@ -8,43 +8,57 @@
 use App\Skor;
 use App\Soal;
 use App\Jawaban;
+use App\Paket;
 
 class RoomController extends Controller
 {
     public  function  index($id_room){
-
+        
     }
 
     public function create(){
-
+        $pakets = Paket::all();
+        return view('room.create')->with([
+            'pakets' => $pakets
+        ]);
     }
 
     public function store(Request $request){
-
         $user = new User();
-        $user->username = 'master';
+        $user->username = 'dummy';
+        $user->save();
+        $user->username = $user->id.'_'.'master';
         $user->save();
 
+        $id_room = $user->id.'_'.$request->kode;
         $room = new Room();
+        $room->paket_id = implode('|', array());
         $room->master_id = $user->id;
         $room->status = 0;
-        $room->kode = $request->kode;
-        $room->player_id = implode('|', array());
-        $room->save();
-        $room->kode = $room->id.'_'.$room->kode;
+        $room->kode = $id_room;
+        $room->player_id = serialize(array());
         $room->save();
-
-        return redirect()->route('soal')->with([
+        
+        return redirect()->route('soal', $room->kode)->with([
             'id_room' => $room->kode
         ]);
+        // return redirect('/room/create');
     }
 
     public function soal($id_room){
-
+        $pakets = Paket::all();
+        $room = Room::where('kode', $id_room)->first();
+        return view('room.soal')->with([
+            'id_room' => $id_room,
+            'pakets' => $pakets
+        ]);
     }
 
     public function addSoal(Request $request, $id_room){
-        $room = Room::all()->where('kode', $id_room);
+        if(!is_array($request->paket_id))
+            return back();
+
+        $room = Room::all()->where('kode', $id_room)->first();
         $room->paket_id = implode('|', $request->paket_id);
         $room->save();
 

app/Http/Controllers/RoomController.php

@@ -9,15 +9,15 @@
 class UserController extends Controller
 {
     public  function create(){
-
+        return view('user');
     }
 
     public function store(Request $request){
         $user = new User();
         $user->username = $request->username;
         $user->save();
 
-        $room = Room::all()->where('kode', $request->kode_room);
+        $room = Room::all()->where('kode', $request->kode_room)->first();
         $current_player = unserialize($room->player_id);
         array_push($current_player, $user->id);
         $room->player_id = serialize($current_player);

app/Http/Controllers/UserController.php

@@ -13,6 +13,7 @@
         "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0",
         "pusher/pusher-php-server": "^3.4"
+        "laravelcollective/html": "^5.8"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",

composer.json

@@ -175,6 +175,8 @@
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
+        //Form
+        Collective\Html\HtmlServiceProvider::class,
     ],
 
     /*
@@ -226,6 +228,9 @@
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
 
+        //Form
+        'Form' => Collective\Html\FormFacade::class,
+        'Html' => Collective\Html\HtmlFacade::class,
     ],
 
 ];

composer.lock

@@ -16,7 +16,7 @@ public function up()
         Schema::create('users', function (Blueprint $table) {
             $table->bigIncrements('id');
             // $table->string('name');
-            $table->string('username')->unique();
+            $table->string('username');
             // $table->timestamp('email_verified_at')->nullable();
             // $table->string('password');
             $table->rememberToken();

config/app.php

@@ -15,8 +15,7 @@ public function up()
     {
         Schema::create('rooms', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->unsignedBigInteger('paket_id');
-            $table->foreign('paket_id')->references('id')->on('pakets');
+            $table->string('paket_id');
             $table->string('master_id');
             $table->string('player_id');
             $table->smallInteger('status');