Skip to content

Feature/improve load solution ui #103

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

Merged
merged 2 commits into from
Feb 2, 2020
Merged

Feature/improve load solution ui #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
649efa6
closes #92. fix up load next step ui
ShMcK Feb 2, 2020
de2d0e0
fix overview page bottom spacing
ShMcK Feb 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions web-app/src/components/StepHelp/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Balloon } from '@alifd/next'
import * as React from 'react'
import { css, jsx } from '@emotion/core'
import Icon from '../Icon'
import Button from '../Button'

const styles = {
Expand Down Expand Up @@ -28,17 +29,32 @@ interface Props {
}

const StepHelp = (props: Props) => {
const [visible, setVisible] = React.useState(false)
// TODO extract or replace load solution
const [loadedSolution, setLoadedSolution] = React.useState()
const onClickHandler = () => {
if (!loadedSolution) {
setLoadedSolution(true)
props.onLoadSolution()
setVisible(false)
}
}
const promptLeft = <Button css={styles.iconButton}>i</Button>
const promptLeft = (
<Button css={styles.iconButton} onClick={() => setVisible(!visible)}>
<Icon type="help" />
</Button>
)
return (
<Balloon trigger={promptLeft} align="l" alignEdge triggerType="click" css={{ width: 150 }} closable={false}>
<Balloon
trigger={promptLeft}
align="l"
alignEdge
triggerType="click"
css={{ width: 150 }}
closable
visible={visible}
onClose={() => setVisible(false)}
>
<div>
<h4 css={styles.balloonTitle}>Stuck?</h4>
<div css={styles.balloonOptions}>
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/containers/Overview/OverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const styles = {
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
width: '100%',
paddingBottom: footerHeight,
paddingBottom: '5rem',
},
summary: {
padding: '0rem 1rem 1rem 1rem',
Expand Down
9 changes: 2 additions & 7 deletions web-app/stories/Step.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,8 @@ const paragraphText = `Markdown included \`code\`, *bold*, & _italics_.
storiesOf('Level', module)
.addDecorator(SideBarDecorator)
.addDecorator(withKnobs)
.add('Step', () => (
<Step
order={1}
content={text('text', stepText)}
status={select('mode', { ACTIVE: 'ACTIVE', COMPLETE: 'COMPLETE', INCOMPLETE: 'INCOMPLETE' }, 'COMPLETE', 'step')}
onLoadSolution={action('onLoadSolution')}
/>
.add('Active Step', () => (
<Step order={1} content={text('text', stepText)} status="ACTIVE" onLoadSolution={action('onLoadSolution')} />
))
.add('Step Markdown', () => (
<Step
Expand Down