Remove berlin types (#519)

* remove all types in berlin * remove types from berlin
lexicongovernance · May 17, 2024 · bd09454 · bd09454
1 parent f87c5a6
commit bd09454
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 164 deletions.
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
@@ -15,6 +15,7 @@ import {
   putUsersToGroups,
   postUsersToGroups,
   GetGroupsResponse,
+  GetEventsResponse,
 } from 'api';
 
 // Components
@@ -37,7 +38,6 @@ import { formatGroups } from '../utils/formatGroups';
 import { useAppStore } from '../store';
 import { Body } from '../components/typography/Body.styled';
 import { useEffect, useMemo } from 'react';
-import { DBEvent } from '../types/DBEventType';
 
 const ACADEMIC_CREDENTIALS = ['Bachelors', 'Masters', 'PhD', 'JD', 'None'];
 
@@ -158,7 +158,7 @@ function AccountForm({
   initialUser: InitialUser;
   user: GetUserResponse | null | undefined;
   groups: GetGroupsResponse[] | null | undefined;
-  events: DBEvent[] | null | undefined;
+  events: GetEventsResponse | null | undefined;
 }) {
   const navigate = useNavigate();
   const theme = useAppStore((state) => state.theme);

diff --git a/packages/berlin/src/pages/Comments.tsx b/packages/berlin/src/pages/Comments.tsx
@@ -25,9 +25,6 @@ import {
   handleLocalVote,
 } from '../utils/voting';
 
-// Types
-import { ResponseUserVotesType } from '../types/CycleType';
-
 // Store
 import { useAppStore } from '../store';
 
@@ -46,7 +43,7 @@ import IconButton from '../components/icon-button';
 import Textarea from '../components/textarea';
 import { INITIAL_HEARTS } from '../utils/constants';
 
-type LocalUserVotes = ResponseUserVotesType | { optionId: string; numOfVotes: number }[];
+type LocalUserVotes = { optionId: string; numOfVotes: number }[];
 
 function Comments() {
   const theme = useAppStore((state) => state.theme);

diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
@@ -19,9 +19,6 @@ import {
   handleLocalVote,
 } from '../utils/voting';
 
-// Types
-import { ResponseUserVotesType } from '../types/CycleType';
-
 // Store
 import { useAppStore } from '../store';
 
@@ -38,7 +35,7 @@ import OptionCard from '../components/option-card';
 import { FIVE_MINUTES_IN_SECONDS, INITIAL_HEARTS } from '../utils/constants';
 
 type Order = 'asc' | 'desc';
-type LocalUserVotes = ResponseUserVotesType | { optionId: string; numOfVotes: number }[];
+type LocalUserVotes = { optionId: string; numOfVotes: number }[];
 
 function Cycle() {
   const queryClient = useQueryClient();
@@ -116,7 +113,7 @@ function Cycle() {
     }
   }, [cycleState, time, formattedTime]);
 
-  const updateInitialVotesAndHearts = (votes: ResponseUserVotesType) => {
+  const updateInitialVotesAndHearts = (votes: GetUserVotesResponse) => {
     const givenVotes = votes
       .map((option) => option.numOfVotes)
       .reduce((prev, curr) => prev + curr, 0);

diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
@@ -10,7 +10,6 @@ import { GetCycleResponse, fetchEvent, fetchEventCycles } from 'api';
 import { Body } from '../components/typography/Body.styled';
 import { FlexColumn } from '../components/containers/FlexColum.styled';
 import { Table } from '../components/table';
-// import BackButton from '../components/back-button';
 import Button from '../components/button';
 import EventCard from '../components/event-card';
 import Link from '../components/link';

diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
@@ -14,6 +14,7 @@ import {
   fetchRegistrationFields,
   fetchRegistrations,
   fetchUsersToGroups,
+  GetEventResponse,
   GetRegistrationsResponseType,
   GetUsersToGroupsResponse,
   postRegistration,
@@ -28,9 +29,6 @@ import {
 // Hooks
 import useUser from '../hooks/useUser';
 
-// Types
-import { DBEvent } from '../types/DBEventType';
-
 // Components
 import { Error } from '../components/typography/Error.styled';
 import { FlexColumn } from '../components/containers/FlexColum.styled';
@@ -242,7 +240,7 @@ function RegisterForm(props: {
   registrationFields: GetRegistrationFieldsResponse | null | undefined;
   registrationId: string | null | undefined;
   groupId: string | null | undefined;
-  event: DBEvent | null | undefined;
+  event: GetEventResponse | null | undefined;
   show: boolean;
   mode: 'edit' | 'create';
   onRegistrationFormCreate?: (newRegistrationId: string) => void;

diff --git a/packages/berlin/src/types/ButtonType.ts b/packages/berlin/src/types/ButtonType.ts
diff --git a/packages/berlin/src/types/CycleType.ts b/packages/berlin/src/types/CycleType.ts
diff --git a/packages/berlin/src/types/DBEventType.ts b/packages/berlin/src/types/DBEventType.ts
diff --git a/packages/berlin/src/types/ForumQuestionType.ts b/packages/berlin/src/types/ForumQuestionType.ts
diff --git a/packages/berlin/src/types/GroupType.ts b/packages/berlin/src/types/GroupType.ts
diff --git a/packages/berlin/src/types/RegistrationFieldOptionType.ts b/packages/berlin/src/types/RegistrationFieldOptionType.ts
diff --git a/packages/berlin/src/types/RegistrationFieldType.ts b/packages/berlin/src/types/RegistrationFieldType.ts
diff --git a/packages/berlin/src/types/RegistrationType.ts b/packages/berlin/src/types/RegistrationType.ts
diff --git a/packages/berlin/src/types/UserAttributesType.ts b/packages/berlin/src/types/UserAttributesType.ts
diff --git a/packages/core/src/types/AuthUserType.ts b/packages/core/src/types/AuthUserType.ts