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

Commit1a5c621

Browse files
committed
fix up stories
1 parentff31819 commit1a5c621

File tree

15 files changed

+105
-114
lines changed

15 files changed

+105
-114
lines changed

‎web-app/.storybook/addons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import'@storybook/addon-actions/register'
22
import'@storybook/addon-knobs/register'
33
import'@storybook/addon-links/register'
4-
4+
import'@storybook/addon-viewport/register'

‎web-app/.storybook/config.ts

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
11
import'@alifd/next/dist/next.css'
2-
import{configure}from'@storybook/react'
2+
import{configure,addParameters}from'@storybook/react'
33
import'../src/styles/index.css'
44

55
// setup acquireVsCodeApi mock
66
//@ts-ignore
77
global.acquireVsCodeApi=()=>({
8-
postMessage(event:string){
9-
console.log('postMessage',event)
10-
}
8+
postMessage(event:string){
9+
console.log('postMessage',event)
10+
}
1111
})
1212

1313

1414
// automatically import all files ending in *.stories.tsx
1515
constreq=require.context('../stories',true,/\.stories\.tsx$/)
1616

1717
functionloadStories(){
18-
req.keys().forEach(req)
18+
req.keys().forEach(req)
1919
}
2020

21+
// set viewport width
22+
// see https://www.npmjs.com/package/@storybook/addon-viewport
23+
addParameters({
24+
viewport:{
25+
viewports:{
26+
name:'SideMenu',
27+
styles:{
28+
width:200,
29+
height:window.innerHeight,
30+
},
31+
type:'mobile'
32+
},
33+
defaultViewport:'SideMenu',
34+
},
35+
})
36+
2137
configure(loadStories,module)
38+

‎web-app/package-lock.json

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎web-app/src/containers/New/TutorialList/TutorialItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { Button } from '@alifd/next'
33

44
interfaceProps{
55
title?:string
6-
text?:string
6+
description?:string
77
onSelect():void
88
}
99

1010
constTutorialItem=(props:Props)=>(
1111
<div>
1212
<h3>{props.title||'Title'}</h3>
13-
<p>{props.text||'Description'}</p>
13+
<p>{props.description||'Description'}</p>
1414
<ButtononClick={props.onSelect}>Start</Button>
1515
</div>
1616
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const TutorialList = (props: Props) => {
2424
key={tutorial.id}
2525
onSelect={()=>onSelect(tutorial)}
2626
title={tutorial.version.summary.title||''}
27-
text={tutorial.version.summary.description||''}
27+
description={tutorial.version.summary.description||''}
2828
/>
2929
))}
3030
</div>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const styles = {
4545
}
4646

4747
interfaceProps{
48-
level:G.Level
48+
level:G.Level&{index:number}
4949
onContinue():void
5050
onLoadSolution():void
5151
}
@@ -100,7 +100,11 @@ const Level = ({ level, onContinue, onLoadSolution }: Props) => {
100100
</div>
101101
)}
102102
<div>
103-
<divstyle={styles.footer}>{level.title}</div>
103+
<divstyle={styles.footer}>
104+
<span>
105+
{level.index.toString()}.{level.title}
106+
</span>
107+
</div>
104108
</div>
105109
</div>
106110
)

‎web-app/src/services/selectors/tutorial.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ export const currentLevel = (context: MachineContext): G.Level => createSelector
2525
// sent with the test to ensure consistency
2626
constlevels:G.Level[]=version.data.levels
2727

28-
constlevel:G.Level|undefined=levels.find((l:G.Level)=>l.id===context.position.levelId)
29-
30-
if(!level){
28+
constlevelIndex=levels.findIndex((l:G.Level)=>l.id===context.position.levelId)
29+
if(levelIndex<0){
3130
thrownewError('Level not found when selecting level')
3231
}
32+
constlevel:G.Level=levels[levelIndex]
33+
level.index=levelIndex
34+
3335
returnlevel
3436
})(context)
3537

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import React from 'react'
22
import*asGfrom'../../typings/graphql'
33

44
import{action}from'@storybook/addon-actions'
5-
import{object,withKnobs}from'@storybook/addon-knobs'
5+
import{withKnobs}from'@storybook/addon-knobs'
66
import{storiesOf}from'@storybook/react'
7-
importSideBarDecoratorfrom'./utils/SideBarDecorator'
87

8+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
99
importLevelfrom'../src/containers/Tutorial/LevelPage/Level/index'
1010

