From 5a84fb6990d83f6561510706f7d879678c03f4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 12 May 2021 16:39:29 +0200
Subject: [PATCH 1/2] Tasks module in the client portal

---
 .../ClientPortal/TaskController.php           | 31 +++++++++
 app/Http/Livewire/TasksTable.php              | 39 +++++++++++
 .../ClientPortal/Tasks/ShowTasksRequest.php   | 30 +++++++++
 app/Http/ViewComposers/PortalComposer.php     |  4 +-
 .../components/livewire/tasks-table.blade.php | 67 +++++++++++++++++++
 .../portal/ninja2020/tasks/index.blade.php    |  8 +++
 routes/client.php                             |  4 +-
 7 files changed, 179 insertions(+), 4 deletions(-)
 create mode 100644 app/Http/Controllers/ClientPortal/TaskController.php
 create mode 100644 app/Http/Livewire/TasksTable.php
 create mode 100644 app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
 create mode 100644 resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
 create mode 100644 resources/views/portal/ninja2020/tasks/index.blade.php

diff --git a/app/Http/Controllers/ClientPortal/TaskController.php b/app/Http/Controllers/ClientPortal/TaskController.php
new file mode 100644
index 000000000000..e4fd9c70a734
--- /dev/null
+++ b/app/Http/Controllers/ClientPortal/TaskController.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Controllers\ClientPortal;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ClientPortal\Tasks\ShowTasksRequest;
+use Illuminate\Http\Request;
+
+class TaskController extends Controller
+{
+    /**
+     * Show the tasks in the client portal.
+     *
+     * @param ShowTasksRequest $request
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(ShowTasksRequest $request)
+    {
+        return render('tasks.index');
+    }
+}
diff --git a/app/Http/Livewire/TasksTable.php b/app/Http/Livewire/TasksTable.php
new file mode 100644
index 000000000000..9a741ed49dd7
--- /dev/null
+++ b/app/Http/Livewire/TasksTable.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Livewire;
+
+use App\Models\Task;
+use App\Utils\Traits\WithSorting;
+use Livewire\Component;
+use Livewire\WithPagination;
+
+class TasksTable extends Component
+{
+    use WithSorting;
+    use WithPagination;
+
+    public $per_page = 10;
+
+    public function render()
+    {
+        $query = Task::query()
+            ->where('client_id', auth('contact')->user()->client->id)
+            ->whereNotNull('invoice_id')
+            ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
+            ->paginate($this->per_page);
+
+        return render('components.livewire.tasks-table', [
+            'tasks' => $query,
+        ]);
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
new file mode 100644
index 000000000000..de4aa00fd991
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\ClientPortal\Tasks;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowTasksRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return (bool)auth()->user('contact')->client->getSetting('enable_client_portal_tasks');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php
index fd0ebd4d6804..13daffd3ae81 100644
--- a/app/Http/ViewComposers/PortalComposer.php
+++ b/app/Http/ViewComposers/PortalComposer.php
@@ -82,9 +82,7 @@ class PortalComposer
         $data[] = ['title' => ctrans('texts.subscriptions'), 'url' => 'client.subscriptions.index', 'icon' => 'calendar'];
 
         if (auth()->user('contact')->client->getSetting('enable_client_portal_tasks')) {
-            $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.dashboard', 'icon' => 'clock'];
-
-            // TODO: Update when 'tasks' module is available in client portal.
+            $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.tasks.index', 'icon' => 'clock'];
         }
 
         return $data;
diff --git a/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php b/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
new file mode 100644
index 000000000000..db25d31225b8
--- /dev/null
+++ b/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
@@ -0,0 +1,67 @@
+<div>
+    <div class="flex items-center justify-between">
+        <div class="flex items-center">
+            <span class="mr-2 text-sm hidden md:block">{{ ctrans('texts.per_page') }}</span>
+            <select wire:model="per_page" class="form-select py-1 text-sm">
+                <option>5</option>
+                <option selected>10</option>
+                <option>15</option>
+                <option>20</option>
+            </select>
+        </div>
+    </div>
+    <div class="-my-2 py-2 overflow-x-auto sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
+        <div class="align-middle inline-block min-w-full overflow-hidden rounded">
+            <table class="min-w-full shadow rounded border border-gray-200 mt-4 credits-table">
+                <thead>
+                <tr>
+                    <th class="px-6 py-3 text-xs font-medium leading-4 tracking-wider text-left text-white uppercase border-b border-gray-200 bg-primary">
+                        <span role="button" wire:click="sortBy('description')" class="cursor-pointer">
+                            {{ ctrans('texts.description') }}
+                        </span>
+                    </th>
+                    <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
+                        <span role="button" wire:click="sortBy('status_id')" class="cursor-pointer">
+                            {{ ctrans('texts.status') }}
+                        </span>
+                    </th>
+                    <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
+                        <span role="button" class="cursor-pointer">
+                            {{ ctrans('texts.duration') }}
+                        </span>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                @forelse($tasks as $task)
+                    <tr class="bg-white group hover:bg-gray-100">
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
+                            {{ \Illuminate\Support\Str::limit($task->description, 80) }}
+                        </td>
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
+                            {{ optional($task->status)->name }}
+                        </td>
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
+                            {{ \Carbon\CarbonInterval::seconds($task->calcDuration())->cascade()->forHumans() }}
+                        </td>
+                    </tr>
+                @empty
+                    <tr class="bg-white group hover:bg-gray-100">
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500" colspan="100%">
+                            {{ ctrans('texts.no_results') }}
+                        </td>
+                    </tr>
+                @endforelse
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="flex justify-center md:justify-between mt-6 mb-6">
+        @if($tasks->total() > 0)
+            <span class="text-gray-700 text-sm hidden md:block">
+                {{ ctrans('texts.showing_x_of', ['first' => $tasks->firstItem(), 'last' => $tasks->lastItem(), 'total' => $tasks->total()]) }}
+            </span>
+        @endif
+        {{ $tasks->links('portal/ninja2020/vendor/pagination') }}
+    </div>
+</div>
diff --git a/resources/views/portal/ninja2020/tasks/index.blade.php b/resources/views/portal/ninja2020/tasks/index.blade.php
new file mode 100644
index 000000000000..783e325a25b3
--- /dev/null
+++ b/resources/views/portal/ninja2020/tasks/index.blade.php
@@ -0,0 +1,8 @@
+@extends('portal.ninja2020.layout.app')
+@section('meta_title', ctrans('texts.tasks'))
+
+@section('body')
+    <div class="flex flex-col">
+        @livewire('tasks-table')
+    </div>
+@endsection
diff --git a/routes/client.php b/routes/client.php
index f0602b260e30..8d288b9d71f1 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -55,7 +55,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence
     Route::get('payment_methods/{payment_method}/verification', 'ClientPortal\PaymentMethodController@verify')->name('payment_methods.verification');
     Route::post('payment_methods/{payment_method}/verification', 'ClientPortal\PaymentMethodController@processVerification');
 
-    Route::resource('payment_methods', 'ClientPortal\PaymentMethodController')->except(['edit', 'update']); 
+    Route::resource('payment_methods', 'ClientPortal\PaymentMethodController')->except(['edit', 'update']);
 
     Route::match(['GET', 'POST'], 'quotes/approve', 'ClientPortal\QuoteController@bulk')->name('quotes.bulk');
     Route::get('quotes', 'ClientPortal\QuoteController@index')->name('quotes.index')->middleware('portal_enabled');
@@ -77,6 +77,8 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence
 
     Route::resource('subscriptions', 'ClientPortal\SubscriptionController')->middleware('portal_enabled')->only(['index']);
 
+    Route::resource('tasks', 'ClientPortal\TaskController')->only(['index']);
+
     Route::post('upload', 'ClientPortal\UploadController')->name('upload.store');
     Route::get('logout', 'Auth\ContactLoginController@logout')->name('logout');
 });

From fad1743e308be8ca10bb3db542089a3263504685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 18 May 2021 11:08:26 +0200
Subject: [PATCH 2/2] Update Carbon locale before rendering the tasks page

---
 app/Http/Controllers/ClientPortal/TaskController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientPortal/TaskController.php b/app/Http/Controllers/ClientPortal/TaskController.php
index e4fd9c70a734..1319bda3d6ff 100644
--- a/app/Http/Controllers/ClientPortal/TaskController.php
+++ b/app/Http/Controllers/ClientPortal/TaskController.php
@@ -14,7 +14,6 @@ namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ClientPortal\Tasks\ShowTasksRequest;
-use Illuminate\Http\Request;
 
 class TaskController extends Controller
 {
@@ -26,6 +25,10 @@ class TaskController extends Controller
      */
     public function index(ShowTasksRequest $request)
     {
+        \Carbon\Carbon::setLocale(
+            auth('contact')->user()->preferredLocale()
+        );
+
         return render('tasks.index');
     }
 }