diff --git a/config/webpack/webpack.config.dev.js b/config/webpack/webpack.config.dev.js index fad9808..da21550 100644 --- a/config/webpack/webpack.config.dev.js +++ b/config/webpack/webpack.config.dev.js @@ -48,6 +48,7 @@ module.exports = WebpackMerge(configBase, { Path.resolve(__dirname, '../../node_modules/') ] }, + { test: /\.jpg$/, loader: 'file' }, // { // test: /\.tsx?$/, // loaders: [ diff --git a/package.json b/package.json index 4fa6faa..0ab352d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "test": "yarn run jest", "test:watch": "yarn run jest -- --watch", "jest": "PWD=$(pwd) NODE_ENV=test ./node_modules/.bin/jest -w 1 --coverage", - "prebuild": "./node_modules/.bin/check-dependencies && yarn run clean", "build": "set NODE_ENV=production && ./node_modules/.bin/webpack-dashboard -m -- ./node_modules/.bin/webpack --progress --profile --colors --config ./config/webpack/webpack.config.prod.js", "lint": "./node_modules/.bin/tslint -c tslint.json 'src/ts/**/*.{ts,tsx}' && ./node_modules/.bin/sass-lint 'src/**/*.scss'", "stats": "set NODE_ENV=production && webpack --progress --config ./config/webpack/webpack.config.stats.js --profile --json > ./config/webpack/stats/stats.json" @@ -87,7 +86,8 @@ "redux-saga": "^0.15.4", "reflect-metadata": "^0.1.10", "reselect": "^3.0.1", - "semantic-ui-react": "^0.71.1" + "semantic-ui-react": "^0.71.1", + "image-webpack-loader": "^3.3.1" }, "jest": { "moduleFileExtensions": [ diff --git a/src/ts/@overflow/app/views/layout/LogoBar.tsx b/src/ts/@overflow/app/views/layout/LogoBar.tsx index 5a5ad68..6d23e15 100644 --- a/src/ts/@overflow/app/views/layout/LogoBar.tsx +++ b/src/ts/@overflow/app/views/layout/LogoBar.tsx @@ -4,9 +4,11 @@ import { Header, Container, Popup, + Image, } from 'semantic-ui-react'; import { Notification } from '@overflow/commons/react/component/Notification'; + export class LogoBar extends React.Component { constructor(props: any, context: any) { diff --git a/src/ts/@overflow/app/views/layout/TempLayout.tsx b/src/ts/@overflow/app/views/layout/TempLayout.tsx index f7cf524..b3e0d56 100644 --- a/src/ts/@overflow/app/views/layout/TempLayout.tsx +++ b/src/ts/@overflow/app/views/layout/TempLayout.tsx @@ -35,7 +35,6 @@ export class AppLayout extends React.Component {
-
ddddddddddddd