8000 fix up stories · jordanliu/coderoad-vscode@1a5c621 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1a5c621

Browse files
ShMcKShMcK
committed
fix up stories
1 parent ff31819 commit 1a5c621

File tree

15 files changed

+105
-114
lines changed
  • stories

    • 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/addo 8000 n-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
    const req = require.context('../stories', true, /\.stories\.tsx$/)
    1616

    1717
    function loadStories() {
    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 about customizing 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
    interface Props {
    55
    title?: string
    6-
    text?: string
    6+
    description?: string
    77
    onSelect(): void
    88
    }
    99

    1010
    const TutorialItem = (props: Props) => (
    1111
    <div>
    1212
    <h3>{props.title || 'Title'}</h3>
    13-
    <p>{props.text || 'Description'}</p>
    13+
    <p>{props.description || 'Description'}</p>
    1414
    <Button onClick={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
    interface Props {
    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-
    <div style={styles.footer}>{level.title}</div>
    103+
    <div style={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
    const levels: G.Level[] = version.data.levels
    2727

    28-
    const level: G.Level | undefined = levels.find((l: G.Level) => l.id === context.position.levelId)
    29-
    30-
    if (!level) {
    28+
    const levelIndex = levels.findIndex((l: G.Level) => l.id === context.position.levelId)
    29+
    if (levelIndex < 0) {
    3130
    throw new Error('Level not found when selecting level')
    3231
    }
    32+
    const level: G.Level = levels[levelIndex]
    33+
    level.index = levelIndex
    34+
    3335
    return level
    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 * as G from '../../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-
    import SideBarDecorator from './utils/SideBarDecorator'
    87

    8+
    import SideBarDecorator from './utils/SideBarDecorator'
    99
    import Level from '../src/containers/Tutorial/LevelPage/Level/index'
    1010

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

    0 commit comments

    Comments
     (0)
    0