Index: prisma/schema.prisma =================================================================== --- prisma/schema.prisma (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ prisma/schema.prisma (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -9,28 +9,30 @@ model Client { - id String @id @default(uuid()) - tenantId String // Tenant identifier - name String - email String @unique - address Json - logoUrl String? - phoneNumber String? - vatNumber String? - companyNumber String? - representative String - status CustomerStatus @default(active) + id String @id @default(uuid()) + tenantId String @map("tenant_id") + name String + email String @unique + address Json + logoUrl String? @map("logo_url") + phoneNumber String? @map("phone_number") + vatNumber String? @map("vat_number") + companyNumber String? @map("company_number") + representative String + status ClientStatus @default(active) + createdAt DateTime @default(now()) @map("created_at") + updatedAt DateTime @updatedAt @map("updated_at") - tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) + tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) invoicesReceived Invoice[] @relation("InvoiceTo") } model Service { - id String @id @default(uuid()) - name String - sprint Float - hour Float - month Float - tenantId String - tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) + id String @id @default(uuid()) + name String + sprint Float + hour Float + month Float + tenantId String @map("tenant_id") + tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) lineItems LineItem[] @@ -38,30 +40,32 @@ model Invoice { - id String @id @default(uuid()) - sent Int? // Number of times sent - dueDate DateTime + id String @id @default(uuid()) + sent Int? + dueDate DateTime @map("due_date") status InvoiceStatus currency Currency - quantityType QuantityType - subTotal Float - createDate DateTime + quantityType QuantityType @map("quantity_type") + subTotal Float @map("sub_total") + issueDate DateTime @map("issue_date") month Month discount Float? taxes Float? - totalAmount Float - invoiceNumber String @unique - pdfRef String? + totalAmount Float @map("total_amount") + invoiceNumber String @unique @map("invoice_number") + pdfRef String? @map("pdf_ref") + createdAt DateTime @default(now()) @map("created_at") + updatedAt DateTime @updatedAt @map("updated_at") - invoiceFromId String - invoiceFrom Tenant @relation(fields: [invoiceFromId], references: [id], onDelete: Cascade) + invoiceFromId String @map("tenant_id") + invoiceFrom Tenant @relation(fields: [invoiceFromId], references: [id], onDelete: Cascade) - invoiceToId String - invoiceTo Client @relation("InvoiceTo", fields: [invoiceToId], references: [id], onDelete: Cascade) + invoiceToId String @map("client_id") + invoiceTo Client @relation("InvoiceTo", fields: [invoiceToId], references: [id], onDelete: Cascade) - items LineItem[] + items LineItem[] } model LineItem { - id String @id @default(uuid()) + id String @id @default(uuid()) title String price Float @@ -69,87 +73,107 @@ quantity Int description String? - serviceId String - service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade) - invoiceId String - invoice Invoice @relation(fields: [invoiceId], references: [id], onDelete: Cascade) + serviceId String @map("service_id") + service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade) + invoiceId String @map("invoice_id") + invoice Invoice @relation(fields: [invoiceId], references: [id], onDelete: Cascade) } model Tenant { - id String @id @default(cuid()) + id String @id @default(cuid()) name String - email String @unique - address Json - bankAccounts Json? - logoUrl String? - phoneNumber String? - vatNumber String? - companyNumber String? + email String @unique + address Json + bankAccounts Json? @map("bank_accounts") + logoUrl String? @map("logo_url") + phoneNumber String? @map("phone_number") + vatNumber String? @map("vat_number") + companyNumber String? @map("company_number") representative String - lastInvoiceNumber String @default("0") - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + lastInvoiceNumber String @default("0") @map("last_invoice_number") + createdAt DateTime @default(now()) @map("created_at") + updatedAt DateTime @updatedAt @map("updated_at") invoicesSent Invoice[] services Service[] employees Employee[] - clients Client[] // Add the relation to clients + clients Client[] + users User[] } model Employee { - id String @id @default(uuid()) - name String - email String @unique - status EmployeeStatus @default(active) - iban String? - cv String? - photo String? - project String? - tenantId String - tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) + id String @id @default(uuid()) + name String + email String @unique + status EmployeeStatus @default(active) + iban String? + cv String? + photo String? + project String? + tenantId String @map("tenant_id") + tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) + createdAt DateTime @default(now()) @map("created_at") + updatedAt DateTime @updatedAt @map("updated_at") } -// Enums -enum CustomerStatus { - active - banned - inactive +model User { + id String @id @default(uuid()) + uid String @unique // Firebase UID + email String @unique + displayName String @map("display_name") + role UserRole + tenantId String @map("tenant_id") + tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade) + createdAt DateTime @default(now()) @map("created_at") + updatedAt DateTime @updatedAt @map("updated_at") +} + +enum UserRole { + ADMIN @map("ADMIN") + MANAGER @map("MANAGER") + USER @map("USER") +} + +enum ClientStatus { + active @map("ACTIVE") + banned @map("BANNED") + inactive @map("INACTIVE") } enum InvoiceStatus { - draft - processing - pending - overdue - paid + draft @map("DRAFT") + processing @map("PROCESSING") + pending @map("PENDING") + overdue @map("OVERDUE") + paid @map("PAID") } enum Currency { - EUR - USD + EUR @map("EUR") + USD @map("USD") } enum QuantityType { - Unit - Hour - Sprint - Month + Unit @map("UNIT") + Hour @map("HOUR") + Sprint @map("SPRINT") + Month @map("MONTH") } enum Month { - January - February - March - April - May - June - July - August - September - October - November - December + January @map("JANUARY") + February @map("FEBRUARY") + March @map("MARCH") + April @map("APRIL") + May @map("MAY") + June @map("JUNE") + July @map("JULY") + August @map("AUGUST") + September @map("SEPTEMBER") + October @map("OCTOBER") + November @map("NOVEMBER") + December @map("DECEMBER") } enum EmployeeStatus { - active - inactive + active @map("ACTIVE") + inactive @map("INACTIVE") } Index: prisma/seed.js =================================================================== --- prisma/seed.js (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ prisma/seed.js (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -6,19 +6,21 @@ // Clear existing data await prisma.service.deleteMany(); + await prisma.user.deleteMany(); await prisma.tenant.deleteMany(); // Define default tenant data const tenantData = { - name: "Default Company", - email: "contact@defaultcompany.com", + id: "cm7lxc3p00000pb7kmdrxsfod", + name: "MVP Masters", + email: "info@mvpmasters.com", address: { - street: "123 Business Street", - city: "Business City", - state: "BS", - zip: "12345", - country: "United States" + street: "Makedonska Treta Brigada 56", + city: "Skopje", + state: "Macedonia", + zip: "1000", + country: "Macedonia" }, - phoneNumber: "+1 234 567 8900", - representative: "John Doe", + phoneNumber: "+389 72 233 943", + representative: "Naum Shapkarovski", lastInvoiceNumber: "1", logoUrl: "https://example.com/default-logo.png", @@ -72,5 +74,18 @@ }); + // Add default admin user + const defaultUser = await prisma.user.create({ + data: { + id: 'dK2y3WezYWWltHCaBRvUFlddkOr2', + uid: 'dK2y3WezYWWltHCaBRvUFlddkOr2', + email: 'naum@mvpmasters.com', + displayName: 'Naum', + role: 'ADMIN', + tenantId: 'cm7lxc3p00000pb7kmdrxsfod' + } + }); + console.log('Seeded default tenant:', defaultTenant); + console.log('Seeded default user:', defaultUser); console.log('🌱 Seeding database...'); Index: scripts/verify-user-email.js =================================================================== --- scripts/verify-user-email.js (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ scripts/verify-user-email.js (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,28 @@ +const admin = require('firebase-admin'); +const serviceAccount = require('../service-account.json'); + +// Initialize Firebase Admin +admin.initializeApp({ + credential: admin.credential.cert(serviceAccount) +}); + +async function verifyUserEmail() { + const uid = 'dK2y3WezYWWltHCaBRvUFlddkOr2'; + + try { + // Update the user's email verified status + await admin.auth().updateUser(uid, { + emailVerified: true, + }); + + // Get the updated user to confirm + const user = await admin.auth().getUser(uid); + console.log('User email verified successfully'); + console.log('User details:', user.toJSON()); + } catch (error) { + console.error('Error verifying user email:', error); + } +} + +// Run the function +verifyUserEmail(); Index: service-account.json =================================================================== --- service-account.json (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ service-account.json (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -1,13 +1,13 @@ { "type": "service_account", - "project_id": "mvp-masters", - "private_key_id": "41113eebee172158f148448927355ce095b111f3", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCjMylcnnaenb6k\nDRY++GyIHbyyzQc+5ChXd6ixB5x0KYLLDs/6hqgSeIjI3urLee7i05NeQYVGIXGE\nvjqOhTdjwr11hIHRcNMIAjMYaI4HNiJHweQa72ux9dB1cZpYpQQrBuG5k3Sf/WjO\ntfiPnP7a7dR00KctsL22FAm4JH+CvfTWQoLpa7n3bhQmNOXZmCLb2ZRU6AkGuYh+\nq5ko5epj7sCtyqAcefUJXysC0EpRySgbeQsXewyvBrSOx2onPnjq+q0Zw9PdVhOH\nSr3zwdQq9DDLYOH1YB1DbaOEI+8tybCT3HHIOKJpCVga/mVZtzoEBR4zbbnkzshe\nS7IDPh2NAgMBAAECggEAIqDFrzkRZsUGUTVUqc5Y6wXSRucRmULcm3iQkuWQSSaQ\nscjGEPyW93pbXbHNBJkt+rOVcpu47WFFvrqFXr29+70zqZaQ3BGSOYIL+Osgbb/L\nBMpLffqcsZE8ptrQuuvip0WJyjBTP+pLXYcHg2N2wRnTKWkne96jVlnImSmnY6RW\n57V0ch/1PjX3SUQaBST6/BkW4qeo93rDU+qhuirtWhTcP64BQyX2CYzzJayLbNuL\ndETvIOaIEw48aBbHGHsmkxUw4E0UaYctaRDAZNlmxA2hulosG6F/TiAQ6/fF+ZCC\nssk5DM5/hGb62/H+Hdoyru/OIjYqNAScgWFjPm50wQKBgQC3Q9qcdm2qzkupEOfj\n2/ATjiXwZkcOjqWFAZuwI0wh4pbuK6dwzUypicMPf9UbGbp48xJKedzXSV5cC+bs\nCubZjdp5pwDyz1gj2QrHTZ37BV93OQyFdjpKVGZHUNVXsDdRmEG3wdrA+TXbGsnU\nLcQrUjjJSlx+PKVUya8OB2PFwQKBgQDj+KMhYbGXsoWWJyV8dzl/jOHc2axW6kc5\nPvnx48sMDgCwHSDTKC5h3IOrbBXTdAlbqztLMCyd7O0OTPFFBbBz4WdICPdl3n0h\nMYySReqjW/cG+ataLRNZ3p1DtKwxLDONSEEib0XyW2x2i4S8QMwUM31hbusbtBz6\ngBnUGJ1CzQKBgQCM/4GUW3FotqtzefRPVQnSoc0Ctk35HzqtqF0WGTIb5+9jcuay\nXOGclscih6F35kWXhLwP3M5SPLqCaw3RkVmnDAKJEjoilfAkNHqceFURqkKWwaem\njx2tzl2ahNB/VK5a8p+tN1KMobAT0PpzanrBMdNK2xFqdlJld35ddsYGgQKBgQCs\n7WFJJCMj0C6XLNC5rnK2N3bpIVEiiQpH+WZ9v265kTGiZiYNJtCwOSbD9PRFdyLW\nH3iV21As55kWnPTzh5JHBLdkpDCOXIwMjtpz5odLLaqf5um9OK4SINSolDd+AWqF\nhEasST4Ezqbi8YhZiMmFlV1JeGrtk93bgyqUgathDQKBgDrnDmIUr9czUIUHIiyz\nFuUDAVqzVAGNol3KknCGfxPssGj7ln+ml7b+db44QKloWxDvtXKiUEVBzYsTsTnz\nX40/oD5FlobeEYUNSIUza/SAhf8KzX6ISo/Ogk8YMd4mvZxeeXPFQHgHd3mJR1s9\ngnNcqCHEulwV+m9E3dnNU6ds\n-----END PRIVATE KEY-----\n", - "client_email": "firebase-adminsdk-6i4ka@mvp-masters.iam.gserviceaccount.com", - "client_id": "104648727229584211592", + "project_id": "agency-os-prod", + "private_key_id": "1e74e55e80a03fc705c995b8d2430f6d4761a281", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCUrVSjMy575tLw\n2bw10FkzfIRxgY0UWPvlhwH1o8iRV9PQMgPr4HmGwK9CmUIqa3LRdi4KzrrCPYoP\noBzMxJCuPSR9ii9XNdqH0uLolP05xOkfCpxUMR5dgS3ExreX+d9xwFVwjfoHRiuw\nNYoayYZrJakhmzmRAU5oiwVZzFtBilQKkvnQJbIIlovksczBE4xUlTz4xmrZWtvQ\nzEnthzxCDrdCvrw5YtafOGpPNg0rEbA9+IwykPWNR+YYVQXLuIKHNYQSV+SlmYAz\n9CdN3Yl+TIsX01aPMJ+gHPr3OhVTk3a97I6WJ7/NIIMDnEvnVU5dYn8j9GwxIWqP\nIWfs9NizAgMBAAECggEASlXLTnmlkR9ccj17A7DzGHH2SkYKwpSnBSCWUzmba0ft\nSFfpbALk4AHw3qx/z3O/iYi8Bn1MFRftslhMbfkNmYBKgVYYy1LKu0QuXTk4zqxs\nHjAQ72tLklanCo6MdrjhBh+y2D60NvTXnRd3wGLoCSRgRsQ0aRKtIEn51+b77W03\n7VLrXjoXdA6/J4X7NGXN12z4YCUnq7MjTcWoGKYnM0nnay8fFdQw598/CfZBY+zb\nYw9u9E8//OCmQ9p15nmcky+ZOq1lbjPLvOamErLHI+Z+bdRlqQugURItT6rTn4rs\nxxn+VqZ33TDo8iu5jOueEFyu6v/Irs/pQmWQjO/V6QKBgQDHDlqxeD05ac/Mus2m\ncUZesbZPEOLf1iuNRGGyZhUWIH63neCBtMxmpunG27u8Zcc4nOSDb8gVowkrBwRf\nxOT9QkW4Z++0CykMoZFrHySjrx6pgG5ylR6hutJZ8aI07uLU+H1DnkInQwmNrA38\njYu239ofZWsRYB/OXAtMLHqDtwKBgQC/NYcJkyADsZB+UNguwxwPxi2U6vaBh2a4\n+W2F0LI47tNkwXtfNPlDRdTwraoucKlPvu6gcHvSt+MQEPkx1gwdnIgiBoeooi4P\nLDUp4OKWdTPo+s4D0W8Z5h2l5/Fegu/Fn6l0iu8hldeAknttwrwTaoq7M+LeJtcX\nuW+Cjkcq5QKBgEMPi/BkIMQ56J8BhA0B9oIqfs/uUXC1l6CVHBDdIVd+BRLZJmys\nO3yN2Q58sqfK5i4ldTruqsrXTVxolcmp7LeB3zk8Et5mMCMoP3SGXnKiqcLTGOKT\naGl2Ji3VIR+SJ2s2eAUSyRivFgXbpC6khSBMFBElusd0yeJc0hWMmo3LAoGASilt\nvdX1pdkaDRQ4NTLx0GByT38uqyCkQ/xicXN3nMNs9Hhi7JN0VpZgOBVzm12RHeAV\nV98o95rhE9sxfBXkTxvmZSQZO9vjd3kTCbIy0F6XCrc0bqCtseLh/vZOVPT+IK2D\noTM9+s3ObwzhmLneDr3VHzTJupZf+NCwoneivM0CgYEAxIp4qoX/cBpUTfR2Q99r\nzaaYufgs4PcekDPXykJxrdjDmP5cOSIwyAUf6k1fTUB3qyhtlyq481K3dQBpKOP3\nbQAJrxl6w+/rNS2YIdjM9RXw1wHNiLd0RfaNtzdebdiILYzRzSLdBmtzwXKmw7Cu\ntS4FVx/E+qdHsOyggGub24k=\n-----END PRIVATE KEY-----\n", + "client_email": "firebase-adminsdk-fbsvc@agency-os-prod.iam.gserviceaccount.com", + "client_id": "102922480115315079115", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-6i4ka%40mvp-masters.iam.gserviceaccount.com", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-fbsvc%40agency-os-prod.iam.gserviceaccount.com", "universe_domain": "googleapis.com" } Index: src/api/invoice.ts =================================================================== --- src/api/invoice.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/api/invoice.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -81,5 +81,5 @@ // Add this interface for the create invoice payload interface CreateInvoicePayload { - createDate: Date; + issueDate: Date; dueDate: Date; items: any[]; Index: src/api/user.ts =================================================================== --- src/api/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/api/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,7 @@ +import { AuthUserType } from 'src/auth/types'; +import axiosInstance from 'src/utils/axios'; + +export async function getUser(): Promise { + const response = await axiosInstance.get('/api/user'); + return response.data; +} Index: src/app/api/customers/route.ts =================================================================== --- src/app/api/customers/route.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/api/customers/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -3,6 +3,5 @@ import prisma from 'src/lib/prisma'; import { authenticateRequest } from 'src/lib/auth-middleware'; -import { CustomerStatus } from '@prisma/client'; -import { Prisma } from '@prisma/client'; +import { Prisma, ClientStatus } from '@prisma/client'; export async function GET(request: NextRequest) { @@ -25,15 +24,27 @@ const validatedFilters = customerTableFiltersSchema.parse(filters); - // Replace Prisma query with raw SQL - const customers = await prisma.$queryRaw` - SELECT * FROM "Client" - WHERE "tenantId" = ${tenantId} - AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`}) - ${ - validatedFilters.status - ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"` - : Prisma.sql`AND TRUE` - } - `; + // const customers = await prisma.$queryRaw` + // SELECT * FROM "Client" + // WHERE "tenant_id" = ${tenantId} + // AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`}) + // ${ + // validatedFilters.status + // ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"` + // : Prisma.sql`AND TRUE` + // } + // `; + + const customers = await prisma.client.findMany({ + where: { + tenantId, + name: { + contains: validatedFilters.name, + mode: 'insensitive', + }, + ...(validatedFilters.status && { + status: validatedFilters.status as ClientStatus, + }), + }, + }); return NextResponse.json(customers); @@ -60,5 +71,4 @@ data: { ...validatedData, - // userId, tenantId, }, Index: src/app/api/invoices/[id]/route.ts =================================================================== --- src/app/api/invoices/[id]/route.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/api/invoices/[id]/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -100,5 +100,5 @@ data: { invoiceNumber: validation.data.invoiceNumber, - createDate: validation.data.createDate, + issueDate: validation.data.issueDate, dueDate: validation.data.dueDate, status: validation.data.status, Index: src/app/api/invoices/route.ts =================================================================== --- src/app/api/invoices/route.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/api/invoices/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -45,5 +45,5 @@ ? { equals: validatedFilters.status as InvoiceStatus } : undefined, - createDate: { + issueDate: { ...(validatedFilters.startDate && { gte: validatedFilters.startDate }), ...(validatedFilters.endDate && { lte: validatedFilters.endDate }), @@ -108,5 +108,5 @@ quantityType: validatedData.quantityType, subTotal: validatedData.subTotal, - createDate: validatedData.createDate, + issueDate: validatedData.issueDate, month: validatedData.month, discount: validatedData.discount, Index: src/app/api/invoices/totals/route.ts =================================================================== --- src/app/api/invoices/totals/route.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/api/invoices/totals/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -20,5 +20,5 @@ const searchParams = request.nextUrl.searchParams; const startDate = searchParams.get('startDate') - ? new Date(searchParams.get('startDate')!) + ? new Date(searchParams.get('issueDate')!) : null; @@ -32,8 +32,8 @@ status, currency, - SUM("totalAmount") as total + SUM("total_amount") as total FROM "Invoice" - WHERE "createDate" >= ${startDate} - AND "invoiceFromId" = ${tenantId} + WHERE "issue_date" >= ${startDate} + AND "tenant_id" = ${tenantId} GROUP BY status, currency `; Index: src/app/api/user/route.ts =================================================================== --- src/app/api/user/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/app/api/user/route.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,30 @@ +import { NextResponse } from 'next/server'; +import { authenticateRequest } from 'src/lib/auth-middleware'; +import { type NextRequest } from 'next/server'; +import prisma from 'src/lib/prisma'; + +export async function GET(request: NextRequest) { + try { + const authResult = await authenticateRequest(request); + + if (authResult instanceof NextResponse) { + return authResult; + } + + // Get user from Prisma + const user = await prisma.user.findUnique({ + where: { + id: authResult.userId, + }, + }); + + if (!user) { + return NextResponse.json({ error: 'User not found' }, { status: 404 }); + } + + return NextResponse.json(user); + } catch (error) { + console.error(error); + return NextResponse.json({ error: 'Internal server error' }, { status: 500 }); + } +} Index: src/app/dashboard/customer/list/page.tsx =================================================================== --- src/app/dashboard/customer/list/page.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/dashboard/customer/list/page.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -1,4 +1,4 @@ // sections -import { CustomerListView } from 'src/sections/user/view'; +import { CustomerListView } from 'src/sections/client/view'; // ---------------------------------------------------------------------- Index: src/app/dashboard/customer/new/page.tsx =================================================================== --- src/app/dashboard/customer/new/page.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/dashboard/customer/new/page.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -1,4 +1,4 @@ // sections -import { CustomerCreateView } from 'src/sections/user/view'; +import { CustomerCreateView } from 'src/sections/client/view'; // ---------------------------------------------------------------------- Index: src/app/error.tsx =================================================================== --- src/app/error.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/app/error.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,28 @@ +'use client'; + +import { useEffect } from 'react'; + +export default function Error({ + error, + reset, +}: { + error: Error & { digest?: string }; + reset: () => void; +}) { + useEffect(() => { + // Log the error to your error reporting service + console.error(error); + }, [error]); + + return ( +
+

Something went wrong!

+ +
+ ); +} Index: src/app/loading.tsx =================================================================== --- src/app/loading.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/loading.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -7,4 +7,8 @@ export default function Loading() { - return ; + return ( +
+
+
+ ); } Index: src/app/not-found.tsx =================================================================== --- src/app/not-found.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/app/not-found.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -1,4 +1,5 @@ // sections import { NotFoundView } from 'src/sections/error'; +import Link from 'next/link'; // ---------------------------------------------------------------------- @@ -8,5 +9,13 @@ }; -export default function NotFoundPage() { - return ; +export default function NotFound() { + return ( +
+

Page Not Found

+

Could not find requested resource

+ + Return Home + +
+ ); } Index: src/auth/context/firebase/auth-provider.tsx =================================================================== --- src/auth/context/firebase/auth-provider.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/auth/context/firebase/auth-provider.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -21,4 +21,5 @@ import { AuthContext } from './auth-context'; import { ActionMapType, AuthStateType, AuthUserType } from '../../types'; +import { getUser } from 'src/api/user'; // ---------------------------------------------------------------------- @@ -71,20 +72,23 @@ if (user) { if (user.emailVerified) { - const userProfile = doc(db, collections.administrator, user.uid); - - const docSnap = await getDoc(userProfile); - - const profile = docSnap.data(); - - dispatch({ - type: Types.INITIAL, - payload: { - user: { - ...user, - ...profile, - id: user.uid, + try { + const profile = await getUser(); + console.log('profile', profile); + + dispatch({ + type: Types.INITIAL, + payload: { + user: { ...profile, emailVerified: user.emailVerified }, }, - }, - }); + }); + } catch (error) { + console.error('Failed to fetch user profile:', error); + dispatch({ + type: Types.INITIAL, + payload: { + user: null, + }, + }); + } } else { dispatch({ @@ -145,15 +149,12 @@ const register = useCallback( async (email: string, password: string, firstName: string, lastName: string) => { - const newUser = await createUserWithEmailAndPassword(auth, email, password); - - await sendEmailVerification(newUser.user); - - const userProfile = doc(collection(db, collections.administrator), newUser.user?.uid); - - await setDoc(userProfile, { - uid: newUser.user?.uid, - email, - displayName: `${firstName} ${lastName}`, - }); + // const newUser = await createUserWithEmailAndPassword(auth, email, password); + // await sendEmailVerification(newUser.user); + // const userProfile = doc(collection(db, collections.administrator), newUser.user?.uid); + // await setDoc(userProfile, { + // uid: newUser.user?.uid, + // email, + // displayName: `${firstName} ${lastName}`, + // }); }, [] Index: src/layouts/dashboard/nav-horizontal.tsx =================================================================== --- src/layouts/dashboard/nav-horizontal.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/layouts/dashboard/nav-horizontal.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -41,5 +41,5 @@ data={navData} config={{ - currentRole: user?.role || 'admin', + currentRole: user?.role || 'ADMIN', }} /> Index: src/layouts/dashboard/nav-mini.tsx =================================================================== --- src/layouts/dashboard/nav-mini.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/layouts/dashboard/nav-mini.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -51,5 +51,5 @@ data={navData} config={{ - currentRole: user?.role || 'admin', + currentRole: user?.role || 'ADMIN', }} /> Index: src/layouts/dashboard/nav-vertical.tsx =================================================================== --- src/layouts/dashboard/nav-vertical.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/layouts/dashboard/nav-vertical.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -58,5 +58,5 @@ data={navData} config={{ - currentRole: user?.role || 'admin', + currentRole: user?.role || 'ADMIN', }} /> Index: src/lib/auth-middleware.ts =================================================================== --- src/lib/auth-middleware.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/lib/auth-middleware.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -21,14 +21,16 @@ try { // Verify the token - // const decodedToken = await auth.verifyIdToken(token); - // const userId = decodedToken.uid; - // const tenantId = decodedToken.customClaims?.tenantId || 'cm7lxc3p00000pb7kmdrxsfod'; + const decodedToken = await auth.verifyIdToken(token); + const userId = decodedToken.uid; - // if (!userId || !tenantId) { - // return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); - // } + const tenantId = decodedToken.customClaims?.tenantId || 'cm7lxc3p00000pb7kmdrxsfod'; - return { userId: 'nlswimR6mMQtirTNlMeqhqcSZeD3', tenantId: 'cm7lxc3p00000pb7kmdrxsfod' }; + if (!userId || !tenantId) { + return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); + } + + return { userId, tenantId: 'cm7lxc3p00000pb7kmdrxsfod' }; } catch (error) { + console.error('Error verifying token:', error); return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); } Index: src/schemas/invoice.ts =================================================================== --- src/schemas/invoice.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/schemas/invoice.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -67,5 +67,5 @@ ]), subTotal: z.number(), - createDate: z.coerce.date(), + issueDate: z.coerce.date(), month: monthSchema, discount: z.number().optional(), Index: src/schemas/models/user.ts =================================================================== --- src/schemas/models/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/schemas/models/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,7 @@ +import { z } from 'zod'; +import { userSchema, userRoleSchema } from '../user'; + +export type User = z.infer; +export type UserRole = z.infer; +export type NewUser = Omit; +export type UpdateUser = Omit; Index: src/schemas/user.ts =================================================================== --- src/schemas/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/schemas/user.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,26 @@ +import { z } from 'zod'; + +export const userRoleSchema = z.union([ + z.literal('ADMIN'), + z.literal('MANAGER'), + z.literal('USER'), +]); + +export const userSchema = z.object({ + id: z.string().optional(), + uid: z.string(), + email: z.string().email(), + displayName: z.string(), + role: userRoleSchema, + tenantId: z.string(), +}); + +export const newUserSchema = userSchema.omit({ + id: true, +}); + +export const updateUserSchema = userSchema.omit({ + id: true, + uid: true, + tenantId: true, +}); Index: src/sections/client/customer-new-edit-form.tsx =================================================================== --- src/sections/client/customer-new-edit-form.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/customer-new-edit-form.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,253 @@ +import * as Yup from 'yup'; +import { useCallback, useMemo } from 'react'; +import { useForm, Controller } from 'react-hook-form'; +import { zodResolver } from '@hookform/resolvers/zod'; +// @mui +import LoadingButton from '@mui/lab/LoadingButton'; +import Box from '@mui/material/Box'; +import Card from '@mui/material/Card'; +import Stack from '@mui/material/Stack'; +import Switch from '@mui/material/Switch'; +import Grid from '@mui/material/Unstable_Grid2'; +import Typography from '@mui/material/Typography'; +import FormControlLabel from '@mui/material/FormControlLabel'; +// utils +import { fData } from 'src/utils/format-number'; +// routes +import { paths } from 'src/routes/paths'; +import { useRouter } from 'src/routes/hooks'; +// types +import { Customer, NewCustomer, newCustomerSchema } from 'src/schemas'; +// components +import Label from 'src/components/label'; +import { useSnackbar } from 'src/components/snackbar'; +import FormProvider, { RHFTextField, RHFUploadAvatar } from 'src/components/hook-form'; +import uploadToFirebaseStorage from 'src/utils/upload-to-firebase-storage'; +import { addDoc, collection } from 'firebase/firestore'; +import { db } from 'src/lib/firebase'; +import { createCustomer } from 'src/api/customer'; + +// ---------------------------------------------------------------------- + +type Props = { + currentUser?: Customer; +}; + +export default function CustomerNewEditForm({ currentUser: currentCustomer }: Props) { + const router = useRouter(); + + const { enqueueSnackbar } = useSnackbar(); + + const defaultValues: NewCustomer = useMemo( + () => ({ + name: currentCustomer?.name || '', + representative: currentCustomer?.representative || '', + email: currentCustomer?.email || '', + logoUrl: currentCustomer?.logoUrl || null, + address: currentCustomer?.address || { + country: '', + state: '', + street: '', + zip: '', + city: '', + }, + vatNumber: currentCustomer?.vatNumber || '', + companyNumber: currentCustomer?.companyNumber || '', + id: currentCustomer?.id || '', + phoneNumber: currentCustomer?.phoneNumber || '', + status: 'active', + }), + [currentCustomer] + ); + + const methods = useForm({ + resolver: zodResolver(newCustomerSchema), + defaultValues, + }); + + const { + reset, + watch, + control, + setValue, + handleSubmit, + formState: { isSubmitting }, + } = methods; + + const values = watch(); + + const onSubmit = handleSubmit(async (data) => { + try { + // await new Promise((resolve) => setTimeout(resolve, 500)); + const logoFile = data.logoUrl as File & { preview: string }; + + const storagePath: string = `customers/${logoFile.name}`; + const logoUrl = await uploadToFirebaseStorage(logoFile, storagePath); + + await createCustomer({ ...data, logoUrl }); + + reset(); + enqueueSnackbar(currentCustomer ? 'Update success!' : 'Create success!'); + router.push(paths.dashboard.customer.list); + console.info('DATA', data); + } catch (error) { + console.error(error); + } + }); + + const handleDrop = useCallback( + (acceptedFiles: File[]) => { + const file = acceptedFiles[0]; + + const newFile = Object.assign(file, { + preview: URL.createObjectURL(file), + }); + + if (file) { + setValue('logoUrl', newFile, { shouldValidate: true }); + } + }, + [setValue] + ); + + return ( + + + + + {currentCustomer && ( + + )} + + + + Allowed *.jpeg, *.jpg, *.png, *.gif +
max size of {fData(3145728)} + + } + /> + + + {currentCustomer && ( + ( + + field.onChange(event.target.checked ? 'banned' : 'active') + } + /> + )} + /> + } + label={ + <> + + Banned + + + Apply disable account + + + } + sx={{ mx: 0, mb: 3, width: 1, justifyContent: 'space-between' }} + /> + )} + + + + + + + + + + + + + + {/* country.label)} + getOptionLabel={(option) => option} + isOptionEqualToValue={(option, value) => option === value} + renderOption={(props, option) => { + const { code, label, phone } = countries.filter( + (country) => country.label === option + )[0]; + + if (!label) { + return null; + } + + return ( +
  • + + {label} ({code}) +{phone} +
    • + ); + }} + /> */} + + + + + + + +     + + + + {!currentCustomer ? 'Create Customer' : 'Save Changes'} + + +     +     +     +     + ); +} Index: src/sections/client/customer-quick-edit-form.tsx =================================================================== --- src/sections/client/customer-quick-edit-form.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/customer-quick-edit-form.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,188 @@ +import * as Yup from 'yup'; +import { useMemo } from 'react'; +import { useForm } from 'react-hook-form'; +import { zodResolver } from '@hookform/resolvers/zod'; +// @mui +import LoadingButton from '@mui/lab/LoadingButton'; +import Box from '@mui/material/Box'; +import Alert from '@mui/material/Alert'; +import Button from '@mui/material/Button'; +import Dialog from '@mui/material/Dialog'; +import MenuItem from '@mui/material/MenuItem'; +import DialogTitle from '@mui/material/DialogTitle'; +import DialogActions from '@mui/material/DialogActions'; +import DialogContent from '@mui/material/DialogContent'; +// types +import { Customer, updateCustomerSchema } from 'src/schemas'; +// assets +import { countries } from 'src/assets/data'; +// components +import Iconify from 'src/components/iconify'; +import { useSnackbar } from 'src/components/snackbar'; +import FormProvider, { RHFSelect, RHFTextField, RHFAutocomplete } from 'src/components/hook-form'; +import { updateCustomer } from 'src/api/customer'; + +// ---------------------------------------------------------------------- + +export const USER_STATUS_OPTIONS = [ + { value: 'active', label: 'Active' }, + { value: 'banned', label: 'Banned' }, + { value: 'inactive', label: 'Inactive' }, +]; + +type Props = { + open: boolean; + onClose: VoidFunction; + currentCustomer?: Customer; +}; + +export default function CustomerQuickEditForm({ currentCustomer, open, onClose }: Props) { + const { enqueueSnackbar } = useSnackbar(); + + // @ts-ignore + const defaultValues: Customer = useMemo( + () => ({ + name: currentCustomer?.name || '', + representative: currentCustomer?.representative || '', + email: currentCustomer?.email || '', + logoUrl: currentCustomer?.logoUrl || '', + address: { + country: currentCustomer?.address?.country || '', + state: currentCustomer?.address?.state || '', + street: currentCustomer?.address?.street || '', + zip: currentCustomer?.address?.zip || '', + city: currentCustomer?.address?.city || '', + }, + vatNumber: currentCustomer?.vatNumber || '', + companyNumber: currentCustomer?.companyNumber || '', + id: currentCustomer?.id || '', + phoneNumber: currentCustomer?.phoneNumber || '', + status: currentCustomer?.status || '', + }), + [currentCustomer] + ); + + const methods = useForm({ + resolver: zodResolver(updateCustomerSchema), + defaultValues, + }); + + const { + reset, + handleSubmit, + formState: { isSubmitting }, + } = methods; + + const onSubmit = handleSubmit(async (data) => { + try { + console.log('currentCustomer', currentCustomer); + if (!currentCustomer) return; + console.log('data', data); + await updateCustomer(currentCustomer.id!, data); + + reset(); + onClose(); + enqueueSnackbar('Update success!'); + console.info('DATA', data); + } catch (error) { + console.error(error); + enqueueSnackbar('Update failed!', { variant: 'error' }); + } + }); + + return ( + + + Quick Update + + + {/* + Account is waiting for confirmation + */} + + + + + {USER_STATUS_OPTIONS.map((status) => ( + + {status.label} + + ))} + + + + + + + + + + + + {/* country.code)} + getOptionLabel={(option) => option} + renderOption={(props, option) => { + const { code, label, phone } = countries.filter( + (country) => country.label === option + )[0]; + + if (!label) { + return null; + } + + return ( +
  • + + {label} ({code}) +{phone} +
    • + ); + }} + /> */} + + + + + + + +     +     + + + + + + Update + + +     +     + ); +} Index: src/sections/client/customer-table-filters-result.tsx =================================================================== --- src/sections/client/customer-table-filters-result.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/customer-table-filters-result.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,109 @@ +// @mui +import Box from '@mui/material/Box'; +import Chip from '@mui/material/Chip'; +import Paper from '@mui/material/Paper'; +import Button from '@mui/material/Button'; +import Stack, { StackProps } from '@mui/material/Stack'; +// types + +// components +import Iconify from 'src/components/iconify'; +import { CustomerTableFilterValue, CustomerTableFilters } from 'src/schemas'; + +// ---------------------------------------------------------------------- + +type Props = StackProps & { + filters: CustomerTableFilters; + onFilters: (name: string, value: CustomerTableFilterValue) => void; + // + onResetFilters: VoidFunction; + // + results: number; +}; + +export default function CustomerTableFiltersResult({ + filters, + onFilters, + // + onResetFilters, + // + results, + ...other +}: Props) { + const handleRemoveStatus = () => { + onFilters('status', 'all'); + }; + + const handleRemoveRole = (inputValue: string) => { + const newValue = filters.role.filter((item) => item !== inputValue); + onFilters('role', newValue); + }; + + return ( + + + {results} + + results found + + + + + {filters.status !== 'all' && ( + + + + )} + + {!!filters.role.length && ( + + {filters.role.map((item) => ( + handleRemoveRole(item)} /> + ))} + + )} + + + + + ); +} + +// ---------------------------------------------------------------------- + +type BlockProps = StackProps & { + label: string; +}; + +function Block({ label, children, sx, ...other }: BlockProps) { + return ( + + + {label} + + + + {children} + + + ); +} Index: src/sections/client/customer-table-row.tsx =================================================================== --- src/sections/client/customer-table-row.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/customer-table-row.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,103 @@ +// @mui +import Avatar from '@mui/material/Avatar'; +import Tooltip from '@mui/material/Tooltip'; +import MenuItem from '@mui/material/MenuItem'; +import TableRow from '@mui/material/TableRow'; +import TableCell from '@mui/material/TableCell'; +import IconButton from '@mui/material/IconButton'; +// hooks +import { useBoolean } from 'src/hooks/use-boolean'; +// types +import { Customer } from 'src/schemas'; +// components +import Label from 'src/components/label'; +import Iconify from 'src/components/iconify'; +import CustomPopover, { usePopover } from 'src/components/custom-popover'; +// +import CustomerQuickEditForm from './customer-quick-edit-form'; + +// ---------------------------------------------------------------------- + +type Props = { + selected: boolean; + onEditRow: VoidFunction; + row: Customer; +}; + +export default function CustomerTableRow({ row, selected, onEditRow }: Props) { + const { name, logoUrl, representative, status, email, phoneNumber } = row; + + // const confirm = useBoolean(); + + const quickEdit = useBoolean(); + + // const popover = usePopover(); + + return ( + <> + + {/* + + */} + + + + {name} + + + {representative} + + {email} + + + + + + + + + + + + {/* + + + */} + + + + + + {/* + { + onEditRow(); + popover.onClose(); + }} + > + + Edit + + */} + + ); +} Index: src/sections/client/customer-table-toolbar.tsx =================================================================== --- src/sections/client/customer-table-toolbar.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/customer-table-toolbar.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,152 @@ +import { useCallback } from 'react'; +// @mui +import Stack from '@mui/material/Stack'; +import MenuItem from '@mui/material/MenuItem'; +import Checkbox from '@mui/material/Checkbox'; +import TextField from '@mui/material/TextField'; +import InputLabel from '@mui/material/InputLabel'; +import IconButton from '@mui/material/IconButton'; +import FormControl from '@mui/material/FormControl'; +import OutlinedInput from '@mui/material/OutlinedInput'; +import InputAdornment from '@mui/material/InputAdornment'; +import Select, { SelectChangeEvent } from '@mui/material/Select'; +// types +import { CustomerTableFilters, CustomerTableFilterValue } from 'src/schemas'; +// components +import Iconify from 'src/components/iconify'; +import CustomPopover, { usePopover } from 'src/components/custom-popover'; + +// ---------------------------------------------------------------------- + +type Props = { + filters: CustomerTableFilters; + onFilters: (name: string, value: CustomerTableFilterValue) => void; + // + roleOptions: string[]; +}; + +export default function CustomerTableToolbar({ + filters, + onFilters, + // + roleOptions, +}: Props) { + const popover = usePopover(); + + const handleFilterName = useCallback( + (event: React.ChangeEvent) => { + onFilters('name', event.target.value); + }, + [onFilters] + ); + + const handleFilterRole = useCallback( + (event: SelectChangeEvent) => { + onFilters( + 'role', + typeof event.target.value === 'string' ? event.target.value.split(',') : event.target.value + ); + }, + [onFilters] + ); + + return ( + <> + + + Role + + + + + + + + + ), + }} + /> + + + + + + + + + { + popover.onClose(); + }} + > + + Print + + + { + popover.onClose(); + }} + > + + Import + + + { + popover.onClose(); + }} + > + + Export + + + + ); +} Index: src/sections/client/view/customer-create-view.tsx =================================================================== --- src/sections/client/view/customer-create-view.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/view/customer-create-view.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,41 @@ +'use client'; + +// @mui +import Container from '@mui/material/Container'; +// routes +import { paths } from 'src/routes/paths'; +// components +import { useSettingsContext } from 'src/components/settings'; +import CustomBreadcrumbs from 'src/components/custom-breadcrumbs'; +// +import CustomerNewEditForm from '../customer-new-edit-form'; + +// ---------------------------------------------------------------------- + +export default function CustomerCreateView() { + const settings = useSettingsContext(); + + return ( + + + + + + ); +} Index: src/sections/client/view/customer-list-view.tsx =================================================================== --- src/sections/client/view/customer-list-view.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/view/customer-list-view.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,335 @@ +'use client'; + +import isEqual from 'lodash/isEqual'; +import { useState, useCallback } from 'react'; +// @mui +import { alpha } from '@mui/material/styles'; +import Tab from '@mui/material/Tab'; +import Tabs from '@mui/material/Tabs'; +import Card from '@mui/material/Card'; +import Table from '@mui/material/Table'; +import Button from '@mui/material/Button'; +import Container from '@mui/material/Container'; +import TableBody from '@mui/material/TableBody'; +import TableContainer from '@mui/material/TableContainer'; +// routes +import { paths } from 'src/routes/paths'; +import { RouterLink } from 'src/routes/components'; +// hooks +import { useBoolean } from 'src/hooks/use-boolean'; +// components +import Label from 'src/components/label'; +import Iconify from 'src/components/iconify'; +import Scrollbar from 'src/components/scrollbar'; +import { useSettingsContext } from 'src/components/settings'; +import CustomBreadcrumbs from 'src/components/custom-breadcrumbs'; +import { + useTable, + getComparator, + emptyRows, + TableNoData, + TableEmptyRows, + TableHeadCustom, + TablePaginationCustom, +} from 'src/components/table'; +// types +import { Customer, CustomerTableFilters, CustomerTableFilterValue } from 'src/schemas'; +// +import { useGetCustomers } from 'src/api/customer'; +import CustomerTableRow from '../customer-table-row'; +import CustomerTableFiltersResult from '../customer-table-filters-result'; +import { USER_STATUS_OPTIONS } from '../customer-quick-edit-form'; + +// ---------------------------------------------------------------------- + +const STATUS_OPTIONS = [{ value: 'all', label: 'All' }, ...USER_STATUS_OPTIONS]; + +const TABLE_HEAD = [ + { id: 'name', label: 'Name' }, + { id: 'representative', label: 'Representative', width: 220 }, + { id: 'email', label: 'Email' }, + { id: 'status', label: 'Status', width: 100 }, + { id: '', width: 88 }, +]; + +const defaultFilters: CustomerTableFilters = { + name: '', + role: [], + status: 'all', +}; + +// ---------------------------------------------------------------------- + +export default function CustomerListView() { + const table = useTable({ defaultDense: true, defaultRowsPerPage: 25 }); + + const settings = useSettingsContext(); + + // const router = useRouter(); + + const confirm = useBoolean(); + + const { customers } = useGetCustomers(); + + // const [tableData, setTableData] = useState(customers || []); + + const [filters, setFilters] = useState(defaultFilters); + + const dataFiltered = applyFilter({ + inputData: customers, + comparator: getComparator(table.order, table.orderBy), + filters, + }); + + const dataInPage = dataFiltered.slice( + table.page * table.rowsPerPage, + table.page * table.rowsPerPage + table.rowsPerPage + ); + + const denseHeight = table.dense ? 52 : 72; + + const canReset = !isEqual(defaultFilters, filters); + + const notFound = (!dataFiltered.length && canReset) || !dataFiltered.length; + + const handleFilters = useCallback( + (name: string, value: CustomerTableFilterValue) => { + table.onResetPage(); + setFilters((prevState) => ({ + ...prevState, + [name]: value, + })); + }, + [table] + ); + + // const handleDeleteRow = useCallback( + // (id: string) => { + // const deleteRow = customers.filter((row) => row.id !== id); + + // table.onUpdatePageDeleteRow(dataInPage.length); + // }, + // [dataInPage.length, table] + // ); + + // const handleDeleteRows = useCallback(() => { + // const deleteRows = tableData.filter((row) => !table.selected.includes(row.id)); + // setTableData(deleteRows); + + // table.onUpdatePageDeleteRows({ + // totalRows: tableData.length, + // totalRowsInPage: dataInPage.length, + // totalRowsFiltered: dataFiltered.length, + // }); + // }, [dataFiltered.length, dataInPage.length, table, tableData]); + + // const handleEditRow = useCallback( + // (id: string) => { + // router.push(paths.dashboard.user.edit(id)); + // }, + // [router] + // ); + + const handleFilterStatus = useCallback( + (event: React.SyntheticEvent, newValue: string) => { + handleFilters('status', newValue); + }, + [handleFilters] + ); + + const handleResetFilters = useCallback(() => { + setFilters(defaultFilters); + }, []); + + return ( + <> + + } + > + New Customer + + } + sx={{ + mb: { xs: 3, md: 5 }, + }} + /> + + + `inset 0 -2px 0 0 ${alpha(theme.palette.grey[500], 0.08)}`, + }} + > + {STATUS_OPTIONS.map((tab) => ( + + {tab.value === 'all' && customers.length} + + {tab.value === 'active' && + customers.filter((customer) => customer.status === 'active').length} + + {tab.value === 'banned' && + customers.filter((customer) => customer.status === 'banned').length} + + {tab.value === 'inactive' && + customers.filter((customer) => customer.status === 'inactive').length} + + } + /> + ))} + + + {canReset && ( + + )} + + + + + + + + {dataFiltered + .slice( + table.page * table.rowsPerPage, + table.page * table.rowsPerPage + table.rowsPerPage + ) + .map((row) => ( + {}} + /> + ))} + + + + + +
    +     +     + + +     +     + + {/* + Are you sure want to delete {table.selected.length} items? + + } + action={ + + } + /> */} + + ); +} + +// ---------------------------------------------------------------------- + +function applyFilter({ + inputData, + comparator, + filters, +}: { + inputData: Customer[]; + comparator: (a: any, b: any) => number; + filters: CustomerTableFilters; +}) { + const { name, status, role } = filters; + + const stabilizedThis = inputData.map((el, index) => [el, index] as const); + + stabilizedThis.sort((a, b) => { + const order = comparator(a[0], b[0]); + if (order !== 0) return order; + return a[1] - b[1]; + }); + + inputData = stabilizedThis.map((el) => el[0]); + + if (name) { + inputData = inputData.filter( + (user) => user.name.toLowerCase().indexOf(name.toLowerCase()) !== -1 + ); + } + + if (status !== 'all') { + inputData = inputData.filter((user) => user.status === status); + } + + return inputData; +} Index: src/sections/client/view/index.ts =================================================================== --- src/sections/client/view/index.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) +++ src/sections/client/view/index.ts (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -0,0 +1,2 @@ +export { default as CustomerListView } from './customer-list-view'; +export { default as CustomerCreateView } from './customer-create-view'; Index: src/sections/invoice/invoice-details.tsx =================================================================== --- src/sections/invoice/invoice-details.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-details.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -261,5 +261,5 @@ Date Issued - {fDate(invoice.createDate)} + {fDate(invoice.issueDate)} Index: src/sections/invoice/invoice-ee-pdf.tsx =================================================================== --- src/sections/invoice/invoice-ee-pdf.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-ee-pdf.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -129,5 +129,5 @@ discount, invoiceTo, - createDate, + issueDate, totalAmount, invoiceFrom, @@ -229,5 +229,5 @@ Date Issued - {fDate(createDate)} + {fDate(issueDate)} Index: src/sections/invoice/invoice-mk-pdf.tsx =================================================================== --- src/sections/invoice/invoice-mk-pdf.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-mk-pdf.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -113,5 +113,5 @@ discount, invoiceTo, - createDate, + issueDate, totalAmount, invoiceFrom, @@ -179,5 +179,5 @@ Date Issued - {fDate(createDate)} + {fDate(issueDate)} Index: src/sections/invoice/invoice-new-edit-form.tsx =================================================================== --- src/sections/invoice/invoice-new-edit-form.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-new-edit-form.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -81,5 +81,5 @@ const NewInvoiceSchema = Yup.object().shape({ invoiceNumber: Yup.string().nullable().required('Invoice number is required'), - createDate: Yup.mixed().nullable().required('Create date is required'), + issueDate: Yup.mixed().nullable().required('Create date is required'), dueDate: Yup.mixed() .required('Due date is required') @@ -87,5 +87,5 @@ 'date-min', 'Due date must be later than create date', - (value, { parent }) => value.getTime() > parent.createDate.getTime() + (value, { parent }) => value.getTime() > parent.issueDate.getTime() ), invoiceFrom: Yup.mixed().nullable().required('Invoice from is required'), @@ -117,5 +117,5 @@ ? currentInvoice?.invoiceNumber : incrementInvoiceNumber(tenant?.lastInvoiceNumber), - createDate: currentInvoice?.createDate ? new Date(currentInvoice.createDate) : new Date(), + issueDate: currentInvoice?.issueDate ? new Date(currentInvoice.issueDate) : new Date(), dueDate: currentInvoice?.dueDate ? new Date(currentInvoice.dueDate) @@ -175,10 +175,9 @@ // Ensure dates are valid Date objects - const createDate = - data.createDate instanceof Date ? data.createDate : new Date(data.createDate); + const issueDate = data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate); const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate); const currentTime = new Date(); - createDate.setHours( + issueDate.setHours( currentTime.getHours(), currentTime.getMinutes(), @@ -197,5 +196,5 @@ invoiceNumber: incrementInvoiceNumber(tenant?.lastInvoiceNumber), status: 'draft', - createDate, + issueDate, dueDate, items: items.filter((item) => item.service !== null) as CreateInvoice['items'], @@ -246,6 +245,6 @@ if (currentInvoice) { // Ensure dates are valid Date objects - const createDate = - data.createDate instanceof Date ? data.createDate : new Date(data.createDate); + const issueDate = + data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate); const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate); @@ -259,5 +258,5 @@ const writeData = { ...data, - createDate, + issueDate, dueDate, items, @@ -312,6 +311,6 @@ // Ensure dates are valid Date objects - const createDate = - data.createDate instanceof Date ? data.createDate : new Date(data.createDate); + const issueDate = + data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate); const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate); @@ -325,5 +324,5 @@ const writeData = { ...data, - createDate, + issueDate, dueDate, items, Index: src/sections/invoice/invoice-new-edit-status-date.tsx =================================================================== --- src/sections/invoice/invoice-new-edit-status-date.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-new-edit-status-date.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -109,5 +109,5 @@ ( Index: src/sections/invoice/invoice-table-row.tsx =================================================================== --- src/sections/invoice/invoice-table-row.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ src/sections/invoice/invoice-table-row.tsx (revision 87c9f1e792d5963b0e888520b84a76f31bd890fb) @@ -51,5 +51,5 @@ sent, invoiceNumber, - createDate, + issueDate, dueDate, status, @@ -60,5 +60,5 @@ } = row; - console.log(createDate); + console.log(issueDate); const confirmSend = useBoolean(); @@ -107,6 +107,6 @@ =', filters.startDate]], - orderBy: 'createDate', + where: [['issueDate', '>=', filters.startDate]], + orderBy: 'issueDate', direction: 'desc', }), @@ -275,6 +275,6 @@ async (invoice: Invoice) => { const serializedParams = JSON.stringify({ - where: [['createDate', '>=', filters.startDate]], - orderBy: 'createDate', + where: [['issueDate', '>=', filters.startDate]], + orderBy: 'issueDate', direction: 'desc', }); @@ -671,6 +671,6 @@ inputData = inputData.filter( (invoice) => - fTimestamp(invoice.createDate.getTime()) >= fTimestamp(startDate.getTime()) && - fTimestamp(invoice.createDate.getTime()) <= fTimestamp(endDate.getTime()) + fTimestamp(invoice.issueDate.getTime()) >= fTimestamp(startDate.getTime()) && + fTimestamp(invoice.issueDate.getTime()) <= fTimestamp(endDate.getTime()) ); } Index: c/sections/user/customer-new-edit-form.tsx =================================================================== --- src/sections/user/customer-new-edit-form.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,253 +1,0 @@ -import * as Yup from 'yup'; -import { useCallback, useMemo } from 'react'; -import { useForm, Controller } from 'react-hook-form'; -import { zodResolver } from '@hookform/resolvers/zod'; -// @mui -import LoadingButton from '@mui/lab/LoadingButton'; -import Box from '@mui/material/Box'; -import Card from '@mui/material/Card'; -import Stack from '@mui/material/Stack'; -import Switch from '@mui/material/Switch'; -import Grid from '@mui/material/Unstable_Grid2'; -import Typography from '@mui/material/Typography'; -import FormControlLabel from '@mui/material/FormControlLabel'; -// utils -import { fData } from 'src/utils/format-number'; -// routes -import { paths } from 'src/routes/paths'; -import { useRouter } from 'src/routes/hooks'; -// types -import { Customer, NewCustomer, newCustomerSchema } from 'src/schemas'; -// components -import Label from 'src/components/label'; -import { useSnackbar } from 'src/components/snackbar'; -import FormProvider, { RHFTextField, RHFUploadAvatar } from 'src/components/hook-form'; -import uploadToFirebaseStorage from 'src/utils/upload-to-firebase-storage'; -import { addDoc, collection } from 'firebase/firestore'; -import { db } from 'src/lib/firebase'; -import { createCustomer } from 'src/api/customer'; - -// ---------------------------------------------------------------------- - -type Props = { - currentUser?: Customer; -}; - -export default function CustomerNewEditForm({ currentUser: currentCustomer }: Props) { - const router = useRouter(); - - const { enqueueSnackbar } = useSnackbar(); - - const defaultValues: NewCustomer = useMemo( - () => ({ - name: currentCustomer?.name || '', - representative: currentCustomer?.representative || '', - email: currentCustomer?.email || '', - logoUrl: currentCustomer?.logoUrl || null, - address: currentCustomer?.address || { - country: '', - state: '', - street: '', - zip: '', - city: '', - }, - vatNumber: currentCustomer?.vatNumber || '', - companyNumber: currentCustomer?.companyNumber || '', - id: currentCustomer?.id || '', - phoneNumber: currentCustomer?.phoneNumber || '', - status: 'active', - }), - [currentCustomer] - ); - - const methods = useForm({ - resolver: zodResolver(newCustomerSchema), - defaultValues, - }); - - const { - reset, - watch, - control, - setValue, - handleSubmit, - formState: { isSubmitting }, - } = methods; - - const values = watch(); - - const onSubmit = handleSubmit(async (data) => { - try { - // await new Promise((resolve) => setTimeout(resolve, 500)); - const logoFile = data.logoUrl as File & { preview: string }; - - const storagePath: string = `customers/${logoFile.name}`; - const logoUrl = await uploadToFirebaseStorage(logoFile, storagePath); - - await createCustomer({ ...data, logoUrl }); - - reset(); - enqueueSnackbar(currentCustomer ? 'Update success!' : 'Create success!'); - router.push(paths.dashboard.customer.list); - console.info('DATA', data); - } catch (error) { - console.error(error); - } - }); - - const handleDrop = useCallback( - (acceptedFiles: File[]) => { - const file = acceptedFiles[0]; - - const newFile = Object.assign(file, { - preview: URL.createObjectURL(file), - }); - - if (file) { - setValue('logoUrl', newFile, { shouldValidate: true }); - } - }, - [setValue] - ); - - return ( - - - - - {currentCustomer && ( - - )} - - - - Allowed *.jpeg, *.jpg, *.png, *.gif -
    max size of {fData(3145728)} - - } - /> -     - - {currentCustomer && ( - ( - - field.onChange(event.target.checked ? 'banned' : 'active') - } - /> - )} - /> - } - label={ - <> - - Banned - - - Apply disable account - - - } - sx={{ mx: 0, mb: 3, width: 1, justifyContent: 'space-between' }} - /> - )} -     -     - - - - - - - - - - - - {/* country.label)} - getOptionLabel={(option) => option} - isOptionEqualToValue={(option, value) => option === value} - renderOption={(props, option) => { - const { code, label, phone } = countries.filter( - (country) => country.label === option - )[0]; - - if (!label) { - return null; - } - - return ( -
  • - - {label} ({code}) +{phone} -
    • - ); - }} - /> */} - - - - - - - -     - - - - {!currentCustomer ? 'Create Customer' : 'Save Changes'} - - -     -     -     -     - ); -} Index: c/sections/user/customer-quick-edit-form.tsx =================================================================== --- src/sections/user/customer-quick-edit-form.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,188 +1,0 @@ -import * as Yup from 'yup'; -import { useMemo } from 'react'; -import { useForm } from 'react-hook-form'; -import { zodResolver } from '@hookform/resolvers/zod'; -// @mui -import LoadingButton from '@mui/lab/LoadingButton'; -import Box from '@mui/material/Box'; -import Alert from '@mui/material/Alert'; -import Button from '@mui/material/Button'; -import Dialog from '@mui/material/Dialog'; -import MenuItem from '@mui/material/MenuItem'; -import DialogTitle from '@mui/material/DialogTitle'; -import DialogActions from '@mui/material/DialogActions'; -import DialogContent from '@mui/material/DialogContent'; -// types -import { Customer, updateCustomerSchema } from 'src/schemas'; -// assets -import { countries } from 'src/assets/data'; -// components -import Iconify from 'src/components/iconify'; -import { useSnackbar } from 'src/components/snackbar'; -import FormProvider, { RHFSelect, RHFTextField, RHFAutocomplete } from 'src/components/hook-form'; -import { updateCustomer } from 'src/api/customer'; - -// ---------------------------------------------------------------------- - -export const USER_STATUS_OPTIONS = [ - { value: 'active', label: 'Active' }, - { value: 'banned', label: 'Banned' }, - { value: 'inactive', label: 'Inactive' }, -]; - -type Props = { - open: boolean; - onClose: VoidFunction; - currentCustomer?: Customer; -}; - -export default function CustomerQuickEditForm({ currentCustomer, open, onClose }: Props) { - const { enqueueSnackbar } = useSnackbar(); - - // @ts-ignore - const defaultValues: Customer = useMemo( - () => ({ - name: currentCustomer?.name || '', - representative: currentCustomer?.representative || '', - email: currentCustomer?.email || '', - logoUrl: currentCustomer?.logoUrl || '', - address: { - country: currentCustomer?.address?.country || '', - state: currentCustomer?.address?.state || '', - street: currentCustomer?.address?.street || '', - zip: currentCustomer?.address?.zip || '', - city: currentCustomer?.address?.city || '', - }, - vatNumber: currentCustomer?.vatNumber || '', - companyNumber: currentCustomer?.companyNumber || '', - id: currentCustomer?.id || '', - phoneNumber: currentCustomer?.phoneNumber || '', - status: currentCustomer?.status || '', - }), - [currentCustomer] - ); - - const methods = useForm({ - resolver: zodResolver(updateCustomerSchema), - defaultValues, - }); - - const { - reset, - handleSubmit, - formState: { isSubmitting }, - } = methods; - - const onSubmit = handleSubmit(async (data) => { - try { - console.log('currentCustomer', currentCustomer); - if (!currentCustomer) return; - console.log('data', data); - await updateCustomer(currentCustomer.id!, data); - - reset(); - onClose(); - enqueueSnackbar('Update success!'); - console.info('DATA', data); - } catch (error) { - console.error(error); - enqueueSnackbar('Update failed!', { variant: 'error' }); - } - }); - - return ( - - - Quick Update - - - {/* - Account is waiting for confirmation - */} - - - - - {USER_STATUS_OPTIONS.map((status) => ( - - {status.label} - - ))} - - - - - - - - - - - - {/* country.code)} - getOptionLabel={(option) => option} - renderOption={(props, option) => { - const { code, label, phone } = countries.filter( - (country) => country.label === option - )[0]; - - if (!label) { - return null; - } - - return ( -
  • - - {label} ({code}) +{phone} -
    • - ); - }} - /> */} - - - - - - - -     -     - - - - - - Update - - -     -     - ); -} Index: c/sections/user/customer-table-filters-result.tsx =================================================================== --- src/sections/user/customer-table-filters-result.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,109 +1,0 @@ -// @mui -import Box from '@mui/material/Box'; -import Chip from '@mui/material/Chip'; -import Paper from '@mui/material/Paper'; -import Button from '@mui/material/Button'; -import Stack, { StackProps } from '@mui/material/Stack'; -// types - -// components -import Iconify from 'src/components/iconify'; -import { CustomerTableFilterValue, CustomerTableFilters } from 'src/schemas'; - -// ---------------------------------------------------------------------- - -type Props = StackProps & { - filters: CustomerTableFilters; - onFilters: (name: string, value: CustomerTableFilterValue) => void; - // - onResetFilters: VoidFunction; - // - results: number; -}; - -export default function CustomerTableFiltersResult({ - filters, - onFilters, - // - onResetFilters, - // - results, - ...other -}: Props) { - const handleRemoveStatus = () => { - onFilters('status', 'all'); - }; - - const handleRemoveRole = (inputValue: string) => { - const newValue = filters.role.filter((item) => item !== inputValue); - onFilters('role', newValue); - }; - - return ( - - - {results} - - results found - - - - - {filters.status !== 'all' && ( - - - - )} - - {!!filters.role.length && ( - - {filters.role.map((item) => ( - handleRemoveRole(item)} /> - ))} - - )} - - - - - ); -} - -// ---------------------------------------------------------------------- - -type BlockProps = StackProps & { - label: string; -}; - -function Block({ label, children, sx, ...other }: BlockProps) { - return ( - - - {label} - - - - {children} - - - ); -} Index: c/sections/user/customer-table-row.tsx =================================================================== --- src/sections/user/customer-table-row.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,103 +1,0 @@ -// @mui -import Avatar from '@mui/material/Avatar'; -import Tooltip from '@mui/material/Tooltip'; -import MenuItem from '@mui/material/MenuItem'; -import TableRow from '@mui/material/TableRow'; -import TableCell from '@mui/material/TableCell'; -import IconButton from '@mui/material/IconButton'; -// hooks -import { useBoolean } from 'src/hooks/use-boolean'; -// types -import { Customer } from 'src/schemas'; -// components -import Label from 'src/components/label'; -import Iconify from 'src/components/iconify'; -import CustomPopover, { usePopover } from 'src/components/custom-popover'; -// -import CustomerQuickEditForm from './customer-quick-edit-form'; - -// ---------------------------------------------------------------------- - -type Props = { - selected: boolean; - onEditRow: VoidFunction; - row: Customer; -}; - -export default function CustomerTableRow({ row, selected, onEditRow }: Props) { - const { name, logoUrl, representative, status, email, phoneNumber } = row; - - // const confirm = useBoolean(); - - const quickEdit = useBoolean(); - - // const popover = usePopover(); - - return ( - <> - - {/* - - */} - - - - {name} - - - {representative} - - {email} - - - - - - - - - - - - {/* - - - */} - - - - - - {/* - { - onEditRow(); - popover.onClose(); - }} - > - - Edit - - */} - - ); -} Index: c/sections/user/customer-table-toolbar.tsx =================================================================== --- src/sections/user/customer-table-toolbar.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,152 +1,0 @@ -import { useCallback } from 'react'; -// @mui -import Stack from '@mui/material/Stack'; -import MenuItem from '@mui/material/MenuItem'; -import Checkbox from '@mui/material/Checkbox'; -import TextField from '@mui/material/TextField'; -import InputLabel from '@mui/material/InputLabel'; -import IconButton from '@mui/material/IconButton'; -import FormControl from '@mui/material/FormControl'; -import OutlinedInput from '@mui/material/OutlinedInput'; -import InputAdornment from '@mui/material/InputAdornment'; -import Select, { SelectChangeEvent } from '@mui/material/Select'; -// types -import { CustomerTableFilters, CustomerTableFilterValue } from 'src/schemas'; -// components -import Iconify from 'src/components/iconify'; -import CustomPopover, { usePopover } from 'src/components/custom-popover'; - -// ---------------------------------------------------------------------- - -type Props = { - filters: CustomerTableFilters; - onFilters: (name: string, value: CustomerTableFilterValue) => void; - // - roleOptions: string[]; -}; - -export default function CustomerTableToolbar({ - filters, - onFilters, - // - roleOptions, -}: Props) { - const popover = usePopover(); - - const handleFilterName = useCallback( - (event: React.ChangeEvent) => { - onFilters('name', event.target.value); - }, - [onFilters] - ); - - const handleFilterRole = useCallback( - (event: SelectChangeEvent) => { - onFilters( - 'role', - typeof event.target.value === 'string' ? event.target.value.split(',') : event.target.value - ); - }, - [onFilters] - ); - - return ( - <> - - - Role - - - - - - - - - ), - }} - /> - - - - - - - - - { - popover.onClose(); - }} - > - - Print - - - { - popover.onClose(); - }} - > - - Import - - - { - popover.onClose(); - }} - > - - Export - - - - ); -} Index: c/sections/user/view/customer-create-view.tsx =================================================================== --- src/sections/user/view/customer-create-view.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,41 +1,0 @@ -'use client'; - -// @mui -import Container from '@mui/material/Container'; -// routes -import { paths } from 'src/routes/paths'; -// components -import { useSettingsContext } from 'src/components/settings'; -import CustomBreadcrumbs from 'src/components/custom-breadcrumbs'; -// -import CustomerNewEditForm from '../customer-new-edit-form'; - -// ---------------------------------------------------------------------- - -export default function CustomerCreateView() { - const settings = useSettingsContext(); - - return ( - - - - - - ); -} Index: c/sections/user/view/customer-list-view.tsx =================================================================== --- src/sections/user/view/customer-list-view.tsx (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,335 +1,0 @@ -'use client'; - -import isEqual from 'lodash/isEqual'; -import { useState, useCallback } from 'react'; -// @mui -import { alpha } from '@mui/material/styles'; -import Tab from '@mui/material/Tab'; -import Tabs from '@mui/material/Tabs'; -import Card from '@mui/material/Card'; -import Table from '@mui/material/Table'; -import Button from '@mui/material/Button'; -import Container from '@mui/material/Container'; -import TableBody from '@mui/material/TableBody'; -import TableContainer from '@mui/material/TableContainer'; -// routes -import { paths } from 'src/routes/paths'; -import { RouterLink } from 'src/routes/components'; -// hooks -import { useBoolean } from 'src/hooks/use-boolean'; -// components -import Label from 'src/components/label'; -import Iconify from 'src/components/iconify'; -import Scrollbar from 'src/components/scrollbar'; -import { useSettingsContext } from 'src/components/settings'; -import CustomBreadcrumbs from 'src/components/custom-breadcrumbs'; -import { - useTable, - getComparator, - emptyRows, - TableNoData, - TableEmptyRows, - TableHeadCustom, - TablePaginationCustom, -} from 'src/components/table'; -// types -import { Customer, CustomerTableFilters, CustomerTableFilterValue } from 'src/schemas'; -// -import { useGetCustomers } from 'src/api/customer'; -import CustomerTableRow from '../customer-table-row'; -import CustomerTableFiltersResult from '../customer-table-filters-result'; -import { USER_STATUS_OPTIONS } from '../customer-quick-edit-form'; - -// ---------------------------------------------------------------------- - -const STATUS_OPTIONS = [{ value: 'all', label: 'All' }, ...USER_STATUS_OPTIONS]; - -const TABLE_HEAD = [ - { id: 'name', label: 'Name' }, - { id: 'representative', label: 'Representative', width: 220 }, - { id: 'email', label: 'Email' }, - { id: 'status', label: 'Status', width: 100 }, - { id: '', width: 88 }, -]; - -const defaultFilters: CustomerTableFilters = { - name: '', - role: [], - status: 'all', -}; - -// ---------------------------------------------------------------------- - -export default function CustomerListView() { - const table = useTable({ defaultDense: true, defaultRowsPerPage: 25 }); - - const settings = useSettingsContext(); - - // const router = useRouter(); - - const confirm = useBoolean(); - - const { customers } = useGetCustomers(); - - // const [tableData, setTableData] = useState(customers || []); - - const [filters, setFilters] = useState(defaultFilters); - - const dataFiltered = applyFilter({ - inputData: customers, - comparator: getComparator(table.order, table.orderBy), - filters, - }); - - const dataInPage = dataFiltered.slice( - table.page * table.rowsPerPage, - table.page * table.rowsPerPage + table.rowsPerPage - ); - - const denseHeight = table.dense ? 52 : 72; - - const canReset = !isEqual(defaultFilters, filters); - - const notFound = (!dataFiltered.length && canReset) || !dataFiltered.length; - - const handleFilters = useCallback( - (name: string, value: CustomerTableFilterValue) => { - table.onResetPage(); - setFilters((prevState) => ({ - ...prevState, - [name]: value, - })); - }, - [table] - ); - - // const handleDeleteRow = useCallback( - // (id: string) => { - // const deleteRow = customers.filter((row) => row.id !== id); - - // table.onUpdatePageDeleteRow(dataInPage.length); - // }, - // [dataInPage.length, table] - // ); - - // const handleDeleteRows = useCallback(() => { - // const deleteRows = tableData.filter((row) => !table.selected.includes(row.id)); - // setTableData(deleteRows); - - // table.onUpdatePageDeleteRows({ - // totalRows: tableData.length, - // totalRowsInPage: dataInPage.length, - // totalRowsFiltered: dataFiltered.length, - // }); - // }, [dataFiltered.length, dataInPage.length, table, tableData]); - - // const handleEditRow = useCallback( - // (id: string) => { - // router.push(paths.dashboard.user.edit(id)); - // }, - // [router] - // ); - - const handleFilterStatus = useCallback( - (event: React.SyntheticEvent, newValue: string) => { - handleFilters('status', newValue); - }, - [handleFilters] - ); - - const handleResetFilters = useCallback(() => { - setFilters(defaultFilters); - }, []); - - return ( - <> - - } - > - New Customer - - } - sx={{ - mb: { xs: 3, md: 5 }, - }} - /> - - - `inset 0 -2px 0 0 ${alpha(theme.palette.grey[500], 0.08)}`, - }} - > - {STATUS_OPTIONS.map((tab) => ( - - {tab.value === 'all' && customers.length} - - {tab.value === 'active' && - customers.filter((customer) => customer.status === 'active').length} - - {tab.value === 'banned' && - customers.filter((customer) => customer.status === 'banned').length} - - {tab.value === 'inactive' && - customers.filter((customer) => customer.status === 'inactive').length} - - } - /> - ))} - - - {canReset && ( - - )} - - - - - - - - {dataFiltered - .slice( - table.page * table.rowsPerPage, - table.page * table.rowsPerPage + table.rowsPerPage - ) - .map((row) => ( - {}} - /> - ))} - - - - - -
    -     -     - - -     -     - - {/* - Are you sure want to delete {table.selected.length} items? - - } - action={ - - } - /> */} - - ); -} - -// ---------------------------------------------------------------------- - -function applyFilter({ - inputData, - comparator, - filters, -}: { - inputData: Customer[]; - comparator: (a: any, b: any) => number; - filters: CustomerTableFilters; -}) { - const { name, status, role } = filters; - - const stabilizedThis = inputData.map((el, index) => [el, index] as const); - - stabilizedThis.sort((a, b) => { - const order = comparator(a[0], b[0]); - if (order !== 0) return order; - return a[1] - b[1]; - }); - - inputData = stabilizedThis.map((el) => el[0]); - - if (name) { - inputData = inputData.filter( - (user) => user.name.toLowerCase().indexOf(name.toLowerCase()) !== -1 - ); - } - - if (status !== 'all') { - inputData = inputData.filter((user) => user.status === status); - } - - return inputData; -} Index: c/sections/user/view/index.ts =================================================================== --- src/sections/user/view/index.ts (revision 3c5302a84bc603a5b071d8babfaca46443a0e1c8) +++ (revision ) @@ -1,2 +1,0 @@ -export { default as CustomerListView } from './customer-list-view'; -export { default as CustomerCreateView } from './customer-create-view';