Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 23:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for canvaskit path

Browse Source
This commit is contained in:
David Bomba 2022-09-02 20:53:32 +10:00
parent 0934925071
commit a963fe1aee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/BaseController.php
View File

@ -900,6 +900,10 @@ class BaseController extends Controller
return redirect('/')->with(['signup' => 'true']); return redirect('/')->with(['signup' => 'true']);
} }
$canvas_path_array = parse_url(config('ninja.app_url'));
$canvas_path = (array_key_exists('path', $canvas_path_array)) ? $canvas_path_array['path'] : '';
$data = []; $data = [];
//pass report errors bool to front end //pass report errors bool to front end
@ -910,6 +914,7 @@ class BaseController extends Controller
$data['build'] = request()->has('build') ? request()->input('build') : ''; $data['build'] = request()->has('build') ? request()->input('build') : '';
$data['login'] = request()->has('login') ? request()->input('login') : 'false'; $data['login'] = request()->has('login') ? request()->input('login') : 'false';
$data['signup'] = request()->has('signup') ? request()->input('signup') : 'false'; $data['signup'] = request()->has('signup') ? request()->input('signup') : 'false';
$data['canvas_path'] = $canvas_path;
if (request()->session()->has('login')) { if (request()->session()->has('login')) {
$data['login'] = 'true'; $data['login'] = 'true';

2
resources/views/index/index.blade.php
View File

@ -21,7 +21,7 @@
</script> </script>
<script> <script>
window.flutterConfiguration = { window.flutterConfiguration = {
canvasKitBaseUrl: "/canvaskit/" canvasKitBaseUrl: "{{ $canvas_path }}/canvaskit/"
}; };
</script> </script>
</head> </head>