diff --git a/package-lock.json b/package-lock.json index 25d6a6d78..35120dc35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9698,6 +9698,11 @@ "is-plain-obj": "^1.0.0" } }, + "sortablejs": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz", + "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg==" + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", diff --git a/package.json b/package.json index 1c9e5c42c..fc913723a 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "npm-font-open-sans": "^1.1.0", "popper.js": "^1.12", "promise-polyfill": "8.1.3", + "sortablejs": "^1.13.0", "uiv": "^0.28.0", "vue": "^2.6.12", "vue-awesome-swiper": "^3.1.3", @@ -55,6 +56,7 @@ "vue-split-panel": "^1.0.4", "vue-tables-2": "^2.1.46", "vue-upload-component": "^2.8.20", + "vuedraggable": "^2.24.3", "vuejs-auto-complete": "^0.9.0", "vuejs-datepicker": "^1.5.4", "vuejs-paginate": "^2.0.1", diff --git a/resources/assets/js/components/menu/CustomSidebar.vue b/resources/assets/js/components/menu/CustomSidebar.vue index 3e9ea43eb..5ede3fe14 100644 --- a/resources/assets/js/components/menu/CustomSidebar.vue +++ b/resources/assets/js/components/menu/CustomSidebar.vue @@ -21,9 +21,11 @@ diff --git a/resources/assets/js/components/menu/CustomSidebarMenuIcon.vue b/resources/assets/js/components/menu/CustomSidebarMenuIcon.vue new file mode 100644 index 000000000..23e4638a5 --- /dev/null +++ b/resources/assets/js/components/menu/CustomSidebarMenuIcon.vue @@ -0,0 +1,26 @@ + + + {{ icon.text }} + + + + diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue new file mode 100644 index 000000000..ecd34f17d --- /dev/null +++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue @@ -0,0 +1,497 @@ + + + + {{ item.title }} + + + + + + + + {{ item.title }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ element.title }} + + + + + + + + Cancel + + + + + + + + diff --git a/resources/assets/js/components/menu/CustomSidebarMenuLink.vue b/resources/assets/js/components/menu/CustomSidebarMenuLink.vue new file mode 100644 index 000000000..d4590580c --- /dev/null +++ b/resources/assets/js/components/menu/CustomSidebarMenuLink.vue @@ -0,0 +1,42 @@ + + + + + + + diff --git a/resources/assets/js/home/main.js b/resources/assets/js/home/main.js index a03029bde..6e5fdcdbb 100644 --- a/resources/assets/js/home/main.js +++ b/resources/assets/js/home/main.js @@ -4,6 +4,7 @@ import VueSidebarMenu from "vue-sidebar-menu"; import VueI18n from 'vue-i18n'; import { BootstrapVue, BootstrapVueIcons } from 'bootstrap-vue'; import { ServerTable, Event, ClientTable} from 'vue-tables-2'; +import Sortable from 'sortablejs'; import "@fortawesome/fontawesome-free/css/all.css"; import "@fortawesome/fontawesome-free/js/all.js"; import 'bootstrap/dist/css/bootstrap-grid.css'; @@ -16,6 +17,7 @@ Vue.use(VueSidebarMenu); Vue.use(BootstrapVue); Vue.use(BootstrapVueIcons); Vue.use(VueI18n); + Vue.use(ServerTable, {}, false, 'bootstrap3', {}); Vue.use(ClientTable, {}, false, 'bootstrap3', {}); window.ProcessMaker = { diff --git a/workflow/engine/methods/authenticationSources/package-lock.json b/workflow/engine/methods/authenticationSources/package-lock.json index 63b3afedf..2b95ed09f 100644 --- a/workflow/engine/methods/authenticationSources/package-lock.json +++ b/workflow/engine/methods/authenticationSources/package-lock.json @@ -16273,7 +16273,7 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader@16.1.1", + "version": "16.1.1", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz", "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==", "dev": true, diff --git a/workflow/engine/methods/userExtendedAttributes/package-lock.json b/workflow/engine/methods/userExtendedAttributes/package-lock.json index f95dc017f..84d1f17c7 100644 --- a/workflow/engine/methods/userExtendedAttributes/package-lock.json +++ b/workflow/engine/methods/userExtendedAttributes/package-lock.json @@ -16273,7 +16273,7 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader@16.1.1", + "version": "16.1.1", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz", "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==", "dev": true, diff --git a/workflow/engine/methods/userPersonalInformation/package-lock.json b/workflow/engine/methods/userPersonalInformation/package-lock.json index 62937fa14..ab6b9d916 100644 --- a/workflow/engine/methods/userPersonalInformation/package-lock.json +++ b/workflow/engine/methods/userPersonalInformation/package-lock.json @@ -16273,7 +16273,7 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader@16.1.1", + "version": "16.1.1", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz", "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==", "dev": true,