Skip to content

Commit 209b07b

Browse files
committed
remove level headers
Signed-off-by: shmck <[email protected]>
1 parent 038e782 commit 209b07b

File tree

2 files changed

+30
-21
lines changed

2 files changed

+30
-21
lines changed

web-app/src/containers/Tutorial/components/Level.tsx

+18-19
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Icon from '../../../components/Icon'
77
import Button from '../../../components/Button'
88
import Markdown from '../../../components/Markdown'
99
import ProcessMessages from '../../../components/ProcessMessages'
10-
import NuxTutorial from '../../../components/NewUserExperience/NuxTutorial'
1110
import ContentMenu from './ContentMenu'
1211
import Step from './Step'
1312
import { DISPLAY_RUN_TEST_BUTTON } from '../../../environment'
@@ -43,6 +42,10 @@ const styles = {
4342
padding: '0rem 1rem',
4443
paddingBottom: '1rem',
4544
},
45+
separator: {
46+
height: 0,
47+
borderBottom: '1px solid rgba(0, 0, 0, 0.1)',
48+
},
4649
tasks: {},
4750
steps: {
4851
padding: '1rem 1rem',
@@ -171,30 +174,30 @@ const Level = ({
171174

172175
return (
173176
<div css={styles.page}>
177+
<div css={styles.header}>
178+
<Dropdown
179+
trigger={
180+
<a css={styles.learn}>
181+
{tutorial.summary.title} <Icon type="arrow-down" size="xxs" />
182+
</a>
183+
}
184+
triggerType="click"
185+
>
186+
{menu}
187+
</Dropdown>
188+
</div>
174189
<div css={styles.content}>
175-
<div css={styles.header}>
176-
<Dropdown
177-
trigger={
178-
<a css={styles.learn}>
179-
Learn <Icon type="arrow-down" size="xxs" />
180-
</a>
181-
}
182-
triggerType="click"
183-
>
184-
{menu}
185-
</Dropdown>
186-
</div>
187-
188190
{content.length ? (
189191
<div css={styles.text}>
190192
<h2 css={styles.title}>{title}</h2>
191193
<Markdown>{content || ''}</Markdown>
192194
</div>
193195
) : null}
194196

197+
{content.length && steps.length ? <div css={styles.separator} /> : null}
198+
195199
{steps.length ? (
196200
<div css={styles.tasks}>
197-
<div css={styles.header}>Tasks</div>
198201
<div css={styles.steps}>
199202
{steps.map((step: (TT.Step & { status: T.ProgressStatus }) | null, stepIndex: number) => {
200203
if (!step) {
@@ -233,10 +236,6 @@ const Level = ({
233236
</div>
234237
)}
235238

236-
<div css={styles.nux}>
237-
<NuxTutorial onLoadSolution={onLoadSolution} />
238-
</div>
239-
240239
<div css={styles.footer}>
241240
{DISPLAY_RUN_TEST_BUTTON && status !== 'COMPLETE' ? (
242241
<Button type="primary" onClick={onRunTest} disabled={processes.length > 0}>

web-app/stories/Level.stories.tsx

+12-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ type ModifiedLevel = TT.Level & {
1414
}
1515

1616
const tutorial: Partial<TT.Tutorial> = {
17+
summary: {
18+
title: 'Example Title',
19+
description: 'An example description',
20+
},
1721
levels: [
1822
{
1923
id: '1',
@@ -96,7 +100,10 @@ storiesOf('Level', module)
96100
))
97101
.add('No steps', () => (
98102
<Level
99-
tutorial={{ levels: [{ id: '1', title: 'No Step Level', content: 'No steps in this one', steps: [] }] }}
103+
tutorial={{
104+
summary: tutorial.summary,
105+
levels: [{ id: '1', title: 'No Step Level', content: 'No steps in this one', steps: [] }],
106+
}}
100107
index={0}
101108
status="ACTIVE"
102109
position={{ levelId: '1', stepId: null, complete: false }}
@@ -111,7 +118,10 @@ storiesOf('Level', module)
111118
))
112119
.add('No lesson', () => (
113120
<Level
114-
tutorial={{ levels: [{ id: '1', title: 'No Step Level', content: '', steps: tutorial.levels[0].steps }] }}
121+
tutorial={{
122+
summary: tutorial.summary,
123+
levels: [{ id: '1', title: 'No Step Level', content: '', steps: tutorial.levels[0].steps }],
124+
}}
115125
index={0}
116126
status="ACTIVE"
117127
position={{ levelId: '1', stepId: '1.1', complete: false }}

0 commit comments

Comments
 (0)