Refactor cospend components and add SSR support to settle page

- Create reusable components: ImageUpload, FormSection, SplitMethodSelector, UsersList
- Replace duplicate code across add/edit pages with shared components
- Remove created-by info and edit/delete buttons from payments list
- Add server-side rendering support to settle page with form actions
- Fix settlement submission redirect issue
- Remove redundant back button from settle page

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2025-09-12 19:29:30 +02:00
parent ac6845d38a
commit e773a90f1d
10 changed files with 1606 additions and 1418 deletions

View File

@@ -0,0 +1,38 @@
<script>
export let title = '';
</script>
<div class="form-section">
{#if title}
<h2>{title}</h2>
{/if}
<slot />
</div>
<style>
.form-section {
background: var(--nord6);
padding: 1.5rem;
border-radius: 0.75rem;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
border: 1px solid var(--nord4);
}
.form-section h2 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
font-size: 1.25rem;
}
@media (prefers-color-scheme: dark) {
.form-section {
background: var(--nord1);
border-color: var(--nord2);
}
.form-section h2 {
color: var(--font-default-dark);
}
}
</style>

View File

@@ -0,0 +1,247 @@
<script>
export let imagePreview = '';
export let imageFile = null;
export let uploading = false;
export let currentImage = null; // For edit mode
export let title = 'Receipt Image';
// Events
import { createEventDispatcher } from 'svelte';
const dispatch = createEventDispatcher();
function handleImageChange(event) {
const file = event.target.files[0];
if (file) {
if (file.size > 5 * 1024 * 1024) {
dispatch('error', 'File size must be less than 5MB');
return;
}
const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp'];
if (!allowedTypes.includes(file.type)) {
dispatch('error', 'Please select a valid image file (JPEG, PNG, WebP)');
return;
}
imageFile = file;
const reader = new FileReader();
reader.onload = (e) => {
imagePreview = e.target.result;
};
reader.readAsDataURL(file);
dispatch('imageSelected', file);
}
}
function removeImage() {
imageFile = null;
imagePreview = '';
currentImage = null;
dispatch('imageRemoved');
}
function removeCurrentImage() {
currentImage = null;
dispatch('currentImageRemoved');
}
</script>
<div class="form-section">
<h2>{title}</h2>
{#if currentImage}
<div class="current-image">
<img src={currentImage} alt="Receipt" class="receipt-preview" />
<div class="image-actions">
<button type="button" class="btn-remove" on:click={removeCurrentImage}>
Remove Image
</button>
</div>
</div>
{/if}
{#if imagePreview}
<div class="image-preview">
<img src={imagePreview} alt="Receipt preview" />
<button type="button" class="remove-image" on:click={removeImage}>
Remove Image
</button>
</div>
{:else}
<div class="image-upload">
<label for="image" class="upload-label">
<div class="upload-content">
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h7"/>
<line x1="16" y1="5" x2="22" y2="5"/>
<line x1="19" y1="2" x2="19" y2="8"/>
</svg>
<p>{currentImage ? 'Replace Image' : 'Upload Receipt Image'}</p>
<small>JPEG, PNG, WebP (max 5MB)</small>
</div>
</label>
<input
type="file"
id="image"
accept="image/jpeg,image/jpg,image/png,image/webp"
on:change={handleImageChange}
disabled={uploading}
hidden
/>
</div>
{/if}
{#if uploading}
<div class="upload-status">Uploading image...</div>
{/if}
</div>
<style>
.form-section {
background: var(--nord6);
padding: 1.5rem;
border-radius: 0.75rem;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
border: 1px solid var(--nord4);
}
.form-section h2 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
font-size: 1.25rem;
}
@media (prefers-color-scheme: dark) {
.form-section {
background: var(--nord1);
border-color: var(--nord2);
}
.form-section h2 {
color: var(--font-default-dark);
}
}
.image-upload {
border: 2px dashed var(--nord4);
border-radius: 0.5rem;
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s;
background-color: var(--nord5);
}
.image-upload:hover {
border-color: var(--blue);
background-color: var(--nord4);
}
@media (prefers-color-scheme: dark) {
.image-upload {
background-color: var(--nord2);
border-color: var(--nord3);
}
.image-upload:hover {
background-color: var(--nord3);
}
}
.upload-label {
cursor: pointer;
display: block;
}
.upload-content svg {
color: var(--nord3);
margin-bottom: 1rem;
}
.upload-content p {
margin: 0 0 0.5rem 0;
font-weight: 500;
color: var(--nord0);
}
.upload-content small {
color: var(--nord3);
}
@media (prefers-color-scheme: dark) {
.upload-content svg {
color: var(--nord4);
}
.upload-content p {
color: var(--font-default-dark);
}
.upload-content small {
color: var(--nord4);
}
}
.image-preview {
text-align: center;
}
.image-preview img {
max-width: 100%;
max-height: 300px;
border-radius: 0.5rem;
margin-bottom: 1rem;
}
.remove-image, .btn-remove {
background-color: var(--red);
color: white;
border: none;
padding: 0.5rem 1rem;
border-radius: 0.25rem;
cursor: pointer;
transition: all 0.2s;
}
.remove-image:hover, .btn-remove:hover {
background-color: var(--nord11);
transform: translateY(-1px);
}
.current-image {
margin-bottom: 1rem;
text-align: center;
}
.receipt-preview {
max-width: 200px;
max-height: 200px;
object-fit: cover;
border-radius: 0.5rem;
border: 1px solid var(--nord4);
margin-bottom: 0.75rem;
display: block;
margin-left: auto;
margin-right: auto;
}
@media (prefers-color-scheme: dark) {
.receipt-preview {
border-color: var(--nord2);
}
}
.image-actions {
display: flex;
justify-content: center;
}
.upload-status {
margin-top: 0.5rem;
color: var(--blue);
font-size: 0.9rem;
text-align: center;
}
</style>

View File

@@ -0,0 +1,456 @@
<script>
import ProfilePicture from './ProfilePicture.svelte';
export let splitMethod = 'equal';
export let users = [];
export let amount = 0;
export let paidBy = '';
export let splitAmounts = {};
export let personalAmounts = {};
export let currentUser = '';
export let predefinedMode = false;
let personalTotalError = false;
// Reactive text for "Paid in Full" option
$: paidInFullText = (() => {
if (!paidBy) {
return 'Paid in Full';
}
// Special handling for 2-user predefined setup
if (predefinedMode && users.length === 2) {
const otherUser = users.find(user => user !== paidBy);
return otherUser ? `Paid in Full for ${otherUser}` : 'Paid in Full';
}
// General case
if (paidBy === currentUser) {
return 'Paid in Full by You';
} else {
return `Paid in Full by ${paidBy}`;
}
})();
function calculateEqualSplits() {
if (!amount || users.length === 0) return;
const amountNum = parseFloat(amount);
const splitAmount = amountNum / users.length;
users.forEach(user => {
if (user === paidBy) {
splitAmounts[user] = splitAmount - amountNum;
} else {
splitAmounts[user] = splitAmount;
}
});
splitAmounts = { ...splitAmounts };
}
function calculateFullPayment() {
if (!amount) return;
const amountNum = parseFloat(amount);
const otherUsers = users.filter(user => user !== paidBy);
const amountPerOtherUser = otherUsers.length > 0 ? amountNum / otherUsers.length : 0;
users.forEach(user => {
if (user === paidBy) {
splitAmounts[user] = -amountNum;
} else {
splitAmounts[user] = amountPerOtherUser;
}
});
splitAmounts = { ...splitAmounts };
}
function calculatePersonalEqualSplit() {
if (!amount || users.length === 0) return;
const totalAmount = parseFloat(amount);
const totalPersonal = users.reduce((sum, user) => {
return sum + (parseFloat(personalAmounts[user]) || 0);
}, 0);
const remainder = Math.max(0, totalAmount - totalPersonal);
const equalShare = remainder / users.length;
users.forEach(user => {
const personalAmount = parseFloat(personalAmounts[user]) || 0;
const totalOwed = personalAmount + equalShare;
if (user === paidBy) {
splitAmounts[user] = totalOwed - totalAmount;
} else {
splitAmounts[user] = totalOwed;
}
});
splitAmounts = { ...splitAmounts };
}
function handleSplitMethodChange() {
if (splitMethod === 'equal') {
calculateEqualSplits();
} else if (splitMethod === 'full') {
calculateFullPayment();
} else if (splitMethod === 'personal_equal') {
calculatePersonalEqualSplit();
} else if (splitMethod === 'proportional') {
users.forEach(user => {
if (!(user in splitAmounts)) {
splitAmounts[user] = 0;
}
});
splitAmounts = { ...splitAmounts };
}
}
// Validate and recalculate when personal amounts change
$: if (splitMethod === 'personal_equal' && personalAmounts && amount) {
const totalPersonal = Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0);
const totalAmount = parseFloat(amount);
personalTotalError = totalPersonal > totalAmount;
if (!personalTotalError) {
calculatePersonalEqualSplit();
}
}
$: if (amount && splitMethod && paidBy) {
handleSplitMethodChange();
}
</script>
<div class="form-section">
<h2>Split Method</h2>
<div class="form-group">
<label for="splitMethod">How should this payment be split?</label>
<select id="splitMethod" name="splitMethod" bind:value={splitMethod} required>
<option value="equal">{predefinedMode && users.length === 2 ? 'Split 50/50' : 'Equal Split'}</option>
<option value="personal_equal">Personal + Equal Split</option>
<option value="full">{paidInFullText}</option>
<option value="proportional">Custom Proportions</option>
</select>
</div>
{#if splitMethod === 'proportional'}
<div class="proportional-splits">
<h3>Custom Split Amounts</h3>
{#each users as user}
<div class="split-input">
<label>{user}</label>
<input
type="number"
step="0.01"
name="split_{user}"
bind:value={splitAmounts[user]}
placeholder="0.00"
/>
</div>
{/each}
</div>
{/if}
{#if splitMethod === 'personal_equal'}
<div class="personal-splits">
<h3>Personal Amounts</h3>
<p class="description">Enter personal amounts for each user. The remainder will be split equally.</p>
{#each users as user}
<div class="split-input">
<label>{user}</label>
<input
type="number"
step="0.01"
min="0"
name="personal_{user}"
bind:value={personalAmounts[user]}
placeholder="0.00"
/>
</div>
{/each}
{#if amount}
<div class="remainder-info" class:error={personalTotalError}>
<span>Total Personal: CHF {Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0).toFixed(2)}</span>
<span>Remainder to Split: CHF {Math.max(0, parseFloat(amount) - Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0)).toFixed(2)}</span>
{#if personalTotalError}
<div class="error-message">⚠️ Personal amounts exceed total payment amount!</div>
{/if}
</div>
{/if}
</div>
{/if}
{#if Object.keys(splitAmounts).length > 0}
<div class="split-preview">
<h3>Split Preview</h3>
{#each users as user}
<div class="split-item">
<div class="split-user">
<ProfilePicture username={user} size={24} />
<span class="username">{user}</span>
</div>
<span class="amount" class:positive={splitAmounts[user] < 0} class:negative={splitAmounts[user] > 0}>
{#if splitAmounts[user] > 0}
owes CHF {splitAmounts[user].toFixed(2)}
{:else if splitAmounts[user] < 0}
is owed CHF {Math.abs(splitAmounts[user]).toFixed(2)}
{:else}
owes CHF {splitAmounts[user].toFixed(2)}
{/if}
</span>
</div>
{/each}
</div>
{/if}
</div>
<style>
.form-section {
background: var(--nord6);
padding: 1.5rem;
border-radius: 0.75rem;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
border: 1px solid var(--nord4);
}
.form-section h2 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
font-size: 1.25rem;
}
@media (prefers-color-scheme: dark) {
.form-section {
background: var(--nord1);
border-color: var(--nord2);
}
.form-section h2 {
color: var(--font-default-dark);
}
}
.form-group {
margin-bottom: 1rem;
}
label {
display: block;
margin-bottom: 0.5rem;
font-weight: 500;
color: var(--nord2);
}
@media (prefers-color-scheme: dark) {
label {
color: var(--nord5);
}
}
select {
width: 100%;
padding: 0.75rem;
border: 1px solid var(--nord4);
border-radius: 0.5rem;
font-size: 1rem;
box-sizing: border-box;
background-color: var(--nord6);
color: var(--nord0);
}
select:focus {
outline: none;
border-color: var(--blue);
box-shadow: 0 0 0 2px rgba(94, 129, 172, 0.2);
}
@media (prefers-color-scheme: dark) {
select {
background-color: var(--nord2);
color: var(--font-default-dark);
border-color: var(--nord3);
}
}
.proportional-splits, .personal-splits {
margin-top: 1rem;
}
.proportional-splits {
border: 1px solid var(--nord4);
border-radius: 0.5rem;
padding: 1rem;
margin-bottom: 1rem;
background-color: var(--nord5);
}
@media (prefers-color-scheme: dark) {
.proportional-splits {
border-color: var(--nord3);
background-color: var(--nord2);
}
}
.proportional-splits h3, .personal-splits h3 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
}
@media (prefers-color-scheme: dark) {
.proportional-splits h3, .personal-splits h3 {
color: var(--font-default-dark);
}
}
.personal-splits .description {
color: var(--nord2);
font-size: 0.9rem;
margin-bottom: 1rem;
font-style: italic;
}
@media (prefers-color-scheme: dark) {
.personal-splits .description {
color: var(--nord4);
}
}
.split-input {
display: flex;
align-items: center;
gap: 1rem;
margin-bottom: 0.5rem;
}
.split-input label {
min-width: 100px;
margin-bottom: 0;
}
.split-input input {
max-width: 120px;
padding: 0.75rem;
border: 1px solid var(--nord4);
border-radius: 0.5rem;
font-size: 1rem;
background-color: var(--nord6);
color: var(--nord0);
box-sizing: border-box;
}
.split-input input:focus {
outline: none;
border-color: var(--blue);
box-shadow: 0 0 0 2px rgba(94, 129, 172, 0.2);
}
@media (prefers-color-scheme: dark) {
.split-input input {
background-color: var(--nord2);
color: var(--font-default-dark);
border-color: var(--nord3);
}
}
.remainder-info {
margin-top: 1rem;
padding: 1rem;
background-color: var(--nord5);
border-radius: 0.5rem;
border: 1px solid var(--nord4);
}
.remainder-info.error {
background-color: var(--nord6);
border-color: var(--red);
}
@media (prefers-color-scheme: dark) {
.remainder-info {
background-color: var(--nord2);
border-color: var(--nord3);
}
.remainder-info.error {
background-color: var(--accent-dark);
border-color: var(--red);
}
}
.remainder-info span {
display: block;
margin-bottom: 0.5rem;
font-weight: 500;
}
.error-message {
color: var(--red);
font-weight: 600;
margin-top: 0.5rem;
font-size: 0.9rem;
}
.split-preview {
background-color: var(--nord5);
padding: 1rem;
border-radius: 0.5rem;
border: 1px solid var(--nord4);
}
@media (prefers-color-scheme: dark) {
.split-preview {
background-color: var(--nord2);
border-color: var(--nord3);
}
}
.split-preview h3 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
}
@media (prefers-color-scheme: dark) {
.split-preview h3 {
color: var(--font-default-dark);
}
}
.split-item {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 0.5rem;
}
.split-user {
display: flex;
align-items: center;
gap: 0.5rem;
}
.username {
color: var(--nord0);
}
@media (prefers-color-scheme: dark) {
.username {
color: var(--font-default-dark);
}
}
.amount.positive {
color: var(--green);
font-weight: 500;
}
.amount.negative {
color: var(--red);
font-weight: 500;
}
</style>

View File

@@ -0,0 +1,239 @@
<script>
import ProfilePicture from './ProfilePicture.svelte';
export let users = [];
export let currentUser = '';
export let predefinedMode = false;
export let canRemoveUsers = true;
export let newUser = '';
function addUser() {
if (predefinedMode) return;
if (newUser.trim() && !users.includes(newUser.trim())) {
users = [...users, newUser.trim()];
newUser = '';
}
}
function removeUser(userToRemove) {
if (predefinedMode) return;
if (!canRemoveUsers) return;
if (users.length > 1 && userToRemove !== currentUser) {
users = users.filter(u => u !== userToRemove);
}
}
</script>
<div class="form-section">
<h2>Split Between Users</h2>
{#if predefinedMode}
<div class="predefined-users">
<p class="predefined-note">Splitting between predefined users:</p>
<div class="users-list">
{#each users as user}
<div class="user-item with-profile">
<ProfilePicture username={user} size={32} />
<span class="username">{user}</span>
{#if user === currentUser}
<span class="you-badge">You</span>
{/if}
</div>
{/each}
</div>
</div>
{:else}
<div class="users-list">
{#each users as user}
<div class="user-item with-profile">
<ProfilePicture username={user} size={32} />
<span class="username">{user}</span>
{#if user === currentUser}
<span class="you-badge">You</span>
{/if}
{#if canRemoveUsers && user !== currentUser}
<button type="button" class="remove-user" on:click={() => removeUser(user)}>
Remove
</button>
{/if}
</div>
{/each}
</div>
<div class="add-user js-enhanced" style="display: none;">
<input
type="text"
bind:value={newUser}
placeholder="Add user..."
on:keydown={(e) => e.key === 'Enter' && (e.preventDefault(), addUser())}
/>
<button type="button" on:click={addUser}>Add User</button>
</div>
{/if}
</div>
<style>
.form-section {
background: var(--nord6);
padding: 1.5rem;
border-radius: 0.75rem;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
border: 1px solid var(--nord4);
}
.form-section h2 {
margin-top: 0;
margin-bottom: 1rem;
color: var(--nord0);
font-size: 1.25rem;
}
@media (prefers-color-scheme: dark) {
.form-section {
background: var(--nord1);
border-color: var(--nord2);
}
.form-section h2 {
color: var(--font-default-dark);
}
}
.users-list {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
margin-bottom: 1rem;
}
.user-item {
display: flex;
align-items: center;
gap: 0.5rem;
background-color: var(--nord5);
padding: 0.5rem 0.75rem;
border-radius: 1rem;
border: 1px solid var(--nord4);
}
@media (prefers-color-scheme: dark) {
.user-item {
background-color: var(--nord2);
border-color: var(--nord3);
}
}
.user-item.with-profile {
gap: 0.75rem;
}
.user-item .username {
font-weight: 500;
color: var(--nord0);
}
@media (prefers-color-scheme: dark) {
.user-item .username {
color: var(--font-default-dark);
}
}
.you-badge {
background-color: var(--blue);
color: white;
padding: 0.125rem 0.5rem;
border-radius: 1rem;
font-size: 0.75rem;
font-weight: 500;
}
.predefined-users {
background-color: var(--nord5);
padding: 1rem;
border-radius: 0.5rem;
border: 1px solid var(--nord4);
}
@media (prefers-color-scheme: dark) {
.predefined-users {
background-color: var(--nord2);
border-color: var(--nord3);
}
}
.predefined-note {
margin: 0 0 1rem 0;
color: var(--nord2);
font-size: 0.9rem;
font-style: italic;
}
@media (prefers-color-scheme: dark) {
.predefined-note {
color: var(--nord4);
}
}
.remove-user {
background-color: var(--red);
color: white;
border: none;
padding: 0.25rem 0.5rem;
border-radius: 0.25rem;
font-size: 0.75rem;
cursor: pointer;
transition: all 0.2s;
}
.remove-user:hover {
background-color: var(--nord11);
transform: translateY(-1px);
}
.add-user {
display: flex;
gap: 0.5rem;
}
.add-user input {
flex: 1;
padding: 0.75rem;
border: 1px solid var(--nord4);
border-radius: 0.5rem;
font-size: 1rem;
background-color: var(--nord6);
color: var(--nord0);
box-sizing: border-box;
}
.add-user input:focus {
outline: none;
border-color: var(--blue);
box-shadow: 0 0 0 2px rgba(94, 129, 172, 0.2);
}
@media (prefers-color-scheme: dark) {
.add-user input {
background-color: var(--nord2);
color: var(--font-default-dark);
border-color: var(--nord3);
}
}
.add-user button {
background-color: var(--blue);
color: white;
border: none;
padding: 0.75rem 1rem;
border-radius: 0.5rem;
cursor: pointer;
transition: all 0.2s;
}
.add-user button:hover {
background-color: var(--nord10);
transform: translateY(-1px);
}
</style>