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

Commit1114d13

Browse files
committed
new queryTutorials loaded
1 parent2d84fa8 commit1114d13

File tree

5 files changed

+88
-34
lines changed

5 files changed

+88
-34
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import*asReactfrom'react'
2+
import{Button}from'@alifd/next'
3+
4+
interfaceProps{
5+
title?:string
6+
text?:string
7+
onNew():void
8+
}
9+
10+
constTutorialItem=(props:Props)=>(
11+
<div>
12+
<h3>{props.title||'Title'}</h3>
13+
<p>{props.text||'Description'}</p>
14+
<ButtononClick={props.onNew}>Start</Button>
15+
</div>
16+
)
17+
18+
exportdefaultTutorialItem
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import*asReactfrom'react'
2+
3+
import*asTfrom'../../../../typings/graphql'
4+
importTutorialItemfrom'./TutorialItem'
5+
6+
interfaceProps{
7+
tutorialList:T.Tutorial[]
8+
onNew(id:string):void
9+
}
10+
11+
constTutorialList=(props:Props)=>(
12+
<div>
13+
{props.tutorialList.map((tutorial:T.Tutorial)=>(
14+
<TutorialItem
15+
key={tutorial.id}
16+
onNew={()=>props.onNew(tutorial.id)}
17+
title={tutorial.title}
18+
text={tutorial.text}
19+
/>
20+
))}
21+
</div>
22+
)
23+
24+
exportdefaultTutorialList

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

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,35 @@
11
import*asReactfrom'react'
2-
import{Button}from'@alifd/next'
3-
4-
importCondfrom'../../components/Cond'
5-
importDataContextfrom'../../utils/DataContext'
6-
import{send}from'../../utils/vscode'
72
import{useQuery}from'@apollo/react-hooks'
8-
importqueryfrom'./query'
3+
import*asTfrom'../../../../typings/graphql'
94

10-
importLoadingPagefrom'../../containers/LoadingPage'
5+
importqueryTutorialsfrom'./queryTutorials'
6+
import{send}from'../../utils/vscode'
7+
importTutorialListfrom'../../components/TutorialList'
118

129
interfaceProps{
13-
state:any
14-
tutorialList:any[]
10+
tutorialList:T.Tutorial[]
1511
onNew(tutorialId:string):void
1612
}
1713

1814
exportconstNewPage=(props:Props)=>(
1915
<div>
20-
<Condstate={props.state}path="SelectTutorial.NewTutorial.SelectTutorial">
21-
<div>
22-
<h2>Start a new Project</h2>
23-
{props.tutorialList.map(tutorial=>(
24-
<div>
25-
<h3>{tutorial.title}</h3>
26-
<p>{tutorial.description}</p>
27-
<ButtononClick={()=>props.onNew(tutorial.id)}>Start</Button>
28-
</div>
29-
))}
30-
</div>
31-
</Cond>
32-
<Condstate={props.state}path="SelectTutorial.NewTutorial.InitializeTutorial">
33-
<LoadingPagetext="Launching Tutorial..."/>
34-
</Cond>
16+
<h2>Start a new Project</h2>
17+
<TutorialListtutorialList={props.tutorialList}onNew={props.onNew}/>
3518
</div>
3619
)
3720

38-
exportdefault()=>{
39-
console.log('load new')
40-
const{ state}=React.useContext(DataContext)
41-
const{ data, loading, error}=useQuery(query)
42-
const[tutorialList]=React.useState([{id:'1',title:'Demo',description:'A basic demo'}])
21+
constNewPageContainer=()=>{
22+
const{ data, loading, error}=useQuery(queryTutorials)
4323
console.log('data',data)
4424
if(loading){
4525
returnnull
4626
}
4727

4828
if(error){
49-
return<div>'Error'</div>
29+
return<div>{JSON.stringify(error,null,2)}</div>
5030
}
5131

52-
return<NewPageonNew={()=>send('TUTORIAL_START')}state={state}tutorialList={tutorialList}/>
32+
return<NewPageonNew={()=>send('TUTORIAL_START')}tutorialList={data.tutorials}/>
5333
}
34+
35+
exportdefaultNewPageContainer

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

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,38 @@
11
importReactfrom'react'
2-
32
import{storiesOf}from'@storybook/react'
43
import{action}from'@storybook/addon-actions'
4+
import*asTfrom'../../typings/graphql'
5+
importapolloProviderfrom'./utils/ApolloDecorator'
56

6-
import{NewPage}from'../src/containers/New'
7+
importTutorialListfrom'../src/components/TutorialList'
8+
importTutorialItemfrom'../src/components/TutorialList/TutorialItem'
9+
importNewContainerfrom'../src/containers/New'
710

8-
storiesOf('New',module).add('Page',()=><NewPageonNew={action('onNew')}/>)
11+
storiesOf('New',module)
12+
.add('Tutorial',()=>{
13+
consttutorial:T.Tutorial={
14+
id:'1',
15+
title:'Tutorial 1',
16+
text:'The first one',
17+
}
18+
return<TutorialItemonNew={action('onNew')}title={tutorial.title}text={tutorial.text}/>
19+
})
20+
.add('TutorialList',()=>{
21+
consttutorialList:T.Tutorial[]=[
22+
{
23+
id:'1',
24+
title:'Tutorial 1',
25+
text:'The first one',
26+
},
27+
{
28+
id:'2',
29+
title:'Tutorial 2',
30+
text:'The second one',
31+
},
32+
]
33+
return<TutorialListtutorialList={tutorialList}onNew={action('onNew')}/>
34+
})
35+
.addDecorator(apolloProvider)
36+
.add('Container',()=>{
37+
return<NewContainer/>
38+
})

0 commit comments

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