From 4a2ea7b378e3f369d9a4e238ecc473ca97ea3ab0 Mon Sep 17 00:00:00 2001
From: Unknown <davhubner@gmail.com>
Date: Tue, 6 Jun 2017 12:35:28 +0200
Subject: [PATCH] Save last selected inventory tab to session

---
 app/Resources/assets/js/style.js              | 31 +++++++++++++++++--
 app/Resources/views/base.html.twig            | 24 --------------
 app/Resources/views/html.html.twig            | 12 +++++--
 app/Resources/views/model/detail.html.twig    |  3 ++
 app/Resources/views/search/index.html.twig    |  4 +--
 .../views/set/tabs/inventory.html.twig        |  8 ++---
 src/AppBundle/Controller/AjaxController.php   | 25 +++++++++++++++
 7 files changed, 72 insertions(+), 35 deletions(-)
 create mode 100644 src/AppBundle/Controller/AjaxController.php

diff --git a/app/Resources/assets/js/style.js b/app/Resources/assets/js/style.js
index 862f51f..3555371 100644
--- a/app/Resources/assets/js/style.js
+++ b/app/Resources/assets/js/style.js
@@ -23,7 +23,7 @@ $(document).ready(function(){
         onVisible: function() {
             $('.image img').visibility('refresh');
         },
-        history: true,
+        // history: true,
         historyType: 'hash'
     });
 
@@ -31,7 +31,7 @@ $(document).ready(function(){
         onVisible: function() {
             $('.image img').visibility('refresh');
         },
-        history: true,
+        // history: true,
         historyType: 'hash'
     });
 
@@ -52,4 +52,31 @@ $(document).ready(function(){
     $('.ui.sidebar')
         .sidebar('attach events', '.toc.item')
     ;
+
+    // save last selected inventory tab to session
+    $('.setTab').click(function() {
+        $tab = $(this).attr('data-tab');
+
+        $.ajax({
+            type: 'POST',
+            url: routes.set_tab.replace("PLACEHOLDER", $tab),
+            async: true,
+        });
+    });
+
+    $('.ui.search')
+        .search({
+            type: 'category',
+            apiSettings: {
+                action: 'search',
+                url: routes.search_autocomplete+'?query={query}',
+            },
+            minCharacters: 3,
+            fields: {
+                title: 'name',
+                description: 'id',
+                url: 'url',
+                image: 'img'
+            }
+        });
 });
\ No newline at end of file
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index bb839fa..bd0230c 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -106,28 +106,4 @@
         </main>
         {% include 'footer.html.twig' %}
     </div>
-{% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $('.ui.search')
-                .search({
-                    type: 'category',
-                    apiSettings: {
-                        action: 'search',
-                        url: '{{ path('search_autocomplete') }}?query={query}',
-                    },
-                    minCharacters: 3,
-                    fields: {
-                        title: 'name',
-                        description: 'id',
-                        url: 'url',
-                        image: 'img'
-                    }
-                });
-        });
-    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/html.html.twig b/app/Resources/views/html.html.twig
index b5d7204..d309944 100644
--- a/app/Resources/views/html.html.twig
+++ b/app/Resources/views/html.html.twig
@@ -23,10 +23,16 @@
 {% block body %}
 
 {% endblock %}
+
+<script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/style.js')) }}"></script>
+<script type="text/javascript">
+    var routes = {
+        search_autocomplete : "{{ path('search_autocomplete') }}",
+        set_tab : "{{ path('set_tab', { 'tab': "PLACEHOLDER" }) }}"
+    };
+</script>
 {% block javascripts %}
-    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/three.js')) }}"></script>
-    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/OrbitControls.js')) }}"></script>
-    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/style.js')) }}"></script>
+
 {% endblock %}
 </body>
 </html>
diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig
index 5042db3..06464a8 100644
--- a/app/Resources/views/model/detail.html.twig
+++ b/app/Resources/views/model/detail.html.twig
@@ -117,6 +117,9 @@
 
 {% block javascripts %}
     {{ parent() }}
+
+    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/three.js')) }}"></script>
+    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/OrbitControls.js')) }}"></script>
     <script type="text/javascript">
         window.onload = function() {
             $('#model-viewer').ModelViewer('{{ path('media_file', {'path': model.path }) }}');
diff --git a/app/Resources/views/search/index.html.twig b/app/Resources/views/search/index.html.twig
index 5e5e431..ece6230 100644
--- a/app/Resources/views/search/index.html.twig
+++ b/app/Resources/views/search/index.html.twig
@@ -16,7 +16,7 @@
                 {% endfor %}
             </div>
             <div class="spacing top">
-                <a class="show all" href="{{ path('set_index',{'s[query]':query}) }}">{{ 'view.all.sets' | trans }}</a>
+                <a class="show all" href="{{ path('set_index',{'query':query}) }}">{{ 'view.all.sets' | trans }}</a>
             </div>
         </div>
     </div>
@@ -30,7 +30,7 @@
                 {% endfor %}
             </div>
             <div class="spacing top">
-                <a class="show all" href="{{ path('model_index',{'m[query]':query}) }}">{{ 'view.all.models' | trans }}</a>
+                <a class="show all" href="{{ path('model_index',{'query':query}) }}">{{ 'view.all.models' | trans }}</a>
             </div>
         </div>
     </div>
diff --git a/app/Resources/views/set/tabs/inventory.html.twig b/app/Resources/views/set/tabs/inventory.html.twig
index 5e9e7d6..27458e2 100644
--- a/app/Resources/views/set/tabs/inventory.html.twig
+++ b/app/Resources/views/set/tabs/inventory.html.twig
@@ -30,14 +30,14 @@
         {% endif %}
 
         <div class="ui top attached tabular menu submenu">
-            <a class="ui item {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
-            <a class="ui item {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
+            <a class="ui item setTab {% if app.session.get('tab') != 'inventory/multicolor' %}active{%  endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
+            <a class="ui item setTab {% if app.session.get('tab') == 'inventory/multicolor' %}active{%  endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
         </div>
 
-        <div class="ui bottom attached tab {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor">
+        <div class="ui bottom attached tab {% if app.session.get('tab') != 'inventory/multicolor' %}active{%  endif %}" data-tab="inventory/unicolor">
             {{ render(path('set_models', {id: set.id})) }}
         </div>
-        <div class="ui bottom attached tab {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor">
+        <div class="ui bottom attached tab {% if app.session.get('tab') == 'inventory/multicolor' %}active{%  endif %}" data-tab="inventory/multicolor">
             {{ render(path('set_colors', {id: set.id})) }}
         </div>
     {% endif %}
diff --git a/src/AppBundle/Controller/AjaxController.php b/src/AppBundle/Controller/AjaxController.php
new file mode 100644
index 0000000..192cd25
--- /dev/null
+++ b/src/AppBundle/Controller/AjaxController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace AppBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
+class AjaxController extends Controller
+{
+    /**
+     * @Route("/set_tab/{tab}", name="set_tab", requirements={"tab"=".+"})
+     */
+    public function setDefaultTabAction(Request $request, $tab)
+    {
+        $session = $request->getSession();
+        $session->set('tab', $tab);
+
+        $response = new Response();
+        return $response;
+
+    }
+}
\ No newline at end of file