Skip to content

Commit

Permalink
[UPDATE] socket.io
Browse files Browse the repository at this point in the history
  • Loading branch information
mild-tn committed Dec 19, 2018
1 parent e0bf6ec commit 2fffa69
Show file tree
Hide file tree
Showing 16 changed files with 596 additions and 85 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.tabSize": 2
}
43 changes: 4 additions & 39 deletions api/app/Http/Controllers/RoomController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,42 +38,9 @@ public function createRoomCode(){
foreach (array_rand($strRan, 6) as $valueStr) {
$rand .= $strRan[$valueStr];
}
// $test = 'RM2301';
return $rand;

}

// public function checkCode($room_name){
// $getRoomName = $this->roomRepository->getRoomByName($room_name);
// $genRoomCode = $this->createRoomCode();
// $oldRoomCode = $this->getRoomByCode($getRoomName[0]->room_code);
// $DATE_TIME = '2018-10-30 21';
// $DATE_FORMAT = 'Y-m-d H';
// if($genRoomCode != $oldRoomCode){
// $newRoom = DB::table('rooms')->insert(
// ['room_name' => $room_name,
// 'room_code' => $genRoomCode,
// 'time_current' => Carbon::createFromFormat($DATE_FORMAT, $DATE_TIME)->toDateTimeString(),
// 'user_id' => $getRoomName[0]->user_id]
// );
// $response = $this->roomRepository->getRoomByCode($genRoomCode);
// return $response;
// }else{
// return $this->createRoomCode();
// }
// $test = $old."+".$gen;
// return $test;
// }

// public function getRoomByCode($roomByCode){
// $roomCode = $this->roomRepository->getRoomByCode($roomByCode);
// return $roomCode;
// }

// public function getRoomByName($roomByName){
// $roomName = $this->roomRepository->getRoomByName($roomByName);
// return $roomName;
// }
}

public function createRoom(Request $request) {
$newRoom = $request->all();
$generateCode = $this->createRoomCode();
Expand All @@ -85,9 +52,7 @@ public function createRoom(Request $request) {
$newRoom['room_code'] = $generateCode;
$newRoom['user_id'] = 1;
return $this->roomRepository->createRoom($newRoom);
}
}


public function getCodeRoom(){

}
}
1 change: 1 addition & 0 deletions api/app/Repositories/RoomRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ public function getRoomByName($roomName){
public function createRoom($room){
return Room::create($room);
}

}
1 change: 1 addition & 0 deletions api/app/Repositories/RoomRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ public function getRooms();
public function getRoomById($id);
public function getRoomByCode($roomByCode);
public function getRoomByName($roomByName);
public function TestRoom($roomName);
}
9 changes: 6 additions & 3 deletions api/routes/api.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Http\Request;

use App\Models\Room;
/*
|--------------------------------------------------------------------------
| API Routes
Expand All @@ -28,11 +28,14 @@
// ->header('Content-Type', 'text/plain');
// });
// Route::get('room/{room_name}','RoomController@createRoomCode');
// Route::get('room/{room_code}','RoomController@getRoomByCode');
Route::get('room/{room_code}','RoomController@getRoomByCode');
// Route::post('room/{room_name}','RoomController@checkCode');
Route::get('room?room_code={room_code}','RoomController@TestRoom');
Route::post('room','RoomController@createRoom');
Route::get('users', 'UserController@getUsers');
Route::get('user/{id}', 'UserController@getUsersById');
Route::get('user/test/{nickname}', 'UserController@getUserByNickname');
Route::get('user', 'UserController@createUser');

// Route::get('test', function(){
// return "<pre>" . print_r(I::all(), true) . "</pre>";
// });
Loading

0 comments on commit 2fffa69

Please sign in to comment.