thalla/lomavuokraus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix/billing-checkbox-alignment' (#17) from fix/billing-checkbox-alignment into master
Some checks are pending
CI / checks (push) Waiting to run
Details

Browse source 
Reviewed-on: #17
This commit is contained in:
Tero Halla-aho 2025-12-21 16:43:12 +02:00
commit b68a75d0b0
1 changed files with 92 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
app/me/page.tsx
View file

@ -157,73 +157,89 @@ export default function ProfilePage() {
} }
return ( return (
<main className="panel" style={{ maxWidth: 640, margin: '40px auto' }}> <main style={{ maxWidth: 1040, margin: '32px auto', display: 'grid', gap: 18 }}>
<h1>{t('myProfileTitle')}</h1> <header className="panel" style={{ display: 'grid', gap: 12, padding: 18 }}>
{message ? <p style={{ color: 'green' }}>{message}</p> : null} <div>
<h1 style={{ margin: 0 }}>{t('myProfileTitle')}</h1>
{message ? <p style={{ color: 'green', margin: '6px 0 0' }}>{message}</p> : null}
</div>
{user ? (
<>
<div style={{ display: 'grid', gap: 6, gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))' }}>
<div><strong>{t('profileEmail')}:</strong> {user.email}</div>
<div><strong>{t('profileName')}:</strong> {user.name ?? '—'}</div>
<div><strong>{t('profilePhone')}:</strong> {user.phone ?? '—'}</div>
<div><strong>{t('profileRole')}:</strong> {user.role}</div>
<div><strong>{t('profileStatus')}:</strong> {user.status}</div>
<div><strong>{t('profileEmailVerified')}:</strong> {user.emailVerifiedAt ? t('yes') : t('no')}</div>
<div><strong>{t('profileApproved')}:</strong> {user.approvedAt ? t('yes') : t('no')}</div>
</div>
<div style={{ display: 'flex', gap: 10, flexWrap: 'wrap' }}>
<a className="button secondary" href="/listings/mine">
{t('navMyListings')}
</a>
<a className="button secondary" href="/listings/new">
{t('navNewListing')}
</a>
</div>
</>
) : (
<p style={{ color: 'red', margin: 0 }}>{error ?? t('notLoggedIn')}</p>
)}
</header>
{user ? ( {user ? (
<> <>
<ul> <section className="panel" style={{ padding: 18, display: 'grid', gap: 12 }}>
<li> <h2 style={{ margin: 0 }}>{t('myProfileTitle')}</h2>
<strong>{t('profileEmail')}:</strong> {user.email} <form onSubmit={onSave} style={{ display: 'grid', gap: 12 }}>
</li> <div style={{ display: 'grid', gap: 10, gridTemplateColumns: 'repeat(auto-fit, minmax(260px, 1fr))', maxWidth: 760 }}>
<li> <label>
<strong>{t('profileName')}:</strong> {user.name ?? '—'} {t('profileName')}
</li> <input value={name} onChange={(e) => setName(e.target.value)} />
<li> </label>
<strong>{t('profilePhone')}:</strong> {user.phone ?? '—'} <label>
</li> {t('profilePhone')}
<li> <input value={phone} onChange={(e) => setPhone(e.target.value)} />
<strong>{t('profileRole')}:</strong> {user.role} </label>
</li> <label>
<li> {t('passwordLabel')} ({t('passwordHint')})
<strong>{t('profileStatus')}:</strong> {user.status} <input type="password" value={password} onChange={(e) => setPassword(e.target.value)} minLength={8} />
</li> </label>
<li> </div>
<strong>{t('profileEmailVerified')}:</strong> {user.emailVerifiedAt ? t('yes') : t('no')} <p style={{ fontSize: 12, color: '#666', margin: 0 }}>{t('emailLocked')}</p>
</li> <div>
<li> <button className="button" type="submit" disabled={saving} style={{ minWidth: 160 }}>
<strong>{t('profileApproved')}:</strong> {user.approvedAt ? t('yes') : t('no')} {saving ? t('saving') : t('save')}
</li> </button>
</ul> </div>
<div style={{ marginTop: 16, display: 'flex', gap: 10, flexWrap: 'wrap' }}> </form>
<a className="button secondary" href="/listings/mine"> </section>
{t('navMyListings')}
</a> <section className="panel" style={{ padding: 18, display: 'grid', gap: 12 }}>
<a className="button secondary" href="/listings/new"> <div>
{t('navNewListing')} <h2 style={{ margin: 0 }}>{t('billingSettingsTitle')}</h2>
</a> <p style={{ color: '#444', margin: '6px 0 0' }}>{t('billingSettingsLead')}</p>
</div> </div>
<form onSubmit={onSave} style={{ marginTop: 20, display: 'grid', gap: 10, maxWidth: 420 }}> {billingMessage ? <p style={{ color: 'green', margin: 0 }}>{billingMessage}</p> : null}
<label> {billingError ? <p style={{ color: 'red', margin: 0 }}>{billingError}</p> : null}
{t('profileName')} <form onSubmit={onSaveBilling} style={{ display: 'grid', gap: 14 }}>
<input value={name} onChange={(e) => setName(e.target.value)} /> <label
</label> className="amenity-option"
<label> style={{ maxWidth: 520, display: 'grid', gridTemplateColumns: 'auto 1fr auto', alignItems: 'center', columnGap: 10, minHeight: 52 }}
{t('profilePhone')} >
<input value={phone} onChange={(e) => setPhone(e.target.value)} /> <span aria-hidden className="amenity-emoji">💸</span>
</label> <span className="amenity-name" style={{ fontWeight: 600 }}>{t('billingEnableLabel')}</span>
<label> <input
{t('passwordLabel')} ({t('passwordHint')}) type="checkbox"
<input type="password" value={password} onChange={(e) => setPassword(e.target.value)} minLength={8} /> checked={billingEnabled}
</label> onChange={(e) => setBillingEnabled(e.target.checked)}
<p style={{ fontSize: 12, color: '#666' }}>{t('emailLocked')}</p> style={{ width: 22, height: 22, margin: 0, justifySelf: 'end' }}
<button className="button" type="submit" disabled={saving}> />
{saving ? t('saving') : t('save')}
</button>
</form>
<section style={{ marginTop: 30 }}>
<h2 style={{ marginBottom: 6 }}>{t('billingSettingsTitle')}</h2>
<p style={{ color: '#444', marginBottom: 12 }}>{t('billingSettingsLead')}</p>
{billingMessage ? <p style={{ color: 'green' }}>{billingMessage}</p> : null}
{billingError ? <p style={{ color: 'red' }}>{billingError}</p> : null}
<form onSubmit={onSaveBilling} style={{ display: 'grid', gap: 14, marginTop: 8 }}>
<label style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
<input type="checkbox" checked={billingEnabled} onChange={(e) => setBillingEnabled(e.target.checked)} />
<span>{t('billingEnableLabel')}</span>
</label> </label>
{billingEnabled ? ( {billingEnabled ? (
<> <>
<div style={{ display: 'grid', gap: 8 }}> <div style={{ display: 'grid', gap: 10, gridTemplateColumns: 'repeat(auto-fit, minmax(260px, 1fr))', maxWidth: 760 }}>
<label> <label>
{t('billingAccountNameLabel')} {t('billingAccountNameLabel')}
<input value={billingAccountName} onChange={(e) => setBillingAccountName(e.target.value)} placeholder="Example Oy" /> <input value={billingAccountName} onChange={(e) => setBillingAccountName(e.target.value)} placeholder="Example Oy" />
@ -232,16 +248,21 @@ export default function ProfilePage() {
{t('billingIbanLabel')} {t('billingIbanLabel')}
<input value={billingIban} onChange={(e) => setBillingIban(e.target.value)} placeholder="FI00 1234 5600 0007 85" /> <input value={billingIban} onChange={(e) => setBillingIban(e.target.value)} placeholder="FI00 1234 5600 0007 85" />
</label> </label>
<label style={{ display: 'flex', gap: 8, alignItems: 'center' }}> <label
className="amenity-option"
style={{ maxWidth: 520, display: 'grid', gridTemplateColumns: 'auto 1fr auto', alignItems: 'center', columnGap: 10, minHeight: 52 }}
>
<span aria-hidden className="amenity-emoji">🧾</span>
<span className="amenity-name" style={{ fontWeight: 600 }}>{t('billingIncludeVat')}</span>
<input <input
type="checkbox" type="checkbox"
checked={billingIncludeVatLine} checked={billingIncludeVatLine}
onChange={(e) => setBillingIncludeVatLine(e.target.checked)} onChange={(e) => setBillingIncludeVatLine(e.target.checked)}
style={{ width: 22, height: 22, margin: 0, justifySelf: 'end' }}
/> />
<span>{t('billingIncludeVat')}</span>
</label> </label>
</div> </div>
<div style={{ border: '1px solid #eee', padding: 12, borderRadius: 6 }}> <div style={{ border: '1px solid rgba(148,163,184,0.3)', padding: 12, borderRadius: 8, background: 'rgba(255,255,255,0.02)' }}>
<div style={{ marginBottom: 8 }}> <div style={{ marginBottom: 8 }}>
<strong>{t('billingListingsTitle')}</strong> <strong>{t('billingListingsTitle')}</strong>
<div style={{ color: '#555', fontSize: 13 }}>{t('billingListingsLead')}</div> <div style={{ color: '#555', fontSize: 13 }}>{t('billingListingsLead')}</div>
@ -260,11 +281,11 @@ export default function ProfilePage() {
? 'yes' ? 'yes'
: 'no'; : 'no';
return ( return (
<div key={listing.id} style={{ border: '1px solid #f0f0f0', padding: 10, borderRadius: 4 }}> <div key={listing.id} style={{ border: '1px solid #f0f0f0', padding: 10, borderRadius: 6, display: 'grid', gap: 8 }}>
<div style={{ fontWeight: 600, marginBottom: 6 }}> <div style={{ fontWeight: 600 }}>
{listing.title} ({listing.slug}) {listing.title} ({listing.slug})
</div> </div>
<div style={{ display: 'grid', gap: 8 }}> <div style={{ display: 'grid', gap: 8, gridTemplateColumns: 'repeat(auto-fit, minmax(240px, 1fr))' }}>
<label> <label>
{t('billingAccountNameLabel')} {t('billingAccountNameLabel')}
<input <input
@ -321,19 +342,17 @@ export default function ProfilePage() {
</div> </div>
</> </>
) : ( ) : (
<p style={{ color: '#666' }}>{t('billingDisabledHint')}</p> <p style={{ color: '#666', margin: 0 }}>{t('billingDisabledHint')}</p>
)} )}
<div> <div>
<button className="button" type="submit" disabled={billingSaving}> <button className="button" type="submit" disabled={billingSaving} style={{ minWidth: 160 }}>
{billingSaving ? t('saving') : t('save')} {billingSaving ? t('saving') : t('save')}
</button> </button>
</div> </div>
</form> </form>
</section> </section>
</> </>
) : ( ) : null}
<p style={{ color: 'red' }}>{error ?? t('notLoggedIn')}</p>
)}
</main> </main>
); );
} }