Moves 'gutenberg-blocks' folder to 'front' and updates 'roles' folder structure.

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/gutenberg-blocks/ ./src/gutenberg-blocks/tainacan-collections/collections-list ./src/gutenberg-blocks/tainacan-facets/facets-list ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/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/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/gutenberg-blocks ./src/gutenberg-blocks/tainacan-collections/collections-list ./src/gutenberg-blocks/tainacan-facets/facets-list ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/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/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

@@ -15,25 +15,25 @@ sass -E 'UTF-8' --cache-location .tmp/sass-cache-2 src/front/scss/tainacan-admin
 
 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-4 src/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss:src/assets/css/tainacan-gutenberg-block-collections-list.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
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-5 src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-5 src/front/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-6 src/gutenberg-blocks/tainacan-items/items-list/items-list.scss:src/assets/css/tainacan-gutenberg-block-items-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-6 src/front/gutenberg-blocks/tainacan-items/items-list/items-list.scss:src/assets/css/tainacan-gutenberg-block-items-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-7 src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss:src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-7 src/front/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss:src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-8 src/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss:src/assets/css/tainacan-gutenberg-block-search-bar.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-8 src/front/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss:src/assets/css/tainacan-gutenberg-block-search-bar.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-9 src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-9 src/front/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-10 src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-10 src/front/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-11 src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss:src/assets/css/tainacan-gutenberg-block-terms-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-11 src/front/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss:src/assets/css/tainacan-gutenberg-block-terms-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-12 src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss:src/assets/css/tainacan-gutenberg-block-facets-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-12 src/front/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss:src/assets/css/tainacan-gutenberg-block-facets-list.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-13 src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-13 src/front/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
 
 echo "Compilação do Sass Concluído!"
 exit 0

src/classes/tainacan-creator.php

@@ -177,7 +177,7 @@ require_once(__DIR__ . '/../theme-helper/class-tainacan-theme-helper.php');
 require_once(__DIR__ . '/../theme-helper/template-tags.php');
 $Tainacan_Theme_Helper = \Tainacan\Theme_Helper::get_instance();
 
-require_once(__DIR__ . '/../gutenberg-blocks/class-tainacan-gutenberg-block.php');
+require_once(__DIR__ . '/../front/gutenberg-blocks/class-tainacan-gutenberg-block.php');
 
 $Tainacan_Search_Engine = new \Tainacan\Search_Engine();
 $Tainacan_Elastic_press = \Tainacan\Elastic_Press::get_instance();

src/front/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js

