refactor: convert repository to monorepo with npm workspaces
Restructured the repository into a monorepo to better organize application code and maintenance scripts. ## Workspace Structure - web-app: Next.js application (all app code moved from root) - housekeeping: Database backup and maintenance scripts ## Key Changes - Moved all application code to web-app/ using git mv - Moved database scripts to housekeeping/ workspace - Updated Dockerfile for monorepo build process - Updated docker-compose files (volume paths: ./web-app/etc/hosts/) - Updated .gitignore for workspace-level node_modules - Updated documentation (README.md, CLAUDE.md, CHANGELOG.md) ## Migration Impact - Root package.json now manages workspaces - Build commands delegate to web-app workspace - All file history preserved via git mv - Docker build process updated for workspace structure 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Knee Cola
@@ -0,0 +1,24 @@
|
||||
import { FC } from "react"
|
||||
import { Bill } from "@/app/lib/db-types"
|
||||
import { TicketIcon } from "@heroicons/react/24/outline"
|
||||
|
||||
export interface BillBadgeProps {
|
||||
locationId: string,
|
||||
bill: Pick<Bill, 'name' | 'paid' | 'hasAttachment' | 'proofOfPayment'>,
|
||||
onClick?: () => void
|
||||
};
|
||||
|
||||
export const BillToggleBadge:FC<BillBadgeProps> = ({ bill: { name, paid, hasAttachment, proofOfPayment }, onClick}) => {
|
||||
|
||||
const className = `badge badge-lg ${paid?"badge-success":" badge-outline"} ${ !paid && hasAttachment ? "btn-outline btn-success" : "" } cursor-pointer`;
|
||||
|
||||
return (
|
||||
<div className={className} onClick={onClick}>
|
||||
{name}
|
||||
{
|
||||
proofOfPayment?.uploadedAt ?
|
||||
<TicketIcon className="h-[1em] w-[1em] inline-block ml-1" /> : null
|
||||
}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
'use client';
|
||||
|
||||
import { FC, useState } from "react";
|
||||
import { BillingLocation, YearMonth } from "../../../../../lib/db-types";
|
||||
import { formatYearMonth } from "../../../../../lib/format";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { updateMonth } from "../../../../../lib/actions/monthActions";
|
||||
import { toast, ToastContainer } from 'react-toastify';
|
||||
import 'react-toastify/dist/ReactToastify.css';
|
||||
import { BillToggleBadge } from "./BillToggleBadge";
|
||||
|
||||
export interface MultiBillEditProps {
|
||||
locations: BillingLocation[];
|
||||
year: number;
|
||||
month: number;
|
||||
}
|
||||
|
||||
interface BillState {
|
||||
locationId: string;
|
||||
billId: string;
|
||||
paid: boolean;
|
||||
}
|
||||
|
||||
export const MultiBillEdit: FC<MultiBillEditProps> = ({ locations, year, month }) => {
|
||||
const t = useTranslations("multi-bill-edit");
|
||||
const router = useRouter();
|
||||
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
|
||||
const [billStates, setBillStates] = useState<BillState[]>(() =>
|
||||
locations.flatMap(location =>
|
||||
location.bills.map(bill => ({
|
||||
locationId: location._id,
|
||||
billId: bill._id,
|
||||
paid: bill.paid,
|
||||
}))
|
||||
)
|
||||
);
|
||||
|
||||
const [allPaidMode, setAllPaidMode] = useState(() =>
|
||||
billStates.length > 0 && billStates.every(bill => bill.paid)
|
||||
);
|
||||
|
||||
// Toggle individual bill paid status
|
||||
const handleBillToggle = (locationId: string, billId: string) => {
|
||||
setBillStates(prevStates =>
|
||||
prevStates.map(state =>
|
||||
state.locationId === locationId && state.billId === billId
|
||||
? { ...state, paid: !state.paid }
|
||||
: state
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
// Toggle all bills paid status
|
||||
const handleSetAllAsPayed = () => {
|
||||
const newPaidState = !allPaidMode;
|
||||
setAllPaidMode(newPaidState);
|
||||
setBillStates(prevStates =>
|
||||
prevStates.map(state => ({ ...state, paid: newPaidState }))
|
||||
);
|
||||
};
|
||||
|
||||
// Save changes to database
|
||||
const handleSave = async () => {
|
||||
setIsSaving(true);
|
||||
try {
|
||||
const updates = billStates.map(state => ({
|
||||
locationId: state.locationId,
|
||||
billId: state.billId,
|
||||
paid: state.paid,
|
||||
}));
|
||||
|
||||
await updateMonth({ year, month }, updates);
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error saving bill updates:', error);
|
||||
toast.error(t("save-error-message"), { theme: "dark" });
|
||||
setIsSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
// Cancel and return to home page
|
||||
const handleCancel = () => {
|
||||
router.push(`/home?year=${year}`);
|
||||
};
|
||||
|
||||
// Get bill state for a specific bill
|
||||
const getBillState = (locationId: string, billId: string): boolean => {
|
||||
const state = billStates.find(
|
||||
s => s.locationId === locationId && s.billId === billId
|
||||
);
|
||||
return state?.paid ?? false;
|
||||
};
|
||||
|
||||
const yearMonth: YearMonth = { year, month };
|
||||
|
||||
return (
|
||||
<div className={`collapse bg-base-200 my-1 sm:min-w-[25em] border-2 border-neutral`}>
|
||||
<h1 className="text-xl font-medium text-white collapse-title ml-1">{formatYearMonth(yearMonth)}</h1>
|
||||
<div className="absolute cursor-pointer top-4 right-[20px]">
|
||||
<BillToggleBadge locationId={"dummy"}
|
||||
bill={{ paid:allPaidMode, name: allPaidMode ? t("set-all-as-unpaid-button") : t("set-all-as-paid-button"), hasAttachment: false, proofOfPayment: undefined }}
|
||||
onClick={handleSetAllAsPayed}
|
||||
/>
|
||||
</div>
|
||||
<div className="p-[16px] pt-0">
|
||||
{locations.map(location => (
|
||||
<div key={location._id} className="card card-compact card-bordered max-w-[35em] bg-base-100 border-1 border-neutral mb-2">
|
||||
<div className="card-body">
|
||||
<h2 className="card-title text-[1rem]">
|
||||
{formatYearMonth(yearMonth)} {location.name}
|
||||
</h2>
|
||||
<div className="space-y-4 mt-[-.5rem]">
|
||||
{location.bills.length > 0 ? (
|
||||
<div className="flex flex-wrap gap-2 mt-2">
|
||||
{location.bills.map(bill => {
|
||||
const isPaid = getBillState(location._id, bill._id);
|
||||
return (
|
||||
<BillToggleBadge
|
||||
key={bill._id}
|
||||
locationId={location._id}
|
||||
bill={{ ...bill, paid: isPaid }}
|
||||
onClick={() => handleBillToggle(location._id, bill._id)}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-sm text-gray-500">{t("no-bills-message")}</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
{/* Action buttons */}
|
||||
<div className="pt-4">
|
||||
<button
|
||||
onClick={handleSave}
|
||||
className="btn btn-primary ml-3"
|
||||
disabled={isSaving}
|
||||
>
|
||||
{isSaving ? (
|
||||
<>
|
||||
<span className="loading loading-spinner loading-sm"></span>
|
||||
{t("saving-button")}
|
||||
</>
|
||||
) : (
|
||||
t("save-button")
|
||||
)}
|
||||
</button>
|
||||
<button
|
||||
onClick={handleCancel}
|
||||
className="btn btn-neutral ml-3"
|
||||
disabled={isSaving}
|
||||
>
|
||||
{t("cancel-button")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<ToastContainer />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,27 @@
|
||||
"use client";
|
||||
|
||||
import { InboxStackIcon, Square3Stack3DIcon } from '@heroicons/react/24/outline';
|
||||
import { useTranslations } from 'next-intl';
|
||||
import { YearMonth } from '../../../../../lib/db-types';
|
||||
import Link from 'next/link';
|
||||
|
||||
export interface MultiBillEditButtonProps {
|
||||
yearMonth: YearMonth;
|
||||
className?: string;
|
||||
}
|
||||
|
||||
export const MultiBillEditButton: React.FC<MultiBillEditButtonProps> = ({ yearMonth, className }) => {
|
||||
|
||||
const t = useTranslations("home-page.multi-bill-edit-button");
|
||||
|
||||
return (
|
||||
<div className={`card card-compact card-bordered bg-base-100 shadow-s my-1 ${className}`}>
|
||||
<Link href={`/home/multi-bill-edit/${yearMonth.year}/${yearMonth.month}`} className="card-body tooltip self-center" data-tip={t("tooltip")} data-umami-event="add-new-location">
|
||||
<span className='flex self-center'>
|
||||
<Square3Stack3DIcon className="h-[1em] w-[1em] cursor-pointer text-4xl" />
|
||||
<span className="ml-1 self-center text-sm sm:text-xs text-left w-[5.5em] leading-[1.3em]">{t("tooltip")}</span>
|
||||
</span>
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,16 @@
|
||||
import { notFound } from 'next/navigation';
|
||||
import { MultiBillEdit } from '@/app/[locale]/home/multi-bill-edit/[year]/[month]/MultiBillEdit';
|
||||
import { getLocationsByMonth } from '@/app/lib/actions/monthActions';
|
||||
|
||||
export default async function MultiBillEditPage({ year, month }: { year: number; month: number }) {
|
||||
|
||||
const locations = await getLocationsByMonth({ year, month });
|
||||
|
||||
if (!locations || locations.length === 0) {
|
||||
return(notFound());
|
||||
}
|
||||
|
||||
const result = <MultiBillEdit locations={locations} year={year} month={month} />;
|
||||
|
||||
return (result);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
import { NotFoundPage } from '@/app/ui/NotFoundPage';
|
||||
|
||||
const MultiBillEditNotFound = () =>
|
||||
<NotFoundPage title="404 Month Not Found" description="Could not find the requested month." />;
|
||||
|
||||
export default MultiBillEditNotFound;
|
||||
@@ -0,0 +1,21 @@
|
||||
import { Suspense } from 'react';
|
||||
import MultiBillEditPage from './MultiBillEditPage';
|
||||
import { Main } from '@/app/ui/Main';
|
||||
|
||||
const MultiBillEditSkeleton = () => (
|
||||
<div className="flex min-h-screen flex-col items-center justify-center p-6 bg-base-300">
|
||||
<span className="loading loading-spinner loading-lg"></span>
|
||||
<p className="mt-4">Loading...</p>
|
||||
</div>
|
||||
);
|
||||
|
||||
export default async function Page({ params }: { params: { year: string; month: string } }) {
|
||||
|
||||
return (
|
||||
<Main>
|
||||
<Suspense fallback={<MultiBillEditSkeleton />}>
|
||||
<MultiBillEditPage year={parseInt(params.year)} month={parseInt(params.month)} />
|
||||
</Suspense>
|
||||
</Main>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user