Skip to content

Fix global asset routes #1413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zackgalbreath merged 2 commits into from
May 16, 2023
Merged

Fix global asset routes #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12d35b
Fix global asset routes
williamjallen May 8, 2023
48efd3d
Merge branch 'master' into include-routes
williamjallen May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace App\Providers;

use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\ServiceProvider;

Expand All @@ -24,8 +26,10 @@ public function boot()

// Serve content over https in production mode.
if (config('app.env') === 'production') {
\URL::forceScheme('https');
URL::forceScheme('https');
}

URL::forceRootUrl(Config::get('app.url'));
}

/**
Expand Down
20 changes: 10 additions & 10 deletions resources/views/cdash.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

{{-- Framework-specific details --}}
@if(isset($angular) && $angular === true)
<link rel="stylesheet" type="text/css" ng-href="build/css/@{{cssfile}}_{{ $js_version }}.css"/>
<link rel="stylesheet" href="css/bootstrap.min.css"/>
<script src="js/CDash_{{ $js_version }}.min.js"></script>
<link rel="stylesheet" type="text/css" ng-href="{{ asset("build/css") }}/@{{cssfile}}_{{ $js_version }}.css"/>
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}"/>
<script src="{{ asset("js/CDash_$js_version.min.js") }}"></script>
@elseif(isset($vue) && $vue === true)
<link type="text/css" rel="stylesheet" href="{{ asset('css/jquery.dataTables.css') }}"/>
<link rel="stylesheet" type="text/css" href="{{ asset(get_css_file()) }}"/>
Expand All @@ -31,13 +31,13 @@
<script src="{{ asset('js/3rdparty.min.js') }}" type="text/javascript" defer></script>
<script src="{{ asset(mix('laravel/js/app.js')) }}" type="text/javascript" defer></script>
@else
<link rel="stylesheet" type="text/css" href="css/jquery.dataTables.css"/>
<link rel="stylesheet" type="text/css" href="css/cdash.css"/>
<script src="js/CDash_{{ $js_version }}.min.js"></script>
<script src="js/tooltip.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.tablesorter.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.dataTables.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/jquery.metadata.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" href="{{ asset('css/jquery.dataTables.css') }}"/>
<link rel="stylesheet" type="text/css" href="{{ asset('css/cdash.css') }}"/>
<script src="{{ asset("js/CDash_${js_version}.min.js") }}"></script>
<script src="{{ asset('js/tooltip.js') }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ asset('js/jquery.tablesorter.js') }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ asset('js/jquery.dataTables.min.js') }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ asset('js/jquery.metadata.js') }}" type="text/javascript" charset="utf-8"></script>
@endif

@yield('header_script')
Expand Down
Loading