ken/coldemailer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ken:features/pagination
Branches Tags
ken:main ken:features/gmail_sender ken:feature/customer-list-filters ken:features/pagination ken:features/csvimport ken:features/emailtemplate ken:features/customer_record
..
compare: ken:features/emailtemplate
Branches Tags
ken:features/gmail_sender ken:main ken:feature/customer-list-filters ken:features/pagination ken:features/csvimport ken:features/emailtemplate ken:features/customer_record

1 Commits
features/p ... features/e

Author SHA1 Message Date
Ken Yasue
ba479a671c save work 2025-03-25 11:29:54 +01:00
25 changed files with 399 additions and 1763 deletions
Expand all files Collapse all files

7
doc/prompts/11 Email template Normal file
View File

@ -0,0 +1,7 @@
I want add EmailTemplate Model
Tablename: EmailTemplate
id, content, modifiedAt, createdAt
Create branch features/emailtemplate
Make CRUD operation UI in Admin console
Then commit changes

5
doc/prompts/11. EmailTemplate CRUD
View File

@ -1,5 +0,0 @@
Please add model EmailTemplate and make CRUD UI in admin console.
ModelName: EmailTamplate
id, content, modifiedAt, createdAt
create branch features/emailtemplate first and commit changes in the end

11
doc/prompts/12 csv import
View File

@ -1,11 +0,0 @@
Please make script to import following csv to Customer model
City,Name,Website URL,Email
"Tokyo","teamLab Planets TOKYO","http://www.teamlab.art/e/planets/","null"
"Tokyo","Tokyo National Museum","http://www.tnm.jp/","null"
"Tokyo","Nezu Museum","http://www.nezu-muse.or.jp/","null"
- Name should be unique.
- Also if there are same email address skip the row.
Create new branch features/csvimport and commit when you finished

2
doc/prompts/13. Pagination
View File

@ -1,2 +0,0 @@
Please implement pagination to all list pages in admin
create new branch and please work in the branch

6
package-lock.json generated
View File

