Skip to content

Commit

Permalink
push
Browse files Browse the repository at this point in the history
  • Loading branch information
ramiAbdou committed Mar 28, 2024
1 parent f684477 commit e16d11c
Show file tree
Hide file tree
Showing 169 changed files with 161 additions and 246 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ apps
|--- member-profile
packages
|--- core
|--- core-ui
|--- email-templates
|--- types
|--- ui
|--- utils
```

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions apps/admin-dashboard/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/admin-dashboard/app/routes/_dashboard.admins.add.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import {
import dayjs from 'dayjs';
import { PropsWithChildren, useState } from 'react';

import { Button, Text } from '@oyster/core-ui';
import {
Application as ApplicationType,
Gender,
Major,
OtherDemographic,
Race,
} from '@oyster/types';
import { Button, Text } from '@oyster/ui';

import { Route } from '../shared/constants';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import {
} from '@remix-run/react';
import { z } from 'zod';

import { Application } from '@oyster/types';
import {
Button,
Form,
getActionErrors,
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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/admin-dashboard/app/routes/_dashboard.applications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import { generatePath } from 'react-router';
import { match } from 'ts-pattern';
import { z } from 'zod';

import { ExtractValue } from '@oyster/types';
import {
cx,
getIconButtonCn,
Pagination,
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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/admin-dashboard/app/routes/_dashboard.bull.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/admin-dashboard/app/routes/_dashboard.events.create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@remix-run/react';
import { z } from 'zod';

import { Event, EventType } from '@oyster/types';
import {
Button,
DatePicker,
Expand All @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/admin-dashboard/app/routes/_dashboard.events.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@remix-run/react';
import { z } from 'zod';

import { Program } from '@oyster/types';
import {
Button,
DatePicker,
Expand All @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import {
} from '@remix-run/react';
import { z } from 'zod';

import { Resource, ResourceStatus } from '@oyster/types';
import {
Button,
Form,
getActionErrors,
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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion apps/admin-dashboard/app/routes/_dashboard.schools.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading

0 comments on commit e16d11c

Please sign in to comment.