Merge pull request #22 from MicroPyramid/dev

Dev

Author: ashwin31

prisma/migrations/20250528002056_/migration.sql

@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "Contact" DROP CONSTRAINT "Contact_organizationId_fkey";
+
+-- AlterTable
+ALTER TABLE "Contact" ALTER COLUMN "organizationId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Contact" ADD CONSTRAINT "Contact_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20250528021650_/migration.sql

@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "OpportunityStatus" AS ENUM ('SUCCESS', 'FAILED', 'IN_PROGRESS');
+
+-- AlterTable
+ALTER TABLE "Opportunity" ADD COLUMN     "status" "OpportunityStatus";

prisma/schema.prisma

@@ -155,16 +155,16 @@ model Contact {
   updatedAt       DateTime                     @updatedAt
   owner           User                         @relation(fields: [ownerId], references: [id])
   ownerId         String
-  organization    Organization                 @relation(fields: [organizationId], references: [id])
-  organizationId  String
+  organization    Organization?                @relation(fields: [organizationId], references: [id])
+  organizationId  String?
   tasks           Task[]
   events          Event[]
   opportunities   Opportunity[]
   cases           Case[]
   leads           Lead[] // Keep this relation for historical tracking only
   comments        Comment[]
   quotes          Quote[]                      @relation("ContactQuotes")
-  relatedAccounts   AccountContactRelationship[]
+  relatedAccounts AccountContactRelationship[]
 }
 
 enum LeadSource {
@@ -217,11 +217,17 @@ enum LeadStatus {
   UNQUALIFIED
   CONVERTED
 }
+enum OpportunityStatus {
+  SUCCESS
+  FAILED
+  IN_PROGRESS
+}
 
 model Opportunity {
   id                   String               @id @default(uuid())
   name                 String
   amount               Float?
+  status               OpportunityStatus?
   closeDate            DateTime?
   probability          Float? // Percentage chance to close (0-100)
   type                 String? // New Business, Existing Business, etc.
@@ -647,17 +653,17 @@ enum ContentBlockType {
 }
 
 model NewsletterSubscriber {
-  id              String    @id @default(uuid())
-  email           String    @unique
-  isActive        Boolean   @default(true)
-  subscribedAt    DateTime  @default(now())
-  unsubscribedAt  DateTime?
-  confirmationToken String? @unique
-  isConfirmed     Boolean   @default(false)
-  confirmedAt     DateTime?
-  ipAddress       String?
-  userAgent       String?
-  
+  id                String    @id @default(uuid())
+  email             String    @unique
+  isActive          Boolean   @default(true)
+  subscribedAt      DateTime  @default(now())
+  unsubscribedAt    DateTime?
+  confirmationToken String?   @unique
+  isConfirmed       Boolean   @default(false)
+  confirmedAt       DateTime?
+  ipAddress         String?
+  userAgent         String?
+
   @@index([email])
   @@index([isActive])
   @@index([subscribedAt])

src/routes/(app)/Sidebar.svelte

@@ -76,14 +76,29 @@
 			]
 		},
 		{
-			key: 'accounts',
+			key: 'contacts',
+			label: 'Contacts',
+			icon: Users,
+			type: 'dropdown',
+			children: [
+				{ href: '/app/contacts', label: 'All Contacts', icon: List },
+				{ href: '/app/contacts/new', label: 'New Contact', icon: UserPlus }
+			]
+		},
+		{
+			href: '/app/accounts',
 			label: 'Accounts',
 			icon: Building,
+			type: 'link'
+		},
+		{
+			key: 'opportunities',
+			label: 'Opportunities',
+			icon: Target,
 			type: 'dropdown',
 			children: [
-				{ href: '/app/accounts', label: 'All Accounts', icon: List },
-				{ href: '/app/accounts/new', label: 'New Account', icon: Plus },
-				{ href: '/app/accounts/opportunities', label: 'Opportunities', icon: Target }
+				{ href: '/app/opportunities', label: 'All Opportunities', icon: List },
+				{ href: '/app/opportunities/new', label: 'New Opportunity', icon: Plus }
 			]
 		},
 		{

src/routes/(app)/app/accounts/+page.server.js

@@ -19,6 +19,7 @@ export async function load({ locals, url, params }) {
         const status = url.searchParams.get('status');
         if (status === 'open') {
             where.closedAt = null;
+            where.active = true;
         } else if (status === 'closed') {
             where.closedAt = { not: null };
         }
@@ -73,6 +74,7 @@ export async function load({ locals, url, params }) {
         return {
             accounts: accounts.map(account => ({
                 ...account,
+                isActive: account.isActive, // Use only the active field, ignore closedAt for display purposes
                 opportunityCount: account.opportunities.length,
                 contactCount: account.relatedContacts.length,
                 taskCount: account.tasks.length,

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

@@ -153,7 +153,7 @@
         </div>
         <div>
           <p class="text-sm text-green-600 dark:text-green-400 font-medium">Active</p>
-          <p class="text-2xl font-bold text-green-900 dark:text-green-100">{accounts.filter(a => !a.closedAt).length}</p>
+          <p class="text-2xl font-bold text-green-900 dark:text-green-100">{accounts.filter(a => a.isActive).length}</p>
         </div>
       </div>
     </div>
@@ -252,14 +252,21 @@
                         <p class="text-sm font-semibold text-gray-900 dark:text-white group-hover:text-blue-600 dark:group-hover:text-blue-400 transition-colors">
                           {account.name}
                         </p>
-                        {#if account.closedAt}
-                          <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900/20 dark:text-red-400 mt-1">
-                            Closed
-                          </span>
-                        {:else}
+                        {#if account.isActive}
                           <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900/20 dark:text-green-400 mt-1">
                             Active
                           </span>
+                        {:else}
+                          <div class="mt-1">
+                            <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900/20 dark:text-red-400">
+                              Closed
+                            </span>
+                            {#if account.closedAt}
+                              <p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
+                                {formatDate(account.closedAt)}
+                              </p>
+                            {/if}
+                          </div>
                         {/if}
                       </a>
                     </div>
@@ -335,16 +342,16 @@
                        title="View Account">
                       <Eye class="w-4 h-4" />
                     </a>
+                    <a href="/app/opportunities/new?accountId={account.id}" 
+                       class="p-2 text-gray-400 hover:text-green-600 dark:hover:text-green-400 transition-colors rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700" 
+                       title="Add Opportunity">
+                      <Plus class="w-4 h-4" />
+                    </a>
                     <a href="/app/accounts/{account.id}/edit" 
                        class="p-2 text-gray-400 hover:text-yellow-600 dark:hover:text-yellow-400 transition-colors rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700" 
                        title="Edit Account">
                       <Edit class="w-4 h-4" />
                     </a>
-                    <a href="/app/accounts/{account.id}/delete" 
-                       class="p-2 text-gray-400 hover:text-red-600 dark:hover:text-red-400 transition-colors rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700" 
-                       title="Delete Account">
-                      <Trash2 class="w-4 h-4" />
-                    </a>
                   </div>
                 </td>
               </tr>

src/routes/(app)/app/accounts/[accountId]/+page.server.js

@@ -127,7 +127,7 @@ export async function load({ params, url, locals }) {
 
 /** @type {import('./$types').Actions} */
 export const actions = {
-  closeAccount: async ({ params, request, locals }) => {
+  closeAccount: async ({ request, locals, params }) => {
     try {
       const user = locals.user;
       const org = locals.org;
@@ -180,6 +180,7 @@ export const actions = {
         where: { id: accountId },
         data: {
           closedAt: new Date(),
+          isActive: false,
           closureReason
         }
       });
@@ -206,7 +207,7 @@ export const actions = {
     }
   },
 
-  reopenAccount: async ({ params, request, locals }) => {
+  reopenAccount: async ({ locals, params }) => {
     try {
       const user = locals.user;
       const org = locals.org;
@@ -260,6 +261,7 @@ export const actions = {
         where: { id: accountId },
         data: {
           closedAt: null,
+          isActive: true,
           closureReason: null
         }
       });
@@ -286,111 +288,7 @@ export const actions = {
     }
   },
 
-  addContact: async ({ params, request, locals }) => {
-    try {
-      const user = locals.user;
-      const org = locals.org;
-      
-      const { accountId } = params;
-      let data;
-      // Support both JSON and form submissions
-      const contentType = request.headers.get('content-type') || '';
-      if (contentType.includes('application/json')) {
-        data = await request.json();
-      } else {
-        const formData = await request.formData();
-        data = Object.fromEntries(formData.entries());
-      }
-      const firstName = data.firstName?.toString().trim();
-      const lastName = data.lastName?.toString().trim();
-      if (!firstName || !lastName) {
-        return fail(400, { success: false, message: 'First and last name are required.' });
-      }
-
-      // check if the account exists and belongs to the organization
-      const account = await prisma.account.findUnique({
-        where: { id: accountId, organizationId: org.id }
-      });
-      if (!account) {
-        return fail(404, { success: false, message: 'Account not found or does not belong to this organization.' });
-      }
-      // Create the contact
-      const contact = await prisma.contact.create({
-        data: {
-          firstName,
-          lastName,
-          email: data.email?.toString() || null,
-          phone: data.phone?.toString() || null,
-          title: data.title?.toString() || null,
-          ownerId: user.id,
-          organizationId: org.id,
-        }
-      });
-      // Link contact to account
-      await prisma.accountContactRelationship.create({
-        data: {
-          accountId,
-          contactId: contact.id,
-          isPrimary: !!data.isPrimary,
-          role: data.role?.toString() || null
-        }
-      });
-      return { success: true, message: 'Contact added successfully.' };
-    } catch (err) {
-      console.error('Error adding contact:', err);
-      return fail(500, { success: false, message: 'Failed to add contact.' });
-    }
-  },
-
-  addOpportunity: async ({ params, request, locals }) => {
-    try {
-      const user = locals.user;
-      const org = locals.org;
-     
-      const { accountId } = params;
-      const formData = await request.formData();
-      const name = formData.get('name')?.toString().trim();
-      const amountRaw = formData.get('amount');
-      const amount = amountRaw ? parseFloat(amountRaw.toString()) : null;
-      const stageRaw = formData.get('stage');
-      const stage = stageRaw ? stageRaw.toString() : 'PROSPECTING';
-      const closeDateRaw = formData.get('closeDate');
-      const closeDate = closeDateRaw ? new Date(closeDateRaw.toString()) : null;
-      const probabilityRaw = formData.get('probability');
-      const probability = probabilityRaw ? parseFloat(probabilityRaw.toString()) : null;
-      if (!name) {
-        return fail(400, { success: false, message: 'Opportunity name is required.' });
-      }
-
-      // chek if the account exists and belongs to the organization
-      const account = await prisma.account.findUnique({
-        where: { id: accountId, organizationId: org.id }
-      });
-      if (!account) {
-        return fail(404, { success: false, message: 'Account not found or does not belong to this organization.' });
-      }
-
-      // Create the opportunity
-      await prisma.opportunity.create({
-        data: {
-          name,
-          amount,
-          stage,
-          closeDate,
-          probability,
-          account: { connect: { id: accountId } },
-          owner: { connect: { id: user.id } },
-          organization: { connect: { id: org.id } }
-        }
-      });
-      return { success: true, message: 'Opportunity added successfully.' };
-    } catch (err) {
-      console.error('Error adding opportunity:', err);
-      return fail(500, { success: false, message: 'Failed to add opportunity.' });
-    }
-  },
-
-  comment: async ({ request, params, locals }) => {
+  comment: async ({ request, locals, params }) => {
     const user = locals.user;
     const org = locals.org;
     // Fallback: fetch account to get organizationId
@@ -416,51 +314,5 @@ export const actions = {
       }
     });
     return { success: true };
-  },
-
-  addTask: async ({ params, request, locals }) => {
-    try {
-      const user = locals.user;
-      const org = locals.org;
-      
-      const { accountId } = params;
-      const formData = await request.formData();
-      const subject = formData.get('subject')?.toString().trim();
-      const description = formData.get('description')?.toString() || '';
-      const dueDateRaw = formData.get('dueDate');
-      const dueDate = dueDateRaw ? new Date(dueDateRaw.toString()) : null;
-      const priority = formData.get('priority')?.toString() || 'Normal';
-      if (!subject) {
-        return fail(400, { success: false, message: 'Subject is required.' });
-      }
-
-      // Check if the account exists and belongs to the organization
-      const account = await prisma.account.findUnique({
-        where: { id: accountId, organizationId: org.id }
-      });
-      if (!account) {
-        return fail(404, { success: false, message: 'Account not found or does not belong to this organization.' });
-      }
-      // If no ownerId is provided, default to current user
-      // if (!ownerId) ownerId = user.id;
-      // console.log(user.id, org.id);
-      const task = await prisma.task.create({
-        data: {
-          subject,
-          description,
-          dueDate,
-          priority,
-          status: 'Open',
-           createdBy:  { connect: { id: user.id    } }, 
-          account: { connect: { id: accountId } },  
-          owner: { connect: { id: user.id } }, 
-          organization: { connect: { id: org.id } }, 
-        }
-      });
-      return { success: true, message: 'Task added successfully.', task };
-    } catch (err) {
-      console.error('Error adding task:', err);
-      return fail(500, { success: false, message: 'Failed to add task.' });
-    }
   }
 };