Skip to content

Feature/on reset #388

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.

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

Merged
merged 9 commits into from
Jul 12, 2020
Prev Previous commit
Next Next commit
add review ui
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
  • Loading branch information
ShMcK committed Jul 12, 2020
commit e4b3ff9393f0dd6ca3393991611175f89ac41aed
53 changes: 53 additions & 0 deletions web-app/src/containers/Tutorial/components/Reset.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import * as React from 'react'
import { Dialog } from '@alifd/next'
import Button from '../../../components/Button'

interface Props {
onReset(): void
}

const Reset = (props: Props) => {
const [modalState, setModalState] = React.useState<'none' | 'confirm' | 'progress'>('none')

const onClose = () => {
setModalState('none')
}

const onOk = () => {
setModalState('progress')
props.onReset()
return setTimeout(() => {
setModalState('none')
}, 3000)
}

return (
<>
<Button type="secondary" onClick={() => setModalState('confirm')}>
Reset
</Button>
{/* TODO improve reset message */}
<Dialog
title="Reset"
visible={modalState === 'confirm'}
onOk={onOk}
onCancel={onClose}
onClose={onClose}
footerActions={['ok', 'cancel']}
>
Are you sure?
</Dialog>
<Dialog
title="Resetting..."
visible={modalState === 'progress'}
footer={false}
onClose={onClose}
closeable={false}
>
Reverting progress to an earlier commit...
</Dialog>
</>
)
}

export default Reset
11 changes: 9 additions & 2 deletions web-app/src/containers/Tutorial/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import * as selectors from '../../services/selectors'
import SideMenu from './components/SideMenu'
import Level from './components/Level'
import Icon from '../../components/Icon'
import SettingsPage from './containers/Settings'
// import SettingsPage from './containers/Settings'
import ReviewPage from './containers/Review'
import Button from '../../components/Button'
import Reset from './components/Reset'
import ProcessMessages from '../../components/ProcessMessages'
import TestMessage from '../../components/TestMessage'
import { Progress } from '@alifd/next'
Expand Down Expand Up @@ -100,6 +101,10 @@ const TutorialPage = (props: PageProps) => {
props.send({ type: 'RUN_TEST' })
}

const onReset = (): void => {
// TODO
}

const [menuVisible, setMenuVisible] = React.useState(false)

const [page, setPage] = React.useState<'level' | 'settings' | 'review'>('level')
Expand Down Expand Up @@ -149,7 +154,9 @@ const TutorialPage = (props: PageProps) => {
)}

{/* Center */}
<div />
<div>
<Reset onReset={onReset} />
</div>

{/* Right */}
<div>
Expand Down
13 changes: 1 addition & 12 deletions web-app/stories/Review.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,5 @@ storiesOf('Review', module)
.addDecorator(SideBarDecorator)
.addDecorator(withKnobs)
.add('Example', () => {
const progress = {
levels: {
'1': true,
},
steps: {
'1.1': true,
'1.2': true,
'1.3': true,
'2.1': true,
},
}
return <Review levels={levels} progress={progress} />
return <Review levels={levels} />
})