Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4de910f

Browse files
authored
Merge pull requestcoderoad#21 from ShMcK/feature/loading
Feature/loading
2 parents773a72c +4198aa8 commit4de910f

File tree

14 files changed

+135
-39
lines changed

14 files changed

+135
-39
lines changed

‎web-app/src/Routes.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import*asReactfrom'react'
22

3-
importCondfrom'./components/Cond'
4-
importLoadingfrom'./components/Loading'
3+
importRouterfrom'./components/Router'
4+
importLoadingPagefrom'./containers/LoadingPage'
55
importContinuePagefrom'./containers/Continue'
66
importNewPagefrom'./containers/New'
77
importTutorialPagefrom'./containers/Tutorial'
88

9+
const{ Route}=Router
10+
911
interfaceProps{
1012
state:any
1113
}
@@ -37,21 +39,22 @@ const Routes = ({ state }: Props) => {
3739
}
3840
})
3941

40-
// TODO: refactor cond to user <Router><Route> and accept first route as if/else if
4142
return(
4243
<divstyle={{ ...styles.page, ...dimensions}}>
43-
<Condstate={state}path="SelectTutorial.Startup">
44-
<Loading/>
45-
</Cond>
46-
<Condstate={state}path="SelectTutorial.NewTutorial">
47-
<NewPage/>
48-
</Cond>
49-
<Condstate={state}path="SelectTutorial.ContinueTutorial">
50-
<ContinuePage/>
51-
</Cond>
52-
<Condstate={state}path="Tutorial">
53-
<TutorialPagestate={state}/>
54-
</Cond>
44+
<Routerstate={state}>
45+
<Routepath="SelectTutorial.Startup">
46+
<LoadingPagetext="Launching..."/>
47+
</Route>
48+
<Routepath="SelectTutorial.NewTutorial">
49+
<NewPage/>
50+
</Route>
51+
<Routepath="SelectTutorial.ContinueTutorial">
52+
<ContinuePage/>
53+
</Route>
54+
<Routepath="Tutorial">
55+
<TutorialPagestate={state}/>
56+
</Route>
57+
</Router>
5558
</div>
5659
)
5760
}

