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

Commitf85afd1

Browse files
committed
move load from url into its own function
1 parent8d5702a commitf85afd1

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import*asReactfrom'react'
22
importuseFetchfrom'../../services/hooks/useFetch'
33
import*asTTfrom'typings/tutorial'
4-
importTutorialOverviewfrom'../../components/TutorialOverview'
54
importLoadingfrom'../Loading'
65

76
interfaceProps{
87
url:string
9-
send:any
10-
onClear():void
8+
onSetDataFromUrl(data:TT.Tutorial):void
119
}
1210

1311
constLoadTutorialSummary=(props:Props)=>{
@@ -22,15 +20,8 @@ const LoadTutorialSummary = (props: Props) => {
2220
if(!data){
2321
return<div>No data returned for tutorial</div>
2422
}
25-
constonNext=()=>{
26-
props.send({
27-
type:'TUTORIAL_START',
28-
payload:{
29-
tutorial:data,
30-
},
31-
})
32-
}
33-
return<TutorialOverviewonNext={onNext}tutorial={data}onClear={props.onClear}/>
23+
props.onSetDataFromUrl(data)
24+
returnnull
3425
}
3526

3627
exportdefaultLoadTutorialSummary

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

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import*asTTfrom'typings/tutorial'
12
import*asReactfrom'react'
23
importSelectTutorialFormfrom'./SelectTutorialForm'
4+
importTutorialOverviewfrom'../../components/TutorialOverview'
35
importLoadTutorialSummaryfrom'./LoadTutorialSummary'
46

57
conststyles={
@@ -19,17 +21,36 @@ interface Props {
1921
}
2022

2123
constSelectTutorialPage=(props:Props)=>{
22-
const[page,setPage]=React.useState<'form'|'summary'>('form')
24+
const[data,setData]=React.useState<TT.Tutorial|null>()
25+
const[page,setPage]=React.useState<'form'|'loading'|'summary'>('form')
2326
const[tab,setTab]=React.useState<'list'|'url'>('list')
2427
const[url,setUrl]=React.useState<string|null>(null)
28+
29+
constonNext=()=>{
30+
props.send({
31+
type:'TUTORIAL_START',
32+
payload:{
33+
tutorial:data,
34+
},
35+
})
36+
}
2537
constonTutorialLoad=(url:string)=>{
2638
setUrl(url)
39+
setPage('loading')
40+
}
41+
constonSetDataFromUrl=(d:TT.Tutorial)=>{
42+
setData(d)
2743
setPage('summary')
2844
}
45+
constonClear=()=>{
46+
setData(null)
47+
setPage('form')
48+
}
2949
return(
3050
<divcss={styles.page}>
3151
{page==='form'&&<SelectTutorialFormurl={url}onTutorialLoad={onTutorialLoad}tab={tab}setTab={setTab}/>}
32-
{page==='summary'&&url&&<LoadTutorialSummaryurl={url}send={props.send}onClear={()=>setPage('form')}/>}
52+
{page==='loading'&&url&&<LoadTutorialSummaryurl={url}onSetDataFromUrl={onSetDataFromUrl}/>}
53+
{page==='summary'&&data&&<TutorialOverviewonNext={onNext}tutorial={data}onClear={onClear}/>}
3354
</div>
3455
)
3556
}

0 commit comments

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