Rewrite (only for backend/oauth/api use from now on)

7 files changed, 9 insertions, 100 deletions

diff --git a/database/.gitignore b/database/.gitignore
index 9b1dffd..9b1dffd 100755..100644
--- a/database/.gitignore
+++ b/database/.gitignore
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index facf233..facf233 100755..100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 0dd0011..689cbee 100755..100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,7 +1,8 @@
 <?php
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
+
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateUsersTable extends Migration
 {
@@ -17,17 +18,11 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('email')->unique();
             $table->string('password');
-            $table->string('avatar')->default('0.png');
-            $table->string('prevHash', 60)->unique();
-            $table->string('hash', 60)->unique();
-            $table->string('api_token')->default("");
-            $table->tinyInteger('verified')->default(0);
-            $table->tinyInteger('admin')->default(0);
-            $table->string('email_token')->nullable();
             $table->rememberToken();
             $table->timestamps();
         });
     }
+
     /**
      * Reverse the migrations.
      *
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index 0dd2748..0d5cb84 100755..100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -1,7 +1,8 @@
 <?php
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
+
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreatePasswordResetsTable extends Migration
 {
@@ -18,6 +19,7 @@ class CreatePasswordResetsTable extends Migration
             $table->timestamp('created_at')->nullable();
         });
     }
+
     /**
      * Reverse the migrations.
      *
diff --git a/database/migrations/2018_06_30_203940_create_messages_table.php b/database/migrations/2018_06_30_203940_create_messages_table.php
deleted file mode 100755
index f24bf21..0000000
--- a/database/migrations/2018_06_30_203940_create_messages_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateMessagesTable extends Migration
-{
-     /**
-      * Run the migrations.
-      *
-      * @return void
-      */
-     public function up()
-     {
-         Schema::create('messages', function (Blueprint $table) {
-             $table->increments('id');
-             $table->integer('user_id')->unsigned();
-             $table->text('message');
-             $table->timestamps();
-
-            $table->foreign('user_id')->references('id')->on('users');
-         });
-     }
-
-    /**
-      * Reverse the migrations.
-      *
-      * @return void
-      */
-     public function down()
-     {
-         Schema::drop('messages');
-     }
-}
\ No newline at end of file
diff --git a/database/migrations/2018_07_07_104937_create_public_keys_table.php b/database/migrations/2018_07_07_104937_create_public_keys_table.php
deleted file mode 100755
index c9d548e..0000000
--- a/database/migrations/2018_07_07_104937_create_public_keys_table.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePublicKeysTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('public_keys', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id')->unsigned()->unique();
-            $table->string('key', 4096);
-            $table->timestamps();
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('public_key');
-    }
-}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index a443b45..91cb6d1 100755..100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,8 +1,6 @@
 <?php
 
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
 
 class DatabaseSeeder extends Seeder
 {
@@ -13,23 +11,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        DB::table('users')->insert([
-            'id' => 0,
-            'name' => 'genesis',
-            'email' => ' ',
-            'password' => ' ',
-            'prevHash' => '0',
-            'hash' => Hash::make('genesis')
-        ]);
-
-        DB::table('users')->insert([
-            'name' => 'Marvin Borner',
-            'email' => 'marvin@borners.de',
-            'password' => Hash::make('password'),
-            'prevHash' => Hash::make('genesis'),
-            'hash' => Hash::make(Hash::make('genesis') . 'Marvin Borner' . 'marvin@borners.de' . Hash::make('password')), // hashing: prev hash, all fields in current 'block'
-            'api_token' => "password",
-            'admin' => 1
-        ]);
+        // $this->call(UsersTableSeeder::class);
     }
 }