lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow Cachet to be setup not from the server's root

Browse Source 
The `asset()` helper was missing at some places so it was not possible
to install it in an other place than the server's root (/).

The paths have been fixed and now use the `asset()` helper. Also,
The steps process takes care of the current path.

See: #3618
This commit is contained in:
Anthony Bocci
2019-06-08 15:00:27 +02:00
parent c30b3659fe
commit c5217637e6
7 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/dist/js/all.js
Vendored
+28 -28
View File
File diff suppressed because one or more lines are too long
public/dist/js/app.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/mix-manifest.json
+2 -2
View File
@@ -1,8 +1,8 @@
{ {
"/dist/js/vendor.js": "/dist/js/vendor.js?id=313e4cd2cf600307cb5c", "/dist/js/vendor.js": "/dist/js/vendor.js?id=313e4cd2cf600307cb5c",
"/dist/js/app.js": "/dist/js/app.js?id=be35dd18d92eef9dee9f", "/dist/js/app.js": "/dist/js/app.js?id=7877550e52e1d4e8d66b",
"/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=0d9dfb3411fe9391898f", "/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=0d9dfb3411fe9391898f",
"/dist/css/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869", "/dist/css/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869",
"/dist/js/manifest.js": "/dist/js/manifest.js?id=40dcfff9d09d402daf38", "/dist/js/manifest.js": "/dist/js/manifest.js?id=40dcfff9d09d402daf38",
"/dist/js/all.js": "/dist/js/all.js?id=1350a1cbe301201dbf4b" "/dist/js/all.js": "/dist/js/all.js?id=498db5622a6525cca7e2"
} }
resources/assets/js/cachet.js
+2 -1
View File
@@ -251,7 +251,8 @@ $(function () {
// Only validate going forward. If current group is invalid, do not go further // Only validate going forward. If current group is invalid, do not go further
if (next > current) { if (next > current) {
var url = '/setup/step' + current; var currentUrl = window.location.href.replace(/step\d/, '');
var url = currentUrl + '/step' + current;
$.post(url, $form.serializeObject()) $.post(url, $form.serializeObject())
.done(function(response) { .done(function(response) {
goToStep(current, next); goToStep(current, next);
resources/views/layout/clean.blade.php
+4 -4
View File
@@ -25,7 +25,7 @@
@if($enableExternalDependencies) @if($enableExternalDependencies)
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> --}} {{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> --}}
@endif @endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}"> <link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css') @yield('css')
@include('partials.crowdin') @include('partials.crowdin')
@@ -35,8 +35,8 @@
Global.locale = '{{ $appLocale }}'; Global.locale = '{{ $appLocale }}';
</script> </script>
<script src="{{ mix('dist/js/manifest.js') }}"></script> <script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script> <script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head> </head>
<body class="@yield('bodyClass')"> <body class="@yield('bodyClass')">
@@ -45,5 +45,5 @@
</div> </div>
</body> </body>
@yield('js') @yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script> <script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html> </html>
resources/views/layout/dashboard.blade.php
+4 -4
View File
@@ -31,13 +31,13 @@
@if($enableExternalDependencies) @if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif @endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}"> <link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css') @yield('css')
@include('partials.crowdin') @include('partials.crowdin')
<script src="{{ mix('dist/js/manifest.js') }}"></script> <script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script> <script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head> </head>
<body class="dashboard"> <body class="dashboard">
@@ -61,5 +61,5 @@
</div> </div>
</body> </body>
@yield('js') @yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script> <script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html> </html>
resources/views/layout/master.blade.php
+4 -4
View File
@@ -48,7 +48,7 @@
@if($enableExternalDependencies) @if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif @endif
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}"> <link rel="stylesheet" href="{{ asset(mix('dist/css/app.css')) }} ">
@include('partials.stylesheet') @include('partials.stylesheet')
@@ -74,8 +74,8 @@
Global.locale = '{{ $appLocale }}'; Global.locale = '{{ $appLocale }}';
</script> </script>
<script src="{{ mix('dist/js/manifest.js') }}"></script> <script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script> <script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head> </head>
<body class="status-page @yield('bodyClass')"> <body class="status-page @yield('bodyClass')">
@yield('outer-content') @yield('outer-content')
@@ -88,5 +88,5 @@
@yield('bottom-content') @yield('bottom-content')
</body> </body>
<script src="{{ mix('dist/js/all.js') }}"></script> <script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html> </html>