app/Http/Controllers/DashController.php

@@ -20,20 +20,71 @@ class DashController extends Controller
             return back();
         }
 
+        $defaultSort = 'last-updated';
+
+        $sort = \Input::get('tableSort', $defaultSort);
+
+        $data['sortOptions'] = [
+            'most-visited' => 'Most Visited',
+            'last-updated' => 'Last Updated',
+            'most-updated' => 'Most Changed',
+//            'most-discussed' => 'Most Discussed',
+//            'most-liked' => 'Most Liked',
+            'newest' => 'Newest',
+            'oldest' => 'Oldest',
+            'most-rows' => 'Longest',
+            'least-rows' => 'Shortest',
+        ];
+
+        if (!in_array($sort, array_keys($data['sortOptions']))) {
+            $sort = $defaultSort;
+        }
+
+        $data['tableSort'] = $sort;
+
         $data['users'] = User::orderBy('updated_at', 'desc')
             ->withCount(['tables'])
             ->paginate(10, ['id', 'title', 'name', 'tables_count'], 'userPage')
             ->appends(\Input::except('userPage'));
 
-        $sort = Table::resolveSortType(\Input::get('tableSort'));
+        $tableQuery = Table::forList();
-        $data['sortOptions'] = Table::getSortOptions();
+        switch ($sort) {
+            case 'most-visited':
+                $tableQuery = $tableQuery->orderBy('visits', 'desc');
+                break;
+            case 'last-updated':
+                $tableQuery = $tableQuery->orderBy('updated_at', 'desc');
+                break;
+            case 'most-updated':
+                $tableQuery = $tableQuery->orderBy('revisions_count', 'desc');
+                break;
+            case 'most-discussed':
+                $tableQuery = $tableQuery->orderBy('comments_count', 'desc');
+                break;
+            case 'most-liked':
+                $tableQuery = $tableQuery->orderBy('favourites_count', 'desc');
+                break;
+            case 'most-rows':
+                $tableQuery = $tableQuery
+                    ->join('revisions', 'revisions.id', '=', 'tables.revision_id')
+                    ->orderBy('revisions.row_count', 'desc');
+                break;
+            case 'least-rows':
+                $tableQuery = $tableQuery
+                    ->join('revisions', 'revisions.id', '=', 'tables.revision_id')
+                    ->orderBy('revisions.row_count', 'asc');
+                break;
+            case 'newest':
+                $tableQuery = $tableQuery->orderBy('created_at', 'desc');
+                break;
+            case 'oldest':
+                $tableQuery = $tableQuery->orderBy('created_at', 'asc');
+                break;
+        }
 
-        $data['tables'] = Table::forList()->tableSort($sort)
+        $data['tables'] = $tableQuery->paginate(10, ['*'], 'tablePage')
-            ->paginate(10, ['*'], 'tablePage')
             ->appends(\Input::except('tablePage'));
 
-        $data['tableSort'] = $sort;
-
         $data['showGreeter'] = !$dismiss && !$request->cookie('dismiss-greeter', false);
 
         return view('welcome', $data);

app/Http/Controllers/ProfileController.php

@@ -3,7 +3,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Table;
 use App\Models\User;
 use Illuminate\Http\Request;
 
