From 10d8ee81b35e192df9faa51241b9d3a9900720f1 Mon Sep 17 00:00:00 2001 From: Gokul Rajiv Date: Sun, 8 Aug 2021 03:23:59 +0800 Subject: [PATCH 1/4] add courses to url --- src/features/game/save/GameSaveRequests.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/features/game/save/GameSaveRequests.ts b/src/features/game/save/GameSaveRequests.ts index e2a3e1d516..0dfd2721a1 100644 --- a/src/features/game/save/GameSaveRequests.ts +++ b/src/features/game/save/GameSaveRequests.ts @@ -24,7 +24,10 @@ export async function saveData(fullSaveState: FullSaveState) { }) }; - const resp = await fetch(`${Constants.backendUrl}/v2/${courseId()}/user/game_states`, options); + const resp = await fetch( + `${Constants.backendUrl}/v2/courses/${courseId()}/user/game_states`, + options + ); if (resp && resp.ok) { return resp; @@ -41,7 +44,7 @@ export async function loadData(): Promise { headers: createHeaders(SourceAcademyGame.getInstance().getAccountInfo().accessToken) }; - const resp = await fetch(`${Constants.backendUrl}/v2/${courseId()}/user/`, options); + const resp = await fetch(`${Constants.backendUrl}/v2/courses/${courseId()}/user/`, options); const message = await resp.text(); const json = JSON.parse(message).gameStates; From 02c87dfb3e35d98ffe5d727c5e2a4ad26a3cd0fe Mon Sep 17 00:00:00 2001 From: Gokul Rajiv Date: Sun, 8 Aug 2021 03:55:17 +0800 Subject: [PATCH 2/4] revert user endpoint --- src/features/game/save/GameSaveRequests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/game/save/GameSaveRequests.ts b/src/features/game/save/GameSaveRequests.ts index 0dfd2721a1..4ae99c22cb 100644 --- a/src/features/game/save/GameSaveRequests.ts +++ b/src/features/game/save/GameSaveRequests.ts @@ -44,7 +44,7 @@ export async function loadData(): Promise { headers: createHeaders(SourceAcademyGame.getInstance().getAccountInfo().accessToken) }; - const resp = await fetch(`${Constants.backendUrl}/v2/courses/${courseId()}/user/`, options); + const resp = await fetch(`${Constants.backendUrl}/v2/user`, options); const message = await resp.text(); const json = JSON.parse(message).gameStates; From 125ca08c3595a9a58fd42723e4ef39fb27a66b21 Mon Sep 17 00:00:00 2001 From: Gokul Rajiv Date: Sun, 8 Aug 2021 04:18:11 +0800 Subject: [PATCH 3/4] fix getting gamestate --- src/features/game/save/GameSaveRequests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/game/save/GameSaveRequests.ts b/src/features/game/save/GameSaveRequests.ts index 4ae99c22cb..0df8428cd1 100644 --- a/src/features/game/save/GameSaveRequests.ts +++ b/src/features/game/save/GameSaveRequests.ts @@ -47,7 +47,7 @@ export async function loadData(): Promise { const resp = await fetch(`${Constants.backendUrl}/v2/user`, options); const message = await resp.text(); - const json = JSON.parse(message).gameStates; + const json = JSON.parse(message).courseRegistration?.gameStates; return _.isEmpty(json) ? createEmptySaveState() : json; } From fbe2424189a6480524b5a85883ad920075f5e1f6 Mon Sep 17 00:00:00 2001 From: Gokul Rajiv Date: Sun, 8 Aug 2021 05:56:10 +0800 Subject: [PATCH 4/4] fix mock chapter paths --- src/features/game/chapter/GameChapterMocks.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/features/game/chapter/GameChapterMocks.ts b/src/features/game/chapter/GameChapterMocks.ts index 657eea0eab..fe0aa07d51 100644 --- a/src/features/game/chapter/GameChapterMocks.ts +++ b/src/features/game/chapter/GameChapterMocks.ts @@ -4,17 +4,17 @@ const GameChapterMocks: GameChapter[] = [ { title: 'Spaceship Emergency', imageUrl: '/locations/planet-y-orbit/crashing.png', - filenames: ['../assets/mockChapter0.txt', '../assets/mockChapter0.1.txt'] + filenames: ['../../assets/mockChapter0.txt', '../../assets/mockChapter0.1.txt'] }, { title: 'Alien Attack', imageUrl: '/locations/telebay/emergency.png', - filenames: ['../assets/mockChapter1.txt'] + filenames: ['../../assets/mockChapter1.txt'] }, { title: 'Jedi Master', imageUrl: '/locations/classroom/normal.png', - filenames: ['../assets/mockChapter2.txt'] + filenames: ['../../assets/mockChapter2.txt'] } ]; export default GameChapterMocks;