- Notifications
You must be signed in to change notification settings - Fork42
Feature/progress#390
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Feature/progress#390
Changes fromall commits
Commits
Show all changes
5 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
69 changes: 69 additions & 0 deletionsweb-app/src/containers/Tutorial/components/Continue.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import * as React from 'react' | ||
| import { Dialog } from '@alifd/next' | ||
| import { css, jsx } from '@emotion/core' | ||
| import Button from '../../../components/Button' | ||
| import ProgressPie from './ProgressPie' | ||
| const styles = { | ||
| content: { | ||
| display: 'flex' as 'flex', | ||
| flexDirection: 'column' as 'column', | ||
| justifyContent: 'center' as 'center', | ||
| alignItems: 'center' as 'center', | ||
| }, | ||
| message: { | ||
| textAlign: 'center' as 'center', | ||
| }, | ||
| } | ||
| interface Props { | ||
| title: string | ||
| current: number // level index | ||
| max: number // level count | ||
| onContinue(): void | ||
| } | ||
| const Continue = (props: Props) => { | ||
| const [modalState, setModalState] = React.useState<'closed' | 'open'>('closed') | ||
| const onClose = () => { | ||
| setModalState('closed') | ||
| } | ||
| const onOpen = () => { | ||
| setModalState('open') | ||
| } | ||
| const onContinue = () => { | ||
| props.onContinue() | ||
| onClose() | ||
| } | ||
| return ( | ||
| <> | ||
| <Button type="primary" size="medium" onClick={onOpen}> | ||
| Continue | ||
| </Button> | ||
| <Dialog | ||
| title="Level Complete!" | ||
| visible={modalState === 'open'} | ||
| onClose={onClose} | ||
| footer={false} | ||
| css={{ padding: '1rem' }} | ||
| > | ||
| <div css={styles.content}> | ||
| <ProgressPie current={props.current} max={props.max} /> | ||
| <div css={styles.message}> | ||
| <h3>{props.title}</h3> | ||
| <br /> | ||
| <Button type="primary" size="large" onClick={onContinue}> | ||
| Continue | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| </Dialog> | ||
| </> | ||
| ) | ||
| } | ||
| export default Continue |
37 changes: 37 additions & 0 deletionsweb-app/src/containers/Tutorial/components/ProgressPie.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import * as React from 'react' | ||
| import { Progress, Icon } from '@alifd/next' | ||
| interface Props { | ||
| current: number | ||
| max: number | ||
| } | ||
| const ProgressPie = (props: Props) => { | ||
| const [progress, setProgress] = React.useState(0) | ||
| React.useEffect(() => { | ||
| let timeout: any | ||
| if (progress < props.current) { | ||
| timeout = setTimeout(() => { | ||
| setProgress(progress + 1) | ||
| }, 100) | ||
| } | ||
| return () => { | ||
| if (timeout) { | ||
| clearTimeout(timeout) | ||
| } | ||
| } | ||
| }, [progress]) | ||
| const progressPercent = Math.floor((progress / props.max) * 100) | ||
| return ( | ||
| <Progress | ||
| percent={progressPercent} | ||
| shape="circle" | ||
| textRender={() => (progressPercent === 100 ? <Icon type="select" size="xl" /> : `${progressPercent}%`)} | ||
| /> | ||
| ) | ||
| } | ||
| export default ProgressPie |
2 changes: 1 addition & 1 deletionweb-app/src/containers/Tutorial/components/Reset.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletionweb-app/src/containers/Tutorial/formatLevels.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
20 changes: 13 additions & 7 deletionsweb-app/src/containers/Tutorial/index.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletionsweb-app/stories/Modals.stories.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import { action } from '@storybook/addon-actions' | ||
| import { withKnobs } from '@storybook/addon-knobs' | ||
| import { storiesOf } from '@storybook/react' | ||
| import React from 'react' | ||
| import SideBarDecorator from './utils/SideBarDecorator' | ||
| import Reset from '../src/containers/Tutorial/components/Reset' | ||
| import Continue from '../src/containers/Tutorial/components/Continue' | ||
| storiesOf('Modals', module) | ||
| .addDecorator(SideBarDecorator) | ||
| .addDecorator(withKnobs) | ||
| .add('Reset', () => <Reset onReset={action('onReset')} />) | ||
| .add('Continue', () => <Continue title="Tutorial Title" current={9} max={11} onContinue={action('onContinue')} />) | ||
| .add('Continue Complete', () => ( | ||
| <Continue title="Tutorial Title" current={11} max={11} onContinue={action('onContinue')} /> | ||
| )) |
37 changes: 9 additions & 28 deletionsweb-app/stories/Tutorial.stories.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.