From 636c54aa361921709c37b7662ebba65f372a4005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:19:12 -0500 Subject: [PATCH] feat: more progress --- packages/api/package.json | 1 + packages/api/src/app/tank-voting/[id]/average/route.ts | 8 +------- packages/core/src/blitzkit/index.ts | 1 + packages/core/src/blitzkit/votes.ts | 7 +++++++ packages/website/src/app/auth/[provider]/layout.tsx | 5 +++++ packages/website/src/app/auth/[provider]/page.tsx | 2 ++ packages/website/src/hooks/useTankVotes.ts | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 packages/core/src/blitzkit/votes.ts create mode 100644 packages/website/src/app/auth/[provider]/layout.tsx diff --git a/packages/api/package.json b/packages/api/package.json index 071a58790..0ce9da55d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,7 @@ { "name": "@blitzkit/api", "private": true, + "main": "src/index.ts", "scripts": { "dev": "next dev", "build": "next build" diff --git a/packages/api/src/app/tank-voting/[id]/average/route.ts b/packages/api/src/app/tank-voting/[id]/average/route.ts index 5acc87e40..41ab3d61a 100644 --- a/packages/api/src/app/tank-voting/[id]/average/route.ts +++ b/packages/api/src/app/tank-voting/[id]/average/route.ts @@ -1,17 +1,11 @@ import { tankDefinitions, usersDatabase } from '@blitzkit/core'; import { NextRequest, NextResponse } from 'next/server'; +import { TankVotes } from '../../../../../../core/src/blitzkit/votes'; import { isValidBlitzId } from '../../../../../../website/src/core/blitz/isValidBlitzId'; import { BlitzkitResponse, BlitzkitResponseError, } from '../../../../../../website/src/hooks/useTankVotes'; -import { TankVoteCategory } from '../cast/route'; - -export interface TankVotes { - categories: Record; - votes: number; - last_updated?: number; -} export async function GET( request: NextRequest, diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 9c8895eef..66cef8692 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -31,4 +31,5 @@ export * from './tankIcon'; export * from './tankNames'; export * from './unionBoundingBox'; export * from './uniqueGuns'; +export * from './votes'; export * from './youtubers'; diff --git a/packages/core/src/blitzkit/votes.ts b/packages/core/src/blitzkit/votes.ts new file mode 100644 index 000000000..48ce62573 --- /dev/null +++ b/packages/core/src/blitzkit/votes.ts @@ -0,0 +1,7 @@ +import { TankVoteCategory } from '../../../api/src/app/tank-voting/[id]/cast/route'; + +export interface TankVotes { + categories: Record; + votes: number; + last_updated?: number; +} diff --git a/packages/website/src/app/auth/[provider]/layout.tsx b/packages/website/src/app/auth/[provider]/layout.tsx new file mode 100644 index 000000000..d6761abba --- /dev/null +++ b/packages/website/src/app/auth/[provider]/layout.tsx @@ -0,0 +1,5 @@ +import { PROVIDERS } from './page'; + +export async function generateStaticParams() { + return PROVIDERS.map((provider) => ({ provider })); +} diff --git a/packages/website/src/app/auth/[provider]/page.tsx b/packages/website/src/app/auth/[provider]/page.tsx index 306aa141c..9216c5e2e 100644 --- a/packages/website/src/app/auth/[provider]/page.tsx +++ b/packages/website/src/app/auth/[provider]/page.tsx @@ -6,6 +6,8 @@ import { useEffect } from 'react'; import PageWrapper from '../../../components/PageWrapper'; import * as App from '../../../stores/app'; +export const PROVIDERS = ['wargaming', 'patreon']; + export interface PatreonAuthResponse { access_token: string; expires_in: number; diff --git a/packages/website/src/hooks/useTankVotes.ts b/packages/website/src/hooks/useTankVotes.ts index dec1694e1..dbab43d43 100644 --- a/packages/website/src/hooks/useTankVotes.ts +++ b/packages/website/src/hooks/useTankVotes.ts @@ -1,5 +1,5 @@ +import { TankVotes } from '@blitzkit/core'; import { useEffect, useState } from 'react'; -import { TankVotes } from '../app/api/tank-voting/[id]/average/route'; import { unwrapBlitzkitResponse } from '../core/blitzkit/unwrapBlitzkitResponse'; import * as App from '../stores/app';