From aa477268ec3f79361313e14604b53fb6c9b8646e Mon Sep 17 00:00:00 2001
From: guillaume91 <guillaume@sobit.nl>
Date: Thu, 20 Jun 2024 10:30:14 +0200
Subject: [PATCH] [Done] Added new font-gis icons in the dropzone.

---
 .../Livewire/Components/CustomDropzone.php    | 10 +++
 ...project-manager-properties-modal.blade.php | 81 -------------------
 .../views/livewire/project-manager.blade.php  |  2 +-
 .../views/livewire/projects/menu.blade.php    |  2 +-
 .../livewire/projects/tabs/settings.blade.php | 10 ++-
 .../livewire/dropzone.blade.php               | 10 ++-
 6 files changed, 26 insertions(+), 89 deletions(-)
 create mode 100644 laravel_app/app/Livewire/Components/CustomDropzone.php
 delete mode 100644 laravel_app/resources/views/components/project-manager-properties-modal.blade.php

diff --git a/laravel_app/app/Livewire/Components/CustomDropzone.php b/laravel_app/app/Livewire/Components/CustomDropzone.php
new file mode 100644
index 0000000..424bacd
--- /dev/null
+++ b/laravel_app/app/Livewire/Components/CustomDropzone.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Livewire\Components;
+
+use Dasundev\LivewireDropzone\Http\Livewire\Dropzone;
+
+class CustomDropzone extends Dropzone
+{
+    public $type = '';
+}
diff --git a/laravel_app/resources/views/components/project-manager-properties-modal.blade.php b/laravel_app/resources/views/components/project-manager-properties-modal.blade.php
deleted file mode 100644
index cd3ff80..0000000
--- a/laravel_app/resources/views/components/project-manager-properties-modal.blade.php
+++ /dev/null
@@ -1,81 +0,0 @@
-@props([
-    'formData',
-    /** @var \App\Livewire\Projects\ProjectManager */
-    'projectManager'
-])
-
-<x-modal wire:model.live="showProjectModal" {{ $attributes }}>
-    <x-form-modal submit="saveProject">
-        <x-slot name="title">
-            {{ __('Project') }}
-        </x-slot>
-
-        <x-slot name="description">
-            {{ __('Report generator for generating reports') }}
-        </x-slot>
-
-        <x-slot name="form">
-            <!-- Token Name -->
-            <div class="mb-2">
-                <x-label for="name" value="{{ __('Name') }}"/>
-                <x-input id="name" type="text" class="mt-1 block w-full" wire:model="formData.name" autofocus/>
-                <x-input-error for="name" class="mt-2"/>
-            </div>
-            <div class="flex flex-col mb-2 gap-2">
-                <p>{{__('Pivot GeoJSON file.')}}</p>
-                <div id="pivot_file">
-                    <livewire:dropzone
-                        wire:model="pivotFiles"
-                        :rules="['extensions:json,geojson','mimes:json,geojson']"
-                        :key="'pivotFiles'"
-                    />
-                </div>
-                @error('pivotFiles')
-                <span class="bg-red-200 text-red-500 p-0.5 mt-1 rounded">{{ $message }}</span>
-                @enderror
-            </div>
-            <div class="flex flex-col mb-2 gap-2">
-                <p>{{__('Span GeoJSON file.')}}</p>
-                <div id="span_file">
-                    <livewire:dropzone
-                        wire:model="spanFiles"
-                        :rules="['extensions:json,geojson','mimes:json,geojson']"
-                        :key="'spanFiles'"
-                    />
-                </div>
-                @error('spanFiles')
-                <span class="bg-red-200 text-red-500 p-0.5 mt-1 rounded">{{ $message }}</span>
-                @enderror
-            </div>
-            <div class="flex flex-col mb-2 gap-2">
-                <p>{{__('Harvested Data file.')}}</p>
-                <div id="harvest_file">
-                    <livewire:dropzone
-                        wire:model="harvestDataFiles"
-                        :rules="['extensions:xls,xlsx,ods','mimes:xls,xlsx,ods','required']"
-                        :key="'harvest_file'"
-                    />
-                </div>
-                @error('harvest_file')
-                <span class="bg-red-100 text-red-400 p-1 rounded">{{ $message }}</span>
-                @enderror
-            </div>
-        </x-slot>
-
-        <x-slot name="actions">
-            <x-action-message class="mr-3" on="saved">
-                {{ __('Saved.') }}
-            </x-action-message>
-            <x-secondary-button class="mr-3"
-                                type="button"
-                                x-on:click="$wire.showProjectModal = false"
-            >
-                {{ __('Cancel') }}
-            </x-secondary-button>
-            <x-button>
-                {{ __('Save') }}
-            </x-button>
-
-        </x-slot>
-    </x-form-modal>
-</x-modal>
diff --git a/laravel_app/resources/views/livewire/project-manager.blade.php b/laravel_app/resources/views/livewire/project-manager.blade.php
index a47cae6..468f6b4 100644
--- a/laravel_app/resources/views/livewire/project-manager.blade.php
+++ b/laravel_app/resources/views/livewire/project-manager.blade.php
@@ -1,6 +1,6 @@
 <div>
     <x-project-manager-mail-settings-modal :projectManager="$this"/>
-    <x-project-manager-properties-modal :projectManager="$this"/>
+{{--    <x-project-manager-properties-modal :projectManager="$this"/>--}}
     <x-project-manager-grid :projectManager="$this"/>
     <x-project-manager-delete-confirmation-modal/>
 </div>
