extract type

This commit is contained in:
notmd
2023-02-01 14:34:47 +07:00
parent f569c6d12b
commit c8cd869594
2 changed files with 8 additions and 5 deletions
@@ -20,8 +20,10 @@ import { TaskCategory, TaskInfo, TaskType } from "src/types/Task";
import { TaskCategoryLabels, TaskInfos } from "../Tasks/TaskTypes";
export type TaskCategoryItem = { taskType: TaskType; count: number };
export interface TasksOptionProps {
content: Partial<Record<TaskCategory, Array<{ taskType: TaskType; count: number }>>>;
content: Partial<Record<TaskCategory, TaskCategoryItem[]>>;
}
export const TaskOption = ({ content }: TasksOptionProps) => {
@@ -40,7 +42,7 @@ export const TaskOption = ({ content }: TasksOptionProps) => {
return (
<Box className="flex flex-col gap-14">
{Object.entries(content).map(([category, taskTypes]) => (
{Object.entries(content).map(([category, items]) => (
<div key={category}>
<Flex>
<Heading size="lg" className="pb-4">
@@ -52,7 +54,7 @@ export const TaskOption = ({ content }: TasksOptionProps) => {
</ExternalLink>
</Flex>
<SimpleGrid columns={[1, 1, 2, 2, 3, 4]} gap={4}>
{taskTypes
{items
.map(({ taskType, count }) => ({ ...taskInfoMap[taskType], count }))
.map((item) => (
<Link key={category + item.id} href={item.pathname}>
+3 -2
View File
@@ -5,8 +5,9 @@ import { useEffect, useMemo, useState } from "react";
import { LeaderboardWidget, TaskOption, WelcomeCard } from "src/components/Dashboard";
import { getDashboardLayout } from "src/components/Layout";
import { get } from "src/lib/api";
import { AvailableTasks, TaskCategory, TaskType } from "src/types/Task";
import { AvailableTasks, TaskCategory } from "src/types/Task";
export { getDefaultStaticProps as getStaticProps } from "src/lib/default_static_props";
import { TaskCategoryItem } from "src/components/Dashboard/TaskOption";
import useSWR from "swr";
const Dashboard = () => {
@@ -59,4 +60,4 @@ const filterAvailableTasks = (availableTasks: Partial<AvailableTasks>) =>
Object.entries(availableTasks)
.filter(([, count]) => count > 0)
.sort((a, b) => b[1] - a[1])
.map(([taskType, count]) => ({ taskType, count })) as Array<{ taskType: TaskType; count: number }>;
.map(([taskType, count]) => ({ taskType, count })) as TaskCategoryItem[];