From 64c35320a1c15eb55d1b9c8accc4f0de9f9ea7da Mon Sep 17 00:00:00 2001 From: Sanja Date: Mon, 20 May 2024 14:09:19 -0700 Subject: [PATCH 1/5] Add UserWay account configurations --- config/services.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/services.php b/config/services.php index f4dd507dc2..47339e0dd7 100644 --- a/config/services.php +++ b/config/services.php @@ -59,4 +59,7 @@ 'template_branch' => env('SCREEN_TEMPLATE_BRANCH', 'spring-2024'), 'template_categories' => env('SCREEN_TEMPLATE_CATEGORIES', 'all'), ], + 'user_way' => [ + 'account_id' => env('USERWAY_ACCOUNT_ID'), + ], ]; From 7eb86a53cf60dfd34d01fbed3f72faef3baff0da Mon Sep 17 00:00:00 2001 From: Sanja Date: Mon, 20 May 2024 14:10:40 -0700 Subject: [PATCH 2/5] Add UserWay accessibility script to .blade.php files --- resources/views/auth/newLogin.blade.php | 3 +++ resources/views/layouts/layout.blade.php | 5 +++++ resources/views/layouts/minimal.blade.php | 3 +++ resources/views/shared/userway.blade.php | 1 + 4 files changed, 12 insertions(+) create mode 100644 resources/views/shared/userway.blade.php diff --git a/resources/views/auth/newLogin.blade.php b/resources/views/auth/newLogin.blade.php index 444241eb11..14f3af97ad 100644 --- a/resources/views/auth/newLogin.blade.php +++ b/resources/views/auth/newLogin.blade.php @@ -10,6 +10,9 @@ {{ __('Login') }} - {{ __('ProcessMaker') }} + @if (hasPackage('package-accessibility')) + @include('shared.userway') + @endif diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php index 1a8c999fbc..3eb3a0afa6 100644 --- a/resources/views/layouts/layout.blade.php +++ b/resources/views/layouts/layout.blade.php @@ -152,6 +152,11 @@ @endif @endforeach @endisset + +@if(hasPackage('package-accessibility')) + @include('shared.userway') +@endif + @yield('js') diff --git a/resources/views/layouts/minimal.blade.php b/resources/views/layouts/minimal.blade.php index 1d59ec8ca5..c7976537dd 100644 --- a/resources/views/layouts/minimal.blade.php +++ b/resources/views/layouts/minimal.blade.php @@ -10,6 +10,9 @@ @yield('title',__('Welcome')) - {{ __('ProcessMaker') }} + @if (hasPackage('package-accessibility')) + @include('shared.userway') + @endif @yield('css') diff --git a/resources/views/shared/userway.blade.php b/resources/views/shared/userway.blade.php new file mode 100644 index 0000000000..7d3da9867a --- /dev/null +++ b/resources/views/shared/userway.blade.php @@ -0,0 +1 @@ + \ No newline at end of file From 2eacaae5764d874db594abb7e233d00cbab57a6a Mon Sep 17 00:00:00 2001 From: Sanja Date: Mon, 20 May 2024 15:35:01 -0700 Subject: [PATCH 3/5] Update userway key name --- config/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services.php b/config/services.php index 47339e0dd7..7cadaf4c05 100644 --- a/config/services.php +++ b/config/services.php @@ -59,7 +59,7 @@ 'template_branch' => env('SCREEN_TEMPLATE_BRANCH', 'spring-2024'), 'template_categories' => env('SCREEN_TEMPLATE_CATEGORIES', 'all'), ], - 'user_way' => [ + 'userway' => [ 'account_id' => env('USERWAY_ACCOUNT_ID'), ], ]; From f1add8f3342b2e13ab12f615f401a6f3f554526a Mon Sep 17 00:00:00 2001 From: Sanja Date: Mon, 20 May 2024 16:13:27 -0700 Subject: [PATCH 4/5] Remove userway.blade.php; Moved to package --- resources/views/shared/userway.blade.php | 1 - 1 file changed, 1 deletion(-) delete mode 100644 resources/views/shared/userway.blade.php diff --git a/resources/views/shared/userway.blade.php b/resources/views/shared/userway.blade.php deleted file mode 100644 index 7d3da9867a..0000000000 --- a/resources/views/shared/userway.blade.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 4b79524d24cb9f7ef626d796b9b9db08cbbc6429 Mon Sep 17 00:00:00 2001 From: Sanja Date: Mon, 20 May 2024 16:13:40 -0700 Subject: [PATCH 5/5] Update userway script reference --- resources/views/auth/newLogin.blade.php | 2 +- resources/views/layouts/layout.blade.php | 4 ++-- resources/views/layouts/minimal.blade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/newLogin.blade.php b/resources/views/auth/newLogin.blade.php index 14f3af97ad..810048407c 100644 --- a/resources/views/auth/newLogin.blade.php +++ b/resources/views/auth/newLogin.blade.php @@ -11,7 +11,7 @@ @if (hasPackage('package-accessibility')) - @include('shared.userway') + @include('package-accessibility::userway') @endif diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php index 3eb3a0afa6..6126eb8f08 100644 --- a/resources/views/layouts/layout.blade.php +++ b/resources/views/layouts/layout.blade.php @@ -153,8 +153,8 @@ @endforeach @endisset -@if(hasPackage('package-accessibility')) - @include('shared.userway') +@if (hasPackage('package-accessibility')) + @include('package-accessibility::userway') @endif diff --git a/resources/views/layouts/minimal.blade.php b/resources/views/layouts/minimal.blade.php index c7976537dd..6197f89405 100644 --- a/resources/views/layouts/minimal.blade.php +++ b/resources/views/layouts/minimal.blade.php @@ -11,7 +11,7 @@ @if (hasPackage('package-accessibility')) - @include('shared.userway') + @include('package-accessibility::userway') @endif @yield('css')