diff --git a/COPYING b/COPYING new file mode 100644 --- /dev/null +++ b/COPYING @@ -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/src/WikiMusic/SSR/Free/View.hs b/src/WikiMusic/SSR/Free/View.hs --- a/src/WikiMusic/SSR/Free/View.hs +++ b/src/WikiMusic/SSR/Free/View.hs @@ -11,6 +11,9 @@ artistCreatePage, genreCreatePage, songCreatePage, + artistEditPage, + genreEditPage, + songEditPage, ) where @@ -28,12 +31,15 @@ = ArtistListPage Env UiMode Language Palette SortOrder GetArtistsQueryResponse (Html -> a) | ArtistDetailPage Env UiMode Language Palette GetArtistsQueryResponse (Html -> a) | ArtistCreatePage Env UiMode Language Palette (Html -> a) + | ArtistEditPage Env UiMode Language Palette Artist (Html -> a) | GenreListPage Env UiMode Language Palette SortOrder GetGenresQueryResponse (Html -> a) | GenreDetailPage Env UiMode Language Palette GetGenresQueryResponse (Html -> a) | GenreCreatePage Env UiMode Language Palette (Html -> a) + | GenreEditPage Env UiMode Language Palette Genre (Html -> a) | SongListPage Env UiMode Language Palette SortOrder GetSongsQueryResponse (Html -> a) | SongDetailPage Env UiMode Language Palette SongAsciiSize GetSongsQueryResponse (Html -> a) | SongCreatePage Env UiMode Language Palette (Html -> a) + | SongEditPage Env UiMode Language Palette Song (Html -> a) | ErrorPage Env UiMode Language Palette Text (Html -> a) | LoginPage Env UiMode Language Palette (Html -> a) deriving (Functor) @@ -47,6 +53,9 @@ artistCreatePage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Free f Html artistCreatePage env mode language palette = injectFree (ArtistCreatePage env mode language palette Pure) +artistEditPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Artist -> Free f Html +artistEditPage env mode language palette artist = injectFree (ArtistEditPage env mode language palette artist Pure) + genreListPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> SortOrder -> GetGenresQueryResponse -> Free f Html genreListPage env mode language palette sortOrder genres = injectFree (GenreListPage env mode language palette sortOrder genres Pure) @@ -56,6 +65,9 @@ genreCreatePage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Free f Html genreCreatePage env mode language palette = injectFree (GenreCreatePage env mode language palette Pure) +genreEditPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Genre -> Free f Html +genreEditPage env mode language palette genre = injectFree (GenreEditPage env mode language palette genre Pure) + songListPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> SortOrder -> GetSongsQueryResponse -> Free f Html songListPage env mode language palette sortOrder songs = injectFree (SongListPage env mode language palette sortOrder songs Pure) @@ -64,6 +76,9 @@ songCreatePage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Free f Html songCreatePage env mode language palette = injectFree (SongCreatePage env mode language palette Pure) + +songEditPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Song -> Free f Html +songEditPage env mode language palette song = injectFree (SongEditPage env mode language palette song Pure) errorPage :: (View :<: f) => Env -> UiMode -> Language -> Palette -> Text -> Free f Html errorPage env mode message l palette = injectFree (ErrorPage env mode message l palette Pure) diff --git a/src/WikiMusic/SSR/Language.hs b/src/WikiMusic/SSR/Language.hs --- a/src/WikiMusic/SSR/Language.hs +++ b/src/WikiMusic/SSR/Language.hs @@ -9,7 +9,7 @@ Titles (..), Errors (..), Slogans (..), - LanguageDict (..), + ApplicationDictionary (..), More (..), Forms (..), Sortings (..), @@ -109,7 +109,7 @@ makeFieldLabelsNoPrefix ''Buttons -data LanguageDict = LanguageDict +data ApplicationDictionary = ApplicationDictionary { titles :: Titles, errors :: Errors, slogans :: Slogans, @@ -120,11 +120,11 @@ } deriving (Eq, Generic, Show) -makeFieldLabelsNoPrefix ''LanguageDict +makeFieldLabelsNoPrefix ''ApplicationDictionary -dictionary :: LanguageDict +dictionary :: ApplicationDictionary dictionary = - LanguageDict + ApplicationDictionary { titles = Titles { wikimusicSSR = DictTerm {en = "WikiMusic", nl = "WikiMusic"}, @@ -237,5 +237,5 @@ -- towerOfBabel alias infixl 8 |##| -(|##|) :: DictTerm -> Language -> Text -(|##|) x language = towerOfBabel language x +(|##|) :: (ApplicationDictionary -> DictTerm) -> Language -> Text +(|##|) fromDict language = towerOfBabel language (fromDict dictionary) diff --git a/src/WikiMusic/SSR/Servant/ApiSetup.hs b/src/WikiMusic/SSR/Servant/ApiSetup.hs --- a/src/WikiMusic/SSR/Servant/ApiSetup.hs +++ b/src/WikiMusic/SSR/Servant/ApiSetup.hs @@ -74,31 +74,60 @@ where prepareCSS = T.filter (\x -> x /= '\n' && x /= '\t') . decodeUtf8 -server :: Env -> Server WikiMusicSSRServant -server env = - fallbackRoute - :<|> artistsRoute env +artistBaseEntityRoutes :: Env -> Server BaseEntityRoutes +artistBaseEntityRoutes env = + artistsRoute env :<|> artistRoute env :<|> artistCreateRoute env :<|> artistCreateFormRoute env :<|> artistLikeRoute env :<|> artistDislikeRoute env - :<|> genresRoute env + :<|> artistEditRoute env + +genreBaseEntityRoutes :: Env -> Server BaseEntityRoutes +genreBaseEntityRoutes env = + genresRoute env :<|> genreRoute env :<|> genreCreateRoute env - :<|> songsRoute env + :<|> genreCreateFormRoute env + :<|> genreLikeRoute env + :<|> genreDislikeRoute env + :<|> genreEditRoute env + +songBaseEntityRoutes :: Env -> Server BaseEntityRoutes +songBaseEntityRoutes env = + songsRoute env :<|> songRoute env :<|> songCreateRoute env - :<|> setLanguageRoute env + :<|> songCreateFormRoute env + :<|> songLikeRoute env + :<|> songDislikeRoute env + :<|> songEditRoute env + +preferenceRoutes :: Env -> Server PreferenceRoutes +preferenceRoutes env = + setLanguageRoute env :<|> setArtistSortingRoute env :<|> setGenreSortingRoute env :<|> setSongSortingRoute env :<|> setDarkModeRoute env :<|> setSongAsciiSizeRoute env :<|> setPaletteRoute env - :<|> loginFormRoute env + +loginRoutes :: Env -> Server LoginRoutes +loginRoutes env = + loginFormRoute env :<|> submitLoginRoute env +server :: Env -> Server WikiMusicSSRServant +server env = + fallbackRoute + :<|> artistBaseEntityRoutes env + :<|> genreBaseEntityRoutes env + :<|> songBaseEntityRoutes env + :<|> preferenceRoutes env + :<|> loginRoutes env + fallbackRoute :: Handler a fallbackRoute = do @@ -137,3 +166,4 @@ corsRequireOrigin = False, corsIgnoreFailures = False } + diff --git a/src/WikiMusic/SSR/Servant/ApiSpec.hs b/src/WikiMusic/SSR/Servant/ApiSpec.hs --- a/src/WikiMusic/SSR/Servant/ApiSpec.hs +++ b/src/WikiMusic/SSR/Servant/ApiSpec.hs @@ -1,4 +1,10 @@ -module WikiMusic.SSR.Servant.ApiSpec (WikiMusicSSRServant) where +module WikiMusic.SSR.Servant.ApiSpec + ( WikiMusicSSRServant, + BaseEntityRoutes, + PreferenceRoutes, + LoginRoutes, + ) +where import Data.UUID (UUID) import Relude @@ -12,41 +18,14 @@ type WikiMusicSSRServant = Get '[ServantBlaze.HTML] NoContent :<|> "artists" - :> WithCookie - :> QueryParam "sort-order" Text - :> QueryParam "limit" Int - :> QueryParam "offset" Int - :> GetHtml - :<|> "artists" :> WithCookie :> Capture "identifier" UUID :> GetHtml - :<|> "artists" :> "create" :> WithCookie :> GetHtml - :<|> "artists" :> "create" :> WithCookie :> PostDataForm - :<|> "artists" :> "like" :> WithCookie :> WithReferer :> Capture "identifier" UUID :> PostNoFields - :<|> "artists" :> "dislike" :> WithCookie :> WithReferer :> Capture "identifier" UUID :> PostNoFields + :> BaseEntityRoutes :<|> "genres" - :> WithCookie - :> QueryParam "sort-order" Text - :> QueryParam "limit" Int - :> QueryParam "offset" Int - :> GetHtml - :<|> "genres" :> WithCookie :> Capture "identifier" UUID :> GetHtml - :<|> "genres" :> "create" :> WithCookie :> GetHtml + :> BaseEntityRoutes :<|> "songs" - :> WithCookie - :> QueryParam "sort-order" Text - :> QueryParam "limit" Int - :> QueryParam "offset" Int - :> GetHtml - :<|> "songs" :> WithCookie :> Capture "identifier" UUID :> GetHtml - :<|> "songs" :> "create" :> WithCookie :> GetHtml - :<|> "user-preferences" :> "locale" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "artist-sorting" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "genre-sorting" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "song-sorting" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "dark-mode" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "song-ascii-size" :> WithReferer :> CookieForm - :<|> "user-preferences" :> "palette" :> WithReferer :> CookieForm - :<|> "login" :> WithCookie :> GetHtml - :<|> "login" :> CookieForm + :> BaseEntityRoutes + :<|> "user-preferences" + :> PreferenceRoutes + :<|> "login" :> LoginRoutes type PostDataForm = MultipartForm Mem (MultipartData Mem) @@ -54,12 +33,38 @@ type PostNoFields = Post '[ServantBlaze.HTML] (Headers '[Header "Location" Text] NoContent) +type WithReferer = Header "referer" Text + type CookieForm = - MultipartForm Mem (MultipartData Mem) + WithReferer + :> MultipartForm Mem (MultipartData Mem) :> Post '[ServantBlaze.HTML] (Headers '[Header "Set-Cookie" Text, Header "Location" Text] NoContent) -type GetHtml = Get '[ServantBlaze.HTML] Html +type HtmlDoc = Get '[ServantBlaze.HTML] Html type WithCookie = Header "cookie" Text -type WithReferer = Header "referer" Text +type BaseEntityRoutes = + WithCookie + :> QueryParam "sort-order" Text + :> QueryParam "limit" Int + :> QueryParam "offset" Int + :> HtmlDoc + :<|> WithCookie :> Capture "identifier" UUID :> HtmlDoc + :<|> "create" :> WithCookie :> HtmlDoc + :<|> "create" :> WithCookie :> PostDataForm + :<|> "like" :> WithCookie :> WithReferer :> Capture "identifier" UUID :> PostNoFields + :<|> "dislike" :> WithCookie :> WithReferer :> Capture "identifier" UUID :> PostNoFields + :<|> "edit" :> WithCookie :> Capture "identifier" UUID :> HtmlDoc + + +type PreferenceRoutes = + "locale" :> CookieForm + :<|> "artist-sorting" :> CookieForm + :<|> "genre-sorting" :> CookieForm + :<|> "song-sorting" :> CookieForm + :<|> "dark-mode" :> CookieForm + :<|> "song-ascii-size" :> CookieForm + :<|> "palette" :> CookieForm + +type LoginRoutes = WithCookie :> HtmlDoc :<|> PostDataForm diff --git a/src/WikiMusic/SSR/Servant/ArtistRoutes.hs b/src/WikiMusic/SSR/Servant/ArtistRoutes.hs --- a/src/WikiMusic/SSR/Servant/ArtistRoutes.hs +++ b/src/WikiMusic/SSR/Servant/ArtistRoutes.hs @@ -6,12 +6,15 @@ artistCreateRoute, artistCreateFormRoute, artistLikeRoute, + artistEditRoute, artistDislikeRoute, ) where +import Data.Maybe qualified import Control.Monad.Error.Class import Data.ByteString.Lazy qualified as BL +import Data.Map qualified as Map import Data.Text qualified as T import Data.UUID (UUID) import Free.AlaCarte @@ -156,3 +159,25 @@ } ] } + +artistEditRoute :: (MonadIO m) => Env -> Maybe Text -> UUID -> m Html +artistEditRoute env cookie identifier = do + maybeArtists <- + liftIO + $ exec @Backend + ( getArtist + env + (viewVars ^. #authToken) + identifier + (Include {value = "artworks,comments,opinions"}) + ) + let a = second (\x -> (head . Data.Maybe.fromJust . nonEmpty) $ Map.elems $ x ^. #artists) maybeArtists + eitherView + env + (viewVars ^. #uiMode) + (viewVars ^. #locale) + (viewVars ^. #palette) + a + (exec @View . artistEditPage env (viewVars ^. #uiMode) (viewVars ^. #locale) (viewVars ^. #palette)) + where + viewVars = viewVarsFromCookies cookie diff --git a/src/WikiMusic/SSR/Servant/GenreRoutes.hs b/src/WikiMusic/SSR/Servant/GenreRoutes.hs --- a/src/WikiMusic/SSR/Servant/GenreRoutes.hs +++ b/src/WikiMusic/SSR/Servant/GenreRoutes.hs @@ -4,14 +4,26 @@ ( genresRoute, genreRoute, genreCreateRoute, + genreCreateFormRoute, + genreLikeRoute, + genreDislikeRoute, + genreEditRoute ) where +import Data.Map qualified as Map +import Data.Maybe qualified +import Control.Monad.Error.Class +import Data.ByteString.Lazy qualified as BL +import Data.Text qualified as T import Data.UUID (UUID) import Free.AlaCarte import Optics import Relude +import Servant +import Servant.Multipart import Text.Blaze.Html as Html +import WikiMusic.Interaction.Model.Genre import WikiMusic.Model.Other import WikiMusic.SSR.Backend.Rest () import WikiMusic.SSR.Free.Backend @@ -69,5 +81,103 @@ genreCreateRoute :: (MonadIO m) => Env -> Maybe Text -> m Html genreCreateRoute env cookie = do liftIO $ exec @View (genreCreatePage env (viewVars ^. #uiMode) (viewVars ^. #locale) (viewVars ^. #palette)) + where + viewVars = viewVarsFromCookies cookie + +genreCreateFormRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> MultipartData tag -> m a +genreCreateFormRoute env cookie multipartData = do + createResult <- liftIO $ exec @Backend (createGenre env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ createResult) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", "/genres")] + } + where + viewVars = viewVarsFromCookies cookie + r = + InsertGenresRequest + { genres = + [ InsertGenresRequestItem + { displayName = fromForm multipartData "" "displayName", + spotifyUrl = maybeFromForm multipartData "spotifyUrl", + youtubeUrl = maybeFromForm multipartData "youtubeUrl", + soundcloudUrl = maybeFromForm multipartData "soundcloudUrl", + wikipediaUrl = maybeFromForm multipartData "wikipediaUrl", + description = maybeFromForm multipartData "description" + } + ] + } + +genreLikeRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> Maybe Text -> UUID -> m a +genreLikeRoute env cookie maybeReferer identifier = do + res <- liftIO $ exec @Backend (upsertGenreOpinion env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ res) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", fromString . T.unpack $ fromMaybe "/genres" maybeReferer)] + } + where + viewVars = viewVarsFromCookies cookie + r = + UpsertGenreOpinionsRequest + { genreOpinions = + [ UpsertGenreOpinionsRequestItem + { genreIdentifier = identifier, + isLike = True + } + ] + } + +genreDislikeRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> Maybe Text -> UUID -> m a +genreDislikeRoute env cookie maybeReferer identifier = do + res <- liftIO $ exec @Backend (upsertGenreOpinion env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ res) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", fromString . T.unpack $ fromMaybe "/genres" maybeReferer)] + } + where + viewVars = viewVarsFromCookies cookie + r = + UpsertGenreOpinionsRequest + { genreOpinions = + [ UpsertGenreOpinionsRequestItem + { genreIdentifier = identifier, + isLike = False + } + ] + } + +genreEditRoute :: (MonadIO m) => Env -> Maybe Text -> UUID -> m Html +genreEditRoute env cookie identifier = do + maybeGenres <- + liftIO + $ exec @Backend + ( getGenre + env + (viewVars ^. #authToken) + identifier + (Include {value = "artworks,comments,opinions"}) + ) + let a = second (\x -> (head . Data.Maybe.fromJust . nonEmpty) $ Map.elems $ x ^. #genres) maybeGenres + eitherView + env + (viewVars ^. #uiMode) + (viewVars ^. #locale) + (viewVars ^. #palette) + a + (exec @View . genreEditPage env (viewVars ^. #uiMode) (viewVars ^. #locale) (viewVars ^. #palette)) where viewVars = viewVarsFromCookies cookie diff --git a/src/WikiMusic/SSR/Servant/SongRoutes.hs b/src/WikiMusic/SSR/Servant/SongRoutes.hs --- a/src/WikiMusic/SSR/Servant/SongRoutes.hs +++ b/src/WikiMusic/SSR/Servant/SongRoutes.hs @@ -4,14 +4,24 @@ ( songsRoute, songRoute, songCreateRoute, + songCreateFormRoute, + songLikeRoute, + songDislikeRoute, + songEditRoute, ) where +import Control.Monad.Error.Class +import Data.ByteString.Lazy qualified as BL +import Data.Text qualified as T import Data.UUID (UUID) import Free.AlaCarte import Optics import Relude +import Servant +import Servant.Multipart import Text.Blaze.Html as Html +import WikiMusic.Interaction.Model.Song import WikiMusic.Model.Other import WikiMusic.SSR.Backend.Rest () import WikiMusic.SSR.Free.Backend @@ -20,6 +30,8 @@ import WikiMusic.SSR.Model.Env import WikiMusic.SSR.Servant.Utilities import WikiMusic.SSR.View.Html () +import Data.Map qualified as Map +import Data.Maybe qualified songsRoute :: (MonadIO m) => Env -> Maybe Text -> Maybe Text -> Maybe Int -> Maybe Int -> m Html songsRoute env cookie givenSortOrder limit offset = do @@ -69,5 +81,108 @@ songCreateRoute :: (MonadIO m) => Env -> Maybe Text -> m Html songCreateRoute env cookie = do liftIO $ exec @View (songCreatePage env (viewVars ^. #uiMode) (viewVars ^. #locale) (viewVars ^. #palette)) + where + viewVars = viewVarsFromCookies cookie + +songCreateFormRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> MultipartData tag -> m a +songCreateFormRoute env cookie multipartData = do + createResult <- liftIO $ exec @Backend (createSong env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ createResult) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", "/songs")] + } + where + viewVars = viewVarsFromCookies cookie + r = + InsertSongsRequest + { songs = + [ InsertSongsRequestItem + { displayName = fromForm multipartData "" "displayName", + spotifyUrl = maybeFromForm multipartData "spotifyUrl", + youtubeUrl = maybeFromForm multipartData "youtubeUrl", + soundcloudUrl = maybeFromForm multipartData "soundcloudUrl", + wikipediaUrl = maybeFromForm multipartData "wikipediaUrl", + description = maybeFromForm multipartData "description", + musicKey = maybeFromForm multipartData "musicKey", + musicTuning = maybeFromForm multipartData "musicTuning", + musicCreationDate = maybeFromForm multipartData "musicCreationDate", + albumName = maybeFromForm multipartData "albumName", + albumInfoLink = maybeFromForm multipartData "albumInfoLink" + } + ] + } + +songLikeRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> Maybe Text -> UUID -> m a +songLikeRoute env cookie maybeReferer identifier = do + res <- liftIO $ exec @Backend (upsertSongOpinion env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ res) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", fromString . T.unpack $ fromMaybe "/songs" maybeReferer)] + } + where + viewVars = viewVarsFromCookies cookie + r = + UpsertSongOpinionsRequest + { songOpinions = + [ UpsertSongOpinionsRequestItem + { songIdentifier = identifier, + isLike = True + } + ] + } + +songDislikeRoute :: (MonadIO m, MonadError ServerError m) => Env -> Maybe Text -> Maybe Text -> UUID -> m a +songDislikeRoute env cookie maybeReferer identifier = do + res <- liftIO $ exec @Backend (upsertSongOpinion env (viewVars ^. #authToken) r) + _ <- liftIO $ BL.putStr (fromString . show $ res) + throwError + $ ServerError + { errHTTPCode = 302, + errReasonPhrase = "Found", + errBody = "", + errHeaders = + [("Location", fromString . T.unpack $ fromMaybe "/songs" maybeReferer)] + } + where + viewVars = viewVarsFromCookies cookie + r = + UpsertSongOpinionsRequest + { songOpinions = + [ UpsertSongOpinionsRequestItem + { songIdentifier = identifier, + isLike = False + } + ] + } + +songEditRoute :: (MonadIO m) => Env -> Maybe Text -> UUID -> m Html +songEditRoute env cookie identifier = do + maybeSongs <- + liftIO + $ exec @Backend + ( getSong + env + (viewVars ^. #authToken) + identifier + (Include {value = "artworks,comments,opinions"}) + ) + let a = second (\x -> (head . Data.Maybe.fromJust . nonEmpty) $ Map.elems $ x ^. #songs) maybeSongs + eitherView + env + (viewVars ^. #uiMode) + (viewVars ^. #locale) + (viewVars ^. #palette) + a + (exec @View . songEditPage env (viewVars ^. #uiMode) (viewVars ^. #locale) (viewVars ^. #palette)) where viewVars = viewVarsFromCookies cookie diff --git a/src/WikiMusic/SSR/View/ArtistHtml.hs b/src/WikiMusic/SSR/View/ArtistHtml.hs --- a/src/WikiMusic/SSR/View/ArtistHtml.hs +++ b/src/WikiMusic/SSR/View/ArtistHtml.hs @@ -6,6 +6,7 @@ ( artistListPage', artistDetailPage', artistCreatePage', + artistEditPage' ) where @@ -26,11 +27,11 @@ artistListPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> SortOrder -> GetArtistsQueryResponse -> m Html artistListPage' env mode language palette sortOrder xs = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #artistsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #artistsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do - sharedPageTop (Just $ dictionary ^. #titles % #artistsPage |##| language) mode language palette + sharedPageTop (Just $ (^. #titles % #artistsPage) |##| language) mode language palette section ! class_ "flex direction-row justify-content-center gap-small align-items-baseline" $ do H.a ! href "/artists/create" $ button $ H.small "+ new artist" mkSortingForm language sortOrder "/user-preferences/artist-sorting" "artist-sorting" @@ -43,7 +44,7 @@ artistDetailPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Artist -> m Html artistDetailPage' env mode language palette x = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #artistsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #artistsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -52,7 +53,7 @@ artistCreatePage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> m Html artistCreatePage' env mode language palette = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #artistsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #artistsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -66,4 +67,23 @@ optionalTextInput "youtubeUrl" "youtube URL" optionalTextInput "wikipediaUrl" "wikipedia URL" optionalTextInput "soundcloudUrl" "soundcloud URL" + submitButton language + +artistEditPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Artist -> m Html +artistEditPage' env mode language palette artist = do + sharedHead <- mkSharedHead env mode palette ((^. #titles % #artistsPage) |##| language) + pure $ H.html $ do + sharedHead + body $ section $ do + sharedPageTop Nothing mode language palette + section $ do + H.h2 "Edit artist" + postForm "/artists/edit" $ do + requiredTextInput' "displayName" "artist name" (Just $ artist ^. #displayName) + optionalTextArea' "description" "description" (artist ^. #description) + optionalTextInput' "spotifyUrl" "spotify URL" (artist ^. #spotifyUrl) + optionalTextInput' "youtubeUrl" "youtube URL" (artist ^. #youtubeUrl) + optionalTextInput' "wikipediaUrl" "wikipedia URL" (artist ^. #wikipediaUrl) + optionalTextInput' "soundcloudUrl" "soundcloud URL" (artist ^. #soundcloudUrl) + submitButton language diff --git a/src/WikiMusic/SSR/View/Components/DetailList.hs b/src/WikiMusic/SSR/View/Components/DetailList.hs --- a/src/WikiMusic/SSR/View/Components/DetailList.hs +++ b/src/WikiMusic/SSR/View/Components/DetailList.hs @@ -13,7 +13,7 @@ import Text.Blaze.Html5.Attributes as A detailListEntry :: Text -> Html -> Html -detailListEntry key val = do +detailListEntry key val = H.div ! class_ "flex direction-row gap-small align-items-baseline" $ do dt . small . text $ key dd . small $ val diff --git a/src/WikiMusic/SSR/View/Components/Forms.hs b/src/WikiMusic/SSR/View/Components/Forms.hs --- a/src/WikiMusic/SSR/View/Components/Forms.hs +++ b/src/WikiMusic/SSR/View/Components/Forms.hs @@ -15,6 +15,10 @@ formArea, optionalTextArea, requiredTextArea, + requiredTextInput', + optionalTextInput', + requiredTextArea', + optionalTextArea', ) where @@ -44,47 +48,59 @@ ! value (fromString . T.unpack $ fst o) $ text ("↕ " <> snd o) entries = - [ ("display-name-asc", dictionary ^. #sortings % #alphabeticalAsc |##| language), - ("display-name-desc", dictionary ^. #sortings % #alphabeticalDesc |##| language), - ("created-at-asc", dictionary ^. #sortings % #createdAtAsc |##| language), - ("created-at-desc", dictionary ^. #sortings % #createdAtDesc |##| language) + [ ("display-name-asc", (^. #sortings % #alphabeticalAsc) |##| language), + ("display-name-desc", (^. #sortings % #alphabeticalDesc) |##| language), + ("created-at-asc", (^. #sortings % #createdAtAsc) |##| language), + ("created-at-desc", (^. #sortings % #createdAtDesc) |##| language) ] requiredTextInput :: Text -> Text -> Html -requiredTextInput name' displayLabel = formInput name' displayLabel True "text" +requiredTextInput name' displayLabel = formInput name' displayLabel True "text" Nothing +requiredTextInput' :: Text -> Text -> Maybe Text -> Html +requiredTextInput' name' displayLabel = formInput name' displayLabel True "text" + requiredTextArea :: Text -> Text -> Html -requiredTextArea name' displayLabel = formArea name' displayLabel True "text" +requiredTextArea name' displayLabel = formArea name' displayLabel True "text" Nothing +requiredTextArea' :: Text -> Text -> Maybe Text -> Html +requiredTextArea' name' displayLabel = formArea name' displayLabel True "text" + optionalTextInput :: Text -> Text -> Html -optionalTextInput name' displayLabel = formInput name' displayLabel False "text" +optionalTextInput name' displayLabel = formInput name' displayLabel False "text" Nothing +optionalTextInput' :: Text -> Text -> Maybe Text -> Html +optionalTextInput' name' displayLabel = formInput name' displayLabel False "text" + optionalTextArea :: Text -> Text -> Html -optionalTextArea name' displayLabel = formArea name' displayLabel False "text" +optionalTextArea name' displayLabel = formArea name' displayLabel False "text" Nothing +optionalTextArea' :: Text -> Text -> Maybe Text -> Html +optionalTextArea' name' displayLabel = formArea name' displayLabel False "text" + requiredEmailInput :: Text -> Text -> Html -requiredEmailInput name' displayLabel = formInput name' displayLabel True "email" +requiredEmailInput name' displayLabel = formInput name' displayLabel True "email" Nothing requiredPasswordInput :: Text -> Text -> Html -requiredPasswordInput name' displayLabel = formInput name' displayLabel True "password" +requiredPasswordInput name' displayLabel = formInput name' displayLabel True "password" Nothing -formInput :: Text -> Text -> Bool -> AttributeValue -> Html -formInput name' displayLabel isRequired type' = do +formInput :: Text -> Text -> Bool -> AttributeValue -> Maybe Text -> Html +formInput name' displayLabel isRequired type' content' = do H.div ! class_ "flex direction-column gap-medium margin-top-small" $ do H.div $ do H.label ! A.for name'' $ fromString . T.unpack $ displayLabel mapM_ (H.span ! class_ "color-error") (if isRequired then Just "*" else Nothing) - H.input ! class_ "" !? (isRequired, required "") ! A.name name'' ! A.id name'' ! type_ type' + H.input ! class_ "" !? (isRequired, required "") ! A.name name'' ! A.id name'' ! type_ type' ! A.value (fromString . T.unpack $ fromMaybe "" content') where name'' = fromString . T.unpack $ name' -formArea :: Text -> Text -> Bool -> AttributeValue -> Html -formArea name' displayLabel isRequired type' = do +formArea :: Text -> Text -> Bool -> AttributeValue -> Maybe Text -> Html +formArea name' displayLabel isRequired type' content' = do H.div ! class_ "flex direction-column gap-medium margin-top-small" $ do H.div $ do H.label ! A.for name'' $ fromString . T.unpack $ displayLabel mapM_ (H.span ! class_ "color-error") (if isRequired then Just "*" else Nothing) - H.textarea ! class_ "" !? (isRequired, required "") ! A.name name'' ! A.id name'' ! type_ type' $ "" + H.textarea ! class_ "" !? (isRequired, required "") ! A.name name'' ! A.id name'' ! type_ type' $ (fromString . T.unpack $ fromMaybe "" content') where name'' = fromString . T.unpack $ name' @@ -92,7 +108,7 @@ submitButton language = button ! A.class_ "background-success border-success align-self-flex-end" ! type_ "submit" $ do H.span "✓" - text $ dictionary ^. #forms % #submit |##| language + text $ (^. #forms % #submit) |##| language postForm :: Text -> Html -> Html postForm action' = diff --git a/src/WikiMusic/SSR/View/Components/Other.hs b/src/WikiMusic/SSR/View/Components/Other.hs --- a/src/WikiMusic/SSR/View/Components/Other.hs +++ b/src/WikiMusic/SSR/View/Components/Other.hs @@ -8,6 +8,7 @@ simpleEntityCard, imageCarousel, warningBanner, + simpleIcon, entityDetails, ) where @@ -99,9 +100,9 @@ $ entity ^. #displayName detailList $ do - detailListEntry (dictionary ^. #more % #likes |##| language) (text $ likeCount entity) - detailListEntry (dictionary ^. #more % #dislikes |##| language) (text $ dislikeCount entity) - detailListEntry (dictionary ^. #more % #views |##| language) (text $ T.pack . show $ entity ^. #viewCount) + detailListEntry ((^. #more % #likes) |##| language) (text $ likeCount entity) + detailListEntry ((^. #more % #dislikes) |##| language) (text $ dislikeCount entity) + detailListEntry ((^. #more % #views) |##| language) (text $ T.pack . show $ entity ^. #viewCount) where artworks = Relude.map (\x -> x ^. #artwork) (Map.elems $ entity ^. #artworks) :: [Artwork] maybeImg = maybe (H.span "") (toImg . Relude.head) (nonEmpty artworks) @@ -113,7 +114,7 @@ ! src (fromString . T.unpack $ x ^. #contentUrl) imageCarousel :: [Artwork] -> Html -imageCarousel artworks = do +imageCarousel artworks = section ! class_ "slider" $ do mapM_ ( \x -> @@ -124,7 +125,7 @@ artworks entityDetailsSkeleton :: Html -> Html -> Html -entityDetailsSkeleton slot0 slot1 = do +entityDetailsSkeleton slot0 slot1 = H.div ! class_ "flex direction-row justify-content-space-evenly" $ do H.div ! class_ "col" $ do slot0 @@ -175,7 +176,7 @@ Text -> s -> Html -entityDetails language path x = do +entityDetails language path x = entityDetailsSkeleton slot0 slot1 where verboseLink' uri = a ! href (fromString . T.unpack $ uri) $ text uri @@ -195,15 +196,15 @@ (x ^. #soundcloudUrl) slot0 = do imageCarousel (Relude.map (^. #artwork) (Map.elems $ x ^. #artworks)) - H.div ! class_ "" $ do + H.div ! class_ "flex direction-row" $ do a ! href (fromString ("/" <> path' <> "/edit/" <> show (x ^. #identifier))) $ button - $ text (dictionary ^. #buttons % #edit |##| language) + $ text ((^. #buttons % #edit) |##| language) a ! href (fromString ("/" <> path' <> "/delete/" <> show (x ^. #identifier))) $ button - $ text (dictionary ^. #buttons % #delete |##| language) + $ text ((^. #buttons % #delete) |##| language) mapM_ (p . text) (x ^. #description) slot1 = do @@ -213,19 +214,19 @@ postForm' (fromString ("/" <> path' <> "/like/" <> show (x ^. #identifier))) "" $ do button ! type_ "submit" $ do H.span "+" - text (dictionary ^. #buttons % #like |##| language) + text ((^. #buttons % #like) |##| language) postForm' (fromString ("/" <> path' <> "/dislike/" <> show (x ^. #identifier))) "" $ do button ! type_ "submit" $ do H.span "-" - text (dictionary ^. #buttons % #dislike |##| language) + text ((^. #buttons % #dislike) |##| language) section $ detailList $ do - detailListEntry (dictionary ^. #more % #views |##| language) (Relude.show $ x ^. #viewCount) - detailListEntry (dictionary ^. #more % #createdAt |##| language) (Relude.show $ x ^. #createdAt) + detailListEntry ((^. #more % #views) |##| language) (Relude.show $ x ^. #viewCount) + detailListEntry ((^. #more % #createdAt) |##| language) (Relude.show $ x ^. #createdAt) mapM_ - (detailListEntry (dictionary ^. #more % #lastEditedAt |##| language)) + (detailListEntry ((^. #more % #lastEditedAt) |##| language)) (Relude.show <$> x ^. #lastEditedAt) - detailListEntry (dictionary ^. #more % #createdBy |##| language) (Relude.show $ x ^. #createdBy) + detailListEntry ((^. #more % #createdBy) |##| language) (Relude.show $ x ^. #createdBy) hr entityLinks @@ -236,4 +237,10 @@ small ! class_ "warning-text" $ text - (dictionary ^. #more % #warningHeavyDevelopment |##| language) + ((^. #more % #warningHeavyDevelopment) |##| language) + +simpleIcon :: Text -> Text -> Html +simpleIcon x txt = + H.span $ do + H.span ! class_ "margin-medium" $ (fromString . T.unpack $ x) + H.span (fromString . T.unpack $ txt) diff --git a/src/WikiMusic/SSR/View/Components/PageTop.hs b/src/WikiMusic/SSR/View/Components/PageTop.hs --- a/src/WikiMusic/SSR/View/Components/PageTop.hs +++ b/src/WikiMusic/SSR/View/Components/PageTop.hs @@ -24,10 +24,10 @@ ! href "/songs" $ h1 ! class_ "italic font-size-xxx-large font-weight-300" - $ text (dictionary ^. #titles % #wikimusicSSR |##| language) + $ text ((^. #titles % #wikimusicSSR) |##| language) em ! class_ "margin-top-large font-size-large font-weight-300" - $ text (dictionary ^. #slogans % #pageTop |##| language) + $ text ((^. #slogans % #pageTop) |##| language) section ! class_ "flex direction-row justify-content-center gap-small" $ do H.div @@ -43,8 +43,8 @@ noscript $ button ! type_ "submit" $ "submit" H.div $ H.form ! action "/user-preferences/dark-mode" ! method "POST" ! enctype "multipart/form-data" $ do select ! onchange "this.form.submit()" ! type_ "checkbox" ! name "dark-mode" ! A.id "dark-mode" $ do - option !? ((mode ^. #value) == "dark", selected "true") ! value "dark" $ "☾ dark mode" - option !? ((mode ^. #value) == "light", selected "true") ! value "light" $ "☼ light mode" + option !? ((mode ^. #value) == "dark", selected "true") ! value "dark" $ simpleIcon "🌙" "dark mode" + option !? ((mode ^. #value) == "light", selected "true") ! value "light" $ simpleIcon "☀️" "light mode" noscript $ button ! type_ "submit" $ "submit" H.div $ H.form ! action "/user-preferences/palette" ! method "POST" ! enctype "multipart/form-data" $ do select ! onchange "this.form.submit()" ! type_ "checkbox" ! name "palette" ! A.id "palette" $ do @@ -60,8 +60,8 @@ myNav language = do hr nav $ ol $ do - li $ a ! class_ "nav-link scale-on-hover" ! href "/songs" $ text (dictionary ^. #more % #songsNav |##| language) - li $ a ! class_ "nav-link scale-on-hover" ! href "/artists" $ text (dictionary ^. #more % #artistsNav |##| language) - li $ a ! class_ "nav-link scale-on-hover" ! href "/genres" $ text (dictionary ^. #more % #genresNav |##| language) - li $ a ! class_ "nav-link scale-on-hover" ! href "/login" $ text (dictionary ^. #more % #loginNav |##| language) + li $ a ! class_ "nav-link scale-on-hover" ! href "/songs" $ text ((^. #more % #songsNav) |##| language) + li $ a ! class_ "nav-link scale-on-hover" ! href "/artists" $ text ((^. #more % #artistsNav) |##| language) + li $ a ! class_ "nav-link scale-on-hover" ! href "/genres" $ text ((^. #more % #genresNav) |##| language) + li $ a ! class_ "nav-link scale-on-hover" ! href "/login" $ text ((^. #more % #loginNav) |##| language) hr diff --git a/src/WikiMusic/SSR/View/GenreHtml.hs b/src/WikiMusic/SSR/View/GenreHtml.hs --- a/src/WikiMusic/SSR/View/GenreHtml.hs +++ b/src/WikiMusic/SSR/View/GenreHtml.hs @@ -6,6 +6,7 @@ ( genreListPage', genreDetailPage', genreCreatePage', + genreEditPage' ) where @@ -26,11 +27,11 @@ genreListPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> SortOrder -> GetGenresQueryResponse -> m Html genreListPage' env mode language palette sortOrder xs = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #genresPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #genresPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do - sharedPageTop (Just $ dictionary ^. #titles % #genresPage |##| language) mode language palette + sharedPageTop (Just $ (^. #titles % #genresPage) |##| language) mode language palette section ! class_ "flex direction-row justify-content-center gap-small align-items-baseline" $ do H.a ! href "/genres/create" $ button $ H.small "+ new genre" mkSortingForm language sortOrder "/user-preferences/genre-sorting" "genre-sorting" @@ -43,7 +44,7 @@ genreDetailPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Genre -> m Html genreDetailPage' env mode language palette x = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #genresPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #genresPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -52,7 +53,7 @@ genreCreatePage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> m Html genreCreatePage' env mode language palette = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #genresPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #genresPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -66,4 +67,23 @@ optionalTextInput "youtubeUrl" "youtube URL" optionalTextInput "wikipediaUrl" "wikipedia URL" optionalTextInput "soundcloudUrl" "soundcloud URL" + submitButton language + +genreEditPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Genre -> m Html +genreEditPage' env mode language palette genre = do + sharedHead <- mkSharedHead env mode palette ((^. #titles % #genresPage) |##| language) + pure $ H.html $ do + sharedHead + body $ section $ do + sharedPageTop Nothing mode language palette + section $ do + H.h2 "Edit genre" + postForm "/genres/edit" $ do + requiredTextInput' "displayName" "genre name" (Just $ genre ^. #displayName) + optionalTextArea' "description" "description" (genre ^. #description) + optionalTextInput' "spotifyUrl" "spotify URL" (genre ^. #spotifyUrl) + optionalTextInput' "youtubeUrl" "youtube URL" (genre ^. #youtubeUrl) + optionalTextInput' "wikipediaUrl" "wikipedia URL" (genre ^. #wikipediaUrl) + optionalTextInput' "soundcloudUrl" "soundcloud URL" (genre ^. #soundcloudUrl) + submitButton language diff --git a/src/WikiMusic/SSR/View/Html.hs b/src/WikiMusic/SSR/View/Html.hs --- a/src/WikiMusic/SSR/View/Html.hs +++ b/src/WikiMusic/SSR/View/Html.hs @@ -25,24 +25,33 @@ import Prelude qualified instance Exec View where + -- artists execAlgebra (ArtistListPage env mode sortOrder l palette r next) = next =<< artistListPage' env mode sortOrder l palette r execAlgebra (ArtistDetailPage env mode language palette r next) = next =<< artistDetailPage' env mode language palette (Prelude.head . Map.elems $ r ^. #artists) execAlgebra (ArtistCreatePage env mode language palette next) = next =<< artistCreatePage' env mode language palette + execAlgebra (ArtistEditPage env mode language palette artist next) = + next =<< artistEditPage' env mode language palette artist + -- genres execAlgebra (GenreListPage env mode sortOrder l palette r next) = next =<< genreListPage' env mode sortOrder l palette r execAlgebra (GenreDetailPage env mode language palette r next) = next =<< genreDetailPage' env mode language palette (Prelude.head . Map.elems $ r ^. #genres) execAlgebra (GenreCreatePage env mode language palette next) = next =<< genreCreatePage' env mode language palette + execAlgebra (GenreEditPage env mode language palette genre next) = + next =<< genreEditPage' env mode language palette genre + -- songs execAlgebra (SongListPage env mode sortOrder language palette r next) = next =<< songListPage' env mode sortOrder language palette r execAlgebra (SongDetailPage env mode language palette songAsciiSize r next) = next =<< songDetailPage' env mode language palette songAsciiSize (Prelude.head . Map.elems $ r ^. #songs) execAlgebra (SongCreatePage env mode language palette next) = next =<< songCreatePage' env mode language palette + execAlgebra (SongEditPage env mode language palette song next) = + next =<< songEditPage' env mode language palette song execAlgebra (ErrorPage env mode language palette message next) = next =<< errorPage' env mode language palette message execAlgebra (LoginPage env mode language palette next) = @@ -50,11 +59,11 @@ errorPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Text -> m Html errorPage' env mode language palette message = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #errorOccurred |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #errorOccurred) |##| language) pure $ H.html $ do sharedHead body $ section $ do - sharedPageTop (Just $ dictionary ^. #titles % #errorOccurred |##| language) mode language palette + sharedPageTop (Just $ (^. #titles % #errorOccurred) |##| language) mode language palette h3 . text $ messageCauses H.pre ! class_ "font-size-small" $ text message where @@ -64,12 +73,12 @@ loginPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> m Html loginPage' env mode language palette = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #login |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #login) |##| language) pure $ H.html $ do sharedHead body $ section $ do - sharedPageTop (Just $ dictionary ^. #titles % #login |##| language) mode language palette + sharedPageTop (Just $ (^. #titles % #login) |##| language) mode language palette section $ postForm "/login" $ do - requiredEmailInput "email" (dictionary ^. #forms % #email |##| language) - requiredPasswordInput "password" (dictionary ^. #forms % #password |##| language) + requiredEmailInput "email" ((^. #forms % #email) |##| language) + requiredPasswordInput "password" ((^. #forms % #password) |##| language) submitButton language diff --git a/src/WikiMusic/SSR/View/SongHtml.hs b/src/WikiMusic/SSR/View/SongHtml.hs --- a/src/WikiMusic/SSR/View/SongHtml.hs +++ b/src/WikiMusic/SSR/View/SongHtml.hs @@ -6,6 +6,7 @@ ( songListPage', songDetailPage', songCreatePage', + songEditPage' ) where @@ -29,11 +30,11 @@ songListPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> SortOrder -> GetSongsQueryResponse -> m Html songListPage' env mode language palette sortOrder xs = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #songsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #songsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do - sharedPageTop (Just $ dictionary ^. #titles % #songsPage |##| language) mode language palette + sharedPageTop (Just $ (^. #titles % #songsPage) |##| language) mode language palette section ! class_ "flex direction-row justify-content-center gap-small align-items-baseline" $ do H.a ! href "/songs/create" $ button $ H.small "+ new song" mkSortingForm language sortOrder "/user-preferences/song-sorting" "song-sorting" @@ -46,7 +47,7 @@ songDetailPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> SongAsciiSize -> Song -> m Html songDetailPage' env mode language palette songAsciiSize x = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #songsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #songsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -72,19 +73,19 @@ songDetails language x = do section $ detailList $ do mapM_ - (detailListEntry (dictionary ^. #more % #musicTuning |##| language) . text) + (detailListEntry ((^. #more % #musicTuning) |##| language) . text) (x ^. #musicTuning) mapM_ - (detailListEntry (dictionary ^. #more % #musicKey |##| language) . text) + (detailListEntry ((^. #more % #musicKey) |##| language) . text) (x ^. #musicKey) mapM_ - (detailListEntry (dictionary ^. #more % #musicCreationDate |##| language) . text) + (detailListEntry ((^. #more % #musicCreationDate) |##| language) . text) (x ^. #musicCreationDate) mapM_ - (detailListEntry (dictionary ^. #more % #albumName |##| language) . text) + (detailListEntry ((^. #more % #albumName) |##| language) . text) (x ^. #albumName) mapM_ - (detailListEntry (dictionary ^. #more % #albumInfoLink |##| language) . text) + (detailListEntry ((^. #more % #albumInfoLink) |##| language) . text) (x ^. #albumInfoLink) mkVersion :: Language -> SongAsciiSize -> SongContent -> Html @@ -94,10 +95,10 @@ detailList $ do mapM_ - (detailListEntry (dictionary ^. #more % #lastEditedAt |##| language)) + (detailListEntry ((^. #more % #lastEditedAt) |##| language)) (Relude.show <$> v ^. #lastEditedAt) - detailListEntry (dictionary ^. #more % #createdAt |##| language) (Relude.show $ v ^. #createdAt) - detailListEntry (dictionary ^. #more % #createdBy |##| language) (Relude.show $ v ^. #createdBy) + detailListEntry ((^. #more % #createdAt) |##| language) (Relude.show $ v ^. #createdAt) + detailListEntry ((^. #more % #createdBy) |##| language) (Relude.show $ v ^. #createdBy) mapM_ ( \asciiLegend -> details ! open "" $ do @@ -114,7 +115,7 @@ songCreatePage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> m Html songCreatePage' env mode language palette = do - sharedHead <- mkSharedHead env mode palette (dictionary ^. #titles % #songsPage |##| language) + sharedHead <- mkSharedHead env mode palette ((^. #titles % #songsPage) |##| language) pure $ H.html $ do sharedHead body $ section $ do @@ -133,4 +134,27 @@ optionalTextInput "musicCreationDate" "date composed" optionalTextInput "albumName" "album name" optionalTextInput "albumInfoLink" "about the album" + submitButton language + +songEditPage' :: (MonadIO m) => Env -> UiMode -> Language -> Palette -> Song -> m Html +songEditPage' env mode language palette song = do + sharedHead <- mkSharedHead env mode palette ((^. #titles % #songsPage) |##| language) + pure $ H.html $ do + sharedHead + body $ section $ do + sharedPageTop Nothing mode language palette + section $ do + H.h2 "Edit song" + postForm "/songs/edit" $ do + requiredTextInput' "displayName" "song name" (Just $ song ^. #displayName) + optionalTextArea' "description" "description" (song ^. #description) + optionalTextInput' "spotifyUrl" "spotify URL" (song ^. #spotifyUrl) + optionalTextInput' "youtubeUrl" "youtube URL" (song ^. #youtubeUrl) + optionalTextInput' "wikipediaUrl" "wikipedia URL" (song ^. #wikipediaUrl) + optionalTextInput' "soundcloudUrl" "soundcloud URL" (song ^. #soundcloudUrl) + optionalTextInput' "musicKey" "music key" (song ^. #musicKey) + optionalTextInput' "musicTuning" "tuning" (song ^. #musicTuning) + optionalTextInput' "musicCreationDate" "date composed" (song ^. #musicCreationDate) + optionalTextInput' "albumName" "album name" (song ^. #albumName) + optionalTextInput' "albumInfoLink" "about the album" (song ^. #albumInfoLink) submitButton language diff --git a/wikimusic-ssr.cabal b/wikimusic-ssr.cabal --- a/wikimusic-ssr.cabal +++ b/wikimusic-ssr.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: wikimusic-ssr -version: 0.6.0.0 +version: 0.6.0.1 description: Please see the README at homepage: https://gitlab.com/jjba-projects/wikimusic-ssr bug-reports: https://gitlab.com/jjba-projects/wikimusic-ssr/-/issues @@ -10,6 +10,7 @@ copyright: 2023 Josep Bigorra license: GPL-3 build-type: Simple +license-file: COPYING extra-source-files: README.org