Merge pull request #316 from dump-hr/fix/choose-booth-page

fix chose booth page
dump-hr · Apr 28, 2024 · 8104cf9 · 8104cf9
2 parents 344b0ba + 83a85e8
commit 8104cf9
Show file tree

Hide file tree

Showing 43 changed files with 1,450 additions and 529 deletions.
diff --git a/apps/admin/src/App.scss b/apps/admin/src/App.scss
@@ -3,4 +3,10 @@
   font-size: 16px;
   font-weight: 400;
   font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-}
+}
+
+.flex {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 8px;
+}
diff --git a/apps/admin/src/api/booth/useCreateBooth.ts b/apps/admin/src/api/booth/useCreateBooth.ts
@@ -1,11 +1,11 @@
-import { BoothDto, CreateBoothDto } from '@ddays-app/types';
+import { BoothCreateDto, BoothDto } from '@ddays-app/types';
 import toast from 'react-hot-toast';
 import { useMutation, useQueryClient } from 'react-query';
 
 import { api } from '..';
 
-const createBooth = async (dto: CreateBoothDto): Promise<BoothDto> => {
-  return await api.post<CreateBoothDto, BoothDto>('/booth', dto);
+const createBooth = async (dto: BoothCreateDto): Promise<BoothDto> => {
+  return await api.post<BoothCreateDto, BoothDto>('/booth', dto);
 };
 
 export const useCreateBooth = () => {

diff --git a/apps/admin/src/api/booth/useCreateManyBooths.ts b/apps/admin/src/api/booth/useCreateManyBooths.ts
@@ -1,11 +1,11 @@
-import { CreateManyBoothsDto } from '@ddays-app/types';
+import { BoothCreateManyDto } from '@ddays-app/types';
 import toast from 'react-hot-toast';
 import { useMutation, useQueryClient } from 'react-query';
 
 import { api } from '..';
 
-const createManyBooths = async (data: CreateManyBoothsDto) => {
-  return await api.post<CreateManyBoothsDto, void>('/booth/many', data);
+const createManyBooths = async (data: BoothCreateManyDto) => {
+  return await api.post<BoothCreateManyDto, void>('/booth/many', data);
 };
 
 export const useCreateManyBooths = () => {

diff --git a/apps/admin/src/api/booth/useGetBooths.ts b/apps/admin/src/api/booth/useGetBooths.ts
@@ -1,10 +1,10 @@
-import { AdminBoothDto } from '@ddays-app/types';
+import { BoothDto } from '@ddays-app/types';
 import { useQuery } from 'react-query';
 
 import { api } from '..';
 
 const getBooths = async () => {
-  return await api.get<never, AdminBoothDto[]>('/booth');
+  return await api.get<never, BoothDto[]>('/booth');
 };
 
 export const useGetBooths = () => {

diff --git a/apps/admin/src/api/booth/useModifyBooth.ts b/apps/admin/src/api/booth/useModifyBooth.ts
@@ -1,14 +1,14 @@
-import { ModifyBoothDto } from '@ddays-app/types';
+import { BoothUpdateDto } from '@ddays-app/types';
 import toast from 'react-hot-toast';
 import { useMutation, useQueryClient } from 'react-query';
 
 import { api } from '..';
 
-const updateBooth = async (dto: ModifyBoothDto & { id: number }) => {
+const updateBooth = async (dto: BoothUpdateDto & { id: number }) => {
   return await api.patch(`/booth/${dto.id}`, dto);
 };
 
-export const useModifyBooth = () => {
+export const useUpdateBooth = () => {
   const queryClient = useQueryClient();
 
   return useMutation(updateBooth, {

diff --git a/apps/admin/src/forms/BoothForm.tsx b/apps/admin/src/forms/BoothForm.tsx
@@ -1,28 +1,24 @@
-import {
-  AdminBoothDto,
-  CompanyCategory,
-  ModifyBoothForm,
-} from '@ddays-app/types';
+import { BoothDto, BoothUpdateDto, CompanyCategory } from '@ddays-app/types';
 import { classValidatorResolver } from '@hookform/resolvers/class-validator';
 import { useForm } from 'react-hook-form';
 
 import { useCreateBooth } from '../api/booth/useCreateBooth';
-import { useModifyBooth } from '../api/booth/useModifyBooth';
+import { useUpdateBooth } from '../api/booth/useModifyBooth';
 import { useCompanyGetAllPublic } from '../api/company/useCompanyGetAllPublic';
 import { Button } from '../components/Button';
 import { InputHandler } from '../components/InputHandler';
 import { Question, QuestionType } from '../types/question';
 
 export interface BoothFormProps {
-  booth?: AdminBoothDto;
+  booth?: BoothDto;
   onSuccess?: () => void;
 }
 
 export const BoothForm: React.FC<BoothFormProps> = ({ booth, onSuccess }) => {
   const { data: companies } = useCompanyGetAllPublic();
 
   const createBooth = useCreateBooth();
-  const updateBooth = useModifyBooth();
+  const updateBooth = useUpdateBooth();
 
   const questions: Question[] = [
     {
@@ -49,8 +45,8 @@ export const BoothForm: React.FC<BoothFormProps> = ({ booth, onSuccess }) => {
     },
   ];
 
-  const form = useForm<ModifyBoothForm>({
-    resolver: classValidatorResolver(ModifyBoothForm),
+  const form = useForm<BoothUpdateDto>({
+    resolver: classValidatorResolver(BoothUpdateDto),
   });
 
   return (

diff --git a/apps/admin/src/forms/ManyBoothsForm.tsx b/apps/admin/src/forms/ManyBoothsForm.tsx
@@ -1,4 +1,4 @@
-import { CompanyCategory, CreateManyBoothsDto } from '@ddays-app/types';
+import { BoothCreateManyDto, CompanyCategory } from '@ddays-app/types';
 import { classValidatorResolver } from '@hookform/resolvers/class-validator';
 import { useForm } from 'react-hook-form';
 
@@ -24,8 +24,8 @@ export const ManyBoothsForm = ({ onSuccess }: { onSuccess?: () => void }) => {
     },
   ];
 
-  const form = useForm<CreateManyBoothsDto>({
-    resolver: classValidatorResolver(CreateManyBoothsDto),
+  const form = useForm<BoothCreateManyDto>({
+    resolver: classValidatorResolver(BoothCreateManyDto),
   });
 
   return (

diff --git a/apps/admin/src/pages/BoothPage.tsx b/apps/admin/src/pages/BoothPage.tsx
@@ -1,4 +1,4 @@
-import { AdminBoothDto } from '@ddays-app/types';
+import { BoothDto } from '@ddays-app/types';
 import { useState } from 'react';
 
 import { useGetBooths } from '../api/booth/useGetBooths';
@@ -11,7 +11,7 @@ import { ManyBoothsForm } from '../forms/ManyBoothsForm';
 
 export const BoothPage = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const [boothToEdit, setBoothToEdit] = useState<AdminBoothDto>();
+  const [boothToEdit, setBoothToEdit] = useState<BoothDto>();
 
   const companies = useGetBooths();
   const [isManyModalOpen, setIsManyModalOpen] = useState(false);
@@ -51,13 +51,15 @@ export const BoothPage = () => {
         />
       </Modal>
 
-      <Button variant='primary' onClick={() => setIsModalOpen(true)}>
-        New
-      </Button>
+      <div className='flex'>
+        <Button variant='primary' onClick={() => setIsModalOpen(true)}>
+          New
+        </Button>
 
-      <Button variant='primary' onClick={() => setIsManyModalOpen(true)}>
-        New (many)
-      </Button>
+        <Button variant='primary' onClick={() => setIsManyModalOpen(true)}>
+          New (many)
+        </Button>
+      </div>
 
       <Table
         data={companies.data}

diff --git a/apps/admin/src/pages/CompanyPage.tsx b/apps/admin/src/pages/CompanyPage.tsx
@@ -36,9 +36,11 @@ export const CompanyPage = () => {
         />
       </Modal>
 
-      <Button variant='primary' onClick={() => setIsModalOpen(true)}>
-        New
-      </Button>
+      <div className='flex'>
+        <Button variant='primary' onClick={() => setIsModalOpen(true)}>
+          New
+        </Button>
+      </div>
 
       <Table
         data={companies.data}

diff --git a/apps/admin/src/pages/EventPage.tsx b/apps/admin/src/pages/EventPage.tsx
@@ -36,9 +36,11 @@ const EventPage = () => {
         />
       </Modal>
 
-      <Button variant='primary' onClick={() => setIsModalOpen(true)}>
-        New
-      </Button>
+      <div className='flex'>
+        <Button variant='primary' onClick={() => setIsModalOpen(true)}>
+          New
+        </Button>
+      </div>
 
       <Table
         data={events.data}

diff --git a/apps/admin/src/pages/InterestPage.tsx b/apps/admin/src/pages/InterestPage.tsx
@@ -36,9 +36,11 @@ export const InterestPage = () => {
         />
       </Modal>
 
-      <Button variant='primary' onClick={() => setIsModalOpen(true)}>
-        New
-      </Button>
+      <div className='flex'>
+        <Button variant='primary' onClick={() => setIsModalOpen(true)}>
+          New
+        </Button>
+      </div>
 
       <Table
         data={interests.data}

diff --git a/apps/admin/src/pages/SpeakerPage.tsx b/apps/admin/src/pages/SpeakerPage.tsx
@@ -59,9 +59,11 @@ const SpeakerPage = () => {
         )}
       </Modal>
 
-      <Button variant='primary' onClick={() => setIsModalOpen(true)}>
-        New
-      </Button>
+      <div className='flex'>
+        <Button variant='primary' onClick={() => setIsModalOpen(true)}>
+          New
+        </Button>
+      </div>
 
       <Table
         data={speakers.data}

diff --git a/apps/api/db/migrations/0009_old_lady_ursula.sql b/apps/api/db/migrations/0009_old_lady_ursula.sql
@@ -0,0 +1,14 @@
+ALTER TABLE "booth_location" RENAME TO "booth";--> statement-breakpoint
+ALTER TABLE "company" DROP CONSTRAINT "company_booth_location_id_booth_location_id_fk";
+--> statement-breakpoint
+ALTER TABLE "booth" DROP CONSTRAINT "booth_location_company_id_company_id_fk";
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "booth" ADD CONSTRAINT "booth_company_id_company_id_fk" FOREIGN KEY ("company_id") REFERENCES "company"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+ALTER TABLE "company" DROP COLUMN IF EXISTS "booth_location_id";--> statement-breakpoint
+ALTER TABLE "booth" ADD CONSTRAINT "booth_name_unique" UNIQUE("name");--> statement-breakpoint
+ALTER TABLE "booth" ADD CONSTRAINT "booth_company_id_unique" UNIQUE("company_id");