Skip to content
This repository has been archived by the owner on Jun 28, 2021. It is now read-only.

Webpack 2 #597

Merged
merged 5 commits into from
Jan 20, 2017
Merged

Webpack 2 #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59b784d
working for dev
mmahalwy Jan 19, 2017
3725313
production working
mmahalwy Jan 20, 2017
c09e132
push for now
mmahalwy Jan 20, 2017
d4c8cf0
missing package
mmahalwy Jan 20, 2017
f939ccc
fix
mmahalwy Jan 20, 2017
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
24 changes: 17 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"posttest:dev:functional": "./tests/functional/test.sh stop",
"test:dev:lint": "./node_modules/eslint/bin/eslint.js ./src",
"test:stylelint": "stylelint './src/**/*.scss' --config ./webpack/.stylelintrc",
"dev": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./webpack/webpack-dev-server.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
"dev-old": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./webpack/webpack-dev-server.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
"dev": "env NODE_PATH='./src' PORT=8000 UV_THREADPOOL_SIZE=100 node ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config ./webpack/dev.config.js & env NODE_PATH='./src' PORT=8000 node ./bin/server.js",
"start": "NODE_PATH='src' node ./start",
"build": "npm run build:client & npm run build:server",
"build:server": "babel ./src -d ./dist -D",
Expand All @@ -29,6 +30,7 @@
},
"dependencies": {
"app-module-path": "1.0.2",
"autoprefixer": "6.6.1",
"autoprefixer-loader": "3.2.0",
"babel-cli": "6.11.4",
"babel-core": "6.13.2",
Expand All @@ -46,39 +48,44 @@
"babel-preset-es2015": "6.13.2",
"babel-preset-react": "6.11.1",
"babel-preset-stage-0": "6.5.0",
"babel-preset-stage-2": "6.13.0",
"babel-register": "6.11.6",
"babel-runtime": "6.11.6",
"body-parser": "1.15.2",
"bootstrap-loader": "1.1.0",
"bootstrap-loader": "2.0.0-beta.19",
"bootstrap-sass": "3.3.7",
"bootstrap-sass-loader": "1.0.10",
"bundle-loader": "0.5.4",
"cache-manager": "1.5.0",
"caniuse-db": "1.0.30000613",
"clean-webpack-plugin": "0.1.10",
"compression": "1.6.2",
"compression-webpack-plugin": "0.3.2",
"cookie-parser": "1.4.3",
"copy-to-clipboard": "3.0.5",
"cors": "2.7.1",
"css-loader": "0.23.1",
"css-loader": "0.26.1",
"cssnano": "3.10.0",
"debug": "2.2.0",
"dotenv": "2.0.0",
"errorhandler": "1.4.3",
"express": "4.14.0",
"express-state": "1.4.0",
"express-useragent": "1.0.4",
"extract-text-webpack-plugin": "2.0.0-beta.3",
"extract-text-webpack-plugin": "2.0.0-beta.5",
"file-loader": "0.8.5",
"fontfaceobserver": "1.7.3",
"history": "^3.0.0",
"html-webpack-plugin": "1.7.0",
"http-proxy": "1.14.0",
"humps": "2.0.0",
"image-webpack-loader": "3.1.0",
"imports-loader": "0.6.5",
"json-loader": "0.5.4",
"morgan": "1.7.0",
"node-sass": "4.1.1",
"normalizr": "3.0.2",
"postcss-loader": "0.9.1",
"precss": "1.4.0",
"pretty-error": "2.0.0",
"promise": "7.1.1",
"proxy-middleware": "0.14.0",
Expand All @@ -92,6 +99,7 @@
"react-cookie": "1.0.4",
"react-dom": "15.4.1",
"react-helmet": "3.1.0",
"react-hot-loader": "3.0.0-beta.6",
"react-inlinesvg": "0.5.4",
"react-intl": "2.1.5",
"react-metrics": "1.2.1",
Expand All @@ -108,6 +116,7 @@
"redux-connect": "5.0.0",
"reselect": "2.5.3",
"resolve-url": "0.2.1",
"resolve-url-loader": "1.6.1",
"sass-loader": "4.1.1",
"serialize-javascript": "1.3.0",
"serve-favicon": "2.3.0",
Expand All @@ -117,7 +126,8 @@
"superagent": "3.3.1",
"url": "0.11.0",
"url-loader": "0.5.7",
"webpack": "2.1.0-beta.20",
"webpack": "2.2.0",
"webpack-dev-server": "2.1.0-beta.0",
"webpack-isomorphic-tools": "2.5.7",
"winston": "1.1.2"
},
Expand Down Expand Up @@ -172,7 +182,7 @@
"wdio-spec-reporter": "0.0.3",
"webdriverio": "4.2.1",
"webpack-bundle-analyzer": "2.2.1",
"webpack-dev-server": "1.6.5",
"webpack-dev-server": "2.1.0-beta.0",
"webpack-hot-middleware": "2.12.2"
},
"pre-commit": [
Expand Down
21 changes: 10 additions & 11 deletions src/components/Audioplayer/RepeatDropdown/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Popover from 'react-bootstrap/lib/Popover';
import Nav from 'react-bootstrap/lib/Nav';
import NavItem from 'react-bootstrap/lib/NavItem';
import FormControl from 'react-bootstrap/lib/FormControl';
import Col from 'react-bootstrap/lib/Col';
import { intlShape, injectIntl } from 'react-intl';

import SwitchToggle from 'components/SwitchToggle';
Expand Down Expand Up @@ -62,7 +61,7 @@ class RepeatButton extends Component {
const array = Array(surah.ayat).join().split(',');

return (
<Col md={12} style={{ paddingTop: 15 }}>
<div className="col-md-12" style={{ paddingTop: 15 }}>
<ul className="list-inline" style={{ marginBottom: 0 }}>
<li>
<LocaleFormattedMessage
Expand Down Expand Up @@ -110,7 +109,7 @@ class RepeatButton extends Component {
</FormControl>
</li>
</ul>
</Col>
</div>
);
}

Expand All @@ -119,7 +118,7 @@ class RepeatButton extends Component {
const array = Array(surah.ayat).join().split(',');

return (
<Col md={12} style={{ paddingTop: 15 }}>
<div className="col-md-12" style={{ paddingTop: 15 }}>
<LocaleFormattedMessage
id="player.currentAyah"
defaultMessage="Ayah"
Expand All @@ -141,7 +140,7 @@ class RepeatButton extends Component {
))
}
</FormControl>
</Col>
</div>
);
}

