From 77d1f27c49b0cb74a573a8c82cdc74396c5d386f Mon Sep 17 00:00:00 2001 From: anthonyray Date: Thu, 14 Mar 2024 10:28:10 +0000 Subject: [PATCH] Prettified Code! --- shared/src/types/employers.ts | 2 +- .../(website)/me/work-info/add-employer-form.tsx | 12 +++++++----- .../(website)/me/work-info/employers-list.tsx | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/shared/src/types/employers.ts b/shared/src/types/employers.ts index 5501e640e..7f7f431d2 100644 --- a/shared/src/types/employers.ts +++ b/shared/src/types/employers.ts @@ -1,4 +1,4 @@ -import { DocumentReference, Timestamp } from 'firebase-admin/firestore'; +import { Timestamp } from 'firebase-admin/firestore'; export const EMPLOYERS_FIRESTORE_PATH = 'employers'; diff --git a/website/src/app/[lang]/[region]/(website)/me/work-info/add-employer-form.tsx b/website/src/app/[lang]/[region]/(website)/me/work-info/add-employer-form.tsx index 81cc430e7..5248afa84 100644 --- a/website/src/app/[lang]/[region]/(website)/me/work-info/add-employer-form.tsx +++ b/website/src/app/[lang]/[region]/(website)/me/work-info/add-employer-form.tsx @@ -4,7 +4,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { EMPLOYERS_FIRESTORE_PATH, Employer } from '@socialincome/shared/src/types/employers'; import { USER_FIRESTORE_PATH } from '@socialincome/shared/src/types/user'; import { Button, Form, FormControl, FormField, FormItem, FormMessage, Input } from '@socialincome/ui'; -import { Timestamp, addDoc, collection, doc } from 'firebase/firestore'; +import { Timestamp, addDoc, collection } from 'firebase/firestore'; import { useForm } from 'react-hook-form'; import { useFirestore } from 'reactfire'; import * as z from 'zod'; @@ -43,10 +43,12 @@ export function AddEmployerForm({ onNewEmployerSubmitted, translations }: AddEmp created: Timestamp.now(), }; - await addDoc(collection(firestore, USER_FIRESTORE_PATH, user_id, EMPLOYERS_FIRESTORE_PATH), new_employer).then(() => { - form.reset(); - onNewEmployerSubmitted(); - }); + await addDoc(collection(firestore, USER_FIRESTORE_PATH, user_id, EMPLOYERS_FIRESTORE_PATH), new_employer).then( + () => { + form.reset(); + onNewEmployerSubmitted(); + }, + ); } }; diff --git a/website/src/app/[lang]/[region]/(website)/me/work-info/employers-list.tsx b/website/src/app/[lang]/[region]/(website)/me/work-info/employers-list.tsx index d80ad9d57..a4d240981 100644 --- a/website/src/app/[lang]/[region]/(website)/me/work-info/employers-list.tsx +++ b/website/src/app/[lang]/[region]/(website)/me/work-info/employers-list.tsx @@ -25,7 +25,7 @@ type EmployersListProps = { } & DefaultParams; type EmployerWithId = { - id: string + id: string; } & Employer; export function EmployersList({ translations }: EmployersListProps) { @@ -51,7 +51,8 @@ export function EmployersList({ translations }: EmployersListProps) { await deleteDoc(employerRef).then(() => onEmployersUpdated()); }; - const onArchiveEmployer = async (employer_id: string) => { // Not leveraging type system .... + const onArchiveEmployer = async (employer_id: string) => { + // Not leveraging type system .... const employerRef = doc(firestore, USER_FIRESTORE_PATH, user!.id, EMPLOYERS_FIRESTORE_PATH, employer_id); await updateDoc(employerRef, { is_current: false }).then(() => onEmployersUpdated()); }; @@ -66,7 +67,7 @@ export function EmployersList({ translations }: EmployersListProps) { const employers: EmployerWithId[] = data!.docs.map((e) => { const employer: Employer = e.data() as Employer; - return { id: e.id, ...employer } + return { id: e.id, ...employer }; }); const currentEmployers: EmployerWithId[] = employers.filter((e) => e.is_current); const pastEmployers: EmployerWithId[] = employers.filter((e) => !e.is_current);