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 form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-28 16:46:57 +03:00
parent 668300ddb8 239b4d6276
commit 2e6aaa8f10
54 changed files with 12529 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/components/layouts/admin/menu.blade.php
View File

@ -113,9 +113,9 @@
<div class="flex ltr:ml-2 rtl:mr-2">
<span class="w-28 text-left block text-base truncate">
<span class="border-b border-transparent transition-all hover:border-black">
<x-link.hover>
{{ Str::limit(setting('company.name'), 22) }}
</span>
</x-link.hover>
</span>
@can('read-common-companies')
@ -222,7 +222,7 @@
<span class="material-icons text-lg text-purple transform ltr:rotate-90 rtl:-rotate-90">expand_circle_down</span>
</button>
<span data-menu-close id="menu-cancel" class="material-icons absolute ltr:-right-2 rtl:right-12 top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<span data-menu-close id="menu-cancel" class="material-icons absolute ltr:-right-2 rtl:right-12 transition-all top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<div class="fixed w-full h-full invisible lg:hidden js-menu-background" style="background-color: rgba(0, 0, 0, 0.5); z-index: -1;"></div>
</div>

37
resources/views/components/layouts/admin/scripts.blade.php
View File

@ -58,6 +58,7 @@
function contentTransitionLeft() {
sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
toggleButton.querySelector("span").classList.add("ltr:-rotate-90", "rtl:rotate-90");
}
@ -65,16 +66,19 @@
function contentTransitionRight() {
sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
toggleButton.querySelector("span").classList.remove("ltr:-rotate-90", "rtl:rotate-90");
}
function hiddenSidebar() {
sideBar.classList.add("menu-list-hidden");
toggleButton.classList.add("ltr:left-12", "rtl:right-12");
}
function unHiddenSidebar() {
toggleButton.classList.remove("ltr:left-12", "rtl:right-12");
sideBar.classList.remove("menu-list-hidden");
}
@ -147,14 +151,26 @@
menu.classList.remove("ltr:-left-80", "rtl:-right-80");
menu.classList.add("ltr:left-14", "rtl:right-14");
mainContent.classList.add("hidden");
toggleButton.classList.add("invisible");
menuClose.classList.remove("hidden");
unHiddenSidebar();
contentTransitionRight();
notificationCount("none");
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
menuClose.classList.add("ltr:-right-57", "rtl:right-59");
menuClose.classList.remove("ltr:-right-2", "rtl:right-12");
} else {
menuClose.classList.add("ltr:-right-2", "rtl:right-12");
}
sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
//for hidden menu, show close icon scenario
if (menuRef === "notifications-menu") {
notificationCount("none");
}
//remove active (cancel text) class form target icon
} else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") {
@ -163,6 +179,7 @@
menu.classList.add("ltr:-left-80", "rtl:-right-80");
menu.classList.remove("ltr:left-14", "rtl:right-14");
mainContent.classList.remove("hidden");
toggleButton.classList.remove("invisible");
menuClose.classList.add("hidden");
@ -178,11 +195,21 @@
menuClose.addEventListener("click", function() {
menu.classList.add("ltr:-left-80", "rtl:-right-80");
menu.classList.remove("ltr:left-14", "rtl:right-14");
iconButton.children[0].textContent = icon;
iconButton.children[0].classList.remove("active");
mainContent.classList.remove("hidden");
this.classList.add("hidden");
toggleButton.classList.remove("invisible");
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
}
//for hidden menu, show close icon scenario
});
});
}
@ -201,6 +228,7 @@
profile_icon_html.children[0].classList.remove("hidden");
profile_icon_html.children[1].classList.add("hidden");
toggleButton.classList.add("invisible");
}
@ -214,6 +242,7 @@
settings_icon_html.children[0].textContent = "cancel";
settings_icon_html.children[0].classList.add("active");
toggleButton.classList.add("invisible");
}
}

20
resources/views/components/layouts/modules/bar.blade.php
View File

@ -14,9 +14,9 @@
<div class="grid grid-cols-2 gap-2">
@foreach ($categories as $slug => $category)
<x-link href="{{ $categoryUrl($slug) }}" class="font-semibold text-sm ltr:pr-4 rtl:pl-4 lg:pr-0 truncate bg-transparent" override="class">
<span class="border-b border-transparent transition-all hover:border-black">
<x-link.hover>
{{ $category }}
</span>
</x-link.hover>
</x-link>
@endforeach
</div>
@ -80,27 +80,27 @@
<div class="flex flex-row items-end lg:items-center mb-1 divide-x divide-black-400">
<x-link href="{{ route('apps.home.index') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
<span class="border-b border-transparent transition-all hover:border-black-400">
<x-link.hover color="to-black-400">
{{ trans('modules.home') }}
</span>
</x-link.hover>
</x-link>
<x-link href="{{ route('apps.new') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
<span class="border-b border-transparent transition-all hover:border-black-400">
<x-link.hover color="to-black-400">
{{ trans('modules.new') }}
</span>
</x-link.hover>
</x-link>
<x-link href="{{ route('apps.paid') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
<span class="border-b border-transparent transition-all hover:border-black-400">
<x-link.hover color="to-black-400">
{{ trans('modules.top_paid') }}
</span>
</x-link.hover>
</x-link>
<x-link href="{{ route('apps.free') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
<span class="border-b border-transparent transition-all hover:border-black-400">
<x-link.hover color="to-black-400">
{{ trans('modules.top_free') }}
</span>
</x-link.hover>
</x-link>
</div>
</div>

