fix: collection name mismatch, login/register navigation, and connection config

- Fix teamSessions → team_sessions to match PocketBase collection name
- Replace <a @click> with <router-link> in Login and Register views
- Update PocketBase default URL and vite proxy target
- Comment out docker-compose user directive for permission fix

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
congsh
2026-04-17 19:28:53 +08:00
parent c5d5484f9e
commit 4dd15dceab
7 changed files with 17 additions and 26 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
// src/api/pocketbase.ts
import PocketBase from 'pocketbase'
const pbUrl = import.meta.env.VITE_PB_URL || '/api'
const pbUrl = import.meta.env.VITE_PB_URL || 'http://localhost:8090'
export const pb = new PocketBase(pbUrl)
+7 -7
View File
@@ -9,7 +9,7 @@ export async function createTeamSession(data: {
gameName: string
members: string[]
}): Promise<TeamSession> {
return pb.collection('teamSessions').create({
return pb.collection('team_sessions').create({
...data,
status: 'recruiting'
}) as unknown as TeamSession
@@ -20,7 +20,7 @@ export async function getActiveTeamSession(): Promise<TeamSession | null> {
const user = pb.authStore.model
if (!user) return null
const result = await pb.collection('teamSessions').getList(1, 1, {
const result = await pb.collection('team_sessions').getList(1, 1, {
filter: `members ~ "${user.id}" && status != "dissolved" && status != "finished"`,
sort: '-created'
})
@@ -30,7 +30,7 @@ export async function getActiveTeamSession(): Promise<TeamSession | null> {
// 获取群组的临时小组列表
export async function getGroupTeamSessions(groupId: string): Promise<TeamSession[]> {
const result = await pb.collection('teamSessions').getList(1, 20, {
const result = await pb.collection('team_sessions').getList(1, 20, {
filter: `sourceGroup="${groupId}"`,
sort: '-created'
})
@@ -46,7 +46,7 @@ export async function updateTeamStatus(sessionId: string, status: TeamStatus): P
updateData.dissolvedAt = new Date().toISOString()
}
return pb.collection('teamSessions').update(sessionId, updateData) as unknown as TeamSession
return pb.collection('team_sessions').update(sessionId, updateData) as unknown as TeamSession
}
// 结束游戏(解散临时小组)
@@ -59,21 +59,21 @@ export async function joinTeamSession(sessionId: string) {
const user = pb.authStore.model
if (!user) throw new Error('未登录')
const session = await pb.collection('teamSessions').getOne(sessionId) as { members: string[] }
const session = await pb.collection('team_sessions').getOne(sessionId) as { members: string[] }
const members = session.members as string[]
if (members.includes(user.id)) {
throw new Error('已在小组中')
}
return pb.collection('teamSessions').update(sessionId, {
return pb.collection('team_sessions').update(sessionId, {
members: [...members, user.id]
})
}
// 订阅临时小组变更
export function subscribeTeamSession(sessionId: string, callback: (session: TeamSession) => void) {
return pb.collection('teamSessions').subscribe('*', (payload) => {
return pb.collection('team_sessions').subscribe('*', (payload) => {
if (payload.record.id === sessionId) {
callback(payload.record as unknown as TeamSession)
}
+1 -1
View File
@@ -50,7 +50,7 @@ export function useRealtime() {
const session = teamStore.currentSession
if (!session) return
const unsub = await pb.collection('teamSessions').subscribe('*', (payload) => {
const unsub = await pb.collection('team_sessions').subscribe('*', (payload) => {
if (payload.record.id === session.id) {
// 更新临时小组状态
teamStore.loadActiveSession()
+4 -9
View File
@@ -1,13 +1,12 @@
<!-- src/views/Login.vue -->
<script setup lang="ts">
import { ref } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { useRouter } from 'vue-router'
import { useUserStore } from '@/stores/user'
import { ElMessage } from 'element-plus'
import PasswordInput from '@/components/common/PasswordInput.vue'
const router = useRouter()
const route = useRoute()
const userStore = useUserStore()
const email = ref('')
@@ -24,7 +23,7 @@ async function handleLogin() {
loading.value = true
await userStore.login(email.value, password.value)
const redirect = route.query.redirect as string || '/'
const redirect = '/'
router.push(redirect)
} catch (error: any) {
ElMessage.error(error.message || '登录失败')
@@ -32,10 +31,6 @@ async function handleLogin() {
loading.value = false
}
}
function goToRegister() {
router.push({ name: 'Register', query: route.query })
}
</script>
<template>
@@ -77,8 +72,8 @@ function goToRegister() {
</form>
<div class="footer-links">
<span>还没有账号</span>
<a @click="goToRegister">立即注册</a>
还没有账号
<router-link :to="{ name: 'Register', query: $route.query }">立即注册</router-link>
</div>
</div>
</div>
+2 -6
View File
@@ -48,10 +48,6 @@ async function handleRegister() {
loading.value = false
}
}
function goToLogin() {
router.push({ name: 'Login' })
}
</script>
<template>
@@ -113,8 +109,8 @@ function goToLogin() {
</form>
<div class="footer-links">
<span>已有账号</span>
<a @click="goToLogin">立即登录</a>
已有账号
<router-link :to="{ name: 'Login' }">立即登录</router-link>
</div>
</div>
</div>