chore: merge ui package into portal

Author: yangshun

apps/portal/package.json

@@ -22,7 +22,6 @@
     "@popperjs/core": "^2.11.6",
     "@prisma/client": "^4.4.0",
     "@supabase/supabase-js": "^1.35.7",
-    "@tih/ui": "workspace:0.0.0",
     "@trpc/client": "^9.27.2",
     "@trpc/next": "^9.27.2",
     "@trpc/react": "^9.27.2",

apps/portal/src/components/global/AppShell.tsx

@@ -6,7 +6,7 @@ import type { ReactNode } from 'react';
 import { Fragment, useState } from 'react';
 import { Menu, Transition } from '@headlessui/react';
 import { Bars3BottomLeftIcon } from '@heroicons/react/24/outline';
-import { Button } from '@tih/ui';
+import { Button } from '~/ui';
 
 import GlobalNavigation from '~/components/global/GlobalNavigation';
 import HomeNavigation from '~/components/global/HomeNavigation';

apps/portal/src/components/global/MobileNavigation.tsx

@@ -3,7 +3,7 @@ import Link from 'next/link';
 import { Fragment } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
 import { XMarkIcon } from '@heroicons/react/24/outline';
-import { HorizontalDivider } from '@tih/ui';
+import { HorizontalDivider } from '~/ui';
 
 import type { GlobalNavigationItems } from './GlobalNavigation';
 import type { ProductNavigationItems } from './ProductNavigation';

apps/portal/src/components/offers/admin/OffersTable.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { JobType } from '@prisma/client';
-import { DropdownMenu, Spinner, useToast } from '@tih/ui';
+import { DropdownMenu, Spinner, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import OffersHeader from '~/components/offers/admin/OffersHeader';

apps/portal/src/components/offers/admin/OffersTablePagination.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Pagination, Spinner } from '@tih/ui';
+import { Pagination, Spinner } from '~/ui';
 
 import type { Paging } from '~/types/offers';
 

apps/portal/src/components/offers/dashboard/DashboardProfileCard.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import { BookmarkSlashIcon } from '@heroicons/react/20/solid';
 import { ArrowRightIcon } from '@heroicons/react/24/outline';
