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
@@ -4,7 +4,7 @@ services:
pocketbase: pocketbase:
image: ghcr.io/muchobien/pocketbase:0.22.4 image: ghcr.io/muchobien/pocketbase:0.22.4
container_name: gamegroup-pb container_name: gamegroup-pb
user: "${PB_UID:-1000}:${PB_GID:-1000}" # user: "${PB_UID:-1000}:${PB_GID:-1000}"
ports: ports:
- "${PB_PORT:-8711}:8090" - "${PB_PORT:-8711}:8090"
volumes: volumes:
+1 -1
View File
@@ -1,7 +1,7 @@
// src/api/pocketbase.ts // src/api/pocketbase.ts
import PocketBase from 'pocketbase' 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) export const pb = new PocketBase(pbUrl)
+7 -7
View File
@@ -9,7 +9,7 @@ export async function createTeamSession(data: {
gameName: string gameName: string
members: string[] members: string[]
}): Promise<TeamSession> { }): Promise<TeamSession> {
return pb.collection('teamSessions').create({ return pb.collection('team_sessions').create({
...data, ...data,
status: 'recruiting' status: 'recruiting'
}) as unknown as TeamSession }) as unknown as TeamSession
@@ -20,7 +20,7 @@ export async function getActiveTeamSession(): Promise<TeamSession | null> {
const user = pb.authStore.model const user = pb.authStore.model
if (!user) return null 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"`, filter: `members ~ "${user.id}" && status != "dissolved" && status != "finished"`,
sort: '-created' sort: '-created'
}) })
@@ -30,7 +30,7 @@ export async function getActiveTeamSession(): Promise<TeamSession | null> {
// 获取群组的临时小组列表 // 获取群组的临时小组列表
export async function getGroupTeamSessions(groupId: string): Promise<TeamSession[]> { 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}"`, filter: `sourceGroup="${groupId}"`,
sort: '-created' sort: '-created'
}) })
@@ -46,7 +46,7 @@ export async function updateTeamStatus(sessionId: string, status: TeamStatus): P
updateData.dissolvedAt = new Date().toISOString() 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 const user = pb.authStore.model
if (!user) throw new Error('未登录') 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[] const members = session.members as string[]
if (members.includes(user.id)) { if (members.includes(user.id)) {
throw new Error('已在小组中') throw new Error('已在小组中')
} }
return pb.collection('teamSessions').update(sessionId, { return pb.collection('team_sessions').update(sessionId, {
members: [...members, user.id] members: [...members, user.id]
}) })
} }
// 订阅临时小组变更 // 订阅临时小组变更
export function subscribeTeamSession(sessionId: string, callback: (session: TeamSession) => void) { 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) { if (payload.record.id === sessionId) {
callback(payload.record as unknown as TeamSession) callback(payload.record as unknown as TeamSession)
} }
+1 -1
View File
@@ -50,7 +50,7 @@ export function useRealtime() {
const session = teamStore.currentSession const session = teamStore.currentSession
if (!session) return 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) { if (payload.record.id === session.id) {
// 更新临时小组状态 // 更新临时小组状态
teamStore.loadActiveSession() teamStore.loadActiveSession()
+4 -9
View File
@@ -1,13 +1,12 @@
<!-- src/views/Login.vue --> <!-- src/views/Login.vue -->
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue' import { ref } from 'vue'
import { useRouter, useRoute } from 'vue-router' import { useRouter } from 'vue-router'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import PasswordInput from '@/components/common/PasswordInput.vue' import PasswordInput from '@/components/common/PasswordInput.vue'
const router = useRouter() const router = useRouter()
const route = useRoute()
const userStore = useUserStore() const userStore = useUserStore()
const email = ref('') const email = ref('')
@@ -24,7 +23,7 @@ async function handleLogin() {
loading.value = true loading.value = true
await userStore.login(email.value, password.value) await userStore.login(email.value, password.value)
const redirect = route.query.redirect as string || '/' const redirect = '/'
router.push(redirect) router.push(redirect)
} catch (error: any) { } catch (error: any) {
ElMessage.error(error.message || '登录失败') ElMessage.error(error.message || '登录失败')
@@ -32,10 +31,6 @@ async function handleLogin() {
loading.value = false loading.value = false
} }
} }
function goToRegister() {
router.push({ name: 'Register', query: route.query })
}
</script> </script>
<template> <template>
@@ -77,8 +72,8 @@ function goToRegister() {
</form> </form>
<div class="footer-links"> <div class="footer-links">
<span>还没有账号</span> 还没有账号
<a @click="goToRegister">立即注册</a> <router-link :to="{ name: 'Register', query: $route.query }">立即注册</router-link>
</div> </div>
</div> </div>
</div> </div>
+2 -6
View File
@@ -48,10 +48,6 @@ async function handleRegister() {
loading.value = false loading.value = false
} }
} }
function goToLogin() {
router.push({ name: 'Login' })
}
</script> </script>
<template> <template>
@@ -113,8 +109,8 @@ function goToLogin() {
</form> </form>
<div class="footer-links"> <div class="footer-links">
<span>已有账号</span> 已有账号
<a @click="goToLogin">立即登录</a> <router-link :to="{ name: 'Login' }">立即登录</router-link>
</div> </div>
</div> </div>
</div> </div>
+1 -1
View File
@@ -13,7 +13,7 @@ export default defineConfig({
port: Number(process.env.VITE_PORT) || 5173, port: Number(process.env.VITE_PORT) || 5173,
proxy: { proxy: {
'/api': { '/api': {
target: process.env.VITE_PB_URL || 'http://192.168.1.14:8711', target: process.env.VITE_PB_URL || 'http://localhost:8090',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')
} }