diff --git a/.env b/.env index 2c85a0ee9..93433196d 100644 --- a/.env +++ b/.env @@ -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= diff --git a/.eslintrc b/.eslintrc index e9c306bef..b72ae45cb 100644 --- a/.eslintrc +++ b/.eslintrc @@ -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, 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 +. diff --git a/README.md b/README.md index 8df3ca96f..2e85ec16e 100644 --- a/README.md +++ b/README.md @@ -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/ diff --git a/bin/server.js b/bin/server.js index 303749064..1425cd949 100644 --- a/bin/server.js +++ b/bin/server.js @@ -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(); + }); diff --git a/bin/server.prod.js b/bin/server.prod.js index 880fbbfa5..7ee9217dd 100644 --- a/bin/server.prod.js +++ b/bin/server.prod.js @@ -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(); + }); diff --git a/karma.conf.js b/karma.conf.js index ac9b1aa40..393f411b3 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -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: '', @@ -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'] }, @@ -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 } + } ] }, @@ -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 }) ], @@ -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'], diff --git a/package.json b/package.json index 83d0d0176..23e7d332b 100644 --- a/package.json +++ b/package.json @@ -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", @@ -33,6 +32,10 @@ "npm run prettier", "npm run lint:fix", "git add" + ], + "*.scss": [ + "npm run prettier", + "git add" ] }, "engines": { @@ -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", @@ -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", @@ -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", diff --git a/src/client.js b/src/client.js index cd3add36d..1ef5ec61a 100644 --- a/src/client.js +++ b/src/client.js @@ -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'; @@ -47,16 +49,18 @@ match( { history, routes: routes(store) }, (error, redirectLocation, renderProps) => { const component = ( - ( - - )} - /> + + ( + + )} + /> + ); const mountNode = document.getElementById('app'); diff --git a/src/components/Audioplayer/ScrollButton/index.js b/src/components/Audioplayer/ScrollButton/index.js index 91d3d9b97..5b72b8411 100644 --- a/src/components/Audioplayer/ScrollButton/index.js +++ b/src/components/Audioplayer/ScrollButton/index.js @@ -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 = ( @@ -22,14 +32,13 @@ const ScrollButton = ({ shouldScroll, onScrollToggle }) => { placement="top" trigger={['hover', 'focus']} > - - + ); diff --git a/src/components/Audioplayer/Track/index.js b/src/components/Audioplayer/Track/index.js index 74c0c92b7..defde1f00 100644 --- a/src/components/Audioplayer/Track/index.js +++ b/src/components/Audioplayer/Track/index.js @@ -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 = { @@ -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); }; @@ -24,13 +51,14 @@ export default class Track extends Component { const { progress } = this.props; return ( -
{ this.container = container; }} - className={styles.container} + { + this.container = container; + }} onClick={this.handleClick} > -
-
+ + ); } } diff --git a/src/components/Audioplayer/Track/style.scss b/src/components/Audioplayer/Track/style.scss deleted file mode 100644 index 621e934b5..000000000 --- a/src/components/Audioplayer/Track/style.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import '../../../styles/variables.scss'; - -.container{ - height: 6px; - width: 100%; - background-color: #f7f7f7; - cursor: pointer; - margin-bottom: 5px; -} - -.progress{ - height: 100%; - background-color: $brand-primary; - position: relative; - padding-left: 12px; - - - &:after{ - content: ''; - height: 12px; - width: 12px; - border-radius: 10px; - position: absolute; - right: 0px; - display: block; - background: #fff; - top: -3px; - box-shadow: 0 1px 2px rgba(0,0,0,0.45); - transition: height 0.5s; - } -} diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js index 44620c0f4..08678bfec 100644 --- a/src/components/Audioplayer/index.js +++ b/src/components/Audioplayer/index.js @@ -1,6 +1,7 @@ /* global document */ // TODO: This file is too too large. import React, { Component, PropTypes } from 'react'; +import styled from 'styled-components'; import * as customPropTypes from 'customPropTypes'; import { connect } from 'react-redux'; import { camelize } from 'humps'; @@ -27,9 +28,28 @@ const RepeatDropdown = Loadable({ LoadingComponent: ComponentLoader }); +const Wrapper = styled.div` + width: 100%; + position: absolute; + top: 0; + left: 0; + height: 10%; +`; + +const ControlItem = styled.li` + vertical-align: middle; + padding-right: 20px; + color: #939598; +`; + 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 +57,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 +90,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 +98,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 +158,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 +191,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 +202,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 +224,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 +244,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 +305,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 +315,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 +323,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 +406,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 ( -
+ {currentFile && } {segments && - segments[currentVerse] && + segments[currentVerse.verseKey] && } -
-
    -
  • + +
      + : {' '} - {currentVerse.split(':')[1]} - -
    • + {currentVerse.verseKey.split(':')[1]} + + {this.renderPreviousButton()} -
      • -
    • + + {this.renderPlayStopButtons()} -
      • -
    • + + {this.renderNextButton()} -
      • -
    • + + -
      • -
    • + + -
      • +
); @@ -464,22 +527,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 +553,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 +568,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/components/Audioplayer/style.scss b/src/components/Audioplayer/style.scss index ba8b44253..7e6598504 100644 --- a/src/components/Audioplayer/style.scss +++ b/src/components/Audioplayer/style.scss @@ -1,6 +1,5 @@ @import '../../styles/variables.scss'; - -.container{ +.container { position: fixed; bottom: 15px; display: block; @@ -9,67 +8,26 @@ z-index: 1; padding: 10px 20px 5px; background: #fff; - box-shadow: 0 0 0.5rem 0 rgba(0,0,0,.2); + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .2); min-width: 340px; - @media(max-width: $screen-sm){ - bottom: 0px; + @media(max-width: $screen-sm) { + bottom: 0; width: 100%; - } - // border: 0.08333rem solid transparent !important; -} - -.wrapper{ - width: 100%; - position: absolute; - top: 0; - left: 0px; - height: 10%; + } // border: 0.08333rem solid transparent !important; } -.options{ - border-radius: 4px; - width: 100%; - display: inline-block; - margin: 0px; - height: 90%; - text-align: center; -} - -.controls{ - margin: 0px; - .controlItem{ - vertical-align: middle; - padding-right: 20px; - color: #939598; - } -} - -.list{ - margin-bottom: 0px; - display: table; - width: 100%; - padding-left: 0px; - text-align: center; - - :global(li){ - padding-right: 15px; - display: table-cell; - } -} - -.buttons{ +.buttons { width: 100%; display: inline-block; cursor: pointer; padding-right: 1.5%; color: $text-color; outline: none; - - &:focus, &:active{ + &:focus, + &:active { outline: none; } - - &.playingButton{ + &.playingButton { background: $brand-primary; color: #fff; height: 32px; @@ -78,41 +36,24 @@ border-radius: 50%; position: relative; vertical-align: middle; - - &:hover{ + &:hover { opacity: 0.75; } } - - i.fa{ + i.fa { color: inherit; font-size: 100%; } } -.checkbox{ - display: none; -} -.repeat{ - color: $brand-primary; -} -.scroll{ - color: $brand-primary; -} - -.disabled{ +.disabled { opacity: 0.5; cursor: not-allowed !important; pointer-events: none; } -.verse{ - padding: 0px; - color: $olive; -} - -.popover{ - :global(.popover-title){ +.popover { + :global(.popover-title) { font-family: $font-montserrat; text-transform: uppercase; color: $cream; @@ -120,14 +61,13 @@ padding-bottom: 15px; font-size: 0.75em; } - - :global(.popover-content){ - :global(a){ + :global(.popover-content) { + :global(a) { font-size: 0.8em; } } - .pill{ - :global(a){ + .pill { + :global(a) { padding: 10px 15px; } } diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js index 0b88d2e9d..4df6881df 100644 --- a/src/components/Footer/index.js +++ b/src/components/Footer/index.js @@ -109,7 +109,15 @@ const Footer = () => ( />

+); SurahsList.propTypes = { chapters: customPropTypes.chapters.isRequired diff --git a/src/components/IndexHeader/index.js b/src/components/IndexHeader/index.js index 90d01ba1b..2308f21d9 100644 --- a/src/components/IndexHeader/index.js +++ b/src/components/IndexHeader/index.js @@ -1,45 +1,45 @@ -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import Link from 'react-router/lib/Link'; import SearchInput from 'components/SearchInput'; -import debug from 'helpers/debug'; import Jumbotron from 'quran-components/lib/Jumbotron'; +import styled from 'styled-components'; const logo = require('../../../static/images/logo-lg-w.png'); -const styles = require('./style.scss'); -class IndexHeader extends Component { - - renderSearch() { - if (this.props.noSearch) { - return null; - } - - return ( - - ); - } - - render() { - debug('component:IndexHeader', 'Render'); - - return ( - -
-
-
- - logo - -

THE NOBLE QUR'AN

- {this.renderSearch()} -
-
+const StyledLink = styled(Link)` + display: inline-block; + width: 30%; + margin-top: 35px; +`; + +const Logo = styled.img` + padding-top: 10px; + padding-bottom: 10px; + height: auto; + width: 100%; +`; + +const Title = styled.h4` + color: ${props => props.theme.brandPrimary}; + font-size: 160%; + padding-bottom: 3.5%; +`; + +const IndexHeader = props => ( + +
+
+
+ + + + THE NOBLE QURAN + {!props.noSearch && }
- - - ); - } -} +
+
+ +); IndexHeader.propTypes = { noSearch: PropTypes.bool diff --git a/src/components/IndexHeader/style.scss b/src/components/IndexHeader/style.scss deleted file mode 100644 index 2211ac9df..000000000 --- a/src/components/IndexHeader/style.scss +++ /dev/null @@ -1,18 +0,0 @@ -@import '../../styles/variables.scss'; - -.link{ - display: inline-block; - width: 30%; - margin-top: 35px; -} -.logo{ - padding-top: 10px; - padding-bottom: 10px; - height: auto; - width: 100%; -} -.title{ - color: lighten($brand-primary, 30%); - font-size: 160%; - padding-bottom: 3.5%; -} diff --git a/src/components/LazyLoad/index.js b/src/components/LazyLoad/index.js index 028c0d55c..4d77f4ad1 100644 --- a/src/components/LazyLoad/index.js +++ b/src/components/LazyLoad/index.js @@ -5,7 +5,6 @@ import ReactDOM from 'react-dom'; import debug from 'helpers/debug'; class LazyLoad extends Component { - componentDidMount() { if (__CLIENT__) { window.removeEventListener('scroll', this.onScroll, true); @@ -23,15 +22,17 @@ class LazyLoad extends Component { const { isLoading, isEnd, offset, onLazyLoad } = this.props; // TODO: Remove ReactDOM! const dom = ReactDOM.findDOMNode(this); // eslint-disable-line - const componentOffset = (dom.offsetParent || dom).offsetTop - (window.pageYOffset + window.innerHeight); // eslint-disable-line max-len + const componentOffset = + (dom.offsetParent || dom).offsetTop - + (window.pageYOffset + window.innerHeight); // eslint-disable-line max-len - if ((!isLoading && !isEnd) && componentOffset < offset) { + if (!isLoading && !isEnd && componentOffset < offset) { debug('component:LazyLoad', 'onLazyLoad called'); return onLazyLoad(); } return false; - } + }; render() { const { isEnd, loadingComponent, endComponent } = this.props; diff --git a/src/components/Line/index.js b/src/components/Line/index.js index 861de1cf7..146ead95e 100644 --- a/src/components/Line/index.js +++ b/src/components/Line/index.js @@ -32,7 +32,7 @@ class Line extends Component { // NOTE: Some 'word's are glyphs (jeem). Not words and should not be clicked for audio let wordAudioPosition = -1; - const text = line.map((word) => ( // eslint-disable-line + const text = line.map(word => // eslint-disable-line - )); + ); return ( @@ -59,14 +59,15 @@ class Line extends Component { debug( 'component:Line', - `Page: ${line[0].pageNum} - Line: ${line[0].lineNum} - Ayah: ${line[0].verseKey}` + `Page: ${line[0].pageNum} - Line: ${line[0].lineNum} - Ayah: ${line[0] + .verseKey}` ); return (
{this.renderText()}
diff --git a/src/components/LocaleSwitcher/index.js b/src/components/LocaleSwitcher/index.js index 863dd4118..cfb93e117 100644 --- a/src/components/LocaleSwitcher/index.js +++ b/src/components/LocaleSwitcher/index.js @@ -2,21 +2,27 @@ import React, { PropTypes, Component } from 'react'; import cookie from 'react-cookie'; import NavDropdown from 'react-bootstrap/lib/NavDropdown'; -import MenuItem from 'react-bootstrap/lib/MenuItem'; +import Menu, { MenuItem } from 'quran-components/lib/Menu'; + +import Icon from 'quran-components/lib/Icon'; +import LocaleFormattedMessage from 'components/LocaleFormattedMessage'; + import config from '../../config'; const { locales, defaultLocale } = config; class LocaleSwitcher extends Component { - state = { - currentLocale: defaultLocale, + currentLocale: defaultLocale }; componentDidMount() { if (__CLIENT__) { // TODO: This should be passed in as a prop! - this.setState({ currentLocale: cookie.load('currentLocale') || defaultLocale }); // eslint-disable-line + // eslint-disable-next-line + this.setState({ + currentLocale: cookie.load('currentLocale') || defaultLocale + }); } } @@ -29,7 +35,7 @@ class LocaleSwitcher extends Component { cookie.save('currentLocale', locale, { path: '/', - expires: new Date(expireDate), + expires: new Date(expireDate) }); window.location.reload(); @@ -50,7 +56,7 @@ class LocaleSwitcher extends Component { )); } - render() { + renderAsDropdown() { const { className } = this.props; return ( @@ -64,10 +70,43 @@ class LocaleSwitcher extends Component { ); } + + renderAsMenu() { + return ( + } + menu={ + + {this.renderList()} + + } + > + + + ); + } + + render() { + const { renderAs } = this.props; + + if (renderAs === 'dropdown') { + return this.renderAsDropdown(); + } + + return this.renderAsMenu(); + } } LocaleSwitcher.propTypes = { - className: PropTypes.string + className: PropTypes.string, + renderAs: PropTypes.string +}; + +LocaleSwitcher.defaultProps = { + renderAs: 'dropdown' }; export default LocaleSwitcher; diff --git a/src/components/LocaleSwitcher/style.scss b/src/components/LocaleSwitcher/style.scss deleted file mode 100644 index bcaf01b53..000000000 --- a/src/components/LocaleSwitcher/style.scss +++ /dev/null @@ -1,7 +0,0 @@ -.local-switcher{ - color: red; -} - -.local-switch-link-active{ - color: #2CA4AB; -} diff --git a/src/components/NoScript/style.scss b/src/components/NoScript/style.scss deleted file mode 100644 index edd0d5113..000000000 --- a/src/components/NoScript/style.scss +++ /dev/null @@ -1,11 +0,0 @@ -.noscript_warning { - position: fixed; - top: 0; - left: 0; - width: 100%; - z-index: 1201; - text-align: center; - color: #FFF; - background-color: #AE0000; - padding: 5px 0 5px 0; -} diff --git a/src/components/PageBreak/style.scss b/src/components/PageBreak/style.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/components/SearchAutocomplete/index.js b/src/components/SearchAutocomplete/index.js index 1392cf8b1..4737eb171 100644 --- a/src/components/SearchAutocomplete/index.js +++ b/src/components/SearchAutocomplete/index.js @@ -10,9 +10,11 @@ const styles = require('./style.scss'); const ayahRegex = /^(\d+)(?::(\d+))?$/; class SearchAutocomplete extends Component { - componentDidMount() { - this.props.input.addEventListener('keydown', this.handleInputKeyDown.bind(this)); + this.props.input.addEventListener( + 'keydown', + this.handleInputKeyDown.bind(this) + ); } componentWillReceiveProps(nextProps) { @@ -51,13 +53,18 @@ class SearchAutocomplete extends Component { const chapterId = captures[1]; const ayahNum = captures[2]; const chapter = this.props.chapters[chapterId]; - matches.push([chapter.nameSimple, chapter.chapterNumber + (ayahNum ? `/${ayahNum}` : '')]); + matches.push([ + chapter.nameSimple, + chapter.chapterNumber + (ayahNum ? `/${ayahNum}` : '') + ]); } else if (value.length >= 2) { const escaped = value.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&'); Object.keys(this.props.chapters).forEach((chapterId) => { const chapter = this.props.chapters[chapterId]; - if (RegExp(escaped, 'i').test(chapter.nameSimple.replace(/['-]/g, ''))) { + if ( + RegExp(escaped, 'i').test(chapter.nameSimple.replace(/['-]/g, '')) + ) { matches.push([chapter.nameSimple, chapter.chapterNumber]); } else if (RegExp(escaped, 'i').test(chapter.nameArabic)) { matches.push([chapter.nameArabic, chapter.chapterNumber]); @@ -65,11 +72,13 @@ class SearchAutocomplete extends Component { }); } - return matches.map(match => ({ - text: `${match[0]}`, - href: `/${match[1]}` - })).slice(0, 5); - } + return matches + .map(match => ({ + text: `${match[0]}`, + href: `/${match[1]}` + })) + .slice(0, 5); + }; suggest = (query) => { const { lang } = this.props; @@ -77,10 +86,12 @@ class SearchAutocomplete extends Component { if (!query || ayahRegex.test(query)) return false; return this.props.suggest(query, lang); - } + }; handleInputKeyDown = (event) => { - if (!(event.keyCode === 9 || event.keyCode === 40 || event.keyCode === 27)) { + if ( + !(event.keyCode === 9 || event.keyCode === 40 || event.keyCode === 27) + ) { return; } @@ -104,7 +115,7 @@ class SearchAutocomplete extends Component { return; } event.preventDefault(); - } + }; handleItemKeyDown(event, item) { const items = this.menu.getElementsByTagName('li'); @@ -123,7 +134,8 @@ class SearchAutocomplete extends Component { // TODO if open closeMenu() break; case 38: // up - if (event.target === items[0]) { // we're on the first item, so focus the input + if (event.target === items[0]) { + // we're on the first item, so focus the input this.props.input.focus(); } else { event.target.previousSibling.focus(); @@ -157,7 +169,11 @@ class SearchAutocomplete extends Component { {item.ayah}
)); @@ -165,8 +181,16 @@ class SearchAutocomplete extends Component { render() { return ( -
-
@@ -176,7 +187,7 @@ SmartBanner.propTypes = { price: customPropTypes.storeText, force: PropTypes.string, title: PropTypes.string, - author: PropTypes.string, + author: PropTypes.string }; SmartBanner.defaultProps = { @@ -188,17 +199,17 @@ SmartBanner.defaultProps = { ios: 'On the App Store', android: 'In Google Play', windows: 'In Windows Store', - kindle: 'In the Amazon Appstore', + kindle: 'In the Amazon Appstore' }, price: { ios: 'Free', android: 'Free', windows: 'Free', - kindle: 'Free', + kindle: 'Free' }, force: '', title: '', - author: '', + author: '' }; export default SmartBanner; diff --git a/src/components/SurahInfo/index.js b/src/components/SurahInfo/index.js index 16d13b1b4..666b07ca1 100644 --- a/src/components/SurahInfo/index.js +++ b/src/components/SurahInfo/index.js @@ -7,20 +7,16 @@ const style = require('./style.scss'); const SurahInfo = ({ chapter, info, isShowingSurahInfo, onClose }) => { // So we don't need to load images and files unless needed if (!isShowingSurahInfo) return