diff --git a/resources/js/admin/auth-clients/index.js b/resources/js/admin/auth-clients/index.js index aaf7f83cf1..118b786fa0 100644 --- a/resources/js/admin/auth-clients/index.js +++ b/resources/js/admin/auth-clients/index.js @@ -1,4 +1,113 @@ import Vue from "vue"; -import AuthClientsListing from "./components/AuthClientsListing"; +import AuthClientsListing from "./components/AuthClientsListing.vue"; Vue.component("AuthClientsListing", AuthClientsListing); + +new Vue({ + el: "#authClients", + data: { + authClient: { + id: null, + name: "", + types: [], + redirect: "", + secret: "", + }, + filter: "", + errors: null, + disabled: false, + title: "", + secretTitle: "", + customModalButtons: [], + secret: "", + }, + beforeMount() { + this.initCustomModalButtons(); + this.resetValues(); + }, + methods: { + onClose() { + this.resetValues(); + }, + onSave() { + if (this.disabled) { + return; + } + this.disabled = true; + + this.loading = true; + let method = "POST"; + let url = "/oauth/clients"; + let verb = "created"; + if (this.authClient.id) { + method = "PUT"; + url = `${url}/${this.authClient.id}`; + verb = "saved"; + } + ProcessMaker.apiClient({ + method, + url, + baseURL: "/", + data: this.authClient, + }).then((response) => { + this.$refs.createEditAuthClient.hide(); + this.loading = false; + if (response.data.secret) { + this.secret = response.data.secret; + this.$refs.secretModal.show(); + } else { + this.$refs.authClientList.fetch(); + } + ProcessMaker.alert(`${this.$t("The auth client was ")}${verb}.`, this.$t("success")); + }).catch((error) => { + this.disabled = false; + this.errors = error.response.data.errors; + }); + }, + resetValues() { + this.title = this.$t("Create Auth-Client"); + this.secretTitle = this.$t("Copy Secret To Clipboard"); + this.authClient = { + id: null, + name: "", + types: [], + redirect: "", + secret: "", + }; + this.errors = { + name: null, + redirect: null, + types: null, + }; + this.disabled = false; + this.initCustomModalButtons(); + }, + edit(item) { + this.title = this.$t("Edit Auth Client"); + this.authClient = item; + this.$refs.createEditAuthClient.show(); + }, + initCustomModalButtons() { + this.customModalButtons = [ + { + content: "Close", + action: "close", + variant: "secondary", + disabled: false, + hidden: false, + }, + ]; + }, + hideSecretModal() { + this.$refs.secretModal.hide(); + this.$refs.authClientList.fetch(); + }, + copySecret(secret) { + navigator.clipboard.writeText(secret).then(() => { + ProcessMaker.alert(this.$t("Secret copied to clipboard."), "success"); + }, () => { + ProcessMaker.alert(this.$t("Secret not copied to clipboard."), "danger"); + }); + }, + }, +}); diff --git a/resources/js/admin/auth-clients/loaderAuthClients.js b/resources/js/admin/auth-clients/loaderAuthClients.js new file mode 100644 index 0000000000..f860598640 --- /dev/null +++ b/resources/js/admin/auth-clients/loaderAuthClients.js @@ -0,0 +1,6 @@ +import { setupMain } from "../../next/setupMain"; + +setupMain(); + +window.ProcessMaker.packages = window.temporal?.packages || []; +window.packages = window.ProcessMaker.packages; diff --git a/resources/js/admin/cssOverride/components/ColorPicker.vue b/resources/js/admin/cssOverride/components/ColorPicker.vue index e316dedcc9..5914743858 100644 --- a/resources/js/admin/cssOverride/components/ColorPicker.vue +++ b/resources/js/admin/cssOverride/components/ColorPicker.vue @@ -10,8 +10,8 @@ import {Sketch} from 'vue-color'; import { createUniqIdsMixin } from "vue-uniq-ids"; + import tinycolor from 'tinycolor2'; const uniqIdsMixin = createUniqIdsMixin(); - const tinycolor = require("tinycolor2"); export default { components: { diff --git a/resources/js/admin/cssOverride/components/SiteDesign.vue b/resources/js/admin/cssOverride/components/SiteDesign.vue index 4357c79cf8..a67dcf62ab 100644 --- a/resources/js/admin/cssOverride/components/SiteDesign.vue +++ b/resources/js/admin/cssOverride/components/SiteDesign.vue @@ -193,6 +193,9 @@ - + @vite(['resources/js/admin/auth-clients/loaderAuthClients.js']) + @vite(['resources/js/admin/auth-clients/index.js']) @endsection diff --git a/resources/views/admin/cases-retention/index.blade.php b/resources/views/admin/cases-retention/index.blade.php index cea7ad691d..c3539bcb43 100644 --- a/resources/views/admin/cases-retention/index.blade.php +++ b/resources/views/admin/cases-retention/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Cases Retention')}} @@ -15,6 +15,7 @@ ]]) @endsection @section('content') + @vite(['resources/js/admin/loaderAdmin.js'])
@@ -61,7 +62,12 @@ class="btn btn-primary download-retention-logs text-nowrap" @section('js') - + + @vite(['resources/js/admin/cases-retention/index.js']) @endsection @section('css') diff --git a/resources/views/admin/cssOverride/edit.blade.php b/resources/views/admin/cssOverride/edit.blade.php index 77d1bef50e..1305f9321a 100644 --- a/resources/views/admin/cssOverride/edit.blade.php +++ b/resources/views/admin/cssOverride/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{ __('Customize UI') }} @@ -35,79 +35,88 @@ @endsection @section('js') - + @vite(['resources/js/admin/cssOverride/loaderCssOverride.js']) + @vite(['resources/js/admin/cssOverride/edit.js']) + @@ -134,4 +143,3 @@ } @endsection - diff --git a/resources/views/admin/devlink/index.blade.php b/resources/views/admin/devlink/index.blade.php index 8f428119c3..66e4b6c18e 100644 --- a/resources/views/admin/devlink/index.blade.php +++ b/resources/views/admin/devlink/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('DevLink')}} @@ -15,6 +15,7 @@ ]]) @endsection @section('content') + @vite(['resources/js/admin/loaderAdmin.js']) @@ -22,5 +23,10 @@ @section('js') - + + @vite(['resources/js/admin/devlink/index.js']) @endsection diff --git a/resources/views/admin/groups/edit.blade.php b/resources/views/admin/groups/edit.blade.php index 2bf2b9cecb..78e81928d9 100644 --- a/resources/views/admin/groups/edit.blade.php +++ b/resources/views/admin/groups/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Edit Group')}} @@ -230,11 +230,18 @@ class="multiselect__tag-icon"> @endsection @section('js') - + @vite(['resources/js/admin/groups/loaderGroups.js']) + @vite(['resources/js/admin/groups/edit.js']) + @endsection diff --git a/resources/views/admin/groups/index.blade.php b/resources/views/admin/groups/index.blade.php index 227a1b1741..9b38c95f4d 100644 --- a/resources/views/admin/groups/index.blade.php +++ b/resources/views/admin/groups/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Groups')}} @@ -63,76 +63,11 @@ class="form-text text-muted">{{__('Group name must be unique')}} @endsection @section('js') - + @vite(['resources/js/admin/groups/loaderGroups.js']) + @vite(['resources/js/admin/groups/index.js']) @endsection diff --git a/resources/views/admin/logs/index.blade.php b/resources/views/admin/logs/index.blade.php index 9a7ca90a61..8a00f2066e 100644 --- a/resources/views/admin/logs/index.blade.php +++ b/resources/views/admin/logs/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Logs')}} @@ -21,8 +21,12 @@ @section('js') - + @vite(['resources/js/admin/loaderAdmin.js']) + @vite(['resources/js/admin/logs/index.js']) @endsection diff --git a/resources/views/admin/queues/index.blade.php b/resources/views/admin/queues/index.blade.php index 6e64ff7df6..cef4184ac6 100644 --- a/resources/views/admin/queues/index.blade.php +++ b/resources/views/admin/queues/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Queue Management')}} @@ -16,6 +16,7 @@ @endsection @section('content') + @vite(['resources/js/admin/users/loaderUsers.js']) @endsection diff --git a/resources/views/admin/script-executors/index.blade.php b/resources/views/admin/script-executors/index.blade.php index cb3146fabe..2cf21ad947 100644 --- a/resources/views/admin/script-executors/index.blade.php +++ b/resources/views/admin/script-executors/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{ __('Script Executors') }} @@ -15,6 +15,7 @@ ]]) @endsection @section('content') + @vite(['resources/js/admin/loaderAdmin.js'])
+ + @vite(['resources/js/admin/script-executors/index.js']) @endsection diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php index d224fe9634..8bc5cd57a6 100644 --- a/resources/views/admin/settings/index.blade.php +++ b/resources/views/admin/settings/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Settings')}} @@ -26,20 +26,31 @@ @endsection @section('js') + + @vite(['resources/js/admin/settings/loaderSettings.js']) + @if (hasPackage('package-email-start-event')) @endif - + @vite(['resources/js/admin/settings/index.js']) @if($errors->has('error')) @endif @if($errors->has('message')) @endif @endsection diff --git a/resources/views/admin/settings/ldap-logs.blade.php b/resources/views/admin/settings/ldap-logs.blade.php index 3efd5dd5d1..d3b446b499 100644 --- a/resources/views/admin/settings/ldap-logs.blade.php +++ b/resources/views/admin/settings/ldap-logs.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite') @section('title') {{__('Ldap Logs')}} @@ -16,6 +16,7 @@ ]]) @endsection @section('content') + @vite(['resources/js/admin/users/loaderUsers.js'])
@section('js') - + @vite(['resources/js/processes/categories/index.js']) @append @endif @section('css') diff --git a/resources/views/layouts/layoutnextvite.blade.php b/resources/views/layouts/layoutnextvite.blade.php index 1e5984ecb0..5c361d077f 100644 --- a/resources/views/layouts/layoutnextvite.blade.php +++ b/resources/views/layouts/layoutnextvite.blade.php @@ -144,7 +144,7 @@ class="main flex-grow-1 h-100 @isset($addons) @foreach ($addons as $addon) @if (!empty($addon['script_mix'])) - + @endif @if (!empty($addon['script_mix_module'])) diff --git a/resources/views/processes-catalogue/index.blade.php b/resources/views/processes-catalogue/index.blade.php index ca34bff986..4f9707ff78 100644 --- a/resources/views/processes-catalogue/index.blade.php +++ b/resources/views/processes-catalogue/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout') +@extends('layouts.layoutnextvite', ['content_margin' => '', 'overflow-auto' => '']) @section('title') {{__('Processes Catalogue')}} @@ -25,22 +25,26 @@ @endsection @section('js') + {{-- temporal must exist before loader (Vite modules run after deferred classic scripts) --}} + @vite(['resources/js/processes-catalogue/loaderProcessesCatalogue.js']) @foreach($manager->getScripts() as $script) - + @endforeach - - + @vite(['resources/js/processes-catalogue/processesCatalogue.js']) @endsection diff --git a/resources/views/processes/archivedList.blade.php b/resources/views/processes/archivedList.blade.php index 822354704d..302886252d 100644 --- a/resources/views/processes/archivedList.blade.php +++ b/resources/views/processes/archivedList.blade.php @@ -30,5 +30,5 @@
@section('js') - + @vite(['resources/js/processes/archived.js']) @append diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php index 1161508184..f0ef66dd20 100644 --- a/resources/views/processes/edit.blade.php +++ b/resources/views/processes/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.layout', ['title' => __('Processes Management')]) +@extends('layouts.layoutnextvite', ['title' => __('Processes Management')]) @section('title') {{__('Configure Process')}} @@ -240,7 +240,7 @@ class="invalid-feedback" label="title" > - @{{ __(noElementsFoundMsg) }} + @{{ noElementsFoundMsg }}