shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Burak Civan
2022-11-07 15:04:35 +03:00
parent 1ceb74ca3a 95bb91dcf5
commit 731aa44608
191 changed files with 7341 additions and 4686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/AkauntingModal.vue
View File

@ -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">

2
resources/assets/js/components/AkauntingModalAddNew.vue
View File

@ -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">

12
resources/assets/js/components/AkauntingRecurring.vue
View File

@ -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>

3
resources/assets/js/components/NotificationPlugin/Notification.vue
View File

@ -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,

21
resources/assets/js/views/auth/users.js vendored
View File

@ -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 => {
});
},
}
});

27
resources/assets/js/views/portal/apps.js vendored
View File

@ -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,