Skip to content

Commit d9635f8

Browse files
pan93412pan93412
committed
style: reformat codebase
1 parent 66d5401 commit d9635f8

File tree

14 files changed

+135
-127
lines changed

14 files changed

+135
-127
lines changed

‎app/(admin)/(activity-management)/events/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
3-
import { EventsDataTable } from "./_components/data-table";
44
import { Suspense } from "react";
5-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
5+
import { EventsDataTable } from "./_components/data-table";
66

77
export const metadata: Metadata = {
88
title: "事件管理",

‎app/(admin)/(activity-management)/points/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
3-
import { PointsDataTable } from "./_components/data-table";
44
import { Suspense } from "react";
5-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
5+
import { PointsDataTable } from "./_components/data-table";
66

77
export const metadata: Metadata = {
88
title: "積分管理",

‎app/(admin)/(activity-management)/submissions/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
3-
import { SubmissionsDataTable } from "./_components/data-table";
44
import { Suspense } from "react";
5-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
5+
import { SubmissionsDataTable } from "./_components/data-table";
66

77
export const metadata: Metadata = {
88
title: "提交記錄",

‎app/(admin)/(question-management)/database/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
4+
import { Suspense } from "react";
35
import { CreateDatabaseTrigger } from "./_components/create";
46
import { DatabaseDataTable } from "./_components/data-table";
5-
import { Suspense } from "react";
6-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
77

88
export const metadata: Metadata = {
99
title: "資料庫",

‎app/(admin)/(question-management)/questions/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
4+
import { Suspense } from "react";
35
import { CreateQuestionTrigger } from "./_components/create";
46
import { QuestionsDataTable } from "./_components/data-table";
5-
import { Suspense } from "react";
6-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
77

88
export const metadata: Metadata = {
99
title: "題庫",

‎app/(admin)/(user-management)/groups/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
4+
import { Suspense } from "react";
35
import { CreateGroupTrigger } from "./_components/create";
46
import { GroupDataTable } from "./_components/data-table";
5-
import { Suspense } from "react";
6-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
77

88
export const metadata: Metadata = {
99
title: "群組",

‎app/(admin)/(user-management)/scopesets/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
4+
import { Suspense } from "react";
35
import { CreateScopeSetTrigger } from "./_components/create";
46
import { ScopeSetDataTable } from "./_components/data-table";
5-
import { Suspense } from "react";
6-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
77

88
export const metadata: Metadata = {
99
title: "權限集",

‎app/(admin)/(user-management)/users/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { DataTableSkeleton } from "@/components/data-table/skeleton";
12
import { SiteHeader } from "@/components/site-header";
23
import type { Metadata } from "next";
3-
import { UsersDataTable } from "./_components/data-table";
44
import { Suspense } from "react";
5-
import { DataTableSkeleton } from "@/components/data-table/skeleton";
5+
import { UsersDataTable } from "./_components/data-table";
66

77
export const metadata: Metadata = {
88
title: "使用者",

‎app/(admin)/_components/login-count.tsx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
"use client";
22

3+
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
4+
import { Skeleton } from "@/components/ui/skeleton";
5+
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
36
import { graphql } from "@/gql";
4-
import { SubmissionStatus, type SubmissionWhereInput } from "@/gql/graphql";
7+
import { type SubmissionWhereInput } from "@/gql/graphql";
58
import { useLazyQuery } from "@apollo/client/react";
69
import { useEffect, useState } from "react";
7-
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
8-
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
9-
import { Checkbox } from "@/components/ui/checkbox";
10-
import { Label } from "@/components/ui/label";
11-
import { Skeleton } from "@/components/ui/skeleton";
1210

1311
const LOGIN_TOTAL_COUNT_QUERY = graphql(`
1412
query LoginTotalCount($where: EventWhereInput!) {
@@ -43,11 +41,11 @@ export default function LoginTotalCount() {
4341
},
4442
all: {},
4543
};
46-
44+
4745
const where = {
4846
...timeRangeWhere[timeRange],
4947
type: "login",
50-
}
48+
};
5149

5250
getLoginTotalCount({ variables: { where } });
5351
}, [timeRange, getLoginTotalCount]);
@@ -71,7 +69,7 @@ export default function LoginTotalCount() {
7169
</TabsList>
7270
<TabsContent value={timeRange} className="mt-4">
7371
<div className="flex items-end gap-2 text-3xl font-bold">
74-
{!loading && (data?.events.totalCount?.toLocaleString('zh-TW') ?? 0)}
72+
{!loading && (data?.events.totalCount?.toLocaleString("zh-TW") ?? 0)}
7573
{loading && <Skeleton className="h-8 w-24" />}
7674
</div>
7775
<p className="mt-1 text-sm text-muted-foreground">

‎app/(admin)/_components/rank.tsx‎

Lines changed: 58 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
"use client";
22

3-
import { graphql, useFragment, type FragmentType } from "@/gql";
3+
import DataTablePagination from "@/components/data-table/pagination";
4+
import { Badge } from "@/components/ui/badge";
5+
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
6+
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
7+
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
8+
import { type FragmentType, graphql, useFragment } from "@/gql";
49
import { RankingBy, RankingOrder, RankingPeriod } from "@/gql/graphql";
510
import { useSuspenseQuery } from "@apollo/client/react";
611
import { useState } from "react";
7-
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
8-
import {
9-
Select,
10-
SelectContent,
11-
SelectItem,
12-
SelectTrigger,
13-
SelectValue,
14-
} from "@/components/ui/select";
15-
import {
16-
Table,
17-
TableBody,
18-
TableCell,
19-
TableHead,
20-
TableHeader,
21-
TableRow,
22-
} from "@/components/ui/table";
23-
import DataTablePagination from "@/components/data-table/pagination";
24-
import { Badge } from "@/components/ui/badge";
2512

2613
const OVERVIEW_RANKING_QUERY = graphql(`
2714
query OverviewRanking($filter: RankingFilter!, $first: Int!, $after: Cursor) {
@@ -93,10 +80,10 @@ export default function OverviewRanking() {
9380

9481
const [rankingBy, setRankingBy] = useState<RankingBy>(RankingBy.Points);
9582
const [rankingOrder, setRankingOrder] = useState<RankingOrder>(
96-
RankingOrder.Desc
83+
RankingOrder.Desc,
9784
);
9885
const [rankingPeriod, setRankingPeriod] = useState<RankingPeriod>(
99-
RankingPeriod.Daily
86+
RankingPeriod.Daily,
10087
);
10188
const [cursors, setCursors] = useState<string[]>([]);
10289

@@ -170,7 +157,7 @@ export default function OverviewRanking() {
170157
<SelectItem key={value} value={value}>
171158
{label}
172159
</SelectItem>
173-
)
160+
),
174161
)}
175162
</SelectContent>
176163
</Select>
@@ -194,7 +181,7 @@ export default function OverviewRanking() {
194181
<SelectItem key={value} value={value}>
195182
{label}
196183
</SelectItem>
197-
)
184+
),
198185
)}
199186
</SelectContent>
200187
</Select>
@@ -213,48 +200,48 @@ export default function OverviewRanking() {
213200
</TableRow>
214201
</TableHeader>
215202
<TableBody>
216-
{data.ranking.edges.length === 0 ? (
217-
<TableRow>
218-
<TableCell
219-
colSpan={3}
220-
className={`text-center text-muted-foreground`}
221-
>
222-
無資料
223-
</TableCell>
224-
</TableRow>
225-
) : (
226-
data.ranking.edges.map((edge, index) => {
227-
const rank = index + 1 + cursors.length * PAGE_SIZE;
228-
return (
229-
<TableRow key={edge.node.id}>
230-
<TableCell>
231-
{rank <= 3 ? (
232-
<Badge
233-
variant={
234-
rank === 1
235-
? "default"
236-
: rank === 2
237-
? "secondary"
238-
: "outline"
239-
}
240-
className="font-bold"
241-
>
242-
#{rank}
243-
</Badge>
244-
) : (
245-
<span className="text-muted-foreground">#{rank}</span>
246-
)}
247-
</TableCell>
248-
<TableCell className="font-medium">
249-
{edge.node.name}
250-
</TableCell>
251-
<TableCell className="text-right font-semibold">
252-
<ScoreCell userFragment={edge} rankingBy={rankingBy} />
253-
</TableCell>
254-
</TableRow>
255-
);
256-
})
257-
)}
203+
{data.ranking.edges.length === 0
204+
? (
205+
<TableRow>
206+
<TableCell
207+
colSpan={3}
208+
className={`text-center text-muted-foreground`}
209+
>
210+
無資料
211+
</TableCell>
212+
</TableRow>
213+
)
214+
: (
215+
data.ranking.edges.map((edge, index) => {
216+
const rank = index + 1 + cursors.length * PAGE_SIZE;
217+
return (
218+
<TableRow key={edge.node.id}>
219+
<TableCell>
220+
{rank <= 3
221+
? (
222+
<Badge
223+
variant={rank === 1
224+
? "default"
225+
: rank === 2
226+
? "secondary"
227+
: "outline"}
228+
className="font-bold"
229+
>
230+
#{rank}
231+
</Badge>
232+
)
233+
: <span className="text-muted-foreground">#{rank}</span>}
234+
</TableCell>
235+
<TableCell className="font-medium">
236+
{edge.node.name}
237+
</TableCell>
238+
<TableCell className="text-right font-semibold">
239+
<ScoreCell userFragment={edge} rankingBy={rankingBy} />
240+
</TableCell>
241+
</TableRow>
242+
);
243+
})
244+
)}
258245
</TableBody>
259246
</Table>
260247

@@ -271,17 +258,20 @@ export default function OverviewRanking() {
271258
);
272259
}
273260

274-
function ScoreCell({ userFragment, rankingBy }: { userFragment: FragmentType<typeof SCORE_CELL_FRAGMENT>, rankingBy: RankingBy }) {
261+
function ScoreCell(
262+
{ userFragment, rankingBy }: { userFragment: FragmentType<typeof SCORE_CELL_FRAGMENT>; rankingBy: RankingBy },
263+
) {
275264
const user = useFragment(SCORE_CELL_FRAGMENT, userFragment);
276265

277266
const components = {
278267
[RankingBy.Points]: <TotalPoints userFragment={user} />,
279268
[RankingBy.CompletedQuestions]: <CompletedQuestion userFragment={user} />,
280-
}
269+
};
281270

282271
return (
283272
<span className="font-semibold">
284-
{components[rankingBy] ?? <span className="text-red-800">發現未定義的排序依據 {rankingBy}</span>}{' | '}
273+
{components[rankingBy] ?? <span className="text-red-800">發現未定義的排序依據 {rankingBy}</span>}
274+
{" | "}
285275
<ScoreDiff userFragment={user} />
286276
</span>
287277
);

0 commit comments

Comments
 (0)