Commit4992b32

authored

Merge pull requestcoderoad#149 from ShMcK/fix/author-tutorial-name

add author to tutorial list

2 parents85c05e1 +bbd7cd2 commit4992b32Copy full SHA for 4992b32

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ const SelectTutorial = (props: Props) => {`
`42`	`42`	`onSelect={()=>onSelect(tutorial)}`
`43`	`43`	`title={tutorial.summary.title\|\|''}`
`44`	`44`	`description={tutorial.summary.description\|\|''}`
	`45`	`+createdBy={tutorial.createdBy}`
`45`	`46`	`/>`
`46`	`47`	`))}`
`47`	`48`	`</div>`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import*asReactfrom'react'`
	`2`	`+import*asGfrom'typings/graphql'`
`2`	`3`	`import{css,jsx}from'@emotion/core'`
`3`	`4`	`importCardfrom'../../components/Card'`
`4`	`5`	`importTagfrom'../../components/Tag'`
`@@ -46,8 +47,9 @@ const styles = {`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`interfaceProps{`
`49`		`-title?:string`
`50`		`-description?:string`
	`50`	`+title:string`
	`51`	`+description:string`
	`52`	`+createdBy?:G.User\|null`
`51`	`53`	`onSelect():void`
`52`	`54`	`}`
`53`	`55`
`@@ -69,8 +71,8 @@ const TutorialItem = (props: Props) => (`
`69`	`71`	`<imgsrc="https://via.placeholder.com/75/75"height="75px"width="75px"/>`
`70`	`72`	`</div>`
`71`	`73`	`<divcss={styles.right}>`
`72`		`-<h2css={styles.title}>{props.title\|\|'Title'}</h2>`
`73`		`-<h3css={styles.author}>Author Name</h3>`
	`74`	`+<h2css={styles.title}>{props.title}</h2>`
	`75`	`+{props.createdBy&&<h3css={styles.author}>{props.createdBy.name}</h3>}`
`74`	`76`	`<divcss={styles.tags}>`
`75`	`77`	`<Tag>javascript</Tag>`
`76`	`78`	`</div>`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,19 @@ const tutorialList = [`
`12`	`12`	`title:'Tutorial 1',`
`13`	`13`	`description:'The first one',`
`14`	`14`	`},`
	`15`	`+createdBy:{`
	`16`	`+name:'First Lastname',`
	`17`	`+},`
`15`	`18`	`},`
`16`	`19`	`{`
`17`	`20`	`id:'2',`
`18`	`21`	`summary:{`
`19`	`22`	`title:'Tutorial 2',`
`20`	`23`	`description:'The second one',`
`21`	`24`	`},`
	`25`	`+createdBy:{`
	`26`	`+name:'Joe Schmo',`
	`27`	`+},`
`22`	`28`	`},`
`23`	`29`	`]`
`24`	`30`
`@@ -34,6 +40,7 @@ storiesOf('Select Tutorial', module)`
`34`	`40`	`onSelect={action('onSelect')}`
`35`	`41`	`title={tutorial.summary.title}`
`36`	`42`	`description={tutorial.summary.description}`
	`43`	`+createdBy={{name:'First Lastname'}}`
`37`	`44`	`/>`
`38`	`45`	`)`
`39`	`46`	`})`

Comments

(0)