‎web-app/src/components/Cond/utils/state.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
exportfunctionstateMatch(state:any,statePath:string){
22
letcurrent=state
3-
letpaths=statePath.split('.')
3+
constpaths=statePath.split('.')
44
letcomplete=false
55
try{
66
for(constpofpaths){
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import*asReactfrom'react'
2+
import{Loading}from'@alifd/next'
23

3-
constLoading=()=>{
4-
return<div>Loading...</div>
4+
interfaceProps{
5+
text:string
56
}
67

7-
exportdefaultLoading
8+
constLoadingComponent=({ text}:Props)=>{
9+
return<Loadingtip={text}/>
10+
}
11+
12+
exportdefaultLoadingComponent
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import*asReactfrom'react'
2+
3+
interfaceProps{
4+
children:any
5+
path:string
6+
}
7+
8+
constRoute=({ children}:Props)=>children
9+
10+
exportdefaultRoute
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import*asReactfrom'react'
2+
importRoutefrom'./Route'
3+
import{stateMatch}from'../Cond/utils/state'
4+
5+
interfaceProps{
6+
state:string
7+
children:any
8+
}
9+
10+
// router finds first state match of <Route path='' />
11+
constRouter=({ state, children}:Props)=>{
12+
constchildArray=React.Children.toArray(children)
13+
for(constchildofchildArray){
14+
if(stateMatch(state,child.props.path)){
15+
returnchild.props.children
16+
}
17+
}
18+
console.warn(`No Route matches for${state}`)
19+
returnnull
20+
}
21+
22+
Router.Route=Route
23+
24+
exportdefaultRouter
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import*asReactfrom'react'
2+
importLoadingfrom'../components/Loading'
3+
4+
interfaceProps{
5+
text:string
6+
}
7+
8+
conststyles={
9+
page:{
10+
display:'flex',
11+
alignItems:'center',
12+
justifyContent:'center',
13+
width:'100%',
14+
height:'100%',
15+
},
16+
}
17+
18+
constLoadingPage=({ text}:Props)=>(
19+
<divstyle={styles.page}>
20+
<Loadingtext={text}/>
21+
</div>
22+
)
23+
24+
exportdefaultLoadingPage

‎web-app/src/containers/New/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import*asReactfrom'react'
22
import{Button}from'@alifd/next'
3+
34
importCondfrom'../../components/Cond'
45
importDataContextfrom'../../utils/DataContext'
56
import{send}from'../../utils/vscode'
7+
importLoadingPagefrom'../../containers/LoadingPage'
68

79
interfaceProps{
810
onNew(tutorialId:string):void
@@ -27,7 +29,7 @@ export const NewPage = (props: Props) => {
2729
</div>
2830
</Cond>
2931
<Condstate={state}path="SelectTutorial.NewTutorial.InitializeTutorial">
30-
<div>Initializing tutorial...</div>
32+
<LoadingPagetext="Launching Tutorial..."/>
3133
</Cond>
3234
</div>
3335
)

‎web-app/src/containers/Tutorial/LevelPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Level from '../../components/Level'
44

55
interfaceLevelProps{
66
send(action:string):void
7-
state:any
87
}
98

109
constLevelPage=(props:LevelProps)=>{

‎web-app/src/containers/Tutorial/StagePage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import DataContext from '../../utils/DataContext'
33
importStagefrom'../../components/Stage'
44

55
interfacePageProps{
6-
state:any
76
send(action:string):void
87
}
98

‎web-app/src/containers/Tutorial/SummaryPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Summary from '../../components/Summary'
44

55
interfacePageProps{
66
send(action:string):void
7-
state:any
87
}
98

109
constSummaryPage=(props:PageProps)=>{

‎web-app/src/containers/Tutorial/index.tsx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
import*asReactfrom'react'
22
import{send}from'../../utils/vscode'
33

4-
importCondfrom'../../components/Cond'
5-
importLoadingfrom'../../components/Loading'
4+
importRouterfrom'../../components/Router'
5+
importLoadingPagefrom'../LoadingPage'
66
importSummaryPagefrom'./SummaryPage'
77
importLevelPagefrom'./LevelPage'
88
importStagePagefrom'./StagePage'
99

10+
const{ Route}=Router
11+
1012
interfaceProps{
1113
state:any
1214
}
1315

1416
constTutorial=(props:Props)=>{
1517
return(
16-
<div>
17-
<Condstate={props.state}path="Tutorial.LoadNext">
18-
<Loading/>
19-
</Cond>
20-
<Condstate={props.state}path="Tutorial.Summary">
21-
<SummaryPagestate={props.state}send={send}/>
22-
</Cond>
23-
<Condstate={props.state}path="Tutorial.Level">
24-
<LevelPagestate={props.state}send={send}/>
25-
</Cond>
26-
<Condstate={props.state}path="Tutorial.Stage">
27-
<StagePagestate={props.state}send={send}/>
28-
</Cond>
29-
</div>
18+
<Routerstate={props.state}>
19+
<Routepath="Tutorial.LoadNext">
20+
<LoadingPagetext="Loading Tutorial..."/>
21+
</Route>
22+
<Routepath="Tutorial.Summary">
23+
<SummaryPagesend={send}/>
24+
</Route>
25+
<Routepath="Tutorial.Level">
26+
<LevelPagesend={send}/>
27+
</Route>
28+
<Routepath="Tutorial.Stage">
29+
<StagePagesend={send}/>
30+
</Route>
31+
</Router>
3032
)
3133
}
3234

‎web-app/stories/Loading.stories.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
importReactfrom'react'
2+
3+
import{storiesOf}from'@storybook/react'
4+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
5+
6+
importLoadingPagefrom'../src/containers/LoadingPage'
7+
8+
storiesOf('Components',module)
9+
.addDecorator(SideBarDecorator)
10+
.add('Loading',()=><LoadingPagetext="Content"/>)

‎web-app/stories/Router.stories.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
importReactfrom'react'
2+
3+
import{storiesOf}from'@storybook/react'
4+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
5+
6+
importRouterfrom'../src/components/Router'
7+
8+
const{ Route}=Router
9+
10+
storiesOf('Components',module)
11+
.addDecorator(SideBarDecorator)
12+
.add('Router',()=>(
13+
<Routerstate="Third">
14+
<Routepath="First">First</Route>
15+
<Routepath="Second">Second</Route>
16+
<Routepath="Third">Third</Route>
17+
</Router>
18+
))

‎web-app/stories/utils/SideBarDecorator.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as React from 'react'
33
conststyles={
44
width:'20rem',
55
borderRight:'2px solid black',
6+
height:window.innerHeight,
67
}
78

89
constSideBarDecorator=storyFn=><divstyle={styles}>{storyFn()}</div>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp