diff --git a/Dockerfile b/Dockerfile index 77084ec..aaa0d16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/package.json b/package.json index 1f11ac5..3a9f32e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ "@fullcalendar/react": "^6.1.17", "@headlessui/vue": "^1.7.23", "@heroui/react": "2.7.6", + "@internationalized/date": "^3.8.1", "@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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 141859e..ec5bdad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,9 +38,15 @@ importers: '@heroui/react': specifier: 2.7.6 version: 2.7.6(@types/react@18.3.20)(framer-motion@11.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwindcss@3.4.17) + '@internationalized/date': + specifier: ^3.8.1 + version: 3.8.1 '@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) @@ -1465,8 +1471,8 @@ packages: '@internationalized/date@3.7.0': resolution: {integrity: sha512-VJ5WS3fcVx0bejE/YHfbDKR/yawZgKqn/if+oEeLqNwBtPzVB06olkfcnojTmEMX+gTpH+FlQ69SHNitJ8/erQ==} - '@internationalized/date@3.8.0': - resolution: {integrity: sha512-J51AJ0fEL68hE4CwGPa6E0PO6JDaVLd8aln48xFCSy7CZkZc96dGEGmLs2OEEbBxcsVZtfrqkXJwI2/MSG8yKw==} + '@internationalized/date@3.8.1': + resolution: {integrity: sha512-PgVE6B6eIZtzf9Gu5HvJxRK3ufUFz9DhspELuhW/N0GuMGMTLvPQNRkHP2hTuP9lblOk+f+1xi96sPiPXANXAA==} '@internationalized/message@3.1.7': resolution: {integrity: sha512-gLQlhEW4iO7DEFPf/U7IrIdA3UyLGS0opeqouaFwlMObLUzwexRjbygONHDVbC9G9oFLXsLyGKYkJwqXw/QADg==} @@ -1866,6 +1872,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 +2151,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: @@ -7395,7 +7411,7 @@ snapshots: dependencies: '@swc/helpers': 0.5.17 - '@internationalized/date@3.8.0': + '@internationalized/date@3.8.1': dependencies: '@swc/helpers': 0.5.17 @@ -7513,7 +7529,7 @@ snapshots: '@react-aria/calendar@3.7.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@internationalized/date': 3.7.0 + '@internationalized/date': 3.8.1 '@react-aria/i18n': 3.12.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-aria/interactions': 3.24.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-aria/live-announcer': 3.4.2 @@ -7565,7 +7581,7 @@ snapshots: '@react-aria/datepicker@3.14.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@internationalized/date': 3.7.0 + '@internationalized/date': 3.8.1 '@internationalized/number': 3.6.1 '@internationalized/string': 3.2.6 '@react-aria/focus': 3.20.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -7657,7 +7673,7 @@ snapshots: '@react-aria/i18n@3.12.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@internationalized/date': 3.8.0 + '@internationalized/date': 3.8.1 '@internationalized/message': 3.1.7 '@internationalized/number': 3.6.1 '@internationalized/string': 3.2.6 @@ -7670,7 +7686,7 @@ snapshots: '@react-aria/i18n@3.12.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@internationalized/date': 3.8.0 + '@internationalized/date': 3.8.1 '@internationalized/message': 3.1.7 '@internationalized/number': 3.6.1 '@internationalized/string': 3.2.6 @@ -8106,7 +8122,7 @@ snapshots: '@react-stately/calendar@3.7.1(react@18.3.1)': dependencies: - '@internationalized/date': 3.7.0 + '@internationalized/date': 3.8.1 '@react-stately/utils': 3.10.5(react@18.3.1) '@react-types/calendar': 3.6.1(react@18.3.1) '@react-types/shared': 3.28.0(react@18.3.1) @@ -8147,9 +8163,15 @@ 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 + '@internationalized/date': 3.8.1 '@internationalized/string': 3.2.6 '@react-stately/form': 3.1.3(react@18.3.1) '@react-stately/overlays': 3.6.15(react@18.3.1) @@ -8385,13 +8407,13 @@ snapshots: '@react-types/calendar@3.6.1(react@18.3.1)': dependencies: - '@internationalized/date': 3.7.0 + '@internationalized/date': 3.8.1 '@react-types/shared': 3.28.0(react@18.3.1) react: 18.3.1 '@react-types/calendar@3.7.0(react@18.3.1)': dependencies: - '@internationalized/date': 3.8.0 + '@internationalized/date': 3.8.1 '@react-types/shared': 3.29.0(react@18.3.1) react: 18.3.1 @@ -8412,7 +8434,7 @@ snapshots: '@react-types/datepicker@3.11.0(react@18.3.1)': dependencies: - '@internationalized/date': 3.7.0 + '@internationalized/date': 3.8.1 '@react-types/calendar': 3.7.0(react@18.3.1) '@react-types/overlays': 3.8.14(react@18.3.1) '@react-types/shared': 3.29.0(react@18.3.1) @@ -8509,6 +8531,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) diff --git a/src/components/Footer.astro b/src/components/Footer.astro index eb9827f..0b9b793 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -11,36 +11,57 @@ const year = date.getFullYear();
-
-
- - +
+
+
+ By NBTCA +
+
+ To be at the intersection of technology and liberal arts. +
+ +
+ 联系我们: + {SITE_EMAIL} +
-
作品
- 本站 - 维修管理 +
导航
+ 主页 + 文档
社媒
Github + QQ
-
-
友链
- N3ptune +
+
维修
+ 预约维修
+ +
+
-
-
- © {`2018-${year} ${SITE_NAME}`} - astro-air-blog -
-
- 浙ICP备2021030831号 +
+
+
+
+ Copyright © {`${year} ${SITE_NAME}`} +
+
diff --git a/src/components/header/NavigationUser.vue b/src/components/header/NavigationUser.vue index e1ad240..0189eb2 100644 --- a/src/components/header/NavigationUser.vue +++ b/src/components/header/NavigationUser.vue @@ -13,6 +13,11 @@ const onSignIn = async () => { postRedirectUri: window.location.pathname, }) } + +const onGoToAccountManage = async () => { + window.open("https://myid.app.nbtca.space/account/aboutme", "_blank") +} + const onSignOut = async () => { logtoClient.value?.signOut(import.meta.env.PUBLIC_LOGTO_REDIRECT_URL) } @@ -66,10 +71,47 @@ onMounted(() => {
+ + + diff --git a/src/components/header/RepairHeader.astro b/src/components/header/RepairHeader.astro index f6ae41d..a86df09 100644 --- a/src/components/header/RepairHeader.astro +++ b/src/components/header/RepairHeader.astro @@ -3,15 +3,34 @@ import NavigationUser from "./NavigationUser.vue" ---
维修 - +
+
+ +
+ +
diff --git a/src/consts.ts b/src/consts.ts index 04709de..3335637 100644 --- a/src/consts.ts +++ b/src/consts.ts @@ -1,5 +1,5 @@ export const SITE_TITLE = `拔电关机` export const SITE_EMAIL = "contact@nbtca.space" -export const SITE_NAME = "Computer Association" +export const SITE_NAME = "NingboTech University, Computer Association" export const SITE_DESCRIPTION = "Computer Association" export const SITE_URL = import.meta.env.PUBLIC_SITE_URL diff --git a/src/pages/posts/PhoNBT2024.md b/src/pages/posts/PhoNBT2024.md index c110aae..e401ce8 100644 --- a/src/pages/posts/PhoNBT2024.md +++ b/src/pages/posts/PhoNBT2024.md @@ -5,9 +5,7 @@ pubDate: 2024-06-18 description: ' “时间之河滚滚而去，青春韶华转瞬即逝”' author: 'kongbai' cover: - url: 'https://oss.nbtca.space/blog/clas/YQL05614-5xNq3t-mid-ulLkGV.jpeg' - square: 'https://www.apple.com.cn/newsroom/images/values/environment/Apple-Earth-Day-India-mangrove-Alibaug-canoe_Full-Bleed-Image.jpg.large_2x.jpg' - alt: 'cover' + url: 'https://oss.nbtca.space/blog/clas/YQL05614-5xNq3t-mid-ulLkGV.jpeg' tags: ["活动","志愿者", "新闻稿", "影留宁理","摄影","毕业"] theme: 'white' featured: true diff --git a/src/pages/posts/_assets/workSummary/IMG_0069.jpeg b/src/pages/posts/_assets/workSummary/IMG_0069.jpeg new file mode 100644 index 0000000..ddce41c Binary files /dev/null and b/src/pages/posts/_assets/workSummary/IMG_0069.jpeg differ diff --git a/src/pages/posts/_assets/workSummary/IMG_0069.jpg b/src/pages/posts/_assets/workSummary/IMG_0069.jpg deleted file mode 100755 index 25c4b72..0000000 Binary files a/src/pages/posts/_assets/workSummary/IMG_0069.jpg and /dev/null differ diff --git a/src/pages/posts/coldCarefulFun.md b/src/pages/posts/coldCarefulFun.md index c6dbe5a..06046fa 100644 --- a/src/pages/posts/coldCarefulFun.md +++ b/src/pages/posts/coldCarefulFun.md @@ -5,7 +5,7 @@ pubDate: 2024-10-15 description: "活动的一些片段" author: "kongbai" cover: - url: ./_assets/post20241016/free_huaji.jpg + url: https://oss.nbtca.space/blog/free_huaji_0F7NMW.jpg alt: "cover" tags: ["活动"] --- diff --git a/src/pages/posts/workSummary.md b/src/pages/posts/workSummary.md index f84e995..e809091 100644 --- a/src/pages/posts/workSummary.md +++ b/src/pages/posts/workSummary.md @@ -5,7 +5,7 @@ pubDate: 2025-01-12 description: ' 人类从历史中学到的唯一教训，就是人类无法从历史中学到任何教训' author: 'zzh0u' cover: - url: ./_assets/workSummary/IMG_0069.jpg + url: https://oss.nbtca.space/blog/IMG_0069_8xFcDr.jpeg tags: ["闲聊"] theme: 'white' featured: true diff --git a/src/pages/repair/EventAction.tsx b/src/pages/repair/EventAction.tsx new file mode 100644 index 0000000..950ee65 --- /dev/null +++ b/src/pages/repair/EventAction.tsx @@ -0,0 +1,313 @@ +import type { UserInfoResponse } from "@logto/browser" +import type { PublicMember } from "../../store/member" +import { EventStatus, type PublicEvent } from "../../types/event" +import { saturdayApiBaseUrl } from "../../utils/client" +import { Button, Form, Select, SelectItem, Textarea } from "@heroui/react" +import { useEffect, useState } from "react" + +export type IdentityContext = { + member: PublicMember + userInfo: UserInfoResponse + token: string +} + +enum RepairRole { + repairAdmin = "repair admin", + repairMember = "repair member", +} + +export type EventActionProps = { + event: PublicEvent + identityContext: IdentityContext + isLoading?: string + onUpdated: (event: PublicEvent) => void + onLoading: (loadingAction?: string) => void +} + +const EventSizeOptions: { + size: string + description?: string +}[] = [ + { size: "xs", description: "无需工具，仅简单排查或软件层级操作" }, + { size: "s", description: "简单拆装部件，操作快，风险低" }, + { size: "m", description: "需基本工具、一定技术判断，时间较长" }, + { size: "l", description: "较复杂的拆装和测试流程，需熟练技能、多人协作可能" }, + { size: "xl", description: "工作量极大，涉及多个设备，需团队作业和详细记录" }, +] + +const EventActionCommitForm = (props: { + formData: { + size: string + description: string + } + setFormData: (data: { + size: string + description: string + }) => void +}) => { + const { formData, setFormData } = props + return ( +
+ +