diff options
| -rw-r--r-- | backend/api/handlers.go | 4 | ||||
| -rw-r--r-- | backend/auth/auth.go | 2 | ||||
| -rw-r--r-- | backend/auth/jwt.go | 2 | ||||
| -rw-r--r-- | backend/game/http.go | 2 | ||||
| -rw-r--r-- | backend/game/hub.go | 4 | ||||
| -rw-r--r-- | backend/game/message.go | 2 | ||||
| -rw-r--r-- | backend/game/models.go | 2 | ||||
| -rw-r--r-- | backend/go.mod | 2 | ||||
| -rw-r--r-- | backend/main.go | 6 | ||||
| -rw-r--r-- | frontend/app/components/GolfPlayApp.client.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/components/GolfWatchApp.client.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/_index.tsx | 4 | ||||
| -rw-r--r-- | frontend/app/routes/admin.dashboard.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/admin.games.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/admin.games_.$gameId.tsx | 4 | ||||
| -rw-r--r-- | frontend/app/routes/admin.users.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/dashboard.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/routes/golf.$gameId.play.tsx | 4 | ||||
| -rw-r--r-- | frontend/app/routes/golf.$gameId.watch.tsx | 4 | ||||
| -rw-r--r-- | frontend/app/routes/login.tsx | 2 | ||||
| -rw-r--r-- | frontend/package-lock.json | 4 | ||||
| -rw-r--r-- | frontend/package.json | 2 | ||||
| -rw-r--r-- | worker/go.mod | 2 |
23 files changed, 32 insertions, 32 deletions
diff --git a/backend/api/handlers.go b/backend/api/handlers.go index 558949b..cc16972 100644 --- a/backend/api/handlers.go +++ b/backend/api/handlers.go @@ -11,8 +11,8 @@ import ( "github.com/jackc/pgx/v5/pgtype" "github.com/labstack/echo/v4" - "github.com/nsfisis/iosdc-2024-albatross/backend/auth" - "github.com/nsfisis/iosdc-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/auth" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" ) var _ StrictServerInterface = (*ApiHandler)(nil) diff --git a/backend/auth/auth.go b/backend/auth/auth.go index a8b9050..401773f 100644 --- a/backend/auth/auth.go +++ b/backend/auth/auth.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/nsfisis/iosdc-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" ) func Login(ctx context.Context, queries *db.Queries, username, password string) (int, error) { diff --git a/backend/auth/jwt.go b/backend/auth/jwt.go index b7abc68..966cc5f 100644 --- a/backend/auth/jwt.go +++ b/backend/auth/jwt.go @@ -6,7 +6,7 @@ import ( "github.com/golang-jwt/jwt/v5" - "github.com/nsfisis/iosdc-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" ) type JWTClaims struct { diff --git a/backend/game/http.go b/backend/game/http.go index d955fa3..18f6cda 100644 --- a/backend/game/http.go +++ b/backend/game/http.go @@ -6,7 +6,7 @@ import ( "github.com/labstack/echo/v4" - "github.com/nsfisis/iosdc-2024-albatross/backend/auth" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/auth" ) type sockHandler struct { diff --git a/backend/game/hub.go b/backend/game/hub.go index de3da14..08833ed 100644 --- a/backend/game/hub.go +++ b/backend/game/hub.go @@ -8,8 +8,8 @@ import ( "github.com/jackc/pgx/v5/pgtype" "github.com/oapi-codegen/nullable" - "github.com/nsfisis/iosdc-2024-albatross/backend/api" - "github.com/nsfisis/iosdc-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/api" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" ) type playerClientState int diff --git a/backend/game/message.go b/backend/game/message.go index bb57eb5..0b413d6 100644 --- a/backend/game/message.go +++ b/backend/game/message.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/nsfisis/iosdc-2024-albatross/backend/api" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/api" ) const ( diff --git a/backend/game/models.go b/backend/game/models.go index 8f3bc80..13e3d0f 100644 --- a/backend/game/models.go +++ b/backend/game/models.go @@ -3,7 +3,7 @@ package game import ( "time" - "github.com/nsfisis/iosdc-2024-albatross/backend/api" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/api" ) type gameState = api.GameState diff --git a/backend/go.mod b/backend/go.mod index 6e4a34a..fe678a0 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,4 +1,4 @@ -module github.com/nsfisis/iosdc-2024-albatross/backend +module github.com/nsfisis/iosdc-japan-2024-albatross/backend go 1.22.3 diff --git a/backend/main.go b/backend/main.go index 91caa73..d3a180c 100644 --- a/backend/main.go +++ b/backend/main.go @@ -11,9 +11,9 @@ import ( "github.com/labstack/echo/v4/middleware" oapimiddleware "github.com/oapi-codegen/echo-middleware" - "github.com/nsfisis/iosdc-2024-albatross/backend/api" - "github.com/nsfisis/iosdc-2024-albatross/backend/db" - "github.com/nsfisis/iosdc-2024-albatross/backend/game" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/api" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db" + "github.com/nsfisis/iosdc-japan-2024-albatross/backend/game" ) func connectDB(ctx context.Context, dsn string) (*pgxpool.Pool, error) { diff --git a/frontend/app/components/GolfPlayApp.client.tsx b/frontend/app/components/GolfPlayApp.client.tsx index 3cb512a..2179b42 100644 --- a/frontend/app/components/GolfPlayApp.client.tsx +++ b/frontend/app/components/GolfPlayApp.client.tsx @@ -22,7 +22,7 @@ export default function GolfPlayApp({ game: Game; sockToken: string; }) { - // const socketUrl = `wss://t.nil.ninja/iosdc/2024/sock/golf/${game.game_id}/play?token=${sockToken}`; + // const socketUrl = `wss://t.nil.ninja/iosdc-japan/2024/sock/golf/${game.game_id}/play?token=${sockToken}`; const socketUrl = process.env.NODE_ENV === "development" ? `ws://localhost:8002/sock/golf/${game.game_id}/play?token=${sockToken}` diff --git a/frontend/app/components/GolfWatchApp.client.tsx b/frontend/app/components/GolfWatchApp.client.tsx index a76f2c9..5990fd4 100644 --- a/frontend/app/components/GolfWatchApp.client.tsx +++ b/frontend/app/components/GolfWatchApp.client.tsx @@ -20,7 +20,7 @@ export default function GolfWatchApp({ game: Game; sockToken: string; }) { - // const socketUrl = `wss://t.nil.ninja/iosdc/2024/sock/golf/${game.game_id}/watch?token=${sockToken}`; + // const socketUrl = `wss://t.nil.ninja/iosdc-japan/2024/sock/golf/${game.game_id}/watch?token=${sockToken}`; const socketUrl = process.env.NODE_ENV === "development" ? `ws://localhost:8002/sock/golf/${game.game_id}/watch?token=${sockToken}` diff --git a/frontend/app/routes/_index.tsx b/frontend/app/routes/_index.tsx index 1699079..b5951ab 100644 --- a/frontend/app/routes/_index.tsx +++ b/frontend/app/routes/_index.tsx @@ -2,7 +2,7 @@ import type { MetaFunction } from "@remix-run/node"; import { Link } from "@remix-run/react"; export const meta: MetaFunction = () => { - return [{ title: "iOSDC 2024 Albatross.swift" }]; + return [{ title: "iOSDC Japan 2024 Albatross.swift" }]; }; export default function Index() { @@ -10,7 +10,7 @@ export default function Index() { <div className="min-h-screen bg-gray-100 flex items-center justify-center"> <div className="text-center"> <h1 className="text-4xl font-bold text-blue-600 mb-4"> - iOSDC 2024 Albatross.swift + iOSDC Japan 2024 Albatross.swift </h1> <p> <Link diff --git a/frontend/app/routes/admin.dashboard.tsx b/frontend/app/routes/admin.dashboard.tsx index af82731..1d172af 100644 --- a/frontend/app/routes/admin.dashboard.tsx +++ b/frontend/app/routes/admin.dashboard.tsx @@ -3,7 +3,7 @@ import { Link } from "@remix-run/react"; import { isAuthenticated } from "../.server/auth"; export const meta: MetaFunction = () => { - return [{ title: "[Admin] Dashboard | iOSDC 2024 Albatross.swift" }]; + return [{ title: "[Admin] Dashboard | iOSDC Japan 2024 Albatross.swift" }]; }; export async function loader({ request }: LoaderFunctionArgs) { diff --git a/frontend/app/routes/admin.games.tsx b/frontend/app/routes/admin.games.tsx index 8362c6c..085a97e 100644 --- a/frontend/app/routes/admin.games.tsx +++ b/frontend/app/routes/admin.games.tsx @@ -4,7 +4,7 @@ import { isAuthenticated } from "../.server/auth"; import { apiClient } from "../.server/api/client"; export const meta: MetaFunction = () => { - return [{ title: "[Admin] Games | iOSDC 2024 Albatross.swift" }]; + return [{ title: "[Admin] Games | iOSDC Japan 2024 Albatross.swift" }]; }; export async function loader({ request }: LoaderFunctionArgs) { diff --git a/frontend/app/routes/admin.games_.$gameId.tsx b/frontend/app/routes/admin.games_.$gameId.tsx index 5d83fb4..244092e 100644 --- a/frontend/app/routes/admin.games_.$gameId.tsx +++ b/frontend/app/routes/admin.games_.$gameId.tsx @@ -11,8 +11,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => { return [ { title: data - ? `[Admin] Game Edit ${data.game.display_name} | iOSDC 2024 Albatross.swift` - : "[Admin] Game Edit | iOSDC 2024 Albatross.swift", + ? `[Admin] Game Edit ${data.game.display_name} | iOSDC Japan 2024 Albatross.swift` + : "[Admin] Game Edit | iOSDC Japan 2024 Albatross.swift", }, ]; }; diff --git a/frontend/app/routes/admin.users.tsx b/frontend/app/routes/admin.users.tsx index 61a25bf..6c9b60d 100644 --- a/frontend/app/routes/admin.users.tsx +++ b/frontend/app/routes/admin.users.tsx @@ -4,7 +4,7 @@ import { isAuthenticated } from "../.server/auth"; import { apiClient } from "../.server/api/client"; export const meta: MetaFunction = () => { - return [{ title: "[Admin] Users | iOSDC 2024 Albatross.swift" }]; + return [{ title: "[Admin] Users | iOSDC Japan 2024 Albatross.swift" }]; }; export async function loader({ request }: LoaderFunctionArgs) { diff --git a/frontend/app/routes/dashboard.tsx b/frontend/app/routes/dashboard.tsx index badf8c4..3cc8e13 100644 --- a/frontend/app/routes/dashboard.tsx +++ b/frontend/app/routes/dashboard.tsx @@ -5,7 +5,7 @@ import { isAuthenticated } from "../.server/auth"; import { apiClient } from "../.server/api/client"; export const meta: MetaFunction = () => { - return [{ title: "Dashboard | iOSDC 2024 Albatross.swift" }]; + return [{ title: "Dashboard | iOSDC Japan 2024 Albatross.swift" }]; }; 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 2a3a68b..919d8df 100644 --- a/frontend/app/routes/golf.$gameId.play.tsx +++ b/frontend/app/routes/golf.$gameId.play.tsx @@ -10,8 +10,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => { return [ { title: data - ? `Golf Playing ${data.game.display_name} | iOSDC 2024 Albatross.swift` - : "Golf Playing | iOSDC 2024 Albatross.swift", + ? `Golf Playing ${data.game.display_name} | iOSDC Japan 2024 Albatross.swift` + : "Golf Playing | iOSDC Japan 2024 Albatross.swift", }, ]; }; diff --git a/frontend/app/routes/golf.$gameId.watch.tsx b/frontend/app/routes/golf.$gameId.watch.tsx index da7baf1..c2e269e 100644 --- a/frontend/app/routes/golf.$gameId.watch.tsx +++ b/frontend/app/routes/golf.$gameId.watch.tsx @@ -10,8 +10,8 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => { return [ { title: data - ? `Golf Watching ${data.game.display_name} | iOSDC 2024 Albatross.swift` - : "Golf Watching | iOSDC 2024 Albatross.swift", + ? `Golf Watching ${data.game.display_name} | iOSDC Japan 2024 Albatross.swift` + : "Golf Watching | iOSDC Japan 2024 Albatross.swift", }, ]; }; diff --git a/frontend/app/routes/login.tsx b/frontend/app/routes/login.tsx index 0db0bc5..f63df08 100644 --- a/frontend/app/routes/login.tsx +++ b/frontend/app/routes/login.tsx @@ -7,7 +7,7 @@ import { Form } from "@remix-run/react"; import { authenticator } from "../.server/auth"; export const meta: MetaFunction = () => { - return [{ title: "Login | iOSDC 2024 Albatross.swift" }]; + return [{ title: "Login | iOSDC Japan 2024 Albatross.swift" }]; }; export async function loader({ request }: LoaderFunctionArgs) { diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c926e7d..f3dc8a5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,10 +1,10 @@ { - "name": "frontend", + "name": "iosdc-japan-2024-albatross-frontend", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "frontend", + "name": "iosdc-japan-2024-albatross-frontend", "dependencies": { "@remix-run/node": "^2.10.3", "@remix-run/react": "^2.10.3", diff --git a/frontend/package.json b/frontend/package.json index 61def51..079de6f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "frontend", + "name": "iosdc-japan-2024-albatross-frontend", "private": true, "sideEffects": false, "type": "module", diff --git a/worker/go.mod b/worker/go.mod index 456ce16..007435d 100644 --- a/worker/go.mod +++ b/worker/go.mod @@ -1,3 +1,3 @@ -module github.com/nsfisis/iosdc-2024-albatross/worker +module github.com/nsfisis/iosdc-japan-2024-albatross/worker go 1.22.3 |
