Skip to content

Setup #3

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 8, 2019
Merged
Changes from 1 commit
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
Prev Previous commit
resolve alifd/next style issues
  • Loading branch information
ShMcK committed Jun 8, 2019
commit 01d26695c77ec2364911511634e5c6d4f983e392
3 changes: 1 addition & 2 deletions web-app/.storybook/addons.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '@storybook/addon-actions/register'
import '@storybook/addon-links/register'
import '@storybook/addon-knobs/register'
import '@storybook/addon-notes/register'
import '@storybook/addon-knobs/register'
2 changes: 2 additions & 0 deletions web-app/.storybook/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { configure } from '@storybook/react';
import '@alifd/next/dist/next.css';

// automatically import all files ending in *.stories.tsx
const req = require.context('../stories', true, /\.stories\.tsx$/);

10 changes: 5 additions & 5 deletions web-app/.storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ const path = require('path')
// see typescript setup
// https://storybook.js.org/docs/configurations/typescript-config/
module.exports = ({ config }) => {
config.module.rules.push({
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
include: path.resolve(__dirname, '../'),
})
config.module.rules.push({
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
include: path.resolve(__dirname, '../'),
})
config.module.rules.push({
test: /\.(ts|tsx)$/,
loader: require.resolve('babel-loader'),
69 changes: 3 additions & 66 deletions web-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web-app/package.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"dependencies": {
"@alifd/next": "^1.15.5",
"@types/jest": "^24.0.13",
"@types/node": "^12.0.4",
"@types/node": "^12.0.7",
"@types/react": "^16.8.19",
"@types/react-dom": "^16.8.4",
"moment": "^2.24.0",
5 changes: 1 addition & 4 deletions web-app/src/components/Continue/ContinueItem.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import * as React from 'react'
import Button from '@alifd/next/lib/button'
import '@alifd/next/lib/button/style'
import '@alifd/next/lib/button/style'
import Card from '@alifd/next/lib/card'
import { Button, Card } from '@alifd/next'

interface Props {
title: string
5 changes: 1 addition & 4 deletions web-app/src/components/Level/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import * as React from 'react'
import Button from '@alifd/next/lib/button'
import '@alifd/next/lib/button/style'
import Card from '@alifd/next/lib/card'
import '@alifd/next/lib/card/style'
import { Button, Card } from '@alifd/next'
import CR from '../../../../src/typings'

const styles = {
3 changes: 1 addition & 2 deletions web-app/src/components/New/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react'
import Button from '@alifd/next/lib/button'
import '@alifd/next/lib/button/style'
import { Button } from '@alifd/next'

interface Props {
onNew(tutorialId: string): void
6 changes: 1 addition & 5 deletions web-app/src/components/Stage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import * as React from 'react'
import Button from '@alifd/next/lib/button'
import '@alifd/next/lib/button/style'
import Card from '@alifd/next/lib/card'
import '@alifd/next/lib/card/style'

import { Button, Card } from '@alifd/next'
import CR from '../../../../src/typings'

import Step from '../Step'
3 changes: 1 addition & 2 deletions web-app/src/components/Step/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react'
import Checkbox from '@alifd/next/lib/checkbox'
import '@alifd/next/lib/checkbox/style'
import { Checkbox } from '@alifd/next'
// import CC from '../../typings/client'
import CR from '../../../../src/typings'

5 changes: 1 addition & 4 deletions web-app/src/components/Summary/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import * as React from 'react'
import Button from '@alifd/next/lib/button'
import '@alifd/next/lib/button/style'
import Card from '@alifd/next/lib/card'
import '@alifd/next/lib/card/style'
import { Button, Card } from '@alifd/next'
import CR from '../../../../src/typings'

const styles = {