From ae2f6c2a9e992475285772da37f81efdf2bdcf48 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Wed, 14 Jun 2023 10:05:27 +0530 Subject: [PATCH 01/20] incr: fix import paths add ext .vue --- src/components/Controls/Color.vue | 6 +- src/components/Icons/18/check.vue | 2 +- src/components/Icons/18/common-entries.vue | 2 +- src/components/Icons/18/customer.vue | 2 +- src/components/Icons/18/dashboard.vue | 2 +- src/components/Icons/18/fb.vue | 2 +- src/components/Icons/18/general.vue | 2 +- src/components/Icons/18/gst.vue | 2 +- src/components/Icons/18/inventory.vue | 2 +- src/components/Icons/18/invoice.vue | 2 +- src/components/Icons/18/item.vue | 2 +- src/components/Icons/18/mail.vue | 2 +- src/components/Icons/18/opening-ac.vue | 2 +- src/components/Icons/18/percentage.vue | 2 +- src/components/Icons/18/purchase-invoice.vue | 2 +- src/components/Icons/18/purchase.vue | 2 +- src/components/Icons/18/reports.vue | 2 +- src/components/Icons/18/review-ac.vue | 2 +- src/components/Icons/18/sales-invoice.vue | 2 +- src/components/Icons/18/sales.vue | 2 +- src/components/Icons/18/settings.vue | 2 +- src/components/Icons/18/start.vue | 2 +- src/components/Icons/18/supplier.vue | 2 +- src/components/Icons/18/system.vue | 2 +- src/components/Icons/24/general.vue | 2 +- src/components/Icons/24/green-check.vue | 2 +- src/components/Icons/24/invoice.vue | 2 +- src/components/Icons/24/mail.vue | 2 +- src/components/Icons/24/privacy.vue | 2 +- src/components/Icons/24/system.vue | 2 +- src/pages/Dashboard/ProfitAndLoss.vue | 4 +- src/pages/GetStarted.vue | 6 +- src/pages/ListView/List.vue | 8 +- src/setup/createCOA.ts | 2 +- src/utils/colors.ts | 119 ++++++++++++++++++- 35 files changed, 157 insertions(+), 46 deletions(-) diff --git a/src/components/Controls/Color.vue b/src/components/Controls/Color.vue index 9486616de..180ed338b 100644 --- a/src/components/Controls/Color.vue +++ b/src/components/Controls/Color.vue @@ -55,9 +55,9 @@ diff --git a/src/components/Icons/12/index.ts b/src/components/Icons/12/index.ts new file mode 100644 index 000000000..03e9ace68 --- /dev/null +++ b/src/components/Icons/12/index.ts @@ -0,0 +1,16 @@ +import ArrowLeftRight from './arrow-left-right.vue'; +import DragHandle from './drag-handle.vue'; +import Filter from './filter.vue'; +import List from './list.vue'; +import Select from './select.vue'; +import Sidebar from './sidebar.vue'; + +// prettier-ignore +export default { + 'arrow-left-right': ArrowLeftRight, + 'drag-handle': DragHandle, + 'filter': Filter, + 'list': List, + 'select': Select, + 'sidebar': Sidebar, +}; diff --git a/src/components/Icons/16/index.ts b/src/components/Icons/16/index.ts new file mode 100644 index 000000000..c23280974 --- /dev/null +++ b/src/components/Icons/16/index.ts @@ -0,0 +1,38 @@ +import AccountIn from './account-in.vue'; +import Address from './address.vue'; +import Assets from './assets.vue'; +import Calendar from './calendar.vue'; +import Circle from './circle.vue'; +import DownSmall from './down-small.vue'; +import Down from './down.vue'; +import Expenses from './expenses.vue'; +import Income from './income.vue'; +import Items from './items.vue'; +import Liabilities from './liabilities.vue'; +import Mail from './mail.vue'; +import Normal from './normal.vue'; +import Opened from './opened.vue'; +import Phone from './phone.vue'; +import Plus from './plus.vue'; +import Search from './search.vue'; + +// prettier-ignore +export default { + 'account-in': AccountIn, + 'address': Address, + 'assets': Assets, + 'calendar': Calendar, + 'circle': Circle, + 'down-small': DownSmall, + 'down': Down, + 'expenses': Expenses, + 'income': Income, + 'items': Items, + 'liabilities': Liabilities, + 'mail': Mail, + 'normal': Normal, + 'opened': Opened, + 'phone': Phone, + 'plus': Plus, + 'search': Search, +} diff --git a/src/components/Icons/18/index.ts b/src/components/Icons/18/index.ts new file mode 100644 index 000000000..b9b87c1f6 --- /dev/null +++ b/src/components/Icons/18/index.ts @@ -0,0 +1,52 @@ +import Check from './check.vue'; +import CommonEntries from './common-entries.vue'; +import Customer from './customer.vue'; +import Dashboard from './dashboard.vue'; +import Fb from './fb.vue'; +import General from './general.vue'; +import Gst from './gst.vue'; +import Inventory from './inventory.vue'; +import Invoice from './invoice.vue'; +import Item from './item.vue'; +import Mail from './mail.vue'; +import OpeningAc from './opening-ac.vue'; +import Percentage from './percentage.vue'; +import Property from './property.vue'; +import PurchaseInvoice from './purchase-invoice.vue'; +import Purchase from './purchase.vue'; +import Reports from './reports.vue'; +import ReviewAc from './review-ac.vue'; +import SalesInvoice from './sales-invoice.vue'; +import Sales from './sales.vue'; +import Settings from './settings.vue'; +import Start from './start.vue'; +import Supplier from './supplier.vue'; +import System from './system.vue'; + +// prettier-ignore +export default { + 'check': Check, + 'common-entries': CommonEntries, + 'customer': Customer, + 'dashboard': Dashboard, + 'fb': Fb, + 'general': General, + 'gst': Gst, + 'inventory': Inventory, + 'invoice': Invoice, + 'item': Item, + 'mail': Mail, + 'opening-ac': OpeningAc, + 'percentage': Percentage, + 'property': Property, + 'purchase-invoice': PurchaseInvoice, + 'purchase': Purchase, + 'reports': Reports, + 'review-ac': ReviewAc, + 'sales-invoice': SalesInvoice, + 'sales': Sales, + 'settings': Settings, + 'start': Start, + 'supplier': Supplier, + 'system': System, +} diff --git a/src/components/Icons/24/index.ts b/src/components/Icons/24/index.ts new file mode 100644 index 000000000..eb222bdd2 --- /dev/null +++ b/src/components/Icons/24/index.ts @@ -0,0 +1,18 @@ + + +import General from './general.vue'; +import GreenCheck from './green-check.vue'; +import Invoice from './invoice.vue'; +import Mail from './mail.vue'; +import Privacy from './privacy.vue'; +import System from './system.vue'; + +// prettier-ignore +export default { + 'general': General, + 'green-check': GreenCheck, + 'invoice': Invoice, + 'mail': Mail, + 'privacy': Privacy, + 'system': System, +} diff --git a/src/components/Icons/8/index.ts b/src/components/Icons/8/index.ts new file mode 100644 index 000000000..0e01ae9be --- /dev/null +++ b/src/components/Icons/8/index.ts @@ -0,0 +1,24 @@ +import ArrowRight from './arrow-right.vue'; +import ChevronLeft from './chevron-left.vue'; +import ChevronRight from './chevron-right.vue'; +import Circle from './circle.vue'; +import DotHorizontal from './dot-horizontal.vue'; +import DotVertical from './dot-vertical.vue'; +import Pencil from './pencil.vue'; +import Plus from './plus.vue'; +import Up from './up.vue'; +import X from './x.vue'; + +// prettier-ignore +export default { + 'arrow-right': ArrowRight, + 'chevron-left': ChevronLeft, + 'chevron-right': ChevronRight, + 'circle': Circle, + 'dot-horizontal': DotHorizontal, + 'dot-vertical': DotVertical, + 'pencil': Pencil, + 'plus': Plus, + 'up': Up, + 'x': X, +} diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 3b099cc14..434407077 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -41,8 +41,8 @@ class="flex-shrink-0" :name="group.icon" :size="group.iconSize || '18'" - :height="group.iconHeight" - :active="isGroupActive(group)" + :height="group.iconHeight ?? 0" + :active="!!isGroupActive(group)" :class="isGroupActive(group) && !group.items ? '-ms-1' : ''" />
- +

