From 4deedda3b63d0edfd43fa53f3305f05a1edf532f Mon Sep 17 00:00:00 2001
From: SrS2225a <sawyer.r.stephens@gmail.com>
Date: Mon, 19 Dec 2022 19:42:08 -0800
Subject: [PATCH] bug fixes for vanity links

---
 app/routes.php                          | 2 +-
 resources/templates/dashboard/grid.twig | 4 ----
 resources/templates/dashboard/list.twig | 3 ---
 resources/templates/upload/public.twig  | 3 ---
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/routes.php b/app/routes.php
index 519fede..9aca211 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -62,7 +62,7 @@ $app->group('', function (RouteCollectorProxy $group) {
 
     $group->post('/upload/{id}/publish', [MediaController::class, 'togglePublish'])->setName('upload.publish');
     $group->post('/upload/{id}/unpublish', [MediaController::class, 'togglePublish'])->setName('upload.unpublish');
-    $group->map(['PUT', 'POST', 'GET'], '/upload/{id}/vanity', [MediaController::class, 'createVanity'])->setName('upload.vanity');
+    $group->post('/upload/{id}/vanity', [MediaController::class, 'createVanity'])->setName('upload.vanity');
     $group->get('/upload/{id}/raw', [MediaController::class, 'getRawById'])->add(AdminMiddleware::class)->setName('upload.raw');
     $group->map(['GET', 'POST'], '/upload/{id}/delete', [MediaController::class, 'delete'])->setName('upload.delete');
 
diff --git a/resources/templates/dashboard/grid.twig b/resources/templates/dashboard/grid.twig
index ef938a8..e27cb34 100755
--- a/resources/templates/dashboard/grid.twig
+++ b/resources/templates/dashboard/grid.twig
@@ -69,9 +69,5 @@
             <div class="text-center text-muted"><i>{{ lang('no_media') }}</i></div>
         {% endif %}
     </div>
-<<<<<<< HEAD
     {% include 'comp/modal_vanity.twig' %}
-    
-=======
->>>>>>> b4f720cf218b71a0b982c837b986b8b977597421
 {% endblock %}
diff --git a/resources/templates/dashboard/list.twig b/resources/templates/dashboard/list.twig
index bc14f64..e18c6ea 100755
--- a/resources/templates/dashboard/list.twig
+++ b/resources/templates/dashboard/list.twig
@@ -78,10 +78,7 @@
                                                     {% else %}
                                                         <a href="javascript:void(0)" class="btn btn-sm btn-outline-info publish-toggle" data-toggle="tooltip" title="{{ lang('publish') }}" data-id="{{ media.id }}" data-published="{{ media.published }}"><i class="fas fa-check-circle"></i></a>
                                                     {% endif %}
-<<<<<<< HEAD
                                                     <a href="javascript:void(0)" class="btn btn-sm btn-outline-info public-vanity" data-id="{{ media.id }}" data-toggle="tooltip" title="{{ lang('vanity') }}"><i class="fas fa-star"></i></a>
-=======
->>>>>>> b4f720cf218b71a0b982c837b986b8b977597421
                                                     <a href="javascript:void(0)" class="btn btn-sm btn-outline-danger media-delete" data-link="{{ route('upload.delete', {'id': media.id}) }}" data-id="{{ media.id }}" data-toggle="tooltip" title="{{ lang('delete') }}"><i class="fas fa-trash"></i></a>
                                                 </div>
                                             </td>
diff --git a/resources/templates/upload/public.twig b/resources/templates/upload/public.twig
index 52b07c8..7351c2d 100755
--- a/resources/templates/upload/public.twig
+++ b/resources/templates/upload/public.twig
@@ -163,8 +163,5 @@
         </div>
     </div>
     {% include 'comp/modal_delete.twig' %}
-<<<<<<< HEAD
     {% include 'comp/modal_vanity.twig' %}
-=======
->>>>>>> b4f720cf218b71a0b982c837b986b8b977597421
 {% endblock %}