diff --git a/.env b/.env index 95cc584..f1d830a 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ VITE_REQUEST_BASE_URL=https://wzpmc.cn:18080 -# VITE_WEBSOCKET_BASE_URL=ws://172.16.114.84:58080 +# VITE_REQUEST_BASE_URL=http://172.16.114.84:58082 VITE_WEBSOCKET_BASE_URL=wss://wzpmc.cn:18080 +# VITE_WEBSOCKET_BASE_URL=ws://172.16.114.84:58082 diff --git a/index.html b/index.html index 571618d..c56af0e 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + 社团展示系统 diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..48f3876 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/public/gobang.svg b/public/gobang.svg index 83bb4ad..22b1e94 100644 --- a/public/gobang.svg +++ b/public/gobang.svg @@ -1 +1,32 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index 2a0138f..0f17399 100644 --- a/src/App.vue +++ b/src/App.vue @@ -100,7 +100,9 @@ display: flex; } .app-router-component { - --el-main-padding: 0; + &:not(.keep-padding) { + --el-main-padding: 0; + } } .app-router-view-enter-active, .app-router-view-leave-active { @@ -113,7 +115,7 @@ } diff --git a/src/api/index.ts b/src/api/index.ts index ab52281..0552134 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,18 +1,10 @@ import { REQUEST_BASE_URL } from '@/env'; -import { - userInfoRespSchema, - userInfoRespSchemaNullable, - type AnyRespSchema, - type SucceedRespOf, - type SucceedUserInfoResp, - type SucceedUserInfoRespNullable, -} from '@/schemas/response'; +import { userInfoRespSchema, type AnyRespSchema, type SucceedRespOf } from '@/schemas/response'; import { useUserStore } from '@/stores/user'; -import type { Nullable, Override } from '@/utils/types'; +import type { Override } from '@/utils/types'; import axios, { type AxiosError, type AxiosRequestConfig, type Method } from 'axios'; import { ElMessage } from 'element-plus'; import type { z } from 'zod'; - export const axiosInstance = axios.create({ baseURL: REQUEST_BASE_URL, }); @@ -25,7 +17,7 @@ axiosInstance.interceptors.request.use((config) => { // 自动获取响应中的token. axiosInstance.interceptors.response.use((response) => { const userStore = useUserStore(); - const authorization = response.headers['set-authorization'] as string | undefined; + const authorization = response.headers['add-authorization'] as string | undefined; if (authorization) { console.log(123); userStore.token = authorization; @@ -47,7 +39,7 @@ export function parseRawResp( if (!raw) return; const resp = schema.parse(raw); if (resp.type === 'error') { - ElMessage.error(errorMessage(errorDescription, resp.code, resp.msg)); + ElMessage.error(errorMessage(errorDescription, resp.status, resp.msg)); return; } return resp as any; @@ -69,18 +61,13 @@ export async function request( errorDescription, ); } -export async function getUserInfo(): Promise; -export async function getUserInfo(userID: number): Promise; export async function getUserInfo(userID?: number) { let url = '/api/user/info'; if (userID !== undefined) { url += `/${userID}`; } - const resp = await request( - url, - userID !== undefined ? userInfoRespSchemaNullable : userInfoRespSchema, - ); + const resp = await request(url, userInfoRespSchema, { errorDescription: '获取用户信息失败' }); return resp; } -export const getAvatarURL = (avatar: Nullable) => - (avatar && `${import.meta.env.VITE_REQUEST_BASE_URL}/api/user/avatar/${avatar}`) ?? undefined; +export const getAvatarURL = (avatar: string | undefined) => + avatar && `${REQUEST_BASE_URL}/api/user/avatar/${avatar}`; diff --git a/src/components/app/LoginRegisterDialog.vue b/src/components/app/LoginRegisterDialog.vue index ac20220..b3a7813 100644 --- a/src/components/app/LoginRegisterDialog.vue +++ b/src/components/app/LoginRegisterDialog.vue @@ -167,7 +167,7 @@ const show = defineModel({ default: false }); const loginRegisterDialogActiveName = ref('login'); const loginFormRef = ref(); const loginFormData = reactive({ - username: 'wubaopu2', + username: 'wubaopu1', password: '123456', verifyImage: 'none' as VerifyImagePath, verifyCode: '', diff --git a/src/components/user/UserMenu.vue b/src/components/user/UserMenu.vue new file mode 100644 index 0000000..9ec816f --- /dev/null +++ b/src/components/user/UserMenu.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/env.ts b/src/env.ts index 4402e17..0835bd7 100644 --- a/src/env.ts +++ b/src/env.ts @@ -1,4 +1,6 @@ -// export const DEV = import.meta.env.DEV; -export const DEV = false; +export const DEV = import.meta.env.DEV; export const REQUEST_BASE_URL = import.meta.env.VITE_REQUEST_BASE_URL; export const WEBSOCKET_BASE_URL = import.meta.env.VITE_WEBSOCKET_BASE_URL; +interface A { + a(this: HTMLElement & A): this; +} diff --git a/src/schemas/response.ts b/src/schemas/response.ts index 9b3e88f..db11d4c 100644 --- a/src/schemas/response.ts +++ b/src/schemas/response.ts @@ -4,9 +4,9 @@ function createRespSchema(data: T) { return z.union([ z .object({ - code: z.number().min(200).max(299), + status: z.number().min(200).max(299), msg: z.string(), - time: z.coerce.date(), + timestamp: z.coerce.date(), }) .extend({ data: data }) .transform((raw) => @@ -16,9 +16,9 @@ function createRespSchema(data: T) { ), z .object({ - code: z.number(), + status: z.number(), msg: z.string(), - time: z.coerce.date(), + timestamp: z.coerce.date(), }) .transform((raw) => Object.assign(raw, { @@ -32,8 +32,6 @@ export type SucceedRespOf = Extract; export type ErrorRespOf = Exclude, T>; export type AnyRespSchema = ReturnType; export const ordinarySchema = createRespSchema(z.literal(true)); -export const loginRespSchema = ordinarySchema; -export const registerRespSchema = ordinarySchema; export const idAndNameSchema = z.object({ id: z.number(), name: z.string(), @@ -43,20 +41,20 @@ const authSchema = idAndNameSchema.extend({ permissions: idAndNameSchema.array(), }); const userInfoDataSchema = idAndNameSchema.extend({ - avatar: z.nullable(z.string()), + avatar: z.optional(z.string()), auth: authSchema, - club: z.nullable( + club: z.optional( idAndNameSchema.extend({ commit: z.string(), - auth: authSchema, }), ), + chubAuth: z.optional(authSchema), }); export const userInfoRespSchema = createRespSchema(userInfoDataSchema); -export const userInfoRespSchemaNullable = createRespSchema(userInfoDataSchema.nullable()); export type SucceedUserInfoResp = SucceedRespOf>; -export type SucceedUserInfoRespNullable = SucceedRespOf>; export type UserInfo = SucceedUserInfoResp['data']; +export const loginRespSchema = userInfoRespSchema; +export const registerRespSchema = userInfoRespSchema; export const verifyRespSchema = createRespSchema( z .object({ diff --git a/src/stores/user.ts b/src/stores/user.ts index 3f7f191..c0d1d88 100644 --- a/src/stores/user.ts +++ b/src/stores/user.ts @@ -4,6 +4,7 @@ import type { UserInfo } from '@/schemas/response'; import { type idAndNameSchema } from '@/schemas/response'; import type { MaybePromise } from '@/utils/types'; import { StorageSerializers, useLocalStorage } from '@vueuse/core'; +import { ElMessage } from 'element-plus'; import { defineStore } from 'pinia'; import { computed, ref, watch } from 'vue'; import { z } from 'zod'; @@ -59,6 +60,7 @@ export const useUserStore = defineStore('user', () => { if (!res.every((r) => r === undefined || r)) return false; token.value = null; await updateSelfUserInfo(); + ElMessage.info('退出成功'); return true; } return { diff --git a/src/utils/game-socket.ts b/src/utils/game-socket.ts index 9c70de5..8f42364 100644 --- a/src/utils/game-socket.ts +++ b/src/utils/game-socket.ts @@ -37,6 +37,7 @@ export interface UseGameSocketOptions< // 只有拥有依赖关系的请求才可以有finally [P in keyof TRelations]?: (error: boolean) => void; }; + disconnected?(): void; } export function useGameSocket, TResp extends BaseResp>() { return >( @@ -102,7 +103,6 @@ export function useGameSocket, TResp extends } }, onDisconnected(_, ev) { - console.log('disconnected'); // 正常断开 if (ev.code === 1000) return; ElMessage.error(`连接已断开：${ev.reason}`); diff --git a/src/views/GobangPlayPage.vue b/src/views/GobangPlayPage.vue index cca66c5..90ca526 100644 --- a/src/views/GobangPlayPage.vue +++ b/src/views/GobangPlayPage.vue @@ -247,13 +247,9 @@ const userStore = useUserStore(); const { smLess, mdLess } = storeToRefs(useMediaStore()); let canExit = false; let confirming = false; -useLogoutInterceptor(() => { - if (confirming) { - return; - } - if (canExit || matchState.value !== MatchState.GAMING) return true; +function confirm(description: string) { confirming = true; - ElMessageBox.confirm('你正在游戏中, 是否退出登录?', '警告', { + return ElMessageBox.confirm(description, '警告', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -261,15 +257,21 @@ useLogoutInterceptor(() => { .then((action: Action) => { if (action !== 'confirm') return; canExit = true; - confirming = false; - return userStore.logout(); }) - .catch(() => { + .catch(() => {}) + .finally(() => { confirming = false; }); - return false; +} +useLogoutInterceptor(async () => { + if (confirming) { + return; + } + if (canExit || matchState.value !== MatchState.GAMING) return true; + await confirm('你正在游戏中, 是否退出登录?'); + return canExit; }); -onBeforeRouteLeave((to, _, next) => { +onBeforeRouteLeave(async (_, __, next) => { if (confirming) { next(false); return; @@ -279,21 +281,8 @@ onBeforeRouteLeave((to, _, next) => { return; } confirming = true; - ElMessageBox.confirm('你正在游戏中, 是否退出房间?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }) - .then((action: Action) => { - if (action !== 'confirm') return; - canExit = true; - confirming = false; - router.push(to); - }) - .catch(() => { - confirming = false; - }); - next(false); + await confirm('你正在游戏中, 是否退出房间?'); + next(canExit); }); const roomId = useRoute().params.id as RoomId | undefined; const canvas = ref(); @@ -421,9 +410,7 @@ const otherUser = computed(() => { }); watch( () => otherUser.value?.id, - () => { - updateMatchState(); - }, + () => updateMatchState(), ); const white = ref(false); const grid = computed(() => diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index 5f618ce..a10698c 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -1,12 +1,19 @@ - +