From 683c8693271b3e348ab5ab0a479fbb3bd27b4832 Mon Sep 17 00:00:00 2001 From: shmck Date: Fri, 24 Jul 2020 20:50:05 -0700 Subject: [PATCH 1/3] fix no next step bug Signed-off-by: shmck --- web-app/src/services/state/actions/context.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-app/src/services/state/actions/context.ts b/web-app/src/services/state/actions/context.ts index 4a32d440..2ca04032 100644 --- a/web-app/src/services/state/actions/context.ts +++ b/web-app/src/services/state/actions/context.ts @@ -79,7 +79,7 @@ const contextActions: ActionFunctionMap = { const nextPosition: T.Position = { levelId: level.id, - stepId: level.steps[0].id, + stepId: level.steps.length ? level.steps[0].id : null, } return nextPosition @@ -163,7 +163,7 @@ const contextActions: ActionFunctionMap = { const nextLevel = levels[levelIndex + 1] const nextPosition = { levelId: nextLevel.id, - stepId: nextLevel.steps[0].id, + stepId: nextLevel.steps.length ? nextLevel.steps[0].id : null, } return { type: 'NEXT_LEVEL', payload: nextPosition } } From bec93ec56029879faea0f9d1b28b06be30490a46 Mon Sep 17 00:00:00 2001 From: shmck Date: Fri, 24 Jul 2020 21:02:27 -0700 Subject: [PATCH 2/3] fix issue when final level complete but not continued Signed-off-by: shmck --- src/services/context/state/Position.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/services/context/state/Position.ts b/src/services/context/state/Position.ts index 88caca58..d5968d37 100644 --- a/src/services/context/state/Position.ts +++ b/src/services/context/state/Position.ts @@ -42,6 +42,15 @@ class Position { // get step const currentLevel: TT.Level = levels[lastLevelIndex] + if (!currentLevel) { + // tutorial complete but not reached completed view + const finalLevel = levels[levels.length - 1] + return { + levelId: finalLevel.id, + stepId: finalLevel.steps.length ? finalLevel.steps[finalLevel.steps.length - 1].id : null, + complete: true, + } + } let currentStepId: string | null if (!currentLevel.steps.length) { // no steps available for level From 91a00eb6001aa34f50d51ca331c86e5a35197346 Mon Sep 17 00:00:00 2001 From: shmck Date: Fri, 24 Jul 2020 21:02:53 -0700 Subject: [PATCH 3/3] fix loading styles Signed-off-by: shmck --- web-app/src/components/Error/index.tsx | 4 ++-- web-app/src/containers/Loading/index.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web-app/src/components/Error/index.tsx b/web-app/src/components/Error/index.tsx index 2a9278c2..5c1bf828 100644 --- a/web-app/src/components/Error/index.tsx +++ b/web-app/src/components/Error/index.tsx @@ -14,9 +14,9 @@ const styles = { alignItems: 'center' as 'center', border: `0.5rem solid ${theme['$color-error-2']}`, padding: '1rem', - width: '100%', + width: '100vw', maxWidth: '100%', - height: '100%', + height: '100vh', }), content: (theme: Theme) => ({ textAlign: 'center' as 'center', diff --git a/web-app/src/containers/Loading/index.tsx b/web-app/src/containers/Loading/index.tsx index 535946c7..bb55882a 100644 --- a/web-app/src/containers/Loading/index.tsx +++ b/web-app/src/containers/Loading/index.tsx @@ -16,8 +16,8 @@ const styles = { flexDirection: 'column' as 'column', alignItems: 'center' as 'center', justifyContent: 'center' as 'center', - height: '100%', - width: '100%', + height: '100vh', + width: '100vw', }, processes: { padding: '0 1rem',