Commitc3cf2a6

committed

refactor out of cards

1 parentbc3df24 commitc3cf2a6Copy full SHA for c3cf2a6

File tree

+31

-12

lines changed

+31

-12

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,30 +1,37 @@`
	`1`	`+import{Button}from'@alifd/next'`
`1`	`2`	`import*asReactfrom'react'`
`2`		`-import{Button,Card}from'@alifd/next'`
`3`	`3`	`importCRfrom'typings'`
`4`	`4`
`5`	`5`	`importMarkdownfrom'../Markdown'`
`6`	`6`	`importStepfrom'../Step'`
`7`	`7`
`8`	`8`	`conststyles={`
`9`	`9`	`card:{`
`10`		`-// width: '20rem',`
	`10`	`+padding:0,`
`11`	`11`	`},`
	`12`	`+content:{`
	`13`	`+padding:'0rem 1rem',`
	`14`	`+},`
	`15`	`+title:{},`
`12`	`16`	`}`
`13`	`17`
`14`	`18`	`interfaceProps{`
`15`	`19`	`stage:CR.TutorialStage`
`16`	`20`	`steps:{`
`17`	`21`	`[stepId:string]:any// CC.Step`
`18`	`22`	`}`
`19`		`-onNextStage():void`
`20`	`23`	`complete:boolean`
	`24`	`+onNextStage():void`
`21`	`25`	`}`
`22`	`26`
`23`	`27`	`constStage=({ stage, steps, onNextStage, complete}:Props)=>{`
`24`	`28`	`const{ title, text}=stage.content`
`25`	`29`	`return(`
`26`		`-<Cardstyle={styles.card}title={title}showTitleBullet={false}contentHeight="auto">`
`27`		`-<Markdown>{text}</Markdown>`
	`30`	`+<divstyle={styles.card}>`
	`31`	`+<divstyle={styles.content}>`
	`32`	`+<h2style={styles.title}>{title}</h2>`
	`33`	`+<Markdown>{text}</Markdown>`
	`34`	`+</div>`
`28`	`35`	`<div>`
`29`	`36`	`{stage.stepList.map((stepId:string)=>{`
`30`	`37`	`conststep=steps[stepId]`
`@@ -36,7 +43,7 @@ const Stage = ({ stage, steps, onNextStage, complete }: Props) => {`
`36`	`43`	`<ButtononClick={onNextStage}>Continue</Button>`
`37`	`44`	`</div>`
`38`	`45`	`)}`
`39`		`-</Card>`
	`46`	`+</div>`
`40`	`47`	`)`
`41`	`48`	`}`
`42`	`49`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const styles = {`
`14`	`14`	`gridTemplateAreas:'CheckboxMargin Content',`
`15`	`15`	`gridTemplateColumns:'2rem 1fr',`
`16`	`16`	`gridTemplateRows:'1fr',`
`17`		`-margin:'1rem',`
	`17`	`+padding:'1rem',`
`18`	`18`	`},`
`19`	`19`	`left:{`
`20`	`20`	`justifySelf:'center',`

Lines changed: 17 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,18 @@`
`1`		`-import*asReactfrom'react'`
`2`	`1`	`import{Button,Card}from'@alifd/next'`
	`2`	`+import*asReactfrom'react'`
`3`	`3`	`importCRfrom'typings'`
`4`	`4`
`5`	`5`	`conststyles={`
`6`	`6`	`card:{`
`7`	`7`	`// width: '20rem',`
`8`	`8`	`},`
	`9`	`+content:{`
	`10`	`+padding:'0rem 1rem',`
	`11`	`+},`
	`12`	`+options:{`
	`13`	`+padding:'1rem',`
	`14`	`+},`
	`15`	`+title:{},`
`9`	`16`	`}`
`10`	`17`
`11`	`18`	`interfaceProps{`
`@@ -16,10 +23,15 @@ interface Props {`
`16`	`23`	`constSummary=({ data, onNext}:Props)=>{`
`17`	`24`	`const{ summary}=data`
`18`	`25`	`return(`
`19`		`-<Cardstyle={styles.card}title={summary.title}showTitleBullet={false}contentHeight="auto">`
`20`		`-<p>{summary.description}</p>`
`21`		`-<ButtononClick={()=>onNext()}>Continue</Button>`
`22`		`-</Card>`
	`26`	`+<divstyle={styles.card}>`
	`27`	`+<divstyle={styles.content}>`
	`28`	`+<h2style={styles.title}>{summary.title}</h2>`
	`29`	`+<p>{summary.description}</p>`
	`30`	`+</div>`
	`31`	`+<divstyle={styles.options}>`
	`32`	`+<ButtononClick={()=>onNext()}>Continue</Button>`
	`33`	`+</div>`
	`34`	`+</div>`
`23`	`35`	`)`
`24`	`36`	`}`
`25`	`37`

Comments

(0)