@@ -7,7 +7,7 @@ const { RangeControl, Spinner, Button, BaseControl, ToggleControl, SelectControl
 const { InspectorControls } = wp.editor;
 
 import CarouselCollectionsModal from './carousel-collections-modal.js';
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-collections/collections-list/collections-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-facets/facets-list/index.js

@@ -8,7 +8,7 @@ const { InspectorControls, BlockControls } = wp.editor;
 
 import MetadataModal from './metadata-modal.js';
 import ParentTermModal from './parent-term-modal.js';
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-facets/facets-list/metadata-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-facets/facets-list/parent-term-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-items/carousel-items-list/index.js

@@ -7,7 +7,7 @@ const { RangeControl, Spinner, Button, ToggleControl, SelectControl, Placeholder
 const { InspectorControls } = wp.editor;
 
 import CarouselItemsModal from './carousel-items-modal.js';
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js

@@ -7,7 +7,7 @@ const { ResizableBox, FocalPointPicker, SelectControl, RangeControl, Spinner, Bu
 const { InspectorControls, BlockControls } = wp.editor;
 
 import DynamicItemsModal from './dynamic-items-modal.js';
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-items/items-list/items-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-items/search-bar/search-bar-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 
 const { __ } = wp.i18n;

src/front/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js

@@ -7,7 +7,7 @@ const { RangeControl, Spinner, Button, BaseControl, ToggleControl, SelectControl
 const { InspectorControls } = wp.editor;
 
 import TermsModal from '../terms-list/terms-modal.js';
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 import axios from 'axios';
 import qs from 'qs';
 

src/front/gutenberg-blocks/tainacan-terms/terms-list/terms-modal.js

@@ -1,4 +1,4 @@
-import tainacan from '../../axios/axios.js';
+import tainacan from '../../js/axios.js';
 
 const { __ } = wp.i18n;
 

src/front/roles/js/roles-main.js

@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import store from '../../js/store/store';
+import store from '../../../js/store/store';
 import router from './roles-router';
 import VTooltip from 'v-tooltip';
 

src/front/roles/js/roles-router.js

@@ -2,8 +2,8 @@ import Vue from 'vue';
 import VueRouter from 'vue-router'
 import qs from 'qs';
 
-import RolesList from '../roles/roles-list.vue';
+import RolesList from '../pages/roles-list.vue';
-import RoleEditionForm from '../roles/role-edition-form.vue'
+import RoleEditionForm from '../pages/role-edition-form.vue'
 
 const { __ } = wp.i18n;
 

webpack.config.js

@@ -7,31 +7,31 @@ module.exports = {
     entry: {
         search: './src/front/js/theme-main.js',
         admin: './src/front/js/main.js',
-        roles: './src/front/js/roles-main.js',
+        roles: './src/front/roles/js/roles-main.js',
 
-        gutenberg_terms_list: './src/gutenberg-blocks/tainacan-terms/terms-list/index.js',
+        gutenberg_terms_list: './src/front/gutenberg-blocks/tainacan-terms/terms-list/index.js',
         
-        gutenberg_items_list: './src/gutenberg-blocks/tainacan-items/items-list/index.js',
+        gutenberg_items_list: './src/front/gutenberg-blocks/tainacan-items/items-list/index.js',
         
-        gutenberg_dynamic_items_list: './src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js',
+        gutenberg_dynamic_items_list: './src/front/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js',
-        gutenberg_dynamic_items_list_theme: './src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js',
+        gutenberg_dynamic_items_list_theme: './src/front/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js',
         
-        gutenberg_carousel_items_list: './src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js',
+        gutenberg_carousel_items_list: './src/front/gutenberg-blocks/tainacan-items/carousel-items-list/index.js',
-        gutenberg_carousel_items_list_theme: './src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.js',
+        gutenberg_carousel_items_list_theme: './src/front/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.js',
         
-        gutenberg_search_bar: './src/gutenberg-blocks/tainacan-items/search-bar/index.js',
+        gutenberg_search_bar: './src/front/gutenberg-blocks/tainacan-items/search-bar/index.js',
-        gutenberg_search_bar_script: './src/gutenberg-blocks/tainacan-items/search-bar/search-bar-theme-script.js',
+        gutenberg_search_bar_script: './src/front/gutenberg-blocks/tainacan-items/search-bar/search-bar-theme-script.js',
         
-        gutenberg_collections_list: './src/gutenberg-blocks/tainacan-collections/collections-list/index.js',
+        gutenberg_collections_list: './src/front/gutenberg-blocks/tainacan-collections/collections-list/index.js',
         
-        gutenberg_carousel_collections_list: './src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js',
+        gutenberg_carousel_collections_list: './src/front/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js',
-        gutenberg_carousel_collections_list_theme: './src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.js',
+        gutenberg_carousel_collections_list_theme: './src/front/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.js',
         
-        gutenberg_facets_list: './src/gutenberg-blocks/tainacan-facets/facets-list/index.js',
+        gutenberg_facets_list: './src/front/gutenberg-blocks/tainacan-facets/facets-list/index.js',
-        gutenberg_facets_list_theme: './src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js',
+        gutenberg_facets_list_theme: './src/front/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js',
                 
-        gutenberg_carousel_terms_list: './src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js',
+        gutenberg_carousel_terms_list: './src/front/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js',
-        gutenberg_carousel_terms_list_theme: './src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js'
+        gutenberg_carousel_terms_list_theme: './src/front/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js'
 
     },
     output: {