-import { Button, useToast } from '@tih/ui';
+import { Button, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import DashboardOfferCard from '~/components/offers/dashboard/DashboardOfferCard';

apps/portal/src/components/offers/forms/FormRadioList.tsx

@@ -1,6 +1,6 @@
 import type { ComponentProps } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { RadioList } from '@tih/ui';
+import { RadioList } from '~/ui';
 
 type RadioListProps = ComponentProps<typeof RadioList>;
 

apps/portal/src/components/offers/forms/FormSection.tsx

@@ -1,4 +1,4 @@
-import { HorizontalDivider } from '@tih/ui';
+import { HorizontalDivider } from '~/ui';
 
 export default function FormSection({
   children,

apps/portal/src/components/offers/forms/FormSelect.tsx

@@ -1,7 +1,7 @@
 import type { ComponentProps, ForwardedRef } from 'react';
 import { forwardRef } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { Select } from '@tih/ui';
+import { Select } from '~/ui';
 
 type SelectProps = ComponentProps<typeof Select>;
 

apps/portal/src/components/offers/forms/FormTextArea.tsx

@@ -1,7 +1,7 @@
 import type { ComponentProps, ForwardedRef } from 'react';
 import { forwardRef } from 'react';
 import type { UseFormRegisterReturn } from 'react-hook-form';
-import { TextArea } from '@tih/ui';
+import { TextArea } from '~/ui';
 
 type TextAreaProps = ComponentProps<typeof TextArea>;
 

apps/portal/src/components/offers/forms/FormTextInput.tsx

@@ -1,7 +1,7 @@
 import type { ComponentProps, ForwardedRef } from 'react';
 import { forwardRef } from 'react';
 import type { UseFormRegisterReturn } from 'react-hook-form';
-import { TextInput } from '@tih/ui';
+import { TextInput } from '~/ui';
 
 type TextInputProps = ComponentProps<typeof TextInput>;
 

apps/portal/src/components/offers/offerAnalysis/OfferAnalysis.tsx

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useState } from 'react';
 import { ArrowUpRightIcon } from '@heroicons/react/24/outline';
 import { JobType } from '@prisma/client';
-import { Alert, Button, HorizontalDivider, Spinner, Tabs } from '@tih/ui';
+import { Alert, Button, HorizontalDivider, Spinner, Tabs } from '~/ui';
 
 import OfferPercentileAnalysisText from './OfferPercentileAnalysisText';
 import OfferProfileCard from './OfferProfileCard';

apps/portal/src/components/offers/offerAnalysis/OfferProfileCard.tsx

@@ -14,7 +14,7 @@ import CompanyProfileImage from '~/components/shared/CompanyProfileImage';
 import type { JobTitleType } from '~/components/shared/JobTitles';
 import { getLabelForJobTitleType } from '~/components/shared/JobTitles';
 
-import { Button } from '~/../../../packages/ui/dist';
+import { Button } from '~/ui';
 import { convertMoneyToString } from '~/utils/offers/currency';
 import { formatDate } from '~/utils/offers/time';
 

apps/portal/src/components/offers/offersSubmission/OffersProfileSave.tsx

@@ -3,7 +3,7 @@ import type { UseQueryResult } from 'react-query';
 import { DocumentDuplicateIcon } from '@heroicons/react/20/solid';
 import { BookmarkIcon as BookmarkOutlineIcon } from '@heroicons/react/24/outline';
 import { BookmarkIcon as BookmarkSolidIcon } from '@heroicons/react/24/solid';
-import { Button, TextInput, useToast } from '@tih/ui';
+import { Button, TextInput, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 

apps/portal/src/components/offers/offersSubmission/OffersSubmissionForm.tsx

@@ -4,7 +4,7 @@ import type { SubmitHandler } from 'react-hook-form';
 import { FormProvider, useForm } from 'react-hook-form';
 import { ArrowLeftIcon, ArrowRightIcon } from '@heroicons/react/20/solid';
 import { JobType } from '@prisma/client';
-import { Button, Spinner, useToast } from '@tih/ui';
+import { Button, Spinner, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import type { BreadcrumbStep } from '~/components/offers/Breadcrumbs';

apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx

@@ -1,6 +1,6 @@
 import { useFormContext, useWatch } from 'react-hook-form';
 import { JobType } from '@prisma/client';
-import { Collapsible, RadioList } from '@tih/ui';
+import { Collapsible, RadioList } from '~/ui';
 
 import { FieldError } from '~/components/offers/constants';
 import type { BackgroundPostData } from '~/components/offers/types';

apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx

@@ -11,7 +11,7 @@ import { useFieldArray } from 'react-hook-form';
 import { PlusIcon } from '@heroicons/react/20/solid';
 import { TrashIcon } from '@heroicons/react/24/outline';
 import { JobType } from '@prisma/client';
-import { Button, Dialog, HorizontalDivider } from '@tih/ui';
+import { Button, Dialog, HorizontalDivider } from '~/ui';
 
 import {
   defaultFullTimeOfferValues,

apps/portal/src/components/offers/profile/ProfileComments.tsx

@@ -1,7 +1,7 @@
 import { signIn, useSession } from 'next-auth/react';
 import { useState } from 'react';
 import { ClipboardDocumentIcon, ShareIcon } from '@heroicons/react/24/outline';
-import { Button, Spinner, TextArea, useToast } from '@tih/ui';
+import { Button, Spinner, TextArea, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import ExpandableCommentCard from '~/components/offers/profile/comments/ExpandableCommentCard';

apps/portal/src/components/offers/profile/ProfileDetails.tsx

@@ -4,7 +4,7 @@ import {
   ArrowPathIcon,
   BriefcaseIcon,
 } from '@heroicons/react/24/outline';
-import { Button, Spinner } from '@tih/ui';
+import { Button, Spinner } from '~/ui';
 
 import EducationCard from '~/components/offers/profile/EducationCard';
 import OfferCard from '~/components/offers/profile/OfferCard';

apps/portal/src/components/offers/profile/ProfileHeader.tsx

@@ -9,7 +9,7 @@ import {
   TrashIcon,
 } from '@heroicons/react/24/outline';
 import { BookmarkIcon as BookmarkIconSolid } from '@heroicons/react/24/solid';
-import { Button, Dialog, Spinner, Tabs, useToast } from '@tih/ui';
+import { Button, Dialog, Spinner, Tabs, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import type { ProfileDetailTab } from '~/components/offers/constants';

apps/portal/src/components/offers/profile/comments/CommentCard.tsx

@@ -1,7 +1,7 @@
 import { formatDistanceToNow } from 'date-fns';
 import { signIn, useSession } from 'next-auth/react';
 import { useState } from 'react';
-import { Button, Dialog, TextArea, useToast } from '@tih/ui';
+import { Button, Dialog, TextArea, useToast } from '~/ui';
 
 import ProfilePhotoHolder from '~/components/offers/profile/ProfilePhotoHolder';
 

apps/portal/src/components/offers/table/OffersTable.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { JobType } from '@prisma/client';
-import { DropdownMenu, Spinner, useToast } from '@tih/ui';
+import { DropdownMenu, Spinner, useToast } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import OffersRow from '~/components/offers/table//OffersRow';

apps/portal/src/components/offers/table/OffersTablePagination.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Pagination, Spinner } from '@tih/ui';
+import { Pagination, Spinner } from '~/ui';
 
 import type { Paging } from '~/types/offers';
 

apps/portal/src/components/questions/ContributeQuestionDialog.tsx

@@ -1,6 +1,6 @@
 import { Fragment, useState } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import { HorizontalDivider, useToast } from '@tih/ui';
+import { HorizontalDivider, useToast } from '~/ui';
 
 import DiscardDraftDialog from './DiscardDraftDialog';
 import type { ContributeQuestionFormProps } from './forms/ContributeQuestionForm';

apps/portal/src/components/questions/CreateListDialog.tsx

@@ -1,5 +1,5 @@
 import { useForm } from 'react-hook-form';
-import { Button, Dialog, TextInput } from '@tih/ui';
+import { Button, Dialog, TextInput } from '~/ui';
 
 import { useFormRegister } from '~/utils/questions/useFormRegister';
 

apps/portal/src/components/questions/DeleteListDialog.tsx

@@ -1,4 +1,4 @@
-import { Button, Dialog } from '@tih/ui';
+import { Button, Dialog } from '~/ui';
 
 export type DeleteListDialogProps = {
   onCancel: () => void;

apps/portal/src/components/questions/DiscardDraftDialog.tsx

@@ -1,4 +1,4 @@
-import { Button, Dialog } from '@tih/ui';
+import { Button, Dialog } from '~/ui';
 
 export type DiscardDraftDialogProps = {
   onCancel: () => void;

apps/portal/src/components/questions/FullScreenSpinner.tsx

@@ -1,4 +1,4 @@
-import { Spinner } from '@tih/ui';
+import { Spinner } from '~/ui';
 
 export default function FullScreenSpinner() {
   return (

apps/portal/src/components/questions/LandingComponent.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
 import { ArrowSmallRightIcon } from '@heroicons/react/24/outline';
 import type { QuestionsQuestionType } from '@prisma/client';
-import type { TypeaheadOption } from '@tih/ui';
-import { Button, Select } from '@tih/ui';
+import type { TypeaheadOption } from '~/ui';
+import { Button, Select } from '~/ui';
 
 import Container from '~/components/shared/Container';
 

apps/portal/src/components/questions/PaginationLoadMoreButton.tsx

@@ -1,5 +1,5 @@
 import type { UseInfiniteQueryResult } from 'react-query';
-import { Button } from '@tih/ui';
+import { Button } from '~/ui';
 
 export type PaginationLoadMoreButtonProps = {
   query: UseInfiniteQueryResult;

apps/portal/src/components/questions/QuestionSearchBar.tsx

@@ -2,7 +2,7 @@ import {
   AdjustmentsHorizontalIcon,
   MagnifyingGlassIcon,
 } from '@heroicons/react/24/outline';
-import { Button, Tabs, TextInput } from '@tih/ui';
+import { Button, Tabs, TextInput } from '~/ui';
 
 import { SORT_ORDERS } from '~/utils/questions/constants';
 

apps/portal/src/components/questions/QuestionTypeBadge.tsx

@@ -6,8 +6,8 @@ import {
   WrenchIcon,
 } from '@heroicons/react/20/solid';
 import type { QuestionsQuestionType } from '@prisma/client';
-import type { BadgeVariant } from '@tih/ui';
-import { Badge } from '@tih/ui';
+import type { BadgeVariant } from '~/ui';
+import { Badge } from '~/ui';
 
 import { QUESTION_TYPES } from '~/utils/questions/constants';
 

apps/portal/src/components/questions/SortOptionsSelect.tsx

@@ -1,4 +1,4 @@
-import { Select } from '~/../../../packages/ui/dist';
+import { Select } from '~/ui';
 import { SORT_ORDERS, SORT_TYPES } from '~/utils/questions/constants';
 
 import type { SortOrder, SortType } from '~/types/questions.d';

apps/portal/src/components/questions/card/question/BaseQuestionCard.tsx

@@ -13,7 +13,7 @@ import {
   TrashIcon,
 } from '@heroicons/react/24/outline';
 import type { QuestionsQuestionType } from '@prisma/client';
-import { Button } from '@tih/ui';
+import { Button } from '~/ui';
 
 import { useProtectedCallback } from '~/utils/questions/useProtectedCallback';
 import { useQuestionVote } from '~/utils/questions/vote/useQuestionVote';

apps/portal/src/components/questions/filter/FilterSection.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import type { UseFormRegisterReturn } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
-import { CheckboxInput, CheckboxList, Collapsible, RadioList } from '@tih/ui';
+import { CheckboxInput, CheckboxList, Collapsible, RadioList } from '~/ui';
 
 export type FilterChoice<V extends string = string> = {
   id: string;

apps/portal/src/components/questions/forms/ContributeQuestionForm.tsx

@@ -3,9 +3,9 @@ import { useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { ArrowPathIcon } from '@heroicons/react/20/solid';
 import type { QuestionsQuestionType } from '@prisma/client';
-import type { TypeaheadOption } from '@tih/ui';
-import { CheckboxInput } from '@tih/ui';
-import { Button, Select, TextArea } from '@tih/ui';
+import type { TypeaheadOption } from '~/ui';
+import { CheckboxInput } from '~/ui';
+import { Button, Select, TextArea } from '~/ui';
 
 import { QUESTION_TYPES } from '~/utils/questions/constants';
 import relabelQuestionAggregates from '~/utils/questions/relabelQuestionAggregates';

apps/portal/src/components/questions/forms/CreateQuestionEncounterForm.tsx

@@ -1,7 +1,7 @@
 import { startOfMonth } from 'date-fns';
 import { useState } from 'react';
 import { CheckIcon } from '@heroicons/react/20/solid';
-import { Button } from '@tih/ui';
+import { Button } from '~/ui';
 
 import type { Month } from '~/components/shared/MonthYearPicker';
 import MonthYearPicker from '~/components/shared/MonthYearPicker';

apps/portal/src/components/questions/layout/BackButtonLayout.tsx

@@ -1,6 +1,6 @@
 import type { PropsWithChildren } from 'react';
 import { ArrowSmallLeftIcon } from '@heroicons/react/24/outline';
-import { Button } from '@tih/ui';
+import { Button } from '~/ui';
 
 import Container from '~/components/shared/Container';
 

apps/portal/src/components/questions/protected/ProtectedDialog.tsx

@@ -1,5 +1,5 @@
 import { signIn } from 'next-auth/react';
-import { Button, Dialog } from '@tih/ui';
+import { Button, Dialog } from '~/ui';
 
 export type ProtectedDialogProps = {
   onClose: () => void;

apps/portal/src/components/questions/typeahead/ExpandedTypeahead.tsx

@@ -1,7 +1,7 @@
 import type { ComponentProps } from 'react';
 import { useState } from 'react';
 import { useMemo } from 'react';
-import { Button, Typeahead } from '@tih/ui';
+import { Button, Typeahead } from '~/ui';
 
 import type { RequireAllOrNone } from '~/utils/questions/RequireAllOrNone';
 

apps/portal/src/components/questions/typeahead/LocationTypeahead.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import type { TypeaheadOption } from '@tih/ui';
+import type { TypeaheadOption } from '~/ui';
 
 import useLocationOptions from '~/utils/questions/useLocationOptions';
 

apps/portal/src/components/resumes/ResumePdf.tsx

@@ -5,7 +5,8 @@ import {
   MagnifyingGlassMinusIcon,
   MagnifyingGlassPlusIcon,
 } from '@heroicons/react/20/solid';
-import { Button, Pagination, Spinner } from '@tih/ui';
+
+import { Button, Pagination, Spinner } from '~/ui';
 
 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`;
 

apps/portal/src/components/resumes/comments/ResumeCommentsForm.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
-import { Button, Dialog, TextArea } from '@tih/ui';
+import { Button, Dialog, TextArea } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 

apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx

@@ -8,7 +8,7 @@ import {
   SparklesIcon,
 } from '@heroicons/react/24/outline';
 import { ResumesSection } from '@prisma/client';
-import { Spinner } from '@tih/ui';
+import { Spinner } from '~/ui';
 
 import { trpc } from '~/utils/trpc';
 

apps/portal/src/components/resumes/comments/comment/ResumeCommentDeleteForm.tsx

@@ -1,4 +1,4 @@
-import { Button, Dialog } from '@tih/ui';
+import { Button, Dialog } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 

apps/portal/src/components/resumes/comments/comment/ResumeCommentEditForm.tsx

@@ -1,6 +1,6 @@
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
-import { Button, TextArea } from '@tih/ui';
+import { Button, TextArea } from '~/ui';
 
 import { trpc } from '~/utils/trpc';
 

apps/portal/src/components/resumes/comments/comment/ResumeCommentReplyForm.tsx

@@ -1,7 +1,7 @@
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import type { ResumesSection } from '@prisma/client';
-import { Button, TextArea } from '@tih/ui';
+import { Button, TextArea } from '~/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';