fix custom route when we are in subdirectory

Dionera#13
spyp · Aug 28, 2018 · ddf1553 · ddf1553
1 parent c001762
commit ddf1553
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/Controllers/TubesController.php b/src/Controllers/TubesController.php
@@ -35,7 +35,6 @@ public function __construct(PheanstalkInterface $pheanstalk, JobRepository $jobs
     public function index()
     {
         $tubeNames = collect($this->pheanstalk->listTubes());
-
         // Adam Wathan give me your strength!
         $tubes = collect($tubeNames)->map(function ($tube) {
             return collect($this->pheanstalk->statsTube($tube))->slice(1)->all();
@@ -58,7 +57,7 @@ public function showTube($tube)
         $nextReady = $this->jobs->nextReady($tube, true);
         $nextBuried = $this->jobs->nextBuried($tube);
         $nextDelayed = $this->jobs->nextDelayed($tube, true);
-        $prefix = config('beanstalkdui.prefix');
+        $prefix = url()->to('/'.config('beanstalkdui.prefix'));
 
         return view('beanstalkdui::tubes.show', compact(
             'nextReady',

diff --git a/src/Resources/assets/js/app.js b/src/Resources/assets/js/app.js
@@ -29,9 +29,7 @@ new Vue({
 
     methods: {
         prefixUrl: function (url){
-            return this.prefix.length > 0
-                ? '/' + this.prefix + url
-                : url
+            return this.prefix + url;
         },
         fetchData: function () {
             $.get(this.prefixUrl('/beanstalkd/api/tubes/' + this.tube), function (response) {

diff --git a/src/Resources/assets/js/failed-jobs-table.js b/src/Resources/assets/js/failed-jobs-table.js
@@ -18,9 +18,7 @@ new Vue({
 
     methods: {
         prefixUrl: function (url){
-            return this.prefix.length > 0
-                ? '/' + this.prefix + url
-                : url
+            return this.prefix + url;
         },
         refresh: function (notify) {
             $.get(this.prefixUrl('/beanstalkd/api/tubes/' + this.tube + '/failed'), function (response) {