From 82665e576a15284a5d1fbdbc50726e18533a7ac8 Mon Sep 17 00:00:00 2001 From: ISMAIL MASSERAN Date: Sun, 25 Oct 2026 11:20:39 +0800 Subject: [PATCH] DONE: cleanup unused files, use component for chart --- src/components/chart-presets/Bar1.vue | 99 ---- src/components/chart-presets/Bar2.vue | 85 --- src/components/chart-presets/BarChart.vue | 80 +++ src/components/chart-presets/Donut1.vue | 43 -- src/components/chart-presets/Donut2.vue | 43 -- src/components/chart-presets/DonutChart.vue | 64 ++ src/components/chart-presets/Line1.vue | 92 --- src/components/chart-presets/Line2.vue | 72 --- src/components/chart-presets/Line3.vue | 82 --- src/components/chart-presets/LineChart.vue | 88 +++ src/components/chart-presets/Pie1.vue | 42 -- src/components/chart-presets/PieChart.vue | 61 ++ src/components/chart-presets/index.ts | 14 +- src/components/chart-presets/types.ts | 17 + src/components/daily-notes/DailyNotes.vue | 1 - .../official-stores/OfficialStores.vue | 1 - .../recent-activities/RecentActivities.vue | 1 - src/components/schedules/Schedules.vue | 1 - src/components/transactions/Transactions.vue | 1 - .../weekly-best-sellers/WeeklyBestSellers.vue | 1 - .../weekly-top-products/WeeklyTopProducts.vue | 1 - .../dashboard/components/AvailableModules.vue | 71 +++ .../components/DashboardGreeting.vue | 34 ++ .../components/MemberInvestmentSummary.vue | 199 +++++++ .../dashboard/components/OnboardingDialog.vue | 124 ++++ .../pages/DashboardOverview-backup.vue | 552 ------------------ .../dashboard/pages/DashboardOverview.vue | 244 +------- .../components/ManualInvestmentForm.vue | 115 +++- .../composables/useMemberInvestmentSummary.ts | 113 ++++ .../investment/pages/InvestmentDetail.vue | 225 ++++++- .../pages/InvestmentManualCreate.vue | 9 +- .../investment/services/investment.service.ts | 84 ++- .../investment/types/investment.types.ts | 48 ++ 33 files changed, 1331 insertions(+), 1376 deletions(-) delete mode 100644 src/components/chart-presets/Bar1.vue delete mode 100644 src/components/chart-presets/Bar2.vue create mode 100644 src/components/chart-presets/BarChart.vue delete mode 100644 src/components/chart-presets/Donut1.vue delete mode 100644 src/components/chart-presets/Donut2.vue create mode 100644 src/components/chart-presets/DonutChart.vue delete mode 100644 src/components/chart-presets/Line1.vue delete mode 100644 src/components/chart-presets/Line2.vue delete mode 100644 src/components/chart-presets/Line3.vue create mode 100644 src/components/chart-presets/LineChart.vue delete mode 100644 src/components/chart-presets/Pie1.vue create mode 100644 src/components/chart-presets/PieChart.vue create mode 100644 src/components/chart-presets/types.ts create mode 100644 src/modules/dashboard/components/AvailableModules.vue create mode 100644 src/modules/dashboard/components/DashboardGreeting.vue create mode 100644 src/modules/dashboard/components/MemberInvestmentSummary.vue create mode 100644 src/modules/dashboard/components/OnboardingDialog.vue delete mode 100644 src/modules/dashboard/pages/DashboardOverview-backup.vue create mode 100644 src/modules/investment/composables/useMemberInvestmentSummary.ts diff --git a/src/components/chart-presets/Bar1.vue b/src/components/chart-presets/Bar1.vue deleted file mode 100644 index 90f11b3..0000000 --- a/src/components/chart-presets/Bar1.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - diff --git a/src/components/chart-presets/Bar2.vue b/src/components/chart-presets/Bar2.vue deleted file mode 100644 index cc296da..0000000 --- a/src/components/chart-presets/Bar2.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - diff --git a/src/components/chart-presets/BarChart.vue b/src/components/chart-presets/BarChart.vue new file mode 100644 index 0000000..fba7528 --- /dev/null +++ b/src/components/chart-presets/BarChart.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/components/chart-presets/Donut1.vue b/src/components/chart-presets/Donut1.vue deleted file mode 100644 index 02ac1ab..0000000 --- a/src/components/chart-presets/Donut1.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/src/components/chart-presets/Donut2.vue b/src/components/chart-presets/Donut2.vue deleted file mode 100644 index e883f56..0000000 --- a/src/components/chart-presets/Donut2.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/src/components/chart-presets/DonutChart.vue b/src/components/chart-presets/DonutChart.vue new file mode 100644 index 0000000..fec6a73 --- /dev/null +++ b/src/components/chart-presets/DonutChart.vue @@ -0,0 +1,64 @@ + + + diff --git a/src/components/chart-presets/Line1.vue b/src/components/chart-presets/Line1.vue deleted file mode 100644 index 35956a6..0000000 --- a/src/components/chart-presets/Line1.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - diff --git a/src/components/chart-presets/Line2.vue b/src/components/chart-presets/Line2.vue deleted file mode 100644 index 5cdb4f1..0000000 --- a/src/components/chart-presets/Line2.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - diff --git a/src/components/chart-presets/Line3.vue b/src/components/chart-presets/Line3.vue deleted file mode 100644 index 36630d5..0000000 --- a/src/components/chart-presets/Line3.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - diff --git a/src/components/chart-presets/LineChart.vue b/src/components/chart-presets/LineChart.vue new file mode 100644 index 0000000..23f67e6 --- /dev/null +++ b/src/components/chart-presets/LineChart.vue @@ -0,0 +1,88 @@ + + + diff --git a/src/components/chart-presets/Pie1.vue b/src/components/chart-presets/Pie1.vue deleted file mode 100644 index 714f941..0000000 --- a/src/components/chart-presets/Pie1.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/components/chart-presets/PieChart.vue b/src/components/chart-presets/PieChart.vue new file mode 100644 index 0000000..33a4302 --- /dev/null +++ b/src/components/chart-presets/PieChart.vue @@ -0,0 +1,61 @@ + + + diff --git a/src/components/chart-presets/index.ts b/src/components/chart-presets/index.ts index 63b68f3..44e2c08 100644 --- a/src/components/chart-presets/index.ts +++ b/src/components/chart-presets/index.ts @@ -1,8 +1,6 @@ -export { default as Line1 } from './Line1.vue' //report-line-chart -export { default as Line2 } from './Line2.vue' //simple-line-chart-1 -export { default as Line3 } from './Line3.vue' //simple-line-chart-3, simple-line-chart-4 -export { default as Pie1 } from './Pie1.vue' //report-pie-chart -export { default as Donut1 } from './Donut1.vue' //report-donut-chart -export { default as Donut2 } from './Donut2.vue' //report-donut-chart-1 -export { default as Bar1 } from './Bar1.vue' //report-bar-chart -export { default as Bar2 } from './Bar2.vue' //report-bar-chart-1 +export { default as DonutChart } from './DonutChart.vue' +export { default as PieChart } from './PieChart.vue' +export { default as LineChart } from './LineChart.vue' +export { default as BarChart } from './BarChart.vue' + +export type { LineChartDataset, BarChartDataset } from './types' diff --git a/src/components/chart-presets/types.ts b/src/components/chart-presets/types.ts new file mode 100644 index 0000000..0a1c493 --- /dev/null +++ b/src/components/chart-presets/types.ts @@ -0,0 +1,17 @@ +export type LineChartDataset = { + label?: string + data: number[] + /** CSS custom property name, e.g. `--color-primary` */ + color?: string + dashed?: boolean + tension?: number + borderWidth?: number +} + +export type BarChartDataset = { + label?: string + data: number[] + /** CSS custom property name, e.g. `--color-primary` */ + color?: string + barThickness?: number +} diff --git a/src/components/daily-notes/DailyNotes.vue b/src/components/daily-notes/DailyNotes.vue index e10bc45..d0d926a 100644 --- a/src/components/daily-notes/DailyNotes.vue +++ b/src/components/daily-notes/DailyNotes.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/official-stores/OfficialStores.vue b/src/components/official-stores/OfficialStores.vue index cdec6a8..955c176 100644 --- a/src/components/official-stores/OfficialStores.vue +++ b/src/components/official-stores/OfficialStores.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/recent-activities/RecentActivities.vue b/src/components/recent-activities/RecentActivities.vue index e77ccf2..7119543 100644 --- a/src/components/recent-activities/RecentActivities.vue +++ b/src/components/recent-activities/RecentActivities.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/schedules/Schedules.vue b/src/components/schedules/Schedules.vue index 2a1e600..e711f20 100644 --- a/src/components/schedules/Schedules.vue +++ b/src/components/schedules/Schedules.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/transactions/Transactions.vue b/src/components/transactions/Transactions.vue index b582b7e..3ed6c07 100644 --- a/src/components/transactions/Transactions.vue +++ b/src/components/transactions/Transactions.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/weekly-best-sellers/WeeklyBestSellers.vue b/src/components/weekly-best-sellers/WeeklyBestSellers.vue index d89b80c..77287eb 100644 --- a/src/components/weekly-best-sellers/WeeklyBestSellers.vue +++ b/src/components/weekly-best-sellers/WeeklyBestSellers.vue @@ -63,7 +63,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/components/weekly-top-products/WeeklyTopProducts.vue b/src/components/weekly-top-products/WeeklyTopProducts.vue index 7364c66..5125b21 100644 --- a/src/components/weekly-top-products/WeeklyTopProducts.vue +++ b/src/components/weekly-top-products/WeeklyTopProducts.vue @@ -62,7 +62,6 @@ import { } from '@/components/ui/pagination' import { Map } from '@/components/ui/map' import { Lucide } from '@/components/ui/lucide' -import { Line1, Line2, Pie1, Donut1, Donut2 } from '@/components/chart-presets' const pc = ref(false) const electronic = ref(false) diff --git a/src/modules/dashboard/components/AvailableModules.vue b/src/modules/dashboard/components/AvailableModules.vue new file mode 100644 index 0000000..0d555e4 --- /dev/null +++ b/src/modules/dashboard/components/AvailableModules.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/modules/dashboard/components/DashboardGreeting.vue b/src/modules/dashboard/components/DashboardGreeting.vue new file mode 100644 index 0000000..00888a6 --- /dev/null +++ b/src/modules/dashboard/components/DashboardGreeting.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/modules/dashboard/components/MemberInvestmentSummary.vue b/src/modules/dashboard/components/MemberInvestmentSummary.vue new file mode 100644 index 0000000..2c791e6 --- /dev/null +++ b/src/modules/dashboard/components/MemberInvestmentSummary.vue @@ -0,0 +1,199 @@ + + + diff --git a/src/modules/dashboard/components/OnboardingDialog.vue b/src/modules/dashboard/components/OnboardingDialog.vue new file mode 100644 index 0000000..aa57855 --- /dev/null +++ b/src/modules/dashboard/components/OnboardingDialog.vue @@ -0,0 +1,124 @@ + + + diff --git a/src/modules/dashboard/pages/DashboardOverview-backup.vue b/src/modules/dashboard/pages/DashboardOverview-backup.vue deleted file mode 100644 index f17bbe5..0000000 --- a/src/modules/dashboard/pages/DashboardOverview-backup.vue +++ /dev/null @@ -1,552 +0,0 @@ - - - diff --git a/src/modules/dashboard/pages/DashboardOverview.vue b/src/modules/dashboard/pages/DashboardOverview.vue index 8742090..f06fcda 100644 --- a/src/modules/dashboard/pages/DashboardOverview.vue +++ b/src/modules/dashboard/pages/DashboardOverview.vue @@ -1,111 +1,13 @@ diff --git a/src/modules/investment/components/ManualInvestmentForm.vue b/src/modules/investment/components/ManualInvestmentForm.vue index 11222c8..b71b96b 100644 --- a/src/modules/investment/components/ManualInvestmentForm.vue +++ b/src/modules/investment/components/ManualInvestmentForm.vue @@ -1,10 +1,12 @@ + + +