diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-08-17 21:11:07 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-08-17 21:11:07 +0900 |
| commit | 01d3120fd7129f573d88f7aa7c227b3ef93fe368 (patch) | |
| tree | eea4f5ac0f025c7bdbff71d2ee83b4dce99355ef /frontend/app/components | |
| parent | f926ef682de637b717d3b0cc0eaee43c59e83c95 (diff) | |
| parent | b923a9d6534820d33f42bc65c47ae22889bde922 (diff) | |
| download | iosdc-japan-2024-albatross-01d3120fd7129f573d88f7aa7c227b3ef93fe368.tar.gz iosdc-japan-2024-albatross-01d3120fd7129f573d88f7aa7c227b3ef93fe368.tar.zst iosdc-japan-2024-albatross-01d3120fd7129f573d88f7aa7c227b3ef93fe368.zip | |
Merge branch 'feat/icon'
Diffstat (limited to 'frontend/app/components')
| -rw-r--r-- | frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx | 26 | ||||
| -rw-r--r-- | frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx | 38 |
2 files changed, 52 insertions, 12 deletions
diff --git a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx index 4730583..a6c4550 100644 --- a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx +++ b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx @@ -55,12 +55,26 @@ export default function GolfPlayAppGaming({ <div className="text-gray-100">{gameDisplayName}</div> <div className="text-2xl">{leftTime}</div> </div> - <div className="font-bold text-end"> - <Link to={"/dashboard"} className="text-gray-100"> - {playerInfo.displayName} - </Link> - <div className="text-2xl">{playerInfo.score}</div> - </div> + <Link to={"/dashboard"}> + <div className="flex gap-4 my-auto font-bold"> + <div className="text-6xl">{playerInfo.score}</div> + <div className="text-end"> + <div className="text-gray-100">Player 1</div> + <div className="text-2xl">{playerInfo.displayName}</div> + </div> + {playerInfo.iconPath && ( + <img + src={ + process.env.NODE_ENV === "development" + ? `http://localhost:8002/iosdc-japan/2024/code-battle${playerInfo.iconPath}` + : `/iosdc-japan/2024/code-battle${playerInfo.iconPath}` + } + alt={`${playerInfo.displayName} のアイコン`} + className="w-12 h-12 rounded-full my-auto border-4 border-white" + /> + )} + </div> + </Link> </div> <div className="grow grid grid-cols-3 divide-x divide-gray-300"> <div className="p-4"> diff --git a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx index c4c3a53..63c232b 100644 --- a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx +++ b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx @@ -47,9 +47,22 @@ export default function GolfWatchAppGaming({ <div className="min-h-screen bg-gray-100 flex flex-col"> <div className="text-white bg-iosdc-japan grid grid-cols-3 px-4 py-2"> <div className="font-bold flex justify-between my-auto"> - <div> - <div className="text-gray-100">Player 1</div> - <div className="text-2xl">{playerInfoA.displayName}</div> + <div className="flex gap-4"> + {playerInfoA.iconPath && ( + <img + src={ + process.env.NODE_ENV === "development" + ? `http://localhost:8002/iosdc-japan/2024/code-battle${playerInfoA.iconPath}` + : `/iosdc-japan/2024/code-battle${playerInfoA.iconPath}` + } + alt={`${playerInfoA.displayName} のアイコン`} + className="w-12 h-12 rounded-full my-auto border-4 border-white" + /> + )} + <div> + <div className="text-gray-100">Player 1</div> + <div className="text-2xl">{playerInfoA.displayName}</div> + </div> </div> <div className="text-6xl">{playerInfoA.score}</div> </div> @@ -59,9 +72,22 @@ export default function GolfWatchAppGaming({ </div> <div className="font-bold flex justify-between my-auto"> <div className="text-6xl">{playerInfoB.score}</div> - <div> - <div className="text-gray-100">Player 2</div> - <div className="text-2xl">{playerInfoB.displayName}</div> + <div className="flex gap-4 text-end"> + <div> + <div className="text-gray-100">Player 2</div> + <div className="text-2xl">{playerInfoB.displayName}</div> + </div> + {playerInfoB.iconPath && ( + <img + src={ + process.env.NODE_ENV === "development" + ? `http://localhost:8002/iosdc-japan/2024/code-battle${playerInfoB.iconPath}` + : `/iosdc-japan/2024/code-battle${playerInfoB.iconPath}` + } + alt={`${playerInfoB.displayName} のアイコン`} + className="w-12 h-12 rounded-full my-auto border-4 border-white" + /> + )} </div> </div> </div> |