Skip to content

Fix/no steps #167

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 4 commits into from
Mar 28, 2020
Merged

Fix/no steps #167

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76420e5
render level with no steps
ShMcK Mar 23, 2020
367c98c
step progress
ShMcK Mar 27, 2020
81489f8
allow levels with no steps
ShMcK Mar 28, 2020
72cf55c
fix bottom padding on level page
ShMcK Mar 28, 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
fix bottom padding on level page
  • Loading branch information
@ShMcK
ShMcK committed Mar 28, 2020
commit 72cf55cea94e4087edf3c62872ff7549145cb895
117 changes: 60 additions & 57 deletions web-app/src/containers/Tutorial/LevelPage/Level.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ const styles = {
page: {
backgroundColor: 'white',
position: 'relative' as 'relative',
height: 'auto',
width: '100%',
},
content: {
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
padding: 0,
paddingBottom: '5rem',
height: 'auto',
width: '100%',
},
header: {
height: '2rem',
Expand All @@ -26,13 +28,11 @@ const styles = {
lineHeight: '1rem',
padding: '10px 1rem',
},
content: {
text: {
padding: '0rem 1rem',
paddingBottom: '1rem',
},
tasks: {
paddingBottom: '5rem',
},
tasks: {},
steps: {
padding: '1rem 1rem',
},
Expand Down Expand Up @@ -101,63 +101,66 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro

return (
<div css={styles.page}>
<div css={styles.header}>
<span>Learn</span>
</div>
<div css={styles.content}>
<h2 css={styles.title}>{level.title}</h2>
<Markdown>{level.content || ''}</Markdown>
</div>
<div css={styles.header}>
<span>Learn</span>
</div>
<div css={styles.text}>
<h2 css={styles.title}>{level.title}</h2>
<Markdown>{level.content || ''}</Markdown>
</div>

{level.steps.length ? (
<div css={styles.tasks}>
<div css={styles.header}>Tasks</div>
<div css={styles.steps}>
{level.steps.map((step: (G.Step & { status: T.ProgressStatus }) | null, index: number) => {
if (!step) {
return null
}
return (
<Step
key={step.id}
order={index + 1}
status={step.status}
content={step.content}
onLoadSolution={onLoadSolution}
/>
)
})}
{level.steps.length ? (
<div css={styles.tasks}>
<div css={styles.header}>Tasks</div>
<div css={styles.steps}>
{level.steps.map((step: (G.Step & { status: T.ProgressStatus }) | null, index: number) => {
if (!step) {
return null
}
return (
<Step
key={step.id}
order={index + 1}
status={step.status}
content={step.content}
onLoadSolution={onLoadSolution}
/>
)
})}
</div>
</div>
</div>
) : null}
<div ref={pageBottomRef} />
) : null}

{(testStatus || processes.length > 0) && (
<div css={styles.processes}>
<ProcessMessages processes={processes} testStatus={testStatus} />
</div>
)}
<div ref={pageBottomRef} />

<div css={styles.nux}>
<NuxTutorial onLoadSolution={onLoadSolution} />
</div>
{(testStatus || processes.length > 0) && (
<div css={styles.processes}>
<ProcessMessages processes={processes} testStatus={testStatus} />
</div>
)}

<div css={styles.footer}>
<span>
{typeof level.index === 'number' ? `${level.index + 1}. ` : ''}
{level.title}
</span>
<span>
{level.status === 'COMPLETE' || !level.steps.length ? (
<Button type="primary" onClick={onContinue}>
Continue
</Button>
) : (
<span css={styles.taskCount}>
{currentStep} of {level.steps.length} tasks
</span>
)}
</span>
<div css={styles.nux}>
<NuxTutorial onLoadSolution={onLoadSolution} />
</div>

<div css={styles.footer}>
<span>
{typeof level.index === 'number' ? `${level.index + 1}. ` : ''}
{level.title}
</span>
<span>
{level.status === 'COMPLETE' || !level.steps.length ? (
<Button type="primary" onClick={onContinue}>
Continue
</Button>
) : (
<span css={styles.taskCount}>
{currentStep} of {level.steps.length} tasks
</span>
)}
</span>
</div>
</div>
</div>
)
Expand Down