From 91e8797ca110625847799857c90f4361f2140772 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 14 Jan 2020 11:40:37 -0300
Subject: [PATCH] Separates admin and theme-search modules

---
 .../class-tainacan-theme-helper.php           |  2 +-
 .../components}/circular-counter.vue          |  0
 .../components}/view-mode-cards.vue           |  2 +-
 .../components}/view-mode-masonry.vue         |  2 +-
 .../components}/view-mode-records.vue         |  2 +-
 .../components}/view-mode-slideshow.vue       |  6 ++--
 .../components}/view-mode-table.vue           |  0
 .../{admin => theme-search}/js/theme-main.js  | 20 ++++++-------
 .../js/theme-router.js                        |  0
 .../scss/_view-mode-slideshow.scss            |  0
 .../scss/theme-basics.sass                    |  0
 .../theme-items-list.vue                      | 30 +++++++++----------
 webpack.config.js                             |  2 +-
 13 files changed, 33 insertions(+), 33 deletions(-)
 rename src/views/{admin/components/other => theme-search/components}/circular-counter.vue (100%)
 rename src/{theme-helper => views/theme-search/components}/view-mode-cards.vue (99%)
 rename src/{theme-helper => views/theme-search/components}/view-mode-masonry.vue (99%)
 rename src/{theme-helper => views/theme-search/components}/view-mode-records.vue (99%)
 rename src/{theme-helper => views/theme-search/components}/view-mode-slideshow.vue (99%)
 rename src/{theme-helper => views/theme-search/components}/view-mode-table.vue (100%)
 rename src/views/{admin => theme-search}/js/theme-main.js (88%)
 rename src/views/{admin => theme-search}/js/theme-router.js (100%)
 rename src/views/{admin => theme-search}/scss/_view-mode-slideshow.scss (100%)
 rename src/views/{admin => theme-search}/scss/theme-basics.sass (100%)
 rename src/views/{admin => theme-search}/theme-items-list.vue (91%)

diff --git a/src/theme-helper/class-tainacan-theme-helper.php b/src/theme-helper/class-tainacan-theme-helper.php
index f5f71366a..a06562abb 100644
--- a/src/theme-helper/class-tainacan-theme-helper.php
+++ b/src/theme-helper/class-tainacan-theme-helper.php
@@ -105,7 +105,7 @@ class Theme_Helper {
 		global $TAINACAN_BASE_URL;
 		if ( $force || is_post_type_archive( \Tainacan\Repositories\Repository::get_collections_db_identifiers() ) || tainacan_get_term() || get_query_var('tainacan_repository_archive') == 1 ) {
 			//\Tainacan\Admin::get_instance()->add_admin_js();
-			wp_enqueue_script('tainacan-search', $TAINACAN_BASE_URL . '/assets/search.js' , [] , TAINACAN_VERSION, true);
+			wp_enqueue_script('tainacan-search', $TAINACAN_BASE_URL . '/assets/theme_search.js' , [] , TAINACAN_VERSION, true);
 			wp_localize_script('tainacan-search', 'tainacan_plugin', \Tainacan\Admin::get_instance()->get_admin_js_localization_params());
 		}
 	}
diff --git a/src/views/admin/components/other/circular-counter.vue b/src/views/theme-search/components/circular-counter.vue
similarity index 100%
rename from src/views/admin/components/other/circular-counter.vue
rename to src/views/theme-search/components/circular-counter.vue
diff --git a/src/theme-helper/view-mode-cards.vue b/src/views/theme-search/components/view-mode-cards.vue
similarity index 99%
rename from src/theme-helper/view-mode-cards.vue
rename to src/views/theme-search/components/view-mode-cards.vue
index 369184333..67ae75e16 100644
--- a/src/theme-helper/view-mode-cards.vue
+++ b/src/views/theme-search/components/view-mode-cards.vue
@@ -164,7 +164,7 @@ export default {
         display: grid;
     }
 
