Merge branch 'dev' into twic

jackstenglein · Jul 22, 2024 · cd98da3 · cd98da3
2 parents 545c429 + a2ccdbd
commit cd98da3
Show file tree

Hide file tree

Showing 20 changed files with 241 additions and 79 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -35,10 +35,6 @@ jobs:
         env:
           AWS_COGNITO_USERNAME: ${{ secrets.AWS_COGNITO_USERNAME }}
           AWS_COGNITO_PASSWORD: ${{ secrets.AWS_COGNITO_PASSWORD }}
-          AWS_COGNITO_REGION: 'us-east-1'
-          AWS_COGNITO_USER_POOL_ID: 'us-east-1_apywr6kwu'
-          AWS_COGNITO_USER_POOL_WEB_CLIENT_ID: '76en8knncv8bfpfgbheua6j6k'
-          AWS_COGNITO_DOMAIN: 'user-pool-domain-dev-chess-dojo-scheduler.auth.us-east-1.amazoncognito.com'
 
       - name: Save Cypress Screenshots
         uses: actions/upload-artifact@v4

diff --git a/backend/pgnService/explorer/getPosition.ts b/backend/pgnService/explorer/getPosition.ts
@@ -17,6 +17,7 @@ import {
 
 const dynamo = new DynamoDBClient({ region: 'us-east-1' });
 const explorerTable = process.env.stage + '-explorer';
+const mastersTable = 'prod-masters-explorer';
 
 /**
  * Gets an ExplorerPosition for the provided FEN.
@@ -37,6 +38,7 @@ export const handler: APIGatewayProxyHandlerV2 = async (event) => {
 
         const results = await Promise.all([
             fetchFromDojo(normalizedFen),
+            fetchFromMasters(normalizedFen),
             fetchFromLichess(normalizedFen),
             fetchFromTablebase(normalizedFen),
             fetchFollower(normalizedFen, event),
@@ -47,9 +49,10 @@ export const handler: APIGatewayProxyHandlerV2 = async (event) => {
             body: JSON.stringify({
                 normalizedFen,
                 dojo: results[0],
-                lichess: results[1],
-                tablebase: results[2],
-                follower: results[3],
+                masters: results[1],
+                lichess: results[2],
+                tablebase: results[3],
+                follower: results[4],
             }),
         };
     } catch (err) {
@@ -81,6 +84,29 @@ async function fetchFromDojo(fen: string): Promise<ExplorerPosition | null> {
     return position as ExplorerPosition;
 }
 
+/**
+ * Fetches the ExplorerPosition associated with the given FEN from the Dojo masters database.
+ * @param fen The normalized FEN to fetch.
+ * @returns An ExplorerPosition for the provided FEN.
+ */
+async function fetchFromMasters(fen: string): Promise<ExplorerPosition | null> {
+    const getItemOutput = await dynamo.send(
+        new GetItemCommand({
+            Key: {
+                normalizedFen: { S: fen },
+                id: { S: 'POSITION' },
+            },
+            TableName: mastersTable,
+        }),
+    );
+    if (!getItemOutput.Item) {
+        return null;
+    }
+
+    const position = unmarshall(getItemOutput.Item);
+    return position as ExplorerPosition;
+}
+
 /**
  * Fetches the data from the Lichess API for the provided FEN.
  * @param fen The FEN to fetch from Lichess.

diff --git a/backend/pgnService/explorer/listGames.ts b/backend/pgnService/explorer/listGames.ts
@@ -8,6 +8,7 @@ import { ExplorerGame } from './types';
 
 const dynamo = new DynamoDBClient({ region: 'us-east-1' });
 const explorerTable = process.env.stage + '-explorer';
+const mastersTable = 'prod-masters-explorer';
 
 /**
  * Returns a list of games with the provided FEN. The FEN is normalized before searching for games.
@@ -31,18 +32,17 @@ export const handler: APIGatewayProxyHandlerV2 = async (event) => {
 
         const queryOutput = await dynamo.send(
             new QueryCommand({
-                KeyConditionExpression: `#fen = :fen AND #id BETWEEN :minId AND :maxId`,
+                KeyConditionExpression: `#fen = :fen AND begins_with ( #id, :id )`,
                 ExpressionAttributeNames: {
                     '#fen': 'normalizedFen',
                     '#id': 'id',
                 },
                 ExpressionAttributeValues: {
                     ':fen': { S: normalizedFen },
-                    ':minId': { S: masters ? 'GAME#masters' : 'GAME#' },
-                    ':maxId': { S: masters ? 'GAME#z' : 'GAME#masters' },
+                    ':id': { S: 'GAME#' },
                 },
                 ExclusiveStartKey: startKey ? JSON.parse(startKey) : undefined,
-                TableName: explorerTable,
+                TableName: masters ? mastersTable : explorerTable,
             }),
         );
 

diff --git a/backend/pgnService/serverless.yml b/backend/pgnService/serverless.yml
@@ -81,7 +81,9 @@ functions:
       - Effect: Allow
         Action:
           - dynamodb:GetItem
-        Resource: !GetAtt ExplorerTable.Arn
+        Resource:
+          - !GetAtt ExplorerTable.Arn
+          - arn:aws:dynamodb:${aws:region}:${aws:accountId}:table/prod-masters-explorer
 
   listGamesByPosition:
     handler: explorer/listGames.handler
@@ -96,7 +98,9 @@ functions:
       - Effect: Allow
         Action:
           - dynamodb:Query
-        Resource: !GetAtt ExplorerTable.Arn
+        Resource:
+          - !GetAtt ExplorerTable.Arn
+          - arn:aws:dynamodb:${aws:region}:${aws:accountId}:table/prod-masters-explorer
 
   followPosition:
     handler: explorer/followPosition.handler

diff --git a/frontend/.env.beta b/frontend/.env.beta
@@ -1,4 +1,4 @@
-# Auth variables
+# Auth
 NEXT_PUBLIC_AUTH_REGION=us-east-1
 NEXT_PUBLIC_AUTH_USER_POOL_ID=us-east-1_0revSxCzf
 NEXT_PUBLIC_AUTH_USER_POOL_WEB_CLIENT_ID=1dfi5rar7a2fr5samugigrmise
@@ -8,11 +8,14 @@ NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_IN=https://beta.chessdojo.club
 NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_OUT=https://beta.chessdojo.club
 NEXT_PUBLIC_AUTH_OAUTH_RESPONSE_TYPE=code
 
-# API variables
+# API
 NEXT_PUBLIC_API_BASE_URL=https://g4shdaq6ug.execute-api.us-east-1.amazonaws.com
 
-# Media variables
+# Media
 NEXT_PUBLIC_MEDIA_PICTURES_BUCKET=https://chess-dojo-prod-pictures.s3.amazonaws.com
 
-# Stripe variables
+# Stripe
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=pk_live_51OB6imGilmvijaecicnOhS1rqgX6VofcmTgi4n3TdhYoPgutx4W8HnUch6iQE7GL62fngez6mL471YWiZSrUhbJI007MlHx5CM
+
+# Site
+NEXT_PUBLIC_BASE_URL=https://beta.chessdojo.club
diff --git a/frontend/.env.development b/frontend/.env.development
@@ -1,4 +1,4 @@
-# Auth variables
+# Auth
 NEXT_PUBLIC_AUTH_REGION=us-east-1
 NEXT_PUBLIC_AUTH_USER_POOL_ID=us-east-1_apywr6kwu
 NEXT_PUBLIC_AUTH_USER_POOL_WEB_CLIENT_ID=76en8knncv8bfpfgbheua6j6k
@@ -8,11 +8,14 @@ NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_IN=http://localhost:3000
 NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_OUT=http://localhost:3000
 NEXT_PUBLIC_AUTH_OAUTH_RESPONSE_TYPE=code
 
-# API variables
+# API
 NEXT_PUBLIC_API_BASE_URL=https://c2qamdaw08.execute-api.us-east-1.amazonaws.com
 
-# Media variables
+# Media
 NEXT_PUBLIC_MEDIA_PICTURES_BUCKET=https://chess-dojo-dev-pictures.s3.amazonaws.com
 
-# Stripe variables
+# Stripe
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=pk_test_51OB6imGilmvijaecMJqdvLJdu89BcghnjU7eOIoCwlBl8DeV6i2XojJOaZ36lamZMuVjO7aorXtl90OcdtAstFfF0022uf0sdp
+
+# Site
+NEXT_PUBLIC_BASE_URL=http://localhost:3000
diff --git a/frontend/.env.production b/frontend/.env.production
@@ -1,4 +1,4 @@
-# Auth variables
+# Auth
 NEXT_PUBLIC_AUTH_REGION=us-east-1
 NEXT_PUBLIC_AUTH_USER_POOL_ID=us-east-1_0revSxCzf
 NEXT_PUBLIC_AUTH_USER_POOL_WEB_CLIENT_ID=1dfi5rar7a2fr5samugigrmise
@@ -8,11 +8,14 @@ NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_IN=https://www.chessdojo.club
 NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_OUT=https://www.chessdojo.club
 NEXT_PUBLIC_AUTH_OAUTH_RESPONSE_TYPE=code
 
-# API variables
+# API
 NEXT_PUBLIC_API_BASE_URL=https://g4shdaq6ug.execute-api.us-east-1.amazonaws.com
 
-# Media variables
+# Media
 NEXT_PUBLIC_MEDIA_PICTURES_BUCKET=https://chess-dojo-prod-pictures.s3.amazonaws.com
 
-# Stripe variables
+# Stripe
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=pk_live_51OB6imGilmvijaecicnOhS1rqgX6VofcmTgi4n3TdhYoPgutx4W8HnUch6iQE7GL62fngez6mL471YWiZSrUhbJI007MlHx5CM
+
+# Site
+NEXT_PUBLIC_BASE_URL=https://www.chessdojo.club
diff --git a/frontend/.env.test b/frontend/.env.test
@@ -1,18 +1,21 @@
-# Auth variables
+# Auth
 NEXT_PUBLIC_AUTH_REGION: us-east-1
 NEXT_PUBLIC_AUTH_USER_POOL_ID: us-east-1_apywr6kwu
 NEXT_PUBLIC_AUTH_USER_POOL_WEB_CLIENT_ID: 76en8knncv8bfpfgbheua6j6k
-NEXT_PUBLIC_AUTH_OAUTH_DOMAIN: authdev.chessdojo.club
+NEXT_PUBLIC_AUTH_OAUTH_DOMAIN: user-pool-domain-dev-chess-dojo-scheduler.auth.us-east-1.amazoncognito.com
 NEXT_PUBLIC_AUTH_OAUTH_SCOPES: profile,email,openid
 NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_IN: http://localhost:3000
 NEXT_PUBLIC_AUTH_OAUTH_REDIRECT_SIGN_OUT: http://localhost:3000
 NEXT_PUBLIC_AUTH_OAUTH_RESPONSE_TYPE: code
 
-# API variables
+# API
 NEXT_PUBLIC_API_BASE_URL: https://c2qamdaw08.execute-api.us-east-1.amazonaws.com
 
-# Media variables
+# Media
 NEXT_PUBLIC_MEDIA_PICTURES_BUCKET: https://chess-dojo-dev-pictures.s3.amazonaws.com
 
-# Stripe variables
+# Stripe
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: pk_test_51OB6imGilmvijaecMJqdvLJdu89BcghnjU7eOIoCwlBl8DeV6i2XojJOaZ36lamZMuVjO7aorXtl90OcdtAstFfF0022uf0sdp
+
+# Site
+NEXT_PUBLIC_BASE_URL=http://localhost:3000
diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
@@ -1,6 +1,13 @@
 import { defineConfig } from 'cypress';
+import dotenv from 'dotenv';
 import { EnvSchema } from './cypress/env';
 
+dotenv.config({
+    path: ['.env.test.local', '.env.local', '.env.test', '.env'],
+});
+
+const env = process.env;
+
 export default defineConfig({
     projectId: 'ut1fmk',
 
@@ -13,11 +20,15 @@ export default defineConfig({
         apiBaseUrl: 'https://c2qamdaw08.execute-api.us-east-1.amazonaws.com',
         numCohorts: 23,
 
-        cognito_username: process.env.AWS_COGNITO_USERNAME,
-        cognito_password: process.env.AWS_COGNITO_PASSWORD,
-        cognito_region: process.env.AWS_COGNITO_REGION,
-        cognito_user_pool_id: process.env.AWS_COGNITO_USER_POOL_ID,
-        cognito_user_pool_web_client_id: process.env.AWS_COGNITO_USER_POOL_WEB_CLIENT_ID,
-        cognito_domain: process.env.AWS_COGNITO_DOMAIN,
+        cognito_username: env.AWS_COGNITO_USERNAME,
+        cognito_password: env.AWS_COGNITO_PASSWORD,
+        cognito_region: env.NEXT_PUBLIC_AUTH_REGION,
+        cognito_user_pool_id:
+            env.AWS_COGNITO_USER_POOL_ID ?? env.NEXT_PUBLIC_AUTH_USER_POOL_ID,
+        cognito_user_pool_web_client_id:
+            env.AWS_COGNITO_USER_POOL_WEB_CLIENT_ID ??
+            env.NEXT_PUBLIC_AUTH_USER_POOL_WEB_CLIENT_ID,
+        cognito_domain:
+            env.AWS_COGNITO_DOMAIN ?? process.env.NEXT_PUBLIC_AUTH_OAUTH_DOMAIN,
     }),
 });
diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs
@@ -12,6 +12,11 @@ const nextConfig = {
                 hostname: 'chess-dojo-images.s3.amazonaws.com',
                 pathname: '**',
             },
+            {
+                protocol: 'https',
+                hostname: 'raw.githubusercontent.com',
+                pathname: '/jalpp/DojoIcons/**',
+            },
         ],
     },
 };

diff --git a/frontend/src/api/explorerApi.tsx b/frontend/src/api/explorerApi.tsx
@@ -38,6 +38,9 @@ export interface GetExplorerPositionResult {
     /** The data from the Dojo database. */
     dojo: ExplorerPosition | null;
 
+    /** The data from the Dojo masters database. */
+    masters: ExplorerPosition | null;
+
     /** The data from the Lichess database. */
     lichess: LichessExplorerPosition | null;
 

diff --git a/frontend/src/app/(legacy)/layout.tsx b/frontend/src/app/(legacy)/layout.tsx
@@ -1,11 +1,4 @@
 import { Layout } from '@/legacy/Layout';
-import { Metadata } from 'next';
-
-export const metadata: Metadata = {
-    title: 'ChessDojo',
-    description:
-        'View the scoreboard, schedule meetings and more for the ChessDojo Training Program',
-};
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
     return <Layout>{children}</Layout>;

diff --git a/frontend/src/app/(scoreboard)/layout.tsx b/frontend/src/app/(scoreboard)/layout.tsx
@@ -0,0 +1,5 @@
+import { Layout } from '@/legacy/Layout';
+
+export default function RootLayout({ children }: { children: React.ReactNode }) {
+    return <Layout>{children}</Layout>;
+}
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -1,5 +1,14 @@
+import { getConfig } from '@/config';
+import { Metadata } from 'next';
 import './globals.css';
 
+export const metadata: Metadata = {
+    metadataBase: getConfig().baseUrl,
+    title: 'ChessDojo Training Program',
+    description:
+        'The ChessDojo Training Program offers structured training plans for all levels 0-2500, along with an active and supportive community',
+};
+
 export default function RootLayout({ children }: { children: React.ReactNode }) {
     return (
         <html lang='en' suppressHydrationWarning>

diff --git a/frontend/src/app/opengraph-image.png b/frontend/src/app/opengraph-image.png
diff --git a/frontend/src/board/pgn/explorer/Explorer.tsx b/frontend/src/board/pgn/explorer/Explorer.tsx
@@ -60,6 +60,7 @@ const Explorer = () => {
                     follower: f,
                     normalizedFen: f.normalizedFen,
                     dojo: null,
+                    masters: null,
                     lichess: null,
                     tablebase: null,
                 });
@@ -77,7 +78,14 @@ const Explorer = () => {
         );
     };
 
-    const { dojo, lichess, tablebase, follower } = position || {};
+    const { dojo, masters, lichess, tablebase, follower } = position || {};
+
+    const selectedPosition =
+        tab === ExplorerDatabaseType.Dojo
+            ? dojo
+            : tab === ExplorerDatabaseType.Masters
+              ? masters
+              : lichess;
 
     return (
         <CardContent>
@@ -134,7 +142,7 @@ const Explorer = () => {
                     <Database
                         type={tab}
                         fen={fen}
-                        position={tab === ExplorerDatabaseType.Lichess ? lichess : dojo}
+                        position={selectedPosition}
                         request={request}
                         minCohort={minCohort}
                         maxCohort={maxCohort}

diff --git a/frontend/src/config.ts b/frontend/src/config.ts
@@ -25,31 +25,13 @@ export const EnvSchema = z.object({
     stripe: z.object({
         publishableKey: z.string(),
     }),
+    baseUrl: z
+        .string()
+        .url()
+        .transform((v) => new URL(v)),
 });
 
-export interface Config {
-    auth: {
-        region: 'us-east-1';
-        userPoolId: string;
-        userPoolWebClientId: string;
-        oauth: {
-            domain: string;
-            scope: string[];
-            redirectSignIn: string;
-            redirectSignOut: string;
-            responseType: 'code';
-        };
-    };
-    api: {
-        baseUrl: string;
-    };
-    media: {
-        picturesBucket: string;
-    };
-    stripe: {
-        publishableKey: string;
-    };
-}
+export type Config = z.infer<typeof EnvSchema>;
 
 export function getConfig(): Config {
     return EnvSchema.parse({
@@ -74,5 +56,6 @@ export function getConfig(): Config {
         stripe: {
             publishableKey: process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY,
         },
+        baseUrl: process.env.NEXT_PUBLIC_BASE_URL,
     });
 }