Hello {userName},
+We noticed you left some items in your shopping cart. Don't miss out on these great products!
+Click below to return to your cart and complete your purchase:
++ Return to Cart +
+If you have any questions, feel free to reply to this email.
+Thanks,
The {appTitle} team
Hello Admin,
+The following product is running low on stock and needs your attention:
+ +Current Stock: {{currentStock}}
+SKU: {{productSku}}
+Please restock this item as soon as possible to avoid missed sales.
+ +Hi there,
+An item you've been watching in your wishlist is now on sale at {appTitle}!
+ +The {2} team
`, }, + abandonedCart: { + subject: `You left something in your cart!`, + body: ` +Hello {0},
+We noticed you left some items in your shopping cart. Don't miss out on these great products!
+Click below to return to your cart and complete your purchase:
+ +Thanks,
+The {2} team
+ `, + }, }, }; diff --git a/backend/src/services/notifications/lowStock.js b/backend/src/services/notifications/lowStock.js new file mode 100644 index 0000000..7f584d5 --- /dev/null +++ b/backend/src/services/notifications/lowStock.js @@ -0,0 +1,52 @@ + +const EmailSender = require('../email'); +const db = require('../../db/models'); +const fs = require('fs'); +const path = require('path'); +const config = require('../../config'); + +class LowStockNotificationService { + static async notify(productId) { + try { + const product = await db.products.findByPk(productId); + if (!product) return; + + // Threshold is 5 + if (product.stock > 5) return; + + const templatePath = path.join(__dirname, '../email/htmlTemplates/lowStock/lowStockEmail.html'); + let html = fs.readFileSync(templatePath, 'utf8'); + + html = html.replace('{{productTitle}}', product.title); + html = html.replace('{{currentStock}}', product.stock); + html = html.replace('{{productSku}}', product.sku || 'N/A'); + html = html.replace('{{productUrl}}', `${config.uiUrl}/products/products-edit?id=${product.id}`); + + // Find all admins + const adminRole = await db.roles.findOne({ where: { name: 'Administrator' } }); + if (!adminRole) return; + + const admins = await db.users.findAll({ where: { app_roleId: adminRole.id } }); + + for (const admin of admins) { + if (admin.email) { + const emailOptions = { + to: admin.email, + subject: `⚠️ Low Stock Alert: ${product.title}`, + html: html + }; + + if (EmailSender.isConfigured) { + await new EmailSender(emailOptions).send(); + } else { + console.log('Email not configured, skipping low stock notification to', admin.email); + } + } + } + } catch (error) { + console.error('Error in LowStockNotificationService:', error); + } + } +} + +module.exports = LowStockNotificationService; diff --git a/backend/src/services/notifications/wishlistSale.js b/backend/src/services/notifications/wishlistSale.js new file mode 100644 index 0000000..fe8a1fe --- /dev/null +++ b/backend/src/services/notifications/wishlistSale.js @@ -0,0 +1,51 @@ +const db = require('../../db/models'); +const EmailSender = require('../email'); +const WishlistSaleEmail = require('../email/list/wishlistSale'); + +class WishlistNotificationService { + static async notifySale(productId) { + try { + const product = await db.products.findByPk(productId); + if (!product || !product.sale_price) return; + + const wishlists = await db.wishlists.findAll({ + where: { productId }, + include: [{ model: db.users, as: 'user' }] + }); + + console.log(`Found ${wishlists.length} wishlist entries for product ${productId}`); + + for (const wishlist of wishlists) { + if (!wishlist.user || !wishlist.user.email) continue; + + const productUrl = `${process.env.FRONTEND_URL || 'http://localhost:3001'}/products/${product.id}`; + + // Ensure sale_price is treated as a number + const salePriceNum = Number(product.sale_price); + const salePriceFormatted = isNaN(salePriceNum) ? `$${product.sale_price}` : `$${salePriceNum.toFixed(2)}`; + + const email = new WishlistSaleEmail( + wishlist.user.email, + product.title, + productUrl, + salePriceFormatted + ); + + if (EmailSender.isConfigured) { + try { + await new EmailSender(email).send(); + console.log(`Wishlist sale notification sent to ${wishlist.user.email}`); + } catch (sendErr) { + console.error(`Failed to send wishlist email to ${wishlist.user.email}:`, sendErr); + } + } else { + console.log(`Email not configured. Skipping send to ${wishlist.user.email}`); + } + } + } catch (error) { + console.error('Error in WishlistNotificationService.notifySale:', error); + } + } +} + +module.exports = WishlistNotificationService; \ No newline at end of file diff --git a/backend/src/services/products.js b/backend/src/services/products.js index 458d58f..c30ebbd 100644 --- a/backend/src/services/products.js +++ b/backend/src/services/products.js @@ -1,3 +1,4 @@ +const WishlistNotificationService = require('./notifications/wishlistSale'); const db = require('../db/models'); const ProductsDBApi = require('../db/api/products'); const processFile = require("../middlewares/upload"); @@ -15,6 +16,13 @@ module.exports = class ProductsService { static async create(data, currentUser) { const transaction = await db.sequelize.transaction(); try { + // If user is a seller, set sellerId to currentUser.id + // We check if app_role exists and has name 'Seller' or if shopName is set + const user = await db.users.findByPk(currentUser.id, { include: [{ model: db.roles, as: 'app_role' }] }); + if (user && (user.app_role?.name === 'Seller' || user.sellerStatus === 'approved')) { + data.sellerId = user.id; + } + await ProductsDBApi.create( data, { @@ -79,6 +87,11 @@ module.exports = class ProductsService { ); } + // Security check: only seller of this product or admin can update + if (currentUser.app_role?.name !== 'Administrator' && products.sellerId && products.sellerId !== currentUser.id) { + throw new Error('Forbidden: You can only update your own products'); + } + const updatedProducts = await ProductsDBApi.update( id, data, @@ -88,6 +101,10 @@ module.exports = class ProductsService { }, ); + if (data.sale_price) { + WishlistNotificationService.notifySale(id); + } + await transaction.commit(); return updatedProducts; @@ -95,44 +112,23 @@ module.exports = class ProductsService { await transaction.rollback(); throw error; } - }; + } static async deleteByIds(ids, currentUser) { - const transaction = await db.sequelize.transaction(); - - try { - await ProductsDBApi.deleteByIds(ids, { - currentUser, - transaction, - }); - - await transaction.commit(); - } catch (error) { - await transaction.rollback(); - throw error; - } + // Security check: only seller or admin + const products = await db.products.findAll({ where: { id: ids } }); + if (currentUser.app_role?.name !== 'Administrator') { + const unauthorized = products.some(p => p.sellerId && p.sellerId !== currentUser.id); + if (unauthorized) throw new Error('Forbidden'); + } + return await ProductsDBApi.deleteByIds(ids, { currentUser }); } static async remove(id, currentUser) { - const transaction = await db.sequelize.transaction(); - - try { - await ProductsDBApi.remove( - id, - { - currentUser, - transaction, - }, - ); - - await transaction.commit(); - } catch (error) { - await transaction.rollback(); - throw error; - } + const product = await db.products.findByPk(id); + if (currentUser.app_role?.name !== 'Administrator' && product.sellerId && product.sellerId !== currentUser.id) { + throw new Error('Forbidden'); + } + return await ProductsDBApi.remove(id, { currentUser }); } - - -}; - - +}; \ No newline at end of file diff --git a/backend/src/services/search.js b/backend/src/services/search.js index e78015c..d53997f 100644 --- a/backend/src/services/search.js +++ b/backend/src/services/search.js @@ -9,12 +9,16 @@ const Op = Sequelize.Op; * @param {object} currentUser */ async function checkPermissions(permission, currentUser) { - if (!currentUser) { - throw new ValidationError('auth.unauthorized'); + // For public storefront search, we might allow certain tables + const publicAllowed = ['READ_PRODUCTS', 'READ_CATEGORIES']; + if (publicAllowed.includes(permission)) { + return true; + } + return false; } - const userPermission = currentUser.custom_permissions.find( + const userPermission = currentUser.custom_permissions?.find( (cp) => cp.name === permission, ); @@ -24,212 +28,83 @@ async function checkPermissions(permission, currentUser) { try { if (!currentUser.app_role) { - throw new ValidationError('auth.forbidden'); + return false; } const permissions = await currentUser.app_role.getPermissions(); return !!permissions.find((p) => p.name === permission); } catch (e) { - throw e; + return false; } } module.exports = class SearchService { + static async autocomplete(searchQuery, currentUser) { + if (!searchQuery || searchQuery.length < 2) { + return []; + } + + try { + const results = []; + + // 1. Search Products + const hasProductPermission = await checkPermissions('READ_PRODUCTS', currentUser); + if (hasProductPermission) { + const products = await db.products.findAll({ + where: { + [Op.or]: [ + { title: { [Op.iLike]: `%${searchQuery}%` } }, + { sku: { [Op.iLike]: `%${searchQuery}%` } } + ] + }, + limit: 5, + attributes: ['id', 'title', 'price', 'slug'] + }); + results.push(...products.map(p => ({ ...p.toJSON(), type: 'product' }))); + } + + // 2. Search Categories + const hasCategoryPermission = await checkPermissions('READ_CATEGORIES', currentUser); + if (hasCategoryPermission) { + const categories = await db.categories.findAll({ + where: { + name: { [Op.iLike]: `%${searchQuery}%` } + }, + limit: 3, + attributes: ['id', 'name', 'slug'] + }); + results.push(...categories.map(c => ({ ...c.toJSON(), type: 'category' }))); + } + + return results; + } catch (error) { + console.error('Autocomplete Error:', error); + return []; + } + } + static async search(searchQuery, currentUser ) { try { if (!searchQuery) { throw new ValidationError('iam.errors.searchQueryRequired'); } const tableColumns = { - - - - - - "users": [ - - "firstName", - - "lastName", - - "phoneNumber", - - "email", - - ], - - - - - - - - - "products": [ - - "title", - - "slug", - - "description", - - "sku", - - ], - - - - - - - "categories": [ - - "name", - - "slug", - - "description", - - ], - - - - - - - "orders": [ - - "order_number", - - "shipping_address", - - "billing_address", - - ], - - - - - - - "order_items": [ - - "name", - - ], - - - - - - - "carts": [ - - "session_id", - - ], - - - - - - - "cart_items": [ - - "name", - - ], - - - - - - - "payments": [ - - "stripe_payment_id", - - "currency", - - ], - - + "users": ["firstName", "lastName", "phoneNumber", "email"], + "products": ["title", "slug", "description", "sku"], + "categories": ["name", "slug", "description"], + "orders": ["order_number", "shipping_address", "billing_address"], + "order_items": ["name"], + "carts": ["session_id"], + "cart_items": ["name"], + "payments": ["stripe_payment_id", "currency"], }; const columnsInt = { - - - - - - - - - - - "products": [ - - "price", - - "stock", - - ], - - - - - - - - - - "orders": [ - - "total", - - ], - - - - - - "order_items": [ - - "quantity", - - "unit_price", - - "total_price", - - ], - - - - - - - - - - "cart_items": [ - - "quantity", - - "unit_price", - - ], - - - - - - "payments": [ - - "amount", - - ], - - + "products": ["price", "stock"], + "orders": ["total"], + "order_items": ["quantity", "unit_price", "total_price"], + "cart_items": ["quantity", "unit_price"], + "payments": ["amount"], }; let allFoundRecords = []; @@ -254,8 +129,6 @@ module.exports = class SearchService { ], }; - - const hasPermission = await checkPermissions(`READ_${tableName.toUpperCase()}`, currentUser); if (!hasPermission) { continue; diff --git a/backend/src/services/seller.js b/backend/src/services/seller.js new file mode 100644 index 0000000..5978c98 --- /dev/null +++ b/backend/src/services/seller.js @@ -0,0 +1,48 @@ + +const db = require('../db/models'); + +class SellerService { + static async apply(userId, { shopName, shopDescription }) { + const user = await db.users.findByPk(userId); + if (!user) throw new Error('User not found'); + + await user.update({ + shopName, + shopDescription, + sellerStatus: 'pending' + }); + + return { success: true, message: 'Application submitted successfully' }; + } + + static async getStatus(userId) { + const user = await db.users.findByPk(userId); + return { status: user.sellerStatus, shopName: user.shopName }; + } + + static async getPendingApplications() { + return await db.users.findAll({ + where: { sellerStatus: 'pending' } + }); + } + + static async reviewApplication(userId, status) { + const user = await db.users.findByPk(userId); + if (!user) throw new Error('User not found'); + + const updateData = { sellerStatus: status }; + + if (status === 'approved') { + // Find Seller role + const sellerRole = await db.roles.findOne({ where: { name: 'Seller' } }); + if (sellerRole) { + updateData.app_roleId = sellerRole.id; + } + } + + await user.update(updateData); + return { success: true, status }; + } +} + +module.exports = SellerService; diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs index 89767ec..0c817b7 100644 --- a/frontend/next.config.mjs +++ b/frontend/next.config.mjs @@ -1,32 +1,31 @@ -/** - * @type {import('next').NextConfig} - */ - -const output = process.env.NODE_ENV === 'production' ? 'export' : 'standalone'; - const nextConfig = { -trailingSlash: true, - distDir: 'build', - output, - basePath: "", - devIndicators: { - position: 'bottom-left', - }, - typescript: { - ignoreBuildErrors: true, - }, - eslint: { - ignoreDuringBuilds: true, - }, - images: { - unoptimized: true, - remotePatterns: [ - { - protocol: 'https', - hostname: '**', - }, - ], - }, - -} - +/** + * @type {import('next').NextConfig} + */ + +const output = process.env.NODE_ENV === 'production' ? 'export' : 'standalone'; + const nextConfig = { +trailingSlash: true, + distDir: 'build', + output, + basePath: "", + devIndicators: { + position: 'bottom-left', + }, + typescript: { + ignoreBuildErrors: true, + }, + eslint: { + ignoreDuringBuilds: true, + }, + images: { + unoptimized: true, + remotePatterns: [ + { + protocol: 'https', + hostname: '**', + }, + ], + }, +} + export default nextConfig \ No newline at end of file diff --git a/frontend/src/components/CountdownTimer.tsx b/frontend/src/components/CountdownTimer.tsx new file mode 100644 index 0000000..2b0003b --- /dev/null +++ b/frontend/src/components/CountdownTimer.tsx @@ -0,0 +1,57 @@ +import React, { useState, useEffect } from 'react'; + +interface CountdownTimerProps { + targetDate: string; +} + +const CountdownTimer: React.FC{item.title || item.name}
++ {item.type} {item.price ? `• $${Number(item.price).toFixed(2)}` : ''} +
+Total Page Views
+Product Views
+Category Views
+${item.product?.price}
+No view data available yet.
} +No trend data available yet.
} +Loading applications...
+ ) : applications.length > 0 ? ( +| User | +Shop Name | +Description | +Actions | +
|---|---|---|---|
|
+ {app.firstName} {app.lastName}
+ {app.email}
+ |
+ {app.shopName} | +{app.shopDescription} | +
+
+
+ |
+
No pending seller applications.
+{discountError}
} + {appliedDiscount && ( +
@@ -170,11 +250,6 @@ export default function CartPage() {
- 
- 
- - {`${widgetsRole?.role?.label || 'Users'}'s widgets`} -
- )} -