From e16d11c223e8bdda2df02df48562621d40edcb5a Mon Sep 17 00:00:00 2001 From: Rami Abdou Date: Thu, 28 Mar 2024 12:22:37 -0700 Subject: [PATCH] push --- README.md | 4 ++-- apps/admin-dashboard/app/root.tsx | 4 ++-- .../app/routes/_dashboard.admins.add.tsx | 2 +- .../_dashboard.applications.$id._index.tsx | 2 +- .../_dashboard.applications.$id.email.tsx | 4 ++-- .../routes/_dashboard.applications.$id.tsx | 2 +- .../app/routes/_dashboard.applications.tsx | 4 ++-- .../_dashboard.bull.$queue.jobs.$id.tsx | 2 +- .../_dashboard.bull.$queue.jobs.add.tsx | 2 +- .../routes/_dashboard.bull.$queue.jobs.tsx | 4 ++-- ..._dashboard.bull.$queue.repeatables.add.tsx | 2 +- .../_dashboard.bull.$queue.repeatables.tsx | 7 +----- .../app/routes/_dashboard.bull.tsx | 2 +- .../routes/_dashboard.events.$id.import.tsx | 8 +------ .../app/routes/_dashboard.events.create.tsx | 4 ++-- .../app/routes/_dashboard.events.tsx | 4 ++-- ...rd.gamification.activities.$id.archive.tsx | 2 +- ...board.gamification.activities.$id.edit.tsx | 8 +------ ..._dashboard.gamification.activities.add.tsx | 8 +------ .../_dashboard.gamification.activities.tsx | 2 +- .../app/routes/_dashboard.icebreakers.add.tsx | 2 +- ....onboarding-sessions.$id.add-attendees.tsx | 8 +------ .../routes/_dashboard.onboarding-sessions.tsx | 2 +- .../_dashboard.onboarding-sessions.upload.tsx | 8 +------ .../app/routes/_dashboard.programs.create.tsx | 4 ++-- .../routes/_dashboard.resources.create.tsx | 4 ++-- .../app/routes/_dashboard.schools.create.tsx | 2 +- .../app/routes/_dashboard.schools.tsx | 2 +- .../_dashboard.students.$id.activate.tsx | 2 +- .../routes/_dashboard.students.$id.email.tsx | 4 ++-- .../_dashboard.students.$id.points.grant.tsx | 4 ++-- .../routes/_dashboard.students.$id.remove.tsx | 2 +- .../_dashboard.students.import.programs.tsx | 4 ++-- .../_dashboard.students.import.resources.tsx | 4 ++-- ...dashboard.students.import.scholarships.tsx | 8 +------ .../app/routes/_dashboard.students.tsx | 2 +- .../routes/_dashboard.surveys.$id.import.tsx | 8 +------ .../app/routes/_dashboard.surveys.create.tsx | 2 +- .../app/routes/_dashboard.surveys.tsx | 2 +- .../admin-dashboard/app/routes/_dashboard.tsx | 2 +- .../app/routes/login._index.tsx | 2 +- .../app/routes/login.otp.send.tsx | 2 +- .../app/routes/login.otp.verify.tsx | 2 +- apps/admin-dashboard/app/routes/login.tsx | 2 +- .../app/shared/components/activity-form.tsx | 2 +- .../app/shared/components/card.tsx | 2 +- .../components/onboarding-session-form.tsx | 2 +- .../app/shared/session.server.ts | 2 +- apps/admin-dashboard/package.json | 2 +- apps/admin-dashboard/railway.json | 2 +- apps/admin-dashboard/tailwind.config.js | 2 +- apps/member-profile/app/root.tsx | 4 ++-- .../app/routes/_profile.directory.join.1.tsx | 4 ++-- .../app/routes/_profile.directory.join.2.tsx | 7 +----- .../app/routes/_profile.directory.join.3.tsx | 7 +----- .../app/routes/_profile.directory.join.4.tsx | 2 +- .../routes/_profile.directory.join._index.tsx | 2 +- .../routes/_profile.directory.join.finish.tsx | 2 +- .../app/routes/_profile.directory.join.tsx | 2 +- .../app/routes/_profile.directory.tsx | 4 ++-- .../app/routes/_profile.directory_.$id.tsx | 10 ++------- .../_profile.events.past.$id.attendees.tsx | 2 +- .../app/routes/_profile.events.past.tsx | 2 +- .../app/routes/_profile.events.tsx | 2 +- .../_profile.events.upcoming.$id.register.tsx | 2 +- ...file.events.upcoming.$id.registrations.tsx | 2 +- .../app/routes/_profile.events.upcoming.tsx | 2 +- .../_profile.home.claim-swag-pack._index.tsx | 2 +- ...file.home.claim-swag-pack.confirmation.tsx | 2 +- .../routes/_profile.home.claim-swag-pack.tsx | 2 +- .../app/routes/_profile.home.tsx | 12 +++++----- .../app/routes/_profile.points.tsx | 4 ++-- .../_profile.profile.education.$id.delete.tsx | 2 +- .../_profile.profile.education.$id.edit.tsx | 8 +------ .../routes/_profile.profile.education.add.tsx | 8 +------ .../app/routes/_profile.profile.education.tsx | 2 +- .../_profile.profile.emails.add.finish.tsx | 4 ++-- .../_profile.profile.emails.add.start.tsx | 2 +- ..._profile.profile.emails.change-primary.tsx | 4 ++-- .../app/routes/_profile.profile.emails.tsx | 2 +- .../app/routes/_profile.profile.general.tsx | 4 ++-- .../routes/_profile.profile.icebreakers.tsx | 2 +- .../app/routes/_profile.profile.personal.tsx | 4 ++-- .../app/routes/_profile.profile.socials.tsx | 7 +----- .../app/routes/_profile.profile.tsx | 2 +- .../_profile.profile.work.$id.delete.tsx | 2 +- .../routes/_profile.profile.work.$id.edit.tsx | 2 +- .../app/routes/_profile.profile.work.add.tsx | 2 +- .../app/routes/_profile.profile.work.tsx | 2 +- apps/member-profile/app/routes/_profile.tsx | 2 +- .../app/routes/_public.apply._index.tsx | 4 ++-- .../app/routes/_public.apply.thank-you.tsx | 2 +- .../app/routes/_public.apply.tsx | 2 +- .../app/routes/_public.login._index.tsx | 2 +- .../app/routes/_public.login.otp.send.tsx | 2 +- .../app/routes/_public.login.otp.verify.tsx | 2 +- .../app/routes/_public.login.tsx | 2 +- apps/member-profile/app/routes/_public.tsx | 2 +- .../app/shared/components/card.tsx | 2 +- .../app/shared/components/city-combobox.tsx | 2 +- .../shared/components/company-combobox.tsx | 2 +- .../components/education-experience.tsx | 2 +- .../app/shared/components/education-form.tsx | 2 +- .../app/shared/components/empty-state.tsx | 2 +- .../shared/components/ethnicity-combobox.tsx | 2 +- .../app/shared/components/event.tsx | 2 +- .../app/shared/components/profile.general.tsx | 2 +- .../shared/components/profile.personal.tsx | 8 +------ .../app/shared/components/profile.tsx | 2 +- .../app/shared/session.server.ts | 2 +- apps/member-profile/package.json | 2 +- apps/member-profile/railway.json | 2 +- apps/member-profile/tailwind.config.js | 2 +- package.json | 1 + packages/core/package.json | 2 +- .../application/ui/application-form.tsx | 22 +++++++++---------- .../modules/application/ui/major-combobox.tsx | 4 ++-- .../application/ui/school-combobox.tsx | 2 +- .../authentication/ui/one-time-code-form.tsx | 2 +- .../modules/employment/ui/work-experience.tsx | 2 +- .../src/modules/employment/ui/work-form.tsx | 2 +- packages/{core-ui => ui}/package.json | 2 +- packages/{core-ui => ui}/rollup.config.js | 0 .../{core-ui => ui}/src/css/_breakpoints.scss | 0 packages/{core-ui => ui}/src/css/shared.css | 0 .../src/hooks/use-delayed-value.ts | 0 .../{core-ui => ui}/src/hooks/use-hydrated.ts | 0 .../src/hooks/use-on-click-outside.ts | 0 .../src/hooks/use-search-params.ts | 0 packages/{core-ui => ui}/src/index.ts | 0 packages/{core-ui => ui}/src/ui/address.tsx | 0 packages/{core-ui => ui}/src/ui/button.tsx | 0 .../src/ui/checkbox/checkbox.module.scss | 0 .../src/ui/checkbox/checkbox.tsx | 0 .../src/ui/combobox-popover.tsx | 0 packages/{core-ui => ui}/src/ui/combobox.tsx | 0 packages/{core-ui => ui}/src/ui/dashboard.tsx | 0 .../{core-ui => ui}/src/ui/date-picker.tsx | 0 packages/{core-ui => ui}/src/ui/divider.tsx | 0 .../src/ui/dropdown/dropdown.module.scss | 0 .../src/ui/dropdown/dropdown.tsx | 0 packages/{core-ui => ui}/src/ui/form.tsx | 0 .../{core-ui => ui}/src/ui/icon-button.tsx | 0 packages/{core-ui => ui}/src/ui/input.tsx | 0 packages/{core-ui => ui}/src/ui/link.tsx | 0 packages/{core-ui => ui}/src/ui/login.tsx | 0 .../src/ui/modal/modal.module.scss | 0 .../{core-ui => ui}/src/ui/modal/modal.tsx | 0 .../{core-ui => ui}/src/ui/multi-combobox.tsx | 0 .../{core-ui => ui}/src/ui/pagination.tsx | 0 packages/{core-ui => ui}/src/ui/pill.tsx | 0 .../src/ui/profile-picture.tsx | 0 packages/{core-ui => ui}/src/ui/public.tsx | 0 .../src/ui/radio/radio.module.scss | 0 .../{core-ui => ui}/src/ui/radio/radio.tsx | 0 .../{core-ui => ui}/src/ui/search-bar.tsx | 0 .../src/ui/select/select.module.scss | 0 .../{core-ui => ui}/src/ui/select/select.tsx | 0 packages/{core-ui => ui}/src/ui/spinner.tsx | 0 packages/{core-ui => ui}/src/ui/table.tsx | 0 packages/{core-ui => ui}/src/ui/text.tsx | 0 packages/{core-ui => ui}/src/ui/textarea.tsx | 0 .../src/ui/toast/toast.module.scss | 0 .../{core-ui => ui}/src/ui/toast/toast.tsx | 0 .../{core-ui => ui}/src/utils/constants.ts | 0 packages/{core-ui => ui}/src/utils/cx.ts | 0 packages/{core-ui => ui}/src/utils/zod.ts | 0 packages/{core-ui => ui}/tsconfig.json | 0 packages/{core-ui => ui}/types.d.ts | 0 169 files changed, 161 insertions(+), 246 deletions(-) rename packages/{core-ui => ui}/package.json (97%) rename packages/{core-ui => ui}/rollup.config.js (100%) rename packages/{core-ui => ui}/src/css/_breakpoints.scss (100%) rename packages/{core-ui => ui}/src/css/shared.css (100%) rename packages/{core-ui => ui}/src/hooks/use-delayed-value.ts (100%) rename packages/{core-ui => ui}/src/hooks/use-hydrated.ts (100%) rename packages/{core-ui => ui}/src/hooks/use-on-click-outside.ts (100%) rename packages/{core-ui => ui}/src/hooks/use-search-params.ts (100%) rename packages/{core-ui => ui}/src/index.ts (100%) rename packages/{core-ui => ui}/src/ui/address.tsx (100%) rename packages/{core-ui => ui}/src/ui/button.tsx (100%) rename packages/{core-ui => ui}/src/ui/checkbox/checkbox.module.scss (100%) rename packages/{core-ui => ui}/src/ui/checkbox/checkbox.tsx (100%) rename packages/{core-ui => ui}/src/ui/combobox-popover.tsx (100%) rename packages/{core-ui => ui}/src/ui/combobox.tsx (100%) rename packages/{core-ui => ui}/src/ui/dashboard.tsx (100%) rename packages/{core-ui => ui}/src/ui/date-picker.tsx (100%) rename packages/{core-ui => ui}/src/ui/divider.tsx (100%) rename packages/{core-ui => ui}/src/ui/dropdown/dropdown.module.scss (100%) rename packages/{core-ui => ui}/src/ui/dropdown/dropdown.tsx (100%) rename packages/{core-ui => ui}/src/ui/form.tsx (100%) rename packages/{core-ui => ui}/src/ui/icon-button.tsx (100%) rename packages/{core-ui => ui}/src/ui/input.tsx (100%) rename packages/{core-ui => ui}/src/ui/link.tsx (100%) rename packages/{core-ui => ui}/src/ui/login.tsx (100%) rename packages/{core-ui => ui}/src/ui/modal/modal.module.scss (100%) rename packages/{core-ui => ui}/src/ui/modal/modal.tsx (100%) rename packages/{core-ui => ui}/src/ui/multi-combobox.tsx (100%) rename packages/{core-ui => ui}/src/ui/pagination.tsx (100%) rename packages/{core-ui => ui}/src/ui/pill.tsx (100%) rename packages/{core-ui => ui}/src/ui/profile-picture.tsx (100%) rename packages/{core-ui => ui}/src/ui/public.tsx (100%) rename packages/{core-ui => ui}/src/ui/radio/radio.module.scss (100%) rename packages/{core-ui => ui}/src/ui/radio/radio.tsx (100%) rename packages/{core-ui => ui}/src/ui/search-bar.tsx (100%) rename packages/{core-ui => ui}/src/ui/select/select.module.scss (100%) rename packages/{core-ui => ui}/src/ui/select/select.tsx (100%) rename packages/{core-ui => ui}/src/ui/spinner.tsx (100%) rename packages/{core-ui => ui}/src/ui/table.tsx (100%) rename packages/{core-ui => ui}/src/ui/text.tsx (100%) rename packages/{core-ui => ui}/src/ui/textarea.tsx (100%) rename packages/{core-ui => ui}/src/ui/toast/toast.module.scss (100%) rename packages/{core-ui => ui}/src/ui/toast/toast.tsx (100%) rename packages/{core-ui => ui}/src/utils/constants.ts (100%) rename packages/{core-ui => ui}/src/utils/cx.ts (100%) rename packages/{core-ui => ui}/src/utils/zod.ts (100%) rename packages/{core-ui => ui}/tsconfig.json (100%) rename packages/{core-ui => ui}/types.d.ts (100%) diff --git a/README.md b/README.md index a0df97179..861c7c141 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ apps |--- member-profile packages |--- core -|--- core-ui |--- email-templates |--- types +|--- ui |--- utils ``` @@ -73,10 +73,10 @@ our applications. - `core`: Nearly all of our business logic, including our database layer and more. Will eventually colocate feature-based UI next to its related business logic. -- `core-ui`: Reusable UI components built in React. - `email-templates`: React-based email templates built with [Resend](https://resend.com). - `types`: Miscellaneous types shared across applications. +- `ui`: Reusable UI components built in React. - `utils`: Reusable utility functions, such as `sleep`. ### CI Pipeline (GitHub Actions) diff --git a/apps/admin-dashboard/app/root.tsx b/apps/admin-dashboard/app/root.tsx index 4db901552..e04f9cbe2 100644 --- a/apps/admin-dashboard/app/root.tsx +++ b/apps/admin-dashboard/app/root.tsx @@ -10,9 +10,9 @@ import { } from '@remix-run/react'; import { withSentry } from '@sentry/remix'; -import { Toast } from '@oyster/core-ui'; +import { Toast } from '@oyster/ui'; -import coreUiStylesheet from '@oyster/core-ui/dist/index.css?url'; +import coreUiStylesheet from '@oyster/ui/dist/index.css?url'; import tailwindStylesheet from './tailwind.css?url'; import { ENV } from './shared/constants.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.admins.add.tsx b/apps/admin-dashboard/app/routes/_dashboard.admins.add.tsx index 9bcee0920..800d68215 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.admins.add.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.admins.add.tsx @@ -20,7 +20,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { addAdmin } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.applications.$id._index.tsx b/apps/admin-dashboard/app/routes/_dashboard.applications.$id._index.tsx index 107c54e0f..0902b7e5c 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.applications.$id._index.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.applications.$id._index.tsx @@ -12,7 +12,6 @@ import { import dayjs from 'dayjs'; import { PropsWithChildren, useState } from 'react'; -import { Button, Text } from '@oyster/core-ui'; import { Application as ApplicationType, Gender, @@ -20,6 +19,7 @@ import { OtherDemographic, Race, } from '@oyster/types'; +import { Button, Text } from '@oyster/ui'; import { Route } from '../shared/constants'; import { diff --git a/apps/admin-dashboard/app/routes/_dashboard.applications.$id.email.tsx b/apps/admin-dashboard/app/routes/_dashboard.applications.$id.email.tsx index f756e10a8..57b7bd721 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.applications.$id.email.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.applications.$id.email.tsx @@ -12,6 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Application } from '@oyster/types'; import { Button, Form, @@ -19,8 +20,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; -import { Application } from '@oyster/types'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { getApplication, updateEmailApplication } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.applications.$id.tsx b/apps/admin-dashboard/app/routes/_dashboard.applications.$id.tsx index 76e99b713..e4f45a651 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.applications.$id.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.applications.$id.tsx @@ -1,7 +1,7 @@ import { json, LoaderFunctionArgs } from '@remix-run/node'; import { Outlet, useLocation, useNavigate } from '@remix-run/react'; -import { Modal } from '@oyster/core-ui'; +import { Modal } from '@oyster/ui'; import { Route } from '../shared/constants'; import { ensureUserAuthenticated } from '../shared/session.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.applications.tsx b/apps/admin-dashboard/app/routes/_dashboard.applications.tsx index da027eb06..b40cfd11d 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.applications.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.applications.tsx @@ -12,6 +12,7 @@ import { Edit } from 'react-feather'; import { generatePath } from 'react-router'; import { z } from 'zod'; +import { Application, ApplicationStatus } from '@oyster/types'; import { Color, Dashboard, @@ -24,8 +25,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; -import { Application, ApplicationStatus } from '@oyster/types'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.$id.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.$id.tsx index 7bf1e0203..d98db79fb 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.$id.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.$id.tsx @@ -10,7 +10,7 @@ import { ArrowUp, Copy, RefreshCw, Trash } from 'react-feather'; import { match } from 'ts-pattern'; import { z } from 'zod'; -import { IconButton, Modal, Text } from '@oyster/core-ui'; +import { IconButton, Modal, Text } from '@oyster/ui'; import { getTimezone } from '../shared/cookies.server'; import { QueueFromName } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.add.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.add.tsx index 2e73b557a..2e3f3fe37 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.add.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.add.tsx @@ -21,7 +21,7 @@ import { Modal, Textarea, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { QueueFromName } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.tsx index 8623a000c..2ba15649d 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.jobs.tsx @@ -12,6 +12,7 @@ import { generatePath } from 'react-router'; import { match } from 'ts-pattern'; import { z } from 'zod'; +import { ExtractValue } from '@oyster/types'; import { cx, getIconButtonCn, @@ -19,8 +20,7 @@ import { Table, TableColumnProps, Text, -} from '@oyster/core-ui'; -import { ExtractValue } from '@oyster/types'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.add.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.add.tsx index 6d0d62776..1e1386c30 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.add.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.add.tsx @@ -20,7 +20,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { QueueFromName } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.tsx index abf78bf7e..dc0414206 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.$queue.repeatables.tsx @@ -16,12 +16,7 @@ import { useState } from 'react'; import { Plus, Trash } from 'react-feather'; import { z } from 'zod'; -import { - Dropdown, - getIconButtonCn, - Table, - TableColumnProps, -} from '@oyster/core-ui'; +import { Dropdown, getIconButtonCn, Table, TableColumnProps } from '@oyster/ui'; import { Route } from '../shared/constants'; import { getTimezone } from '../shared/cookies.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.bull.tsx b/apps/admin-dashboard/app/routes/_dashboard.bull.tsx index 242639a93..8473b3ed9 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.bull.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.bull.tsx @@ -2,7 +2,7 @@ import { json, LoaderFunctionArgs } from '@remix-run/node'; import { NavLink, Outlet } from '@remix-run/react'; import { generatePath } from 'react-router'; -import { Dashboard } from '@oyster/core-ui'; +import { Dashboard } from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.events.$id.import.tsx b/apps/admin-dashboard/app/routes/_dashboard.events.$id.import.tsx index 2d6e00874..bd999a546 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.events.$id.import.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.events.$id.import.tsx @@ -17,14 +17,8 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; import { Email, EventAttendee } from '@oyster/types'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.events.create.tsx b/apps/admin-dashboard/app/routes/_dashboard.events.create.tsx index 193f43c66..8bcfa4a60 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.events.create.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.events.create.tsx @@ -12,6 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Event, EventType } from '@oyster/types'; import { Button, DatePicker, @@ -22,8 +23,7 @@ import { Select, Textarea, validateForm, -} from '@oyster/core-ui'; -import { Event, EventType } from '@oyster/types'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.events.tsx b/apps/admin-dashboard/app/routes/_dashboard.events.tsx index 5de42f083..7da22f760 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.events.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.events.tsx @@ -5,6 +5,7 @@ import { useState } from 'react'; import { Menu, Plus, Upload } from 'react-feather'; import { generatePath } from 'react-router'; +import { Event } from '@oyster/types'; import { Dashboard, Dropdown, @@ -14,8 +15,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; -import { Event } from '@oyster/types'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.archive.tsx b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.archive.tsx index b188679cc..d66dbd1f7 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.archive.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.archive.tsx @@ -11,7 +11,7 @@ import { useNavigation, } from '@remix-run/react'; -import { Button, Form, Modal } from '@oyster/core-ui'; +import { Button, Form, Modal } from '@oyster/ui'; import { Route } from '../shared/constants'; import { archiveActivity } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.edit.tsx b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.edit.tsx index d5eb0d330..4df8325cc 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.edit.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.$id.edit.tsx @@ -13,14 +13,8 @@ import { import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; import { Activity, ActivityPeriod } from '@oyster/types'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { ActivityForm } from '../shared/components/activity-form'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.add.tsx b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.add.tsx index 107191ebf..10cc31ad4 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.add.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.add.tsx @@ -11,14 +11,8 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; import { Activity } from '@oyster/types'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { id } from '@oyster/utils'; import { ActivityForm } from '../shared/components/activity-form'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.tsx b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.tsx index 6d05e1781..dadd112d2 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.gamification.activities.tsx @@ -11,7 +11,7 @@ import { Pill, Table, TableColumnProps, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.icebreakers.add.tsx b/apps/admin-dashboard/app/routes/_dashboard.icebreakers.add.tsx index 43efd1b3c..c56ac48b0 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.icebreakers.add.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.icebreakers.add.tsx @@ -18,7 +18,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { addIcebreakerPrompt } from '../shared/core.server'; import { AddIcebreakerPromptInput } from '../shared/core.ui'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.$id.add-attendees.tsx b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.$id.add-attendees.tsx index bb7b472d4..003e21a1c 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.$id.add-attendees.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.$id.add-attendees.tsx @@ -12,13 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { OnboardingSessionAttendeesField } from '../shared/components/onboarding-session-form'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.tsx b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.tsx index d87e7b3ab..33a3d3b50 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.tsx @@ -18,7 +18,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { getTimezone } from '../shared/cookies.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.upload.tsx b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.upload.tsx index 37bf78c9a..f66bd66c8 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.upload.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.onboarding-sessions.upload.tsx @@ -12,13 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { OnboardingSessionAttendeesField, diff --git a/apps/admin-dashboard/app/routes/_dashboard.programs.create.tsx b/apps/admin-dashboard/app/routes/_dashboard.programs.create.tsx index db229fd63..c0c67d46b 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.programs.create.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.programs.create.tsx @@ -12,6 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Program } from '@oyster/types'; import { Button, DatePicker, @@ -20,8 +21,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; -import { Program } from '@oyster/types'; +} from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.resources.create.tsx b/apps/admin-dashboard/app/routes/_dashboard.resources.create.tsx index 39224d494..343178790 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.resources.create.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.resources.create.tsx @@ -12,6 +12,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Resource, ResourceStatus } from '@oyster/types'; import { Button, Form, @@ -19,8 +20,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; -import { Resource, ResourceStatus } from '@oyster/types'; +} from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.schools.create.tsx b/apps/admin-dashboard/app/routes/_dashboard.schools.create.tsx index 6deab6c7e..9bdadea65 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.schools.create.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.schools.create.tsx @@ -18,7 +18,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { createSchool } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.schools.tsx b/apps/admin-dashboard/app/routes/_dashboard.schools.tsx index 3a1190a30..cda56a94c 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.schools.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.schools.tsx @@ -18,7 +18,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { db } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.$id.activate.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.$id.activate.tsx index 010deaa8c..f5eb5a602 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.$id.activate.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.$id.activate.tsx @@ -11,7 +11,7 @@ import { useNavigate, } from '@remix-run/react'; -import { Button, Form, Modal } from '@oyster/core-ui'; +import { Button, Form, Modal } from '@oyster/ui'; import { Route } from '../shared/constants'; import { activateMember, db } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.$id.email.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.$id.email.tsx index 90640aff7..4181607ed 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.$id.email.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.$id.email.tsx @@ -13,6 +13,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Student } from '@oyster/types'; import { Button, Form, @@ -20,8 +21,7 @@ import { Input, Modal, validateForm, -} from '@oyster/core-ui'; -import { Student } from '@oyster/types'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { db, updateMemberEmail } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.$id.points.grant.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.$id.points.grant.tsx index 3aa72a0f4..4b8861c7e 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.$id.points.grant.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.$id.points.grant.tsx @@ -13,6 +13,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { CompletedActivity } from '@oyster/types'; import { Button, Form, @@ -21,8 +22,7 @@ import { Modal, Textarea, validateForm, -} from '@oyster/core-ui'; -import { CompletedActivity } from '@oyster/types'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { db, job } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.$id.remove.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.$id.remove.tsx index acc6dbd7b..a0c9c20a1 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.$id.remove.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.$id.remove.tsx @@ -10,7 +10,7 @@ import { useNavigate, } from '@remix-run/react'; -import { Button, Modal } from '@oyster/core-ui'; +import { Button, Modal } from '@oyster/ui'; import { Route } from '../shared/constants'; import { db, job } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.import.programs.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.import.programs.tsx index 16f8e6a87..bdf5f4fcd 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.import.programs.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.import.programs.tsx @@ -18,6 +18,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; +import { Email, Program, ProgramParticipant } from '@oyster/types'; import { Button, Form, @@ -27,8 +28,7 @@ import { Text, TextProps, validateForm, -} from '@oyster/core-ui'; -import { Email, Program, ProgramParticipant } from '@oyster/types'; +} from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.import.resources.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.import.resources.tsx index a1c03f35c..7a7a3c56b 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.import.resources.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.import.resources.tsx @@ -19,6 +19,7 @@ import { import dayjs from 'dayjs'; import { z } from 'zod'; +import { Email, Resource, ResourceUser } from '@oyster/types'; import { Button, Form, @@ -28,8 +29,7 @@ import { Text, TextProps, validateForm, -} from '@oyster/core-ui'; -import { Email, Resource, ResourceUser } from '@oyster/types'; +} from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.import.scholarships.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.import.scholarships.tsx index f527906b7..68fc79be6 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.import.scholarships.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.import.scholarships.tsx @@ -17,14 +17,8 @@ import { import dayjs from 'dayjs'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; import { Email, ScholarshipRecipient, ScholarshipType } from '@oyster/types'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { id } from '@oyster/utils'; import { Route } from '../shared/constants'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.tsx index 36a4e754e..2f937af03 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.students.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.students.tsx @@ -23,7 +23,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { getTimezone } from '../shared/cookies.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.surveys.$id.import.tsx b/apps/admin-dashboard/app/routes/_dashboard.surveys.$id.import.tsx index 7c0617370..1cb9f7275 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.surveys.$id.import.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.surveys.$id.import.tsx @@ -17,13 +17,7 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - Form, - getActionErrors, - Modal, - validateForm, -} from '@oyster/core-ui'; +import { Button, Form, getActionErrors, Modal, validateForm } from '@oyster/ui'; import { Route } from '../shared/constants'; import { db, importSurveyResponses } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.surveys.create.tsx b/apps/admin-dashboard/app/routes/_dashboard.surveys.create.tsx index 9e89fec7e..59befd499 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.surveys.create.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.surveys.create.tsx @@ -22,7 +22,7 @@ import { Select, Textarea, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { createSurvey, listEvents } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.surveys.tsx b/apps/admin-dashboard/app/routes/_dashboard.surveys.tsx index 2ae1584e6..b8e947362 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.surveys.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.surveys.tsx @@ -17,7 +17,7 @@ import { Table, TableColumnProps, useSearchParams, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { Route } from '../shared/constants'; import { db } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/_dashboard.tsx b/apps/admin-dashboard/app/routes/_dashboard.tsx index 7373a5a33..77fc24859 100644 --- a/apps/admin-dashboard/app/routes/_dashboard.tsx +++ b/apps/admin-dashboard/app/routes/_dashboard.tsx @@ -11,7 +11,7 @@ import { Video, } from 'react-feather'; -import { Dashboard } from '@oyster/core-ui'; +import { Dashboard } from '@oyster/ui'; import { Route } from '../shared/constants'; import { countPendingApplications } from '../shared/core.server'; diff --git a/apps/admin-dashboard/app/routes/login._index.tsx b/apps/admin-dashboard/app/routes/login._index.tsx index c22b34a9d..3786e00dd 100644 --- a/apps/admin-dashboard/app/routes/login._index.tsx +++ b/apps/admin-dashboard/app/routes/login._index.tsx @@ -1,7 +1,7 @@ import { json, LoaderFunctionArgs } from '@remix-run/node'; import { useLoaderData } from '@remix-run/react'; -import { Form, Login } from '@oyster/core-ui'; +import { Form, Login } from '@oyster/ui'; import { Route } from '../shared/constants'; import { ENV } from '../shared/constants.server'; diff --git a/apps/admin-dashboard/app/routes/login.otp.send.tsx b/apps/admin-dashboard/app/routes/login.otp.send.tsx index 82cbd4796..6e8181c3f 100644 --- a/apps/admin-dashboard/app/routes/login.otp.send.tsx +++ b/apps/admin-dashboard/app/routes/login.otp.send.tsx @@ -5,7 +5,7 @@ import { useNavigation, } from '@remix-run/react'; -import { Button, Form, getActionErrors, validateForm } from '@oyster/core-ui'; +import { Button, Form, getActionErrors, validateForm } from '@oyster/ui'; import { Route } from '../shared/constants'; import { oneTimeCodeIdCookie } from '../shared/cookies.server'; diff --git a/apps/admin-dashboard/app/routes/login.otp.verify.tsx b/apps/admin-dashboard/app/routes/login.otp.verify.tsx index adf24a886..5cdf67dbb 100644 --- a/apps/admin-dashboard/app/routes/login.otp.verify.tsx +++ b/apps/admin-dashboard/app/routes/login.otp.verify.tsx @@ -10,7 +10,7 @@ import { useNavigation, } from '@remix-run/react'; -import { Button, Form, getActionErrors, validateForm } from '@oyster/core-ui'; +import { Button, Form, getActionErrors, validateForm } from '@oyster/ui'; import { Route } from '../shared/constants'; import { oneTimeCodeIdCookie } from '../shared/cookies.server'; diff --git a/apps/admin-dashboard/app/routes/login.tsx b/apps/admin-dashboard/app/routes/login.tsx index 100a2bc57..d61749fa1 100644 --- a/apps/admin-dashboard/app/routes/login.tsx +++ b/apps/admin-dashboard/app/routes/login.tsx @@ -1,7 +1,7 @@ import { json, LoaderFunctionArgs, redirect } from '@remix-run/node'; import { Outlet } from '@remix-run/react'; -import { Login, Public } from '@oyster/core-ui'; +import { Login, Public } from '@oyster/ui'; import { Route } from '../shared/constants'; import { getSession, SESSION } from '../shared/session.server'; diff --git a/apps/admin-dashboard/app/shared/components/activity-form.tsx b/apps/admin-dashboard/app/shared/components/activity-form.tsx index 64cbc0242..137dcf82d 100644 --- a/apps/admin-dashboard/app/shared/components/activity-form.tsx +++ b/apps/admin-dashboard/app/shared/components/activity-form.tsx @@ -1,5 +1,5 @@ -import { Form, Input, Select, Textarea } from '@oyster/core-ui'; import { ActivityPeriod, ActivityType } from '@oyster/types'; +import { Form, Input, Select, Textarea } from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; type FieldProps = { diff --git a/apps/admin-dashboard/app/shared/components/card.tsx b/apps/admin-dashboard/app/shared/components/card.tsx index c3c182743..3a9082520 100644 --- a/apps/admin-dashboard/app/shared/components/card.tsx +++ b/apps/admin-dashboard/app/shared/components/card.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren } from 'react'; -import { cx, Text } from '@oyster/core-ui'; +import { cx, Text } from '@oyster/ui'; type CardProps = PropsWithChildren<{ className?: string; diff --git a/apps/admin-dashboard/app/shared/components/onboarding-session-form.tsx b/apps/admin-dashboard/app/shared/components/onboarding-session-form.tsx index fd74195a0..6eaf942de 100644 --- a/apps/admin-dashboard/app/shared/components/onboarding-session-form.tsx +++ b/apps/admin-dashboard/app/shared/components/onboarding-session-form.tsx @@ -9,7 +9,7 @@ import { MultiComboboxItem, MultiComboboxSearch, MultiComboboxValues, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import type { SearchMembersResult } from '../../routes/members.search'; type FieldProps = { diff --git a/apps/admin-dashboard/app/shared/session.server.ts b/apps/admin-dashboard/app/shared/session.server.ts index 1083b4d5a..dccc9275b 100644 --- a/apps/admin-dashboard/app/shared/session.server.ts +++ b/apps/admin-dashboard/app/shared/session.server.ts @@ -1,6 +1,6 @@ import { createCookieSessionStorage, redirect, Session } from '@remix-run/node'; -import { ToastProps } from '@oyster/core-ui'; +import { ToastProps } from '@oyster/ui'; import { Route } from './constants'; import { ENV } from './constants.server'; diff --git a/apps/admin-dashboard/package.json b/apps/admin-dashboard/package.json index f6e26a4de..78b9a8a72 100644 --- a/apps/admin-dashboard/package.json +++ b/apps/admin-dashboard/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@oyster/core": "*", - "@oyster/core-ui": "*", "@oyster/types": "*", + "@oyster/ui": "*", "@oyster/utils": "*", "@remix-run/node": "^2.8.1", "@remix-run/react": "^2.8.1", diff --git a/apps/admin-dashboard/railway.json b/apps/admin-dashboard/railway.json index 1e3f681aa..84147e422 100644 --- a/apps/admin-dashboard/railway.json +++ b/apps/admin-dashboard/railway.json @@ -7,7 +7,7 @@ "watchPatterns": [ "/apps/admin-dashboard/**/*", "/packages/core/**/*", - "/packages/core-ui/**/*" + "/packages/ui/**/*" ] }, "deploy": { diff --git a/apps/admin-dashboard/tailwind.config.js b/apps/admin-dashboard/tailwind.config.js index 56860801e..ffde2efda 100644 --- a/apps/admin-dashboard/tailwind.config.js +++ b/apps/admin-dashboard/tailwind.config.js @@ -1,6 +1,6 @@ /** @type {import('tailwindcss').Config} */ export default { - content: ['./app/**/*.{ts,tsx}', '../../packages/core-ui/src/**/*.tsx'], + content: ['./app/**/*.{ts,tsx}', '../../packages/ui/src/**/*.tsx'], theme: { extend: { colors: { diff --git a/apps/member-profile/app/root.tsx b/apps/member-profile/app/root.tsx index 59b611c0a..dbf11df94 100644 --- a/apps/member-profile/app/root.tsx +++ b/apps/member-profile/app/root.tsx @@ -13,9 +13,9 @@ import dayjs from 'dayjs'; import timezone from 'dayjs/plugin/timezone.js'; import utc from 'dayjs/plugin/utc.js'; -import { Toast } from '@oyster/core-ui'; +import { Toast } from '@oyster/ui'; -import coreUiStylesheet from '@oyster/core-ui/dist/index.css?url'; +import coreUiStylesheet from '@oyster/ui/dist/index.css?url'; import tailwindStylesheet from './tailwind.css?url'; import { ENV } from './shared/constants.server'; diff --git a/apps/member-profile/app/routes/_profile.directory.join.1.tsx b/apps/member-profile/app/routes/_profile.directory.join.1.tsx index 60e476714..1bb16f885 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.1.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.1.tsx @@ -13,6 +13,7 @@ import { import { sql } from 'kysely'; import { z } from 'zod'; +import { Student } from '@oyster/types'; import { Button, Checkbox, @@ -24,8 +25,7 @@ import { Text, TextProps, validateForm, -} from '@oyster/core-ui'; -import { Student } from '@oyster/types'; +} from '@oyster/ui'; import { CurrentLocationField } from '../shared/components/profile.general'; import { Route } from '../shared/constants'; diff --git a/apps/member-profile/app/routes/_profile.directory.join.2.tsx b/apps/member-profile/app/routes/_profile.directory.join.2.tsx index 0940105c3..f42d66bab 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.2.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.2.tsx @@ -13,13 +13,8 @@ import { import { sql } from 'kysely'; import { z } from 'zod'; -import { - Button, - Divider, - getActionErrors, - validateForm, -} from '@oyster/core-ui'; import { nullableField, Student } from '@oyster/types'; +import { Button, Divider, getActionErrors, validateForm } from '@oyster/ui'; import { EthnicityField, diff --git a/apps/member-profile/app/routes/_profile.directory.join.3.tsx b/apps/member-profile/app/routes/_profile.directory.join.3.tsx index 50fe84d89..e51e1eb85 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.3.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.3.tsx @@ -12,13 +12,8 @@ import { } from '@remix-run/react'; import { z } from 'zod'; -import { - Button, - getActionErrors, - InputField, - validateForm, -} from '@oyster/core-ui'; import { nullableField, Student } from '@oyster/types'; +import { Button, getActionErrors, InputField, validateForm } from '@oyster/ui'; import { Route } from '../shared/constants'; import { db } from '../shared/core.server'; diff --git a/apps/member-profile/app/routes/_profile.directory.join.4.tsx b/apps/member-profile/app/routes/_profile.directory.join.4.tsx index f87fdd12b..c6862a72b 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.4.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.4.tsx @@ -20,7 +20,7 @@ import { Select, Textarea, validateForm, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { id } from '@oyster/utils'; import { diff --git a/apps/member-profile/app/routes/_profile.directory.join._index.tsx b/apps/member-profile/app/routes/_profile.directory.join._index.tsx index c303914f3..54d41d8d2 100644 --- a/apps/member-profile/app/routes/_profile.directory.join._index.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join._index.tsx @@ -2,7 +2,7 @@ import { json, LoaderFunctionArgs } from '@remix-run/node'; import { Link } from '@remix-run/react'; import { ArrowRight } from 'react-feather'; -import { Button, getButtonCn, Modal } from '@oyster/core-ui'; +import { Button, getButtonCn, Modal } from '@oyster/ui'; import { Route } from '../shared/constants'; import { ensureUserAuthenticated } from '../shared/session.server'; diff --git a/apps/member-profile/app/routes/_profile.directory.join.finish.tsx b/apps/member-profile/app/routes/_profile.directory.join.finish.tsx index e5520298b..603f319ba 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.finish.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.finish.tsx @@ -2,7 +2,7 @@ import { json, LoaderFunctionArgs } from '@remix-run/node'; import { generatePath, Link, useLoaderData } from '@remix-run/react'; import { ArrowRight, Eye } from 'react-feather'; -import { Button, getButtonCn, Text } from '@oyster/core-ui'; +import { Button, getButtonCn, Text } from '@oyster/ui'; import { Route } from '../shared/constants'; import { ensureUserAuthenticated, user } from '../shared/session.server'; diff --git a/apps/member-profile/app/routes/_profile.directory.join.tsx b/apps/member-profile/app/routes/_profile.directory.join.tsx index c8b7d7f50..549ccac56 100644 --- a/apps/member-profile/app/routes/_profile.directory.join.tsx +++ b/apps/member-profile/app/routes/_profile.directory.join.tsx @@ -4,7 +4,7 @@ import { PropsWithChildren } from 'react'; import { ArrowLeft, ArrowRight, Check } from 'react-feather'; import { match } from 'ts-pattern'; -import { Button, cx, getButtonCn, Modal, Text } from '@oyster/core-ui'; +import { Button, cx, getButtonCn, Modal, Text } from '@oyster/ui'; import { Route } from '../shared/constants'; import { ensureUserAuthenticated } from '../shared/session.server'; diff --git a/apps/member-profile/app/routes/_profile.directory.tsx b/apps/member-profile/app/routes/_profile.directory.tsx index 58d80b608..ac1c37f4a 100644 --- a/apps/member-profile/app/routes/_profile.directory.tsx +++ b/apps/member-profile/app/routes/_profile.directory.tsx @@ -12,6 +12,7 @@ import { Filter, Plus } from 'react-feather'; import { match } from 'ts-pattern'; import { z } from 'zod'; +import { ExtractValue, Student } from '@oyster/types'; import { Button, Dashboard, @@ -23,8 +24,7 @@ import { Select, Text, useSearchParams, -} from '@oyster/core-ui'; -import { ExtractValue, Student } from '@oyster/types'; +} from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; import { CityCombobox } from '../shared/components/city-combobox'; diff --git a/apps/member-profile/app/routes/_profile.directory_.$id.tsx b/apps/member-profile/app/routes/_profile.directory_.$id.tsx index 568e32946..b80716e33 100644 --- a/apps/member-profile/app/routes/_profile.directory_.$id.tsx +++ b/apps/member-profile/app/routes/_profile.directory_.$id.tsx @@ -4,13 +4,7 @@ import dayjs from 'dayjs'; import React, { PropsWithChildren } from 'react'; import { BookOpen, Calendar, Globe, Home, Link, MapPin } from 'react-feather'; -import { - cx, - getButtonCn, - ProfilePicture, - Text, - TextProps, -} from '@oyster/core-ui'; +import { cx, getButtonCn, ProfilePicture, Text, TextProps } from '@oyster/ui'; import { Card } from '../shared/components/card'; import { EducationExperienceItem } from '../shared/components/education-experience'; @@ -195,7 +189,7 @@ function MemberHeader() { {!!member.slackUrl && ( { icon = React.cloneElement(icon, { diff --git a/apps/member-profile/app/shared/components/ethnicity-combobox.tsx b/apps/member-profile/app/shared/components/ethnicity-combobox.tsx index 3b1e5061b..572e7eca9 100644 --- a/apps/member-profile/app/shared/components/ethnicity-combobox.tsx +++ b/apps/member-profile/app/shared/components/ethnicity-combobox.tsx @@ -13,7 +13,7 @@ import { MultiComboboxProps, MultiComboboxSearch, MultiComboboxValues, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import type { SearchCountriesResult } from '../../routes/countries.search'; diff --git a/apps/member-profile/app/shared/components/event.tsx b/apps/member-profile/app/shared/components/event.tsx index 5fb3ac895..b47efd4a5 100644 --- a/apps/member-profile/app/shared/components/event.tsx +++ b/apps/member-profile/app/shared/components/event.tsx @@ -3,7 +3,7 @@ import { PropsWithChildren } from 'react'; import { Calendar } from 'react-feather'; import { match } from 'ts-pattern'; -import { Text } from '@oyster/core-ui'; +import { Text } from '@oyster/ui'; // Components diff --git a/apps/member-profile/app/shared/components/profile.general.tsx b/apps/member-profile/app/shared/components/profile.general.tsx index 8adc069bc..19f9f4bc3 100644 --- a/apps/member-profile/app/shared/components/profile.general.tsx +++ b/apps/member-profile/app/shared/components/profile.general.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { FieldProps, Form, Input, Text } from '@oyster/core-ui'; +import { FieldProps, Form, Input, Text } from '@oyster/ui'; import { CityCombobox, CityComboboxProps } from './city-combobox'; diff --git a/apps/member-profile/app/shared/components/profile.personal.tsx b/apps/member-profile/app/shared/components/profile.personal.tsx index 1cd0ec62b..f8d88ba0f 100644 --- a/apps/member-profile/app/shared/components/profile.personal.tsx +++ b/apps/member-profile/app/shared/components/profile.personal.tsx @@ -1,11 +1,5 @@ -import { - Checkbox, - DatePicker, - FieldProps, - Form, - Select, -} from '@oyster/core-ui'; import { FORMATTED_GENDER, Gender } from '@oyster/types'; +import { Checkbox, DatePicker, FieldProps, Form, Select } from '@oyster/ui'; import { Country } from '../core.ui'; import { CityCombobox, CityComboboxProps } from './city-combobox'; diff --git a/apps/member-profile/app/shared/components/profile.tsx b/apps/member-profile/app/shared/components/profile.tsx index db8995f3d..26809bcf2 100644 --- a/apps/member-profile/app/shared/components/profile.tsx +++ b/apps/member-profile/app/shared/components/profile.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren } from 'react'; -import { Divider, Text } from '@oyster/core-ui'; +import { Divider, Text } from '@oyster/ui'; // Profile diff --git a/apps/member-profile/app/shared/session.server.ts b/apps/member-profile/app/shared/session.server.ts index b80976c48..982d2c380 100644 --- a/apps/member-profile/app/shared/session.server.ts +++ b/apps/member-profile/app/shared/session.server.ts @@ -1,6 +1,6 @@ import { createCookieSessionStorage, redirect, Session } from '@remix-run/node'; -import { ToastProps } from '@oyster/core-ui'; +import { ToastProps } from '@oyster/ui'; import { Route } from './constants'; import { ENV } from './constants.server'; diff --git a/apps/member-profile/package.json b/apps/member-profile/package.json index f667d6cdc..a9e8bbf75 100644 --- a/apps/member-profile/package.json +++ b/apps/member-profile/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@oyster/core": "*", - "@oyster/core-ui": "*", "@oyster/types": "*", + "@oyster/ui": "*", "@oyster/utils": "*", "@remix-run/node": "^2.8.1", "@remix-run/react": "^2.8.1", diff --git a/apps/member-profile/railway.json b/apps/member-profile/railway.json index 15f4dfbdd..6f0af3798 100644 --- a/apps/member-profile/railway.json +++ b/apps/member-profile/railway.json @@ -7,7 +7,7 @@ "watchPatterns": [ "/apps/member-profile/**/*", "/packages/core/**/*", - "/packages/core-ui/**/*" + "/packages/ui/**/*" ] }, "deploy": { diff --git a/apps/member-profile/tailwind.config.js b/apps/member-profile/tailwind.config.js index d7f82588a..e7a75b7eb 100644 --- a/apps/member-profile/tailwind.config.js +++ b/apps/member-profile/tailwind.config.js @@ -1,6 +1,6 @@ /** @type {import('tailwindcss').Config} */ export default { - content: ['./app/**/*.{ts,tsx}', '../../packages/core-ui/src/**/*.tsx'], + content: ['./app/**/*.{ts,tsx}', '../../packages/ui/src/**/*.tsx'], theme: { extend: { colors: { diff --git a/package.json b/package.json index 506c27a03..f46869fa5 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dev": "turbo run dev --cache-dir=.turbo", "dev:apps": "yarn dev --filter='./apps/*'", "lint": "turbo run lint --cache-dir=.turbo", + "postinstall": "yarn workspace @oyster/core db:types", "test": "turbo run test --cache-dir=.turbo", "start": "turbo run start --cache-dir=.turbo" }, diff --git a/packages/core/package.json b/packages/core/package.json index 4b2da2375..e56bb2802 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -44,8 +44,8 @@ "statsig-node": "^5.3.0" }, "devDependencies": { - "@oyster/core-ui": "*", "@oyster/tsconfig": "*", + "@oyster/ui": "*", "@remix-run/react": "^2.8.1", "@types/dedent": "^0.7.2", "@types/jsonwebtoken": "^9.0.2", diff --git a/packages/core/src/modules/application/ui/application-form.tsx b/packages/core/src/modules/application/ui/application-form.tsx index 30c2948cd..188b7d164 100644 --- a/packages/core/src/modules/application/ui/application-form.tsx +++ b/packages/core/src/modules/application/ui/application-form.tsx @@ -1,16 +1,5 @@ import React, { PropsWithChildren, useContext, useState } from 'react'; -import { - Checkbox, - FieldProps, - Form, - Input, - Link, - Radio, - Text, - Textarea, - TextProps, -} from '@oyster/core-ui'; import { Demographic, FORMATTED_DEMOGRAPHICS, @@ -22,6 +11,17 @@ import { OtherDemographic, Race, } from '@oyster/types'; +import { + Checkbox, + FieldProps, + Form, + Input, + Link, + Radio, + Text, + Textarea, + TextProps, +} from '@oyster/ui'; import { iife, toTitleCase } from '@oyster/utils'; import { diff --git a/packages/core/src/modules/application/ui/major-combobox.tsx b/packages/core/src/modules/application/ui/major-combobox.tsx index 9b87ca214..ecd8f76e3 100644 --- a/packages/core/src/modules/application/ui/major-combobox.tsx +++ b/packages/core/src/modules/application/ui/major-combobox.tsx @@ -1,5 +1,6 @@ import { useState } from 'react'; +import { Major } from '@oyster/types'; import { Combobox, ComboboxInput, @@ -8,8 +9,7 @@ import { ComboboxProps, FieldProps, InputProps, -} from '@oyster/core-ui'; -import { Major } from '@oyster/types'; +} from '@oyster/ui'; import { toEscapedString, toTitleCase } from '@oyster/utils'; const TOP_MAJORS: Major[] = [ diff --git a/packages/core/src/modules/application/ui/school-combobox.tsx b/packages/core/src/modules/application/ui/school-combobox.tsx index 59b53deb5..7dfbc0b8b 100644 --- a/packages/core/src/modules/application/ui/school-combobox.tsx +++ b/packages/core/src/modules/application/ui/school-combobox.tsx @@ -8,7 +8,7 @@ import { ComboboxPopover, InputProps, useDelayedValue, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { School as _School } from '@/modules/education/education.types'; diff --git a/packages/core/src/modules/authentication/ui/one-time-code-form.tsx b/packages/core/src/modules/authentication/ui/one-time-code-form.tsx index 240bd0d8f..f1f3d6d74 100644 --- a/packages/core/src/modules/authentication/ui/one-time-code-form.tsx +++ b/packages/core/src/modules/authentication/ui/one-time-code-form.tsx @@ -1,4 +1,4 @@ -import { FieldProps, Form, Input } from '@oyster/core-ui'; +import { FieldProps, Form, Input } from '@oyster/ui'; export const OneTimeCodeForm = () => {}; diff --git a/packages/core/src/modules/employment/ui/work-experience.tsx b/packages/core/src/modules/employment/ui/work-experience.tsx index 909fbd502..e17370846 100644 --- a/packages/core/src/modules/employment/ui/work-experience.tsx +++ b/packages/core/src/modules/employment/ui/work-experience.tsx @@ -1,6 +1,6 @@ import { Edit } from 'react-feather'; -import { IconButton, Text } from '@oyster/core-ui'; +import { IconButton, Text } from '@oyster/ui'; import { toTitleCase } from '@oyster/utils'; type WorkExperienceItemProps = { diff --git a/packages/core/src/modules/employment/ui/work-form.tsx b/packages/core/src/modules/employment/ui/work-form.tsx index 488b8b156..fa596cc77 100644 --- a/packages/core/src/modules/employment/ui/work-form.tsx +++ b/packages/core/src/modules/employment/ui/work-form.tsx @@ -19,7 +19,7 @@ import { Input, Select, useDelayedValue, -} from '@oyster/core-ui'; +} from '@oyster/ui'; import { order } from '@oyster/utils'; import { diff --git a/packages/core-ui/package.json b/packages/ui/package.json similarity index 97% rename from packages/core-ui/package.json rename to packages/ui/package.json index 5959747fd..f4a5ba9e9 100644 --- a/packages/core-ui/package.json +++ b/packages/ui/package.json @@ -1,5 +1,5 @@ { - "name": "@oyster/core-ui", + "name": "@oyster/ui", "version": "0.0.0", "private": true, "sideEffects": false, diff --git a/packages/core-ui/rollup.config.js b/packages/ui/rollup.config.js similarity index 100% rename from packages/core-ui/rollup.config.js rename to packages/ui/rollup.config.js diff --git a/packages/core-ui/src/css/_breakpoints.scss b/packages/ui/src/css/_breakpoints.scss similarity index 100% rename from packages/core-ui/src/css/_breakpoints.scss rename to packages/ui/src/css/_breakpoints.scss diff --git a/packages/core-ui/src/css/shared.css b/packages/ui/src/css/shared.css similarity index 100% rename from packages/core-ui/src/css/shared.css rename to packages/ui/src/css/shared.css diff --git a/packages/core-ui/src/hooks/use-delayed-value.ts b/packages/ui/src/hooks/use-delayed-value.ts similarity index 100% rename from packages/core-ui/src/hooks/use-delayed-value.ts rename to packages/ui/src/hooks/use-delayed-value.ts diff --git a/packages/core-ui/src/hooks/use-hydrated.ts b/packages/ui/src/hooks/use-hydrated.ts similarity index 100% rename from packages/core-ui/src/hooks/use-hydrated.ts rename to packages/ui/src/hooks/use-hydrated.ts diff --git a/packages/core-ui/src/hooks/use-on-click-outside.ts b/packages/ui/src/hooks/use-on-click-outside.ts similarity index 100% rename from packages/core-ui/src/hooks/use-on-click-outside.ts rename to packages/ui/src/hooks/use-on-click-outside.ts diff --git a/packages/core-ui/src/hooks/use-search-params.ts b/packages/ui/src/hooks/use-search-params.ts similarity index 100% rename from packages/core-ui/src/hooks/use-search-params.ts rename to packages/ui/src/hooks/use-search-params.ts diff --git a/packages/core-ui/src/index.ts b/packages/ui/src/index.ts similarity index 100% rename from packages/core-ui/src/index.ts rename to packages/ui/src/index.ts diff --git a/packages/core-ui/src/ui/address.tsx b/packages/ui/src/ui/address.tsx similarity index 100% rename from packages/core-ui/src/ui/address.tsx rename to packages/ui/src/ui/address.tsx diff --git a/packages/core-ui/src/ui/button.tsx b/packages/ui/src/ui/button.tsx similarity index 100% rename from packages/core-ui/src/ui/button.tsx rename to packages/ui/src/ui/button.tsx diff --git a/packages/core-ui/src/ui/checkbox/checkbox.module.scss b/packages/ui/src/ui/checkbox/checkbox.module.scss similarity index 100% rename from packages/core-ui/src/ui/checkbox/checkbox.module.scss rename to packages/ui/src/ui/checkbox/checkbox.module.scss diff --git a/packages/core-ui/src/ui/checkbox/checkbox.tsx b/packages/ui/src/ui/checkbox/checkbox.tsx similarity index 100% rename from packages/core-ui/src/ui/checkbox/checkbox.tsx rename to packages/ui/src/ui/checkbox/checkbox.tsx diff --git a/packages/core-ui/src/ui/combobox-popover.tsx b/packages/ui/src/ui/combobox-popover.tsx similarity index 100% rename from packages/core-ui/src/ui/combobox-popover.tsx rename to packages/ui/src/ui/combobox-popover.tsx diff --git a/packages/core-ui/src/ui/combobox.tsx b/packages/ui/src/ui/combobox.tsx similarity index 100% rename from packages/core-ui/src/ui/combobox.tsx rename to packages/ui/src/ui/combobox.tsx diff --git a/packages/core-ui/src/ui/dashboard.tsx b/packages/ui/src/ui/dashboard.tsx similarity index 100% rename from packages/core-ui/src/ui/dashboard.tsx rename to packages/ui/src/ui/dashboard.tsx diff --git a/packages/core-ui/src/ui/date-picker.tsx b/packages/ui/src/ui/date-picker.tsx similarity index 100% rename from packages/core-ui/src/ui/date-picker.tsx rename to packages/ui/src/ui/date-picker.tsx diff --git a/packages/core-ui/src/ui/divider.tsx b/packages/ui/src/ui/divider.tsx similarity index 100% rename from packages/core-ui/src/ui/divider.tsx rename to packages/ui/src/ui/divider.tsx diff --git a/packages/core-ui/src/ui/dropdown/dropdown.module.scss b/packages/ui/src/ui/dropdown/dropdown.module.scss similarity index 100% rename from packages/core-ui/src/ui/dropdown/dropdown.module.scss rename to packages/ui/src/ui/dropdown/dropdown.module.scss diff --git a/packages/core-ui/src/ui/dropdown/dropdown.tsx b/packages/ui/src/ui/dropdown/dropdown.tsx similarity index 100% rename from packages/core-ui/src/ui/dropdown/dropdown.tsx rename to packages/ui/src/ui/dropdown/dropdown.tsx diff --git a/packages/core-ui/src/ui/form.tsx b/packages/ui/src/ui/form.tsx similarity index 100% rename from packages/core-ui/src/ui/form.tsx rename to packages/ui/src/ui/form.tsx diff --git a/packages/core-ui/src/ui/icon-button.tsx b/packages/ui/src/ui/icon-button.tsx similarity index 100% rename from packages/core-ui/src/ui/icon-button.tsx rename to packages/ui/src/ui/icon-button.tsx diff --git a/packages/core-ui/src/ui/input.tsx b/packages/ui/src/ui/input.tsx similarity index 100% rename from packages/core-ui/src/ui/input.tsx rename to packages/ui/src/ui/input.tsx diff --git a/packages/core-ui/src/ui/link.tsx b/packages/ui/src/ui/link.tsx similarity index 100% rename from packages/core-ui/src/ui/link.tsx rename to packages/ui/src/ui/link.tsx diff --git a/packages/core-ui/src/ui/login.tsx b/packages/ui/src/ui/login.tsx similarity index 100% rename from packages/core-ui/src/ui/login.tsx rename to packages/ui/src/ui/login.tsx diff --git a/packages/core-ui/src/ui/modal/modal.module.scss b/packages/ui/src/ui/modal/modal.module.scss similarity index 100% rename from packages/core-ui/src/ui/modal/modal.module.scss rename to packages/ui/src/ui/modal/modal.module.scss diff --git a/packages/core-ui/src/ui/modal/modal.tsx b/packages/ui/src/ui/modal/modal.tsx similarity index 100% rename from packages/core-ui/src/ui/modal/modal.tsx rename to packages/ui/src/ui/modal/modal.tsx diff --git a/packages/core-ui/src/ui/multi-combobox.tsx b/packages/ui/src/ui/multi-combobox.tsx similarity index 100% rename from packages/core-ui/src/ui/multi-combobox.tsx rename to packages/ui/src/ui/multi-combobox.tsx diff --git a/packages/core-ui/src/ui/pagination.tsx b/packages/ui/src/ui/pagination.tsx similarity index 100% rename from packages/core-ui/src/ui/pagination.tsx rename to packages/ui/src/ui/pagination.tsx diff --git a/packages/core-ui/src/ui/pill.tsx b/packages/ui/src/ui/pill.tsx similarity index 100% rename from packages/core-ui/src/ui/pill.tsx rename to packages/ui/src/ui/pill.tsx diff --git a/packages/core-ui/src/ui/profile-picture.tsx b/packages/ui/src/ui/profile-picture.tsx similarity index 100% rename from packages/core-ui/src/ui/profile-picture.tsx rename to packages/ui/src/ui/profile-picture.tsx diff --git a/packages/core-ui/src/ui/public.tsx b/packages/ui/src/ui/public.tsx similarity index 100% rename from packages/core-ui/src/ui/public.tsx rename to packages/ui/src/ui/public.tsx diff --git a/packages/core-ui/src/ui/radio/radio.module.scss b/packages/ui/src/ui/radio/radio.module.scss similarity index 100% rename from packages/core-ui/src/ui/radio/radio.module.scss rename to packages/ui/src/ui/radio/radio.module.scss diff --git a/packages/core-ui/src/ui/radio/radio.tsx b/packages/ui/src/ui/radio/radio.tsx similarity index 100% rename from packages/core-ui/src/ui/radio/radio.tsx rename to packages/ui/src/ui/radio/radio.tsx diff --git a/packages/core-ui/src/ui/search-bar.tsx b/packages/ui/src/ui/search-bar.tsx similarity index 100% rename from packages/core-ui/src/ui/search-bar.tsx rename to packages/ui/src/ui/search-bar.tsx diff --git a/packages/core-ui/src/ui/select/select.module.scss b/packages/ui/src/ui/select/select.module.scss similarity index 100% rename from packages/core-ui/src/ui/select/select.module.scss rename to packages/ui/src/ui/select/select.module.scss diff --git a/packages/core-ui/src/ui/select/select.tsx b/packages/ui/src/ui/select/select.tsx similarity index 100% rename from packages/core-ui/src/ui/select/select.tsx rename to packages/ui/src/ui/select/select.tsx diff --git a/packages/core-ui/src/ui/spinner.tsx b/packages/ui/src/ui/spinner.tsx similarity index 100% rename from packages/core-ui/src/ui/spinner.tsx rename to packages/ui/src/ui/spinner.tsx diff --git a/packages/core-ui/src/ui/table.tsx b/packages/ui/src/ui/table.tsx similarity index 100% rename from packages/core-ui/src/ui/table.tsx rename to packages/ui/src/ui/table.tsx diff --git a/packages/core-ui/src/ui/text.tsx b/packages/ui/src/ui/text.tsx similarity index 100% rename from packages/core-ui/src/ui/text.tsx rename to packages/ui/src/ui/text.tsx diff --git a/packages/core-ui/src/ui/textarea.tsx b/packages/ui/src/ui/textarea.tsx similarity index 100% rename from packages/core-ui/src/ui/textarea.tsx rename to packages/ui/src/ui/textarea.tsx diff --git a/packages/core-ui/src/ui/toast/toast.module.scss b/packages/ui/src/ui/toast/toast.module.scss similarity index 100% rename from packages/core-ui/src/ui/toast/toast.module.scss rename to packages/ui/src/ui/toast/toast.module.scss diff --git a/packages/core-ui/src/ui/toast/toast.tsx b/packages/ui/src/ui/toast/toast.tsx similarity index 100% rename from packages/core-ui/src/ui/toast/toast.tsx rename to packages/ui/src/ui/toast/toast.tsx diff --git a/packages/core-ui/src/utils/constants.ts b/packages/ui/src/utils/constants.ts similarity index 100% rename from packages/core-ui/src/utils/constants.ts rename to packages/ui/src/utils/constants.ts diff --git a/packages/core-ui/src/utils/cx.ts b/packages/ui/src/utils/cx.ts similarity index 100% rename from packages/core-ui/src/utils/cx.ts rename to packages/ui/src/utils/cx.ts diff --git a/packages/core-ui/src/utils/zod.ts b/packages/ui/src/utils/zod.ts similarity index 100% rename from packages/core-ui/src/utils/zod.ts rename to packages/ui/src/utils/zod.ts diff --git a/packages/core-ui/tsconfig.json b/packages/ui/tsconfig.json similarity index 100% rename from packages/core-ui/tsconfig.json rename to packages/ui/tsconfig.json diff --git a/packages/core-ui/types.d.ts b/packages/ui/types.d.ts similarity index 100% rename from packages/core-ui/types.d.ts rename to packages/ui/types.d.ts