Merge branch 'iipbs/st/dev'
This commit is contained in:
@@ -43,7 +43,7 @@ export function getInitialPanels({
|
||||
// },
|
||||
{
|
||||
id: "panel-d",
|
||||
component: <ScheduleCalendarPanel />,
|
||||
component: <UnSubmitPanel params={dashboardParams} />,
|
||||
className: "",
|
||||
},
|
||||
{
|
||||
@@ -53,7 +53,7 @@ export function getInitialPanels({
|
||||
},
|
||||
{
|
||||
id: "panel-f",
|
||||
component: <UnSubmitPanel params={dashboardParams} />,
|
||||
component: <ScheduleCalendarPanel />,
|
||||
className: "",
|
||||
},
|
||||
];
|
||||
|
||||
@@ -69,9 +69,11 @@ const columnHelper = createColumnHelper<PstRecentListResponse>();
|
||||
|
||||
const noticeColumns = [
|
||||
columnHelper.accessor("pstTtl", {
|
||||
header: "제목",
|
||||
header: () => <div className="text-left">제목</div>,
|
||||
cell: ({ row }) => (
|
||||
<div className="min-w-[20rem] truncate">{row.original.pstTtl}</div>
|
||||
<div className="min-w-[20rem] truncate px-2 text-left">
|
||||
{row.original.pstTtl}
|
||||
</div>
|
||||
),
|
||||
}),
|
||||
columnHelper.accessor("wrtrNm", {
|
||||
|
||||
@@ -40,20 +40,6 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
|
||||
title="헤더를 드래그하여 패널 순서 변경"
|
||||
>
|
||||
<h3 className="text-2xl font-semibold">일정안내</h3>
|
||||
{data && (
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-xl tracking-tight">
|
||||
{data.ddayLabel}
|
||||
</span>
|
||||
<Badge
|
||||
size="lg"
|
||||
color="orange"
|
||||
className="rounded-full !px-3 text-xl font-semibold"
|
||||
>
|
||||
{data.dday}
|
||||
</Badge>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="card-body max-h-[calc(100%-3.25rem)] py-2.5">
|
||||
{isLoading && (
|
||||
@@ -129,6 +115,17 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center justify-center gap-4 py-4 tracking-tight">
|
||||
<span className="text-3xl font-semibold">
|
||||
{data.ddayLabel}
|
||||
</span>
|
||||
<Badge
|
||||
size="lg"
|
||||
className="rounded-sm !py-4 !text-5xl font-bold"
|
||||
>
|
||||
{data.dday}
|
||||
</Badge>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -66,7 +66,7 @@ export function StatsSubmissionPanel({ params }: StatsSubmissionPanelProps) {
|
||||
)}
|
||||
<div className="h-full">
|
||||
{data && (
|
||||
<div className="flex h-full flex-col items-center gap-4">
|
||||
<div className="flex h-full flex-col items-center gap-2">
|
||||
{/* 통계제출률 상태 이모지 */}
|
||||
<div className="flex justify-center">
|
||||
{
|
||||
@@ -95,7 +95,7 @@ export function StatsSubmissionPanel({ params }: StatsSubmissionPanelProps) {
|
||||
</div>
|
||||
<Progress
|
||||
value={data.submissionRate}
|
||||
className="h-6 bg-muted"
|
||||
className="h-10 bg-muted"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user