@@ -19,15 +18,14 @@ class ProfileController extends Controller
      */
     public function view(User $user)
     {
-        $data['user'] = $user;
+        $tables = $user->tables()->forList()->orderByDesc('updated_at')->paginate(10);
-        $data['tables_count'] = $user->tables()->count();
+        $tables_count = $user->tables()->count();
-
+
-        $data['tableSort'] = $sort = Table::resolveSortType(\Input::get('tableSort'));
+        return view('profile.view')->with(compact(
-        $data['sortOptions'] = Table::getSortOptions();
+            'tables',
-
+            'user',
-        $data['tables'] = $user->tables()->forList()->tableSort($sort)->paginate(10);
+            'tables_count'
-
+        ));
-        return view('profile.view', $data);
     }
 
     /**

app/Models/Table.php

@@ -150,8 +150,6 @@ class Table extends BaseModel
             }
         }
 
-        if ($name == 'handle') return '@' . $this->cachedOwner()->name . '/' . $this->name;
-
         if ($name == 'draftSessionKey') return "proposal.{$this->id}";
 
         return parent::__get($name);
@@ -194,68 +192,4 @@ class Table extends BaseModel
             ->with('owner:id,name,title')
             ->withCount(['favourites', 'forks', 'revisions', 'proposals', 'comments']);
     }
-
-    public static function getSortOptions()
-    {
-        return [
-            'most-visited' => 'Most Visited',
-            'last-updated' => 'Last Updated',
-            'most-updated' => 'Most Changed',
-//            'most-discussed' => 'Most Discussed',
-//            'most-liked' => 'Most Liked',
-            'newest' => 'Newest',
-            'oldest' => 'Oldest',
-            'most-rows' => 'Longest',
-            'least-rows' => 'Shortest',
-        ];
-    }
-
-    public static function resolveSortType($sort)
-    {
-        $defaultSort = 'last-updated';
-        if (!in_array($sort, array_keys(self::getSortOptions()))) {
-            $sort = $defaultSort;
-        }
-        return $sort;
-    }
-
-    public function scopeTableSort(Builder $query, $sort)
-    {
-
-        switch ($sort) {
-            case 'most-visited':
-                $query = $query->orderBy('visits', 'desc');
-                break;
-            case 'last-updated':
-                $query = $query->orderBy('updated_at', 'desc');
-                break;
-            case 'most-updated':
-                $query = $query->orderBy('revisions_count', 'desc');
-                break;
-            case 'most-discussed':
-                $query = $query->orderBy('comments_count', 'desc');
-                break;
-            case 'most-liked':
-                $query = $query->orderBy('favourites_count', 'desc');
-                break;
-            case 'most-rows':
-                $query = $query
-                    ->join('revisions', 'revisions.id', '=', 'tables.revision_id')
-                    ->orderBy('revisions.row_count', 'desc');
-                break;
-            case 'least-rows':
-                $query = $query
-                    ->join('revisions', 'revisions.id', '=', 'tables.revision_id')
-                    ->orderBy('revisions.row_count', 'asc');
-                break;
-            case 'newest':
-                $query = $query->orderBy('created_at', 'desc');
-                break;
-            case 'oldest':
-                $query = $query->orderBy('created_at', 'asc');
-                break;
-        }
-
-        return $query;
-    }
 }

resources/views/auth/login.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts.app')
-@section('title', "Login")
 
 @section('content')
   <div class="container">

resources/views/auth/passwords/email.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts.app')
-@section('title', "Forgotten Password")
 
 @section('content')
 <div class="container">

resources/views/auth/passwords/reset.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts.app')
-@section('title', "Reset Password")
 
 @section('content')
 <div class="container">

resources/views/auth/register.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts.app')
-@section('title', "Register")
 
 @section('content')
   <div class="container">

resources/views/layouts/app.blade.php

@@ -8,7 +8,7 @@
   <!-- CSRF Token -->
   <meta name="csrf-token" content="{{ csrf_token() }}">
 
-  <title>@yield('title', 'MISSING TITLE') - datatable.directory</title>
+  <title>{{ config('app.name', 'Laravel') }}</title>
 
   <!-- Scripts -->
   <script src="{{ asset('js/app.js') }}" defer></script>

resources/views/profile/edit-account.blade.php

@@ -1,7 +1,6 @@
 {{-- Profile edit form --}}
 
 @extends('layouts.app')
-@section('title', "Account Settings")
 
 @section('content')
   @php(Widget::setLayout(3, 7))

resources/views/profile/edit-profile.blade.php

@@ -1,7 +1,6 @@
 {{-- Profile edit form --}}
 
 @extends('layouts.app')
-@section('title', "Edit Profile")
 
 @section('content')
   <form method="POST" action="{{route('profile.store')}}" class="row justify-content-center"
@@ -11,7 +10,7 @@
     <div class="col-md-10">
       @php(Widget::setLayout(3, 7))
 
-      {!! Widget::header(1, 'Edit Profile') !!}
+      {!! Widget::header(1, 'Profile Settings') !!}
       {!! Widget::par('
         Username can be changed on the
         <a href="'.e(route('account.edit')).'">account settings</a> page.

resources/views/profile/view.blade.php

@@ -1,6 +1,5 @@
 {{-- User's dashboard / profile page --}}
 @extends('layouts.app')
-@section('title', "$user->title's Tables")
 
 @php
 /** @var \App\Models\Table[] $tables */
