From 9b1049e39b2e6e45371930832b421be21297dcb5 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Mar 2025 21:26:39 +0900 Subject: change base path --- frontend/app/routes/_index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontend/app/routes/_index.tsx') diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx index 808302d..ec4dfcb 100644 --- a/frontend/app/routes/_index.tsx +++ b/frontend/app/routes/_index.tsx @@ -16,7 +16,7 @@ export default function Index() { return (
iOSDC Japan 2024 -- cgit v1.2.3-70-g09d2 From e0ccf0c80325533ea380b677c9a79b7a621574f4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Mar 2025 21:47:51 +0900 Subject: Revert "feat(frontend): update home page" This reverts commit f8dc194ed82c2181cf466927514cfe08a2429725. --- frontend/app/routes/_index.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'frontend/app/routes/_index.tsx') diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx index ec4dfcb..4aa068a 100644 --- a/frontend/app/routes/_index.tsx +++ b/frontend/app/routes/_index.tsx @@ -1,7 +1,7 @@ import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node"; -import { Link } from "@remix-run/react"; import { ensureUserNotLoggedIn } from "../.server/auth"; import BorderedContainer from "../components/BorderedContainer"; +import NavigateLink from "../components/NavigateLink"; export const meta: MetaFunction = () => [ { title: "iOSDC Japan 2024 Albatross.swift" }, @@ -38,17 +38,8 @@ export default function Index() {

-
-

- 追記: - イベントは終了しました。ご参加いただいたみなさま、ありがとうございました！ -

- - 試合結果はこちらのスタッフブログで公開しています。 - +
+ ログイン
); -- cgit v1.2.3-70-g09d2 From 36a45e4e65945bccd5082f4e26c057c760ea5a7c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Mar 2025 22:01:37 +0900 Subject: update index page --- frontend/app/components/BorderedContainer.tsx | 2 +- frontend/app/components/NavigateLink.tsx | 2 +- frontend/app/routes/_index.tsx | 21 ++++++++++----------- frontend/public/favicon.svg | 2 +- frontend/public/logo.svg | 1 + 5 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 frontend/public/logo.svg (limited to 'frontend/app/routes/_index.tsx') diff --git a/frontend/app/components/BorderedContainer.tsx b/frontend/app/components/BorderedContainer.tsx index cbbfbde..fe15c3b 100644 --- a/frontend/app/components/BorderedContainer.tsx +++ b/frontend/app/components/BorderedContainer.tsx @@ -6,7 +6,7 @@ type Props = { export default function BorderedContainer({ children }: Props) { return ( -
+
{children}
); diff --git a/frontend/app/components/NavigateLink.tsx b/frontend/app/components/NavigateLink.tsx index b749cea..02aae3e 100644 --- a/frontend/app/components/NavigateLink.tsx +++ b/frontend/app/components/NavigateLink.tsx @@ -4,7 +4,7 @@ export default function NavigateLink(props: LinkProps) { return ( ); } diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx index 4aa068a..ff2209b 100644 --- a/frontend/app/routes/_index.tsx +++ b/frontend/app/routes/_index.tsx @@ -14,27 +14,26 @@ export async function loader({ request }: LoaderFunctionArgs) { export default function Index() { return ( -
+
iOSDC Japan 2024
-
-
iOSDC Japan 2024
-
Swift Code Battle
+
+
PHPER CODE BATTLE

- Swift コードバトルは指示された動作をする Swift + PHPer コードバトルは指示された動作をする PHP コードをより短く書けた方が勝ち、という 1 対 1 - の対戦コンテンツです。8/22（木）day0 前夜祭では 8/12 + の対戦コンテンツです。3/21（金）day0 前夜祭では 3/8 に実施された予選を勝ち抜いたプレイヤーによるトーナメント形式での - Swift - コードバトルを実施します。ここでは短いコードが正義です！可読性も保守性も放り投げた、イベントならではのコードをお楽しみください！ + PHPer コードバトルを実施します。 + ここでは短いコードが正義です！可読性も保守性も放り投げた、イベントならではのコードをお楽しみください！

diff --git a/frontend/public/favicon.svg b/frontend/public/favicon.svg index f2eea0d..682d390 100644 --- a/frontend/public/favicon.svg +++ b/frontend/public/favicon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/public/logo.svg b/frontend/public/logo.svg new file mode 100644 index 0000000..b123f96 --- /dev/null +++ b/frontend/public/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 9c61843bdbd67d3c026bd8fc1a82f5cb9a984131 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Mar 2025 22:05:46 +0900 Subject: update site name --- .github/workflows/update-submodule.yml | 52 +++++++++++----------- README.md | 2 +- backend/admin/templates/base.html | 2 +- .../components/GolfPlayApps/GolfPlayAppGaming.tsx | 2 +- .../GolfPlayApps/GolfPlayAppStarting.tsx | 2 +- .../components/GolfPlayApps/GolfPlayAppWaiting.tsx | 2 +- .../GolfWatchApps/GolfWatchAppGaming.tsx | 2 +- .../GolfWatchApps/GolfWatchAppStarting.tsx | 2 +- .../GolfWatchApps/GolfWatchAppWaiting.tsx | 2 +- frontend/app/routes/_index.tsx | 2 +- frontend/app/routes/dashboard.tsx | 2 +- frontend/app/routes/golf.$gameId.play.tsx | 4 +- frontend/app/routes/golf.$gameId.watch.tsx | 4 +- frontend/app/routes/login.tsx | 2 +- frontend/app/tailwind.css | 6 --- 15 files changed, 41 insertions(+), 47 deletions(-) (limited to 'frontend/app/routes/_index.tsx') 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 @@ - ADMIN {{ .Title }} | iOSDC Japan 2024 Albatross.swift + ADMIN {{ .Title }} | PHPerKaigi 2025 Albatross 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 (
-
+
{gameDisplayName}
{leftTime}
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 (
-
+
{gameDisplayName}
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 (
-
+
{gameDisplayName}
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 (
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 (
-
+
{gameDisplayName}
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 (
-
+
{gameDisplayName}
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 = ({ 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 = ({ 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; - } -} -- cgit v1.2.3-70-g09d2 From bd9c2e8b587c733059d44f642c53536eb7fe1ec9 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Mar 2025 22:13:44 +0900 Subject: update colors --- frontend/app/components/InputText.tsx | 2 +- frontend/app/components/SubmitButton.tsx | 2 +- frontend/app/routes/_index.tsx | 2 +- frontend/app/routes/dashboard.tsx | 2 +- frontend/app/routes/login.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'frontend/app/routes/_index.tsx') diff --git a/frontend/app/components/InputText.tsx b/frontend/app/components/InputText.tsx index 3f2c526..ed68206 100644 --- a/frontend/app/components/InputText.tsx +++ b/frontend/app/components/InputText.tsx @@ -6,7 +6,7 @@ export default function InputText(props: InputProps) { return ( ); } diff --git a/frontend/app/components/SubmitButton.tsx b/frontend/app/components/SubmitButton.tsx index 1400a7b..643b3f5 100644 --- a/frontend/app/components/SubmitButton.tsx +++ b/frontend/app/components/SubmitButton.tsx @@ -6,7 +6,7 @@ export default function SubmitButton(props: ButtonProps) { return (