Commit526f5c9

committed

setup loading component processes

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parente96a2cd commit526f5c9Copy full SHA for 526f5c9

File tree

+14

-13

lines changed

+14

-13

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ const Routes = () => {`
`25`	`25`	`<Router>`
`26`	`26`	`{/* Setup */}`
`27`	`27`	`<Routepath={['Setup.Startup','Setup.ValidateSetup']}>`
`28`		`-<LoadingPagetext="Launching..."/>`
	`28`	`+<LoadingPagetext="Launching..."processes={context.processes}/>`
`29`	`29`	`</Route>`
`30`	`30`	`<Routepath="Setup.Start">`
`31`	`31`	`<StartPagesend={send}context={context}/>`
`32`	`32`	`</Route>`
`33`	`33`	`<Routepath={['Setup.LoadTutorialSummary','Setup.LoadTutorialData','Setup.SetupNewTutorial']}>`
`34`		`-<LoadingPagetext="Loading Tutorial..."/>`
	`34`	`+<LoadingPagetext="Loading Tutorial..."processes={context.processes}/>]`
`35`	`35`	`</Route>`
`36`	`36`	`<Routepath="Setup.SelectTutorial">`
`37`	`37`	`<SelectTutorialPagesend={send}context={context}/>`
`@@ -41,7 +41,7 @@ const Routes = () => {`
`41`	`41`	`</Route>`
`42`	`42`	`{/* Tutorial */}`
`43`	`43`	`<Routepath={['Tutorial.LoadNext','Tutorial.Level.Load']}>`
`44`		`-<LoadingPagetext="Loading Level..."/>`
	`44`	`+<LoadingPagetext="Loading Level..."processes={context.processes}/>`
`45`	`45`	`</Route>`
`46`	`46`	`<Routepath="Tutorial.Level">`
`47`	`47`	`<LevelSummaryPagesend={send}context={context}/>`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@ import { Loading } from '@alifd/next'`
`2`	`2`	`import*asReactfrom'react'`
`3`	`3`
`4`	`4`	`interfaceProps{`
`5`		`-text:string`
	`5`	`+message:string`
`6`	`6`	`}`
`7`	`7`
`8`		`-constLoadingComponent=({text}:Props)=>{`
`9`		`-return<Loadingtip={text}/>`
	`8`	`+constLoadingComponent=({message}:Props)=>{`
	`9`	`+return<Loadingtip={message}/>`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`exportdefaultLoadingComponent`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const styles = {`
`22`	`22`	`constLoadingPage=({ text}:Props)=>{`
`23`	`23`	`return(`
`24`	`24`	`<divcss={styles.page}>`
`25`		`-<Loadingtext={text}/>`
	`25`	`+<Loadingmessage={text}/>`
`26`	`26`	`</div>`
`27`	`27`	`)`
`28`	`28`	`}`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@ import * as React from 'react'`
`2`	`2`	`import*asTfrom'typings'`
`3`	`3`	`import{css,jsx}from'@emotion/core'`
`4`	`4`	`importLoadingfrom'../../components/Loading'`
`5`		`-importMessagefrom'../../components/Message'`
`6`	`5`
`7`	`6`	`interfaceProps{`
`8`	`7`	`text:string`
`9`		`-context?:T.MachineContext`
	`8`	`+processes?:T.ProcessEvent[]`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`conststyles={`
`@@ -20,7 +19,7 @@ const styles = {`
`20`	`19`	`},`
`21`	`20`	`}`
`22`	`21`
`23`		`-constLoadingPage=({ text}:Props)=>{`
	`22`	`+constLoadingPage=({ text, processes}:Props)=>{`
`24`	`23`	`const[showLoading,setShowHiding]=React.useState(false)`
`25`	`24`
`26`	`25`	`React.useEffect(()=>{`
`@@ -38,9 +37,11 @@ const LoadingPage = ({ text }: Props) => {`
`38`	`37`	`returnnull`
`39`	`38`	`}`
`40`	`39`
	`40`	`+constmessage:string=processes&&processes.length ?processes[0].title :text`
	`41`	`+`
`41`	`42`	`return(`
`42`	`43`	`<divcss={styles.page}>`
`43`		`-<Loadingtext={text}/>`
	`44`	`+<Loadingmessage={message}/>`
`44`	`45`	`</div>`
`45`	`46`	`)`
`46`	`47`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`importuseFetchfrom'../../services/hooks/useFetch'`
`3`	`3`	`import*asTTfrom'typings/tutorial'`
`4`		`-importLoadingfrom'../Loading'`
	`4`	`+importLoadingPagefrom'../Loading'`
`5`	`5`
`6`	`6`	`interfaceProps{`
`7`	`7`	`url:string`
`@@ -11,7 +11,7 @@ interface Props {`
`11`	`11`	`constLoadTutorialSummary=(props:Props)=>{`
`12`	`12`	`const{ data, error, loading}=useFetch<TT.Tutorial>(props.url)`
`13`	`13`	`if(loading){`
`14`		`-return<Loadingtext="Loading tutorial summary..."/>`
	`14`	`+return<LoadingPagetext="Loading tutorial summary..."/>`
`15`	`15`	`}`
`16`	`16`	`if(error){`
`17`	`17`	console.log(`Failed to load tutorial summary:${error}`)

Comments

(0)