aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/update-submodule.yml52
-rw-r--r--README.md2
-rw-r--r--backend/admin/templates/base.html2
-rw-r--r--frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx2
-rw-r--r--frontend/app/components/GolfPlayApps/GolfPlayAppStarting.tsx2
-rw-r--r--frontend/app/components/GolfPlayApps/GolfPlayAppWaiting.tsx2
-rw-r--r--frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx2
-rw-r--r--frontend/app/components/GolfWatchApps/GolfWatchAppStarting.tsx2
-rw-r--r--frontend/app/components/GolfWatchApps/GolfWatchAppWaiting.tsx2
-rw-r--r--frontend/app/routes/_index.tsx2
-rw-r--r--frontend/app/routes/dashboard.tsx2
-rw-r--r--frontend/app/routes/golf.$gameId.play.tsx4
-rw-r--r--frontend/app/routes/golf.$gameId.watch.tsx4
-rw-r--r--frontend/app/routes/login.tsx2
-rw-r--r--frontend/app/tailwind.css6
15 files changed, 41 insertions, 47 deletions
diff --git a/.github/workflows/update-submodule.yml b/.github/workflows/update-submodule.yml
index ac6142d..833c781 100644
--- a/.github/workflows/update-submodule.yml
+++ b/.github/workflows/update-submodule.yml
@@ -1,26 +1,26 @@
-name: Update submodule
-on:
- push:
- branches: [main]
-jobs:
- update-submodule:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- with:
- repository: nsfisis/nil.ninja
- submodules: true
- token: ${{ secrets.GH_PAT }}
- path: nil.ninja
-
- - run: |
- cd nil.ninja
- cd vhosts/t/albatross-swift
- git fetch --prune origin
- git switch -d origin/main
- cd "$(git rev-parse --show-superproject-working-tree)"
- git add vhosts/t/albatross-swift
- git config user.name nsfisis
- git config user.email nsfisis@gmail.com
- git commit -m "[automated] Update 'vhosts/t/albatross-swift' (${GITHUB_SHA})"
- git push origin main
+# name: Update submodule
+# on:
+# push:
+# branches: [main]
+# jobs:
+# update-submodule:
+# runs-on: ubuntu-latest
+# steps:
+# - uses: actions/checkout@v2
+# with:
+# repository: nsfisis/nil.ninja
+# submodules: true
+# token: ${{ secrets.GH_PAT }}
+# path: nil.ninja
+#
+# - run: |
+# cd nil.ninja
+# cd vhosts/t/albatross-swift
+# git fetch --prune origin
+# git switch -d origin/main
+# cd "$(git rev-parse --show-superproject-working-tree)"
+# git add vhosts/t/albatross-swift
+# git config user.name nsfisis
+# git config user.email nsfisis@gmail.com
+# git commit -m "[automated] Update 'vhosts/t/albatross-swift' (${GITHUB_SHA})"
+# git push origin main
diff --git a/README.md b/README.md
index d44c602..ee8ec63 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Albatross.swift
+# PHPerKaigi 2025 Albatross
# これは何？
diff --git a/backend/admin/templates/base.html b/backend/admin/templates/base.html
index 8e71194..08c7dc5 100644
--- a/backend/admin/templates/base.html
+++ b/backend/admin/templates/base.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>ADMIN {{ .Title }} | iOSDC Japan 2024 Albatross.swift</title>
+ <title>ADMIN {{ .Title }} | PHPerKaigi 2025 Albatross</title>
<link rel="icon" href="{{ .BasePath }}/favicon.svg">
<link rel="stylesheet" href="{{ .BasePath }}/admin/css/normalize.css">
<link rel="stylesheet" href="{{ .BasePath }}/admin/css/sakura.css">
diff --git a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx
index 0aa6b3d..d4a059f 100644
--- a/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx
+++ b/frontend/app/components/GolfPlayApps/GolfPlayAppGaming.tsx
@@ -55,7 +55,7 @@ export default function GolfPlayAppGaming({
return (
<div className="min-h-screen bg-gray-100 flex flex-col">
- <div className="text-white bg-iosdc-japan flex flex-row justify-between px-4 py-2">
+ <div className="text-white bg-sky-600 flex flex-row justify-between px-4 py-2">
<div className="font-bold">
<div className="text-gray-100">{gameDisplayName}</div>
<div className="text-2xl">{leftTime}</div>
diff --git a/frontend/app/components/GolfPlayApps/GolfPlayAppStarting.tsx b/frontend/app/components/GolfPlayApps/GolfPlayAppStarting.tsx
index b41dfed..07b93d6 100644
--- a/frontend/app/components/GolfPlayApps/GolfPlayAppStarting.tsx
+++ b/frontend/app/components/GolfPlayApps/GolfPlayAppStarting.tsx
@@ -10,7 +10,7 @@ export default function GolfPlayAppStarting({ gameDisplayName }: Props) {
return (
<div className="min-h-screen bg-gray-100 flex flex-col">
- <div className="text-white bg-iosdc-japan p-10 text-center">
+ <div className="text-white bg-sky-600 p-10 text-center">
<div className="text-4xl font-bold">{gameDisplayName}</div>
</div>
<div className="text-center text-black font-black text-10xl">
diff --git a/frontend/app/components/GolfPlayApps/GolfPlayAppWaiting.tsx b/frontend/app/components/GolfPlayApps/GolfPlayAppWaiting.tsx
index 706dc8f..4b74c0d 100644
--- a/frontend/app/components/GolfPlayApps/GolfPlayAppWaiting.tsx
+++ b/frontend/app/components/GolfPlayApps/GolfPlayAppWaiting.tsx
@@ -12,7 +12,7 @@ export default function GolfPlayAppWaiting({
}: Props) {
return (
<div className="min-h-screen bg-gray-100 flex flex-col font-bold text-center">
- <div className="text-white bg-iosdc-japan p-10">
+ <div className="text-white bg-sky-600 p-10">
<div className="text-4xl">{gameDisplayName}</div>
</div>
<div className="grow grid mx-auto text-black">
diff --git a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
index 2907f5a..7cfbc86 100644
--- a/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
+++ b/frontend/app/components/GolfWatchApps/GolfWatchAppGaming.tsx
@@ -52,7 +52,7 @@ export default function GolfWatchAppGaming({
: gameResult === "winB"
? "bg-purple-400"
: "bg-pink-500"
- : "bg-iosdc-japan";
+ : "bg-sky-600";
return (
<div className="min-h-screen bg-gray-100 flex flex-col">
diff --git a/frontend/app/components/GolfWatchApps/GolfWatchAppStarting.tsx b/frontend/app/components/GolfWatchApps/GolfWatchAppStarting.tsx
index 684d2af..82e5334 100644
--- a/frontend/app/components/GolfWatchApps/GolfWatchAppStarting.tsx
+++ b/frontend/app/components/GolfWatchApps/GolfWatchAppStarting.tsx
@@ -10,7 +10,7 @@ export default function GolfWatchAppStarting({ gameDisplayName }: Props) {
return (
<div className="min-h-screen bg-gray-100 flex flex-col">
- <div className="text-white bg-iosdc-japan p-10 text-center">
+ <div className="text-white bg-sky-600 p-10 text-center">
<div className="text-4xl font-bold">{gameDisplayName}</div>
</div>
<div className="text-center text-black font-black text-10xl">
diff --git a/frontend/app/components/GolfWatchApps/GolfWatchAppWaiting.tsx b/frontend/app/components/GolfWatchApps/GolfWatchAppWaiting.tsx
index 0e964e3..c2a5431 100644
--- a/frontend/app/components/GolfWatchApps/GolfWatchAppWaiting.tsx
+++ b/frontend/app/components/GolfWatchApps/GolfWatchAppWaiting.tsx
@@ -14,7 +14,7 @@ export default function GolfWatchAppWaiting({
}: Props) {
return (
<div className="min-h-screen bg-gray-100 flex flex-col font-bold text-center">
- <div className="text-white bg-iosdc-japan p-10">
+ <div className="text-white bg-sky-600 p-10">
<div className="text-4xl">{gameDisplayName}</div>
</div>
<div className="grow grid grid-cols-3 gap-10 mx-auto text-black">
diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx
index ff2209b..5dda2c8 100644
--- a/frontend/app/routes/_index.tsx
+++ b/frontend/app/routes/_index.tsx
@@ -4,7 +4,7 @@ import BorderedContainer from "../components/BorderedContainer";
import NavigateLink from "../components/NavigateLink";
export const meta: MetaFunction = () => [
- { title: "iOSDC Japan 2024 Albatross.swift" },
+ { title: "PHPerKaigi 2025 Albatross" },
];
export async function loader({ request }: LoaderFunctionArgs) {
diff --git a/frontend/app/routes/dashboard.tsx b/frontend/app/routes/dashboard.tsx
index a68d5c5..20038c1 100644
--- a/frontend/app/routes/dashboard.tsx
+++ b/frontend/app/routes/dashboard.tsx
@@ -7,7 +7,7 @@ import NavigateLink from "../components/NavigateLink";
import UserIcon from "../components/UserIcon";
export const meta: MetaFunction = () => [
- { title: "Dashboard | iOSDC Japan 2024 Albatross.swift" },
+ { title: "Dashboard | PHPerKaigi 2025 Albatross" },
];
export async function loader({ request }: LoaderFunctionArgs) {
diff --git a/frontend/app/routes/golf.$gameId.play.tsx b/frontend/app/routes/golf.$gameId.play.tsx
index a2860dd..91a2b8c 100644
--- a/frontend/app/routes/golf.$gameId.play.tsx
+++ b/frontend/app/routes/golf.$gameId.play.tsx
@@ -16,8 +16,8 @@ import { PlayerState } from "../types/PlayerState";
export const meta: MetaFunction<typeof loader> = ({ data }) => [
{
title: data
- ? `Golf Playing ${data.game.display_name} | iOSDC Japan 2024 Albatross.swift`
- : "Golf Playing | iOSDC Japan 2024 Albatross.swift",
+ ? `Golf Playing ${data.game.display_name} | PHPerKaigi 2025 Albatross`
+ : "Golf Playing | PHPerKaigi 2025 Albatross",
},
];
diff --git a/frontend/app/routes/golf.$gameId.watch.tsx b/frontend/app/routes/golf.$gameId.watch.tsx
index cdfc908..5a41de5 100644
--- a/frontend/app/routes/golf.$gameId.watch.tsx
+++ b/frontend/app/routes/golf.$gameId.watch.tsx
@@ -20,8 +20,8 @@ import { PlayerState } from "../types/PlayerState";
export const meta: MetaFunction<typeof loader> = ({ data }) => [
{
title: data
- ? `Golf Watching ${data.game.display_name} | iOSDC Japan 2024 Albatross.swift`
- : "Golf Watching | iOSDC Japan 2024 Albatross.swift",
+ ? `Golf Watching ${data.game.display_name} | PHPerKaigi 2025 Albatross`
+ : "Golf Watching | PHPerKaigi 2025 Albatross",
},
];
diff --git a/frontend/app/routes/login.tsx b/frontend/app/routes/login.tsx
index b1249e0..b59ce43 100644
--- a/frontend/app/routes/login.tsx
+++ b/frontend/app/routes/login.tsx
@@ -10,7 +10,7 @@ import InputText from "../components/InputText";
import SubmitButton from "../components/SubmitButton";
export const meta: MetaFunction = () => [
- { title: "Login | iOSDC Japan 2024 Albatross.swift" },
+ { title: "Login | PHPerKaigi 2025 Albatross" },
];
export async function loader({ request }: LoaderFunctionArgs) {
diff --git a/frontend/app/tailwind.css b/frontend/app/tailwind.css
index 6d3faee..b5c61c9 100644
--- a/frontend/app/tailwind.css
+++ b/frontend/app/tailwind.css
@@ -1,9 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
-
-@layer components {
- .bg-iosdc-japan {
- @apply bg-gradient-to-r from-orange-400 via-pink-500 to-purple-400;
- }
-}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-11-30 23:17:12 +0000