82
resources/views/components/layouts/modules/show/buttons.blade.php
View File

@ -1,34 +1,49 @@
@props(['module', 'installed', 'enable'])
@if (! empty($module->plan))
<a href="{{ $module->action_url }}" class="relative bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate" target="_blank">
<x-link.loading>
{{ trans('modules.get_premium_cloud') }}
</x-link.loading>
</a>
<x-link
href="{{ $module->action_url }}"
target="_blank"
class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
override="class"
>
{{ trans('modules.get_premium_cloud') }}
</x-link>
@elseif (in_array('onprime', $module->where_to_use))
@if ($installed)
@can('delete-modules-item')
<a href="{{ route('apps.app.uninstall', $module->slug) }}" class="relative bg-red text-white rounded-md text-sm text-center w-1/2 py-2 truncate">
<x-link.loading>
<x-link
href="{{ route('apps.app.uninstall', $module->slug) }}"
class="bg-red rounded-md text-white text-sm text-center w-1/2 py-2 truncate"
override="class"
>
<x-link.loading>
{{ trans('modules.button.uninstall') }}
</x-link.loading>
</a>
</x-link>
@endcan
@can('update-modules-item')
@if ($enable)
<a href="{{ route('apps.app.disable', $module->slug) }}" class="relative bg-orange rounded-md text-white w-1/2 text-center text-sm py-2 truncate">
<x-link.loading>
<x-link
href="{{ route('apps.app.disable', $module->slug) }}"
class="bg-orange rounded-md text-white text-sm text-center w-1/2 py-2 truncate"
override="class"
>
<x-link.loading>
{{ trans('modules.button.disable') }}
</x-link.loading>
</a>
</x-link>
@else
<a href="{{ route('apps.app.enable', $module->slug) }}" class="relative bg-green rounded-md text-white text-sm text-center w-1/2 py-2 truncate">
<x-link.loading>
<x-link
href="{{ route('apps.app.enable', $module->slug) }}"
class="bg-green rounded-md text-white text-sm text-center w-1/2 py-2 truncate"
override="class"
>
<x-link.loading>
{{ trans('modules.button.enable') }}
</x-link.loading>
</a>
</x-link>
@endif
@endcan
@else
@ -53,26 +68,35 @@
</button>
@endif
@else
<a href="{{ $module->action_url }}" class="relative bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate" target="_blank">
<x-link.loading>
{{ trans('modules.use_app') }}
</x-link.loading>
</a>
<x-link
href="{{ $module->action_url }}"
target="_blank"
class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
override="class"
>
{{ trans('modules.use_app') }}
</x-link>
@endif
@endcan
@endif
@else
@if ($module->install)
<a href="{{ $module->action_url }}" class="relative bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate" target="_blank">
<x-link.loading>
{{ trans('modules.install_cloud') }}
</x-link.loading>
</a>
<x-link
href="{{ $module->action_url }}"
target="_blank"
class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
override="class"
>
{{ trans('modules.install_cloud') }}
</x-link>
@else
<a href="{{ $module->action_url }}" class="relative bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate" target="_blank">
<x-link.loading>
{{ trans('modules.get_cloud') }}
</x-link.loading>
</a>
<x-link
href="{{ $module->action_url }}"
target="_blank"
class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
override="class"
>
{{ trans('modules.get_cloud') }}
</x-link>
@endif
@endif

6
resources/views/components/layouts/portal/menu.blade.php
View File

@ -84,9 +84,9 @@
<div class="flex ltr:ml-2 rtl:mr-2">
<span class="w-28 text-left block text-base truncate">
<span class="border-b border-transparent transition-all hover:border-black">
<x-link.hover>
{{ Str::limit(setting('company.name'), 22) }}
</span>
</x-link.hover>
</span>
@can('read-common-companies')
@ -169,7 +169,7 @@
<span class="material-icons text-lg text-purple transform ltr:rotate-90 rtl:-rotate-90">expand_circle_down</span>
</button>
<span data-menu-close class="material-icons absolute ltr:-right-2 rtl:right-12 top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<span data-menu-close class="material-icons absolute ltr:-right-2 rtl:right-12 transition-all top-8 text-lg text-purple cursor-pointer z-10 hidden">cancel</span>
<div class="fixed w-full h-full invisible lg:hidden js-menu-background" style="background-color: rgba(0, 0, 0, 0.5); z-index: -1;"></div>
</div>

21
resources/views/components/layouts/portal/scripts.blade.php
View File

@ -137,8 +137,18 @@
mainContent.classList.add("hidden");
toggleButton.classList.add("invisible");
menuClose.classList.remove("hidden");
unHiddenSidebar();
contentTransitionRight();
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
menuClose.classList.add("ltr:-right-57", "rtl:right-59");
menuClose.classList.remove("ltr:-right-2", "rtl:right-12");
} else {
menuClose.classList.add("ltr:-right-2", "rtl:right-12");
}
sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
//for hidden menu, show close icon scenario
//remove active (cancel text) class form target icon
} else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") {
@ -164,6 +174,13 @@
mainContent.classList.remove("hidden");
this.classList.add("hidden");
toggleButton.classList.remove("invisible");
//for hidden menu, show close icon scenario
if (sideBar.classList.contains("menu-list-hidden")) {
sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
}
//for hidden menu, show close icon scenario
});
});
}