Merge remote-tracking branch 'origin/main' into iipbs-sn-map

This commit is contained in:
yschoi
2025-05-26 12:43:22 +09:00
226 changed files with 8612 additions and 545 deletions
+2 -2
View File
@@ -37,9 +37,9 @@ export interface IUser {
const client = getApiClient();
export const getUserInfo = async (userUniqId: string) => {
export const getUserInfo = async () => {
const response = await client.get<IUser>(
`${ENDPOINT.USER_SERVICE.USERS}/${userUniqId}`,
`${ENDPOINT.USER_SERVICE.USERS}/info/me`,
);
return response.data;
};
@@ -2,11 +2,11 @@ import "./button-group.css";
import type { Meta, StoryObj } from "@storybook/react";
import { RadioGroup, RadioGroupItem } from "../radio-group";
import { ButtonGroup, ButtonGroupItem } from "../button-group";
const meta: Meta<typeof RadioGroup> = {
const meta: Meta<typeof ButtonGroup> = {
title: "Elements/ButtonGroup",
component: RadioGroup,
component: ButtonGroup,
parameters: {
docs: {
description: {
@@ -19,49 +19,49 @@ ButtonGroup 컴포넌트는 RadioGroup 컴포넌트를 기반으로 버튼 모
};
export default meta;
type Story = StoryObj<typeof RadioGroup>;
type Story = StoryObj<typeof ButtonGroup>;
export const Default: Story = {
render: () => (
<RadioGroup defaultValue="comfortable" variant="button">
<RadioGroupItem value="default">Default</RadioGroupItem>
<RadioGroupItem value="comfortable">Comfortable</RadioGroupItem>
<RadioGroupItem value="compact">Compact</RadioGroupItem>
</RadioGroup>
<ButtonGroup defaultValue="comfortable" variant="button">
<ButtonGroupItem value="default">Default</ButtonGroupItem>
<ButtonGroupItem value="comfortable">Comfortable</ButtonGroupItem>
<ButtonGroupItem value="compact">Compact</ButtonGroupItem>
</ButtonGroup>
),
};
export const Secondary: Story = {
render: () => (
<RadioGroup defaultValue="comfortable" variant="button" color="secondary">
<RadioGroupItem value="default">Default</RadioGroupItem>
<RadioGroupItem value="comfortable">Comfortable</RadioGroupItem>
<RadioGroupItem value="compact">Compact</RadioGroupItem>
</RadioGroup>
<ButtonGroup defaultValue="comfortable" variant="button" color="secondary">
<ButtonGroupItem value="default">Default</ButtonGroupItem>
<ButtonGroupItem value="comfortable">Comfortable</ButtonGroupItem>
<ButtonGroupItem value="compact">Compact</ButtonGroupItem>
</ButtonGroup>
),
};
export const Rounded: Story = {
render: () => (
<RadioGroup defaultValue="comfortable" variant="button" shape="rounded">
<RadioGroupItem value="default">Default</RadioGroupItem>
<RadioGroupItem value="comfortable">Comfortable</RadioGroupItem>
<RadioGroupItem value="compact">Compact</RadioGroupItem>
</RadioGroup>
<ButtonGroup defaultValue="comfortable" variant="button" shape="rounded">
<ButtonGroupItem value="default">Default</ButtonGroupItem>
<ButtonGroupItem value="comfortable">Comfortable</ButtonGroupItem>
<ButtonGroupItem value="compact">Compact</ButtonGroupItem>
</ButtonGroup>
),
};
export const SecondaryRounded: Story = {
render: () => (
<RadioGroup
<ButtonGroup
defaultValue="comfortable"
variant="button"
color="secondary"
shape="rounded"
>
<RadioGroupItem value="default">Default</RadioGroupItem>
<RadioGroupItem value="comfortable">Comfortable</RadioGroupItem>
<RadioGroupItem value="compact">Compact</RadioGroupItem>
</RadioGroup>
<ButtonGroupItem value="default">Default</ButtonGroupItem>
<ButtonGroupItem value="comfortable">Comfortable</ButtonGroupItem>
<ButtonGroupItem value="compact">Compact</ButtonGroupItem>
</ButtonGroup>
),
};
@@ -0,0 +1,39 @@
import "./button-group.css";
import * as React from "react";
import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";
const ButtonGroup = React.forwardRef<
React.ElementRef<typeof RadioGroupPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root> & {
variant?: "radio" | "button";
color?: "primary" | "secondary";
shape?: "square" | "rounded";
}
>(
(
{ variant = "radio", color = "primary", shape = "square", ...props },
ref,
) => {
return (
<RadioGroupPrimitive.Root
{...props}
ref={ref}
data-variant={variant}
data-color={color}
data-shape={shape}
/>
);
},
);
ButtonGroup.displayName = RadioGroupPrimitive.Root.displayName;
const ButtonGroupItem = React.forwardRef<
React.ElementRef<typeof RadioGroupPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
>(({ ...props }, ref) => {
return <RadioGroupPrimitive.Item ref={ref} {...props} />;
});
ButtonGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
export { ButtonGroup, ButtonGroupItem };
@@ -16,6 +16,7 @@ import type { HTMLAttributes } from "react";
declare module "@tanstack/react-table" {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
interface ColumnMeta<TData extends RowData, TValue> {
width?: number;
align?: "left" | "center" | "right";
rowSpan?: number;
}
@@ -1,6 +1,6 @@
"use client";
import { useState } from "react";
import { useEffect, useState } from "react";
import { format } from "date-fns";
import { CalendarIcon } from "lucide-react";
import type { DateRange } from "react-day-picker";
@@ -11,20 +11,38 @@ import { Calendar } from "../calendar";
import { Popover, PopoverContent, PopoverTrigger } from "../popover";
type DateRangePickerProps = React.HTMLAttributes<HTMLDivElement> & {
value?: DateRange;
defaultValue?: DateRange;
disabled?: boolean;
handleDateChange?: (date: DateRange | undefined) => void;
onValueChange?: (date: DateRange | undefined) => void;
};
export function DateRangePicker({
value,
defaultValue,
disabled,
className,
handleDateChange,
children,
onValueChange,
}: DateRangePickerProps) {
const [date, setDate] = useState<DateRange>();
const [dateState, setDateState] = useState<DateRange | undefined>(
defaultValue,
);
const isControlled = value !== undefined;
const dateValue = isControlled ? value : dateState;
useEffect(() => {
if (isControlled) {
setDateState(value);
}
}, [isControlled, value]);
const handleSelect = (date: DateRange | undefined) => {
setDate(date);
handleDateChange?.(date);
if (!isControlled) {
setDateState(date);
}
onValueChange?.(date);
};
return (
@@ -36,19 +54,19 @@ export function DateRangePicker({
variant="outline"
className={cn(
"h-[3.2rem] min-w-[12rem] justify-start border-input !bg-background px-4 py-2 text-left text-[1.3rem] font-normal text-muted-foreground hover:!bg-accent",
!date && "text-muted-foreground",
!dateValue && "text-muted-foreground",
)}
disabled={disabled}
>
<CalendarIcon className="!size-[1.6rem]" />
{date?.from ? (
date.to ? (
{dateValue?.from ? (
dateValue.to ? (
<>
{format(date.from, "yyyy-MM-dd")} ~{" "}
{format(date.to, "yyyy-MM-dd")}
{format(dateValue.from, "yyyy-MM-dd")} ~{" "}
{format(dateValue.to, "yyyy-MM-dd")}
</>
) : (
format(date.from, "yyyy-MM-dd")
format(dateValue.from, "yyyy-MM-dd")
)
) : (
<span>기간 선택</span>
@@ -56,14 +74,17 @@ export function DateRangePicker({
</Button>
</PopoverTrigger>
<PopoverContent className="w-auto p-0" align="start">
<Calendar
initialFocus
mode="range"
defaultMonth={date?.from}
selected={date}
onSelect={handleSelect}
numberOfMonths={2}
/>
<div>
{children}
<Calendar
initialFocus
mode="range"
defaultMonth={dateValue?.from}
selected={dateValue}
onSelect={handleSelect}
numberOfMonths={2}
/>
</div>
</PopoverContent>
</Popover>
</div>
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
import { images } from "@common/assets";
import { getConfig } from "@common/config";
import { ENDPOINT } from "../../config";
import { getCookie, setCookie } from "../../lib";
import { setCookie } from "../../lib";
import { getSiteInfo, getUserInfo } from "../../api";
import {
DropdownMenu,
@@ -12,14 +12,12 @@ import {
} from "../dropdown-menu";
import { Button } from "../button";
const { AUTH_USER_ID, SITE_ID } = getConfig();
const { SITE_ID } = getConfig();
export function Header({ viewOnly }: { viewOnly?: boolean }) {
const userUniqId = getCookie(AUTH_USER_ID ?? "") ?? "";
const { data: userInfo } = useQuery({
queryKey: [ENDPOINT.USER_SERVICE.USERS],
queryFn: () => getUserInfo(userUniqId),
queryFn: () => getUserInfo(),
enabled: !viewOnly,
});
@@ -1,6 +1,7 @@
export * from "./accordion";
export * from "./badge";
export * from "./button";
export * from "./button-group";
export * from "./calendar";
export * from "./carousel";
export * from "./checkbox";
@@ -7,7 +7,7 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
return (
<input
className={cn(
"flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
"flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-base text-foreground ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
className,
)}
ref={ref}
@@ -9,7 +9,7 @@ const Textarea = React.forwardRef<
return (
<textarea
className={cn(
"flex min-h-[6rem] w-full rounded-md border border-input bg-transparent p-3 text-base placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
"flex min-h-[6rem] w-full rounded-md border border-input bg-transparent p-3 text-base text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
className,
)}
ref={ref}