) {
+ if (req.method !== 'POST') {
+ return res.status(405).json({ message: 'Method not allowed' })
}
- const shaKey = sha256(`${user}&&${pass}`)
+
try {
- // Create account and initial setup transaction
- const account = await createAccount(shaKey)
- await addTransaction(account.id, 'Initial Setup', 0)
- res.redirect(302, `/manage/${shaKey}`)
- } catch (error: any) {
- // Prisma unique constraint error code P2002
- if (error.code === 'P2002') {
- res.status(409).send('Account already exists.')
- } else {
- res.status(500).send(`Error - ${error.message}`)
+ const { username, password } = req.body
+
+ // Basic validation
+ if (!username || !password) {
+ return res
+ .status(400)
+ .json({ message: 'Validation failed', error: 'Username and password are required' })
}
+
+ // Type safe approach instead of using 'any'
+ const key = sha256(`${username}&&${password}`) as string
+
+ // Check if user exists
+ const existingUser = await accountService.getUser(key)
+ if (existingUser) {
+ return res.status(409).json({ message: 'Account exists', error: 'Account already exists' })
+ }
+
+ // Create user
+ await accountService.createUser(key, username)
+
+ return res.status(201).json({
+ message: 'Account created successfully!',
+ key,
+ })
+ } catch (error) {
+ console.error('Create account error:', error)
+ return res.status(500).json({
+ message: 'Server error',
+ error: error instanceof Error ? error.message : 'Failed to create account',
+ })
}
}
diff --git a/pages/api/manage/[userid]/transaction.ts b/pages/api/manage/[userid]/transaction.ts
index 7041bf3..72eaef6 100644
--- a/pages/api/manage/[userid]/transaction.ts
+++ b/pages/api/manage/[userid]/transaction.ts
@@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next'
-import { addTransaction } from '../../../../src/db'
+import transactionService from '../../../../src/services/db/transactions'
type TransactionRequest = NextApiRequest & {
body: {
@@ -27,10 +27,13 @@ export default async function handler(req: TransactionRequest, res: NextApiRespo
} else if (amount < 0) {
amount = -amount
}
+ // Attempt to create the transaction
try {
- await addTransaction(userid, description, amount)
- res.redirect(302, `/manage/${userid}`)
+ const result = await transactionService.addTransaction(userid, description, amount)
+ return res.status(201).json({ message: 'Transaction created', result })
} catch (error) {
- res.status(500).send('Error processing transaction')
+ // Log the error for debugging
+ console.error('Failed to create transaction:', error)
+ return res.status(500).json({ error: 'Failed to create transaction' })
}
}
diff --git a/pages/api/manage/[userid]/update.ts b/pages/api/manage/[userid]/update.ts
index cc514f0..6e751ab 100644
--- a/pages/api/manage/[userid]/update.ts
+++ b/pages/api/manage/[userid]/update.ts
@@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next'
-import { updateAccountSettings } from '../../../../src/db'
+import accountService from '../../../../src/services/db/accounts'
type UpdateRequest = NextApiRequest & {
body: {
@@ -22,9 +22,11 @@ export default async function handler(req: UpdateRequest, res: NextApiResponse)
const interest = parseFloat(interestRaw)
const allowance = parseFloat(allowanceRaw)
try {
- await updateAccountSettings(userid, interest, allowance)
- res.redirect(302, `/manage/${userid}`)
+ const result = await accountService.updateAccountSettings(userid, interest, allowance)
+ return res.status(200).json({ message: 'User info updated', result })
} catch (error) {
- res.status(500).send('Error updating account')
+ // Log the error for debugging
+ console.error('Failed to update user info:', error)
+ return res.status(500).json({ error: 'Failed to update user info' })
}
}
diff --git a/pages/index.tsx b/pages/index.tsx
index 9a2ff0d..865287b 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,8 +1,11 @@
import React, { useState } from 'react'
import type { NextPage } from 'next'
-import { Button, Collapse } from 'react-bootstrap'
+import Image from 'next/image'
+import { Button, Collapse, Row, Col } from 'react-bootstrap'
import LoginForm from '../src/components/LoginForm'
import CreateAccountForm from '../src/components/CreateAccountForm'
+import DescriptionCard from '../src/components/DescriptionCard'
+import pirateImage from '../public/assets/pirate.png'
const Home: NextPage = () => {
const [openLogin, setOpenLogin] = useState(false)
@@ -44,15 +47,24 @@ const Home: NextPage = () => {
-
- Funey is a website that makes Money Fun :)
-
-
- To get started, create a fake "bank" account for your little ones, set a balance,
- and an interest rate (accrued monthly) and then add the website link to their mobile device
- or iPad for "viewing" their balance. As they earn or spend money, come back to the
- manage page (bookmark or login) and update their account totals.
-
+
+ {/* Mobile view: Centered image above description */}
+
+
+
+
+
+
+
+ {/* Desktop view: Centered description left, image right */}
+
+
+
+
+
+
+
+
)
}
diff --git a/pages/manage/[userid].tsx b/pages/manage/[userid].tsx
index cc4dcb9..0c1f186 100644
--- a/pages/manage/[userid].tsx
+++ b/pages/manage/[userid].tsx
@@ -1,8 +1,10 @@
import React, { useEffect, useState } from 'react'
import type { NextPage, GetServerSideProps } from 'next'
-import type { Transaction, Account } from '../../src/types'
import { Button, Card, Form, FormControl, InputGroup, Alert } from 'react-bootstrap'
-import { getAccountInfo, getTransactions, updateInterest, updateAllowance } from '../../src/db'
+import type { Transaction, Account } from '../../src/types'
+import accountService from '../../src/services/db/accounts'
+import transactionService from '../../src/services/db/transactions'
+import financialService from '../../src/services/db/financials'
import TransactionsCard from '../../src/TransactionsCard'
interface ManageProps {
@@ -86,14 +88,14 @@ export const getServerSideProps: GetServerSideProps = async ({ quer
return { notFound: true }
}
// Apply pending interest and allowance
- await updateInterest(id)
- await updateAllowance(id)
+ await financialService.updateInterest(id)
+ await financialService.updateAllowance(id)
// Fetch account and transactions
- const account = await getAccountInfo(id)
+ const account = await accountService.getAccountInfo(id)
if (!account) {
return { notFound: true }
}
- const transactions = await getTransactions(id)
+ const transactions = await transactionService.getTransactions(id)
return { props: { userid: id, account, transactions } }
}
diff --git a/pages/view/[viewid].tsx b/pages/view/[viewid].tsx
index 8797e0e..b569f4a 100644
--- a/pages/view/[viewid].tsx
+++ b/pages/view/[viewid].tsx
@@ -1,8 +1,10 @@
import React from 'react'
import type { NextPage, GetServerSideProps } from 'next'
-import type { Transaction, Account } from '../../src/types'
import { Card } from 'react-bootstrap'
-import { getAccountInfo, getTransactions, updateInterest, updateAllowance } from '../../src/db'
+import type { Transaction, Account } from '../../src/types'
+import accountService from '../../src/services/db/accounts'
+import transactionService from '../../src/services/db/transactions'
+import financialService from '../../src/services/db/financials'
import TransactionsCard from '../../src/TransactionsCard'
interface ViewProps {
@@ -41,11 +43,11 @@ export const getServerSideProps: GetServerSideProps = async ({ query
const id = Array.isArray(viewid) ? viewid[0] : viewid
const props: ViewProps = { account: null, transactions: [] }
if (id) {
- await updateInterest(id)
- await updateAllowance(id)
- const account = await getAccountInfo(id)
+ await financialService.updateInterest(id)
+ await financialService.updateAllowance(id)
+ const account = await accountService.getAccountInfo(id)
if (account) {
- const transactions = await getTransactions(id)
+ const transactions = await transactionService.getTransactions(id)
props.account = account
props.transactions = transactions
}
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 0000000..c9c3967
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,37 @@
+import path from 'path'
+import getPort from 'get-port'
+import { defineConfig, devices, PlaywrightTestConfig } from '@playwright/test'
+
+const configPromise: Promise = (async () => {
+ const PORT = process.env.PORT ? Number(process.env.PORT) : await getPort()
+ process.env.PORT = String(PORT)
+ const baseURL = `http://localhost:${PORT}`
+
+ return defineConfig({
+ timeout: 30 * 1000,
+ testDir: path.join(__dirname, 'e2e'),
+ retries: 2,
+ outputDir: 'test-results/',
+ webServer: {
+ command: 'npm run dev',
+ url: baseURL,
+ timeout: 120 * 1000,
+ reuseExistingServer: !process.env.CI,
+ env: { PORT: String(PORT) },
+ },
+ globalSetup: require.resolve('./scripts/setup-test-db.js'),
+ use: {
+ baseURL,
+ trace: 'retry-with-trace',
+ headless: true, // Run tests in headless mode (no browser UI)
+ },
+ projects: [
+ {
+ name: 'Desktop Chrome',
+ use: { ...devices['Desktop Chrome'] },
+ },
+ ],
+ })
+})()
+
+export default configPromise
diff --git a/prisma/generated/postgresql.prisma b/prisma/generated/postgresql.prisma
index 6a9790b..547ff6f 100644
--- a/prisma/generated/postgresql.prisma
+++ b/prisma/generated/postgresql.prisma
@@ -1,5 +1,7 @@
generator client {
- provider = "prisma-client-js"
+provider = "prisma-client-js"
+
+ output = "../node_modules/@prisma/client"
}
datasource db {
diff --git a/prisma/generated/sqlite.prisma b/prisma/generated/sqlite.prisma
index 0e5401f..c897794 100644
--- a/prisma/generated/sqlite.prisma
+++ b/prisma/generated/sqlite.prisma
@@ -1,5 +1,7 @@
generator client {
- provider = "prisma-client-js"
+provider = "prisma-client-js"
+
+ output = "../node_modules/@prisma/client"
}
datasource db {
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index c7df060..fa0ed9e 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,5 +1,6 @@
generator client {
provider = "prisma-client-js"
+ output = "../node_modules/@prisma/client" // Explicitly set output path
}
datasource db {
diff --git a/public/assets/background.png b/public/assets/background.png
index 3d70c81..d17302c 100644
Binary files a/public/assets/background.png and b/public/assets/background.png differ
diff --git a/scripts/build-schemas.js b/scripts/build-schemas.js
index 0f397d9..014cf58 100644
--- a/scripts/build-schemas.js
+++ b/scripts/build-schemas.js
@@ -25,7 +25,25 @@ const providers = [
providers.forEach(({ name, wrapper }) => {
const wrapperPath = path.resolve(wrappersDir, wrapper)
const wrapperContent = fs.readFileSync(wrapperPath, 'utf-8')
- const outputContent = wrapperContent + '\n\n' + models
+
+ // --- Inject output path into generator block (Revised) ---
+ const generatorRegex = /(generator\s+client\s+\{)([^}]*)(\s*\})/; // Capture parts: opening, content, closing
+ const modifiedWrapperContent = wrapperContent.replace(
+ generatorRegex,
+ (match, opening, content, closing) => {
+ if (content.includes('output')) {
+ return match; // Already has output, do nothing
+ }
+ // Add output path, ensuring proper indentation and newline before closing brace
+ const indentedOutput = '\n output = "../node_modules/@prisma/client"';
+ // Ensure content ends with a newline if it's not empty and trim existing whitespace
+ const formattedContent = content.trim() + (content.trim() ? '\n' : '');
+ return opening + '\n' + formattedContent + indentedOutput + '\n' + closing.trim(); // Reconstruct with newlines
+ }
+ );
+ // -------------------------------------------------------
+
+ const outputContent = modifiedWrapperContent + '\n\n' + models
const outPath = path.resolve(generatedDir, `${name}.prisma`)
fs.writeFileSync(outPath, outputContent)
console.log(`Generated ${path.relative(process.cwd(), outPath)}`)
diff --git a/scripts/test-all.sh b/scripts/test-all.sh
deleted file mode 100644
index 3abd58b..0000000
--- a/scripts/test-all.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Export test environment variables
-export DATABASE_URL="file:./test.db"
-export SMTP_HOST="0.0.0.0"
-export SMTP_PORT="1025"
-export SMTP_USER=""
-export SMTP_PASS=""
-export EMAIL_FROM="nextstrap@example.com"
-export NEXTAUTH_URL="http://0.0.0.0:3000"
-export TEST_MODE="true"
-export NEXT_PUBLIC_TEST_MODE="true"
-export NEXT_PUBLIC_APP_NAME="nextstrap"
-export NEXTAUTH_SECRET="test_secret"
-
-# Generate Prisma client
-npx prisma generate --schema=prisma/schema.sqlite.prisma
-
-# Push schema to SQLite database
-npx prisma db push --schema=prisma/schema.sqlite.prisma --force-reset
-
-# Start the dev server
-npx next dev -p 3000 &
-SERVER_PID=$!
-
-# Wait for the server
-npx wait-on tcp:3000
-
-# Run Playwright tests
-npx playwright test --forbid-only --max-failures=1
-
-# Cleanup
-kill $SERVER_PID
-rm -f test.db
diff --git a/src/TransactionsCard.tsx b/src/TransactionsCard.tsx
index df9e216..07a65a4 100644
--- a/src/TransactionsCard.tsx
+++ b/src/TransactionsCard.tsx
@@ -14,6 +14,19 @@ interface TransactionsCardProps {
const TransactionsCard: React.FC = ({ transactions }) => {
const [expand, setExpand] = useState(false)
const showTransactions = expand ? transactions : transactions.slice(0, 4)
+
+ const formatCurrency = (amount: number) => {
+ return new Intl.NumberFormat('en-US', {
+ style: 'currency',
+ currency: 'USD',
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ })
+ .format(amount)
+ .replace('$', '')
+ .replace('-', '')
+ }
+
return (
Transactions:
@@ -32,7 +45,7 @@ const TransactionsCard: React.FC
= ({ transactions }) =>
| {utcStr} |
{description} |
- {value >= 0 ? `\$${value.toFixed(2)}` : `\- $${-value.toFixed(2)}`} |
+ {value >= 0 ? `$${formatCurrency(value)}` : `- $${formatCurrency(-value)}`} |
)
})}
diff --git a/src/cards/components/CreateAccountForm.tsx b/src/cards/components/CreateAccountForm.tsx
new file mode 100644
index 0000000..92284cb
--- /dev/null
+++ b/src/cards/components/CreateAccountForm.tsx
@@ -0,0 +1,79 @@
+import React, { useState } from 'react'
+import { useRouter } from 'next/router'
+
+const CreateAccountForm: React.FC = () => {
+ const router = useRouter()
+ const [username, setUsername] = useState('')
+ const [password, setPassword] = useState('')
+ const [password2, setPassword2] = useState('')
+ const [error, setError] = useState('')
+ const [loading, setLoading] = useState(false)
+
+ const handleSubmit = async (event: React.FormEvent) => {
+ event.preventDefault()
+
+ if (password !== password2) {
+ setError('Passwords do not match')
+ return
+ }
+
+ setLoading(true)
+ setError('')
+
+ try {
+ await fetch('/api/create', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ username, password }),
+ })
+ router.push('/success')
+ } catch (_err) {
+ setError('Failed to create account. Please try again.')
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ return (
+
+ )
+}
+
+export default CreateAccountForm
diff --git a/src/components/CreateAccountForm.tsx b/src/components/CreateAccountForm.tsx
index a147977..8a3ada9 100644
--- a/src/components/CreateAccountForm.tsx
+++ b/src/components/CreateAccountForm.tsx
@@ -1,18 +1,18 @@
import React, { useState } from 'react'
import { Form, Button, Alert } from 'react-bootstrap'
+import { useRouter } from 'next/router'
const CreateAccountForm: React.FC = () => {
const [username, setUsername] = useState('')
const [password, setPassword] = useState('')
const [password2, setPassword2] = useState('')
const [error, setError] = useState(null)
- const [success, setSuccess] = useState(null)
const [loading, setLoading] = useState(false)
+ const router = useRouter()
const handleSubmit = async (event: React.FormEvent) => {
event.preventDefault()
setError(null)
- setSuccess(null)
if (username.length < 4) {
setError('Username must be at least 4 characters long')
@@ -43,11 +43,8 @@ const CreateAccountForm: React.FC = () => {
if (!response.ok) {
setError(data.error || 'Failed to create account')
} else {
- setSuccess(data.message || 'Account created successfully!')
- setUsername('')
- setPassword('')
- setPassword2('')
- // Optionally redirect or perform other actions on success
+ // Navigate to the management page
+ router.push(`/manage/${data.key}`)
}
} catch (err) {
setError('An unexpected error occurred. Please try again.')
@@ -60,7 +57,6 @@ const CreateAccountForm: React.FC = () => {
return (