@@ -77,18 +76,12 @@
           @icon(fa-table fa-pr fa-large)
           <h2>
             @if(authed() && user()->is($user))
-              Your Tables:
+              Your Tables
             @else
-              User's Tables:
+              User's Tables
             @endif
           </h2>
 
-          @include('table._sort-dropdown', [
-            'link' => route('profile.view',
-                        Input::except(['tableSort', 'page'])
-                        + ['tableSort' => '__sort'] + ['user' => $user->name])
-          ])
-
           <nav class="ml-auto" aria-label="Pages of the table list">
             {{ $tables->links(null, ['ulClass' => 'pagination-sm mb-0 pagination-outline-light']) }}
           </nav>

resources/views/table/_sort-dropdown.blade.php

@@ -1,16 +0,0 @@
-<span>
-  <a class="nav-link dropdown-toggle link-no-color pl-1 ml-1 pr-2"
-     data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
-     aria-expanded="false">{{ $sortOptions[$tableSort] }}</a>
-  <span class="dropdown-menu">
-    @foreach($sortOptions as $k => $label)
-      <a class="dropdown-item"
-         href="{{ str_replace('__sort', $k, $link) }}">
-          {{ $label }}
-        </a>
-      {{--@endif--}}
-    @endforeach
-  </span>
-</span>
-
-{{-- route('dash', Input::except(['tableSort', 'tablePage']) + ['tableSort' => $k]) --}}

resources/views/table/conf.blade.php

@@ -1,7 +1,6 @@
 {{-- Basic table view --}}
 
 @extends('layouts.app')
-@section('title', "Table Settings - \"$table->title\"")
 
 @php
   /** @var \App\Models\Table $table */

resources/views/table/create.blade.php

@@ -1,7 +1,6 @@
 {{-- New table form --}}
 
 @extends('layouts.app')
-@section('title', "New Table")
 
 @section('content')
   <form method="POST" action="{{route('table.storeNew')}}" class="row justify-content-center"

resources/views/table/propose/layout.blade.php

@@ -1,7 +1,6 @@
 {{-- Basic table view --}}
 
 @extends('layouts.app')
-@section('title', "Draft Change - \"$table->title\"")
 
 @php
 /** @var \App\Models\Table $table */

resources/views/table/revisions.blade.php

@@ -1,7 +1,6 @@
 {{-- List of table revisions --}}
 
 @extends('layouts.app')
-@section('title', "Revisions - $table->title")
 
 @php
 /** @var \App\Models\Table $table */

resources/views/table/view.blade.php

@@ -1,7 +1,6 @@
 {{-- Basic table view --}}
 
 @extends('layouts.app')
-@section('title', "Table \"$table->title\"")
 
 @php
 /** @var \App\Models\Table $table */

resources/views/welcome.blade.php

@@ -6,7 +6,6 @@
 @endphp
 
 @extends('layouts.app')
-@section('title', "All Tables")
 
 @section('content')
   @if($showGreeter)
@@ -51,12 +50,21 @@
         <div class="card-header card-header-extra">
           @icon(fa-table fa-pr fa-large)
           <h2>Tables:</h2>
-
+          <span>
-          @include('table._sort-dropdown', [
+            <a class="nav-link dropdown-toggle link-no-color pl-1 ml-1 pr-2"
-            'link' => route('dash',
+               data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
-                        Input::except(['tableSort', 'tablePage'])
+               aria-expanded="false">{{ $sortOptions[$tableSort] }}</a>
-                        + ['tableSort' => '__sort'])
+            <div class="dropdown-menu">
-          ])
+              @foreach($sortOptions as $k => $label)
+                {{--@if($k != $tableSort)--}}
+                  <a class="dropdown-item"
+                     href="{{ route('dash', Input::except(['tableSort', 'tablePage']) + ['tableSort' => $k]) }}">
+                    {{ $label }}
+                  </a>
+                {{--@endif--}}
+              @endforeach
+            </div>
+          </span>
 
           <nav class="ml-auto" aria-label="Pages of the table list">
             {{ $tables->links(null, [