diff --git a/.gitignore b/.gitignore index ffc430d..fb8544c 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ fabric.properties composer.phar /vendor/ +/Backend/Database/test.db diff --git a/Backend/Models/GameData.php b/Backend/Models/GameData.php index 3121b28..c368455 100644 --- a/Backend/Models/GameData.php +++ b/Backend/Models/GameData.php @@ -9,6 +9,6 @@ class GameData extends Eloquent ]; public function group(){ - return $this->belongsTo(Group::class); + return $this->hasOne(Group::class); } } diff --git a/Backend/Models/Group.php b/Backend/Models/Group.php index 20fdcd1..13fd160 100644 --- a/Backend/Models/Group.php +++ b/Backend/Models/Group.php @@ -8,15 +8,15 @@ class Group extends Eloquent ]; public function gameJam(){ - return $this->hasOne(GameJam::class); + return $this->belongsTo(GameJam::class); } public function keyWord(){ return $this->hasMany(KeyWord::class); } public function gameData(){ - return $this->hasOne(GameData::class); + return $this->belongsTo(GameData::class); } - public function pasword(){ - return $this->hasOne(Password::class); + public function password(){ + return $this->belongsTo(Password::class); } } diff --git a/Backend/Models/Password.php b/Backend/Models/Password.php index 58e9b42..10d78da 100644 --- a/Backend/Models/Password.php +++ b/Backend/Models/Password.php @@ -8,7 +8,7 @@ class Password extends Eloquent{ public function group(){ - return $this->belongsTo(Group::class); + return $this->hasOne(Group::class); } } \ No newline at end of file diff --git a/Backend/Models/hasVoted.php b/Backend/Models/hasVoted.php index 3514274..7f8a903 100644 --- a/Backend/Models/hasVoted.php +++ b/Backend/Models/hasVoted.php @@ -7,6 +7,6 @@ class hasVoted extends Eloquent{ 'ipaddress' ]; public function gameData(){ - return $this->hasOne(GameData::class); + return $this->belongsTo(GameData::class); } } \ No newline at end of file diff --git a/Backend/SigningUp.php b/Backend/SigningUp.php index b3d9bbc..5b0e57f 100644 --- a/Backend/SigningUp.php +++ b/Backend/SigningUp.php @@ -1 +1,42 @@ password = password_hash($_POST['password'] ,PASSWORD_DEFAULT); + + if(!$password->save()){ + return; + } + + $group = new Group(); + + $group->password()->associate($password); + + $group->gameJam()->associate(GameJam::find($_POST['gameJamId'])); + + $group->groupName = $groupName = $_POST['groupName']; + + $group->groupAmount = $_POST['groupAmount']; + + $group->votes = 0; + + if(!$group->save()){ + return; + } + + $_SESSION['groupName'] = $groupName; + $_SESSION['success'] = "You are now logged in"; + header('location: index.php'); +}