-    @import "../../src/views/admin/scss/_view-mode-cards.scss";
+    @import "../../admin/scss/_view-mode-cards.scss";
 
     .tainacan-cards-container .tainacan-card .metadata-title {
         padding: 0.6rem 0.75rem;
diff --git a/src/theme-helper/view-mode-masonry.vue b/src/views/theme-search/components/view-mode-masonry.vue
similarity index 99%
rename from src/theme-helper/view-mode-masonry.vue
rename to src/views/theme-search/components/view-mode-masonry.vue
index b30b0fa8a..71d19c864 100644
--- a/src/theme-helper/view-mode-masonry.vue
+++ b/src/views/theme-search/components/view-mode-masonry.vue
@@ -184,7 +184,7 @@ export default {
     $gray3: #dcdcdc;
     $gray4: #555758;
 
-    @import "../../src/views/admin/scss/_view-mode-masonry.scss";
+    @import "../../admin/scss/_view-mode-masonry.scss";
 
     .tainacan-masonry-container .tainacan-masonry-item .metadata-title {
         margin: 0px 6px;
diff --git a/src/theme-helper/view-mode-records.vue b/src/views/theme-search/components/view-mode-records.vue
similarity index 99%
rename from src/theme-helper/view-mode-records.vue
rename to src/views/theme-search/components/view-mode-records.vue
index f101a7eeb..1d4fc4544 100644
--- a/src/theme-helper/view-mode-records.vue
+++ b/src/views/theme-search/components/view-mode-records.vue
@@ -206,7 +206,7 @@ export default {
     $gray4: #555758;
     $gray5: #454647; 
 
-    @import "../../src/views/admin/scss/_view-mode-records.scss";
+    @import "../../admin/scss/_view-mode-records.scss";
 
     .tainacan-records-container .tainacan-record .metadata-title {
         padding: 0.6rem 0.75rem;
diff --git a/src/theme-helper/view-mode-slideshow.vue b/src/views/theme-search/components/view-mode-slideshow.vue
similarity index 99%
rename from src/theme-helper/view-mode-slideshow.vue
rename to src/views/theme-search/components/view-mode-slideshow.vue
index 94ceca205..5498b0461 100644
--- a/src/theme-helper/view-mode-slideshow.vue
+++ b/src/views/theme-search/components/view-mode-slideshow.vue
@@ -303,10 +303,10 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import axios from '../views/admin/js/axios';
+import axios from '../../admin/js/axios';
 import 'swiper/dist/css/swiper.css';
 import { swiper, swiperSlide } from 'vue-awesome-swiper';
-import CircularCounter from '../views/admin/components/other/circular-counter.vue';
+import CircularCounter from './circular-counter.vue';
  
 export default {
     name: 'ViewModeSlideshow',
@@ -663,7 +663,7 @@ export default {
     $page-small-side-padding: 25px;
     $page-side-padding: 4.166666667%; 
 
-    @import "../../src/views/admin/scss/_view-mode-slideshow.scss";
+    @import "../scss/_view-mode-slideshow.scss";
 
     .is-fullscreen .table-wrapper {
         overflow: hidden !important;
diff --git a/src/theme-helper/view-mode-table.vue b/src/views/theme-search/components/view-mode-table.vue
similarity index 100%
rename from src/theme-helper/view-mode-table.vue
rename to src/views/theme-search/components/view-mode-table.vue
diff --git a/src/views/admin/js/theme-main.js b/src/views/theme-search/js/theme-main.js
similarity index 88%
rename from src/views/admin/js/theme-main.js
rename to src/views/theme-search/js/theme-main.js
index ff128b721..20e589970 100644
--- a/src/views/admin/js/theme-main.js
+++ b/src/views/theme-search/js/theme-main.js
@@ -18,19 +18,19 @@ import FilterNumericInterval from '../../../classes/filter-types/numeric-interva
 import FilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
 
 import TaincanFiltersList from '../../../classes/filter-types/tainacan-filter-item.vue';
-import ItemsPage from '../pages/lists/items-page.vue';
-import TermItemsPage from '../pages/lists/term-items-page.vue';
-import ViewModeTable from '../../../theme-helper/view-mode-table.vue';
-import ViewModeCards from '../../../theme-helper/view-mode-cards.vue';
-import ViewModeRecords from '../../../theme-helper/view-mode-records.vue';
-import ViewModeMasonry from '../../../theme-helper/view-mode-masonry.vue';
-import ViewModeSlideshow from '../../../theme-helper/view-mode-slideshow.vue';
+import ItemsPage from '../../admin/pages/lists/items-page.vue';
+import TermItemsPage from '../../admin/pages/lists/term-items-page.vue';
+import ViewModeTable from '../components/view-mode-table.vue';
+import ViewModeCards from '../components/view-mode-cards.vue';
+import ViewModeRecords from '../components/view-mode-records.vue';
+import ViewModeMasonry from '../components/view-mode-masonry.vue';
+import ViewModeSlideshow from '../components/view-mode-slideshow.vue';
 
 // Remaining imports
-import store from './store/store'
+import store from '../../admin/js/store/store'
 import routerTheme from './theme-router.js'
-import eventBusSearch from './event-bus-search';
-import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusHelperPlugin } from './utilities';
+import eventBusSearch from '../../admin/js/event-bus-search';
+import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusHelperPlugin } from '../../admin/js/utilities';
 
 // Configure and Register Plugins
 Vue.use(Buefy, {
diff --git a/src/views/admin/js/theme-router.js b/src/views/theme-search/js/theme-router.js
similarity index 100%
rename from src/views/admin/js/theme-router.js
rename to src/views/theme-search/js/theme-router.js
diff --git a/src/views/admin/scss/_view-mode-slideshow.scss b/src/views/theme-search/scss/_view-mode-slideshow.scss
similarity index 100%
rename from src/views/admin/scss/_view-mode-slideshow.scss
rename to src/views/theme-search/scss/_view-mode-slideshow.scss
diff --git a/src/views/admin/scss/theme-basics.sass b/src/views/theme-search/scss/theme-basics.sass
similarity index 100%
rename from src/views/admin/scss/theme-basics.sass
rename to src/views/theme-search/scss/theme-basics.sass
diff --git a/src/views/admin/theme-items-list.vue b/src/views/theme-search/theme-items-list.vue
similarity index 91%
rename from src/views/admin/theme-items-list.vue
rename to src/views/theme-search/theme-items-list.vue
index 96d93b1b4..a48078bfa 100644
--- a/src/views/admin/theme-items-list.vue
+++ b/src/views/theme-search/theme-items-list.vue
@@ -33,7 +33,7 @@ export default {
 <style lang="scss">
 
     // TAINACAN Variables
-    @import "./scss/_variables.scss";
+    @import "../admin/scss/_variables.scss";
 
     // Bulma imports
     @import "./scss/theme-basics.sass";
@@ -51,20 +51,20 @@ export default {
     @import "../../../node_modules/buefy/src/scss/components/_numberinput.scss";
 
     // Tainacan imports
-    @import "./scss/_tables.scss";
-    @import "./scss/_modals.scss";
-    @import "./scss/_buttons.scss"; 
-    @import "./scss/_inputs.scss";
-    @import "./scss/_checkboxes.scss";
-    @import "./scss/_pagination.scss";
-    @import "./scss/_tags.scss";
-    @import "./scss/_notices.scss";
-    @import "./scss/_tabs.scss";
-    @import "./scss/_selects.scss";
-    @import "./scss/_dropdown-and-autocomplete.scss";
-    @import "./scss/_tooltips.scss";
-    @import "./scss/_tainacan-form.scss";
-    @import "./scss/_filters-menu-modal.scss";
+    @import "../admin/scss/_tables.scss";
+    @import "../admin/scss/_modals.scss";
+    @import "../admin/scss/_buttons.scss"; 
+    @import "../admin/scss/_inputs.scss";
+    @import "../admin/scss/_checkboxes.scss";
+    @import "../admin/scss/_pagination.scss";
+    @import "../admin/scss/_tags.scss";
+    @import "../admin/scss/_notices.scss";
+    @import "../admin/scss/_tabs.scss";
+    @import "../admin/scss/_selects.scss";
+    @import "../admin/scss/_dropdown-and-autocomplete.scss";
+    @import "../admin/scss/_tooltips.scss";
+    @import "../admin/scss/_tainacan-form.scss";
+    @import "../admin/scss/_filters-menu-modal.scss";
 
     .theme-items-list {
         position: relative;
diff --git a/webpack.config.js b/webpack.config.js
index ba36e6b04..8fdd711f4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,8 +5,8 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 module.exports = {
     entry: {
-        search: './src/views/admin/js/theme-main.js',
         admin: './src/views/admin/js/main.js',
+        theme_search: './src/views/theme-search/js/theme-main.js',
         roles: './src/views/roles/js/roles-main.js',
 
         gutenberg_terms_list: './src/views/gutenberg-blocks/tainacan-terms/terms-list/index.js',