From d6d09d90f4b37d1d1f8d38041e3a59df61da4fdf Mon Sep 17 00:00:00 2001 From: azeezolaniran2016 Date: Sat, 27 May 2017 21:18:14 +0100 Subject: [PATCH 01/38] Limit selection of translations (#718) (#800) --- src/components/ContentDropdown/index.js | 98 +++++++++++++++---------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/src/components/ContentDropdown/index.js b/src/components/ContentDropdown/index.js index 04472f855..4ed675961 100644 --- a/src/components/ContentDropdown/index.js +++ b/src/components/ContentDropdown/index.js @@ -10,30 +10,28 @@ import Icon from 'quran-components/lib/Icon'; const style = require('./style.scss'); -const compareAlphabetically = property => - (previous, next) => { - const previousText = previous[property].toUpperCase(); - const nextText = next[property].toUpperCase(); +const compareAlphabetically = property => (previous, next) => { + const previousText = previous[property].toUpperCase(); + const nextText = next[property].toUpperCase(); - if (previousText < nextText) { - return -1; - } + if (previousText < nextText) { + return -1; + } - if (previousText > nextText) { - return 1; - } + if (previousText > nextText) { + return 1; + } - return 0; - }; + return 0; +}; +const TRANSLATIONS_SELECTION_LIMIT = 10; class ContentDropdown extends Component { - componentDidMount() { if (!this.props.translationOptions.length) { return this.props.loadTranslations(); } - return false; } @@ -41,13 +39,14 @@ class ContentDropdown extends Component { const { onOptionChange } = this.props; onOptionChange({ translations: [] }); - } + }; handleOptionSelected(id) { const { onOptionChange, translations } = this.props; - if (translations.find(option => option === id)) { - onOptionChange({ translations: translations.filter(option => option !== id) }); + onOptionChange({ + translations: translations.filter(option => option !== id) + }); } else { onOptionChange({ translations: [...translations, id] }); } @@ -65,6 +64,9 @@ class ContentDropdown extends Component { id={translation.id + translation.languageName} name="translation" checked={checked || false} + disabled={ + !checked && translations.length >= TRANSLATIONS_SELECTION_LIMIT + } handleChange={() => this.handleOptionSelected(translation.id)} > {render(translation)} @@ -76,48 +78,61 @@ class ContentDropdown extends Component { renderEnglishList() { const list = this.props.translationOptions - .filter(translation => translation.languageName === 'English') - .sort(compareAlphabetically('authorName')); + .filter(translation => translation.languageName === 'English') + .sort(compareAlphabetically('authorName')); return this.renderItems(list, translation => translation.authorName); } renderLanguagesList() { const list = this.props.translationOptions - .filter(translation => translation.languageName !== 'English') - .sort(compareAlphabetically('languageName')); + .filter(translation => translation.languageName !== 'English') + .sort(compareAlphabetically('languageName')); - return this.renderItems(list, translation => `${translation.languageName} - ${translation.authorName}`); + return this.renderItems( + list, + translation => `${translation.languageName} - ${translation.authorName}` + ); } render() { const { translations, translationOptions } = this.props; - return ( } menu={ - translationOptions.length ? - - { - translations && translations.length && + translationOptions.length + ? + {translations && + translations.length && - - - } + + } - + {this.renderEnglishList()} - + {this.renderLanguagesList()} - : - + + : } > - + ); } @@ -130,8 +145,11 @@ ContentDropdown.propTypes = { loadTranslations: PropTypes.func.isRequired }; -export default connect(state => ({ - translationOptions: state.options.options.translations, - loadingTranslations: state.options.loadingTranslations, - translations: state.options.translations -}), { loadTranslations })(ContentDropdown); +export default connect( + state => ({ + translationOptions: state.options.options.translations, + loadingTranslations: state.options.loadingTranslations, + translations: state.options.translations + }), + { loadTranslations } +)(ContentDropdown); From f80ad109dcab079742c3e735926517d281ce21b1 Mon Sep 17 00:00:00 2001 From: Naveed Ahmad Date: Tue, 30 May 2017 23:43:54 +0500 Subject: [PATCH 02/38] Moved font path to cdn, fixed direction for farsi (#809) * moved font path to cdn, fixed direction for farsi * fixed language name --- src/styles/fonts/_fonts.scss | 8 ++++---- src/styles/main.scss | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/styles/fonts/_fonts.scss b/src/styles/fonts/_fonts.scss index e1fa5b94b..5bae328c6 100644 --- a/src/styles/fonts/_fonts.scss +++ b/src/styles/fonts/_fonts.scss @@ -90,16 +90,16 @@ @font-face { font-family: 'surah_names'; - src: url('../../static/fonts/surah_names/surah_names.eot?yg3f94'); - src: url('../../static/fonts/surah_names/surah_names.eot?yg3f94#iefix') format('embedded-opentype'), url('../../static/fonts/surah_names/surah_names.ttf?yg3f94') format('truetype'), url('../../static/fonts/surah_names/surah_names.woff?yg3f94') format('woff'), url('../../static/fonts/surah_names/surah_names.svg?yg3f94#surah_names') format('svg'); + src: url('//quran-1f14.kxcdn.com/fonts/surah_names/surah_names.eot?yg3f94'); + src: url('//quran-1f14.kxcdn.com/fonts/surah_names/surah_names.eot?yg3f94#iefix') format('embedded-opentype'), url('//quran-1f14.kxcdn.com/fonts/surah_names/surah_names.ttf?yg3f94') format('truetype'), url('//quran-1f14.kxcdn.com/fonts/surah_names/surah_names.woff?yg3f94') format('woff'), url('//quran-1f14.kxcdn.com/fonts/surah_names/surah_names.svg?yg3f94#surah_names') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'bismillah'; - src: url('../../static/fonts/bismillah/bismillah.eot?yg3f94'); - src: url('../../static/fonts/bismillah/bismillah.eot?yg3f94#iefix') format('embedded-opentype'), url('../../static/fonts/bismillah/bismillah.ttf?yg3f94') format('truetype'), url('../../static/fonts/bismillah/bismillah.woff?yg3f94') format('woff'), url('../../static/fonts/bismillah/bismillah.svg?yg3f94#bismillah') format('svg'); + src: url('//quran-1f14.kxcdn.com/fonts/bismillah/bismillah.eot?yg3f94'); + src: url('//quran-1f14.kxcdn.com/fonts/bismillah/bismillah.eot?yg3f94#iefix') format('embedded-opentype'), url('//quran-1f14.kxcdn.com/fonts/bismillah/bismillah.ttf?yg3f94') format('truetype'), url('//quran-1f14.kxcdn.com/fonts/bismillah/bismillah.woff?yg3f94') format('woff'), url('//quran-1f14.kxcdn.com/fonts/bismillah/bismillah.svg?yg3f94#bismillah') format('svg'); font-weight: normal; font-style: normal; } diff --git a/src/styles/main.scss b/src/styles/main.scss index 157d83efc..41bf41270 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -175,6 +175,10 @@ li em{ } } +.persian{ + direction: rtl; +} + .modal-backdrop{ bottom: 0; } From d0415e596f7686c116faa0b2d742da17bec86d87 Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Tue, 30 May 2017 13:14:13 -0700 Subject: [PATCH 03/38] Reduce audio api calls (#807) --- src/components/Audioplayer/index.js | 125 ++++++++++++++++++++-------- src/containers/Surah/index.js | 68 ++++++++------- src/redux/actions/audioplayer.js | 2 +- 3 files changed, 127 insertions(+), 68 deletions(-) diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js index 44620c0f4..6c91a66e3 100644 --- a/src/components/Audioplayer/index.js +++ b/src/components/Audioplayer/index.js @@ -28,8 +28,13 @@ const RepeatDropdown = Loadable({ }); export class Audioplayer extends Component { + state = { + loadingFile: false + }; + componentDidMount() { - const { currentFile } = this.props; // eslint-disable-line no-shadow, max-len + const { currentFile, currentVerse, audio, verses, load } = this.props; // eslint-disable-line no-shadow, max-len + const nextVerse = verses[this.getNext()]; debug('component:Audioplayer', 'componentDidMount'); @@ -37,7 +42,19 @@ export class Audioplayer extends Component { return this.handleAddFileListeners(currentFile); } - console.error('Audioplayer mounted but no file available'); + load({ + chapterId: currentVerse.chapterId, + verseId: currentVerse.id, + verseKey: currentVerse.verseKey, + audio + }); + + load({ + chapterId: nextVerse.chapterId, + verseId: nextVerse.id, + verseKey: nextVerse.verseKey, + audio + }); return false; } @@ -58,7 +75,7 @@ export class Audioplayer extends Component { } // Change verse - if (this.props.currentVerse !== nextProps.currentVerse) { + if (this.props.currentVerse.verseKey !== nextProps.currentVerse.verseKey) { if (this.props.currentFile) { this.handleRemoveFileListeners(this.props.currentFile); } @@ -66,11 +83,42 @@ export class Audioplayer extends Component { return this.handleAddFileListeners(nextProps.currentFile); } + if (this.props.audio !== nextProps.audio) { + Object.keys(this.props.files).forEach(key => + this.props.load({ + chapterId: this.props.verses[key].chapterId, + verseId: this.props.verses[key].id, + verseKey: this.props.verses[key].verseKey, + audio: nextProps.audio + }) + ); + } + return false; } - componentDidUpdate() { - const { currentFile, isPlaying } = this.props; + componentDidUpdate(previousProps) { + const { + currentFile, + isPlaying, + verses, + audio, + currentVerse, + load + } = this.props; + + if ( + currentVerse.verseKey !== previousProps.currentVerse.verseKey && + verses[this.getNext()] + ) { + const verse = verses[this.getNext()]; + load({ + chapterId: verse.chapterId, + verseId: verse.id, + verseKey: verse.verseKey, + audio + }); + } if (!currentFile) return false; @@ -95,30 +143,28 @@ export class Audioplayer extends Component { } getPrevious() { - const { currentVerse, files } = this.props; - const ayahIds = Object.keys(files); - const index = ayahIds.findIndex(id => id === currentVerse); + const { currentVerse, verseIds } = this.props; + const index = verseIds.findIndex(id => id === currentVerse.verseKey); - return ayahIds[index - 1]; + return verseIds[index - 1]; } getNext() { - const { currentVerse, chapter, files, onLoadAyahs } = this.props; - const ayahIds = Object.keys(files); - const ayahNum = currentVerse.split(':')[1]; - const index = ayahIds.findIndex(id => id === currentVerse); + const { currentVerse, chapter, onLoadAyahs, verseIds } = this.props; + const ayahNum = currentVerse.verseKey.split(':')[1]; + const index = verseIds.findIndex(id => id === currentVerse.verseKey); if (chapter.versesCount === ayahNum + 1) { // We are at the end of the chapter! return false; } - if (ayahIds.length - 3 <= index + 1) { + if (verseIds.length - 3 <= index + 1) { // Need to load the next set of ayahs! onLoadAyahs(); } - return ayahIds[index + 1]; + return verseIds[index + 1]; } handleAyahChange = (direction = 'next') => { @@ -130,7 +176,7 @@ export class Audioplayer extends Component { const nextVerse = this[camelize(`get_${direction}`)](); if (!nextVerse) return pause(); - this.props[direction](currentVerse); + this.props[direction](currentVerse.verseKey); this.handleScrollTo(nextVerse); @@ -141,7 +187,7 @@ export class Audioplayer extends Component { return false; }; - scrollToVerse = (ayahNum = this.props.currentVerse) => { + scrollToVerse = (ayahNum = this.props.currentVerse.verseKey) => { scroller.scrollTo(`verse:${ayahNum}`, -45); }; @@ -163,7 +209,7 @@ export class Audioplayer extends Component { preloadNext() { const { currentVerse, files } = this.props; const ayahIds = Object.keys(files); - const index = ayahIds.findIndex(id => id === currentVerse) + 1; + const index = ayahIds.findIndex(id => id === currentVerse.verseKey) + 1; for (let id = index; id <= index + 2; id += 1) { if (ayahIds[id]) { @@ -183,7 +229,7 @@ export class Audioplayer extends Component { setRepeat, // eslint-disable-line no-shadow setAyah // eslint-disable-line no-shadow } = this.props; - const [chapter, ayah] = currentVerse + const [chapter, ayah] = currentVerse.verseKey .split(':') .map(val => parseInt(val, 10)); @@ -244,7 +290,7 @@ export class Audioplayer extends Component { if (!shouldScroll) { // we use the inverse (!) here because we're toggling, so false is true - this.scrollToVerse(currentVerse); + this.scrollToVerse(currentVerse.verseKey); } this.props.toggleScroll(); @@ -254,7 +300,7 @@ export class Audioplayer extends Component { // NOTE: if no file, just wait. if (!file) return false; - const { update, currentTime } = this.props; // eslint-disable-line no-shadow + const { update } = this.props; // eslint-disable-line no-shadow debug('component:Audioplayer', `Attaching listeners to ${file.src}`); // Preload file @@ -262,8 +308,8 @@ export class Audioplayer extends Component { const onLoadeddata = () => { // Default current time to zero. This will change - file.currentTime = // eslint-disable-line no-param-reassign - file.currentTime || currentTime || 0; + file.currentTime = 0; // eslint-disable-line + // file.currentTime || currentTime || 0; return update({ duration: file.duration, @@ -345,7 +391,9 @@ export class Audioplayer extends Component { renderPreviousButton() { const { currentVerse, files } = this.props; if (!files) return false; - const index = Object.keys(files).findIndex(id => id === currentVerse); + const index = Object.keys(files).findIndex( + id => id === currentVerse.verseKey + ); return ( } {segments && - segments[currentVerse] && + segments[currentVerse.verseKey] && } @@ -432,7 +480,7 @@ export class Audioplayer extends Component { /> : {' '} - {currentVerse.split(':')[1]} + {currentVerse.verseKey.split(':')[1]}
  • {this.renderPreviousButton()} @@ -447,7 +495,7 @@ export class Audioplayer extends Component {
    • @@ -464,22 +512,22 @@ export class Audioplayer extends Component { } const mapStateToProps = (state, ownProps) => { - const currentVerse = - state.audioplayer.currentVerse || ownProps.startVerse.verseKey; const files = state.audioplayer.files[ownProps.chapter.id]; + const verseIds = Object.keys(ownProps.verses); return { files, - currentVerse, + verseIds, segments: state.audioplayer.segments[ownProps.chapter.id], - currentFile: files[currentVerse], + currentFile: files[ownProps.currentVerse.verseKey], chapterId: ownProps.chapter.id, isPlaying: state.audioplayer.isPlaying, isLoading: state.audioplayer.isLoading, repeat: state.audioplayer.repeat, shouldScroll: state.audioplayer.shouldScroll, duration: state.audioplayer.duration, - currentTime: state.audioplayer.currentTime + currentTime: state.audioplayer.currentTime, + audio: state.options.audio }; }; @@ -490,7 +538,7 @@ Audioplayer.propTypes = { segments: customPropTypes.segments, // NOTE: should be PropTypes.instanceOf(Audio) but not on server. files: PropTypes.object, // eslint-disable-line - currentVerse: PropTypes.string, + currentVerse: PropTypes.verseType, isLoading: PropTypes.bool.isRequired, play: PropTypes.func.isRequired, pause: PropTypes.func.isRequired, @@ -505,9 +553,12 @@ Audioplayer.propTypes = { isPlaying: PropTypes.bool, currentTime: PropTypes.number, duration: PropTypes.number, + load: PropTypes.func.isRequired, // NOTE: should be PropTypes.instanceOf(Audio) but not on server. currentFile: PropTypes.any, // eslint-disable-line - startVerse: customPropTypes.verseType // eslint-disable-line + audio: PropTypes.number.isRequired, + verses: customPropTypes.verses, + verseIds: PropTypes.object // eslint-disable-line }; export default connect(mapStateToProps, AudioActions)(Audioplayer); diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js index 94b5e031a..5198aed0b 100644 --- a/src/containers/Surah/index.js +++ b/src/containers/Surah/index.js @@ -79,34 +79,34 @@ class Surah extends Component { return false; } - componentDidMount() { - const { verses, options: { audio } } = this.props; - - Object.values(verses).forEach((verse) => { - this.props.actions.audio.load({ - chapterId: verse.chapterId, - verseId: verse.id, - verseKey: verse.verseKey, - audio - }); - }); - } - - // TODO: Should this belong here? - componentWillReceiveProps(nextProps) { - if (this.props.options.audio !== nextProps.options.audio) { - const { verses, options: { audio } } = nextProps; - - Object.values(verses).forEach((verse) => { - this.props.actions.audio.load({ - chapterId: verse.chapterId, - verseId: verse.id, - verseKey: verse.verseKey, - audio - }); - }); - } - } + // componentDidMount() { + // const { verses, options: { audio } } = this.props; + + // Object.values(verses).forEach((verse) => { + // this.props.actions.audio.load({ + // chapterId: verse.chapterId, + // verseId: verse.id, + // verseKey: verse.verseKey, + // audio + // }); + // }); + // } + + // // TODO: Should this belong here? + // componentWillReceiveProps(nextProps) { + // if (this.props.options.audio !== nextProps.options.audio) { + // const { verses, options: { audio } } = nextProps; + + // Object.values(verses).forEach((verse) => { + // this.props.actions.audio.load({ + // chapterId: verse.chapterId, + // verseId: verse.id, + // verseKey: verse.verseKey, + // audio + // }); + // }); + // } + // } shouldComponentUpdate(nextProps, nextState) { const conditions = [ @@ -360,7 +360,14 @@ class Surah extends Component { } render() { - const { chapter, verses, options, info, actions } = this.props; // eslint-disable-line no-shadow + const { + chapter, + verses, + options, + info, + actions, + currentVerse + } = this.props; // eslint-disable-line no-shadow debug('component:Surah', 'Render'); if (!this.hasVerses()) { @@ -430,7 +437,8 @@ class Surah extends Component { {__CLIENT__ && } diff --git a/src/redux/actions/audioplayer.js b/src/redux/actions/audioplayer.js index d140a9de0..65aeafc3b 100644 --- a/src/redux/actions/audioplayer.js +++ b/src/redux/actions/audioplayer.js @@ -116,5 +116,5 @@ export function load({ chapterId, verseId, verseKey, audio }) { } export function isLoaded(files, verse) { - return files[verse.chapterId][verse.verseKey]; + return files[verse.verseKey]; } From 99645b23809f7274f2a53a9f88e91812a5ec76a8 Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Tue, 30 May 2017 13:27:47 -0700 Subject: [PATCH 04/38] Loader overlay (#750) --- src/containers/Surah/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js index 5198aed0b..a611e5080 100644 --- a/src/containers/Surah/index.js +++ b/src/containers/Surah/index.js @@ -31,7 +31,7 @@ import * as MediaActions from 'redux/actions/media.js'; import { chaptersConnect, chapterInfoConnect, versesConnect } from './connect'; -const LoaderStyle = { width: '10em', height: '10em' }; +const LoaderStyle = {}; const style = require('./style.scss'); @@ -228,7 +228,7 @@ class Surah extends Component { ); - return isLoading ? : noAyah; + return isLoading ? : noAyah; } renderPagination() { @@ -306,7 +306,7 @@ class Surah extends Component { } } - loadingComponent={} + loadingComponent={} /> ); } From 468ad6696db340cd654e829ec823e873b6c05a86 Mon Sep 17 00:00:00 2001 From: Mohamed El Mahallawy Date: Tue, 30 May 2017 13:44:54 -0700 Subject: [PATCH 05/38] Change license to reflect other projects (#805) * Change license to reflect other projects * replace ios with quran.com --- LICENSE.md | 695 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 674 insertions(+), 21 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index d932105ee..527297d18 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2016 Quran.com - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Quran.com is a Quran reading application. + Copyright (C) 2017 Quran.com + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Quran.com Copyright (C) 2017 Quran.com + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 5fb95059ac78cea009a675e2e8266e92efd7db05 Mon Sep 17 00:00:00 2001 From: Naveed Ahmad Date: Wed, 31 May 2017 02:36:01 +0500 Subject: [PATCH 06/38] added content page for tafsir (#799) * added content page for tafsir * fixed routes and tafsir actions * added action for tafsir * finished tafsir modal * moved foot note into common popup * fixed foot note action * enabled wraper class name of popup * fixed modal wrapper class and size for tafsir * minor ui fixes * merge fix * tafsir id could be string as well --- src/components/Tafsir/index.js | 25 ++++++++ src/components/Translation/index.js | 24 +++++--- src/components/Verse/index.js | 26 +++++++- src/containers/App/index.js | 73 +++++++++------------- src/containers/Surah/connect.js | 19 +++++- src/containers/VerseTafsir/index.js | 94 +++++++++++++++++++++++++++++ src/customPropTypes.js | 29 +++++---- src/helpers/tafsirs.js | 10 +++ src/redux/actions/footNote.js | 15 ----- src/redux/actions/media.js | 17 +++++- src/redux/actions/verses.js | 25 +++++++- src/redux/constants/footNote.js | 4 -- src/redux/constants/media.js | 4 ++ src/redux/constants/verses.js | 3 + src/redux/modules/footNote.js | 38 ------------ src/redux/modules/media.js | 68 +++++++++++++++++++-- src/redux/modules/options.js | 2 - src/redux/modules/reducer.js | 4 +- src/redux/modules/verses.js | 33 +++++++--- src/routes.js | 8 +++ src/styles/main.scss | 2 +- src/styles/nightmode.scss | 4 ++ 22 files changed, 380 insertions(+), 147 deletions(-) create mode 100644 src/components/Tafsir/index.js create mode 100644 src/containers/VerseTafsir/index.js create mode 100644 src/helpers/tafsirs.js delete mode 100644 src/redux/actions/footNote.js delete mode 100644 src/redux/constants/footNote.js delete mode 100644 src/redux/modules/footNote.js diff --git a/src/components/Tafsir/index.js b/src/components/Tafsir/index.js new file mode 100644 index 000000000..0963f9a62 --- /dev/null +++ b/src/components/Tafsir/index.js @@ -0,0 +1,25 @@ +/* eslint-disable react/prefer-stateless-function */ +import React, { Component } from 'react'; +import * as customPropTypes from 'customPropTypes'; + +export default class Tafsir extends Component { + render() { + const { tafsir, verse } = this.props; + + return ( +
    +

    {tafsir.resourceName}

    +

    {verse.textMadani}

    +

    +

    + ); + } +} + +Tafsir.propTypes = { + tafsir: customPropTypes.tafsirType.isRequired, + verse: customPropTypes.verseType +}; diff --git a/src/components/Translation/index.js b/src/components/Translation/index.js index 7d948be3f..772b93957 100644 --- a/src/components/Translation/index.js +++ b/src/components/Translation/index.js @@ -2,12 +2,11 @@ import React, { Component, PropTypes } from 'react'; import * as customPropTypes from 'customPropTypes'; import { connect } from 'react-redux'; -import { loadFootNote } from 'redux/actions/footNote'; +import { loadFootNote } from 'redux/actions/media'; const styles = require('./style.scss'); class Translation extends Component { - componentDidMount() { const { index } = this.props; let trans; @@ -22,10 +21,9 @@ class Translation extends Component { // TODO: this is breaking for search! Need to figure out why // const { index } = this.props; // let trans; - // if (__CLIENT__) { - // trans = document.getElementById(`trans${index}`).children[1]; // eslint-disable-line - // trans.removeEventListener('click', this.fetchFootNote, true); + // trans = document.getElementById(`trans${index}`).children[1]; // eslint-disable-line + // trans.removeEventListener('click', this.fetchFootNote, true); // } } @@ -36,7 +34,7 @@ class Translation extends Component { event.preventDefault(); loadFootNote(event.target.attributes.foot_note.value); } - } + }; render() { const { translation, index } = this.props; @@ -44,9 +42,14 @@ class Translation extends Component { const isArabic = lang === 'arabic'; return ( -
    + @@ -310,6 +333,7 @@ Verse.propTypes = { iscurrentVerse: PropTypes.bool, currentVerse: PropTypes.string, userAgent: PropTypes.object, // eslint-disable-line + loadTafsirs: PropTypes.func.isRequired, isPdf: PropTypes.bool }; @@ -319,4 +343,4 @@ Verse.defaultProps = { isPdf: false }; -export default Verse; +export default connect(() => ({}), { loadTafsirs })(Verse); diff --git a/src/containers/App/index.js b/src/containers/App/index.js index ca617c4c3..dfb40b454 100644 --- a/src/containers/App/index.js +++ b/src/containers/App/index.js @@ -14,7 +14,6 @@ import metricsConfig from 'helpers/metrics'; import Footer from 'components/Footer'; import NoScript from 'components/NoScript'; import { removeMedia } from 'redux/actions/media'; -import { removeFootNote } from 'redux/actions/footNote'; import Loader from 'quran-components/lib/Loader'; import authConnect from './connect'; @@ -49,6 +48,27 @@ class App extends Component { sidebarOpen: false }; + renderModalBody() { + const { media } = this.props; + + if (media.loading) { + return ( +
    + +
    + ); + } + + return ( +
    + ); + } + render() { const { main, @@ -56,20 +76,10 @@ class App extends Component { footer, children, media, - footNote, - loadingFootNote, removeMedia, // eslint-disable-line no-shadow - removeFootNote, // eslint-disable-line no-shadow ...props } = this.props; debug('component:APPLICATION', 'Render'); - let footNoteText; - - if (footNote) { - footNoteText = footNote.text; - } else { - footNoteText = ; - } return (
    @@ -101,41 +111,15 @@ class App extends Component { {footer ||