From c23009b306a3cd582ca91725a085b6a903066703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 29 Jul 2018 17:24:44 +0200
Subject: [PATCH] recreate Proposals button/inbox, start of edit page

---
 app/Http/Controllers/TableController.php      | 13 +++++++-
 app/Models/Table.php                          | 11 +++++--
 resources/views/profile/_table-list.blade.php |  6 +++-
 .../views/table/_action-buttons.blade.php     | 25 ++++++++++++++-
 resources/views/table/_rows.blade.php         |  5 +++
 resources/views/table/edit.blade.php          | 31 +++++++++++++++++++
 resources/views/table/view.blade.php          | 20 ++++++------
 routes/web.php                                |  2 ++
 8 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 resources/views/table/edit.blade.php

diff --git a/app/Http/Controllers/TableController.php b/app/Http/Controllers/TableController.php
index 45c8b94..35c77f4 100644
--- a/app/Http/Controllers/TableController.php
+++ b/app/Http/Controllers/TableController.php
@@ -20,7 +20,7 @@ class TableController extends Controller
         ]);
 
         /** @var Table $tableModel */
-        $tableModel = $user->tables()->withCount(['favourites', 'forks', 'revisions', 'comments'])
+        $tableModel = $user->tables()->withCount(['favourites', 'forks', 'revisions', 'comments', 'proposals'])
             ->where('name', $table)->first();
 
         if ($tableModel === null) abort(404, "No such table.");
@@ -66,6 +66,17 @@ class TableController extends Controller
         );
     }
 
+    public function settings(Request $request, User $user, string $table)
+    {
+        /** @var Table $tableModel */
+        $tableModel = $user->tables()->where('name', $table)->first();
+        if ($tableModel === null) abort(404, "No such table.");
+
+        return view('table.edit', [
+            'table' => $tableModel,
+        ]);
+    }
+
     public function storeNew(Request $request)
     {
         /** @var User $u */
diff --git a/app/Models/Table.php b/app/Models/Table.php
index 700043a..c78c232 100644
--- a/app/Models/Table.php
+++ b/app/Models/Table.php
@@ -21,7 +21,8 @@ use Illuminate\Database\Eloquent\Collection;
  * @property string $license
  * @property string $origin
  * @property int $visits
- * @property-read string $viewPage
+ * @property-read string $viewRoute
+ * @property-read string $settingsRoute
  * @property-read User $owner
  * @property-read Table $parentTable
  * @property-read Table[]|Collection $forks
@@ -122,16 +123,20 @@ class Table extends BaseModel
 
     public function __get($name)
     {
-        if ($name == 'viewPage') {
+        if ($name == 'viewRoute') {
             return route('table.view', ['user' => $this->cachedOwner()->name, 'table' => $this->name]);
         }
 
+        if ($name == 'settingsRoute') {
+            return route('table.conf', ['user' => $this->cachedOwner()->name, 'table' => $this->name]);
+        }
+
         return parent::__get($name);
     }
 
     public function scopeForList(Builder $query)
     {
         return $query->with('revision:id,row_count')->with('owner:id,name,title')
-            ->withCount(['favourites', 'forks', 'revisions']);
+            ->withCount(['favourites', 'forks', 'revisions', 'proposals']);
     }
 }
diff --git a/resources/views/profile/_table-list.blade.php b/resources/views/profile/_table-list.blade.php
index 948f800..3ebeb92 100644
--- a/resources/views/profile/_table-list.blade.php
+++ b/resources/views/profile/_table-list.blade.php
@@ -2,6 +2,10 @@
   if (!isset($showAuthors)) $showAuthors = false;
 @endphp
 
+@php
+  /** @var \App\Models\Table[] $tables */
+@endphp
+
 <div class="list-group list-group-flush">
   @if(count($tables) == 0)
     <span class="list-group-item">No tables yet.</span>
@@ -14,7 +18,7 @@
         $rows = $table->revision->row_count;
       @endphp
       <a class="list-group-item list-group-item-action"
-         href="{{$table->viewPage}}">
+         href="{{$table->viewRoute}}">
         <span class="row">{{-- this must be span so that Lynx includes the table name in the anchor --}}
           <span class="d-block col-7 flex-grow-1">
             @icon(fa-table fa-pr){!!
diff --git a/resources/views/table/_action-buttons.blade.php b/resources/views/table/_action-buttons.blade.php
index 016dd69..57edce6 100644
--- a/resources/views/table/_action-buttons.blade.php
+++ b/resources/views/table/_action-buttons.blade.php
@@ -2,6 +2,10 @@
   args: $table
 --}}
 
+@php
+  /** @var \App\Models\Table $table */
+@endphp
+
 <nav aria-label="Table action buttons">
   @sr(Table actions)
 
@@ -67,10 +71,29 @@
     @icon(fa-comment, sr:Comments)
   </a>
 
