Commit1037582

authored

Merge pull requestcoderoad#355 from coderoad/fix/summary-markdown

add markdown support to tutorial overview

2 parents1d38411 +da39942 commit1037582Copy full SHA for 1037582

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`import*asTTfrom'typings/tutorial'`
`3`	`3`	`// import moment from 'moment'`
`4`		`-importButtonfrom'../Button'`
`5`		`-importMarkdownfrom'../Markdown'`
	`4`	`+importButtonfrom'../../../components/Button'`
	`5`	`+importMarkdownfrom'../../../components/Markdown'`
`6`	`6`	`import{Breadcrumb}from'@alifd/next'`
`7`	`7`
`8`	`8`	`constfooterHeight='3rem'`
`@@ -88,8 +88,8 @@ const Summary = (props: Props) => {`
`88`	`88`	`</Breadcrumb.Item>`
`89`	`89`	`</Breadcrumb>`
`90`	`90`	`</div>`
`91`		`-<h1css={styles.title}>{props.tutorial.summary.title}</h1>`
`92`		`-<h3>{props.tutorial.summary.description}</h3>`
	`91`	+<Markdowncss={styles.title}>{`#${props.tutorial.summary.title}`}</Markdown>
	`92`	+<Markdown>{`###${props.tutorial.summary.description}`}</Markdown>
`93`	`93`	`{/* <h5 css={styles.meta}>`
`94`	`94`	`<div css={{ marginRight: '2rem' }}>Created by {props.createdBy.name}</div>`
`95`	`95`	`<div>Last updated {moment(props.updatedAt).format('M/YYYY')}</div>`
`@@ -100,9 +100,7 @@ const Summary = (props: Props) => {`
`100`	`100`	`<h2>Content</h2>`
`101`	`101`	`{props.tutorial.levels.map((level:TT.Level,index:number)=>(`
`102`	`102`	`<divkey={index}>`
`103`		`-<h3>`
`104`		`-{index+1}.{level.title}`
`105`		`-</h3>`
	`103`	+<Markdown>{`###${index+1}.${level.title}`}</Markdown>
`106`	`104`	`<divcss={styles.levelSummary}>`
`107`	`105`	`<Markdown>{level.summary}</Markdown>`
`108`	`106`	`</div>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import*asTTfrom'typings/tutorial'`
`2`	`2`	`import*asReactfrom'react'`
`3`	`3`	`importSelectTutorialFormfrom'./SelectTutorialForm'`
`4`		`-importTutorialOverviewfrom'../../components/TutorialOverview'`
	`4`	`+importTutorialOverviewfrom'./TutorialOverview'`
`5`	`5`	`importLoadTutorialSummaryfrom'./LoadTutorialSummary'`
`6`	`6`	`importprocessTutorialfrom'../../services/tutorial'`
`7`	`7`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { linkTo } from '@storybook/addon-links'`
`3`	`3`	`import{action}from'@storybook/addon-actions'`
`4`	`4`	`import{storiesOf}from'@storybook/react'`
`5`	`5`	`importReactfrom'react'`
`6`		`-importOverViewPagefrom'../src/components/TutorialOverview'`
	`6`	`+importOverViewPagefrom'../src/containers/SelectTutorial/TutorialOverview'`
`7`	`7`	`importSideBarDecoratorfrom'./utils/SideBarDecorator'`
`8`	`8`
`9`	`9`	`storiesOf('Overview',module)`
`@@ -13,18 +13,21 @@ storiesOf('Overview', module)`
`13`	`13`	`id:'1',`
`14`	`14`	`version:'0.1.0',`
`15`	`15`	`config:{`
	`16`	`+appVersions:{`
	`17`	`+vscode:'0.1.0',`
	`18`	`+},`
`16`	`19`	`testRunner:{command:''},`
`17`	`20`	`repo:{uri:'',branch:'master'},`
`18`	`21`	`},`
`19`	`22`	`summary:{`
`20`	`23`	`title:'Manage NPM package.json',`
`21`		`-description:'Learn to use the package manager at the core of JavaScript projects.',`
	`24`	`+description:'Learn to use the package manager at the core of JavaScript projects',`
`22`	`25`	`},`
`23`	`26`	`levels:[`
`24`	`27`	`{`
`25`	`28`	`id:'L1',`
`26`		`-title:'The First Level',`
`27`		`-summary:'A Summary of the first level',`
	`29`	+title:'The First Level. `Markdown` supported here.',
	`30`	+summary:'A Summary of the first level. `Markdown` supported here.',
`28`	`31`	`content:'',`
`29`	`32`	`steps:[],`
`30`	`33`	`},`

Comments

(0)