From a7a025b659669f99d6f38dfdad1506dcea81061e Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 11 Dec 2019 01:17:49 +0300
Subject: [PATCH] feat(admin-plugin): add entry select type modal on entry
 creation #331

---
 .../admin/app/Controllers/EntriesController.php  | 16 ++++++++++++++++
 site/plugins/admin/routes/web.php                |  1 +
 .../views/templates/content/entries/index.html   | 12 +++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 9dfa03e5..8598ef88 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -171,6 +171,22 @@ class EntriesController extends Controller
         );
     }
 
+    /**
+     * Select Entry Type - process
+     *
+     * @param Request  $request  PSR7 request
+     * @param Response $response PSR7 response
+     *
+     * @return Response
+     */
+    public function selectEntryTypeProcess(Request $request, Response $response) : Response
+    {
+        // Get data from POST
+        $data = $request->getParsedBody();
+
+        return $response->withRedirect($this->router->pathFor('admin.entries.add') . '?id=' . $data['id'] . '&type=' . $data['type']);
+    }
+
     /**
      * Create new entry - process
      *
diff --git a/site/plugins/admin/routes/web.php b/site/plugins/admin/routes/web.php
index 0dc60175..3acc4798 100644
--- a/site/plugins/admin/routes/web.php
+++ b/site/plugins/admin/routes/web.php
@@ -26,6 +26,7 @@ $app->group('/' . $admin_route, function () use ($app) : void {
     $app->post('/entries/edit', 'EntriesController:editProcess')->setName('admin.entries.editProcess');
     $app->get('/entries/add', 'EntriesController:add')->setName('admin.entries.add');
     $app->post('/entries/add', 'EntriesController:addProcess')->setName('admin.entries.addProcess');
+    $app->post('/entries/select-entry-type', 'EntriesController:selectEntryTypeProcess')->setName('admin.entries.selectEntryTypeProcess');
     $app->get('/entries/move', 'EntriesController:move')->setName('admin.entries.move');
     $app->post('/entries/move', 'EntriesController:moveProcess')->setName('admin.entries.moveProcess');
     $app->get('/entries/rename', 'EntriesController:rename')->setName('admin.entries.rename');
diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html
index a08c08d9..5f315bbc 100644
--- a/site/plugins/admin/views/templates/content/entries/index.html
+++ b/site/plugins/admin/views/templates/content/entries/index.html
@@ -61,7 +61,7 @@
                      </button>
                      <div class="dropdown-menu dropdown-menu-lg-right">
                        <a class="dropdown-item" href="{{ path_for('admin.entries.edit') }}?id={{ entry.slug }}&type=editor"><i class="fas fa-edit"></i> {{ tr('admin_edit') }}</a>
-                       <a class="dropdown-item" href="{{ path_for('admin.entries.add') }}?id={{ entry.slug }}"><i class="fas fa-plus-circle"></i> {{ tr('admin_add') }}</a>
+                       <a class="dropdown-item" href="javascript:;" onclick="$('.js-add-entry input[name=id]').attr('value', '{{ entry.slug }}');" data-toggle="modal" data-target="#selectEntryTypeModal"><i class="fas fa-plus-circle"></i> {{ tr('admin_add') }}</a>
                        <a class="dropdown-item" href="javascript:;"
                           onclick="event.preventDefault();
                                    document.getElementById('duplicate-id-{{ entry.slug }}').submit();"><i class="fas fa-copy"></i> {{ tr('admin_duplicate') }}</a>
@@ -93,7 +93,7 @@
 <div class="empty-list-message">
     <i class="far fa-newspaper"></i>
     <h3>{{ tr('admin_you_have_not_created_any_entries_yet') }}</h3>
-    <a href="{{ path_for('admin.entries.add') }}?id={{ entry.slug }}" class="btn">{{ tr('admin_create_new_entry') }}</a>
+    <a href="javascript:;" data-toggle="modal" data-target="#selectEntryTypeModal" class="btn">{{ tr('admin_create_new_entry') }}</a>
 </div>
 {% endif %}
 
@@ -110,11 +110,17 @@
           <ul class="fieldset-selector row">
               {% for key, fieldset in fieldsets %}
                   <li class="col-md-4">
-                      <a href="{{ path_for('admin.entries.add') }}?id={{ id_current }}&type={{ key }}" class="fieldset-item">
+                      <a href="javascript:;" onclick="event.preventDefault();
+                                document.getElementById('add-entry-{{ key }}').submit();" class="fieldset-item">
                           <div class="fieldset-thumbnail">{% if fieldset.icon %}<i class="{{ fieldset.icon }}"></i>{% else %}<i class="far fa-file-alt"></i>{% endif %}</div>
                           <div class="fieldset-title">{{ fieldset.title }}</div>
                       </a>
                   </li>
+                  <form id="add-entry-{{ key }}" action="{{ path_for('admin.entries.selectEntryTypeProcess') }}" method="POST" style="display: none;" class='js-add-entry'>
+                      {{ csrf() }}
+                      <input type="hidden" name="type" value="{{ key }}">
+                      <input type="hidden" name="id" value="{{ id_current }}">
+                  </form>
               {% endfor %}
           </ul>
       </div>