+  {{-- Active proposals button | counter --}}
+  <div class="btn-group" role="group" aria-label="Fork">
+    <a href="" class="btn btn-outline-primary py-1 btn-sm" title="Change Proposals"
+       data-toggle="tooltip" data-placement="top">
+      @icon(fa-inbox fa-pr, sr:Change Proposals){{ $table->proposals_count ?: '–' }}
+    </a>
+    @if(user()->ownsTable($table))
+      <a href="" class="btn btn-outline-primary py-1 btn-sm btn-square" title="Draft Change"
+         data-toggle="tooltip" data-placement="top">
+        @icon(fa-pencil, sr:Draft Change)
+      </a>
+    @else
+      <a href="" class="btn btn-outline-primary py-1 btn-sm btn-square" title="Propose Change"
+         data-toggle="tooltip" data-placement="top">
+        @icon(fa-pencil, sr:Propose Change)
+      </a>
+    @endif
+  </div>
+
 @endif
 
   @if(user() && user()->ownsTable($table))
-    <a href="" class="btn btn-outline-primary py-1 btn-sm"
+    <a href="{{ $table->settingsRoute }}" class="btn btn-outline-primary py-1 btn-sm"
        title="Table Options" data-toggle="tooltip" data-placement="top">
       @icon(fa-wrench, sr:Table Options)
     </a>
diff --git a/resources/views/table/_rows.blade.php b/resources/views/table/_rows.blade.php
index 3e28d8e..63df5e7 100644
--- a/resources/views/table/_rows.blade.php
+++ b/resources/views/table/_rows.blade.php
@@ -2,6 +2,11 @@
   args: $rows, $cols
 --}}
 
+@php
+  /** @var object[] $columns */
+  /** @var \App\Models\Row[]|array[][] $rows */
+@endphp
+
 <table class="table table-hover table-sm">
   <thead>
   <tr>
diff --git a/resources/views/table/edit.blade.php b/resources/views/table/edit.blade.php
new file mode 100644
index 0000000..399281e
--- /dev/null
+++ b/resources/views/table/edit.blade.php
@@ -0,0 +1,31 @@
+{{-- Basic table view --}}
+
+@extends('layouts.app')
+
+@php
+  /** @var \App\Models\Table $table */
+@endphp
+
+@section('content')
+  <div class="row justify-content-start px-3">
+    <div class="d-flex w-100 align-items-center">
+      <small class="flex-grow-1" style="font-size: 120%;">
+        <a href="{{route('profile.view', $table->owner->name)}}" class="link-no-color">{{ $table->owner->handle }}</a>{{--
+      --}}<span class="px-1">/</span>{{--
+      --}}<b>{{ $table->name }}</b>
+      </small>
+
+      <h1 class="mx-3">{{ $table->title }}</h1>
+
+      <a href="{{ $table->viewRoute }}" class="btn btn-outline-primary py-1 btn-sm"
+         title="Back to Table" data-toggle="tooltip" data-placement="top">
+        @icon(fa-table, sr:Back to Table)
+      </a>
+    </div>
+  </div>
+
+  <div class="row mx-auto col-md-12 justify-content-center mb-1 border rounded px-0 py-2 box-shadow mb-3">
+    lalala
+  </div>{{-- End of row --}}
+
+@endsection
diff --git a/resources/views/table/view.blade.php b/resources/views/table/view.blade.php
index 8f18af0..5f517f0 100644
--- a/resources/views/table/view.blade.php
+++ b/resources/views/table/view.blade.php
@@ -7,19 +7,19 @@
 @endphp
 
 @section('content')
-  <div class="row justify-content-start px-3">
-    <div class="d-flex w-100 align-items-center">
-      <small class="flex-grow-1" style="font-size: 120%;">
-        <a href="{{route('profile.view', $table->owner->name)}}" class="link-no-color">{{ $table->owner->handle }}</a>{{--
-        --}}<span class="px-1">/</span>{{--
-        --}}<b>{{ $table->name }}</b>
-      </small>
+<div class="row justify-content-start px-3">
+  <div class="d-flex w-100 align-items-center">
+    <small class="flex-grow-1" style="font-size: 120%;">
+      <a href="{{route('profile.view', $table->owner->name)}}" class="link-no-color">{{ $table->owner->handle }}</a>{{--
+      --}}<span class="px-1">/</span>{{--
+      --}}<b>{{ $table->name }}</b>
+    </small>
 
-      <h1 class="mx-3">{{ $table->title }}</h1>
+    <h1 class="mx-3">{{ $table->title }}</h1>
 
-      @include('table._action-buttons')
-    </div>
+    @include('table._action-buttons')
   </div>
+</div>
 
 <div class="row mx-auto col-md-12 justify-content-center mb-1 border rounded px-0 py-2 box-shadow mb-3">
 
diff --git a/routes/web.php b/routes/web.php
index e142372..6f32303 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -53,6 +53,8 @@ Route::group(['middleware' => 'auth'], function () {
         Route::post('store', 'AccountController@storeAccount')->name('account.store');
         Route::get('forget-social-login/{id}', 'AccountController@forgetSocialLogin')->name('forget-identity');
     });
+
+    Route::get('@{user}/{table}/settings', 'TableController@settings')->name('table.conf');
 });
 
 // Table resource - located at the end to work as a fallback