diff --git a/.DS_Store b/.DS_Store index ed6640d..c59b749 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/laravel/.DS_Store b/laravel/.DS_Store index fb43bfb..8483145 100644 Binary files a/laravel/.DS_Store and b/laravel/.DS_Store differ diff --git a/laravel/database/migrations/.DS_Store b/laravel/database/migrations/.DS_Store deleted file mode 100644 index 182d6bf..0000000 Binary files a/laravel/database/migrations/.DS_Store and /dev/null differ diff --git a/laravel/database/2014_10_12_000000_create_users_table.php b/laravel/database/migrations/2014_10_12_000000_create_users_table.php similarity index 100% rename from laravel/database/2014_10_12_000000_create_users_table.php rename to laravel/database/migrations/2014_10_12_000000_create_users_table.php diff --git a/laravel/database/2014_10_12_100000_create_password_resets_table.php b/laravel/database/migrations/2014_10_12_100000_create_password_resets_table.php similarity index 100% rename from laravel/database/2014_10_12_100000_create_password_resets_table.php rename to laravel/database/migrations/2014_10_12_100000_create_password_resets_table.php diff --git a/laravel/database/migrations/2017_10_18_085057_initialStructure.php b/laravel/database/migrations/2017_10_18_085057_initialStructure.php deleted file mode 100644 index 13c60ef..0000000 --- a/laravel/database/migrations/2017_10_18_085057_initialStructure.php +++ /dev/null @@ -1,86 +0,0 @@ -increments('id'); - $table->string('name'); - $table->string('email')->unique(); - $table->string('password'); - $table->string('remember_token'); - $table->string('nickname')->unique(); - $table->boolean('admin')->default(false); - $table->boolean('blocked')->default(false); - $table->string('reason_blocked')->nullable(); - $table->string('reason_reactivated')->nullable(); - $table->timestamps(); - }); - - Schema::create('password_resets', function (Blueprint $table) { - $table->string('email')->index(); - $table->string('token'); - $table->timestamp('created_at')->nullable(); - }); - - Schema::create('config', function (Blueprint $table) { - $table->increments('id'); - $table->string('platform_email'); - $table->string('platform_email_properties'); - $table->string('img_base_path'); - $table->timestamps(); - }); - - Schema::create('images', function (Blueprint $table) { - $table->increments('id'); - $table->enum('face', ['hidden', 'tile'])->default('tile'); - $table->boolean('active')->default(true); - $table->string('path'); - $table->timestamps(); - }); - - Schema::create('games', function (Blueprint $table) { - $table->increments('id'); - $table->enum('type', ['singleplayer', 'multiplayer']); - $table->enum('status', ['pending', 'active', 'terminated', 'canceled'])->default('pending'); - $table->integer('total_players')->default(1); - $table->integer('created_by')->unsigned(); - $table->foreign('created_by')->references('id')->on('users'); - $table->integer('winner')->unsigned()->nullable(); - $table->foreign('winner')->references('id')->on('users'); - $table->timestamps(); - }); - - Schema::create('game_user', function (Blueprint $table) { - $table->integer('game_id')->unsigned(); - $table->foreign('game_id')->references('id')->on('games')->onDelete('cascade'); - $table->integer('user_id')->unsigned(); - $table->foreign('user_id')->references('id')->on('users'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('game_user'); - Schema::dropIfExists('games'); - Schema::dropIfExists('images'); - Schema::dropIfExists('config'); - Schema::dropIfExists('password_resets'); - Schema::dropIfExists('users'); - } -} diff --git a/laravel/database/seeds/.DS_Store b/laravel/database/seeds/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/laravel/database/seeds/.DS_Store and /dev/null differ diff --git a/laravel/database/seeds/DatabaseSeeder.php b/laravel/database/seeds/DatabaseSeeder.php index caf5c29..78ecf21 100644 --- a/laravel/database/seeds/DatabaseSeeder.php +++ b/laravel/database/seeds/DatabaseSeeder.php @@ -11,7 +11,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - // $this->call(UsersTableSeeder::class); $this->call(UsersTableSeeder::class); } }