Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon committed Sep 8, 2020
2 parents 8b6999d + 8b42f93 commit e8fef89
Show file tree
Hide file tree
Showing 254 changed files with 5,710 additions and 1,061 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.vagrant
.vagrant
/ssl/BaltimoreCyberTrustRoot.crt.pem
5 changes: 5 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<IfModule mod_rewrite.c>
RewriteEngine on

RewriteRule ^(.*)$ /public/$1 [NC,L,QSA]
</IfModule>
21 changes: 21 additions & 0 deletions app/Account.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Model;

class Account extends Model
{
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'user_id', 'type', 'username', 'rank', 'level', 'xp', 'private'
];

public function user() {
return $this->belongsTo(User::class);
}
}
10 changes: 10 additions & 0 deletions app/AccountAuthStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Model;

class AccountAuthStatus extends Model
{
//
}
4 changes: 4 additions & 0 deletions app/Boss/AbyssalSire.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@ class AbyssalSire extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/AlchemicalHydra.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@ class AlchemicalHydra extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/BarrowsChests.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,8 @@ class BarrowsChests extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Bryophyta.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ class Bryophyta extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Callisto.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ class Callisto extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Cerberus.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ class Cerberus extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/ChaosElemental.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class ChaosElemental extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/ChaosFanatic.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class ChaosFanatic extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/CommanderZilyana.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ class CommanderZilyana extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/CorporealBeast.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ class CorporealBeast extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/CrazyArchaeologist.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class CrazyArchaeologist extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/DagannothKings.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ class DagannothKings extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
20 changes: 20 additions & 0 deletions app/Boss/DagannothPrime.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Model;

class DagannothPrime extends Model
{
protected $table = 'dagannoth_prime';

protected $fillable = [
'kill_count',
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
20 changes: 20 additions & 0 deletions app/Boss/DagannothRex.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Model;

class DagannothRex extends Model
{
protected $table = 'dagannoth_rex';

protected $fillable = [
'kill_count',
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
20 changes: 20 additions & 0 deletions app/Boss/DagannothSupreme.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Model;

class DagannothSupreme extends Model
{
protected $table = 'dagannoth_supreme';

protected $fillable = [
'kill_count',
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
20 changes: 20 additions & 0 deletions app/Boss/DerangedArchaeologist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Model;

class DerangedArchaeologist extends Model
{
protected $table = 'deranged_archaeologist';

protected $fillable = [
'kill_count',
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/GeneralGraardor.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ class GeneralGraardor extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/GiantMole.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class GiantMole extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Goblin.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ class Goblin extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/GrotesqueGuardians.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ class GrotesqueGuardians extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Hespori.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ class Hespori extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/KalphiteQueen.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ class KalphiteQueen extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/KingBlackDragon.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ class KingBlackDragon extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Kraken.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ class Kraken extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/KreeArra.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ class Kreearra extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/KrilTsutsaroth.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ class KrilTsutsaroth extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
20 changes: 20 additions & 0 deletions app/Boss/Mimic.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Model;

class Mimic extends Model
{
protected $table = 'mimic';

protected $fillable = [
'kill_count',
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Obor.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ class Obor extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Sarachnis.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ class Sarachnis extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Scorpia.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class Scorpia extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
4 changes: 4 additions & 0 deletions app/Boss/Skotizo.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ class Skotizo extends Model
];

protected $hidden = ['user_id'];

public function account() {
return $this->belongsTo(\App\Account::class);
}
}
Loading

0 comments on commit e8fef89

Please sign in to comment.