Merge pull request #3646 from anthonybocci/feature/3618-setup-path-2.4

Allow Cachet to be setup not from the server's root
cachethq · Jun 23, 2019 · 76e9f41 · 76e9f41
2 parents 4f205e0 + 67b43ed
commit 76e9f41
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 45 deletions.
diff --git a/public/dist/js/all.js b/public/dist/js/all.js
diff --git a/public/dist/js/app.js b/public/dist/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -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"
 }
diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js
@@ -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);

diff --git a/resources/views/layout/clean.blade.php b/resources/views/layout/clean.blade.php
@@ -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')
@@ -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')">
@@ -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>
diff --git a/resources/views/layout/dashboard.blade.php b/resources/views/layout/dashboard.blade.php
@@ -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">
@@ -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>
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
@@ -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 -->
@@ -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')
 
@@ -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')
@@ -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>