Moves admin and search content inside an 'admin' folder inside 'front'.

.gitignore

@@ -16,7 +16,7 @@ last-js-build.md5
 last-sass-build.md5
 last-composer-build.md5
 last-package-build.md5
-src/front/scss/.sass-cache
+src/front/admin/scss/.sass-cache
 src/assets/css/tainacan-admin.css
 src/assets/css/tainacan-admin.css.map
 src/assets/report.html

build.sh

@@ -13,12 +13,12 @@ current_OS=`uname`
 # For macOS (Darwin)
 if [ $current_OS == "Darwin" ]; then
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5
-    find ./src/scss/ ./src/front/scss/ ./src/front/gutenberg-blocks/ ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
+    find ./src/scss/ ./src/front/admin/scss/ ./src/front/gutenberg-blocks/ ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5
 else
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5
-    find ./src/scss/ ./src/front/scss/ ./src/front/gutenberg-blocks ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
+    find ./src/scss/ ./src/front/admin/scss/ ./src/front/gutenberg-blocks ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5
 fi

compile-sass.sh

@@ -11,9 +11,9 @@ echo "Compilando Sass..."
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-1 src/scss/tainacan-embeds.scss:src/assets/css/tainacan-embeds.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-2 src/front/scss/tainacan-admin.scss:src/assets/css/tainacan-admin.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-2 src/front/admin/scss/tainacan-admin.scss:src/assets/css/tainacan-admin.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-3 src/front/scss/tainacan-roles.scss:src/assets/css/tainacan-roles.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-3 src/front/roles/tainacan-roles.scss:src/assets/css/tainacan-roles.css
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-4 src/front/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss:src/assets/css/tainacan-gutenberg-block-collections-list.css
 

src/classes/filter-types/checkbox/Checkbox.vue