{{ t`No entries found` }}

diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue index 9f1768120..5470f5d7c 100644 --- a/src/pages/ListView/List.vue +++ b/src/pages/ListView/List.vue @@ -10,7 +10,7 @@

#

-
+
@@ -46,8 +46,8 @@ -
+

@@ -82,42 +82,42 @@ >

{{ t`No entries found` }}

-
diff --git a/src/components/Charts/DonutChart.vue b/src/components/Charts/DonutChart.vue index 783b6d253..706d68f6e 100644 --- a/src/components/Charts/DonutChart.vue +++ b/src/components/Charts/DonutChart.vue @@ -22,12 +22,6 @@ :cx="cx" :cy="cy" :r="radius" - @mouseover=" - $emit( - 'change', - thetasAndStarts.length === 1 ? thetasAndStarts[0][0] : null - ) - " :stroke-width=" thickness + (hasNonZeroValues && active === thetasAndStarts[0][0] ? 4 : 0) @@ -38,12 +32,18 @@ :class="hasNonZeroValues ? 'sector' : ''" :style="{ transformOrigin: `${cx}px ${cy}px` }" fill="transparent" + @mouseover=" + $emit( + 'change', + thetasAndStarts.length === 1 ? thetasAndStarts[0][0] : null + ) + " />