Skip to content

Fix/continue #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Fix/continue #255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa86304
clean up logs
ShMcK Apr 12, 2020
9168e37
fix continue init load
ShMcK Apr 12, 2020
1259451
refactor tutorial pages
ShMcK Apr 12, 2020
64409c9
fix log due to env being prod
ShMcK Apr 12, 2020
b8ff86b
cleanup routes
ShMcK Apr 12, 2020
738fb7a
continue progress
ShMcK Apr 13, 2020
a23f997
cleanup
ShMcK Apr 13, 2020
a7f1527
continue progress
ShMcK Apr 18, 2020
b4af893
fix broken steps
ShMcK Apr 18, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup routes 
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
  • Loading branch information
@ShMcK
ShMcK committed Apr 18, 2020
commit b8ff86b14299ab4e637f7aba3e1c05850720b68d
4 changes: 2 additions & 2 deletions typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ export interface MachineStateSchema {
Setup: {
states: {
Startup: {}
Start: {}
ValidateSetup: {}
Start: {}
SelectTutorial: {}
SetupNewTutorial: {}
StartNewTutorial: {}
StartTutorial: {}
}
}
Tutorial: {
Expand Down
5 changes: 1 addition & 4 deletions web-app/src/Routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,10 @@ const Routes = () => {
<Route path="Setup.Start">
<StartPage send={send} context={context} />
</Route>
<Route path={['Setup.LoadTutorialSummary', 'Setup.LoadTutorialData', 'Setup.SetupNewTutorial']}>
<LoadingPage text="Loading Tutorial..." />
</Route>
<Route path="Setup.SelectTutorial">
<SelectTutorialPage send={send} context={context} />
</Route>
<Route path={['Setup.SetupNewTutorial', 'Setup.StartNewTutorial']}>
<Route path={['Setup.SetupNewTutorial', 'Setup.StartTutorial']}>
<LoadingPage text="Configuring tutorial..." />
</Route>
{/* Tutorial */}
Expand Down
1 change: 0 additions & 1 deletion web-app/src/containers/Tutorial/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const TutorialPage = (props: PageProps) => {
const levelData: TT.Level = selectors.currentLevel(props.context)

const onContinue = (): void => {
console.log('onContinue triggered')
props.send({
type: 'LEVEL_NEXT',
payload: {
Expand Down
8 changes: 4 additions & 4 deletions web-app/src/services/state/machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const createMachine = (options: any) => {
on: {
NEW_TUTORIAL: 'ValidateSetup',
CONTINUE_TUTORIAL: {
target: '#tutorial-level',
target: 'StartTutorial',
actions: ['continueConfig'],
},
CONTINUE_FAILED: {
Expand All @@ -107,11 +107,11 @@ export const createMachine = (options: any) => {
actions: ['setError'],
},
TRY_AGAIN: 'SetupNewTutorial',
TUTORIAL_CONFIGURED: 'StartNewTutorial',
TUTORIAL_CONFIGURED: 'StartTutorial',
},
},
StartNewTutorial: {
onEntry: ['startNewTutorial'],
StartTutorial: {
onEntry: ['StartTutorial'],
after: {
0: '#tutorial',
},
Expand Down