@@ -41,7 +41,7 @@
 <script>
     import { isCancel } from '../../../js/axios/axios';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
 
     export default {
         mixins: [filterTypeMixin, dynamicFilterTypeMixin],

src/classes/filter-types/date-interval/DateInterval.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-    import { wpAjax, dateInter } from "../../../front/js/mixins";
+    import { wpAjax, dateInter } from "../../../front/admin/js/mixins";
     import { filterTypeMixin } from '../filter-types-mixin';
     import moment from 'moment';
 

src/classes/filter-types/date/Date.vue

@@ -111,7 +111,7 @@
 </template>
 
 <script>
-    import { wpAjax, dateInter } from "../../../front/js/mixins";
+    import { wpAjax, dateInter } from "../../../front/admin/js/mixins";
     import { filterTypeMixin } from '../filter-types-mixin';
     import moment from 'moment';
 

src/classes/filter-types/numeric/Numeric.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script>
-    import { wpAjax } from '../../../front/js/mixins';
+    import { wpAjax } from '../../../front/admin/js/mixins';
     import { filterTypeMixin } from '../filter-types-mixin';
 
     export default {

src/classes/filter-types/tainacan-filter-item.vue

@@ -90,7 +90,7 @@
 </script>
 
 <style lang="scss">
-    @import "../../../src/front/scss/_variables.scss";
+    @import "../../../src/front/admin/scss/_variables.scss";
 
     .filter-item-forms {
 

src/classes/filter-types/taxonomy/Checkbox.vue

@@ -49,7 +49,7 @@
     import qs from 'qs';
     import { tainacan as axios, CancelToken, isCancel } from '../../../js/axios/axios';
     import { mapGetters } from 'vuex';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     
     export default {

src/classes/metadata-types/date/Date.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script>
-    import { dateInter } from "../../../front/js/mixins";
+    import { dateInter } from "../../../front/admin/js/mixins";
     import moment from 'moment';
 
     export default {

src/classes/metadata-types/tainacan-form-item.vue

@@ -209,7 +209,7 @@
 
 <style lang="scss" scoped>
 
-    @import '../../front/scss/_variables.scss'; 
+    @import '../../front/admin/scss/_variables.scss'; 
 
     .multiple-inputs {
         display: flex;

src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue

@@ -66,7 +66,7 @@
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
 
     export default {
         created() {

src/classes/metadata-types/taxonomy/TaxonomyRadio.vue

@@ -75,7 +75,7 @@
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
 
     export default {
         created() {

src/front/admin/components/edition/item-edition-form.vue

@@ -762,7 +762,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { eventBus } from '../../../js/event-bus-web-components.js'
+import { eventBus } from '../../../../js/event-bus-web-components.js'
 import wpMediaFrames from '../../js/wp-media-frames';
 import FileItem from '../other/file-item.vue';
 import DocumentItem from '../other/document-item.vue';

src/front/admin/components/lists/items-list.vue

@@ -919,7 +919,7 @@ import { mapActions, mapGetters } from 'vuex';
 import CustomDialog from '../other/custom-dialog.vue';
 import ItemCopyDialog from '../other/item-copy-dialog.vue';
 import BulkEditionModal from '../bulk-edition/bulk-edition-modal.vue';
-import { dateInter } from "../../../front/js/mixins";
+import { dateInter } from "../../js/mixins";
 
 export default {
     name: 'ItemsList',

src/front/admin/components/other/checkbox-radio-modal.vue

@@ -277,8 +277,8 @@
 
 <script>
     import qs from 'qs';
-    import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import {  dynamicFilterTypeMixin } from '../../../classes/filter-types/filter-types-mixin';
+    import { tainacan as axios, isCancel } from '../../../../js/axios/axios';
+    import { dynamicFilterTypeMixin } from '../../../../classes/filter-types/filter-types-mixin';
 
     export default {
         name: 'CheckboxFilterModal',

src/front/admin/js/main.js

@@ -11,46 +11,46 @@ import draggable from 'vuedraggable';
 import VueTheMask from 'vue-the-mask';
 
 // Custom elements
-import Text from '../../classes/metadata-types/text/Text.vue';
-import Textarea from '../../classes/metadata-types/textarea/Textarea.vue';
-import Selectbox from '../../classes/metadata-types/selectbox/Selectbox.vue';
-import Numeric from '../../classes/metadata-types/numeric/Numeric.vue';
-import Date from '../../classes/metadata-types/date/Date.vue';
-import Relationship from '../../classes/metadata-types/relationship/Relationship.vue';
-import Taxonomy from '../../classes/metadata-types/taxonomy/Taxonomy.vue';
+import Text from '../../../classes/metadata-types/text/Text.vue';
+import Textarea from '../../../classes/metadata-types/textarea/Textarea.vue';
+import Selectbox from '../../../classes/metadata-types/selectbox/Selectbox.vue';
+import Numeric from '../../../classes/metadata-types/numeric/Numeric.vue';
+import Date from '../../../classes/metadata-types/date/Date.vue';
+import Relationship from '../../../classes/metadata-types/relationship/Relationship.vue';
+import Taxonomy from '../../../classes/metadata-types/taxonomy/Taxonomy.vue';
 
-import FormRelationship from '../../classes/metadata-types/relationship/FormRelationship.vue';
-import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
-import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.vue';
-import FormNumeric from '../../classes/metadata-types/numeric/FormNumeric.vue';
+import FormRelationship from '../../../classes/metadata-types/relationship/FormRelationship.vue';
+import FormTaxonomy from '../../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
+import FormSelectbox from '../../../classes/metadata-types/selectbox/FormSelectbox.vue';
+import FormNumeric from '../../../classes/metadata-types/numeric/FormNumeric.vue';
 
-import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
-import FilterDate from '../../classes/filter-types/date/Date.vue';
-import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
-import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
-import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
-import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
-import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
-import FilterDateInterval from '../../classes/filter-types/date-interval/DateInterval.vue';
-import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
-import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
-import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
+import FilterNumeric from '../../../classes/filter-types/numeric/Numeric.vue';
+import FilterDate from '../../../classes/filter-types/date/Date.vue';
+import FilterSelectbox from '../../../classes/filter-types/selectbox/Selectbox.vue';
+import FilterAutocomplete from '../../../classes/filter-types/autocomplete/Autocomplete.vue';
+import FilterCheckbox from '../../../classes/filter-types/checkbox/Checkbox.vue';
+import FilterTaginput from '../../../classes/filter-types/taginput/Taginput.vue';
+import FilterNumericInterval from '../../../classes/filter-types/numeric-interval/NumericInterval.vue';
+import FilterDateInterval from '../../../classes/filter-types/date-interval/DateInterval.vue';
+import FilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
+import FilterTaxonomyCheckbox from '../../../classes/filter-types/taxonomy/Checkbox.vue';
+import FilterTaxonomyTaginput from '../../../classes/filter-types/taxonomy/Taginput.vue';
 
-import FormFilterNumeric from '../../classes/filter-types/numeric/FormNumeric.vue';
-import FormFilterNumericInterval from '../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
-import FormFilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
-// import FormDate from '../../classes/filter-types/date/FormDate.vue';
+import FormFilterNumeric from '../../../classes/filter-types/numeric/FormNumeric.vue';
+import FormFilterNumericInterval from '../../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
+import FormFilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
+// import FormDate from '../../../classes/filter-types/date/FormDate.vue';
 
-import TainacanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
-import TainacanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
+import TainacanFormItem from '../../../classes/metadata-types/tainacan-form-item.vue';
+import TainacanFiltersList from '../../../classes/filter-types/tainacan-filter-item.vue';
 
 // Remaining imports
 import AdminPage from '../admin.vue'
 import HelpButton from '../components/other/help-button.vue';
 import TainacanTitle from '../components/navigation/tainacan-title.vue';
-import store from '../../js/store/store'
+import store from '../../../js/store/store'
 import router from './router'
-import eventBusSearch from '../../js/event-bus-search';
+import eventBusSearch from '../../../js/event-bus-search';
 import termsListBus from './terms-list-bus.js';
 import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin, StatusHelperPlugin, CommentsStatusHelperPlugin } from './utilities';
 

src/front/admin/js/theme-main.js

@@ -5,31 +5,31 @@ import VTooltip from 'v-tooltip';
 import VueMasonry from 'vue-masonry-css';
 
 // Custom elements
-import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
-import FilterDate from '../../classes/filter-types/date/Date.vue';
-import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
-import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
-import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
-import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
-import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
-import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
-import FilterDateInterval from '../../classes/filter-types/date-interval/DateInterval.vue';
-import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
-import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
+import FilterNumeric from '../../../classes/filter-types/numeric/Numeric.vue';
+import FilterDate from '../../../classes/filter-types/date/Date.vue';
+import FilterSelectbox from '../../../classes/filter-types/selectbox/Selectbox.vue';
+import FilterAutocomplete from '../../../classes/filter-types/autocomplete/Autocomplete.vue';
+import FilterCheckbox from '../../../classes/filter-types/checkbox/Checkbox.vue';
+import FilterTaginput from '../../../classes/filter-types/taginput/Taginput.vue';
+import FilterTaxonomyCheckbox from '../../../classes/filter-types/taxonomy/Checkbox.vue';
+import FilterTaxonomyTaginput from '../../../classes/filter-types/taxonomy/Taginput.vue';
+import FilterDateInterval from '../../../classes/filter-types/date-interval/DateInterval.vue';
+import FilterNumericInterval from '../../../classes/filter-types/numeric-interval/NumericInterval.vue';
+import FilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
 
-import TaincanFiltersList from '../../classes/filter-types/tainacan-filter-item.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 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';
 
 // Remaining imports
-import store from '../../js/store/store'
+import store from '../../../js/store/store'
 import routerTheme from './theme-router.js'
-import eventBusSearch from '../../js/event-bus-search';
+import eventBusSearch from '../../../js/event-bus-search';
 import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusHelperPlugin } from './utilities';
 
 // Configure and Register Plugins

src/front/admin/pages/lists/activities-page.vue

@@ -264,7 +264,7 @@
 <script>
     import ActivitiesList from "../../components/lists/activities-list.vue";
     import ProcessesList from "../../components/lists/processes-list.vue";
-    import { dateInter } from "../../../front/js/mixins";
+    import { dateInter } from "../../js/mixins";
     import { mapActions, mapGetters } from 'vuex';
     import moment from 'moment'