Merge branch 'master' of https://github.com/brkcvn/akaunting into long-tabs

resources/assets/js/components/AkauntingModal.vue

@@ -7,7 +7,7 @@
             tabindex="-1"
             role="dialog"
             :aria-hidden="!show">
-            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
+            <div class="w-full my-10 m-auto flex flex-col px-2 sm:px-0" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
                 <slot name="modal-content">
                     <div class="modal-content">
                         <div class="p-5 bg-body rounded-tl-lg rounded-tr-lg">

resources/assets/js/components/AkauntingModalAddNew.vue

@@ -7,7 +7,7 @@
             tabindex="-1"
             role="dialog"
             :aria-hidden="!show">
-            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
+            <div class="w-full my-10 m-auto flex flex-col px-2 sm:px-0" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
                 <slot name="modal-content">
                     <div class="modal-content">
                         <div class="p-5 bg-body rounded-tl-lg rounded-tr-lg">

resources/assets/js/components/AkauntingRecurring.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="sm:col-span-6 space-y-8 sm:space-y-2">
-        <div class="flex flex-wrap lg:flex-nowrap items-center space-y-3 lg:space-y-0" :class="{ 'justify-between sm:justify-start': frequency == 'custom' }">
-            <div class="w-60 px-2 text-sm">
+    <div class="sm:col-span-6 space-y-6 sm:space-y-2">
+        <div class="flex flex-wrap lg:flex-nowrap items-center space-y-1 lg:space-y-0" :class="{ 'justify-start': frequency == 'custom' }">
+            <div class="w-24 sm:w-60 px-0 sm:px-2 text-sm">
                 {{ frequencyText }}
             </div>
 
@@ -14,7 +14,7 @@
                 </el-option>
             </el-select>
 
-            <div class="w-20 px-2 text-sm text-center" v-if="frequency == 'custom'">
+            <div class="w-20 sm:w-auto px-2 text-sm text-center" v-if="frequency == 'custom'">
                 {{ frequencyEveryText }}
             </div>
 
@@ -30,8 +30,8 @@
             </el-select>
         </div>
 
-        <div class="flex flex-wrap lg:flex-nowrap items-center space-y-3 lg:space-y-0" :class="{ 'justify-between sm:justify-start': limit !== 'never' }">
-            <div class="w-60 px-2 text-sm">
+        <div class="flex flex-wrap lg:flex-nowrap items-center space-y-3 lg:space-y-0" :class="{ 'justify-start': limit !== 'never' }">
+            <div class="w-24 sm:w-60 px-0 sm:px-2 text-sm">
                 {{ startText }}
             </div>
 

resources/assets/js/components/NotificationPlugin/Notification.vue

@@ -2,8 +2,7 @@
   <div
     @click="tryClose"
     data-notify="container"
-    class="alert alert-notify fixed flex items-center justify-between ltr:right-4 rtl:left-4 p-4 text-black font-bold rounded-lg z-30"
-    style="width: 500px;"
+    class="alert alert-notify fixed w-full sm:w-500 flex items-center justify-between ltr:right-0 rtl:left-0 sm:ltr:right-4 sm:rtl:left-4 p-4 text-black font-bold rounded-lg z-30"
     :class="[
       { 'alert-with-icon': icon },
       verticalAlign,

resources/assets/js/views/auth/users.js

@@ -30,6 +30,7 @@ const app = new Vue({
             form: new Form('user'),
             bulk_action: new BulkAction('users'),
             show_password: false,
+            landing_pages: null,
         }
     },
 
@@ -51,5 +52,25 @@ const app = new Vue({
                 this.show_password = false;
             }
         },
+
+        onChangeRole(role_id) {
+            if (! role_id) {
+                return;
+            }
+
+            let role_promise = Promise.resolve(window.axios.get(url + '/auth/users/landingpages', {
+                params: {
+                    role_id: role_id
+                }
+            }));
+
+            role_promise.then(response => {
+                if (response.data.success) {
+                    this.landing_pages = response.data.data;
+                }
+            })
+            .catch(error => {
+            });
+        },
     }
 });

resources/assets/js/views/portal/apps.js

@@ -66,6 +66,33 @@ const app = new Vue({
         if (typeof this.form.password !== 'undefined') {
             this.form.password = '';
         }
+        
+
+        if (document.querySelector('[data-tabs-swiper]').childElementCount > 2) {
+
+            document.querySelectorAll('[data-tabs-slide]').forEach((item) => {
+                item.classList.add('swiper-slide');
+            });
+
+            document.querySelector('[data-tabs-swiper]').classList.add('swiper', 'swiper-links');
+
+            let html = `
+            <div class="swiper-wrapper">
+                ${document.querySelector('[data-tabs-swiper]').innerHTML}
+            </div>
+
+            <div class="swiper-button-next top-3 right-0">
+                <span class="material-icons">chevron_right</span>
+            </div>
+
+            <div class="swiper-button-prev top-3 left-0">
+                <span class="material-icons">chevron_left</span>
+            </div>
+            `; 
+
+            document.querySelector('[data-tabs-swiper]').innerHTML = html; 
+        }
+
 
         new Swiper(".swiper-links", {
             loop: false,

resources/assets/sass/app.css

@@ -191,6 +191,36 @@
         @apply font-normal;
     }
     /* after the upgrade tailwind 3.2.1, this tags font-weight changed. Added this block for now */
+
+    /* changelog modal styling for update center */
+    .change-log-modal .badge {
+        @apply px-3 py-2 rounded-3xl text-xs font-medium bg-green text-white;
+    }
+
+    .change-log-modal h2 {
+        @apply text-2xl font-bold text-purple mb-2;
+    }
+
+    .change-log-modal h3 {
+        @apply text-lg font-bold text-purple mb-2;
+    }
+
+    .change-log-modal ul {
+        @apply list-disc list-inside mb-2;
+    }
+
+    .change-log-modal li {
+        @apply text-base text-purple;
+    }
+
+    .change-log-modal a {
+        @apply text-green underline;
+    }
+    /* changelog modal styling for update center */
+
+    #button-monthly {
+        margin-left: unset !important;
+    }
 }
 
 /* menu */
@@ -454,9 +484,16 @@ html[dir='rtl'] .el-scrollbar__wrap {
     }
     /* apex-chart cash-flow */
     .apex-chart-cash-flow .apexcharts-legend {
-        width: 24rem !important;
+        width: 100% !important;
         justify-content: space-around !important;
         padding: 0;
+        flex-wrap: nowrap !important;
+    }
+
+    .apex-chart-cash-flow .apexcharts-legend-series {
+        width: 8rem;
+        text-align: center;
+        margin: 0 !important;
     }
 
     .apex-chart-cash-flow  .apexcharts-toolbar {
@@ -564,6 +601,17 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
     }
 }
 
+@media only screen and (max-width: 480px) {
+    .dashboard-picker .el-picker-panel__body {
+        width: 100% !important;
+        margin-left: unset !important;
+    }
+
+    .dashboard-picker.el-date-range-picker.el-popper.has-sidebar {
+        width: 100% !important;
+    }
+}
+
 #nprogress .bar {
     background: #A6A8C9 !important;
     height: 5px !important;