Merge pull request #665 from pixelfed/frontend-ui-refactor

Frontend ui refactor

app/Status.php

@@ -19,7 +19,7 @@ class Status extends Model
      */
     protected $dates = ['deleted_at'];
 
-    protected $fillable = ['profile_id', 'visibility', 'in_reply_to_id', 'reblog_of_id'];
+    protected $fillable = ['profile_id', 'visibility', 'in_reply_to_id', 'reblog_of_id', 'type'];
 
     const STATUS_TYPES = [
         'text',
@@ -90,13 +90,13 @@ class Status extends Model
 
     public function url()
     {
-        if($this->url) {
+        if($this->uri) {
-            return $this->url;
+            return $this->uri;
         }
         $id = $this->id;
         $username = $this->profile->username;
-        $path = config('app.url')."/p/{$username}/{$id}";
+        $path = url(config('app.url')."/p/{$username}/{$id}");
-        return url($path);
+        return $path;
     }
 
     public function permalink($suffix = '/activity')

database/migrations/2018_09_19_060554_create_stories_table.php

@@ -14,7 +14,7 @@ class CreateStoriesTable extends Migration
     public function up()
     {
         Schema::create('stories', function (Blueprint $table) {
-            $table->increments('bigIncrements');
+            $table->bigIncrements('id');
             $table->bigInteger('profile_id')->unsigned();
             $table->timestamp('published_at')->nullable();
             $table->timestamp('expires_at')->nullable();

database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php

@@ -0,0 +1,75 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAccountStatusToProfilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Drop old columns, fix stories
+        if(Schema::hasColumn('profiles', 'hub_url')) {
+            Schema::table('profiles', function (Blueprint $table) {
+                $table->dropColumn('verify_token');
+                $table->dropColumn('secret');
+                $table->dropColumn('salmon_url');
+                $table->dropColumn('hub_url');
+            });
+        }
+
+        if(Schema::hasColumn('stories', 'bigIncrements')) {
+            Schema::table('stories', function (Blueprint $table) {
+                $table->dropColumn('bigIncrements');
+            });
+            Schema::table('stories', function (Blueprint $table) {
+                $table->bigIncrements('id')->first();
+            });
+        }
+
+        // Add account status to profile and user tables
+
+        Schema::table('profiles', function (Blueprint $table) {
+            $table->string('status')->nullable()->index()->after('username');
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('status')->nullable()->index()->after('email');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('profiles', function (Blueprint $table) {
+            $table->string('verify_token')->nullable();
+            $table->string('secret')->nullable();
+            $table->string('salmon_url')->nullable();
+            $table->string('hub_url')->nullable();
+        });
+
+        Schema::table('stories', function (Blueprint $table) {
+            $table->dropColumn('id');
+        });
+        Schema::table('stories', function (Blueprint $table) {
+            $table->bigIncrements('bigIncrements')->first();
+        });
+
+        Schema::table('profiles', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+}