kayodebristol
diff --git a/‎web-app/.storybook/config.ts
Lines changed: 1 addition & 1 deletion b/‎web-app/.storybook/config.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/.storybook/webpack.config.js
Lines changed: 9 additions & 9 deletions b/‎web-app/.storybook/webpack.config.js
Lines changed: 9 additions & 9 deletions
diff --git a/‎web-app/config-overrides.js
Lines changed: 8 additions & 9 deletions b/‎web-app/config-overrides.js
Lines changed: 8 additions & 9 deletions
diff --git a/‎web-app/src/containers/LoadingPage.tsx
Lines changed: 2 additions & 0 deletions b/‎web-app/src/containers/LoadingPage.tsx
Lines changed: 2 additions & 0 deletions
diff --git a/‎web-app/src/index.tsx
Lines changed: 1 addition & 1 deletion b/‎web-app/src/index.tsx
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/src/styles/font.scss
Lines changed: 35 additions & 0 deletions b/‎web-app/src/styles/font.scss
Lines changed: 35 additions & 0 deletions
diff --git a/‎web-app/src/styles/fonts/next-icon.svg
Lines changed: 182 additions & 0 deletions b/‎web-app/src/styles/fonts/next-icon.svg
Lines changed: 182 additions & 0 deletions
diff --git a/‎web-app/src/styles/fonts/next-icon.woff2
5.47 KB b/‎web-app/src/styles/fonts/next-icon.woff2
5.47 KB
diff --git a/‎web-app/src/styles/fonts/roboto-bold.woff2
19.8 KB b/‎web-app/src/styles/fonts/roboto-bold.woff2
19.8 KB
diff --git a/‎web-app/src/styles/fonts/roboto-light.woff2
19.1 KB b/‎web-app/src/styles/fonts/roboto-light.woff2
19.1 KB
@@ -1,5 +1,5 @@
 import { configure } from '@storybook/react'
-import '../src/styles/index.css'
+import '../src/styles/index.scss'
 
 // setup acquireVsCodeApi mock
 // @ts-ignore
 
@@ -13,15 +13,15 @@ module.exports = ({ config }) => {
     test: /\.(ts|tsx)$/,
     loader: require.resolve('babel-loader'),
     options: {
-      plugins: [
-        [
-          'babel-plugin-import',
-          {
-            libraryName: '@alifd/next',
-            style: true,
-          },
-        ],
-      ],
+      // plugins: [
+      //   [
+      //     'babel-plugin-import',
+      //     {
+      //       libraryName: '@alifd/next',
+      //       style: true,
+      //     },
+      //   ],
+      // ],
       presets: [
         // react-app
         ['react-app', { flow: false, typescript: true }],
 
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const path = require('path')
-const { addBabelPreset, addBabelPlugin, addWebpackModuleRule } = require('customize-cra')
+const { addBabelPreset, addWebpackModuleRule, addWebpackPlugin } = require('customize-cra')
 
 module.exports = function override(config) {
   addWebpackModuleRule({
@@ -17,13 +16,13 @@ module.exports = function override(config) {
   })(config)
 
   // load @alifd/next component css
-  addBabelPlugin([
-    'babel-plugin-import',
-    {
-      libraryName: '@alifd/next',
-      style: true,
-    },
-  ])(config)
+  // addBabelPlugin([
+  //   'babel-plugin-import',
+  //   {
+  //     libraryName: '@alifd/next',
+  //     style: true,
+  //   },
+  // ])(config)
 
   // setup emotion styles
   addBabelPreset('@emotion/babel-preset-css-prop')(config)
 
@@ -2,6 +2,7 @@ import * as React from 'react'
 import * as T from 'typings'
 import { css, jsx } from '@emotion/core'
 import Loading from '../components/Loading'
+import { Icon } from '@alifd/next'
 import Message from '../components/Message'
 
 interface Props {
@@ -31,6 +32,7 @@ const LoadingPage = ({ text, context }: Props) => {
   }
   return (
     <div css={styles.page}>
+      <Icon type="smile" />
       <Loading text={text} />
     </div>
   )
 
@@ -5,7 +5,7 @@ import App from './App'
 // init error logging
 import './services/sentry/init'
 // init initial styles
-import './styles/index.css'
+import './styles/index.scss'
 // init listeners
 import './services/listeners'
 
 
@@ -0,0 +1,35 @@
+@charset "UTF-8";
+
+@font-face {
+  font-family: 'NextIcon';
+  src: url('/styles/fonts/next-icon.woff2') format('woff2'), url('/styles/fonts/next-icon.svg#NextIcon') format('svg');
+}
+@font-face {
+  font-family: 'Roboto';
+  src: url('/styles/fonts/roboto-thin.woff2') format('woff2');
+  font-weight: 200;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('/styles/fonts/roboto-light.woff2') format('woff2');
+  font-weight: 300;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('/styles/fonts/roboto-regular.woff2') format('woff2');
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('/styles/fonts/roboto-medium.woff2') format('woff2');
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('/styles/fonts/roboto-bold.woff2') format('woff2');
+  font-weight: 700;
+}
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import * as React from 'react'`
`2`	`2`	`import * as T from 'typings'`
`3`	`3`	`import { css, jsx } from '@emotion/core'`
`4`	`4`	`import Loading from '../components/Loading'`
	`5`	`+import { Icon } from '@alifd/next'`
`5`	`6`	`import Message from '../components/Message'`
`6`	`7`
`7`	`8`	`interface Props {`
`@@ -31,6 +32,7 @@ const LoadingPage = ({ text, context }: Props) => {`
`31`	`32`	`}`
`32`	`33`	`return (`
`33`	`34`	`<div css={styles.page}>`
	`35`	`+ <Icon type="smile" />`
`34`	`36`	`<Loading text={text} />`
`35`	`37`	`</div>`
`36`	`38`	`)`