Merge pull request #4 from aloware/fix/favicon-removed

Favicon removed
aloware · Apr 1, 2022 · 2ee7025 · 2ee7025
2 parents ac55c9f + c8dd990
commit 2ee7025
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 25 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/img/favicon.png b/public/img/favicon.png
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,5 @@
 {
-    "/app.js": "/app.js?id=53199d4b9ce383c89f58c3321bdd5b2e",
+    "/app.js": "/app.js?id=c611a989f24eb726b5b16760b1519c22",
     "/app-dark.css": "/app-dark.css?id=cd1d3557e4d1ad0ee48178571d428a17",
-    "/app.css": "/app.css?id=764ab48074813350c86491591a7e63b4",
-    "/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f"
+    "/app.css": "/app.css?id=764ab48074813350c86491591a7e63b4"
 }
diff --git a/resources/img/favicon.png b/resources/img/favicon.png
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -25,13 +25,13 @@ Vue.use(VueRouter);
 
 Vue.prototype.$http = axios.create();
 
-window.Horizon.basePath = '/' + window.Horizon.path;
+window.FairQueue.basePath = '/' + window.FairQueue.path;
 
-let routerBasePath = window.Horizon.basePath + '/';
+let routerBasePath = window.FairQueue.basePath + '/';
 
-if (window.Horizon.path === '' || window.Horizon.path === '/') {
+if (window.FairQueue.path === '' || window.FairQueue.path === '/') {
     routerBasePath = '/';
-    window.Horizon.basePath = '';
+    window.FairQueue.basePath = '';
 }
 
 const router = new VueRouter({
@@ -54,7 +54,7 @@ Vue.directive('tooltip', function(el, binding) {
 });
 
 new Vue({
-    el: '#horizon',
+    el: '#fair-queue',
 
     router,
 

diff --git a/resources/js/base.js b/resources/js/base.js
@@ -2,8 +2,8 @@ import moment from 'moment-timezone';
 
 export default {
     computed: {
-        Horizon() {
-            return Horizon;
+        FairQueue() {
+            return FairQueue;
         },
     },
 

diff --git a/resources/js/screens/dashboard.vue b/resources/js/screens/dashboard.vue
@@ -55,7 +55,7 @@
              * Load the general stats.
              */
             loadStats() {
-                return this.$http.get(Horizon.basePath + '/api/stats')
+                return this.$http.get(FairQueue.basePath + '/api/stats')
                     .then(response => {
                         this.stats = response.data;
 
@@ -71,7 +71,7 @@
              * Load the workers stats.
              */
             loadWorkers() {
-                return this.$http.get(Horizon.basePath + '/api/masters')
+                return this.$http.get(FairQueue.basePath + '/api/masters')
                     .then(response => {
                         this.workers = response.data;
                     });
@@ -82,7 +82,7 @@
              * Load the workload stats.
              */
             loadWorkload() {
-                return this.$http.get(Horizon.basePath + '/api/workload')
+                return this.$http.get(FairQueue.basePath + '/api/workload')
                     .then(response => {
                         this.workload = response.data;
                     });

diff --git a/resources/js/screens/metrics/jobs.vue b/resources/js/screens/metrics/jobs.vue
@@ -29,7 +29,7 @@
             loadJobs() {
                 this.ready = false;
 
-                this.$http.get(Horizon.basePath + '/api/metrics/jobs')
+                this.$http.get(FairQueue.basePath + '/api/metrics/jobs')
                     .then(response => {
                         this.jobs = response.data;
 

diff --git a/resources/js/screens/metrics/preview.vue b/resources/js/screens/metrics/preview.vue
@@ -36,7 +36,7 @@
             loadMetric() {
                 this.ready = false;
 
-                this.$http.get(Horizon.basePath + '/api/metrics/' + this.$route.params.type + '/' + encodeURIComponent(this.$route.params.slug))
+                this.$http.get(FairQueue.basePath + '/api/metrics/' + this.$route.params.type + '/' + encodeURIComponent(this.$route.params.slug))
                     .then(response => {
                         let data = this.prepareData(response.data);
 

diff --git a/resources/js/screens/metrics/queues.vue b/resources/js/screens/metrics/queues.vue
@@ -29,7 +29,7 @@
             loadQueues() {
                 this.ready = false;
 
-                this.$http.get(Horizon.basePath + '/api/metrics/queues')
+                this.$http.get(FairQueue.basePath + '/api/metrics/queues')
                     .then(response => {
                         this.queues = response.data;
 

diff --git a/resources/js/screens/queues/index.vue b/resources/js/screens/queues/index.vue
@@ -29,7 +29,7 @@
             loadQueues() {
                 this.ready = false;
 
-                this.$http.get(Horizon.basePath + '/api/monitoring')
+                this.$http.get(FairQueue.basePath + '/api/monitoring')
                     .then(response => {
                         this.queues = response.data;
 

diff --git a/resources/js/screens/queues/queue-partitions.vue b/resources/js/screens/queues/queue-partitions.vue
@@ -59,7 +59,7 @@
                     this.ready = false;
                 }
 
-                this.$http.get(Horizon.basePath + '/api/queues/' + encodeURIComponent(queue) + '/partitions?starting_at='+ starting +'&limit=' + this.perPage)
+                this.$http.get(FairQueue.basePath + '/api/queues/' + encodeURIComponent(queue) + '/partitions?starting_at='+ starting +'&limit=' + this.perPage)
                     .then(response => {
                         if (!this.$root.autoLoadsNewEntries && refreshing && this.partitions.length && _.first(response.data).id !== _.first(this.partitions).id) {
                             this.hasNewEntries = true;

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -5,7 +5,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <link rel="shortcut icon" href="{{ asset('/vendor/fairqueue/img/favicon.png') }}">
 
     <title>FairQueue{{ config('app.name') ? ' - ' . config('app.name') : '' }}</title>
 
@@ -14,7 +13,7 @@
     <link href="{{ asset(mix($cssFile, 'vendor/fairqueue')) }}" rel="stylesheet">
 </head>
 <body>
-<div id="horizon" v-cloak>
+<div id="fair-queue" v-cloak>
     <alert :message="alert.message"
            :type="alert.type"
            :auto-close="alert.autoClose"
@@ -58,9 +57,9 @@
     </div>
 </div>
 
-<!-- Global Horizon Object -->
+<!-- Global FairQueue Object -->
 <script>
-    window.Horizon = @json($horizonScriptVariables);
+    window.FairQueue = @json($fairqueueScriptVariables);
 </script>
 
 <script src="{{asset(mix('app.js', 'vendor/fairqueue'))}}"></script>

diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
@@ -13,7 +13,7 @@ public function index()
     {
         return view('fairqueue::layout', [
             'cssFile' => 'app.css',
-            'horizonScriptVariables' => ['path' => 'fairqueue']
+            'fairqueueScriptVariables' => ['path' => 'fairqueue']
         ]);
     }
 

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -28,7 +28,6 @@ mix.options({
     .sass('resources/sass/app.scss', 'public')
     .sass('resources/sass/app-dark.scss', 'public')
     .version()
-    .copy('resources/img', 'public/img')
     .webpackConfig({
         resolve: {
             symlinks: false,