Merge pull request #3002 from mervekaraman/master

Progress bar not showing on some pages

public/css/app.css

@@ -1543,16 +1543,13 @@ button, input, optgroup, select, textarea{
 .change-log-modal .badge{
   border-radius: 1.5rem;
   --tw-bg-opacity: 1;
-  background-color: rgb(110 161 82 / var(--tw-bg-opacity));
-  padding-left: 0.75rem;
-  padding-right: 0.75rem;
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
-  font-size: 0.75rem;
+  font-size: 1.2rem;
   line-height: 1rem;
-  font-weight: 500;
+  font-weight: 700;
   --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: #6ea152;
 }
 
 .change-log-modal h2{
@@ -1566,38 +1563,46 @@ button, input, optgroup, select, textarea{
 
 .change-log-modal h3{
   margin-bottom: 0.5rem;
+  margin-top: 40px;
   font-size: 1.125rem;
   line-height: 1.75rem;
   font-weight: 700;
   --tw-text-opacity: 1;
-  color: rgb(85 88 139 / var(--tw-text-opacity));
+  color: #55588B;
 }
 
 .change-log-modal ul{
   margin-bottom: 0.5rem;
   list-style-position: inside;
   list-style-type: disc;
+  border: 2px solid #eaeaea;
+  padding: 10px 20px;
+  border-radius: 8px;
+}
+
+.change-log-modal li:last-child {
+  margin-bottom: 13px;
 }
 
 .change-log-modal li{
   font-size: 1rem;
   line-height: 1.5rem;
+  margin-top: 13px;
   --tw-text-opacity: 1;
   color: rgb(85 88 139 / var(--tw-text-opacity));
 }
 
+
 .change-log-modal a{
   --tw-text-opacity: 1;
   color: rgb(110 161 82 / var(--tw-text-opacity));
-  -webkit-text-decoration-line: underline;
-          text-decoration-line: underline;
 }
 
 /* changelog modal styling for update center */
 
 #button-monthly {
-        margin-left: unset !important;
-    }
+  margin-left: unset !important;
+}
 
 /* width of container, custom choose */
 
@@ -62548,6 +62553,11 @@ body{
   background-color: rgb(85 88 139 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-purple-100:hover{
+  --tw-bg-opacity: 1;
+  background-color: rgb(238 238 243 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-purple-700:hover{
   --tw-bg-opacity: 1;
   background-color: rgb(64 66 104 / var(--tw-bg-opacity));
@@ -62577,11 +62587,6 @@ body{
   background-color: rgb(101 99 140 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-purple-100:hover{
-  --tw-bg-opacity: 1;
-  background-color: rgb(238 238 243 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-opacity-100:hover{
   --tw-bg-opacity: 1;
 }
@@ -62662,13 +62667,6 @@ body{
           text-decoration-line: underline;
 }
 
-.hover\:shadow-2xl:hover{
-  --tw-shadow: 0 25px 50px -12px rgb(0 0 0 / 0.25);
-  --tw-shadow-colored: 0 25px 50px -12px var(--tw-shadow-color);
-  -webkit-box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-          box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-}
-
 .focus\:z-10:focus{
   z-index: 10;
 }
@@ -63552,12 +63550,6 @@ body{
           transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-:is([dir="ltr"] .ltr\:items-start){
-  -webkit-box-align: start;
-      -ms-flex-align: start;
-          align-items: flex-start;
-}
-
 :is([dir="ltr"] .ltr\:space-x-2) > :not([hidden]) ~ :not([hidden]){
   --tw-space-x-reverse: 0;
   margin-right: calc(0.5rem * var(--tw-space-x-reverse));
@@ -64581,12 +64573,6 @@ body{
           transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-:is([dir="rtl"] .rtl\:items-end){
-  -webkit-box-align: end;
-      -ms-flex-align: end;
-          align-items: flex-end;
-}
-
 :is([dir="rtl"] .rtl\:space-x-reverse) > :not([hidden]) ~ :not([hidden]){
   --tw-space-x-reverse: 1;
 }

resources/assets/js/bootstrap.js

@@ -19,6 +19,38 @@ window.axios.defaults.headers.common['X-CSRF-TOKEN'] = window.Laravel.csrfToken;
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 window.axios.defaults.headers.common['Content-Type'] = 'multipart/form-data';
 
+
+// #start NProgress integration
+// Added nprogress to use nprogress bar
+import NProgress from "nprogress";
+
+window.axios.interceptors.request.use(function (config) {
+    // Do something before request is sent
+    NProgress.start();
+
+    return config;
+}, function (error) {
+    // Do something with request error
+    console.log(error);
+
+    return Promise.reject(error);
+});
+
+// Add a response interceptor
+window.axios.interceptors.response.use(function (response) {
+    // Do something with response data
+    NProgress.done();
+
+    return response;
+}, function (error) {
+    NProgress.done();
+    // Do something with response error
+    console.log(error);
+
+    return Promise.reject(error);
+});
+// #end NProgress integration
+
 /**
  * Echo exposes an expressive API for subscribing to channels and listening
  * for events that are broadcast by Laravel. Echo and event broadcasting
@@ -33,3 +65,4 @@ window.axios.defaults.headers.common['Content-Type'] = 'multipart/form-data';
 //     broadcaster: 'pusher',
 //     key: 'your-pusher-key'
 // });
+

resources/views/install/updates/index.blade.php

@@ -127,7 +127,7 @@
         </x-index.container>
 
         <akaunting-modal v-if="changelog.show"
-            modal-dialog-class="max-w-screen-xl change-log-modal"
+            modal-dialog-class="max-w-screen-lg change-log-modal"
             :show="changelog.show"
             :title="'{{ trans('updates.changelog') }}'"
             @cancel="changelog.show = false"