Skip to content

Commit b5b488a

Browse files
authored
Merge pull request #5 from MicroPyramid/dev
Dev
2 parents 41e24c5 + 81e8dd1 commit b5b488a

File tree

31 files changed

+1752
-340
lines changed

31 files changed

+1752
-340
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@prisma/client": "6.5.0",
5050
"axios": "^1.8.4",
5151
"date-fns": "^4.1.0",
52-
"flowbite-svelte-blocks": "^1.1.4",
52+
"flowbite-svelte-blocks": "^2.0.0",
5353
"flowbite-svelte-icons": "^2.1.1",
5454
"svelte-fa": "^4.0.3",
5555
"uuid": "^11.1.0"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- AlterTable
2+
ALTER TABLE "Case" ADD COLUMN "dueDate" TIMESTAMP(3);

prisma/schema.prisma

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ model Case {
352352
origin String? // Email, Web, Phone
353353
type String? // Problem, Feature Request, Question
354354
reason String? // Example: "User didn't attend training, Complex functionality"
355+
dueDate DateTime?
355356
createdAt DateTime @default(now())
356357
updatedAt DateTime @updatedAt
357358
closedAt DateTime?

src/routes/(app)/Sidebar.svelte

Lines changed: 1 addition & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -36,80 +36,6 @@
3636
activeMainSidebar = navigation.to?.url.pathname ?? '';
3737
});
3838
39-
let menu = [
40-
{ name: 'Dashboard', icon: 'ChartPieOutline', href: '/app/dashboard' },
41-
{ name: 'Leads', icon: 'FunnelOutline', href: '/app/leads' },
42-
{ name: 'Contacts', icon: 'UserOutline', href: '/app/contacts' },
43-
{
44-
name: 'Accounts',
45-
icon: 'BuildingOfficeOutline',
46-
children: {
47-
'All Accounts': '/app/accounts',
48-
'New Account': '/app/accounts/new',
49-
'Account Opportunities': '/app/accounts/opportunities',
50-
'Deleted/Archived Accounts': '/app/accounts/deleted'
51-
}
52-
},
53-
{
54-
name: 'Opportunities',
55-
icon: 'CurrencyDollarOutline',
56-
children: {
57-
'All Opportunities': '/app/opportunities',
58-
'New Opportunity': '/app/opportunities/new'
59-
}
60-
},
61-
{
62-
name: 'Cases',
63-
icon: 'LifebuoyOutline',
64-
children: {
65-
'All Cases': '/app/cases',
66-
'New Case': '/app/cases/new'
67-
}
68-
},
69-
{
70-
name: 'Tasks',
71-
icon: 'ClipboardOutline',
72-
children: {
73-
'All Tasks': '/app/tasks',
74-
'New Task': '/app/tasks/new',
75-
Calendar: '/app/tasks/calendar'
76-
}
77-
},
78-
{
79-
name: 'Invoices',
80-
icon: 'ReceiptOutline',
81-
children: {
82-
'All Invoices': '/app/invoices',
83-
'Create Invoice': '/app/invoices/new'
84-
}
85-
},
86-
{
87-
name: 'Reports',
88-
icon: 'ChartBarOutline',
89-
children: {
90-
'Sales Reports': '/app/reports/sales',
91-
'Case Stats': '/app/reports/cases',
92-
'Invoice Trends': '/app/reports/invoices'
93-
}
94-
},
95-
{
96-
name: 'Settings',
97-
icon: 'CogOutline',
98-
children: {
99-
'User Management': '/app/settings/users',
100-
'Custom Fields': '/app/settings/fields',
101-
Integrations: '/app/settings/integrations'
102-
}
103-
}
104-
];
105-
let links = [
106-
{
107-
label: 'Support',
108-
href: 'https://discord.gg/',
109-
icon: LifeSaverSolid
110-
}
111-
];
112-
let dropdowns = Object.fromEntries(Object.keys(menu).map((x) => [x, false]));
11339
</script>
11440
11541
<Sidebar
@@ -143,11 +69,6 @@
14369
href="/app/leads/open"
14470
class={`${itemClass} ${mainSidebarUrl === '/app/leads/open' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
14571
/>
146-
<SidebarDropdownItem
147-
label="Closed Leads"
148-
href="/app/leads/closed"
149-
class={`${itemClass} ${mainSidebarUrl === '/app/leads/closed' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
150-
/>
15172
<SidebarDropdownItem
15273
label="Create Lead"
15374
href="/app/leads/new"
@@ -171,26 +92,7 @@
17192
href="/app/accounts/opportunities"
17293
class={`${itemClass} ${mainSidebarUrl === '/app/accounts/opportunities' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
17394
/>
174-
<SidebarDropdownItem
175-
label="Deleted/Archived Accounts"
176-
href="/app/accounts/deleted"
177-
class={`${itemClass} ${mainSidebarUrl === '/app/accounts/deleted' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
178-
/>
179-
</SidebarDropdownWrapper>
180-
181-
<SidebarDropdownWrapper label="Opportunities">
182-
<SidebarDropdownItem
183-
label="All Opportunities"
184-
href="/app/opportunities"
185-
class={`${itemClass} ${mainSidebarUrl === '/app/opportunities' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
186-
/>
187-
<SidebarDropdownItem
188-
label="New Opportunity"
189-
href="/app/opportunities/new"
190-
class={`${itemClass} ${mainSidebarUrl === '/app/opportunities/new' ? 'bg-gray-100 font-semibold dark:bg-gray-700' : ''}`}
191-
/>
19295
</SidebarDropdownWrapper>
193-
19496
<SidebarDropdownWrapper label="Cases">
19597
<SidebarDropdownItem
19698
label="All Cases"
@@ -217,13 +119,7 @@
217119
/>
218120
</SidebarDropdownWrapper>
219121
</SidebarGroup>
220-
<SidebarGroup ulClass={groupClass}>
221-
{#each links as { label, href, icon } (label)}
222-
<SidebarItem {label} {href} spanClass="ml-3" class={itemClass} target="_blank">
223-
<svelte:component this={icon} slot="icon" class={iconClass} />
224-
</SidebarItem>
225-
{/each}
226-
</SidebarGroup>
122+
227123
</nav>
228124
</SidebarWrapper>
229125
</Sidebar>

src/routes/(app)/app/accounts/+page.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
/>
6767
<select
6868
class="border border-gray-300 dark:border-gray-600 rounded px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
69+
style="width: 90px;"
6970
bind:value={statusFilter}
7071
on:change={updateQueryParams}
7172
>

0 commit comments

Comments
 (0)