From 1b3408d71ef12b2607ed1759a1569e1e3d34d464 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Mon, 13 Nov 2023 15:23:17 -0400 Subject: [PATCH 01/17] Adding Open Launchpad to Process ellipsis --- resources/js/components/shared/ellipsisMenuActions.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/js/components/shared/ellipsisMenuActions.js b/resources/js/components/shared/ellipsisMenuActions.js index db1164f002..519e340871 100644 --- a/resources/js/components/shared/ellipsisMenuActions.js +++ b/resources/js/components/shared/ellipsisMenuActions.js @@ -19,6 +19,14 @@ export default { icon: "fas fa-pause", conditional: "if(has_timer_start_events and not(pause_timer_start), true, false)", }, + { + value: "open-launchpad", + content: "Open Launchpad", + link: true, + href: "/processes/", //TO DO: Add path to Launchpad View when it's ready + permission: ["edit-processes", "create-projects", "view-projects"], + icon: "fas fa-file-export", + }, { value: "edit-designer", content: "Edit Process", From 484fed21d51166a36b0eece0355a7268a2c37d30 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 15 Nov 2023 11:18:46 -0400 Subject: [PATCH 02/17] feature/FOUR-12396 --- .../ProcessesCatalogueController.php | 14 ++++ .../Http/Middleware/GenerateMenus.php | 25 +++----- resources/img/processes-catalogue-empty.svg | 20 ++++++ .../components/ProcessesCatalogue.vue | 44 +++++++++++++ resources/js/processes-catalogue/index.js | 11 ++++ .../views/processes-catalogue/index.blade.php | 64 +++++++++++++++++++ routes/web.php | 4 ++ webpack.mix.js | 2 + 8 files changed, 167 insertions(+), 17 deletions(-) create mode 100644 ProcessMaker/Http/Controllers/ProcessesCatalogueController.php create mode 100644 resources/img/processes-catalogue-empty.svg create mode 100644 resources/js/processes-catalogue/components/ProcessesCatalogue.vue create mode 100644 resources/js/processes-catalogue/index.js create mode 100644 resources/views/processes-catalogue/index.blade.php diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php new file mode 100644 index 0000000000..5ccc9c54e6 --- /dev/null +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -0,0 +1,14 @@ + 'requests.index', 'id' => 'requests'] )->active('requests/*'); }); + $menu->group(['prefix' => 'processes'], function ($request_items) { + $request_items->add( + __('Processes'), + ['route' => 'processes.catalogue.index', 'id' => 'processes-catalogue'] + )->active('processes-catalogue/*'); + }); //@TODO change the index to the correct blade $menu->group(['prefix' => 'tasks'], function ($request_items) { $request_items->add( @@ -109,23 +115,8 @@ public function handle(Request $request, Closure $next) ]); } }); - Menu::make('sidebar_task', function ($menu) { - $submenu = $menu->add(__('Tasks')); - $submenu->add(__('To Do'), [ - 'route' => 'tasks.index', - 'icon' => 'fa-list', - 'id' => 'homeid', - ]); - $submenu->add(__('Completed'), [ - 'route' => ['tasks.index', 'status' => 'CLOSED'], - 'icon' => 'fa-check-square', - 'id' => 'homeid', - ]); - $submenu->add(__('Self Service'), [ - 'route' => ['tasks.index', 'status' => 'SELF_SERVICE'], - 'icon' => 'fa-user', - 'id' => 'homeid', - ]); + Menu::make('sidebar_processes_catalogue', function ($menu) { + $submenu = $menu->add(__('Processes')); }); Menu::make('sidebar_request', function ($menu) { $submenu = $menu->add(__('Request')); diff --git a/resources/img/processes-catalogue-empty.svg b/resources/img/processes-catalogue-empty.svg new file mode 100644 index 0000000000..530c123c48 --- /dev/null +++ b/resources/img/processes-catalogue-empty.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue new file mode 100644 index 0000000000..336b745a03 --- /dev/null +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -0,0 +1,44 @@ + + + + diff --git a/resources/js/processes-catalogue/index.js b/resources/js/processes-catalogue/index.js new file mode 100644 index 0000000000..acbe35c721 --- /dev/null +++ b/resources/js/processes-catalogue/index.js @@ -0,0 +1,11 @@ +import Vue from "vue"; +import ProcessesCatalogue from "./components/ProcessesCatalogue"; + +new Vue({ + el: "#processes-catalogue", + components: { ProcessesCatalogue }, + data: { + }, + methods: { + }, +}); diff --git a/resources/views/processes-catalogue/index.blade.php b/resources/views/processes-catalogue/index.blade.php new file mode 100644 index 0000000000..54b99111b6 --- /dev/null +++ b/resources/views/processes-catalogue/index.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.layout') + +@section('title') + {{__('Processes Catalogue')}} +@endsection + +@section('sidebar') + @include('layouts.sidebar', ['sidebar' => Menu::get('sidebar_processes_catalogue')]) +@endsection + +@section('content') +
+ +
+@endsection + +@section('js') + +@endsection + +@section('css') + +@endsection diff --git a/routes/web.php b/routes/web.php index 3e211549e0..209eb78d92 100644 --- a/routes/web.php +++ b/routes/web.php @@ -27,6 +27,7 @@ use ProcessMaker\Http\Controllers\Process\ScriptController; use ProcessMaker\Http\Controllers\Process\SignalController; use ProcessMaker\Http\Controllers\ProcessController; +use ProcessMaker\Http\Controllers\ProcessesCatalogueController; use ProcessMaker\Http\Controllers\ProfileController; use ProcessMaker\Http\Controllers\RequestController; use ProcessMaker\Http\Controllers\TaskController; @@ -89,6 +90,9 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); + + Route::get('processes-catalogue', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index'); + Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes'); Route::get('processes/{process}/export/{page?}', [ProcessController::class, 'export'])->name('processes.export')->middleware('can:export-processes'); diff --git a/webpack.mix.js b/webpack.mix.js index 5d729dde12..43a83240de 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -116,6 +116,8 @@ mix.js("resources/js/app-layout.js", "public/js") .js("resources/js/processes/translations/import.js", "public/js/processes/translations") + .js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js") + .js("resources/js/tasks/index.js", "public/js/tasks/index.js") .js("resources/js/tasks/mobile.js", "public/js/tasks/mobile.js") .js("resources/js/tasks/show.js", "public/js/tasks/show.js") From 8bd93504d1c0e32af6b0682d89b71411130bc8e2 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker <123644082+luNunezProcessmaker@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:19:18 -0400 Subject: [PATCH 03/17] feature/FOUR-12396 --- .../views/processes-catalogue/index.blade.php | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/resources/views/processes-catalogue/index.blade.php b/resources/views/processes-catalogue/index.blade.php index 54b99111b6..178e2a51d9 100644 --- a/resources/views/processes-catalogue/index.blade.php +++ b/resources/views/processes-catalogue/index.blade.php @@ -17,48 +17,3 @@ @section('js') @endsection - -@section('css') - -@endsection From 1edcb9a7fc2b3efac0ea21ae6fe5f4bd1f1572b6 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 16 Nov 2023 10:18:06 -0400 Subject: [PATCH 04/17] feature/FOUR-12396 --- .../processes-catalogue/components/ProcessesCatalogue.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 336b745a03..b245fe3710 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -13,8 +13,12 @@ alt="recent projects" > -

{{ $t('Currently you dont have processes created') }}

-

{{ $t('We compel you to create new processes using our templates') }}

+

+ {{ $t('Currently you dont have processes created') }} +

+

+ {{ $t('We encourage you to create new processes using our templates') }} +