This commit is contained in:
Clas Wen 2025-05-24 01:14:46 +08:00
parent 53d6723dfb
commit 91666db1d7
10 changed files with 543 additions and 17 deletions

View file

@ -9,6 +9,6 @@ FROM base AS build
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
RUN pnpm run build
FROM nginx:alpine as deploy
FROM nginx:alpine AS deploy
COPY nginx.conf /etc/nginx/nginx.conf
COPY --from=build /app/dist /usr/share/nginx/html

View file

@ -25,6 +25,7 @@
"@headlessui/vue": "^1.7.23",
"@heroui/react": "2.7.6",
"@logto/browser": "^2.2.18",
"@react-stately/data": "^3.13.0",
"@stylistic/eslint-plugin": "^2.13.0",
"astro": "^4.16.18",
"dayjs": "^1.11.13",

View file

@ -41,6 +41,9 @@ importers:
'@logto/browser':
specifier: ^2.2.18
version: 2.2.18
'@react-stately/data':
specifier: ^3.13.0
version: 3.13.0(react@18.3.1)
'@stylistic/eslint-plugin':
specifier: ^2.13.0
version: 2.13.0(eslint@8.57.1)(typescript@5.8.3)
@ -1866,6 +1869,11 @@ packages:
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
'@react-stately/data@3.13.0':
resolution: {integrity: sha512-7LYPxVbWB6tvmLYKO19H5G5YtXV6eKCSXisOUiL9fVnOcGOPDK5z310sj9TP5vaX7zVPtwy0lDBUrZuRfhvQIQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
'@react-stately/datepicker@3.13.0':
resolution: {integrity: sha512-I0Y/aQraQyRLMWnh5tBZMiZ0xlmvPjFErXnQaeD7SdOYUHNtQS4BAQsMByQrMfg8uhOqUTKlIh7xEZusuqYWOA==}
peerDependencies:
@ -2140,6 +2148,11 @@ packages:
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
'@react-types/shared@3.29.1':
resolution: {integrity: sha512-KtM+cDf2CXoUX439rfEhbnEdAgFZX20UP2A35ypNIawR7/PFFPjQDWyA2EnClCcW/dLWJDEPX2U8+EJff8xqmQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
'@react-types/slider@3.7.10':
resolution: {integrity: sha512-Yb8wbpu2gS7AwvJUuz0IdZBRi6eIBZq32BSss4UHX0StA8dtR1/K4JeTsArxwiA3P0BA6t0gbR6wzxCvVA9fRw==}
peerDependencies:
@ -8143,6 +8156,12 @@ snapshots:
'@swc/helpers': 0.5.17
react: 18.3.1
'@react-stately/data@3.13.0(react@18.3.1)':
dependencies:
'@react-types/shared': 3.29.1(react@18.3.1)
'@swc/helpers': 0.5.17
react: 18.3.1
'@react-stately/datepicker@3.13.0(react@18.3.1)':
dependencies:
'@internationalized/date': 3.7.0
@ -8505,6 +8524,10 @@ snapshots:
dependencies:
react: 18.3.1
'@react-types/shared@3.29.1(react@18.3.1)':
dependencies:
react: 18.3.1
'@react-types/slider@3.7.10(react@18.3.1)':
dependencies:
'@react-types/shared': 3.29.0(react@18.3.1)

View file

@ -3,15 +3,34 @@ import NavigationUser from "./NavigationUser.vue"
---
<script>
const button = document.getElementById("repair-header")
button.addEventListener("click", () => {
window.location.href = "/repair"
})
import { validateRepairRole } from "../../pages/repair/RepairAdmin"
import { makeLogtoClient } from "../../utils/auth"
const button = document.getElementById("repair-header")
button.addEventListener("click", () => {
window.location.href = "/repair"
})
const adminButton = document.getElementById("repair-admin")
makeLogtoClient().getIdTokenClaims().then((claims) => {
const hasRole = validateRepairRole(claims.roles)
if (hasRole) {
adminButton.classList.remove("hidden")
}
else {
adminButton.classList.add("hidden")
}
})
</script>
<div class="box-border border-b sticky top-0 bg-white/80 backdrop-blur z-20 h-12">
<div class="h-full flex items-center justify-between text-lg max-w-[1024px] mx-auto px-[22px]">
<span id="repair-header" class="font-semibold select-none cursor-default">维修</span>
<NavigationUser client:load />
<div class="flex items-center">
<div class="flex items-center gap-2 mr-4 text-sm text-gray-500">
<a class="hidden text-gray-500" id="repair-admin" href="/repair/admin" class="appearance-none text-gray-500 cursor-pointer">维修管理</a>
</div>
<NavigationUser client:load />
</div>
</div>
</div>

View file

@ -46,20 +46,22 @@ function EventLogItem(props: {
)
}
function EventStatusChip(props: {
export function EventStatusChip(props: {
size?: "sm" | "md" | "lg"
status: string
}) {
const size = props.size || "md"
switch (props.status) {
case EventStatus.open:
return <Chip></Chip>
return <Chip size={size}></Chip>
case EventStatus.accepted:
return <Chip></Chip>
return <Chip size={size}></Chip>
case EventStatus.committed:
return <Chip color="primary"></Chip>
return <Chip size={size} color="primary"></Chip>
case EventStatus.closed:
return <Chip color="success"></Chip>
return <Chip size={size} color="success"></Chip>
case EventStatus.cancelled:
return <Chip></Chip>
return <Chip size={size}></Chip>
}
}
@ -121,7 +123,7 @@ export default function EventDetail(props: {
event
? (
<section className="box-border mb-24">
<div className="section-content mt-8">
<div className="mt-8">
<h2 className="text-2xl font-bold"></h2>
<div className="flex gap-2 items-center">
<span>
@ -130,7 +132,7 @@ export default function EventDetail(props: {
<EventStatusChip status={event.status}></EventStatusChip>
</div>
</div>
<div className="section-content my-8 flex flex-col gap-4">
<div className="my-8 flex flex-col gap-4">
<Textarea
label="问题描述"
readOnly

View file

@ -0,0 +1,465 @@
import {
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
User,
Pagination,
Spinner,
Popover,
PopoverTrigger,
PopoverContent,
Button,
CheckboxGroup,
Checkbox,
Drawer,
DrawerContent,
DrawerHeader,
DrawerBody,
DrawerFooter,
useDisclosure,
} from "@heroui/react"
import { useCallback, useEffect, useMemo, useState } from "react"
import { useAsyncList } from "@react-stately/data"
import type { components } from "../../types/saturday"
import { saturdayClient } from "../../utils/client"
import EventDetail, { EventStatusChip } from "./EventDetail"
import dayjs from "dayjs"
import { UserEventStatus } from "../../types/event"
import { makeLogtoClient } from "../../utils/auth"
type PublicEvent = components["schemas"]["PublicEvent"]
// type EventLog = components["schemas"]["EventLog"]
export const EyeIcon = (props) => {
return (
<svg
aria-hidden="true"
fill="none"
focusable="false"
height="1em"
role="presentation"
viewBox="0 0 20 20"
width="1em"
{...props}
>
<path
d="M12.9833 10C12.9833 11.65 11.65 12.9833 10 12.9833C8.35 12.9833 7.01666 11.65 7.01666 10C7.01666 8.35 8.35 7.01666 10 7.01666C11.65 7.01666 12.9833 8.35 12.9833 10Z"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<path
d="M9.99999 16.8916C12.9417 16.8916 15.6833 15.1583 17.5917 12.1583C18.3417 10.9833 18.3417 9.00831 17.5917 7.83331C15.6833 4.83331 12.9417 3.09998 9.99999 3.09998C7.05833 3.09998 4.31666 4.83331 2.40833 7.83331C1.65833 9.00831 1.65833 10.9833 2.40833 12.1583C4.31666 15.1583 7.05833 16.8916 9.99999 16.8916Z"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</svg>
)
}
export const DeleteIcon = (props) => {
return (
<svg
aria-hidden="true"
fill="none"
focusable="false"
height="1em"
role="presentation"
viewBox="0 0 20 20"
width="1em"
{...props}
>
<path
d="M17.5 4.98332C14.725 4.70832 11.9333 4.56665 9.15 4.56665C7.5 4.56665 5.85 4.64998 4.2 4.81665L2.5 4.98332"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<path
d="M7.08331 4.14169L7.26665 3.05002C7.39998 2.25835 7.49998 1.66669 8.90831 1.66669H11.0916C12.5 1.66669 12.6083 2.29169 12.7333 3.05835L12.9166 4.14169"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<path
d="M15.7084 7.61664L15.1667 16.0083C15.075 17.3166 15 18.3333 12.675 18.3333H7.32502C5.00002 18.3333 4.92502 17.3166 4.83335 16.0083L4.29169 7.61664"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<path
d="M8.60834 13.75H11.3833"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
<path
d="M7.91669 10.4167H12.0834"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</svg>
)
}
export const EditIcon = (props) => {
return (
<svg
aria-hidden="true"
fill="none"
focusable="false"
height="1em"
role="presentation"
viewBox="0 0 20 20"
width="1em"
{...props}
>
<path
d="M11.05 3.00002L4.20835 10.2417C3.95002 10.5167 3.70002 11.0584 3.65002 11.4334L3.34169 14.1334C3.23335 15.1084 3.93335 15.775 4.90002 15.6084L7.58335 15.15C7.95835 15.0834 8.48335 14.8084 8.74168 14.525L15.5834 7.28335C16.7667 6.03335 17.3 4.60835 15.4583 2.86668C13.625 1.14168 12.2334 1.75002 11.05 3.00002Z"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeMiterlimit={10}
strokeWidth={1.5}
/>
<path
d="M9.90833 4.20831C10.2667 6.50831 12.1333 8.26665 14.45 8.49998"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeMiterlimit={10}
strokeWidth={1.5}
/>
<path
d="M2.5 18.3333H17.5"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeMiterlimit={10}
strokeWidth={1.5}
/>
</svg>
)
}
function CheckboxPopover(props: {
value: string[]
onValueChange: (value: string[]) => void
}) {
// const [selectedValues, setSelectedValues] = useState([])
// const handleSelectionChange = (values) => {
// setSelectedValues(values)
// }
return (
<Popover placement="bottom">
<PopoverTrigger>
<Button size="sm" isIconOnly variant="bordered">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="size-6">
<path strokeLinecap="round" strokeLinejoin="round" d="M12 6.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 12.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 18.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5Z" />
</svg>
</Button>
</PopoverTrigger>
<PopoverContent>
<div className="p-2">
<CheckboxGroup
value={props.value}
onValueChange={props.onValueChange}
orientation="vertical"
>
{
UserEventStatus.map((status) => {
return (
<Checkbox key={status.status} value={status.status}>
<EventStatusChip size="sm" status={status.status} />
</Checkbox>
)
})
}
</CheckboxGroup>
</div>
</PopoverContent>
</Popover>
)
}
function TicketDetailDrawer(props: {
eventId: number
isOpen: boolean
onOpenChange: (isOpen: boolean) => void
onClose: () => void
onDelete: () => void
onEdit: () => void
}) {
const { isOpen, onOpenChange, onClose } = props
return (
<Drawer isOpen={isOpen} onOpenChange={onOpenChange}>
<DrawerContent>
<DrawerHeader>
<h2 className="text-2xl font-bold"></h2>
</DrawerHeader>
<DrawerBody>
<EventDetail eventId={props.eventId}></EventDetail>
</DrawerBody>
<DrawerFooter>
<Button variant="flat" onPress={onClose}>
</Button>
</DrawerFooter>
</DrawerContent>
</Drawer>
)
}
export const validateRepairRole = (roles: string[]) => {
const acceptableRoles = ["repair admin", "repair member"]
return roles.some(role => acceptableRoles.includes(role.toLowerCase()))
}
export default function App() {
const [isLoading, setIsLoading] = useState(true)
const [page, setPage] = useState(1)
const rowsPerPage = 15
// const [events, setEvents] = useState<PublicEvent[]>([])
const [statusFilter, setStatusFilter] = useState<string[]>([])
const { isOpen, onOpen, onOpenChange } = useDisclosure()
// const [userInfo, setUserInfo] = useState<UserInfoResponse>()
useEffect(() => {
const check = async () => {
const adminPath = "/repair/admin"
const authenticated = await makeLogtoClient().isAuthenticated()
if (!authenticated) {
window.location.href = `/repair/login-hint?redirectUrl=${adminPath}`
return
}
const res = await makeLogtoClient().getIdTokenClaims()
const hasRole = validateRepairRole(res.roles)
if (!hasRole) {
window.location.href = `/repair/login-hint?redirectUrl=${adminPath}`
return
}
// setUserInfo(res)
}
check()
}, [])
// const fetchAndSetEvent = async () => {
// const { data } = await saturdayClient.GET("/events", {
// params: {
// query: {
// order: "DESC",
// offset: 1,
// limit: 1000,
// },
// },
// })
// setEvents(data)
// }
const list = useAsyncList<PublicEvent>({
async load() {
const { data } = await saturdayClient.GET("/events", {
params: {
query: {
order: "DESC",
offset: 1,
limit: 1000,
},
},
})
setIsLoading(false)
return {
items: data,
}
},
async sort({ items, sortDescriptor }) {
return {
items: items.sort((a, b) => {
const first = a[sortDescriptor.column]
const second = b[sortDescriptor.column]
let cmp = (parseInt(first) || first) < (parseInt(second) || second) ? -1 : 1
if (sortDescriptor.direction === "descending") {
cmp *= -1
}
return cmp
}),
}
},
})
const items = useMemo(() => {
const start = (page - 1) * rowsPerPage
const end = start + rowsPerPage
if (statusFilter.length > 0) {
return list.items.filter(item => statusFilter.includes(item.status)).slice(start, end)
}
return list.items.slice(start, end)
}, [list, page, rowsPerPage, statusFilter])
const pages = useMemo(() => {
return Math.ceil(list.items.length / rowsPerPage)
}, [list, rowsPerPage])
// useEffect(() => {
// fetchAndSetEvent()
// }, [])
const columns = [
{
key: "eventId",
label: "单号",
},
{
key: "problem",
label: "问题描述",
},
{
key: "model",
label: "型号",
},
{
key: "memberId",
label: "处理人",
},
{
key: "gmtCreate",
label: "创建时间",
},
{
key: "status",
label: "状态",
content: (
<div className="flex items-center gap-2">
<CheckboxPopover value={statusFilter} onValueChange={setStatusFilter}></CheckboxPopover>
</div>
),
},
{
key: "actions",
label: "操作",
},
]
const [activeEventId, setActiveEventId] = useState<number>()
const onOpenEventDetail = (eventId: number) => {
setActiveEventId(eventId)
onOpen()
}
const renderCell = useCallback((event: PublicEvent, columnKey: string) => {
const cellValue = event[columnKey]
switch (columnKey) {
case "problem":
return (
<div className="max-w-40 line-clamp-2 overflow-hidden text-ellipsis">
{cellValue}
</div>
)
case "memberId":
return (
event.member
? (
<User
avatarProps={{ radius: "full", src: event.member.avatar, size: "sm" }}
name={event.member.alias}
>
{event.member.alias}
</User>
)
: <></>
)
case "gmtCreate":
return (
<span>
{dayjs(cellValue).format("YYYY-MM-DD HH:mm")}
</span>
)
case "status":
return EventStatusChip({
status: cellValue,
})
case "actions":
return (
<Button onPress={() => onOpenEventDetail(event.eventId)} size="sm" isIconOnly variant="light">
<span className="text-lg text-default-400 cursor-pointer active:opacity-50">
<EyeIcon />
</span>
</Button>
)
default:
return cellValue
}
}, [])
return (
<section className="box-border mb-24">
<div className="section-content mt-8">
<h2 className="text-2xl font-bold"></h2>
</div>
<div className="section-content my-8 flex flex-col gap-4">
<Table
aria-label="Example table with dynamic content"
sortDescriptor={list.sortDescriptor}
onSortChange={list.sort}
bottomContent={(
<div className="flex w-full justify-center">
<Pagination
isCompact
showControls
showShadow
color="secondary"
page={page}
total={pages}
onChange={page => setPage(page)}
/>
</div>
)}
>
<TableHeader columns={columns}>
{column => <TableColumn key={column.key} allowsSorting={column.allowSorting} children={column.content ?? <div>{column.label}</div>}></TableColumn>}
</TableHeader>
<TableBody isLoading={isLoading} items={items} loadingContent={<Spinner label="Loading..." />}>
{item => (
<TableRow key={item.eventId}>
{columnKey => <TableCell>{renderCell(item, columnKey)}</TableCell>}
</TableRow>
)}
</TableBody>
</Table>
</div>
<TicketDetailDrawer
eventId={activeEventId}
isOpen={isOpen}
onOpenChange={onOpenChange}
onClose={() => {
onOpenChange()
}}
onDelete={() => {}}
onEdit={() => {}}
>
</TicketDetailDrawer>
</section>
)
}

View file

@ -181,8 +181,9 @@ function TicketFormCreated(props: {
</div>
</Alert>
</div>
<EventDetail eventId={props.event?.eventId}></EventDetail>
<div className="section-content">
<EventDetail eventId={props.event?.eventId}></EventDetail>
</div>
</section>
)
}

View file

@ -0,0 +1,12 @@
---
import BaseLayout from "../../layouts/BaseLayout.astro"
import RepairHeader from "../../components/header/RepairHeader.astro"
import RepairAdmin from "./RepairAdmin"
---
<BaseLayout primaryTitle="Create Ticket">
<RepairHeader></RepairHeader>
<div>
<RepairAdmin client:only="react"></RepairAdmin>
</div>
</BaseLayout>

View file

@ -16,6 +16,9 @@ import RepairHeader from "../../components/header/RepairHeader.astro"
const logtoClient = makeLogtoClient()
const createRepairPath = "/repair/create-ticket"
const authenticated = await logtoClient.isAuthenticated()
logtoClient.getIdTokenClaims().then((res) => {
console.log(res)
})
if (!authenticated) {
window.location.href = `/repair/login-hint?redirectUrl=${createRepairPath}`
return

View file

@ -6,7 +6,7 @@ import EventDetail from "./EventDetail"
<BaseLayout primaryTitle="Create Ticket">
<RepairHeader></RepairHeader>
<div>
<div class="section-content">
<EventDetail client:only="react"></EventDetail>
</div>
</BaseLayout>