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

Commit745d4cc

Browse files
authored
Merge pull requestcoderoad#179 from ShMcK/feature/tutorial-from-file
Feature/tutorial from file
2 parents82973bc +a1f554b commit745d4cc

File tree

5 files changed

+101
-21
lines changed

5 files changed

+101
-21
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+
onLoadSummary(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.onLoadSummary(data)
24+
returnnull
3425
}
3526

3627
exportdefaultLoadTutorialSummary

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import*asTTfrom'typings/tutorial'
12
import*asReactfrom'react'
23
import{Radio}from'@alifd/next'
34
importTutorialSelectfrom'./forms/TutorialSelect'
45
importTutorialUrlfrom'./forms/TutorialUrl'
6+
importTutorialFilefrom'./forms/TutorialFile'
57

68
conststyles={
79
formWrapper:{
@@ -15,7 +17,8 @@ interface Props {
1517
tab:string
1618
setTab(tab:'list'|'url'):void
1719
url:string|null
18-
onTutorialLoad(url:string):void
20+
onTutorialLoadFromUrl(url:string):void
21+
onLoadSummary(data:TT.Tutorial|null):void
1922
}
2023

2124
constSelectTutorialForm=(props:Props)=>{
@@ -30,12 +33,13 @@ const SelectTutorialForm = (props: Props) => {
3033
>
3134
<Radiovalue="list">List</Radio>
3235
<Radiovalue="url">URL</Radio>
33-
{/*<Radio value="file">File</Radio> */}
36+
<Radiovalue="file">File</Radio>
3437
</Radio.Group>
3538
<br/>
3639
<br/>
37-
{props.tab==='list'&&<TutorialSelectonTutorialLoad={props.onTutorialLoad}/>}
38-
{props.tab==='url'&&<TutorialUrlonTutorialLoad={props.onTutorialLoad}defaultUrl={props.url||''}/>}
40+
{props.tab==='list'&&<TutorialSelectonTutorialLoad={props.onTutorialLoadFromUrl}/>}
41+
{props.tab==='url'&&<TutorialUrlonTutorialLoad={props.onTutorialLoadFromUrl}defaultUrl={props.url||''}/>}
42+
{props.tab==='file'&&<TutorialFileonLoadSummary={props.onLoadSummary}/>}
3943
</div>
4044
)
4145
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import*asReactfrom'react'
2+
import*asTTfrom'typings/tutorial'
3+
import{Form}from'@alifd/next'
4+
5+
constFormItem=Form.Item
6+
7+
interfaceProps{
8+
onLoadSummary(data:TT.Tutorial):void
9+
}
10+
11+
conststyles={
12+
uploadFileButton:{
13+
padding:'0.3rem 0.5rem',
14+
outline:'1px dotted rgb(51, 51, 51)',
15+
borderRadius:'0.2rem',
16+
fontWeight:400,
17+
fontFamily:
18+
'-apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;',
19+
},
20+
}
21+
22+
constTutorialFile=(props:Props)=>{
23+
constonChange=(evt:any)=>{
24+
evt.preventDefault()
25+
constfiles=evt.target.files
26+
27+
if(!files.length){
28+
alert('No file select')
29+
return
30+
}
31+
constuploadedFile=files[0]
32+
constreader=newFileReader()
33+
reader.onload=(e:any)=>{
34+
// TODO: handle errors from invalid JSON
35+
constfileJson:TT.Tutorial=JSON.parse(e.target.result)
36+
props.onLoadSummary(fileJson)
37+
}
38+
reader.readAsText(uploadedFile)
39+
}
40+
41+
return(
42+
<Formstyle={{maxWidth:'600px'}}>
43+
<FormItemlabel="Load coderoad config.json">
44+
<br/>
45+
<labelstyle={styles.uploadFileButton}>
46+
Upload
47+
<inputstyle={{display:'none'}}type="file"accept="application/json"onChange={onChange}/>
48+
</label>
49+
<br/>
50+
</FormItem>
51+
<br/>
52+
</Form>
53+
)
54+
}
55+
56+
exportdefaultTutorialFile

‎web-app/src/containers/SelectTutorial/forms/TutorialUrl.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import*asReactfrom'react'
2-
import{Button,Form,Radio,Input}from'@alifd/next'
2+
import{Button,Form,Input}from'@alifd/next'
33

44
constFormItem=Form.Item
55

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

Lines changed: 33 additions & 4 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,44 @@ 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)
25-
constonTutorialLoad=(url:string)=>{
28+
29+
constonNext=()=>{
30+
props.send({
31+
type:'TUTORIAL_START',
32+
payload:{
33+
tutorial:data,
34+
},
35+
})
36+
}
37+
constonTutorialLoadFromUrl=(url:string)=>{
2638
setUrl(url)
39+
setPage('loading')
40+
}
41+
constonLoadSummary=(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}>
31-
{page==='form'&&<SelectTutorialFormurl={url}onTutorialLoad={onTutorialLoad}tab={tab}setTab={setTab}/>}
32-
{page==='summary'&&url&&<LoadTutorialSummaryurl={url}send={props.send}onClear={()=>setPage('form')}/>}
51+
{page==='form'&&(
52+
<SelectTutorialForm
53+
url={url}
54+
onLoadSummary={onLoadSummary}
55+
onTutorialLoadFromUrl={onTutorialLoadFromUrl}
56+
tab={tab}
57+
setTab={setTab}
58+
/>
59+
)}
60+
{page==='loading'&&url&&<LoadTutorialSummaryurl={url}onLoadSummary={onLoadSummary}/>}
61+
{page==='summary'&&data&&<TutorialOverviewonNext={onNext}tutorial={data}onClear={onClear}/>}
3362
</div>
3463
)
3564
}

0 commit comments

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