Skip to content
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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 23, 2019
Merged

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

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
c521763
Allow Cachet to be setup not from the server's root
nalysius Jun 8, 2019
67b43ed
Add a missing "asset" call
nalysius Jun 13, 2019
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
56 changes: 28 additions & 28 deletions public/dist/js/all.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/dist/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"/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/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869",
"/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"
}
3 changes: 2 additions & 1 deletion resources/assets/js/cachet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ $(function () {

// Only validate going forward. If current group is invalid, do not go further
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())
.done(function(response) {
goToStep(current, next);
Expand Down
8 changes: 4 additions & 4 deletions resources/views/layout/clean.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@if($enableExternalDependencies)
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> --}}
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')

@include('partials.crowdin')
Expand All @@ -35,8 +35,8 @@
Global.locale = '{{ $appLocale }}';
</script>

<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>

<body class="@yield('bodyClass')">
Expand All @@ -45,5 +45,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>
8 changes: 4 additions & 4 deletions resources/views/layout/dashboard.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')

@include('partials.crowdin')

<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>

<body class="dashboard">
Expand All @@ -61,5 +61,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>
10 changes: 5 additions & 5 deletions resources/views/layout/master.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<meta property="og:type" content="website">
<meta property="og:title" content="@yield('title', $siteTitle)">
<meta property="og:image" content="/img/favicon.png">
<meta property="og:image" content=" {{ asset('/img/favicon.png') }}">
<meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">

<!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
Expand Down Expand Up @@ -48,7 +48,7 @@
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/app.css')) }} ">

@include('partials.stylesheet')

Expand All @@ -74,8 +74,8 @@ function refresh() {

Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="status-page @yield('bodyClass')">
@yield('outer-content')
Expand All @@ -88,5 +88,5 @@ function refresh() {

@yield('bottom-content')
</body>
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>