@ -19,7 +19,6 @@
"@editorjs/paragraph": "^2.11.7", "@editorjs/paragraph": "^2.11.7",
"@editorjs/quote": "^2.7.6", "@editorjs/quote": "^2.7.6",
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"csv-parse": "^5.6.0",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"mysql2": "^3.13.0", "mysql2": "^3.13.0",
"next": "15.2.2", "next": "15.2.2",
@ -2765,11 +2764,6 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/csv-parse": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.6.0.tgz",
"integrity": "sha512-l3nz3euub2QMg5ouu5U09Ew9Wf6/wQ8I++ch1loQ0ljmzhmfZYrH9fflS22i/PQEvsPvxCwxgz5q7UB8K1JO4Q=="
},
"node_modules/damerau-levenshtein": { "node_modules/damerau-levenshtein": {
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",

4
package.json
View File

@ -8,8 +8,7 @@
"start": "next start", "start": "next start",
"lint": "next lint", "lint": "next lint",
"create-test-user": "npx ts-node -P tsconfig.scripts.json src/scripts/create-test-user.ts", "create-test-user": "npx ts-node -P tsconfig.scripts.json src/scripts/create-test-user.ts",
"reset-database": "npx ts-node -P tsconfig.scripts.json src/scripts/reset-database.ts", "reset-database": "npx ts-node -P tsconfig.scripts.json src/scripts/reset-database.ts"
"import-customers": "npx ts-node -P tsconfig.scripts.json src/scripts/import-customers.ts"
}, },
"dependencies": { "dependencies": {
"@editorjs/code": "^2.9.3", "@editorjs/code": "^2.9.3",
@ -23,7 +22,6 @@
"@editorjs/paragraph": "^2.11.7", "@editorjs/paragraph": "^2.11.7",
"@editorjs/quote": "^2.7.6", "@editorjs/quote": "^2.7.6",
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"csv-parse": "^5.6.0",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"mysql2": "^3.13.0", "mysql2": "^3.13.0",
"next": "15.2.2", "next": "15.2.2",

67
src/app/(admin)/admin/contact-records/page.tsx
View File

@ -4,7 +4,6 @@ import { useState, useEffect, FormEvent } from 'react';
import Link from 'next/link'; import Link from 'next/link';
import { useRouter, useSearchParams } from 'next/navigation'; import { useRouter, useSearchParams } from 'next/navigation';
import { CONTACT_TYPES } from '@/lib/constants'; import { CONTACT_TYPES } from '@/lib/constants';
import Pagination from '@/lib/components/Pagination';
interface Customer { interface Customer {
id: string; id: string;
@ -20,18 +19,6 @@ interface ContactRecord {
customer: Customer; customer: Customer;
} }
interface PaginationInfo {
page: number;
pageSize: number;
totalCount: number;
totalPages: number;
}
interface ContactRecordsResponse {
data: ContactRecord[];
pagination: PaginationInfo;
}
export default function ContactRecordsList() { export default function ContactRecordsList() {
const router = useRouter(); const router = useRouter();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
@ -41,26 +28,16 @@ export default function ContactRecordsList() {
const initialContactType = searchParams.get('contactType') || ''; const initialContactType = searchParams.get('contactType') || '';
const initialDateFrom = searchParams.get('dateFrom') || ''; const initialDateFrom = searchParams.get('dateFrom') || '';
const initialDateTo = searchParams.get('dateTo') || ''; const initialDateTo = searchParams.get('dateTo') || '';
const initialPage = parseInt(searchParams.get('page') || '1');
const initialPageSize = parseInt(searchParams.get('pageSize') || '10');
// State for filters // State for filters
const [customerId, setCustomerId] = useState(initialCustomerId); const [customerId, setCustomerId] = useState(initialCustomerId);
const [contactType, setContactType] = useState(initialContactType); const [contactType, setContactType] = useState(initialContactType);
const [dateFrom, setDateFrom] = useState(initialDateFrom); const [dateFrom, setDateFrom] = useState(initialDateFrom);
const [dateTo, setDateTo] = useState(initialDateTo); const [dateTo, setDateTo] = useState(initialDateTo);
const [page, setPage] = useState(initialPage);
const [pageSize, setPageSize] = useState(initialPageSize);
// State for data // State for data
const [contactRecords, setContactRecords] = useState<ContactRecord[]>([]); const [contactRecords, setContactRecords] = useState<ContactRecord[]>([]);
const [customers, setCustomers] = useState<Customer[]>([]); const [customers, setCustomers] = useState<Customer[]>([]);
const [pagination, setPagination] = useState<PaginationInfo>({
page: initialPage,
pageSize: initialPageSize,
totalCount: 0,
totalPages: 0
});
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
@ -83,21 +60,19 @@ export default function ContactRecordsList() {
fetchCustomers(); fetchCustomers();
}, []); }, []);
// Fetch contact records with filters and pagination // Fetch contact records with filters
useEffect(() => { useEffect(() => {
const fetchContactRecords = async () => { const fetchContactRecords = async () => {
setIsLoading(true); setIsLoading(true);
setError(null); setError(null);
try { try {
// Build query string with filters and pagination // Build query string with filters
const params = new URLSearchParams(); const params = new URLSearchParams();
if (customerId) params.append('customerId', customerId); if (customerId) params.append('customerId', customerId);
if (contactType) params.append('contactType', contactType); if (contactType) params.append('contactType', contactType);
if (dateFrom) params.append('dateFrom', dateFrom); if (dateFrom) params.append('dateFrom', dateFrom);
if (dateTo) params.append('dateTo', dateTo); if (dateTo) params.append('dateTo', dateTo);
params.append('page', initialPage.toString());
params.append('pageSize', initialPageSize.toString());
const response = await fetch(`/api/contact-records?${params.toString()}`); const response = await fetch(`/api/contact-records?${params.toString()}`);
@ -105,9 +80,8 @@ export default function ContactRecordsList() {
throw new Error('Failed to fetch contact records'); throw new Error('Failed to fetch contact records');
} }
const responseData: ContactRecordsResponse = await response.json(); const data = await response.json();
setContactRecords(responseData.data); setContactRecords(data);
setPagination(responseData.pagination);
} catch (err) { } catch (err) {
console.error('Error fetching contact records:', err); console.error('Error fetching contact records:', err);
setError(err instanceof Error ? err.message : 'An error occurred'); setError(err instanceof Error ? err.message : 'An error occurred');
@ -116,21 +90,22 @@ export default function ContactRecordsList() {
} }
}; };
fetchContactRecords(); // Only fetch if we have URL parameters or if this is the initial load
}, [initialCustomerId, initialContactType, initialDateFrom, initialDateTo, initialPage, initialPageSize]); if (initialCustomerId || initialContactType || initialDateFrom || initialDateTo || isLoading) {
fetchContactRecords();
}
}, [initialCustomerId, initialContactType, initialDateFrom, initialDateTo]);
// Handle filter form submission // Handle filter form submission
const handleFilterSubmit = (e: FormEvent) => { const handleFilterSubmit = (e: FormEvent) => {
e.preventDefault(); e.preventDefault();
// Reset to page 1 when applying new filters // Build query string with filters
const params = new URLSearchParams(); const params = new URLSearchParams();
if (customerId) params.append('customerId', customerId); if (customerId) params.append('customerId', customerId);
if (contactType) params.append('contactType', contactType); if (contactType) params.append('contactType', contactType);
if (dateFrom) params.append('dateFrom', dateFrom); if (dateFrom) params.append('dateFrom', dateFrom);
if (dateTo) params.append('dateTo', dateTo); if (dateTo) params.append('dateTo', dateTo);
params.append('page', '1'); // Reset to page 1
params.append('pageSize', pageSize.toString());
// Update URL with filters // Update URL with filters
router.push(`/admin/contact-records?${params.toString()}`); router.push(`/admin/contact-records?${params.toString()}`);
@ -142,19 +117,7 @@ export default function ContactRecordsList() {
setContactType(''); setContactType('');
setDateFrom(''); setDateFrom('');
setDateTo(''); setDateTo('');
router.push(`/admin/contact-records?page=1&pageSize=${pageSize}`); router.push('/admin/contact-records');
};
// Handle page change
const handlePageChange = (newPage: number) => {
setPage(newPage);
// Build query string with current filters and new page
const params = new URLSearchParams(searchParams.toString());
params.set('page', newPage.toString());
// Update URL with new page
router.push(`/admin/contact-records?${params.toString()}`);
}; };
return ( return (
@ -345,14 +308,6 @@ export default function ContactRecordsList() {
</tbody> </tbody>
</table> </table>
</div> </div>
{/* Pagination */}
<Pagination
currentPage={pagination.page}
totalPages={pagination.totalPages}
totalItems={pagination.totalCount}
pageSize={pagination.pageSize}
onPageChange={handlePageChange}
/>
</div> </div>
)} )}
</> </>

355
src/app/(admin)/admin/customers/page.tsx
View File

@ -1,103 +1,20 @@
'use client';
import { useState, useEffect } from 'react';
import Link from 'next/link'; import Link from 'next/link';
import { useRouter, useSearchParams } from 'next/navigation'; import { getDataSource, Customer } from '@/lib/database';
import DeleteButton from './DeleteButton'; import DeleteButton from './DeleteButton';
import Pagination from '@/lib/components/Pagination';
interface Customer { export default async function AdminCustomers() {
id: string; // Fetch customers from the database
name: string; const dataSource = await getDataSource();
url: string; const customerRepository = dataSource.getRepository(Customer);
email: string;
createdAt: string;
modifiedAt: string;
}
interface PaginationInfo { const customers = await customerRepository.find({
page: number; order: { createdAt: 'DESC' }
pageSize: number;
totalCount: number;
totalPages: number;
}
interface CustomersResponse {
data: Customer[];
pagination: PaginationInfo;
}
export default function AdminCustomers() {
const router = useRouter();
const searchParams = useSearchParams();
// Get pagination values from URL params
const initialPage = parseInt(searchParams.get('page') || '1');
const initialPageSize = parseInt(searchParams.get('pageSize') || '10');
// State for pagination
const [page, setPage] = useState(initialPage);
const [pageSize, setPageSize] = useState(initialPageSize);
// State for data
const [customers, setCustomers] = useState<Customer[]>([]);
const [pagination, setPagination] = useState<PaginationInfo>({
page: initialPage,
pageSize: initialPageSize,
totalCount: 0,
totalPages: 0
}); });
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// Fetch customers with pagination
useEffect(() => {
const fetchCustomers = async () => {
setIsLoading(true);
setError(null);
try {
// Build query string with pagination
const params = new URLSearchParams();
params.append('page', initialPage.toString());
params.append('pageSize', initialPageSize.toString());
const response = await fetch(`/api/customers?${params.toString()}`);
if (!response.ok) {
throw new Error('Failed to fetch customers');
}
const responseData: CustomersResponse = await response.json();
setCustomers(responseData.data);
setPagination(responseData.pagination);
} catch (err) {
console.error('Error fetching customers:', err);
setError(err instanceof Error ? err.message : 'An error occurred');
} finally {
setIsLoading(false);
}
};
fetchCustomers();
}, [initialPage, initialPageSize]);
// Handle page change
const handlePageChange = (newPage: number) => {
setPage(newPage);
// Build query string with new page
const params = new URLSearchParams(searchParams.toString());
params.set('page', newPage.toString());
// Update URL with new page
router.push(`/admin/customers?${params.toString()}`);
};
return ( return (
<div> <div>
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<h1 className="text-2xl font-semibold text-gray-900 dark:text-gray-100">Customers</h1> <h1 className="text-2xl font-semibold text-gray-900">Customers</h1>
<Link <Link
href="/admin/customers/new" href="/admin/customers/new"
className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
@ -106,158 +23,126 @@ export default function AdminCustomers() {
</Link> </Link>
</div> </div>
{/* Error Message */} <div className="mt-8 flex flex-col">
{error && ( <div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div className="bg-red-50 border-l-4 border-red-400 p-4 my-4 dark:bg-red-900/20 dark:border-red-500"> <div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
<div className="flex"> <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
<div className="flex-shrink-0"> <table className="min-w-full divide-y divide-gray-300">
<svg className="h-5 w-5 text-red-400 dark:text-red-300" viewBox="0 0 20 20" fill="currentColor"> <thead className="bg-gray-50">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" /> <tr>
</svg> <th
</div> scope="col"
<div className="ml-3"> className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"
<p className="text-sm text-red-700 dark:text-red-300">{error}</p> >
</div> ID
</div> </th>
</div> <th
)} scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
{/* Loading State */} >
{isLoading ? ( Name
<div className="text-center py-8"> </th>
<p className="text-gray-500 dark:text-gray-400">Loading customers...</p> <th
</div> scope="col"
) : ( className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<div className="mt-8 flex flex-col"> >
<div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8"> URL
<div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8"> </th>
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg"> <th
<table className="min-w-full divide-y divide-gray-300 dark:divide-gray-700"> scope="col"
<thead className="bg-gray-50 dark:bg-gray-700"> className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<tr> >
<th Email
scope="col" </th>
className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-200 sm:pl-6" <th
> scope="col"
ID className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
</th> >
<th Created
scope="col" </th>
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <th
> scope="col"
Name className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
</th> >
<th Modified
scope="col" </th>
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6">
> <span className="sr-only">Actions</span>
URL </th>
</th> </tr>
<th </thead>
scope="col" <tbody className="divide-y divide-gray-200 bg-white">
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" {customers.length > 0 ? (
> customers.map((customer) => (
Email <tr key={customer.id}>
</th> <td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
<th <Link
scope="col" href={`/admin/customers/detail/${customer.id}`}
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" className="text-indigo-600 hover:text-indigo-900"
> >
Created {customer.id.substring(0, 8)}...
</th> </Link>
<th </td>
scope="col" <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <Link
> href={`/admin/customers/detail/${customer.id}`}
Modified className="text-indigo-600 hover:text-indigo-900"
</th> >
<th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6"> {customer.name}
<span className="sr-only">Actions</span> </Link>
</th> </td>
</tr> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
</thead> {customer.url ? (
<tbody className="divide-y divide-gray-200 bg-white dark:bg-gray-800 dark:divide-gray-700">
{customers.length > 0 ? (
customers.map((customer) => (
<tr key={customer.id}>
<td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-200 sm:pl-6">
<Link
href={`/admin/customers/detail/${customer.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300"
>
{customer.id.substring(0, 8)}...
</Link>
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
<Link
href={`/admin/customers/detail/${customer.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300"
>
{customer.name}
</Link>
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{customer.url ? (
<a
href={customer.url.startsWith('http') ? customer.url : `https://${customer.url}`}
target="_blank"
rel="noopener noreferrer"
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300"
>
{customer.url}
</a>
) : (
<span className="text-gray-400 dark:text-gray-500">-</span>
)}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
<a <a
href={`mailto:${customer.email}`} href={customer.url.startsWith('http') ? customer.url : `https://${customer.url}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300" target="_blank"
rel="noopener noreferrer"
className="text-indigo-600 hover:text-indigo-900"
> >
{customer.email} {customer.url}
</a> </a>
</td> ) : (
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400"> <span className="text-gray-400">-</span>
{new Date(customer.createdAt).toLocaleDateString()} )}
</td> </td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400"> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{new Date(customer.modifiedAt).toLocaleDateString()} <a
</td> href={`mailto:${customer.email}`}
<td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6"> className="text-indigo-600 hover:text-indigo-900"
<Link >
href={`/admin/customers/edit/${customer.id}`} {customer.email}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300 mr-4" </a>
> </td>
Edit <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
</Link> {new Date(customer.createdAt).toLocaleDateString()}
<DeleteButton customerId={customer.id} customerName={customer.name} /> </td>
</td> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
</tr> {new Date(customer.modifiedAt).toLocaleDateString()}
)) </td>
) : ( <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<tr> <Link
<td colSpan={7} className="py-4 pl-4 pr-3 text-sm text-gray-500 dark:text-gray-400 text-center"> href={`/admin/customers/edit/${customer.id}`}
No customers found. Create your first customer! className="text-indigo-600 hover:text-indigo-900 mr-4"
>
Edit
</Link>
<DeleteButton customerId={customer.id} customerName={customer.name} />
</td> </td>
</tr> </tr>
)} ))
</tbody> ) : (
</table> <tr>
<td colSpan={7} className="py-4 pl-4 pr-3 text-sm text-gray-500 text-center">
{/* Pagination */} No customers found. Create your first customer!
<Pagination </td>
currentPage={pagination.page} </tr>
totalPages={pagination.totalPages} )}
totalItems={pagination.totalCount} </tbody>
pageSize={pagination.pageSize} </table>
onPageChange={handlePageChange}
/>
</div>
</div> </div>
</div> </div>
</div> </div>
)} </div>
</div> </div>
); );
} }

68
src/app/(admin)/admin/email-templates/DeleteButton.tsx
View File

@ -1,68 +0,0 @@
'use client';
import { useState } from 'react';
import { useRouter } from 'next/navigation';
interface DeleteButtonProps {
templateId: string;
}
export default function DeleteButton({ templateId }: DeleteButtonProps) {
const router = useRouter();
const [isDeleting, setIsDeleting] = useState(false);
const [showConfirm, setShowConfirm] = useState(false);
const handleDelete = async () => {
if (isDeleting) return;
setIsDeleting(true);
try {
const response = await fetch(`/api/email-templates/${templateId}`, {
method: 'DELETE',
});
if (!response.ok) {
throw new Error('Failed to delete email template');
}
// Refresh the page to show updated list
router.refresh();
} catch (error) {
console.error('Error deleting email template:', error);
alert('Failed to delete email template');
} finally {
setIsDeleting(false);
setShowConfirm(false);
}
};
return (
<>
{showConfirm ? (
<span className="inline-flex items-center">
<button
onClick={handleDelete}
className="text-red-600 hover:text-red-900 mr-2"
disabled={isDeleting}
>
{isDeleting ? 'Deleting...' : 'Confirm'}
</button>
<button
onClick={() => setShowConfirm(false)}
className="text-gray-600 hover:text-gray-900"
disabled={isDeleting}
>
Cancel
</button>
</span>
) : (
<button
onClick={() => setShowConfirm(true)}
className="text-red-600 hover:text-red-900"
>
Delete
</button>
)}
</>
);
}

188
src/app/(admin)/admin/email-templates/components/EditEmailTemplate.tsx
View File

@ -1,188 +0,0 @@
'use client';
import { useState, useEffect, FormEvent, ChangeEvent } from 'react';
import { useRouter } from 'next/navigation';
import Link from 'next/link';
interface EmailTemplate {
id: string;
title: string;
content: string;
createdAt: string;
modifiedAt: string;
}
interface EditEmailTemplateProps {
id?: string; // Optional for new template
}
export default function EditEmailTemplate({ id }: EditEmailTemplateProps) {
const router = useRouter();
const [formData, setFormData] = useState({
title: '',
content: '',
});
const [isLoading, setIsLoading] = useState(!!id); // Only loading if editing
const [isSubmitting, setIsSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null);
// Fetch email template data if editing
useEffect(() => {
const fetchEmailTemplate = async () => {
if (!id) {
setIsLoading(false);
return;
}
try {
const response = await fetch(`/api/email-templates/${id}`);
if (!response.ok) {
throw new Error('Failed to fetch email template');
}
const template: EmailTemplate = await response.json();
setFormData({
title: template.title,
content: template.content,
});
setIsLoading(false);
} catch (err) {
setError('Failed to load email template data');
setIsLoading(false);
}
};
fetchEmailTemplate();
}, [id]);
const handleChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
const { name, value } = e.target;
setFormData((prev) => ({ ...prev, [name]: value }));
};
const handleSubmit = async (e: FormEvent) => {
e.preventDefault();
setIsSubmitting(true);
setError(null);
try {
// Validate form
if (!formData.title || !formData.content) {
throw new Error('Title and content are required');
}
// Determine if creating or updating
const url = id ? `/api/email-templates/${id}` : '/api/email-templates';
const method = id ? 'PUT' : 'POST';
// Submit the form
const response = await fetch(url, {
method,
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(formData),
});
if (!response.ok) {
const data = await response.json();
throw new Error(data.error || `Failed to ${id ? 'update' : 'create'} email template`);
}
// Redirect to email templates list on success
router.push('/admin/email-templates');
router.refresh();
} catch (err) {
setError(err instanceof Error ? err.message : 'An error occurred');
setIsSubmitting(false);
}
};
if (isLoading) {
return <div className="text-center py-10">Loading...</div>;
}
return (
<div>
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-semibold text-gray-900">
{id ? 'Edit Email Template' : 'Add New Email Template'}
</h1>
<Link
href="/admin/email-templates"
className="text-indigo-600 hover:text-indigo-900"
>
Back to Email Templates
</Link>
</div>
{error && (
<div className="bg-red-50 border-l-4 border-red-400 p-4 mb-6">
<div className="flex">
<div className="flex-shrink-0">
<svg className="h-5 w-5 text-red-400" viewBox="0 0 20 20" fill="currentColor">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" />
</svg>
</div>
<div className="ml-3">
<p className="text-sm text-red-700">{error}</p>
</div>
</div>
</div>
)}
<form onSubmit={handleSubmit} className="bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4">
<div className="mb-4">
<label className="block text-gray-700 text-sm font-bold mb-2" htmlFor="title">
Title
</label>
<input
className="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
id="title"
type="text"
name="title"
value={formData.title}
onChange={handleChange}
placeholder="Email template title"
required
/>
</div>
<div className="mb-6">
<label className="block text-gray-700 text-sm font-bold mb-2" htmlFor="content">
Content
</label>
<textarea
className="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
id="content"
name="content"
value={formData.content}
onChange={handleChange}
placeholder="Email template content"
rows={10}
required
/>
</div>
<div className="flex items-center justify-between">
<button
className="bg-indigo-600 hover:bg-indigo-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline disabled:opacity-50"
type="submit"
disabled={isSubmitting}
>
{isSubmitting ? (id ? 'Updating...' : 'Creating...') : (id ? 'Update Template' : 'Create Template')}
</button>
<Link
href="/admin/email-templates"
className="inline-block align-baseline font-bold text-sm text-indigo-600 hover:text-indigo-800"
>
Cancel
</Link>
</div>
</form>
</div>
);
}

102
src/app/(admin)/admin/email-templates/detail/[id]/page.tsx
View File

@ -1,102 +0,0 @@
import Link from 'next/link';
import { getDataSource, EmailTemplate } from '@/lib/database';
export default async function EmailTemplateDetailPage(props: { params: Promise<{ id: string }> }) {
const { id } = await props.params;
// Fetch email template from the database
const dataSource = await getDataSource();
const emailTemplateRepository = dataSource.getRepository(EmailTemplate);
const emailTemplate = await emailTemplateRepository.findOne({
where: { id }
});
if (!emailTemplate) {
return (
<div>
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-semibold text-gray-900">Email Template Not Found</h1>
<Link
href="/admin/email-templates"
className="text-indigo-600 hover:text-indigo-900"
>
Back to Email Templates
</Link>
</div>
<div className="bg-red-50 border-l-4 border-red-400 p-4">
<div className="flex">
<div className="flex-shrink-0">
<svg className="h-5 w-5 text-red-400" viewBox="0 0 20 20" fill="currentColor">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" />
</svg>
</div>
<div className="ml-3">
<p className="text-sm text-red-700">The requested email template could not be found.</p>
</div>
</div>
</div>
</div>
);
}
return (
<div>
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-semibold text-gray-900">Email Template Details</h1>
<div className="flex space-x-4">
<Link
href={`/admin/email-templates/edit/${emailTemplate.id}`}
className="text-indigo-600 hover:text-indigo-900"
>
Edit
</Link>
<Link
href="/admin/email-templates"
className="text-indigo-600 hover:text-indigo-900"
>
Back to Email Templates
</Link>
</div>
</div>
<div className="bg-white shadow overflow-hidden sm:rounded-lg">
<div className="px-4 py-5 sm:px-6">
<h3 className="text-lg leading-6 font-medium text-gray-900">Template Information</h3>
</div>
<div className="border-t border-gray-200">
<dl>
<div className="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt className="text-sm font-medium text-gray-500">ID</dt>
<dd className="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{emailTemplate.id}</dd>
</div>
<div className="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt className="text-sm font-medium text-gray-500">Created At</dt>
<dd className="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{new Date(emailTemplate.createdAt).toLocaleString()}
</dd>
</div>
<div className="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt className="text-sm font-medium text-gray-500">Modified At</dt>
<dd className="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{new Date(emailTemplate.modifiedAt).toLocaleString()}
</dd>
</div>
<div className="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt className="text-sm font-medium text-gray-500">Title</dt>
<dd className="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{emailTemplate.title}
</dd>
</div>
<div className="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
<dt className="text-sm font-medium text-gray-500">Content</dt>
<dd className="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 whitespace-pre-wrap">
{emailTemplate.content}
</dd>
</div>
</dl>
</div>
</div>
</div>
);
}

6
src/app/(admin)/admin/email-templates/edit/[id]/page.tsx
View File

@ -1,6 +0,0 @@
import EditEmailTemplate from '../../components/EditEmailTemplate';
export default async function EditEmailTemplatePage(props: { params: Promise<{ id: string }> }) {
const { id } = await props.params;
return <EditEmailTemplate id={id} />;
}

5
src/app/(admin)/admin/email-templates/new/page.tsx
View File

@ -1,5 +0,0 @@
import EditEmailTemplate from '../components/EditEmailTemplate';
export default function NewEmailTemplatePage() {
return <EditEmailTemplate />;
}

221
src/app/(admin)/admin/email-templates/page.tsx
View File

@ -1,221 +0,0 @@
'use client';
import { useState, useEffect } from 'react';
import Link from 'next/link';
import { useRouter, useSearchParams } from 'next/navigation';
import DeleteButton from './DeleteButton';
import Pagination from '@/lib/components/Pagination';
interface EmailTemplate {
id: string;
title: string;
content: string;
createdAt: string;
modifiedAt: string;
}
interface PaginationInfo {
page: number;
pageSize: number;
totalCount: number;
totalPages: number;
}
interface EmailTemplatesResponse {
data: EmailTemplate[];
pagination: PaginationInfo;
}
export default function AdminEmailTemplates() {
const router = useRouter();
const searchParams = useSearchParams();
// Get pagination values from URL params
const initialPage = parseInt(searchParams.get('page') || '1');
const initialPageSize = parseInt(searchParams.get('pageSize') || '10');
// State for pagination
const [page, setPage] = useState(initialPage);
const [pageSize, setPageSize] = useState(initialPageSize);
// State for data
const [emailTemplates, setEmailTemplates] = useState<EmailTemplate[]>([]);
const [pagination, setPagination] = useState<PaginationInfo>({
page: initialPage,
pageSize: initialPageSize,
totalCount: 0,
totalPages: 0
});
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// Fetch email templates with pagination
useEffect(() => {
const fetchEmailTemplates = async () => {
setIsLoading(true);
setError(null);
try {
// Build query string with pagination
const params = new URLSearchParams();
params.append('page', initialPage.toString());
params.append('pageSize', initialPageSize.toString());
const response = await fetch(`/api/email-templates?${params.toString()}`);
if (!response.ok) {
throw new Error('Failed to fetch email templates');
}
const responseData: EmailTemplatesResponse = await response.json();
setEmailTemplates(responseData.data);
setPagination(responseData.pagination);
} catch (err) {
console.error('Error fetching email templates:', err);
setError(err instanceof Error ? err.message : 'An error occurred');
} finally {
setIsLoading(false);
}
};
fetchEmailTemplates();
}, [initialPage, initialPageSize]);
// Handle page change
const handlePageChange = (newPage: number) => {
setPage(newPage);
// Build query string with new page
const params = new URLSearchParams(searchParams.toString());
params.set('page', newPage.toString());
// Update URL with new page
router.push(`/admin/email-templates?${params.toString()}`);
};
return (
<div>
<div className="flex justify-between items-center">
<h1 className="text-2xl font-semibold text-gray-900 dark:text-gray-100">Email Templates</h1>
<Link
href="/admin/email-templates/new"
className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
>
Add New Template
</Link>
</div>
{/* Error Message */}
{error && (
<div className="bg-red-50 border-l-4 border-red-400 p-4 my-4 dark:bg-red-900/20 dark:border-red-500">
<div className="flex">
<div className="flex-shrink-0">
<svg className="h-5 w-5 text-red-400 dark:text-red-300" viewBox="0 0 20 20" fill="currentColor">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" />
</svg>
</div>
<div className="ml-3">
<p className="text-sm text-red-700 dark:text-red-300">{error}</p>
</div>
</div>
</div>
)}
{/* Loading State */}
{isLoading ? (
<div className="text-center py-8">
<p className="text-gray-500 dark:text-gray-400">Loading email templates...</p>
</div>
) : (
<div className="mt-8 flex flex-col">
<div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
<table className="min-w-full divide-y divide-gray-300 dark:divide-gray-700">
<thead className="bg-gray-50 dark:bg-gray-700">
<tr>
<th
scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200"
style={{ width: "60%" }}
>
Title
</th>
<th
scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200"
style={{ width: "10%" }}
>
Created
</th>
<th
scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200"
style={{ width: "10%" }}
>
Modified
</th>
<th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6" style={{ width: "15%" }}>
<span className="sr-only">Actions</span>
</th>
</tr>
</thead>
<tbody className="divide-y divide-gray-200 bg-white dark:bg-gray-800 dark:divide-gray-700">
{emailTemplates.length > 0 ? (
emailTemplates.map((template) => (
<tr key={template.id}>
<td className="py-4 px-3 text-sm text-gray-500 dark:text-gray-400">
<Link
href={`/admin/email-templates/detail/${template.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300"
>
{template.title}
</Link>
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(template.createdAt).toLocaleDateString()}
{' '}
{new Date(template.createdAt).toLocaleTimeString()}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(template.modifiedAt).toLocaleDateString()}
{' '}
{new Date(template.modifiedAt).toLocaleTimeString()}
</td>
<td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<Link
href={`/admin/email-templates/edit/${template.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300 mr-4"
>
Edit
</Link>
<DeleteButton templateId={template.id} />
</td>
</tr>
))
) : (
<tr>
<td colSpan={5} className="py-4 pl-4 pr-3 text-sm text-gray-500 dark:text-gray-400 text-center">
No email templates found. Create your first template!
</td>
</tr>
)}
</tbody>
</table>
{/* Pagination */}
<Pagination
currentPage={pagination.page}
totalPages={pagination.totalPages}
totalItems={pagination.totalCount}
pageSize={pagination.pageSize}
onPageChange={handlePageChange}
/>
</div>
</div>
</div>
</div>
)}
</div>
);
}

280
src/app/(admin)/admin/posts/page.tsx
View File

@ -1,108 +1,20 @@
'use client';
import { useState, useEffect } from 'react';
import Link from 'next/link'; import Link from 'next/link';
import { useRouter, useSearchParams } from 'next/navigation'; import { Post, getDataSource } from '@/lib/database';
import DeleteButton from './DeleteButton'; import DeleteButton from './DeleteButton';
import Pagination from '@/lib/components/Pagination';
interface User { export default async function AdminPosts() {
id: string; // Fetch posts from the database
username: string; const dataSource = await getDataSource();
} const postRepository = dataSource.getRepository(Post);
const posts = await postRepository.find({
interface Post { relations: ['user'],
id: string; order: { createdAt: 'DESC' }
title: string;
content: string;
createdAt: string;
modifiedAt: string;
user: User;
}
interface PaginationInfo {
page: number;
pageSize: number;
totalCount: number;
totalPages: number;
}
interface PostsResponse {
data: Post[];
pagination: PaginationInfo;
}
export default function AdminPosts() {
const router = useRouter();
const searchParams = useSearchParams();
// Get pagination values from URL params
const initialPage = parseInt(searchParams.get('page') || '1');
const initialPageSize = parseInt(searchParams.get('pageSize') || '10');
// State for pagination
const [page, setPage] = useState(initialPage);
const [pageSize, setPageSize] = useState(initialPageSize);
// State for data
const [posts, setPosts] = useState<Post[]>([]);
const [pagination, setPagination] = useState<PaginationInfo>({
page: initialPage,
pageSize: initialPageSize,
totalCount: 0,
totalPages: 0
}); });
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// Fetch posts with pagination
useEffect(() => {
const fetchPosts = async () => {
setIsLoading(true);
setError(null);
try {
// Build query string with pagination
const params = new URLSearchParams();
params.append('page', initialPage.toString());
params.append('pageSize', initialPageSize.toString());
const response = await fetch(`/api/posts?${params.toString()}`);
if (!response.ok) {
throw new Error('Failed to fetch posts');
}
const responseData: PostsResponse = await response.json();
setPosts(responseData.data);
setPagination(responseData.pagination);
} catch (err) {
console.error('Error fetching posts:', err);
setError(err instanceof Error ? err.message : 'An error occurred');
} finally {
setIsLoading(false);
}
};
fetchPosts();
}, [initialPage, initialPageSize]);
// Handle page change
const handlePageChange = (newPage: number) => {
setPage(newPage);
// Build query string with new page
const params = new URLSearchParams(searchParams.toString());
params.set('page', newPage.toString());
// Update URL with new page
router.push(`/admin/posts?${params.toString()}`);
};
return ( return (
<div> <div>
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<h1 className="text-2xl font-semibold text-gray-900 dark:text-gray-100">Posts</h1> <h1 className="text-2xl font-semibold text-gray-900">Posts</h1>
<Link <Link
href="/admin/posts/new" href="/admin/posts/new"
className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
@ -111,114 +23,82 @@ export default function AdminPosts() {
</Link> </Link>
</div> </div>
{/* Error Message */} <div className="mt-8 flex flex-col">
{error && ( <div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div className="bg-red-50 border-l-4 border-red-400 p-4 my-4 dark:bg-red-900/20 dark:border-red-500"> <div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
<div className="flex"> <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
<div className="flex-shrink-0"> <table className="min-w-full divide-y divide-gray-300">
<svg className="h-5 w-5 text-red-400 dark:text-red-300" viewBox="0 0 20 20" fill="currentColor"> <thead className="bg-gray-50">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" /> <tr>
</svg> <th
</div> scope="col"
<div className="ml-3"> className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"
<p className="text-sm text-red-700 dark:text-red-300">{error}</p> >
</div> Title
</div> </th>
</div> <th
)} scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
{/* Loading State */} >
{isLoading ? ( Author
<div className="text-center py-8"> </th>
<p className="text-gray-500 dark:text-gray-400">Loading posts...</p> <th
</div> scope="col"
) : ( className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<div className="mt-8 flex flex-col"> >
<div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8"> Created
<div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8"> </th>
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg"> <th
<table className="min-w-full divide-y divide-gray-300 dark:divide-gray-700"> scope="col"
<thead className="bg-gray-50 dark:bg-gray-700"> className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<tr> >
<th Modified
scope="col" </th>
className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-200 sm:pl-6" <th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6">
> <span className="sr-only">Actions</span>
Title </th>
</th> </tr>
<th </thead>
scope="col" <tbody className="divide-y divide-gray-200 bg-white">
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" {posts.length > 0 ? (
> posts.map((post: Post) => (
Author <tr key={post.id}>
</th> <td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
<th {post.title}
scope="col" </td>
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
> {post.user?.username || 'Unknown'}
Created </td>
</th> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
<th {new Date(post.createdAt).toLocaleDateString()}
scope="col" </td>
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
> {new Date(post.modifiedAt).toLocaleDateString()}
Modified </td>
</th> <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6"> <Link
<span className="sr-only">Actions</span> href={`/admin/posts/edit/${post.id}`}
</th> className="text-indigo-600 hover:text-indigo-900 mr-4"
</tr> >
</thead> Edit
<tbody className="divide-y divide-gray-200 bg-white dark:bg-gray-800 dark:divide-gray-700"> </Link>
{posts.length > 0 ? ( <DeleteButton postId={post.id} />
posts.map((post) => (
<tr key={post.id}>
<td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-200 sm:pl-6">
{post.title}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{post.user?.username || 'Unknown'}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(post.createdAt).toLocaleDateString()}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(post.modifiedAt).toLocaleDateString()}
</td>
<td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<Link
href={`/admin/posts/edit/${post.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300 mr-4"
>
Edit
</Link>
<DeleteButton postId={post.id} />
</td>
</tr>
))
) : (
<tr>
<td colSpan={5} className="py-4 pl-4 pr-3 text-sm text-gray-500 dark:text-gray-400 text-center">
No posts found. Create your first post!
</td> </td>
</tr> </tr>
)} ))
</tbody> ) : (
</table> <tr>
<td colSpan={5} className="py-4 pl-4 pr-3 text-sm text-gray-500 text-center">
{/* Pagination */} No posts found. Create your first post!
<Pagination </td>
currentPage={pagination.page} </tr>
totalPages={pagination.totalPages} )}
totalItems={pagination.totalCount} </tbody>
pageSize={pagination.pageSize} </table>
onPageChange={handlePageChange}
/>
</div>
</div> </div>
</div> </div>
</div> </div>
)} </div>
</div> </div>
); );
} }

297
src/app/(admin)/admin/users/page.tsx
View File

@ -1,103 +1,22 @@
'use client';
import { useState, useEffect } from 'react';
import Link from 'next/link'; import Link from 'next/link';
import Image from 'next/image'; import Image from 'next/image';
import { useRouter, useSearchParams } from 'next/navigation'; import { getDataSource, User } from '@/lib/database';
import DeleteButton from './DeleteButton'; import DeleteButton from './DeleteButton';
import Pagination from '@/lib/components/Pagination';
interface User { export default async function AdminUsers() {
id: string; // Fetch users from the database
username: string; const dataSource = await getDataSource();
avatar: string | null; const userRepository = dataSource.getRepository(User);
createdAt: string;
modifiedAt: string;
}
interface PaginationInfo { const users = await userRepository.find({
page: number; select: ['id', 'username', 'avatar', 'createdAt', 'modifiedAt'],
pageSize: number; order: { createdAt: 'DESC' }
totalCount: number;
totalPages: number;
}
interface UsersResponse {
data: User[];
pagination: PaginationInfo;
}
export default function AdminUsers() {
const router = useRouter();
const searchParams = useSearchParams();
// Get pagination values from URL params
const initialPage = parseInt(searchParams.get('page') || '1');
const initialPageSize = parseInt(searchParams.get('pageSize') || '10');
// State for pagination
const [page, setPage] = useState(initialPage);
const [pageSize, setPageSize] = useState(initialPageSize);
// State for data
const [users, setUsers] = useState<User[]>([]);
const [pagination, setPagination] = useState<PaginationInfo>({
page: initialPage,
pageSize: initialPageSize,
totalCount: 0,
totalPages: 0
}); });
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// Fetch users with pagination
useEffect(() => {
const fetchUsers = async () => {
setIsLoading(true);
setError(null);
try {
// Build query string with pagination
const params = new URLSearchParams();
params.append('page', initialPage.toString());
params.append('pageSize', initialPageSize.toString());
const response = await fetch(`/api/users?${params.toString()}`);
if (!response.ok) {
throw new Error('Failed to fetch users');
}
const responseData: UsersResponse = await response.json();
setUsers(responseData.data);
setPagination(responseData.pagination);
} catch (err) {
console.error('Error fetching users:', err);
setError(err instanceof Error ? err.message : 'An error occurred');
} finally {
setIsLoading(false);
}
};
fetchUsers();
}, [initialPage, initialPageSize]);
// Handle page change
const handlePageChange = (newPage: number) => {
setPage(newPage);
// Build query string with new page
const params = new URLSearchParams(searchParams.toString());
params.set('page', newPage.toString());
// Update URL with new page
router.push(`/admin/users?${params.toString()}`);
};
return ( return (
<div> <div>
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<h1 className="text-2xl font-semibold text-gray-900 dark:text-gray-100">Users</h1> <h1 className="text-2xl font-semibold text-gray-900">Users</h1>
<Link <Link
href="/admin/users/new" href="/admin/users/new"
className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
@ -106,126 +25,94 @@ export default function AdminUsers() {
</Link> </Link>
</div> </div>
{/* Error Message */} <div className="mt-8 flex flex-col">
{error && ( <div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div className="bg-red-50 border-l-4 border-red-400 p-4 my-4 dark:bg-red-900/20 dark:border-red-500"> <div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
<div className="flex"> <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
<div className="flex-shrink-0"> <table className="min-w-full divide-y divide-gray-300">
<svg className="h-5 w-5 text-red-400 dark:text-red-300" viewBox="0 0 20 20" fill="currentColor"> <thead className="bg-gray-50">
<path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" /> <tr>
</svg> <th
</div> scope="col"
<div className="ml-3"> className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"
<p className="text-sm text-red-700 dark:text-red-300">{error}</p> >
</div> Username
</div> </th>
</div> <th
)} scope="col"
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
{/* Loading State */} >
{isLoading ? ( Avatar
<div className="text-center py-8"> </th>
<p className="text-gray-500 dark:text-gray-400">Loading users...</p> <th
</div> scope="col"
) : ( className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<div className="mt-8 flex flex-col"> >
<div className="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8"> Created
<div className="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8"> </th>
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg"> <th
<table className="min-w-full divide-y divide-gray-300 dark:divide-gray-700"> scope="col"
<thead className="bg-gray-50 dark:bg-gray-700"> className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900"
<tr> >
<th Modified
scope="col" </th>
className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-200 sm:pl-6" <th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6">
> <span className="sr-only">Actions</span>
Username </th>
</th> </tr>
<th </thead>
scope="col" <tbody className="divide-y divide-gray-200 bg-white">
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" {users.length > 0 ? (
> users.map((user) => (
Avatar <tr key={user.id}>
</th> <td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
<th {user.username}
scope="col" </td>
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
> {user.avatar ? (
Created <Image
</th> src={user.avatar}
<th alt={user.username}
scope="col" width={40}
className="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-200" height={40}
> className="rounded-full"
Modified />
</th> ) : (
<th scope="col" className="relative py-3.5 pl-3 pr-4 sm:pr-6"> <div className="h-10 w-10 rounded-full bg-gray-200 flex items-center justify-center text-gray-500">
<span className="sr-only">Actions</span> {user.username.charAt(0).toUpperCase()}
</th> </div>
</tr> )}
</thead> </td>
<tbody className="divide-y divide-gray-200 bg-white dark:bg-gray-800 dark:divide-gray-700"> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{users.length > 0 ? ( {new Date(user.createdAt).toLocaleDateString()}
users.map((user) => ( </td>
<tr key={user.id}> <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
<td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-200 sm:pl-6"> {new Date(user.modifiedAt).toLocaleDateString()}
{user.username} </td>
</td> <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400"> <Link
{user.avatar ? ( href={`/admin/users/edit/${user.id}`}
<Image className="text-indigo-600 hover:text-indigo-900 mr-4"
src={user.avatar} >
alt={user.username} Edit
width={40} </Link>
height={40} <DeleteButton userId={user.id} username={user.username} />
className="rounded-full"
/>
) : (
<div className="h-10 w-10 rounded-full bg-gray-200 dark:bg-gray-600 flex items-center justify-center text-gray-500 dark:text-gray-300">
{user.username.charAt(0).toUpperCase()}
</div>
)}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(user.createdAt).toLocaleDateString()}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{new Date(user.modifiedAt).toLocaleDateString()}
</td>
<td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<Link
href={`/admin/users/edit/${user.id}`}
className="text-indigo-600 hover:text-indigo-900 dark:text-indigo-400 dark:hover:text-indigo-300 mr-4"
>
Edit
</Link>
<DeleteButton userId={user.id} username={user.username} />
</td>
</tr>
))
) : (
<tr>
<td colSpan={5} className="py-4 pl-4 pr-3 text-sm text-gray-500 dark:text-gray-400 text-center">
No users found. Create your first user!
</td> </td>
</tr> </tr>
)} ))
</tbody> ) : (
</table> <tr>
<td colSpan={5} className="py-4 pl-4 pr-3 text-sm text-gray-500 text-center">
{/* Pagination */} No users found. Create your first user!
<Pagination </td>
currentPage={pagination.page} </tr>
totalPages={pagination.totalPages} )}
totalItems={pagination.totalCount} </tbody>
pageSize={pagination.pageSize} </table>
onPageChange={handlePageChange}
/>
</div>
</div> </div>
</div> </div>
</div> </div>
)} </div>
</div> </div>
); );
} }

80
src/app/api/contact-records/route.ts
View File

@ -14,63 +14,49 @@ export async function GET(request: NextRequest) {
const dateFrom = url.searchParams.get('dateFrom'); const dateFrom = url.searchParams.get('dateFrom');
const dateTo = url.searchParams.get('dateTo'); const dateTo = url.searchParams.get('dateTo');
// Pagination parameters
const page = parseInt(url.searchParams.get('page') || '1');
const pageSize = parseInt(url.searchParams.get('pageSize') || '10');
const skip = (page - 1) * pageSize;
// Build query // Build query
let queryBuilder = contactRecordRepository.createQueryBuilder('contactRecord') const queryOptions: any = {
.leftJoinAndSelect('contactRecord.customer', 'customer') order: { createdAt: 'DESC' },
.orderBy('contactRecord.createdAt', 'DESC'); relations: ['customer']
};
// Apply filters // Build where clause
let whereClause: any = {};
// Filter by customer if customerId is provided
if (customerId) { if (customerId) {
queryBuilder = queryBuilder.andWhere('contactRecord.customerId = :customerId', { customerId }); whereClause.customerId = customerId;
} }
// Filter by contact type if provided
if (contactType) { if (contactType) {
queryBuilder = queryBuilder.andWhere('contactRecord.contactType = :contactType', { contactType }); whereClause.contactType = contactType;
} }
if (dateFrom) { // Filter by date range if provided
queryBuilder = queryBuilder.andWhere('contactRecord.createdAt >= :dateFrom', { if (dateFrom || dateTo) {
dateFrom: new Date(dateFrom) whereClause.createdAt = {};
});
}
if (dateTo) { if (dateFrom) {
// Set the date to the end of the day for inclusive filtering whereClause.createdAt.gte = new Date(dateFrom);
const endDate = new Date(dateTo);
endDate.setHours(23, 59, 59, 999);
queryBuilder = queryBuilder.andWhere('contactRecord.createdAt <= :dateTo', {
dateTo: endDate
});
}
// Get total count for pagination
const totalCount = await queryBuilder.getCount();
// Apply pagination
queryBuilder = queryBuilder
.skip(skip)
.take(pageSize);
// Execute query
const contactRecords = await queryBuilder.getMany();
// Calculate total pages
const totalPages = Math.ceil(totalCount / pageSize);
return NextResponse.json({
data: contactRecords,
pagination: {
page,
pageSize,
totalCount,
totalPages
} }
});
if (dateTo) {
// Set the date to the end of the day for inclusive filtering
const endDate = new Date(dateTo);
endDate.setHours(23, 59, 59, 999);
whereClause.createdAt.lte = endDate;
}
}
// Add where clause to query options if not empty
if (Object.keys(whereClause).length > 0) {
queryOptions.where = whereClause;
}
const contactRecords = await contactRecordRepository.find(queryOptions);
return NextResponse.json(contactRecords);
} catch (error) { } catch (error) {
console.error('Error fetching contact records:', error); console.error('Error fetching contact records:', error);
return NextResponse.json( return NextResponse.json(

38
src/app/api/customers/route.ts
View File

@ -7,41 +7,11 @@ export async function GET(request: NextRequest) {
const dataSource = await getDataSource(); const dataSource = await getDataSource();
const customerRepository = dataSource.getRepository(Customer); const customerRepository = dataSource.getRepository(Customer);
// Get query parameters const customers = await customerRepository.find({
const url = new URL(request.url); order: { createdAt: 'DESC' }
// Pagination parameters
const page = parseInt(url.searchParams.get('page') || '1');
const pageSize = parseInt(url.searchParams.get('pageSize') || '10');
const skip = (page - 1) * pageSize;
// Build query
let queryBuilder = customerRepository.createQueryBuilder('customer')
.orderBy('customer.createdAt', 'DESC');
// Get total count for pagination
const totalCount = await queryBuilder.getCount();
// Apply pagination
queryBuilder = queryBuilder
.skip(skip)
.take(pageSize);
// Execute query
const customers = await queryBuilder.getMany();
// Calculate total pages
const totalPages = Math.ceil(totalCount / pageSize);
return NextResponse.json({
data: customers,
pagination: {
page,
pageSize,
totalCount,
totalPages
}
}); });
return NextResponse.json(customers);
} catch (error) { } catch (error) {
console.error('Error fetching customers:', error); console.error('Error fetching customers:', error);
return NextResponse.json( return NextResponse.json(

44
src/app/api/email-templates/[id]/route.ts
View File

@ -1,18 +1,18 @@
import { NextRequest, NextResponse } from 'next/server'; import { NextRequest, NextResponse } from 'next/server';
import { getDataSource, EmailTemplate } from '@/lib/database'; import { getDataSource, EmailTemplate } from '@/lib/database';
// GET /api/email-templates/[id] - Get a specific email template // GET /api/email-templates/[id] - Get a single email template by ID
export async function GET( export async function GET(
request: NextRequest, request: NextRequest,
props: { params: Promise<{ id: string }> } { params }: { params: { id: string } }
) { ) {
try { try {
const { id } = await props.params; const { id } = params;
const dataSource = await getDataSource(); const dataSource = await getDataSource();
const emailTemplateRepository = dataSource.getRepository(EmailTemplate); const emailTemplateRepository = dataSource.getRepository(EmailTemplate);
const emailTemplate = await emailTemplateRepository.findOne({ const emailTemplate = await emailTemplateRepository.findOne({
where: { id: id } where: { id }
}); });
if (!emailTemplate) { if (!emailTemplate) {
@ -35,16 +35,16 @@ export async function GET(
// PUT /api/email-templates/[id] - Update an email template // PUT /api/email-templates/[id] - Update an email template
export async function PUT( export async function PUT(
request: NextRequest, request: NextRequest,
props: { params: Promise<{ id: string }> } { params }: { params: { id: string } }
) { ) {
try { try {
const { id } = await props.params; const { id } = params;
const dataSource = await getDataSource(); const dataSource = await getDataSource();
const emailTemplateRepository = dataSource.getRepository(EmailTemplate); const emailTemplateRepository = dataSource.getRepository(EmailTemplate);
// Find the email template to update // Check if email template exists
const emailTemplate = await emailTemplateRepository.findOne({ const emailTemplate = await emailTemplateRepository.findOne({
where: { id: id } where: { id }
}); });
if (!emailTemplate) { if (!emailTemplate) {
@ -54,22 +54,23 @@ export async function PUT(
); );
} }
// Get update data
const data = await request.json(); const data = await request.json();
const { title, content } = data; const { name, content } = data;
// Validate required fields // Validate required fields
if (!title || !content) { if (!name && !content) {
return NextResponse.json( return NextResponse.json(
{ error: 'Title and content are required' }, { error: 'At least one field (name or content) must be provided' },
{ status: 400 } { status: 400 }
); );
} }
// Update email template fields // Update fields
emailTemplate.title = title; if (name) emailTemplate.name = name;
emailTemplate.content = content; if (content) emailTemplate.content = content;
// Save the updated email template // Save updated email template
const updatedEmailTemplate = await emailTemplateRepository.save(emailTemplate); const updatedEmailTemplate = await emailTemplateRepository.save(emailTemplate);
return NextResponse.json(updatedEmailTemplate); return NextResponse.json(updatedEmailTemplate);
@ -85,16 +86,16 @@ export async function PUT(
// DELETE /api/email-templates/[id] - Delete an email template // DELETE /api/email-templates/[id] - Delete an email template
export async function DELETE( export async function DELETE(
request: NextRequest, request: NextRequest,
props: { params: Promise<{ id: string }> } { params }: { params: { id: string } }
) { ) {
try { try {
const { id } = await props.params; const { id } = params;
const dataSource = await getDataSource(); const dataSource = await getDataSource();
const emailTemplateRepository = dataSource.getRepository(EmailTemplate); const emailTemplateRepository = dataSource.getRepository(EmailTemplate);
// Find the email template to delete // Check if email template exists
const emailTemplate = await emailTemplateRepository.findOne({ const emailTemplate = await emailTemplateRepository.findOne({
where: { id: id } where: { id }
}); });
if (!emailTemplate) { if (!emailTemplate) {
@ -107,7 +108,10 @@ export async function DELETE(
// Delete the email template // Delete the email template
await emailTemplateRepository.remove(emailTemplate); await emailTemplateRepository.remove(emailTemplate);
return NextResponse.json({ success: true }); return NextResponse.json(
{ message: 'Email template deleted successfully' },
{ status: 200 }
);
} catch (error) { } catch (error) {
console.error('Error deleting email template:', error); console.error('Error deleting email template:', error);
return NextResponse.json( return NextResponse.json(

48
src/app/api/email-templates/route.ts
View File

@ -9,39 +9,23 @@ export async function GET(request: NextRequest) {
// Get query parameters // Get query parameters
const url = new URL(request.url); const url = new URL(request.url);
const search = url.searchParams.get('search');
// Pagination parameters
const page = parseInt(url.searchParams.get('page') || '1');
const pageSize = parseInt(url.searchParams.get('pageSize') || '10');
const skip = (page - 1) * pageSize;
// Build query // Build query
let queryBuilder = emailTemplateRepository.createQueryBuilder('emailTemplate') const queryOptions: any = {
.orderBy('emailTemplate.createdAt', 'DESC'); order: { createdAt: 'DESC' }
};
// Get total count for pagination // Add search filter if provided
const totalCount = await queryBuilder.getCount(); if (search) {
queryOptions.where = [
{ name: search ? { contains: search } : undefined }
];
}
// Apply pagination const emailTemplates = await emailTemplateRepository.find(queryOptions);
queryBuilder = queryBuilder
.skip(skip)
.take(pageSize);
// Execute query return NextResponse.json(emailTemplates);
const emailTemplates = await queryBuilder.getMany();
// Calculate total pages
const totalPages = Math.ceil(totalCount / pageSize);
return NextResponse.json({
data: emailTemplates,
pagination: {
page,
pageSize,
totalCount,
totalPages
}
});
} catch (error) { } catch (error) {
console.error('Error fetching email templates:', error); console.error('Error fetching email templates:', error);
return NextResponse.json( return NextResponse.json(
@ -58,19 +42,19 @@ export async function POST(request: NextRequest) {
const emailTemplateRepository = dataSource.getRepository(EmailTemplate); const emailTemplateRepository = dataSource.getRepository(EmailTemplate);
const data = await request.json(); const data = await request.json();
const { title, content } = data; const { name, content } = data;
// Validate required fields // Validate required fields
if (!title || !content) { if (!name || !content) {
return NextResponse.json( return NextResponse.json(
{ error: 'Title and content are required' }, { error: 'Name and content are required' },
{ status: 400 } { status: 400 }
); );
} }
// Create and save the new email template // Create and save the new email template
const emailTemplate = new EmailTemplate(); const emailTemplate = new EmailTemplate();
emailTemplate.title = title; emailTemplate.name = name;
emailTemplate.content = content; emailTemplate.content = content;
const savedEmailTemplate = await emailTemplateRepository.save(emailTemplate); const savedEmailTemplate = await emailTemplateRepository.save(emailTemplate);

35
src/app/api/posts/route.ts
View File

@ -11,13 +11,8 @@ export async function GET(request: NextRequest) {
const url = new URL(request.url); const url = new URL(request.url);
const parentId = url.searchParams.get('parentId'); const parentId = url.searchParams.get('parentId');
// Pagination parameters
const page = parseInt(url.searchParams.get('page') || '1');
const pageSize = parseInt(url.searchParams.get('pageSize') || '10');
const skip = (page - 1) * pageSize;
// Build query // Build query
let queryBuilder = postRepository.createQueryBuilder('post') let query = postRepository.createQueryBuilder('post')
.leftJoinAndSelect('post.user', 'user') .leftJoinAndSelect('post.user', 'user')
.leftJoinAndSelect('post.parent', 'parent') .leftJoinAndSelect('post.parent', 'parent')
.orderBy('post.createdAt', 'DESC'); .orderBy('post.createdAt', 'DESC');
@ -26,36 +21,16 @@ export async function GET(request: NextRequest) {
if (parentId) { if (parentId) {
if (parentId === 'null') { if (parentId === 'null') {
// Get root posts (no parent) // Get root posts (no parent)
queryBuilder = queryBuilder.where('post.parentId IS NULL'); query = query.where('post.parentId IS NULL');
} else { } else {
// Get children of specific parent // Get children of specific parent
queryBuilder = queryBuilder.where('post.parentId = :parentId', { parentId }); query = query.where('post.parentId = :parentId', { parentId });
} }
} }
// Get total count for pagination const posts = await query.getMany();
const totalCount = await queryBuilder.getCount();
// Apply pagination return NextResponse.json(posts);
queryBuilder = queryBuilder
.skip(skip)
.take(pageSize);
// Execute query
const posts = await queryBuilder.getMany();
// Calculate total pages
const totalPages = Math.ceil(totalCount / pageSize);
return NextResponse.json({
data: posts,
pagination: {
page,
pageSize,
totalCount,
totalPages
}
});
} catch (error) { } catch (error) {
console.error('Error fetching posts:', error); console.error('Error fetching posts:', error);
return NextResponse.json( return NextResponse.json(

40
src/app/api/users/route.ts
View File

@ -9,42 +9,12 @@ export async function GET(request: NextRequest) {
const dataSource = await getDataSource(); const dataSource = await getDataSource();
const userRepository = dataSource.getRepository(User); const userRepository = dataSource.getRepository(User);
// Get query parameters const users = await userRepository.find({
const url = new URL(request.url); select: ['id', 'username', 'avatar', 'createdAt', 'modifiedAt'],
order: { createdAt: 'DESC' }
// Pagination parameters
const page = parseInt(url.searchParams.get('page') || '1');
const pageSize = parseInt(url.searchParams.get('pageSize') || '10');
const skip = (page - 1) * pageSize;
// Build query
let queryBuilder = userRepository.createQueryBuilder('user')
.select(['user.id', 'user.username', 'user.avatar', 'user.createdAt', 'user.modifiedAt'])
.orderBy('user.createdAt', 'DESC');
// Get total count for pagination
const totalCount = await queryBuilder.getCount();
// Apply pagination
queryBuilder = queryBuilder
.skip(skip)
.take(pageSize);
// Execute query
const users = await queryBuilder.getMany();
// Calculate total pages
const totalPages = Math.ceil(totalCount / pageSize);
return NextResponse.json({
data: users,
pagination: {
page,
pageSize,
totalCount,
totalPages
}
}); });
return NextResponse.json(users);
} catch (error) { } catch (error) {
console.error('Error fetching users:', error); console.error('Error fetching users:', error);
return NextResponse.json( return NextResponse.json(

143
src/lib/components/Pagination/index.tsx
View File

@ -1,143 +0,0 @@
'use client';
import { useRouter, useSearchParams } from 'next/navigation';
interface PaginationProps {
currentPage: number;
totalPages: number;
totalItems: number;
pageSize: number;
onPageChange?: (page: number) => void;
}
export default function Pagination({
currentPage,
totalPages,
totalItems,
pageSize,
onPageChange
}: PaginationProps) {
const router = useRouter();
const searchParams = useSearchParams();
// Calculate the range of items being displayed
const startItem = (currentPage - 1) * pageSize + 1;
const endItem = Math.min(currentPage * pageSize, totalItems);
// Generate page numbers to display
const getPageNumbers = () => {
const pages = [];
const maxPagesToShow = 5; // Show at most 5 page numbers
let startPage = Math.max(1, currentPage - Math.floor(maxPagesToShow / 2));
let endPage = startPage + maxPagesToShow - 1;
if (endPage > totalPages) {
endPage = totalPages;
startPage = Math.max(1, endPage - maxPagesToShow + 1);
}
for (let i = startPage; i <= endPage; i++) {
pages.push(i);
}
return pages;
};
// Handle page change
const handlePageChange = (page: number) => {
if (page < 1 || page > totalPages) return;
if (onPageChange) {
onPageChange(page);
} else {
// Update URL with new page parameter
const params = new URLSearchParams(searchParams.toString());
params.set('page', page.toString());
router.push(`?${params.toString()}`);
}
};
if (totalPages <= 1) return null;
return (
<div className="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6 dark:bg-gray-800 dark:border-gray-700">
<div className="flex flex-1 justify-between sm:hidden">
<button
onClick={() => handlePageChange(currentPage - 1)}
disabled={currentPage === 1}
className={`relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 dark:bg-gray-700 dark:border-gray-600 dark:text-gray-200 ${currentPage === 1
? 'opacity-50 cursor-not-allowed'
: 'hover:bg-gray-50 dark:hover:bg-gray-600'
}`}
>
Previous
</button>
<button
onClick={() => handlePageChange(currentPage + 1)}
disabled={currentPage === totalPages}
className={`relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 dark:bg-gray-700 dark:border-gray-600 dark:text-gray-200 ${currentPage === totalPages
? 'opacity-50 cursor-not-allowed'
: 'hover:bg-gray-50 dark:hover:bg-gray-600'
}`}
>
Next
</button>
</div>
<div className="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
<div>
<p className="text-sm text-gray-700 dark:text-gray-300">
Showing <span className="font-medium">{startItem}</span> to{' '}
<span className="font-medium">{endItem}</span> of{' '}
<span className="font-medium">{totalItems}</span> results
</p>
</div>
<div>
<nav className="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
<button
onClick={() => handlePageChange(currentPage - 1)}
disabled={currentPage === 1}
className={`relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 ${currentPage === 1
? 'opacity-50 cursor-not-allowed'
: 'hover:bg-gray-50 dark:hover:bg-gray-700 focus:z-20 focus:outline-offset-0'
}`}
>
<span className="sr-only">Previous</span>
<svg className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fillRule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clipRule="evenodd" />
</svg>
</button>
{getPageNumbers().map((page) => (
<button
key={page}
onClick={() => handlePageChange(page)}
aria-current={page === currentPage ? 'page' : undefined}
className={`relative inline-flex items-center px-4 py-2 text-sm font-semibold ${page === currentPage
? 'z-10 bg-indigo-600 text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'
: 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 dark:text-gray-200 dark:ring-gray-600 dark:hover:bg-gray-700'
}`}
>
{page}
</button>
))}
<button
onClick={() => handlePageChange(currentPage + 1)}
disabled={currentPage === totalPages}
className={`relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 ${currentPage === totalPages
? 'opacity-50 cursor-not-allowed'
: 'hover:bg-gray-50 dark:hover:bg-gray-700 focus:z-20 focus:outline-offset-0'
}`}
>
<span className="sr-only">Next</span>
<svg className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fillRule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clipRule="evenodd" />
</svg>
</button>
</nav>
</div>
</div>
</div>
);
}

2
src/lib/database/entities/EmailTemplate.ts
View File

@ -6,7 +6,7 @@ export class EmailTemplate {
id: string; id: string;
@Column() @Column()
title: string; name: string;
@Column('text') @Column('text')
content: string; content: string;

108
src/scripts/import-customers.ts
View File

@ -1,108 +0,0 @@
import 'reflect-metadata';
import fs from 'fs';
import path from 'path';
import { parse } from 'csv-parse/sync';
import { getDataSource } from '../lib/database';
import { Customer } from '../lib/database/entities/Customer';
interface CustomerCSVRow {
City: string;
Name: string;
'Website URL': string;
Email: string;
}
async function importCustomers(csvFilePath: string): Promise<void> {
try {
// Initialize database connection
const dataSource = await getDataSource();
const customerRepository = dataSource.getRepository(Customer);
// Read and parse CSV file
const fileContent = fs.readFileSync(csvFilePath, 'utf-8');
const records = parse(fileContent, {
columns: true,
skip_empty_lines: true,
trim: true,
}) as CustomerCSVRow[];
console.log(`Found ${records.length} records in CSV file`);
// Track processed emails to skip duplicates
const processedEmails = new Set<string>();
// Track existing names to ensure uniqueness
const existingNames = new Set<string>(
(await customerRepository.find()).map(customer => customer.name)
);
let importedCount = 0;
let skippedDuplicateEmail = 0;
let skippedDuplicateName = 0;
for (const record of records) {
const email = record.Email === 'null' ? '' : record.Email;
const name = record.Name;
// Skip if email is already processed (not empty and already seen)
if (email && processedEmails.has(email)) {
console.log(`Skipping record with duplicate email: ${email}`);
skippedDuplicateEmail++;
continue;
}
// Skip if name already exists in database
if (existingNames.has(name)) {
console.log(`Skipping record with duplicate name: ${name}`);
skippedDuplicateName++;
continue;
}
// Add to processed sets
if (email) {
processedEmails.add(email);
}
existingNames.add(name);
// Create new customer
const customer = new Customer();
customer.name = name;
customer.url = record['Website URL'] === 'null' ? '' : record['Website URL'];
customer.email = email;
// Save to database
await customerRepository.save(customer);
importedCount++;
console.log(`Imported customer: ${name}`);
}
console.log('Import summary:');
console.log(`- Total records in CSV: ${records.length}`);
console.log(`- Successfully imported: ${importedCount}`);
console.log(`- Skipped (duplicate email): ${skippedDuplicateEmail}`);
console.log(`- Skipped (duplicate name): ${skippedDuplicateName}`);
} catch (error) {
console.error('Error importing customers:', error);
throw error;
}
}
// Check if file path is provided as command line argument
const csvFilePath = process.argv[2];
if (!csvFilePath) {
console.error('Please provide the path to the CSV file as a command line argument');
console.error('Example: npm run import-customers -- ./data/customers.csv');
process.exit(1);
}
// Run the import function
importCustomers(csvFilePath)
.then(() => {
console.log('Import completed successfully');
process.exit(0);
})
.catch((error) => {
console.error('Import failed:', error);
process.exit(1);
});