1 Commits
1.0.0 ... 1.1.0

Author SHA1 Message Date
Sebastien Castiel
50525ad881 Add cancel button on expense form (fixes #92) 2024-02-14 09:49:06 -05:00
2 changed files with 18 additions and 7 deletions

View File

@@ -39,6 +39,7 @@ import { ExpenseFormValues, expenseFormSchema } from '@/lib/schemas'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { zodResolver } from '@hookform/resolvers/zod' import { zodResolver } from '@hookform/resolvers/zod'
import { Save, Trash2 } from 'lucide-react' import { Save, Trash2 } from 'lucide-react'
import Link from 'next/link'
import { useSearchParams } from 'next/navigation' import { useSearchParams } from 'next/navigation'
import { useState } from 'react' import { useState } from 'react'
import { useForm } from 'react-hook-form' import { useForm } from 'react-hook-form'
@@ -583,6 +584,9 @@ export function ExpenseForm({
Delete Delete
</AsyncButton> </AsyncButton>
)} )}
<Button variant="ghost" asChild>
<Link href={`/groups/${group.id}`}>Cancel</Link>
</Button>
</div> </div>
</form> </form>
</Form> </Form>

View File

@@ -35,6 +35,7 @@ import { getGroup } from '@/lib/api'
import { GroupFormValues, groupFormSchema } from '@/lib/schemas' import { GroupFormValues, groupFormSchema } from '@/lib/schemas'
import { zodResolver } from '@hookform/resolvers/zod' import { zodResolver } from '@hookform/resolvers/zod'
import { Save, Trash2 } from 'lucide-react' import { Save, Trash2 } from 'lucide-react'
import Link from 'next/link'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useFieldArray, useForm } from 'react-hook-form' import { useFieldArray, useForm } from 'react-hook-form'
@@ -272,13 +273,19 @@ export function GroupForm({
</CardContent> </CardContent>
</Card> </Card>
<SubmitButton <div className="flex mt-4 gap-2">
size="lg" <SubmitButton
loadingContent={group ? 'Saving…' : 'Creating…'} loadingContent={group ? 'Saving…' : 'Creating…'}
onClick={updateActiveUser} onClick={updateActiveUser}
> >
<Save className="w-4 h-4 mr-2" /> {group ? <>Save</> : <> Create</>} <Save className="w-4 h-4 mr-2" /> {group ? <>Save</> : <> Create</>}
</SubmitButton> </SubmitButton>
{!group && (
<Button variant="ghost" asChild>
<Link href="/groups">Cancel</Link>
</Button>
)}
</div>
</form> </form>
</Form> </Form>
) )