Expand All @@ -150,7 +149,7 @@ class RepeatButton extends Component {

return (
<div className={`${!repeat.from && style.disabled} row`}>
<Col md={12}>
<div className="col-md-12">
<Nav
bsStyle="pills"
activeKey={repeat.from === repeat.to ? 1 : 2}
Expand All @@ -169,7 +168,7 @@ class RepeatButton extends Component {
/>
</NavItem>
</Nav>
</Col>
</div>
</div>
);
}
Expand All @@ -190,7 +189,7 @@ class RepeatButton extends Component {

return (
<div className={`${!repeat.from && style.disabled} row`}>
<Col md={12} style={{ paddingTop: 15 }}>
<div className="col-md-12" style={{ paddingTop: 15 }}>
<LocaleFormattedMessage
id="player.repeat.title"
defaultMessage="Repeat"
Expand All @@ -216,7 +215,7 @@ class RepeatButton extends Component {
))
}
</FormControl>
</Col>
</div>
</div>
);
}
Expand All @@ -230,7 +229,7 @@ class RepeatButton extends Component {
className={style.popover}
title={
<div className="row">
<Col md={12} className="text-center">
<div className="col-md-12 text-center">
<LocaleFormattedMessage
id="player.repeat.title"
defaultMessage="TOGGLE REPEAT"
Expand All @@ -241,7 +240,7 @@ class RepeatButton extends Component {
id="repeat-toggle"
flat
/>
</Col>
</div>
</div>
}
>
Expand Down
25 changes: 12 additions & 13 deletions src/components/FontSizeDropdown/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { Component, PropTypes } from 'react';

import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
import Popover from 'react-bootstrap/lib/Popover';
import Col from 'react-bootstrap/lib/Col';

import LocaleFormattedMessage from 'components/LocaleFormattedMessage';

Expand Down Expand Up @@ -43,51 +42,51 @@ export default class FontSizeDropdown extends Component {
return (
<Popover id="FontSizeDropdown" title={title} className={style.popover}>
<div className="row">
<Col xs={3}>
<div className="col-xs-3">
<a
tabIndex="-1"
onClick={() => this.handleOptionSelected('arabic', -1)}
className="pointer"
>
<i className="ss-icon ss-hyphen" />
</a>
</Col>
<Col xs={6} className="text-center">
</div>
<div className="col-xs-6 text-center">
<LocaleFormattedMessage id="setting.fontSize.arabic" defaultMessage="Arabic" />
</Col>
<Col xs={3} className="text-right">
</div>
<div className="col-xs-3 text-center">
<a
tabIndex="-1"
onClick={() => this.handleOptionSelected('arabic', 1)}
className="pointer"
>
<i className="ss-icon ss-plus" />
</a>
</Col>
</div>
</div>
<br />
<div className="row">
<Col xs={3}>
<div className="col-xs-3">
<a
tabIndex="-1"
onClick={() => this.handleOptionSelected('translation', -1)}
className="pointer"
>
<i className="ss-icon ss-hyphen" />
</a>
</Col>
<Col xs={6} className="text-center">
</div>
<div className="col-xs-6 text-center">
<LocaleFormattedMessage id="setting.translations.title" defaultMessage="Translations" />
</Col>
<Col xs={3} className="text-right">
</div>
<div className="col-xs-3 text-right">
<a
tabIndex="-1"
onClick={() => this.handleOptionSelected('translation', 1)}
className="pointer"
>
<i className="ss-icon ss-plus" />
</a>
</Col>
</div>
</div>
</Popover>
);
Expand Down
Loading