diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..175443ce8 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,595 @@ +GNU General Public License +========================== + +_Version 3, 29 June 2007_ +_Copyright © 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. + + + Copyright (C) + + 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: + + Copyright (C) + 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/images/login_background.jpg b/images/intro_background.jpg similarity index 100% rename from images/login_background.jpg rename to images/intro_background.jpg diff --git a/src/App/styles.less b/src/App/styles.less index 960b30bf9..066281dec 100644 --- a/src/App/styles.less +++ b/src/App/styles.less @@ -61,6 +61,8 @@ text-decoration: none; outline: none; appearance: none; + background: none; + box-shadow: none; } html, body, :global(#app) { @@ -79,12 +81,14 @@ html, body, :global(#app) { height: 100%; } - input[type="email"], input[type="password"], input[type="text"] { - user-select: text; - } + input { + &::-moz-focus-inner { + border: none; + } - input::-moz-focus-inner { - border: 0; + &[type="email"], &[type="password"], &[type="text"] { + user-select: text; + } } ::-webkit-scrollbar { diff --git a/src/common/Checkbox/Checkbox.js b/src/common/Checkbox/Checkbox.js index 4152fa6dc..94082c7bc 100644 --- a/src/common/Checkbox/Checkbox.js +++ b/src/common/Checkbox/Checkbox.js @@ -1,18 +1,11 @@ -import React, { Component } from 'react'; +import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Icon from 'stremio-icons/dom'; -import { withFocusable } from 'stremio-common'; +import { Input } from 'stremio-common'; import styles from './styles'; -class Checkbox extends Component { - shouldComponentUpdate(nextProps) { - return nextProps.focusable !== this.props.focusable || - nextProps.checked !== this.props.checked || - nextProps.disabled !== this.props.disabled || - nextProps.className !== this.props.className; - } - +class Checkbox extends PureComponent { onClick = (event) => { event.preventDefault(); if (typeof this.props.onClick === 'function') { @@ -20,32 +13,48 @@ class Checkbox extends Component { } } + onDrag = (event) => { + if (typeof this.props.onDrag === 'function') { + this.props.onDrag(event); + } + + if (!event.defaultPrevented) { + this.props.forwardedRef.current.blur(); + } + } + + onMouseOut = (event) => { + if (typeof this.props.onMouseOut === 'function') { + this.props.onMouseOut(event); + } + + if (!event.defaultPrevented) { + this.props.forwardedRef.current.blur(); + } + } + render() { return ( -
- - + -
+
+ +
+ {React.Children.only(this.props.children)} + ); } } Checkbox.propTypes = { - className: PropTypes.string, disabled: PropTypes.bool.isRequired, - checked: PropTypes.bool.isRequired, - onClick: PropTypes.func + checked: PropTypes.bool.isRequired }; Checkbox.defaultProps = { @@ -53,12 +62,8 @@ Checkbox.defaultProps = { checked: false }; -const CheckboxWithFocusable = withFocusable(Checkbox); - -CheckboxWithFocusable.displayName = 'CheckboxWithFocusable'; - const CheckboxWithForwardedRef = React.forwardRef((props, ref) => ( - + )); CheckboxWithForwardedRef.displayName = 'CheckboxWithForwardedRef'; diff --git a/src/common/Checkbox/styles.less b/src/common/Checkbox/styles.less index ffe321f53..3027a7c2e 100644 --- a/src/common/Checkbox/styles.less +++ b/src/common/Checkbox/styles.less @@ -1,28 +1,34 @@ .checkbox-container { position: relative; z-index: 0; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--background-color); - .icon { - height: 100%; - fill: var(--icon-color); + .icon-container { + width: var(--icon-size); + height: var(--icon-size); + + .icon { + width: 100%; + height: 100%; + fill: var(--icon-color); + background-color: var(--icon-background-color); + } } .native-checkbox { position: absolute; - opacity: 0; - height: 0; - width: 0; top: 0; left: 0; + width: 0; + height: 0; + opacity: 0; + z-index: -1; } &:global(.checked) { - .icon { - padding: 10%; + .icon-container { + .icon { + padding: 10%; + } } } } \ No newline at end of file diff --git a/src/common/Input/Input.js b/src/common/Input/Input.js index 6954257a2..7af6ae165 100644 --- a/src/common/Input/Input.js +++ b/src/common/Input/Input.js @@ -3,27 +3,33 @@ import PropTypes from 'prop-types'; import { withFocusable } from 'stremio-common'; const ENTER_KEY_CODE = 13; -const BUTTON_INPUT_TYPES = ['button', 'submit', 'link', 'checkbox']; -const TEXT_INPUT_TYPES = ['text', 'password', 'email']; +const BUTTON_INPUT_TYPES = ['button', 'link', 'submit', 'checkbox']; +const TEXT_INPUT_TYPES = ['text', 'password', 'email', 'search']; +const TAG_NAMES_FOR_TYPE = { + button: 'div', + link: 'a', + submit: 'input', + checkbox: 'input', + text: 'input', + password: 'input', + email: 'input', + search: 'input' +}; class Input extends PureComponent { - onClick = (event) => { - if (typeof this.props.onClick === 'function') { - this.props.onClick(event); - } - - if (this.props.type === 'checkbox') { - event.preventDefault(); - } - } - onKeyUp = (event) => { if (typeof this.props.onKeyUp === 'function') { this.props.onKeyUp(event); } - if (!event.defaultPrevented && BUTTON_INPUT_TYPES.includes(this.props.type) && event.which === ENTER_KEY_CODE) { - event.currentTarget.click(); + if (!event.defaultPrevented && event.which === ENTER_KEY_CODE) { + if (BUTTON_INPUT_TYPES.includes(this.props.type)) { + event.currentTarget.click(); + } else if (TEXT_INPUT_TYPES.includes(this.props.type)) { + if (typeof this.props.onSubmit === 'function') { + this.props.onSubmit(event); + } + } } } @@ -48,45 +54,18 @@ class Input extends PureComponent { } render() { - const { forwardedRef, focusable, type, ...props } = this.props; - - if (type === 'button') { - return ( -
- ); - } - - if (type === 'link') { - return ( - - ); - } - - return ( - - ); + const { forwardedRef, focusable, type, children, ...props } = this.props; + const tagName = TAG_NAMES_FOR_TYPE[type]; + const elementProps = { + ...props, + ref: forwardedRef, + type: tagName === 'input' ? type : null, + tabIndex: focusable ? 0 : -1, + onKeyUp: this.onKeyUp, + onDrag: this.onDrag, + onMouseOut: this.onMouseOut + }; + return React.createElement(tagName, elementProps, children); } } diff --git a/src/common/Loader/Loader.js b/src/common/Loader/Loader.js new file mode 100644 index 000000000..41dcb23cf --- /dev/null +++ b/src/common/Loader/Loader.js @@ -0,0 +1,58 @@ +import React, { PureComponent } from 'react'; + +class Loader extends PureComponent { + render() { + const { fill, children, ...props } = this.props; + return ( + + + + + + + + + + + + + + + + ); + } +} + +export default Loader; diff --git a/src/common/Loader/index.js b/src/common/Loader/index.js new file mode 100644 index 000000000..832fbc442 --- /dev/null +++ b/src/common/Loader/index.js @@ -0,0 +1,3 @@ +import Loader from './Loader'; + +export default Loader; \ No newline at end of file diff --git a/src/common/MetaItem/MetaItem.js b/src/common/MetaItem/MetaItem.js index b09d06461..dd966f64e 100644 --- a/src/common/MetaItem/MetaItem.js +++ b/src/common/MetaItem/MetaItem.js @@ -1,7 +1,7 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; -import { Popup, Button } from 'stremio-common'; +import { Popup, Input } from 'stremio-common'; import Icon from 'stremio-icons/dom'; import styles from './styles'; @@ -20,7 +20,6 @@ class MetaItem extends Component { nextProps.popupClassName !== this.props.popupClassName || nextProps.id !== this.props.id || nextProps.type !== this.props.type || - nextProps.relativeSide !== this.props.relativeSide || nextProps.posterShape !== this.props.posterShape || nextProps.poster !== this.props.poster || nextProps.title !== this.props.title || @@ -69,11 +68,16 @@ class MetaItem extends Component { : 'ic_movies'; return (
- -
-
- +
+
+
+ + + + + + {this.renderProgress()}
); @@ -97,7 +101,7 @@ class MetaItem extends Component {
{this.props.menuOptions.map(({ label, type }) => ( - + {label} ))}
@@ -120,10 +124,10 @@ class MetaItem extends Component { render() { return ( - + ); } } @@ -135,7 +139,6 @@ MetaItem.propTypes = { menuOptionOnSelect: PropTypes.func, id: PropTypes.string.isRequired, type: PropTypes.string.isRequired, - relativeSide: PropTypes.oneOf(['auto', 'height']).isRequired, posterShape: PropTypes.oneOf(['poster', 'landscape', 'square']).isRequired, poster: PropTypes.string.isRequired, title: PropTypes.string.isRequired, @@ -148,7 +151,6 @@ MetaItem.propTypes = { })).isRequired }; MetaItem.defaultProps = { - relativeSide: 'auto', posterShape: 'square', poster: '', title: '', diff --git a/src/common/MetaItem/styles.less b/src/common/MetaItem/styles.less index 53e3d4491..07890907b 100644 --- a/src/common/MetaItem/styles.less +++ b/src/common/MetaItem/styles.less @@ -1,24 +1,28 @@ .meta-item-container { - --play-icon-size: calc(var(--poster-relative-size) * .4); - display: inline-flex; flex-direction: column; + align-items: stretch; background-color: var(--color-backgroundlight); - border: calc(var(--progress-bar-size) * 0.5) solid transparent; + border: var(--focusable-border-size) solid transparent; cursor: pointer; .poster-image-container { position: relative; - display: flex; - justify-content: center; - align-items: center; - overflow: hidden; z-index: 0; - .placeholder-image { - width: calc(var(--poster-relative-size) * 0.5); - height: calc(var(--poster-relative-size) * 0.5); - fill: var(--color-surfacelighter); + .placeholder-image-container { + position: absolute; + top: 25%; + right: 10%; + bottom: 25%; + left: 10%; + z-index: 0; + + .placeholder-image { + width: 100%; + height: 100%; + fill: var(--color-surfacelight20); + } } .poster-image { @@ -36,18 +40,19 @@ .play-icon-container { position: absolute; - width: var(--play-icon-size); - height: var(--play-icon-size); + top: 30%; + height: 40%; + width: 100%; z-index: 2; - background-color: var(--color-surfacelighter); - border-radius: 50%; - box-shadow: 0 0 calc(var(--play-icon-size) * 0.25) calc(var(--play-icon-size) * 0.04) var(--color-backgroundlight); + overflow: visible; visibility: var(--play-icon-visibility, collapse); - text-align: center; + + .play-icon-background { + fill: var(--color-surfacelighter); + filter: drop-shadow(0 0 0.5em var(--color-backgroundlight)); + } .play-icon { - height: 40%; - margin-top: 30%; fill: var(--color-primary); } } @@ -58,15 +63,19 @@ bottom: 0; left: 0; z-index: 3; - height: var(--progress-bar-size); + height: 0.5em; background-color: var(--color-backgroundlighter); - box-shadow: 0 0 calc(var(--progress-bar-size) * 4) calc(var(--progress-bar-size) * 1.5) var(--color-backgroundlight); .progress { height: 100%; background-color: var(--color-primary); } } + + &:before { + content: ""; + display: block; + } } .title-bar-container { @@ -98,48 +107,20 @@ } &.poster-shape-square { - .poster-image-container { - width: var(--poster-relative-size); - height: var(--poster-relative-size); - } - - .title-bar-container { - width: var(--poster-relative-size); + .poster-image-container:before { + padding-top: 100%; } } &.poster-shape-landscape { - .poster-image-container { - width: calc(var(--poster-relative-size) / var(--landscape-shape-ratio)); - height: var(--poster-relative-size); - } - - .title-bar-container { - width: calc(var(--poster-relative-size) / var(--landscape-shape-ratio)); + .poster-image-container:before { + padding-top: calc(100% * var(--landscape-shape-ratio)); } } &.poster-shape-poster { - &.relative-side-auto { - .poster-image-container { - width: var(--poster-relative-size); - height: calc(var(--poster-relative-size) * var(--poster-shape-ratio)); - } - - .title-bar-container { - width: var(--poster-relative-size); - } - } - - &.relative-side-height { - .poster-image-container { - width: calc(var(--poster-relative-size) / var(--poster-shape-ratio)); - height: var(--poster-relative-size); - } - - .title-bar-container { - width: calc(var(--poster-relative-size) / var(--poster-shape-ratio)); - } + .poster-image-container:before { + padding-top: calc(100% * var(--poster-shape-ratio)); } } @@ -149,19 +130,18 @@ } .menu-popup-container { - --box-shadow: 0 0 2em .15em var(--color-background); + --box-shadow: 0 0 1.5em .2em var(--color-backgroundlight); .menu-items-container { + min-width: 8em; + max-width: 12em; background-color: var(--color-surfacelighter); - min-width: calc(var(--poster-relative-size) * 0.6); - max-width: var(--poster-relative-size); .menu-item { - display: inline-block; - width: 100%; - color: var(--color-backgrounddarker); font-size: 1.2em; padding: 0.5em; + width: 100%; + color: var(--color-backgrounddarker); cursor: pointer; &:hover, &:focus { diff --git a/src/common/Router/Route/ModalsContainerProvider.js b/src/common/Router/Route/ModalsContainerProvider/ModalsContainerProvider.js similarity index 72% rename from src/common/Router/Route/ModalsContainerProvider.js rename to src/common/Router/Route/ModalsContainerProvider/ModalsContainerProvider.js index 44f2ee914..91828e996 100644 --- a/src/common/Router/Route/ModalsContainerProvider.js +++ b/src/common/Router/Route/ModalsContainerProvider/ModalsContainerProvider.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; import { ModalsContainerContext } from 'stremio-common'; +import styles from './styles'; class ModalsContainerProvider extends Component { constructor(props) { @@ -13,7 +13,6 @@ class ModalsContainerProvider extends Component { shouldComponentUpdate(nextProps, nextState) { return nextState.modalsContainer !== this.state.modalsContainer || - nextProps.modalsContainerClassName !== this.props.modalsContainerClassName || nextProps.children !== this.props.children; } @@ -25,14 +24,10 @@ class ModalsContainerProvider extends Component { return ( {this.state.modalsContainer ? this.props.children : null} -
+
); } } -ModalsContainerProvider.propTypes = { - modalsContainerClassName: PropTypes.string -}; - export default ModalsContainerProvider; diff --git a/src/common/Router/Route/ModalsContainerProvider/index.js b/src/common/Router/Route/ModalsContainerProvider/index.js new file mode 100644 index 000000000..71c3e7ef8 --- /dev/null +++ b/src/common/Router/Route/ModalsContainerProvider/index.js @@ -0,0 +1,3 @@ +import ModalsContainerProvider from './ModalsContainerProvider'; + +export default ModalsContainerProvider; diff --git a/src/common/Router/Route/ModalsContainerProvider/styles.less b/src/common/Router/Route/ModalsContainerProvider/styles.less new file mode 100644 index 000000000..f0d7a65c7 --- /dev/null +++ b/src/common/Router/Route/ModalsContainerProvider/styles.less @@ -0,0 +1,13 @@ + .modals-container { + width: 0; + height: 0; + + >:global(.modal-container) { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1; + } + } \ No newline at end of file diff --git a/src/common/Router/Route/Route.js b/src/common/Router/Route/Route.js index cb502d424..04f5c12fc 100644 --- a/src/common/Router/Route/Route.js +++ b/src/common/Router/Route/Route.js @@ -15,7 +15,7 @@ class Route extends Component { render() { return (
- +
{this.props.children} diff --git a/src/common/Router/Route/styles.less b/src/common/Router/Route/styles.less index 3ea772dee..22fef257f 100644 --- a/src/common/Router/Route/styles.less +++ b/src/common/Router/Route/styles.less @@ -10,20 +10,6 @@ height: 100%; } - .modals-container { - width: 0; - height: 0; - - >:global(.modal-container) { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - } - } - &:not(:last-child) { display: none; } diff --git a/src/common/UserPanel/styles.less b/src/common/UserPanel/styles.less index 463c79bfe..3de1bedb9 100644 --- a/src/common/UserPanel/styles.less +++ b/src/common/UserPanel/styles.less @@ -6,7 +6,7 @@ .user-panel { width: var(--user-panel-width); - background-color: var(--color-background); + background-color: var(--color-backgroundlighter); .user-info { display: grid; diff --git a/src/common/index.js b/src/common/index.js index ecf1c821d..94fd324b1 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -9,6 +9,7 @@ import NavBar from './NavBar'; import MetaItem from './MetaItem'; import ShareModal from './ShareModal'; import UserPanel from './UserPanel'; +import Loader from './Loader'; export { Checkbox, @@ -22,6 +23,7 @@ export { MetaItem, ShareModal, UserPanel, + Loader, Slider, FocusableProvider, withFocusable diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js index 650f56bd2..b39a12c9f 100644 --- a/src/routes/Addons/Addons.js +++ b/src/routes/Addons/Addons.js @@ -75,6 +75,34 @@ class Addons extends Component { return addonTypes; } + renderAddonPlaceholders() { + const addonPlaceholders = []; + for (let placeholderNumber = 0; placeholderNumber < 20; placeholderNumber++) { + addonPlaceholders.push( +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ) + } + + return addonPlaceholders; + } + render() { return (
@@ -98,29 +126,35 @@ class Addons extends Component { )}
- {this.props.addons - .filter((addon) => { - if (this.state.selectedCategory === ADDON_CATEGORIES.OFFICIAL) return addon.isOfficial === true; - if (this.state.selectedCategory === ADDON_CATEGORIES.COMMUNITY) return addon.isOfficial === false; - if (this.state.selectedCategory === ADDON_CATEGORIES.MY) return addon.isInstalled === true; - }) - .filter((addon) => { - return this.state.selectedAddonType === DEFAULT_TYPE || - addon.types.indexOf(this.state.selectedAddonType) !== -1; - }) - .map((addon) => - - )} + { + this.props.addons.length === 0 + ? + this.renderAddonPlaceholders() + : + this.props.addons + .filter((addon) => { + if (this.state.selectedCategory === ADDON_CATEGORIES.OFFICIAL) return addon.isOfficial === true; + if (this.state.selectedCategory === ADDON_CATEGORIES.COMMUNITY) return addon.isOfficial === false; + if (this.state.selectedCategory === ADDON_CATEGORIES.MY) return addon.isInstalled === true; + }) + .filter((addon) => { + return this.state.selectedAddonType === DEFAULT_TYPE || + addon.types.indexOf(this.state.selectedAddonType) !== -1; + }) + .map((addon) => + + ) + }
); @@ -132,6 +166,7 @@ Addons.propTypes = { }; Addons.defaultProps = { addons: [ + { logo: '', name: '', version: '', isOfficial: true, isInstalled: false, types: [], hostname: '', description: '' }, { logo: 'ic_series', name: 'Watch Hub', version: '1.3.0', isOfficial: true, isInstalled: false, types: ['ovies', 'Series'], hostname: 'piratebay-stremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuappstremio-addon.herokuapp.com', description: 'Find where to stream your favourite movies and shows amongst iTunes, Hulu, Amazon and other UK/US services.' }, { name: 'Cinemeta', version: '2.4.0', isOfficial: false, isInstalled: true, types: ['Moies', 'Series'], hostname: 'stremio-zooqle.now.sh', description: 'Watch your favourite YouTube channels ad-free and get notified when they upload new videos.' }, { logo: 'ic_youtube_small', name: 'YouTube', version: '1.3.0', isOfficial: false, isInstalled: true, types: ['Channels', 'Videos'], hostname: 'pct.best4stremio.space', description: 'Watch your favourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiourfavourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiourfavourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notiour favourite YouTube channels ad-free and get notified when they upload new videos.' }, diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less index 1ff9dcd3b..315baef0c 100644 --- a/src/routes/Addons/styles.less +++ b/src/routes/Addons/styles.less @@ -97,10 +97,103 @@ .scroll-container { flex: 1; align-self: stretch; - margin: calc(var(--spacing) * 2.5 + var(--button-border-width)) calc(var(--spacing) * 2.5 + var(--button-border-width)) calc(var(--spacing) * 2.5 + var(--button-border-width)) 0; + padding: calc(var(--spacing) * 2.5 + var(--button-border-width)) calc(var(--spacing) * 2.5 + var(--button-border-width)) calc(var(--spacing) * 2.5 + var(--button-border-width)) 0; overflow-y: auto; overflow-x: hidden; + .placeholder { + display: flex; + flex-direction: row; + position: relative; + z-index: 0; + width: var(--addon-width); + padding: 1.6em; + overflow: hidden; + background-color: var(--color-backgroundlighter); + + .logo-placeholder { + flex: 1; + background-color: var(--color-secondarylighter20); + + .logo { + width: calc(0.12 * var(--addon-width)); + height: calc(0.12 * var(--addon-width)); + } + } + + .text-placeholder { + flex: 5; + margin-left: 3em; + display: flex; + flex-direction: column; + justify-content: space-between; + + .header-placeholder { + height: 15%; + display: flex; + flex-direction: row; + justify-content: space-between; + + .name { + flex: 2; + margin-right: 3em; + background-color: var(--color-secondarylighter20); + } + + .version { + flex: 1; + background-color: var(--color-secondarylighter20); + } + } + + .types-placeholder, .hostname-placeholder, .description-placeholder { + height: 15%; + background-color: var(--color-secondarylighter20); + } + } + + .buttons-placeholder { + flex: 4; + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: space-between; + + .button { + width: 65%; + height: calc(0.05 * var(--addon-width)); + background-color: var(--color-secondarylighter20); + } + } + + &:after { + content: " "; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 50%; + width: 500%; + margin-left: -250%; + animation: placeholderAnimation 1s linear infinite; + background: linear-gradient(to right, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0) 58%); + } + + @keyframes placeholderAnimation { + 0% { + transform: translate3d(-30%, 0, 0); + } + + 100% { + transform: translate3d(30%, 0, 0); + } + } + + &:nth-child(n+8) { + display: none; + } + } + >:not(:first-child) { margin-top: calc(var(--spacing) * 2.5 + var(--button-border-width)); } diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js index 496e78a28..88e519697 100644 --- a/src/routes/Board/Board.js +++ b/src/routes/Board/Board.js @@ -1,6 +1,6 @@ -import React, { PureComponent } from 'react'; +import React, { PureComponent, Fragment } from 'react'; import classnames from 'classnames'; -import { MetaItem } from 'stremio-common'; +import { MetaItem, Input } from 'stremio-common'; import styles from './styles'; const CONTINUE_WATCHING_MENU = [ @@ -19,26 +19,85 @@ class Board extends PureComponent { super(props); this.items = { + addonCatalogItems2: [ + { + id: '0', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '120', + type: 'movie', + posterShape: 'square', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '03', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '40', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '05', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '055', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + { + id: '058', + type: 'movie', + posterShape: 'poster', + poster: 'qwe', + title: 'Movie title', + progress: 0.7 + }, + ], continueWatchingItems: [ { id: '0', type: 'movie', posterShape: 'poster', + poster: 'https://i.ytimg.com/vi/97AUCrEgTj0/hqdefault.jpg', title: 'Movie title', progress: 0.7 }, { id: '1', type: 'movie', - posterShape: 'poster', + posterShape: 'square', title: 'Movie title', progress: 0.2 }, { id: '3', type: 'movie', - poster: 'https://www.stremio.com/website/home-stremio.png', - posterShape: 'poster', + poster: 'https://www.stremio.com/website/home-testimonials.jpg', + posterShape: 'square', title: 'Movie title', progress: 0.4 }, @@ -53,25 +112,17 @@ class Board extends PureComponent { { id: '5', type: 'channel', - posterShape: 'square', + posterShape: 'poster', title: 'Movie title', progress: 1 - } - ], - addonCatalogItems: [ - { - id: '01', - type: 'movie', - posterShape: 'landscape', - title: 'Movie title' }, { - id: '02', - type: 'movie', - posterShape: 'landscape', + id: '6', + type: 'channel', + posterShape: 'poster', title: 'Movie title', - subtitle: 'Movie subtitle' - }, + progress: 0.1 + } ] }; } @@ -93,33 +144,68 @@ class Board extends PureComponent { }); } + renderMetaItemPlaceholders() { + const metaItemPlaceholders = []; + for (let placeholderNumber = 0; placeholderNumber < 20; placeholderNumber++) { + metaItemPlaceholders.push( +
+
+
+
+
+
+ ) + } + + return ( +
+ {metaItemPlaceholders} +
+ ); + } + render() { return (
-
- {this.items.continueWatchingItems.map((props) => ( - - ))} -
-
- {this.items.addonCatalogItems.map((props) => ( - - ))} -
+ { + this.items.addonCatalogItems2.length === 0 || this.items.continueWatchingItems.length === 0 ? + this.renderMetaItemPlaceholders() + : + +
+
+ {this.items.continueWatchingItems.map((item) => ( + + ))} +
+ +
+
+
+ {this.items.addonCatalogItems2.map((item, _, metaItems) => ( + + ))} +
+ +
+ + }
); } diff --git a/src/routes/Board/styles.less b/src/routes/Board/styles.less index 08c08613b..2b65afd6e 100644 --- a/src/routes/Board/styles.less +++ b/src/routes/Board/styles.less @@ -1,23 +1,34 @@ .board-container, .meta-item-popup-container { - font-size: 12px; - --progress-bar-size: 6px; + font-size: 18px; .board-row { &.continue-watching-row { .meta-item { - --poster-relative-size: calc(180px * var(--poster-shape-ratio)); --play-icon-visibility: visible; + + &:nth-child(n+6) { + display: none; + } } } &.notificatins-row { .meta-item { - --poster-relative-size: 180px; - --play-icon-size: 105px; - &:hover, &:focus { --play-icon-visibility: visible; } + + &:nth-child(n+4) { + display: none; + } + } + } + + &.addon-catalog-row { + .meta-item { + &:nth-child(n+7) { + display: none; + } } } } @@ -26,16 +37,105 @@ .board-container { width: 100%; height: 100%; + padding: 2em; overflow-x: hidden; overflow-y: auto; + .placeholder-container { + display: flex; + flex-direction: row; + + .placeholder { + flex: 1; + margin: 1em; + padding: 0.4em; + position: relative; + z-index: 0; + overflow: hidden; + background-color: var(--color-backgroundlighter); + + .poster-image-placeholder { + flex: calc(1 / var(--poster-shape-ratio)); + margin-bottom: 1em; + background-color: var(--color-secondarylighter20); + + &:before { + content: ""; + display: inline-block; + padding-top: calc(100% * var(--poster-shape-ratio)); + } + } + + .title-bar-placeholder { + height: 2em; + display: flex; + flex-direction: row; + background-color: var(--color-secondarylighter20); + } + + &:after { + content: " "; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 50%; + width: 800%; + margin-left: -400%; + animation: placeholderAnimation 1s linear infinite; + background: linear-gradient(to right, rgba(255, 255, 255, 0) 44%, rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 56%); + } + + @keyframes placeholderAnimation { + 0% { + transform: translate3d(-30%, 0, 0); + } + + 100% { + transform: translate3d(30%, 0, 0); + } + } + + &:nth-child(n+7) { + display: none; + } + } + } + .board-row { + width: 100%; display: flex; flex-direction: row; align-items: stretch; - .meta-item { - margin: 10px; + .meta-items-container { + flex: 5; + display: flex; + flex-direction: row; + align-items: stretch; + + .meta-item { + margin: 1em; + + &.poster-shape-square { + flex: 1; + } + + &.poster-shape-landscape { + flex: calc(1 / var(--landscape-shape-ratio)); + } + + &.poster-shape-poster { + flex: calc(1 / var(--poster-shape-ratio)); + } + } + } + + .show-more-container { + margin: 1em; + flex: 1; + background-color: var(--color-backgroundlighter); + cursor: pointer; } } } \ No newline at end of file diff --git a/src/routes/Calendar/Calendar.js b/src/routes/Calendar/Calendar.js index fb4ac7dc3..c370ca2a5 100644 --- a/src/routes/Calendar/Calendar.js +++ b/src/routes/Calendar/Calendar.js @@ -1,11 +1,379 @@ import React, { Component } from 'react'; +import PropTypes from 'prop-types'; +import classnames from 'classnames'; +import { Input } from 'stremio-common'; +import Icon from 'stremio-icons/dom'; +import styles from './styles'; + +const DAYS = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; +const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; class Calendar extends Component { - render() { + constructor(props) { + super(props); + + this.selectedDateVideosContainerRef = React.createRef(); + this.videosScrollContainerRef = React.createRef(); + + this.state = { + date: new Date(), + videoId: '' + }; + } + + componentDidMount() { + this.scrollToSelectedVideo(); + } + + shouldComponentUpdate(nextProps, nextState) { + return nextState.date !== this.state.date || + nextState.videoId !== this.state.videoId; + } + + componentDidUpdate(prevProps, prevState) { + if (prevState.date !== this.state.date) { + this.scrollToSelectedVideo(); + } + } + + scrollToSelectedVideo = () => { + if (this.selectedDateVideosContainerRef.current !== null) { + this.videosScrollContainerRef.current.scrollTop = this.selectedDateVideosContainerRef.current.offsetTop - this.videosScrollContainerRef.current.offsetTop; + } else { + this.setState({ videoId: '' }); + } + } + + changeDate = (event) => { + const date = new Date(parseInt(event.currentTarget.dataset.date)); + for (let mItem of this.props.metaItems) { + const video = mItem.videos.find((video) => { + return video.released.getFullYear() === date.getFullYear() && + video.released.getMonth() === date.getMonth() && + video.released.getDate() === date.getDate(); + }); + if (video) { + this.setState({ date, videoId: video.id }); + return; + } + } + + this.setState({ date, videoId: '' }); + } + + showVideoInfo = (event) => { + event.stopPropagation(); + for (let mItem of this.props.metaItems) { + const video = mItem.videos.find((video) => video.id == event.currentTarget.dataset.videoId); + if (video) { + this.setState({ date: new Date(video.released), videoId: video.id }); + return; + } + } + + this.setState({ date: new Date(), videoId: '' }); + } + + getMonthInfo = (date) => { + const monthDate = new Date(date); + monthDate.setDate(1); + const padsCount = (monthDate.getDay() + 6) % 7; + monthDate.setMonth(monthDate.getMonth() + 1); + monthDate.setDate(0); + const daysCount = monthDate.getDate(); + const weeksCount = Math.ceil((padsCount + daysCount) / 7); + + return { + padsCount, + daysCount, + weeksCount + }; + } + + renderMonthButton(date) { + return date.getMonth() === this.state.date.getMonth() ? +
{MONTHS[date.getMonth()]}
+ : + {MONTHS[date.getMonth()]} + } + + renderCalendar = (videosForMonth) => { + const { padsCount, daysCount, weeksCount } = this.getMonthInfo(this.state.date); + const weeks = []; + for (let weekNumber = 0; weekNumber < weeksCount; weekNumber++) { + weeks.push( +
+ {this.renderMonthDays(weekNumber, padsCount, daysCount, videosForMonth)} +
+ ); + } + return ( -
You're on the Calendar Tab
+
+ {weeks} +
+ ); + } + + renderMonthDays = (weekNumber, padsCount, daysCount, videosForMonth) => { + const today = new Date(); + const days = []; + for (let day = 0; day < 7; day++) { + const sequentDay = (weekNumber * 7) + (day - padsCount + 1); + days.push( + day < padsCount && weekNumber === 0 + ? +
+ : + sequentDay <= daysCount + ? + +
+ {sequentDay} +
+
+ { + videosForMonth + .filter((video) => video.released.getDate() === sequentDay) + .map((video) => +
+ ) + } +
+ + : + null + ); + } + return days; + } + + renderVideosForMonth = (videoDate, videosForMonth) => { + const today = new Date(); + + return ( + videosForMonth + .filter((video) => video.released.getDate() === videoDate.getDate()) + .map((video) => + +
+
+ {video.metaName} +
+ { + video.season || video.episode + ? +
+ S{video.season} E{video.episode} +
+ : + null + } +
+
+ {video.name} +
+ { + video.description + ? +
+ {video.description} +
+ : + null + } + +
+ +
{video.released.getTime() < today.getTime() ? 'WATCH NOW' : 'SHOW'}
+
+ + + ) + ); + } + + renderSideBar = (videoDates, videosForMonth) => { + return ( +
+ { + videoDates.length > 0 + ? + videoDates.map((videoDate) => +
+
+ {MONTHS[this.state.date.getMonth()].slice(0, 3)} {videoDate.getDate()} +
+ {this.renderVideosForMonth(videoDate, videosForMonth)} +
+ ) + : + null + } +
+ ); + } + + render() { + const videosForMonth = this.props.metaItems + .map((mItem) => { + return mItem.videos + .filter((video) => { + return video.released.getFullYear() === this.state.date.getFullYear() && video.released.getMonth() === this.state.date.getMonth(); + }) + .map((video) => ({ + ...video, + metaPoster: mItem.poster, + metaName: mItem.name + })); + }) + .filter((videos) => videos.length > 0) + .reduce((result, videos) => { + result = result.concat(videos); + return result; + }, []); + + const videoDates = videosForMonth + .map((video) => video.released) + .filter((date, index, dates) => { + for (var i = 0; i < dates.length; i++) { + if (dates[i].getTime() === date.getTime()) { + return i === index; + } + } + + return false; + }) + .sort(function(a, b) { + return a - b; + }); + + return ( +
+
+
+ {this.renderMonthButton(new Date(this.state.date.getFullYear(), this.state.date.getMonth() - 1, 1))} + {this.renderMonthButton(this.state.date)} + {this.renderMonthButton(new Date(this.state.date.getFullYear(), this.state.date.getMonth() + 1, 1))} +
+
+ {DAYS.map((day) =>
{day}
)} +
+ {this.renderCalendar(videosForMonth)} +
+ {this.renderSideBar(videoDates, videosForMonth)} +
); } } +Calendar.propTypes = { + metaItems: PropTypes.arrayOf(PropTypes.shape({ + poster: PropTypes.string, + name: PropTypes.string.isRequired, + videos: PropTypes.arrayOf(PropTypes.shape({ + id: PropTypes.string.isRequired, + name: PropTypes.string.isRequired, + description: PropTypes.string, + released: PropTypes.PropTypes.instanceOf(Date), + season: PropTypes.number, + episode: PropTypes.number + })) + })) +}; +Calendar.defaultProps = { + metaItems: [ + { + poster: 'https://images.metahub.space/poster/medium/tt2306299/img', + name: 'Vikings', + videos: [ + { id: '1', episode: 16, name: 'Homeland', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 1), season: 5 }, + { id: '2', episode: 17, name: 'The Buddha', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 2), season: 5 }, + { id: '3', episode: 18, name: 'Boneless', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 3), season: 5 }, + { id: '4', episode: 19, name: 'Revenge', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 4), season: 5 }, + { id: '5', episode: 20, name: 'Ragnarok', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 5), season: 5 } + ] + }, + { + poster: 'https://images.metahub.space/poster/medium/tt1520211/img', + name: 'The Walking Dead', + videos: [ + { id: '6', episode: 16, name: 'Sing me a song', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 7), season: 5 }, + { id: '7', episode: 17, name: 'Say yes', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 12), season: 5 }, + { id: '8', episode: 18, name: 'Bury me here', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 19), season: 5 }, + { id: '9', episode: 19, name: 'Honor', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 4, 3), season: 5 }, + { id: '10', episode: 20, name: 'The Bridge', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 5, 10), season: 5 } + ] + }, + { + poster: 'https://images.metahub.space/poster/medium/tt0944947/img', + name: 'Game of Thrones', + videos: [ + { id: '11', episode: 16, name: 'The North Remembers', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 4), season: 5 }, + { id: '12', episode: 17, name: 'Garden of Bones', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 10), season: 5 }, + { id: '13', episode: 18, name: 'Dragonstone', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 3, 17), season: 5 }, + { id: '14', episode: 19, name: 'Stormborn', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 4, 3), season: 5 }, + { id: '15', episode: 20, name: 'Eastwatch', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 5, 10), season: 5 } + ] + }, + { + poster: 'https://images.metahub.space/poster/medium/tt0411008/img', + name: 'Lost', + videos: [ + { id: '16', episode: 16, name: 'The Lie', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 4), season: 5 }, + { id: '17', episode: 17, name: '316', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 10), season: 5 }, + { id: '18', episode: 18, name: 'Dead Is Dead', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 17), season: 5 }, + { id: '19', episode: 19, name: 'Racon', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 4, 3), season: 5 }, + { id: '20', episode: 20, name: 'Sundown', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 2, 10), season: 5 } + ] + }, + { + poster: 'https://images.metahub.space/poster/medium/tt0813715/img', + name: 'Heroes', + videos: [ + { id: '21', episode: 16, name: 'Genesis', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 3, 3), season: 5 }, + { id: '22', episode: 17, name: 'Six Months Ago', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 3, 10), season: 5 }, + { id: '23', episode: 18, name: 'Fallout', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 3, 17), season: 5 }, + { id: '24', episode: 19, name: 'Parasite', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 3, 8), season: 5 }, + { id: '25', episode: 20, name: 'The Wall', description: 'Bjorn achieves one of Ragnars dreams. Back in Kattegat, Ivar hatches a new plan while preparing for a divine arrival. In Iceland, a settler returns in a terrible state. King Alfred faces his greatest threat yet.', released: new Date(2019, 5, 10), season: 5 } + ] + } + ] +}; + export default Calendar; diff --git a/src/routes/Calendar/styles.less b/src/routes/Calendar/styles.less new file mode 100644 index 000000000..8afda4cb6 --- /dev/null +++ b/src/routes/Calendar/styles.less @@ -0,0 +1,335 @@ +.calendar-container { + --spacing: 16px; + --videos-scroll-container-width: 270px; + font-size: 14px; +} + +.calendar-container { + padding: var(--spacing); + height: 100%; + display: flex; + flex-direction: row; + background-color: var(--color-background); + + .calendar { + padding-right: calc(var(--spacing) * 0.5); + flex: 1; + + .month-buttons-container { + padding-top: calc(var(--spacing) * 0.5); + height: 3.5em; + text-align: center; + + .month-button { + padding: calc(var(--spacing) * 0.25); + width: 6em; + display: inline-block; + font-size: 1.7em; + line-height: 1.2em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + vertical-align: middle; + border: calc(var(--focusable-border-size) * 0.5) solid transparent; + color: var(--color-surfacelighter); + cursor: pointer; + + &:focus { + border-color: var(--color-surfacelighter); + } + + &:first-child, &:last-child { + font-size: 1.4em; + color: var(--color-surface); + + &:hover { + border-color: transparent; + color: var(--color-surfacelight); + } + } + + &:not(:first-child):not(:last-child) { + margin: 0 var(--spacing); + } + } + } + + .week-days { + height: 3.5em; + display: flex; + flex-direction: row; + align-items: center; + + .day { + padding-right: calc(var(--spacing) * 0.5); + flex: 1; + font-size: 1.2em; + line-height: 1.2em; + text-align: center; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: var(--color-secondarylighter); + } + } + + .month-days { + width: 100%; + height: 36.5em; + display: table; + table-layout: fixed; + border-spacing: var(--focusable-border-size); + + .week { + display: table-row; + + .pad { + display: table-cell; + } + + .day { + display: table-cell; + position: relative; + z-index: 0; + border: calc(var(--focusable-border-size) * 0.5) solid transparent; + background-color: var(--color-backgroundlighter); + cursor: pointer; + + .date { + position: absolute; + z-index: 1; + top: 0; + left: 0; + right: 0; + padding: 0.4em 0; + display: flex; + align-items: center; + justify-content: center; + font-size: 1.4em; + color: var(--color-secondarylighter); + + &.today { + color: var(--color-surfacelighter); + background-color: var(--color-primary); + } + } + + .posters-container { + position: absolute; + z-index: 0; + right: 0; + bottom: 0; + left: 0; + + .poster { + display: none; + width: calc(100% / 4); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + + &.past { + opacity: 0.4; + } + + &:nth-child(-n+4) { + display: inline-block; + } + + &:before { + content: ""; + display: inline-block; + padding-top: calc(100% * var(--poster-shape-ratio)); + } + } + } + + &:hover, &:focus { + border-color: var(--color-surfacelighter); + } + + &.selected { + border-color: var(--color-primary); + background-color: var(--color-backgroundlighter60); + + &:focus { + border-color: var(--color-surfacelighter); + } + + &:hover { + border-color: var(--color-primary); + } + } + } + } + } + } + + .videos-scroll-container { + padding-right: calc(var(--spacing) * 0.5); + width: var(--videos-scroll-container-width); + overflow-x: hidden; + overflow-y: auto; + scroll-behavior: smooth; + + .videos-container { + border: var(--focusable-border-size) solid var(--color-background); + background-color: var(--color-backgroundlighter); + + .date { + padding: var(--spacing); + font-size: 1.2em; + color: var(--color-primarylight); + cursor: pointer; + } + + .video { + padding: var(--spacing); + border: calc(var(--focusable-border-size) * 0.5) solid transparent; + cursor: pointer; + + .main-info { + display: flex; + flex-direction: row; + justify-content: space-between; + + .meta-item-name { + flex: 3; + line-height: 1.2em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: var(--color-surface); + } + + .video-number { + flex: 1; + line-height: 1.2em; + text-align: end; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: var(--color-surface); + } + } + + .name { + width: 100%; + display: none; + padding: calc(var(--spacing) * 0.5) 0; + overflow-wrap: break-word; + color: var(--color-surfacelighter); + } + + .description { + display: none; + padding: var(--spacing) 0; + line-height: 1.2em; + border-bottom: calc(var(--focusable-border-size) * 0.5) solid var(--color-background); + color: var(--color-surfacelighter); + } + + .watch-button-container { + display: none; + margin: calc(var(--spacing) * 0.5); + padding: var(--spacing); + border: calc(var(--focusable-border-size) * 0.5) solid transparent; + cursor: pointer; + + .watch-button { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + + .icon { + margin-right: 1em; + width: 1em; + fill: var(--color-surfacelight); + } + + .label { + max-width: 9em; + word-break: break-all; //Firefox doesn't support { break-word } + word-break: break-word; + color: var(--color-surfacelight); + } + } + + &:focus { + border: calc(var(--focusable-border-size) * 0.5) solid var(--color-surfacelighter); + } + + &:hover { + border-color: transparent; + + .watch-button { + .icon { + fill: var(--color-surfacelighter); + } + + .label { + color: var(--color-surfacelighter); + } + } + } + } + + &.selected { + padding-bottom: 0; + background-color: var(--color-primarydark); + cursor: default; + + .main-info { + .meta-item-name { + white-space: unset; + overflow-wrap: break-word; + } + + .video-number { + white-space: unset; + overflow-wrap: break-word; + } + } + + .name { + display: block; + } + + .description { + display: block; + } + + .watch-button-container { + display: block; + } + + &:hover { + background-color: var(--color-primarydark); + } + } + + &.today { + background-color: var(--color-primarydarker40); + } + + &:focus { + border-color: var(--color-surfacelighter); + } + + &:hover { + border-color: transparent; + background-color: var(--color-primarydark60); + } + } + + &.selected { + border-color: var(--color-primary); + } + + &:not(:last-child) { + margin-bottom: calc(var(--spacing) * 0.5); + } + } + } +} \ No newline at end of file diff --git a/src/routes/Detail/StreamsList/StreamsList.js b/src/routes/Detail/StreamsList/StreamsList.js index c590e09c9..a70faa00b 100644 --- a/src/routes/Detail/StreamsList/StreamsList.js +++ b/src/routes/Detail/StreamsList/StreamsList.js @@ -4,12 +4,28 @@ import Icon from 'stremio-icons/dom'; import Stream from './Stream'; import styles from './styles'; +const renderStreamPlaceholders = () => { + const streamPlaceholders = []; + for (let placeholderNumber = 0; placeholderNumber < 20; placeholderNumber++) { + streamPlaceholders.push( +
+
+
+
+ ) + } + + return streamPlaceholders; +} + const StreamsList = (props) => { return (
- {props.streams - .map((stream) => + {props.streams.length === 0 ? + renderStreamPlaceholders() + : + props.streams.map((stream) => :not(:first-child) { margin-top: var(--spacing); } diff --git a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js index 9dfd91105..27a2fbad4 100644 --- a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js +++ b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js @@ -4,14 +4,17 @@ import classnames from 'classnames'; import { Checkbox } from 'stremio-common'; import styles from './styles'; +const linkOnClick = (event) => { + event.stopPropagation(); +}; + const ConsentCheckbox = React.forwardRef(({ className, label, link, href, checked, onClick }, ref) => ( - + )); ConsentCheckbox.displayName = 'ConsentCheckbox'; diff --git a/src/routes/Intro/ConsentCheckbox/styles.less b/src/routes/Intro/ConsentCheckbox/styles.less index c1067f69d..37a18714d 100644 --- a/src/routes/Intro/ConsentCheckbox/styles.less +++ b/src/routes/Intro/ConsentCheckbox/styles.less @@ -1,42 +1,39 @@ .consent-checkbox-container { + --icon-size: 1.2em; + --icon-color: var(--color-surface); + --icon-background-color: transparent; + display: flex; flex-direction: row; align-items: center; + justify-content: center; cursor: pointer; - .checkbox { - --icon-color: var(--color-surface); - margin-right: calc(var(--spacing) * 0.5); - width: 1.3em; - height: 1.3em; + .label { + flex: 1; + margin-left: 0.5em; + line-height: 1.2em; + color: var(--color-surface); - &:global(.checked) { - --icon-color: var(--color-surfacelight); - background-color: var(--color-primary); + .link { + color: var(--color-surfacelight); } } - .label { - line-height: 1.2em; - color: var(--color-surface); - } - - .link { - line-height: 1.2em; - color: var(--color-surfacelight); + &:global(.checked) { + --icon-color: var(--color-surfacelight); + --icon-background-color: var(--color-primary); } &:focus-within, &:hover { - .checkbox { - --icon-color: var(--color-surfacelighter); - } + --icon-color: var(--color-surfacelighter); .label { color: var(--color-surfacelight); - } - .link { - color: var(--color-surfacelighter); + .link { + color: var(--color-surfacelighter); + } } } } \ No newline at end of file diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js index e392f8c19..969b74c4e 100644 --- a/src/routes/Intro/Intro.js +++ b/src/routes/Intro/Intro.js @@ -1,6 +1,6 @@ import React, { Component, Fragment } from 'react'; import Icon from 'stremio-icons/dom'; -import { Button, Input, Link } from 'stremio-common'; +import { Input } from 'stremio-common'; import ConsentCheckbox from './ConsentCheckbox'; import styles from './styles'; @@ -33,48 +33,8 @@ class Intro extends Component { }; } - changeSelectedForm = (event) => { - event.currentTarget.blur(); - this.setState({ - selectedForm: event.currentTarget.dataset.option, - termsAccepted: false, - privacyPolicyAccepted: false, - marketingAccepted: false, - email: '', - password: '', - confirmPassword: '', - error: '', - }); - } - - emailOnChange = (event) => { - this.setState({ email: event.target.value }); - } - - passwordOnChange = (event) => { - this.setState({ password: event.target.value }); - } - - confirmPasswordOnChange = (event) => { - this.setState({ confirmPassword: event.target.value }); - } - - toggleTerms = () => { - this.setState(({ termsAccepted }) => ({ - termsAccepted: !termsAccepted - })); - } - - togglePrivacyPolicy = () => { - this.setState(({ privacyPolicyAccepted }) => ({ - privacyPolicyAccepted: !privacyPolicyAccepted - })); - } - - toggleMarketing = () => { - this.setState(({ marketingAccepted }) => ({ - marketingAccepted: !marketingAccepted - })); + componentDidMount() { + this.emailRef.current.focus(); } shouldComponentUpdate(nextProps, nextState) { @@ -98,73 +58,123 @@ class Intro extends Component { } } - loginOnSubmit = (event) => { - event.preventDefault(); - if (this.state.email.length < 8) { - this.setState({ error: 'Please enter a valid email' }); - } else { - if (this.emailRef.current === document.activeElement) { - this.passwordRef.current.focus(); - } + changeSelectedForm = (event) => { + this.setState({ + selectedForm: event.currentTarget.dataset.form, + termsAccepted: false, + privacyPolicyAccepted: false, + marketingAccepted: false, + email: '', + password: '', + confirmPassword: '', + error: '', + }); + } - if (this.state.password.length === 0) { - this.setState({ error: 'Invalid password' }); - } else { - this.setState({ error: '' }); - } + emailOnChange = (event) => { + this.setState({ email: event.target.value }); + } + + emailOnSubmit = (event) => { + event.preventDefault(); + this.passwordRef.current.focus(); + } + + passwordOnChange = (event) => { + this.setState({ password: event.target.value }); + } + + passwordOnSubmit = (event) => { + event.preventDefault(); + if (this.state.selectedForm === FORMS.LOGIN) { + this.loginWithEmail(); + } else { + this.confirmPasswordRef.current.focus(); } } - signUpOnSubmit = (event) => { - event.preventDefault(); - if (this.state.email.length < 8) { - this.setState({ error: 'Please enter a valid email' }); - } else { - if (this.emailRef.current === document.activeElement) { - this.passwordRef.current.focus(); - } - - if (this.state.password.length === 0) { - this.setState({ error: 'Invalid password' }); - } else { - if (this.passwordRef.current === document.activeElement) { - this.confirmPasswordRef.current.focus(); - } - - if (this.state.password !== this.state.confirmPassword) { - this.setState({ error: 'Passwords dont match' }); - } else { - if (this.confirmPasswordRef.current === document.activeElement) { - this.termsRef.current.focus(); - } - - if (!this.state.termsAccepted) { - this.setState({ error: 'You must accept the Terms of Service' }); - } else { - if (this.termsRef.current === document.activeElement) { - this.privacyPolicyRef.current.focus(); - } - - if (!this.state.privacyPolicyAccepted) { - this.setState({ error: 'You must accept the Privacy Policy' }); - } else { - if (this.privacyPolicyRef.current === document.activeElement) { - this.marketingRef.current.focus(); - } - - this.setState({ error: '' }); - } - } - } - } - } + confirmPasswordOnChange = (event) => { + this.setState({ confirmPassword: event.target.value }); } - guestLoginOnSubmit = () => { + confirmPasswordOnSubmit = (event) => { + event.preventDefault(); + this.termsRef.current.focus(); + } + + toggleTerms = () => { + this.setState(({ termsAccepted }) => ({ + termsAccepted: !termsAccepted + })); + } + + togglePrivacyPolicy = () => { + this.setState(({ privacyPolicyAccepted }) => ({ + privacyPolicyAccepted: !privacyPolicyAccepted + })); + } + + toggleMarketing = () => { + this.setState(({ marketingAccepted }) => ({ + marketingAccepted: !marketingAccepted + })); + } + + loginWithFacebook = () => { + alert('Facebook login'); + } + + loginWithEmail = () => { + if (this.state.email.length < 8) { + this.setState({ error: 'Please enter a valid email' }); + return; + } + + if (this.state.password.length === 0) { + this.setState({ error: 'Invalid password' }); + return; + } + + this.setState({ error: '' }); + alert('Email login'); + } + + signup = () => { + if (this.state.email.length < 8) { + this.setState({ error: 'Please enter a valid email' }); + return; + } + + if (this.state.password.length === 0) { + this.setState({ error: 'Invalid password' }); + return; + } + + if (this.state.password !== this.state.confirmPassword) { + this.setState({ error: 'Passwords dont match' }); + return; + } + + if (!this.state.termsAccepted) { + this.setState({ error: 'You must accept the Terms of Service' }); + return; + } + + if (!this.state.privacyPolicyAccepted) { + this.setState({ error: 'You must accept the Privacy Policy' }); + return; + } + + this.setState({ error: '' }); + alert('Signup'); + } + + loginAsGuest = () => { if (!this.state.termsAccepted) { this.setState({ error: 'You must accept the Terms of Service' }); } else { this.setState({ error: '' }); + alert('Guest login'); } } @@ -173,44 +183,48 @@ class Intro extends Component {
-
- +
We won't post anything on your behalf
-
- - - { - this.state.selectedForm === FORMS.LOGIN ? - Forgot password? - : - - - - - - - } - { - this.state.error.length > 0 ? -
{this.state.error}
- : - null - } - -
- + + { - this.state.selectedForm === FORMS.SIGN_UP ? - + this.state.selectedForm === FORMS.LOGIN ? + Forgot password? + : + + + + + + + } + { + this.state.error.length > 0 ? +
{this.state.error}
: null } + +
{this.state.selectedForm === FORMS.LOGIN ? 'LOG IN' : 'SING UP'}
+ + { + this.state.selectedForm === FORMS.SIGN_UP ? + +
GUEST LOGIN
+ + : + null + } + +
{this.state.selectedForm === FORMS.SIGN_UP ? 'LOG IN' : 'SING UP WITH EMAIL'}
+
-
+
); } } diff --git a/src/routes/Intro/styles.less b/src/routes/Intro/styles.less index 57c81ceac..149890b82 100644 --- a/src/routes/Intro/styles.less +++ b/src/routes/Intro/styles.less @@ -1,5 +1,5 @@ .intro-container { - --login-form-width: 270px; + --form-width: 270px; --spacing: 16px; font-size: 14px; } @@ -9,9 +9,11 @@ z-index: 0; width: 100%; height: 100%; - background-image: url('/images/login_background.jpg'); + background-image: url('/images/intro_background.jpg'); background-size: cover; - background-attachment: fixed; + background-repeat: no-repeat; + background-position: center; + background-origin: border-box; .overlay { position: absolute; @@ -24,44 +26,51 @@ } .scroll-content { - display: flex; - flex-direction: row; position: absolute; z-index: 1; top: 0; left: 0; right: 0; bottom: 0; + display: flex; + flex-direction: row; overflow-y: auto; overflow-x: hidden; - .intro { + .form-container { + width: var(--form-width); margin: auto; - padding: calc(var(--login-form-width) * 0.2) 0; - width: var(--login-form-width); + padding: 5% 0; - .facebook-button { - width: var(--login-form-width); - height: calc(var(--login-form-width) * 0.25); + .facebook-button, .submit-button, .switch-form-button, .guest-login-button { display: flex; flex-direction: row; align-items: center; justify-content: center; border: var(--focusable-border-size) solid transparent; - background: var(--color-secondarydark); cursor: pointer; .icon { height: 1.7em; - margin-right: var(--spacing); + margin-right: 1em; fill: var(--color-surfacelighter); } .label { - font-size: 1.1em; + font-size: 1em; + font-weight: 600; color: var(--color-surfacelighter); } + &:before { + content: ""; + display: block; + } + + &:focus, &:hover { + filter: brightness(1.2); + } + &:focus { border-color: var(--color-surfacelighter); } @@ -71,116 +80,62 @@ } } + .facebook-button { + background: var(--color-secondarydark); + + .label { + font-size: 1.2em; + } + + &:before { + padding-top: 25%; + } + } + .facebook-statement { - margin: calc(var(--spacing) * 0.5) 0 calc(var(--spacing) * 4) 0; + display: block; + margin-top: 0.5em; + margin-bottom: calc(var(--spacing) * 4); text-align: center; color: var(--color-surface); } - .form-container { - width: var(--login-form-width); - display: flex; - flex-direction: column; - align-items: stretch; - justify-content: center; + .text-input { + display: block; + width: 100%; + margin: var(--spacing) 0; + padding: 0.5em 0.2em; + font-size: 1em; + line-height: 1em; + border-bottom: 1px solid var(--color-surface); + color: var(--color-surfacelighter); - .text-input { - margin: 0 calc(var(--spacing) * 0.5) var(--spacing) calc(var(--spacing) * 0.5); - padding: 0.5em 0; - border-bottom: 1px solid var(--color-surface); - font-size: 1.1em; - color: var(--color-surfacelighter); - background: none; + &::placeholder { + color: var(--color-surfacelight); + } + + &:hover, &:focus { + border-bottom-color: var(--color-surfacelighter); &::placeholder { - color: var(--color-surfacelight); - } - - &:hover, &:focus { - border-bottom-color: var(--color-surfacelighter); - - &::placeholder { - color: var(--color-surfacelighter); - } - } - } - - .consent-checkbox { - width: 100%; - margin-bottom: var(--spacing); - padding: calc(var(--spacing) * 0.5); - border: var(--focusable-border-size) solid transparent; - - &:focus-within { - border-color: var(--color-surfacelighter); - } - } - - - .forgot-password { - align-self: flex-end; - margin-bottom: var(--spacing); - padding: calc(var(--spacing) * 0.5); - border: var(--focusable-border-size) solid transparent; - color: var(--color-surfacelight); - cursor: pointer; - - &:hover, &:focus { color: var(--color-surfacelighter); } - - &:focus { - border-color: var(--color-surfacelighter); - } - - &:hover { - border-color: transparent; - } - } - - .error { - margin-bottom: var(--spacing); - text-align: center; - color: var(--color-signal1); - } - - .submit-button { - width: 100%; - outline: none; - padding: calc(var(--spacing) * 1.1); - font-size: 1.1em; - font-weight: 600; - border: var(--focusable-border-size) solid transparent; - color: var(--color-surfacelighter); - background-color: var(--color-primarydark); - cursor: pointer; - - &:hover, &:focus { - background-color: var(--color-primary); - } - - &:focus { - border-color: var(--color-surfacelighter); - } - - &:hover { - border-color: transparent; - } } } - .switch-form-button, .guest-login-button { - width: 100%; - display: inline-block; - margin-top: var(--spacing); - padding: calc(var(--spacing) * 0.5); - text-align: center; - font-size: 1.1em; - font-weight: 600; + .forgot-password-link { + display: block; + margin: var(--spacing) 0; + padding: 0.5em; border: var(--focusable-border-size) solid transparent; - color: var(--color-surfacelighter); + color: var(--color-surfacelight); + text-align: right; cursor: pointer; + &:hover, &:focus { + color: var(--color-surfacelighter); + } + &:focus { border-color: var(--color-surfacelighter); } @@ -189,6 +144,49 @@ border-color: transparent; } } + + .consent-checkbox { + margin: var(--spacing) 0; + padding: 0.5em 0.2em; + border: var(--focusable-border-size) solid transparent; + + &:focus-within { + border-color: var(--color-surfacelighter); + } + + &:hover { + border-color: transparent; + } + } + + .error { + margin: var(--spacing) 0; + padding: 0.5em 0.2em; + text-align: center; + color: var(--color-signal1); + } + + .submit-button { + background-color: var(--color-primarydark); + + .label { + font-size: 1.2em; + font-weight: 600; + } + + &:before { + padding-top: 20%; + } + } + + .switch-form-button, .guest-login-button { + margin: var(--spacing) 0; + padding: 0.8em 0.2em; + + .label { + font-size: 1.1em; + } + } } } } \ No newline at end of file diff --git a/stories/index.stories.js b/stories/index.stories.js index 63fff7cbe..9e55f0244 100644 --- a/stories/index.stories.js +++ b/stories/index.stories.js @@ -2,12 +2,13 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import { Checkbox, LibraryItemList, MetaItem, ShareModal, UserPanel } from 'stremio-common'; import Addon from '../src/routes/Addons/Addon'; -import Stream from '../src/routes/Detail/StreamsList/Stream'; import Video from '../src/routes/Detail/VideosList/Video'; import VideosList from '../src/routes/Detail/VideosList'; +import Stream from '../src/routes/Detail/StreamsList/Stream'; import StreamsList from '../src/routes/Detail/StreamsList'; +import ModalsContainerProvider from '../src/common/Router/Route/ModalsContainerProvider'; import colors from 'stremio-colors'; -import appStyles from '../src/app/styles'; +import appStyles from '../src/App/styles'; import styles from './styles'; const storyStyle = { @@ -16,14 +17,6 @@ const storyStyle = { minHeight: 'initial' }; -const videosListStyle = { - position: 'absolute', - height: '100%', - padding: '10px', - minHeight: 'initial', - background: colors.backgroundlighter -} - const streamsListStyle = { position: 'absolute', height: '100%', @@ -32,51 +25,61 @@ const streamsListStyle = { background: colors.backgroundlighter } +const CONTINUE_WATCHING_MENU = [ + { + label: 'Play', + type: 'play' + }, + { + label: 'Dismiss', + type: 'dismiss' + } +]; + +const onModalsContainerDomTreeChange = ({ modalsContainerElement }) => { + return modalsContainerElement.childElementCount === 0; +}; + storiesOf('Addon', module) .add('not-installed', () => (
)) .add('installed', () => (
)) - .add('long-description', () => ( + .add('long-text', () => (
-
- )) - .add('long-urls', () => ( -
-
)); @@ -84,88 +87,102 @@ storiesOf('Addon', module) storiesOf('Checkbox', module) .add('checked-disabled', () => (
- + +
+
)) .add('not-checked-disabled', () => (
- + +
+
)) .add('not-checked', () => (
- + +
+
)) .add('checked', () => (
- -
- )) - -storiesOf('LibraryItemList', module) - .add('library item list', () => ( -
- + +
+
)); storiesOf('MetaItem', module) - .add('poster', () => ( + .add('continue-watching-poster', () => ( + + +
+ +
+ + + )) + .add('continue-watching-square', () => ( + + +
+ +
+ + + )) + .add('addon-catalog-poster-movie', () => (
)) - .add('with-title', () => ( + .add('addon-catalog-square-channel', () => (
)) - .add('with-progress', () => ( -
- -
- )) - .add('landscape-shape', () => ( + .add('addon-catalog-landscape-series', () => (
)); @@ -178,6 +195,165 @@ storiesOf('ShareModal', module)
)); +storiesOf('UserPanel', module) + .add('anonymous', () => ( +
+ +
+ )) + .add('without avatar', () => ( +
+ +
+ )) + .add('with avatar', () => ( +
+ +
+ )); + +storiesOf('Video', module) + .add('poster-upcoming-watched-long-title', () => ( +
+
+ )) + .add('empty-poster-progress', () => ( +
+
+ )) + .add('no-poster-upcoming', () => ( +
+
+ )) + .add('no-poster-upcoming-watched', () => ( +
+
+ )) + .add('no-poster-long-title-progress', () => ( +
+
+ )); + +storiesOf('VideosList', module) + .add('list of videos', () => ( + + +
+ +
+ + + )); + storiesOf('Stream', module) .add('no-logo-title', () => (
@@ -228,170 +404,35 @@ storiesOf('Stream', module)
)); -storiesOf('UserPanel', module) - .add('anonymous', () => ( -
- -
- )) - .add('without avatar', () => ( -
- -
- )) - .add('with avatar', () => ( -
- -
- )); - -storiesOf('Video', module) - .add('poster-upcoming-watched-long-title', () => ( -
-
- )) - .add('poster-watched', () => ( -
-
- )) - .add('no-poster-progress', () => ( -
-
- )) - .add('poster-progress', () => ( -
-
- )) - .add('no-poster-upcoming', () => ( -
-
- )); - -storiesOf('VideosList', module) - .add('list of videos', () => ( -
- -
- )); - storiesOf('StreamsList', module) .add('short list of streams', () => (
- +
)) .add('long list of streams', () => (
- +
)); \ No newline at end of file diff --git a/stories/styles.less b/stories/styles.less index fbffe29e8..8ad56cdf4 100644 --- a/stories/styles.less +++ b/stories/styles.less @@ -1,7 +1,32 @@ -.checkbox-size { - height: 16px; - width: 16px; +.addon { + --addon-width: 960px; + --button-border-width: 2px; + font-size: 14px; } -.video, .stream { - margin: 10px; + +.checkbox-size { + --icon-size: 1.2em; + --icon-color: var(--color-surfacelighter); +} + +.meta-item-continue-watching { + --play-icon-visibility: visible; +} + +.video { + --video-width: 360px; + --spacing: 8px; + font-size: 12px; +} + +.videos-list, :global(.detail-popup-container) { + --spacing: 8px; + --video-width: 360px; + font-size: 12px; + + position: absolute; + z-index: 1; + top: 0; + bottom: 0; + padding: calc(3 * var(--spacing)) 0; } \ No newline at end of file