修正記分板在 iPad 尺寸的版面與修復 dev server 啟動問題
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -25,3 +25,4 @@ dist-ssr
|
|||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
*.sln
|
||||||
*.sw?
|
*.sw?
|
||||||
|
/*.stackdump
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "concurrently \"npm:dev:server\" \"npm:dev:client\"",
|
"dev": "concurrently \"npm:dev:server\" \"npm:dev:client\"",
|
||||||
"dev:client": "vite",
|
"dev:client": "vite",
|
||||||
"dev:server": "node --watch server/server.mjs",
|
"dev:server": "node server/server.mjs",
|
||||||
"build": "tsc -b && vite build",
|
"build": "tsc -b && vite build",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
|
|||||||
18
src/App.css
18
src/App.css
@@ -1737,15 +1737,6 @@
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.scoreboard-screen {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scoreboard-rail {
|
|
||||||
grid-template-columns: minmax(0, 1fr) 140px 160px;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scoreboard-team-head {
|
.scoreboard-team-head {
|
||||||
grid-template-columns: minmax(0, 1fr) 62px;
|
grid-template-columns: minmax(0, 1fr) 62px;
|
||||||
}
|
}
|
||||||
@@ -1998,9 +1989,18 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scoreboard-screen {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
.scoreboard-rail {
|
.scoreboard-rail {
|
||||||
grid-template-columns: minmax(0, 1fr) 94px 106px;
|
grid-template-columns: minmax(0, 1fr) 94px 106px;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
|
align-items: stretch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rail-pill-hold-wrap {
|
||||||
|
grid-column: 1 / -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rail-square-button {
|
.rail-square-button {
|
||||||
|
|||||||
@@ -718,14 +718,14 @@ function App() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const setServing = (side: ScoreSide) => {
|
const setServing = (side: ScoreSide) => {
|
||||||
if (scoreHistory.length > 0 || scoreState.initialServing !== null) {
|
if (scoreHistory.length > 0) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
setScoreState((current) => ({
|
setScoreState((current) => ({
|
||||||
...current,
|
...current,
|
||||||
initialServing: side,
|
initialServing: current.initialServing === side ? null : side,
|
||||||
serving: side,
|
serving: current.initialServing === side ? null : side,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -463,7 +463,7 @@ export function ScoreboardPage({
|
|||||||
assignments={leftAssignments}
|
assignments={leftAssignments}
|
||||||
canArrangeMatch={canArrangeMatch}
|
canArrangeMatch={canArrangeMatch}
|
||||||
canScore={canScore}
|
canScore={canScore}
|
||||||
canSetServing={canArrangeMatch && scoreState.initialServing === null}
|
canSetServing={canArrangeMatch}
|
||||||
currentReceiver={scoreState.serving === 'right' ? currentReceiver?.name ?? null : null}
|
currentReceiver={scoreState.serving === 'right' ? currentReceiver?.name ?? null : null}
|
||||||
currentServer={scoreState.serving === 'left' ? currentServer?.name ?? null : null}
|
currentServer={scoreState.serving === 'left' ? currentServer?.name ?? null : null}
|
||||||
hasInitialServing={scoreState.initialServing === 'left'}
|
hasInitialServing={scoreState.initialServing === 'left'}
|
||||||
@@ -496,7 +496,7 @@ export function ScoreboardPage({
|
|||||||
assignments={rightAssignments}
|
assignments={rightAssignments}
|
||||||
canArrangeMatch={canArrangeMatch}
|
canArrangeMatch={canArrangeMatch}
|
||||||
canScore={canScore}
|
canScore={canScore}
|
||||||
canSetServing={canArrangeMatch && scoreState.initialServing === null}
|
canSetServing={canArrangeMatch}
|
||||||
currentReceiver={scoreState.serving === 'left' ? currentReceiver?.name ?? null : null}
|
currentReceiver={scoreState.serving === 'left' ? currentReceiver?.name ?? null : null}
|
||||||
currentServer={scoreState.serving === 'right' ? currentServer?.name ?? null : null}
|
currentServer={scoreState.serving === 'right' ? currentServer?.name ?? null : null}
|
||||||
hasInitialServing={scoreState.initialServing === 'right'}
|
hasInitialServing={scoreState.initialServing === 'right'}
|
||||||
|
|||||||
Reference in New Issue
Block a user