diff --git a/laravel_app/resources/views/livewire/projects/menu.blade.php b/laravel_app/resources/views/livewire/projects/menu.blade.php
index 2343ba6..a57a26c 100644
--- a/laravel_app/resources/views/livewire/projects/menu.blade.php
+++ b/laravel_app/resources/views/livewire/projects/menu.blade.php
@@ -3,5 +3,5 @@
     <a class=" capitalize font-semibold text-md hover:rounded-lg hover:bg-gray-50 hover:text-indigo-600 hover:border-0 py-2 pl-2 pr-3 leading-6 whitespace-nowrap gap-2 flex items-baseline group text-gray-700 {{!($activeTab == 'mosaics')   ?: 'rounded-lg bg-gray-50 text-indigo-600 border-0'}}" href="{{route('project.show',[$projectName,'mosaics'])}}"><i class="group-hover:text-indigo-600 w-6 text-gray-400 fg-mosaic fg-lg"></i>Mosaics</a>
     <a class=" capitalize font-semibold text-md hover:rounded-lg hover:bg-gray-50 hover:text-indigo-600 hover:border-0 py-2 pl-2 pr-3 leading-6 whitespace-nowrap gap-2 flex items-baseline group text-gray-700 {{!($activeTab == 'reports')   ?: 'rounded-lg bg-gray-50 text-indigo-600 border-0'}}" href="{{route('project.show',[$projectName,'reports'])}}"><i class="group-hover:text-indigo-600 w-6 text-gray-400 fg-map-stat fg-lg"></i>Reports</a>
     <a class=" capitalize font-semibold text-md hover:rounded-lg hover:bg-gray-50 hover:text-indigo-600 hover:border-0 py-2 pl-2 pr-3 leading-6 whitespace-nowrap gap-2 flex items-baseline group text-gray-700 {{!($activeTab == 'mailings')  ?: 'rounded-lg bg-gray-50 text-indigo-600 border-0'}}" href="{{route('project.show',[$projectName,'mailings'])}}"><i class="group-hover:text-indigo-600 w-6 text-gray-400 fa-regular fa-envelope"></i>Mailings</a>
-    <a class=" capitalize font-semibold text-md hover:rounded-lg hover:bg-gray-50 hover:text-indigo-600 hover:border-0 py-2 pl-2 pr-3 leading-6 whitespace-nowrap gap-2 flex items-baseline group text-gray-700 {{!($activeTab == 'settings')  ?: 'rounded-lg bg-gray-50 text-indigo-600 border-0'}}" href="{{route('project.show',[$projectName,'settings'])}}"><i class="group-hover:text-indigo-600 w-6 text-gray-400 fa-regular fg-earth-gear fg-lg"></i>Settings</a>
+    <a class=" capitalize font-semibold text-md hover:rounded-lg hover:bg-gray-50 hover:text-indigo-600 hover:border-0 py-2 pl-2 pr-3 leading-6 whitespace-nowrap gap-2 flex items-baseline group text-gray-700 {{!($activeTab == 'settings')  ?: 'rounded-lg bg-gray-50 text-indigo-600 border-0'}}" href="{{route('project.show',[$projectName,'settings'])}}"><i class="group-hover:text-indigo-600 w-6 text-gray-400 fa-solid fa-gear"></i>Settings</a>
 </div>
diff --git a/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php b/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php
index 6e6f4bd..5f44089 100644
--- a/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php
+++ b/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php
@@ -114,9 +114,10 @@
                 <div class="flex flex-col mb-2 gap-2">
                     <p>{{__('Pivot GeoJSON file.')}}</p>
                     <div id="pivot_file">
-                        <livewire:dropzone
+                        <livewire:components.custom-dropzone
                             wire:model="pivotFiles"
                             wire:key="'pivotFiles'"
+                            :type="'pivot'"
                         />
                     </div>
                     @error('pivotFiles')
@@ -136,9 +137,10 @@
                 <div class="flex flex-col mb-2 gap-2">
                     <p>{{__('Span GeoJSON file.')}}</p>
                     <div id="span_file">
-                        <livewire:dropzone
+                        <livewire:components.custom-dropzone
                             wire:model="spanFiles"
                             wire:key="'spanFiles'"
+                            :type="'span'"
                         />
                     </div>
                     @error('spanFiles')
@@ -158,11 +160,11 @@
                 <div class="flex flex-col mb-2 gap-2">
                     <p>{{__('Harvested Data file.')}}</p>
                     <div id="harvest_file">
-                        <livewire:dropzone
+                        <livewire:components.custom-dropzone
                             wire:model="harvestDataFiles"
                             :rules="['extensions:xls,xlsx,ods','mimes:xls,xlsx,ods','required']"
-                            :key="'harvest_file'"
                             wire:key="'harvest_file'"
+                            :type="'harvest'"
                         />
                     </div>
                     @error('harvest_file')
diff --git a/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php b/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php
index 270c95f..1a5db32 100644
--- a/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php
+++ b/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php
@@ -37,8 +37,14 @@ class="w-full antialiased"
                 <div x-show="!isDragging" class="flex flex-col items-center justify-center gap-2 py-8 h-full ">
                     <div class="flex items-center justify-center gap-2">
 {{--                        TODO change depending on the file type props etc--}}
-                        <i class="fg-geojson-file fg-3x"></i>
-                        <p class="text-md ">Drop here or <span class="font-semibold text-black dark:text-white">Browse file</span>
+                        <i class="@php
+                                        echo match ($type){
+                                            'pivot','span' => 'fg-geojson-file fg-3x',
+                                            'harvest' => 'fg-map-stat fg-3x',
+                                            default => 'fa-solid fa-file-arrow-down'
+                                        }
+                                  @endphp  fill-red-100"></i>
+                        <p class="text-md ">Drop here or <span class="font-semibold text-black dark:text-white">Browse file </span>
                         </p>
                     </div>
                     <div class="flex items-center justify-center gap-2 text-gray-400 text-sm">