diff --git a/components/HeaderNavbar.tsx b/components/HeaderNavbar.tsx index 039739a..b4c25ea 100644 --- a/components/HeaderNavbar.tsx +++ b/components/HeaderNavbar.tsx @@ -41,6 +41,7 @@ const HeaderNavbar: React.FC = () => { { amount: parseCurrency(amount), date: values.date, + description: values.description, category: { id: values.category }, user: { // @ts-ignore diff --git a/forms/TransactionForm.tsx b/forms/TransactionForm.tsx index a676b6a..8cc420a 100644 --- a/forms/TransactionForm.tsx +++ b/forms/TransactionForm.tsx @@ -29,6 +29,7 @@ import Loading from "components/Loading"; const validationSchema = Yup.object().shape({ amount: Yup.number().required("Required").nullable(), date: Yup.date().required("Required").nullable(), + description: Yup.string().nullable(), category: Yup.string().required("Required").nullable(), }); @@ -40,6 +41,7 @@ export interface TransactionFormProps { export type TransactionFormValues = { amount: number; date: Date; + description: String; category: string; type: "expense" | "income"; }; @@ -77,6 +79,17 @@ const TransactionForm: React.FC = (props) => { /> + + {!data.queryCategory.length ? (
diff --git a/server/ikura.graphql b/server/ikura.graphql index 94ed06a..c38412e 100644 --- a/server/ikura.graphql +++ b/server/ikura.graphql @@ -1,7 +1,6 @@ # Zef.SchemaVersion: v1 # Zef.Authentication: {"Algo": "HS256", "VerificationKey": "2c3432fba16d204318282d820959521efcd43fa1f3d75abb9ec31e902c65f981", "Audience": "ikura.app", "Header": "X-Auth-Token"} - type User @auth( add: """ @@ -15,10 +14,8 @@ type User | collect]) """ ) -@upfetch(field: "email") -@hook( - onCreate: "userCreate" -) { + @upfetch(field: "email") + @hook(onCreate: "userCreate") { sub: String email: String! @unique @search givenName: String @@ -46,6 +43,7 @@ type Transaction user: User @relation(rt: "User") category: Category amount: Int @search + description: String date: DateTime @search } @@ -68,11 +66,8 @@ type Category | collect]) """ ) { - user: User - transactions: [Transaction] - @incoming - @relation(rt: "Category") + transactions: [Transaction] @incoming @relation(rt: "Category") name: String icon: String created: DateTime