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

Feature/tutorial from file#179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ShMcK merged 4 commits intomasterfromfeature/tutorial-from-file
Apr 3, 2020
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletionsweb-app/src/containers/SelectTutorial/LoadTutorialSummary.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
import * as React from 'react'
import useFetch from '../../services/hooks/useFetch'
import * as TT from 'typings/tutorial'
import TutorialOverview from '../../components/TutorialOverview'
import Loading from '../Loading'

interface Props {
url: string
send: any
onClear(): void
onLoadSummary(data: TT.Tutorial): void
}

const LoadTutorialSummary = (props: Props) => {
Expand All@@ -22,15 +20,8 @@ const LoadTutorialSummary = (props: Props) => {
if (!data) {
return <div>No data returned for tutorial</div>
}
const onNext = () => {
props.send({
type: 'TUTORIAL_START',
payload: {
tutorial: data,
},
})
}
return <TutorialOverview onNext={onNext} tutorial={data} onClear={props.onClear} />
props.onLoadSummary(data)
return null
}

export default LoadTutorialSummary
12 changes: 8 additions & 4 deletionsweb-app/src/containers/SelectTutorial/SelectTutorialForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import * as TT from 'typings/tutorial'
import * as React from 'react'
import { Radio } from '@alifd/next'
import TutorialSelect from './forms/TutorialSelect'
import TutorialUrl from './forms/TutorialUrl'
import TutorialFile from './forms/TutorialFile'

const styles = {
formWrapper: {
Expand All@@ -15,7 +17,8 @@ interface Props {
tab: string
setTab(tab: 'list' | 'url'): void
url: string | null
onTutorialLoad(url: string): void
onTutorialLoadFromUrl(url: string): void
onLoadSummary(data: TT.Tutorial | null): void
}

const SelectTutorialForm = (props: Props) => {
Expand All@@ -30,12 +33,13 @@ const SelectTutorialForm = (props: Props) => {
>
<Radio value="list">List</Radio>
<Radio value="url">URL</Radio>
{/*<Radio value="file">File</Radio> */}
<Radio value="file">File</Radio>
</Radio.Group>
<br />
<br />
{props.tab === 'list' && <TutorialSelect onTutorialLoad={props.onTutorialLoad} />}
{props.tab === 'url' && <TutorialUrl onTutorialLoad={props.onTutorialLoad} defaultUrl={props.url || ''} />}
{props.tab === 'list' && <TutorialSelect onTutorialLoad={props.onTutorialLoadFromUrl} />}
{props.tab === 'url' && <TutorialUrl onTutorialLoad={props.onTutorialLoadFromUrl} defaultUrl={props.url || ''} />}
{props.tab === 'file' && <TutorialFile onLoadSummary={props.onLoadSummary} />}
</div>
)
}
Expand Down
56 changes: 56 additions & 0 deletionsweb-app/src/containers/SelectTutorial/forms/TutorialFile.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as React from 'react'
import * as TT from 'typings/tutorial'
import { Form } from '@alifd/next'

const FormItem = Form.Item

interface Props {
onLoadSummary(data: TT.Tutorial): void
}

const styles = {
uploadFileButton: {
padding: '0.3rem 0.5rem',
outline: '1px dotted rgb(51, 51, 51)',
borderRadius: '0.2rem',
fontWeight: 400,
fontFamily:
'-apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;',
},
}

const TutorialFile = (props: Props) => {
const onChange = (evt: any) => {
evt.preventDefault()
const files = evt.target.files

if (!files.length) {
alert('No file select')
return
}
const uploadedFile = files[0]
const reader = new FileReader()
reader.onload = (e: any) => {
// TODO: handle errors from invalid JSON
const fileJson: TT.Tutorial = JSON.parse(e.target.result)
props.onLoadSummary(fileJson)
}
reader.readAsText(uploadedFile)
}

return (
<Form style={{ maxWidth: '600px' }}>
<FormItem label="Load coderoad config.json">
<br />
<label style={styles.uploadFileButton}>
Upload
<input style={{ display: 'none' }} type="file" accept="application/json" onChange={onChange} />
</label>
<br />
</FormItem>
<br />
</Form>
)
}

export default TutorialFile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import*asReactfrom'react'
import{Button,Form,Radio,Input}from'@alifd/next'
import{Button,Form,Input}from'@alifd/next'

constFormItem=Form.Item

Expand Down
37 changes: 33 additions & 4 deletionsweb-app/src/containers/SelectTutorial/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import * as TT from 'typings/tutorial'
import * as React from 'react'
import SelectTutorialForm from './SelectTutorialForm'
import TutorialOverview from '../../components/TutorialOverview'
import LoadTutorialSummary from './LoadTutorialSummary'

const styles = {
Expand All@@ -19,17 +21,44 @@ interface Props {
}

const SelectTutorialPage = (props: Props) => {
const [page, setPage] = React.useState<'form' | 'summary'>('form')
const [data, setData] = React.useState<TT.Tutorial | null>()
const [page, setPage] = React.useState<'form' | 'loading' | 'summary'>('form')
const [tab, setTab] = React.useState<'list' | 'url'>('list')
const [url, setUrl] = React.useState<string | null>(null)
const onTutorialLoad = (url: string) => {

const onNext = () => {
props.send({
type: 'TUTORIAL_START',
payload: {
tutorial: data,
},
})
}
const onTutorialLoadFromUrl = (url: string) => {
setUrl(url)
setPage('loading')
}
const onLoadSummary = (d: TT.Tutorial) => {
setData(d)
setPage('summary')
}
const onClear = () => {
setData(null)
setPage('form')
}
return (
<div css={styles.page}>
{page === 'form' && <SelectTutorialForm url={url} onTutorialLoad={onTutorialLoad} tab={tab} setTab={setTab} />}
{page === 'summary' && url && <LoadTutorialSummary url={url} send={props.send} onClear={() => setPage('form')} />}
{page === 'form' && (
<SelectTutorialForm
url={url}
onLoadSummary={onLoadSummary}
onTutorialLoadFromUrl={onTutorialLoadFromUrl}
tab={tab}
setTab={setTab}
/>
)}
{page === 'loading' && url && <LoadTutorialSummary url={url} onLoadSummary={onLoadSummary} />}
{page === 'summary' && data && <TutorialOverview onNext={onNext} tutorial={data} onClear={onClear} />}
</div>
)
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp