Skip to content

Commit

Permalink
fix: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kongnayeon committed Jan 18, 2025
2 parents 864fd71 + 5639eac commit 30b4f41
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 3 additions & 4 deletions apps/web/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
Checkbox,
Label,
Breadcrumb,
Chip,
TextField,
Chip,
} from '@repo/ui';
Expand Down Expand Up @@ -141,7 +140,7 @@ export default function Home() {
<TextField.Label>주제</TextField.Label>
<TextField.Input
placeholder="주제를 적어주세요"
maxLength={500}
maxLength={5000}
{...register('topic', {
required: '주제를 입력해주세요',
maxLength: {
Expand All @@ -156,7 +155,7 @@ export default function Home() {
<TextField.Label>AI 업그레이드</TextField.Label>
<TextField.Input
placeholder="AI에게 요청하여 글 업그레이드하기"
maxLength={500}
maxLength={5000}
showCounter
{...register('aiUpgrade')}
/>
Expand All @@ -167,7 +166,7 @@ export default function Home() {
<TextField.Label>AI 업그레이드</TextField.Label>
<TextField.Input
placeholder="AI에게 요청하여 글 업그레이드하기"
maxLength={500}
maxLength={5000}
showCounter
{...register('aiUpgrade')}
/>
Expand Down
4 changes: 4 additions & 0 deletions packages/ui/src/assets/icons/_IconX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions packages/ui/src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ export type {
BreadcrumbItemProps,
BreadcrumbSeparatorProps,
} from './Breadcrumb/Breadcrumb';
export { Chip } from './Chip/Chip';
export type { ChipProps } from './Chip/Chip';
export { TextField } from './TextField/TextField';
export type {
TextFieldProps,
Expand Down

0 comments on commit 30b4f41

Please sign in to comment.