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

Bump serialize-javascript from 1.3.0 to 3.1.0 #1186

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
d6d09d9
Limit selection of translations (#718) (#800)
azeezolaniran2016 May 27, 2017
f80ad10
Moved font path to cdn, fixed direction for farsi (#809)
naveed-ahmad May 30, 2017
d0415e5
Reduce audio api calls (#807)
mmahalwy May 30, 2017
99645b2
Loader overlay (#750)
mmahalwy May 30, 2017
468ad66
Change license to reflect other projects (#805)
mmahalwy May 30, 2017
5fb9505
added content page for tafsir (#799)
naveed-ahmad May 30, 2017
52dcd94
Create nl.js
abdelouali Jun 1, 2017
80ebfca
moved all setting related compontent to settings namespace
naveed-ahmad Jun 5, 2017
3970ed1
fixed setting
naveed-ahmad Jun 6, 2017
510b113
minor changes for tafsir
naveed-ahmad Jun 6, 2017
603536d
added local in setting
naveed-ahmad Jun 6, 2017
046fc32
load setting/options from cookies
naveed-ahmad Jun 9, 2017
33518d1
added reset font size
naveed-ahmad Jun 9, 2017
93cbf77
Simple refactorizations. (#820)
UmanShahzad Jun 10, 2017
0cea96a
Merge branch 'master' of github.com:quran/quran.com-frontend into sav…
naveed-ahmad Jun 11, 2017
31501b1
don't need switch toggle[moved to components]
naveed-ahmad Jun 11, 2017
58beafb
minor fixes for urdu and rtl languages
naveed-ahmad Jun 11, 2017
80273a1
fixed font size and alignment on rtl languages for translations and f…
naveed-ahmad Jun 11, 2017
652b852
Merge pull request #818 from quran/save_setting
naveed-ahmad Jun 11, 2017
968fbe7
Merge branch 'master' into patch-1
naveed-ahmad Jun 11, 2017
c378d29
added Dutch language
naveed-ahmad Jun 11, 2017
28b30f8
Merge pull request #812 from abdelouali/patch-1
naveed-ahmad Jun 11, 2017
6f7d12d
removed sitemap
naveed-ahmad Jun 11, 2017
ca3d93e
fixed ayat ul kursi
naveed-ahmad Jun 11, 2017
d26f9ad
refacor home to component
naveed-ahmad Jun 11, 2017
0b8e4ed
wip on loading juzs
naveed-ahmad Jun 12, 2017
84c1ad5
added minimal UI for juz
naveed-ahmad Jun 12, 2017
c3f6d44
change default translation to The Clear Quran
naveed-ahmad Jun 12, 2017
892c6e3
Merge pull request #824 from quran/clear_quran_as_default_trans
naveed-ahmad Jun 15, 2017
4cd7ca2
Merge branch 'master' into move_sitemap_to_api
naveed-ahmad Jun 15, 2017
b7f7913
Merge branch 'master' into filter_by_para
naveed-ahmad Jun 21, 2017
2c3dee6
disable lint
naveed-ahmad Jun 24, 2017
f0ff1e7
Fixed an issue that was causing the wrong word to highlight
iMoe037 Jun 24, 2017
24598f2
Merge pull request #823 from quran/filter_by_para
naveed-ahmad Jun 24, 2017
809ddcf
Merge branch 'master' into fix/ayah-highlight
naveed-ahmad Jun 24, 2017
3df7cab
Merge branch 'master' into move_sitemap_to_api
naveed-ahmad Jun 24, 2017
214474e
Merge pull request #822 from quran/move_sitemap_to_api
naveed-ahmad Jun 24, 2017
d626fd2
Merge branch 'master' into fix/ayah-highlight
naveed-ahmad Jun 24, 2017
fb0da49
Fixed surah dropdown #793
naveed-ahmad Jun 24, 2017
d8708c9
Merge branch 'master' into switch_surah
naveed-ahmad Jun 24, 2017
040b464
Merge pull request #831 from iMoe037/fix/ayah-highlight
naveed-ahmad Jun 24, 2017
97a0002
Changed the name attribute to fix auto-scrolling
iMoe037 Jun 25, 2017
d062d2f
Merge pull request #833 from iMoe037/fix/auto-scroll
naveed-ahmad Jun 25, 2017
7d0c884
Merge branch 'master' into switch_surah
naveed-ahmad Jun 25, 2017
f517d5e
Fix beginning of surah button not reseting the player (#674) (#821)
azeezolaniran2016 Jun 27, 2017
fd55a6b
Bug fix for issue #835
ikandars Jun 28, 2017
77b7fec
Merge branch 'master' into master
naveed-ahmad Jun 28, 2017
89b2966
Merge branch 'master' into switch_surah
naveed-ahmad Jun 28, 2017
723e36a
Merge pull request #836 from ikandars/master
naveed-ahmad Jun 28, 2017
06a31b5
Merge branch 'master' into switch_surah
naveed-ahmad Jun 28, 2017
ae47deb
Merge pull request #832 from quran/switch_surah
naveed-ahmad Jun 28, 2017
37f4008
Refactorizations.
Jun 23, 2017
d0ef11b
Refactorizations.
Jun 23, 2017
248a3f2
update prettier to support scss formatting
thabti Jul 2, 2017
b848576
Merge pull request #841 from quran/feature/update-prettier
naveed-ahmad Jul 2, 2017
0cc5aea
Merge branch 'master' into refactor_2
naveed-ahmad Jul 2, 2017
919fdb9
Merge branch 'master' into refactor
naveed-ahmad Jul 2, 2017
be9f0a7
Merge pull request #838 from UmanShahzad/refactor
naveed-ahmad Jul 2, 2017
93dd5cc
Merge branch 'master' into refactor_2
naveed-ahmad Jul 2, 2017
4c1a3c6
Merge pull request #839 from UmanShahzad/refactor_2
naveed-ahmad Jul 2, 2017
ef06792
fixes Arabic surah alignment
Jul 4, 2017
0c57fa9
Merge pull request #842 from ajalger/fix/arabic-align-homepage
naveed-ahmad Jul 4, 2017
2935ac5
Adding Styled components instead of style.scss (#829)
mmahalwy Jul 11, 2017
4e8677f
keep the date current (#844)
nur-azhar Jul 13, 2017
1c08440
Dynamic Footer Year
korabh Jul 21, 2017
7789bf5
Merge pull request #848 from korabh/master
naveed-ahmad Jul 21, 2017
28cb16d
Merge branch 'master' into production
ahmedre Jul 29, 2017
78fe41c
Add dynamic og:image and remove canonical urls (#1170)
tifa2UP Jul 30, 2020
335850c
Add Google Tag Manager (#1169)
mmahalwy Jul 30, 2020
f34c8c6
change to fallback
mmahalwy Aug 7, 2020
12e73fc
fix error
mmahalwy Aug 7, 2020
d9bbbcb
fix error
mmahalwy Aug 7, 2020
5c3d1f5
remove tag
mmahalwy Aug 7, 2020
5e9611e
Bump serialize-javascript from 1.3.0 to 3.1.0
dependabot[bot] Aug 13, 2020
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NODE_ENV=development
PORT=8000
API_URL=http://staging.quran.com:3000
API_URL=http://api.quran.com
ONE_QURAN_URL=http://localhost:3030
SEGMENTS_KEY=
SENTRY_KEY_CLIENT=
Expand Down
8 changes: 4 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
"__DEVTOOLS__": true,
"socket": true,
"webpackIsomorphicTools": true,
ga: true,
Raven: true,
mixpanel: true,
"ga": true,
"Raven": true,
"mixpanel": true,
"expect": true,
"browser": true,
"import": true,
"FB": true,
"window": true,
sinon: true
"sinon": true
},
"env": {
"mocha": true,
Expand Down
695 changes: 674 additions & 21 deletions LICENSE.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ analyze-bundle-size bundle-stats.json

[Reactjs]: https://facebook.github.io/react/docs/getting-started.html
[Redux]: http://redux.js.org/
[styled-components]: http://styled-components.com
[Expressjs]: http://expressjs.com/en/starter/hello-world.html
[Webpack]: http://webpack.github.io/docs/what-is-webpack.html
[nodejs]: https://nodejs.org/en/
Expand Down
8 changes: 4 additions & 4 deletions bin/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (__DEVELOPMENT__) {
}

global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
.development(process.env.NODE_ENV === 'development')
.server(rootDir, function() {
require('../src/server.js').default();
});
.development(process.env.NODE_ENV === 'development')
.server(rootDir, function() {
require('../src/server.js').default();
});
12 changes: 7 additions & 5 deletions bin/server.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ global.__CLIENT__ = false;
global.__SERVER__ = true;
global.__DEVELOPMENT__ = process.env.NODE_ENV !== 'production';

global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
.development(__DEVELOPMENT__)
.server(rootDir, function() {
require('../dist/server.js').default();
});
global.webpack_isomorphic_tools = new webpackIsomorphicTools(
require('../webpack/isomorphic-tools-configuration')
)
.development(__DEVELOPMENT__)
.server(rootDir, function() {
require('../dist/server.js').default();
});
51 changes: 27 additions & 24 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var webpack = require('webpack');
const path = require('path');
const webpack = require('webpack');

module.exports = function(config) {
module.exports = config => {
config.set({

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',

Expand All @@ -26,42 +26,42 @@ module.exports = function(config) {
'./node_modules/phantomjs-polyfill/bind-polyfill.js',
'./tests/polyfill/Event.js',
'./node_modules/Intl/locale-data/jsonp/en-US.js',
{pattern: 'static/images/*', watched: false, included: false, served: true},
{
pattern: 'static/images/*',
watched: false,
included: false,
served: true
},

// Actual tests here
'tests.webpack.js'
],

// list of files to exclude
exclude: [
],
exclude: [],

proxies: {
'/images': __dirname + '/static/images',
'/images/': __dirname + '/static/images/',
'/images': path.join(__dirname, '/static/images'),
'/images/': path.join(__dirname, '/static/images/')
},

proxyValidateSSL: false,

// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessors

preprocessors: {
'tests.webpack.js': [ 'webpack', 'sourcemap' ]
'tests.webpack.js': ['webpack', 'sourcemap']
},

webpack: {
externals: {
'cheerio': 'window',
cheerio: 'window',
'react/addons': true,
'react/lib/ExecutionEnvironment': true,
'react/lib/ReactContext': true
},
resolve: {
modules: [
'src',
'node_modules'
],
modules: ['src', 'node_modules'],
extensions: ['', '.json', '.js']
},

Expand All @@ -72,9 +72,16 @@ module.exports = function(config) {
exclude: [/server/, /node_modules/, /tests/],
loader: 'babel'
},
{ test: /\.json$/, loader: 'json-loader'},
{ test: /\.scss$/, loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!sass?outputStyle=expanded&sourceMap' },
{ test: /\.(jpe?g|png|gif|svg)$/, loader: 'url', query: {limit: 10240} }
{ test: /\.json$/, loader: 'json-loader' },
{
test: /\.scss$/,
loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!sass?outputStyle=expanded&sourceMap'
},
{
test: /\.(jpe?g|png|gif|svg)$/,
loader: 'url',
query: { limit: 10240 }
}
]
},

Expand All @@ -86,12 +93,12 @@ module.exports = function(config) {
fs: 'empty'
},

plugins:[
plugins: [
new webpack.DefinePlugin({
__CLIENT__: true,
__SERVER__: false,
__DEVELOPMENT__: true,
__DEVTOOLS__: false // <-------- DISABLE redux-devtools HERE
__DEVTOOLS__: false // <-------- DISABLE redux-devtools HERE
})
],

Expand Down Expand Up @@ -119,20 +126,16 @@ module.exports = function(config) {
// web server port
port: 9876,


// enable / disable colors in the output (reporters and logs)
colors: true,


// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,


// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,


// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
// browsers: ['Chrome', 'PhantomJS'],
Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"test:stylelint": "stylelint './src/**/*.scss' --config ./webpack/.stylelintrc",
"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 --expose-gc ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config ./webpack/dev.config.js --progress & env NODE_PATH='./src' PORT=8000 node --expose-gc ./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",
"build:client": "webpack --config ./webpack/prod.config.js",
Expand All @@ -33,6 +32,10 @@
"npm run prettier",
"npm run lint:fix",
"git add"
],
"*.scss": [
"npm run prettier",
"git add"
]
},
"engines": {
Expand Down Expand Up @@ -104,7 +107,7 @@
"promise": "7.1.1",
"proxy-middleware": "0.14.0",
"qs": "6.2.1",
"quran-components": "^0.0.73",
"quran-components": "^0.0.78",
"raven": "1.1.1",
"raw-loader": "0.5.1",
"react": "15.4.1",
Expand Down Expand Up @@ -134,11 +137,12 @@
"resolve-url": "0.2.1",
"resolve-url-loader": "1.6.1",
"sass-loader": "^6.0.5",
"serialize-javascript": "1.3.0",
"serialize-javascript": "3.1.0",
"serve-favicon": "2.3.0",
"sitemap": "1.8.1",
"strip-loader": "0.1.2",
"style-loader": "0.13.1",
"styled-components": "^2.1.0",
"superagent": "3.3.1",
"url": "0.11.0",
"url-loader": "0.5.7",
Expand Down Expand Up @@ -184,7 +188,7 @@
"phantomjs-polyfill": "0.0.1",
"piping": "0.3.0",
"pre-commit": "1.1.3",
"prettier": "^1.2.2",
"prettier": "^1.5.2",
"react-addons-test-utils": "15.4.1",
"react-transform-catch-errors": "1.0.0",
"react-transform-hmr": "1.0.1",
Expand Down
24 changes: 14 additions & 10 deletions src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ import useScroll from 'react-router-scroll';
import { ReduxAsyncConnect } from 'redux-connect';
import { syncHistoryWithStore } from 'react-router-redux';
import { AppContainer } from 'react-hot-loader';
import { ThemeProvider } from 'styled-components';

import debug from 'debug';

import config from './config';
import theme from './theme';
import ApiClient from './helpers/ApiClient';
import createStore from './redux/create';
import routes from './routes';
Expand Down Expand Up @@ -47,16 +49,18 @@ match(
{ history, routes: routes(store) },
(error, redirectLocation, renderProps) => {
const component = (
<Router
{...renderProps}
render={props => (
<ReduxAsyncConnect
{...props}
helpers={{ client }}
render={applyRouterMiddleware(useScroll())}
/>
)}
/>
<ThemeProvider theme={theme}>
<Router
{...renderProps}
render={props => (
<ReduxAsyncConnect
{...props}
helpers={{ client }}
render={applyRouterMiddleware(useScroll())}
/>
)}
/>
</ThemeProvider>
);

const mountNode = document.getElementById('app');
Expand Down
19 changes: 14 additions & 5 deletions src/components/Audioplayer/ScrollButton/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import React, { PropTypes } from 'react';
import styled from 'styled-components';
import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
import Tooltip from 'react-bootstrap/lib/Tooltip';
import LocaleFormattedMessage from 'components/LocaleFormattedMessage';

const style = require('../style.scss');
const ScrollLink = styled.a`
width: 100%;
display: inline-block;
cursor: pointer;
padding-right: 1.5%;
color: ${props => (props.active ? props.theme.brandPrimary : props.theme.textColor)};
outline: none;
cursor: pointer;
margin-bottom: 0;
`;

const ScrollButton = ({ shouldScroll, onScrollToggle }) => {
const tooltip = (
Expand All @@ -22,14 +32,13 @@ const ScrollButton = ({ shouldScroll, onScrollToggle }) => {
placement="top"
trigger={['hover', 'focus']}
>
<a
<ScrollLink
tabIndex="-1"
className={`pointer ${style.buttons} ${shouldScroll ? style.scroll : ''}`}
active={shouldScroll}
onClick={onScrollToggle}
style={{ marginBottom: 0 }}
>
<i className="ss-icon ss-link" />
</a>
</ScrollLink>
</OverlayTrigger>
</div>
);
Expand Down
48 changes: 38 additions & 10 deletions src/components/Audioplayer/Track/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@
/* eslint-disable jsx-a11y/no-static-element-interactions */
import React, { Component, PropTypes } from 'react';
import styled from 'styled-components';

const styles = require('./style.scss');
const Container = styled.div`
height: 6px;
width: 100%;
background-color: #f7f7f7;
cursor: pointer;
margin-bottom: 5px;
`;

const Progress = styled.div`
height: 100%;
background-color: ${props => props.theme.brandPrimary};
position: relative;
padding-left: 12px;


&:after{
content: '';
height: 12px;
width: 12px;
border-radius: 10px;
position: absolute;
right: 0;
display: block;
background: #fff;
top: -3px;
box-shadow: 0 1px 2px rgba(0,0,0,0.45);
transition: height 0.5s;
}
`;

export default class Track extends Component {
static propTypes = {
Expand All @@ -12,10 +41,8 @@ export default class Track extends Component {
handleClick = (event) => {
const { onTrackChange } = this.props;

const fraction = (
event.nativeEvent.offsetX /
this.container.getBoundingClientRect().width
);
const fraction =
event.nativeEvent.offsetX / this.container.getBoundingClientRect().width;

return onTrackChange(fraction);
};
Expand All @@ -24,13 +51,14 @@ export default class Track extends Component {
const { progress } = this.props;

return (
<div
ref={(container) => { this.container = container; }}
className={styles.container}
<Container
ref={(container) => {
this.container = container;
}}
onClick={this.handleClick}
>
<div className={styles.progress} style={{ width: `${progress}%` }} />
</div>
<Progress style={{ width: `${progress}%` }} />
</Container>
);
}
}
Loading