1111
storiesOf('Tutorial SideBar',module)
1212
.addDecorator(SideBarDecorator)
1313
.addDecorator(withKnobs)
1414
.add('Level',()=>{
15-
constlevel:G.Level={
15+
constlevel:G.Level&{index:number}={
1616
id:'L1',
17+
index:2,
1718
title:'A Title',
1819
description:'Some description',
1920
setup:null,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
importReactfrom'react'
22

33
import{storiesOf}from'@storybook/react'
4-
importSideBarDecoratorfrom'./utils/SideBarDecorator'
54

5+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
66
importLoadingPagefrom'../src/containers/LoadingPage'
77

88
storiesOf('Components',module)

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

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
importReactfrom'react'
22
import{storiesOf}from'@storybook/react'
33
import{action}from'@storybook/addon-actions'
4-
import*asTfrom'../../typings/graphql'
5-
importapolloProviderfrom'./utils/ApolloDecorator'
64

5+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
76
importTutorialListfrom'../src/containers/New/TutorialList'
87
importTutorialItemfrom'../src/containers/New/TutorialList/TutorialItem'
9-
importNewContainerfrom'../src/containers/New'
108

119
storiesOf('New',module)
12-
.add('Tutorial',()=>{
13-
consttutorial={
14-
id:'1',
15-
title:'Tutorial 1',
16-
text:'The first one',
17-
}
18-
return<TutorialItemonSelect={action('onSelect')}title={tutorial.title}text={tutorial.text}/>
19-
})
20-
.add('TutorialList',()=>{
10+
.addDecorator(SideBarDecorator)
11+
.add('Tutorial List',()=>{
2112
consttutorialList=[
2213
{
2314
id:'1',
24-
title:'Tutorial 1',
25-
text:'The first one',
15+
version:{
16+
summary:{
17+
title:'Tutorial 1',
18+
description:'The first one',
19+
},
20+
},
2621
},
2722
{
2823
id:'2',
29-
title:'Tutorial 2',
30-
text:'The second one',
24+
version:{
25+
summary:{
26+
title:'Tutorial 2',
27+
description:'The second one',
28+
},
29+
},
3130
},
3231
]
33-
return<TutorialListtutorialList={tutorialList}onNew={action('onNew')}/>
32+
return<TutorialListtutorialList={tutorialList}/>
33+
})
34+
.add('Tutorial Item',()=>{
35+
consttutorial={
36+
id:'1',
37+
title:'Tutorial 1',
38+
description:'The first one',
39+
}
40+
return<TutorialItemonSelect={action('onSelect')}title={tutorial.title}description={tutorial.description}/>
3441
})
35-
.addDecorator(apolloProvider)
36-
.add('Container',()=><NewContainer/>)

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
importReactfrom'react'
22

3-
import{select,boolean,text,withKnobs}from'@storybook/addon-knobs'
3+
import{action}from'@storybook/addon-actions'
4+
import{select,text,withKnobs}from'@storybook/addon-knobs'
45
import{storiesOf}from'@storybook/react'
56
importSideBarDecoratorfrom'./utils/SideBarDecorator'
67

@@ -12,20 +13,20 @@ const stepText =
1213
constparagraphText=`Markdown included \`code\`, *bold*, & _italics_.
1314
\`\`\`javascript
1415
var a = 12
15-
16+
1617
function example(a) {
1718
return a + 1
1819
}
1920
\`\`\`
20-
21+
2122
Headers can be added:
22-
23+
2324
# h1
2425
## h2
2526
### h3
2627
#### h4
2728
##### h5
28-
29+
2930
Emojis: :) :| :(
3031
`
3132

@@ -35,12 +36,14 @@ storiesOf('Tutorial SideBar', module)
3536
.add('Step Description',()=>(
3637
<StepDescription
3738
text={text('text',stepText)}
38-
mode={select('mode',{active:'ACTIVE',complete:'COMPLETE',incomplete:'INCOMPLETE'},'active','step')}
39+
mode={select('mode',{ACTIVE:'ACTIVE',COMPLETE:'COMPLETE',INCOMPLETE:'INCOMPLETE'},'ACTIVE','step')}
40+
onLoadSolution={action('onLoadSolution')}
3941
/>
4042
))
4143
.add('Step Markdown',()=>(
4244
<StepDescription
4345
text={text('text',paragraphText)}
44-
mode={select('mode',{active:'ACTIVE',complete:'COMPLETE',incomplete:'INCOMPLETE'},'active','step')}
46+
mode={select('mode',{ACTIVE:'ACTIVE',COMPLETE:'COMPLETE',INCOMPLETE:'INCOMPLETE'},'ACTIVE','step')}
47+
onLoadSolution={action('onLoadSolution')}
4548
/>
4649
))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import React from 'react'
22

33
import{linkTo}from'@storybook/addon-links'
44
import{storiesOf}from'@storybook/react'
5-
importSideBarDecoratorfrom'./utils/SideBarDecorator'
65

6+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
77
importSummaryfrom'../src/containers/Tutorial/SummaryPage/Summary'
88

99
storiesOf('Tutorial SideBar',module)
1010
.addDecorator(SideBarDecorator)
1111
.add('Summary',()=>(
12-
<Summarytitle="Some Title"text="Some description"onNext={linkTo('Tutorial SideBar','Level')}/>
12+
<Summarytitle="Some Title"description="Some description"onNext={linkTo('Tutorial SideBar','Level')}/>
1313
))

0 commit comments

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