From 6ff3745adfee5e61fd4a60aa96aaa952addaca91 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 6 Apr 2023 16:19:33 -0700 Subject: [PATCH 1/2] Added BM JS Signed-off-by: snipe --- config/services.php | 8 +- resources/views/layouts/default.blade.php | 1814 +++++++++++---------- resources/views/partials/bpay.blade.php | 14 + 3 files changed, 951 insertions(+), 885 deletions(-) create mode 100644 resources/views/partials/bpay.blade.php diff --git a/config/services.php b/config/services.php index 3f7362fd51..de8c4ed71a 100644 --- a/config/services.php +++ b/config/services.php @@ -43,10 +43,10 @@ return [ 'secret' => env('STRIPE_SECRET'), ], - 'stunning' => [ - 'enabled' => env('ENABLE_STUNNING', false), - 'app_key' => env('STUNNING_APP_KEY'), - 'stripe_id' => env('STUNNING_STRIPE_ID'), + 'baremetrics' => [ + 'enabled' => env('ENABLE_BMPAY', false), + 'app_key' => env('BMPAY_PUBLIC_KEY', null), + 'stripe_id' => env('BMPAY_STRIPE_ID', null), ], 'google' => [ diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 84792ec0c8..37554e6a83 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -1,30 +1,32 @@ - + - @section('title') - @show - :: {{ $snipeSettings->site_name }} + @section('title') + @show + :: {{ $snipeSettings->site_name }} - + - - - - + + + - - + + {{-- stylesheets --}} @@ -32,7 +34,8 @@ @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '') @else - + @endif {{-- page level css --}} @stack('css') @@ -40,932 +43,981 @@ @if (($snipeSettings) && ($snipeSettings->header_color!='')) - + .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li:hover > a, .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li.active > a { + border-left-color: {{ $snipeSettings->header_color }}; + } + + .btn-primary { + background-color: {{ $snipeSettings->header_color }}; + border-color: {{ $snipeSettings->header_color }}; + } + @endif {{-- Custom CSS --}} @if (($snipeSettings) && ($snipeSettings->custom_css)) - + @endif - - + + @livewireStyles - + - @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '') - - @else - - @endif - - {{ trans('general.skip_to_main_content') }} -
- -
- - - - - - - - {{ trans('general.toggle_navigation') }} - - - -
- - - - - - -
- - @if ($debug_in_production) -
-
- {{ strtoupper(trans('general.debug_warning')) }}: - {!! trans('general.debug_warning_text') !!} -
-
- @endif - - -
-

@yield('title')

- - @if (isset($helpText)) - @include ('partials.more-info', - [ - 'helpText' => $helpText, - 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' - ]) - @endif -
- @yield('header_right') -
- - - -
- - -
- - -
- @if (config('app.lock_passwords')) -
-
- {{ trans('general.some_features_disabled') }} -
-
- @endif - - @include('notifications') -
- - - -
- @yield('content') -
- -
- -
- -
- - - @if ($snipeSettings->footer_text!='') -
- {!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!} -
- @endif - + {{ trans('general.skip_to_main_content') }} +
- Snipe-IT is open source software, made with love by @snipeitapp. -
+
+ + + + + +
+ + + {{ trans('general.toggle_navigation') }} + + + + + + + + + + +
+ + + @if ($debug_in_production) +
+
+ + {{ strtoupper(trans('general.debug_warning')) }}: + {!! trans('general.debug_warning_text') !!} +
+
+ @endif + + +
+

@yield('title')

+ + @if (isset($helpText)) + @include ('partials.more-info', + [ + 'helpText' => $helpText, + 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' + ]) + @endif +
+ @yield('header_right') +
+ + +
+ + +
+ + +
+ @if (config('app.lock_passwords')) +
+
+ {{ trans('general.some_features_disabled') }} +
+
+ @endif + + @include('notifications') +
+ + + +
+ @yield('content') +
+ +
+ +
+ +
+ +
+ + + + + + + + - -