Skip to content

Feature/step no title #47

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 3 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
style step checkbox
  • Loading branch information
ShMcK committed Oct 30, 2019
commit f56ad565193f856178be0178f7f68962973d3ae0
3 changes: 1 addition & 2 deletions web-app/.storybook/addons.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '@storybook/addon-actions/register'
import '@storybook/addon-knobs/register'
import '@storybook/addon-links/register'
import '@storybook/addon-viewport/register'
import '@storybook/addon-links/register'
1 change: 1 addition & 0 deletions web-app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ErrorBoundary from './components/ErrorBoundary'
import client from './services/apollo'
import Routes from './Routes'


const App = () => (
<ErrorBoundary>
<ApolloProvider client={client}>
Expand Down
37 changes: 23 additions & 14 deletions web-app/src/containers/Tutorial/LevelPage/Level/Step/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,42 @@ interface Props {

const styles = {
card: {
display: 'grid',

padding: '0 1rem 1rem 0.5rem',
},
display: 'grid',
gridTemplateColumns: '25px 1fr',
padding: '1rem 1rem 1rem 0.5rem',
},
content: {
margin: 0
}
}

const Step = (props: Props) => {
// TODO: extract or replace load solution
const [loadedSolution, setLoadedSolution] = React.useState()

const onClickHandler = () => {
if (!loadedSolution) {
setLoadedSolution(true)
props.onLoadSolution()
}
}

const showLoadSolution = status === 'ACTIVE' && !loadedSolution
const showLoadSolution = props.status === 'ACTIVE' && !loadedSolution

return (
<div style={styles.card}>
<Checkbox
checked={status === 'COMPLETE'}
indeterminate={false}
disabled={status === 'INCOMPLETE'}
/>
<Markdown>{props.content || ''}</Markdown>
{showLoadSolution && <Button onClick={onClickHandler}>Load Solution</Button>}
<div>
<Checkbox
checked={props.status === 'COMPLETE'}
indeterminate={false /* TODO: running */}
disabled={props.status !== 'COMPLETE' /* TODO: and not running */}
onChange={() => {
/* do nothing */
}}
/>
</div>
<div id='content'>
<Markdown>{props.content || ''}</Markdown>
</div>
<div>{showLoadSolution && <Button onClick={onClickHandler}>Load Solution</Button>}</div>
</div>
)
}
Expand Down
6 changes: 3 additions & 3 deletions web-app/src/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}

.hover-select:hover {
cursor: pointer;
}
p {
margin: 0
}
18 changes: 10 additions & 8 deletions web-app/stories/Step.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { select, text, withKnobs } from '@storybook/addon-knobs'
import { storiesOf } from '@storybook/react'
import SideBarDecorator from './utils/SideBarDecorator'

import StepDescription from '../src/containers/Tutorial/LevelPage/Level/StepDescription'
import Step from '../src/containers/Tutorial/LevelPage/Level/Step'

const stepText =
'This is a long paragraph of step text intended to wrap around the side after a short period of writing to demonstrate text wrap among other things'
Expand Down Expand Up @@ -33,17 +33,19 @@ const paragraphText = `Markdown included \`code\`, *bold*, & _italics_.
storiesOf('Level', module)
.addDecorator(SideBarDecorator)
.addDecorator(withKnobs)
.add('Step Description', () => (
<StepDescription
text={text('text', stepText)}
mode={select('mode', { ACTIVE: 'ACTIVE', COMPLETE: 'COMPLETE', INCOMPLETE: 'INCOMPLETE' }, 'ACTIVE', 'step')}
.add('Step', () => (
<Step
order={1}
content={text('text', stepText)}
status={select('mode', { ACTIVE: 'ACTIVE', COMPLETE: 'COMPLETE', INCOMPLETE: 'INCOMPLETE' }, 'COMPLETE', 'step')}
onLoadSolution={action('onLoadSolution')}
/>
))
.add('Step Markdown', () => (
<StepDescription
text={text('text', paragraphText)}
mode={select('mode', { ACTIVE: 'ACTIVE', COMPLETE: 'COMPLETE', INCOMPLETE: 'INCOMPLETE' }, 'ACTIVE', 'step')}
<Step
order={2}
content={text('text', paragraphText)}
status={select('mode', { ACTIVE: 'ACTIVE', COMPLETE: 'COMPLETE', INCOMPLETE: 'INCOMPLETE' }, 'ACTIVE', 'step')}
onLoadSolution={action('onLoadSolution')}
/>
))