From fcd6d1e03436b7afc04c962c1dbfe434bfdc9475 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Fri, 30 Aug 2019 14:07:12 +0200 Subject: [PATCH 01/11] remove ring plugin --- project.clj | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/project.clj b/project.clj index f46a7ee..8284aca 100644 --- a/project.clj +++ b/project.clj @@ -31,21 +31,9 @@ [markdown-clj "1.10.0"] [dorothy "0.0.7"]] - :profiles {:dev {:dependencies [;; webserver stuff - [javax.servlet/servlet-api "2.5"] - [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.7.1" - :exclusions [ring/ring-core - ring/ring-codec - commons-io - commons-codec]]] - :plugins [;; neo4j db + :profiles {:dev {:plugins [;; neo4j db [joshavg/lein-neo4j "0.5.0"] - ;; webserver stuff - [lein-less "1.7.5"] - [lein-ring "0.12.5"] - ;; code quality [lein-ancient "LATEST"] [jonase/eastwood "LATEST"] @@ -58,8 +46,6 @@ :neo4j {:path "neo4j"} :repl-options {:init-ns wanijo.infrastructure.repl} - :ring {:handler wanijo.handler/app - :nrepl {:start? true}} :less {:source-paths ["resources/app/stylesheets"] :target-path "resources/public/css"} :aliases {"uberjar" ["do" ["less" "once"] "uberjar"]} From 94cd4cdcc25ab2459966ac27f2de72fd552e262b Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Fri, 30 Aug 2019 16:12:41 +0200 Subject: [PATCH 02/11] something for people to read --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..401a1a7 --- /dev/null +++ b/README.md @@ -0,0 +1,39 @@ +# Wanijo + +> (Toki Pona) +> Wan: One, a, unite, make one +> Ijo: thing, something, object +> Wanijo: Unite things + +## How to develop + +You'll need: + +- JDK >= 8 +- Leiningen >= 2.9 + +### First time launch with fresh database + +- start a neo4j database with `lein neo4j` +- start a repl with `lein repl` or similar +- import `wanijo.infrastructure.repl` + - if you use leiningen for launching the repl, this will be your init-ns +- run `wanijo.infrastructure.repl/create-user!` using the desired username and password as parameters +- run `wanijo.infrastructure.repl/run-migrations!` to create desireable database constraints and structures + +### Launch the application server + +- start a repl +- import `wanijo.main` +- run `wanijo.main/start-server-dev!` + - the application is available on port `8080` + +### "Architecture" + +> Structure your application as it seems to fit your needs. Then call it architecture and pat yourself on the shoulder. You've achieved something! + +The first level of structure are the building blocks of the domain, e.g. `instance`, `schema`. Inside these namespaces you'll find namespaces for each technical need: routing, database access, domain rules etc. + +`wanijo.handler` collects all routes and passes them to ring. + +`wanijo.infrastructure` contains the namespaces needed for technical code that do not belong to any domain, like database access, routing or similars. From 61d69d36e2855ba9422f16327d339a5925d46a46 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Fri, 30 Aug 2019 16:26:57 +0200 Subject: [PATCH 03/11] add license --- LICENSE | 675 ++++++++++++++++++++++++++++++++++++++++++++++++++++ project.clj | 4 +- 2 files changed, 678 insertions(+), 1 deletion(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..53d1f3d --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + 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/project.clj b/project.clj index 8284aca..5061e42 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,9 @@ (defproject wanijo "0.3.0" :description "Graph Database via UI" :url "https://gitea.heevyis.ninja/josha/wanijo" - :min-lein-version "2.0.0" + :min-lein-version "2.9.0" + :license {:name "GPL-3.0" + :url "https://opensource.org/licenses/GPL-3.0"} :dependencies [;;clojure core [org.clojure/clojure "1.10.1"] From b535880c1da7d3df46a7c0b45c19133e515a0958 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Thu, 5 Sep 2019 13:25:34 +0200 Subject: [PATCH 04/11] re-add less --- project.clj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project.clj b/project.clj index 5061e42..d727d33 100644 --- a/project.clj +++ b/project.clj @@ -36,6 +36,9 @@ :profiles {:dev {:plugins [;; neo4j db [joshavg/lein-neo4j "0.5.0"] + ;; web stuff + [lein-less "1.7.5"] + ;; code quality [lein-ancient "LATEST"] [jonase/eastwood "LATEST"] From 81a33bb68f25f40c4935567dbad3df212dcb1542 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Thu, 5 Sep 2019 14:44:47 +0200 Subject: [PATCH 05/11] naming conventions regarding side effects --- src/wanijo/attribute/routes.clj | 2 +- src/wanijo/handler.clj | 4 +-- src/wanijo/home/view.clj | 2 +- src/wanijo/infrastructure/auth.clj | 2 +- src/wanijo/infrastructure/view.clj | 2 +- src/wanijo/instance/routes.clj | 2 +- src/wanijo/instance/view/edit.clj | 2 +- src/wanijo/instance/view/instances.clj | 2 +- src/wanijo/instance/view/link_selection.clj | 2 +- src/wanijo/instance/view/show.clj | 2 +- src/wanijo/instance/view/starred.clj | 2 +- src/wanijo/schema/middleware.clj | 32 ++++++++++----------- src/wanijo/schema/routes.clj | 4 +-- src/wanijo/schema/view.clj | 4 +-- src/wanijo/user/view.clj | 2 +- src/wanijo/visualisation/routes.clj | 2 +- src/wanijo/visualisation/view.clj | 2 +- 17 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/wanijo/attribute/routes.clj b/src/wanijo/attribute/routes.clj index 5b7489c..976f779 100644 --- a/src/wanijo/attribute/routes.clj +++ b/src/wanijo/attribute/routes.clj @@ -33,7 +33,7 @@ (resp/redirect (path :schema-show {:uuid (get-in req [:params :schema])}))) (defn wrap-allowed-to-write [] - (schema-middleware/write-permission-middleware + (schema-middleware/write-permission-middleware! #(or (get-in % [:params :schema]) (get-in % [:route-params :schema]) (-> (get-in % [:route-params :uuid]) diff --git a/src/wanijo/handler.clj b/src/wanijo/handler.clj index a60cbef..0dbb64e 100644 --- a/src/wanijo/handler.clj +++ b/src/wanijo/handler.clj @@ -42,7 +42,7 @@ (def standalone-app (-> app-routes - schema-middleware/wrap-user-schemas + schema-middleware/wrap-user-schemas! ring-json/wrap-json-response (wrap-defaults site-defaults))) @@ -55,7 +55,7 @@ (-> app-routes wrap-spec-asserts devmode/wrap-devmode - schema-middleware/wrap-user-schemas + schema-middleware/wrap-user-schemas! ring-json/wrap-json-response (wrap-defaults (assoc-in site-defaults diff --git a/src/wanijo/home/view.clj b/src/wanijo/home/view.clj index 31c28d4..171019f 100644 --- a/src/wanijo/home/view.clj +++ b/src/wanijo/home/view.clj @@ -2,4 +2,4 @@ (:require [wanijo.infrastructure.view :as view])) (defn root! [req] - (view/layout! :session (:session req))) + (view/layout :session (:session req))) diff --git a/src/wanijo/infrastructure/auth.clj b/src/wanijo/infrastructure/auth.clj index ec7fd6b..8369057 100644 --- a/src/wanijo/infrastructure/auth.clj +++ b/src/wanijo/infrastructure/auth.clj @@ -21,7 +21,7 @@ :flash :invalid-credentials)))) (defn login! [req] - (view/layout! + (view/layout :content [[:h1 "Login"] (hform/form-to diff --git a/src/wanijo/infrastructure/view.clj b/src/wanijo/infrastructure/view.clj index c2a289e..73399ae 100644 --- a/src/wanijo/infrastructure/view.clj +++ b/src/wanijo/infrastructure/view.clj @@ -23,7 +23,7 @@ [:h2.flash__heading--error "Warning"] content]) -(defn layout! +(defn layout [& {:keys [content title session diff --git a/src/wanijo/instance/routes.clj b/src/wanijo/instance/routes.clj index ce47b09..f7a994b 100644 --- a/src/wanijo/instance/routes.clj +++ b/src/wanijo/instance/routes.clj @@ -127,7 +127,7 @@ (GET (register! :instance-list "/instance/list/:schema-uuid") [schema-uuid :as req] (list! schema-uuid req)) - (middleware-schema/wrap-allowed-to-read + (middleware-schema/wrap-allowed-to-read! #(get-in % [:params :schema-uuid]))) (POST (register! :instance-new "/instance/new") [] new!) diff --git a/src/wanijo/instance/view/edit.clj b/src/wanijo/instance/view/edit.clj index 4405d27..874811c 100644 --- a/src/wanijo/instance/view/edit.clj +++ b/src/wanijo/instance/view/edit.clj @@ -9,7 +9,7 @@ [formulare.core :as form])) (defn edit [instance form form-data schemas req] - (view/layout! + (view/layout :request req :content [[:h1 diff --git a/src/wanijo/instance/view/instances.clj b/src/wanijo/instance/view/instances.clj index c8e4fda..aa7390b 100644 --- a/src/wanijo/instance/view/instances.clj +++ b/src/wanijo/instance/view/instances.clj @@ -8,7 +8,7 @@ [wanijo.infrastructure.time :refer [prettify-dt]])) (defn instances [schema instances new-form req] - (view/layout! + (view/layout :request req :content [[:h1 "All Instances of schema " diff --git a/src/wanijo/instance/view/link_selection.clj b/src/wanijo/instance/view/link_selection.clj index ccdf25f..3b845f2 100644 --- a/src/wanijo/instance/view/link_selection.clj +++ b/src/wanijo/instance/view/link_selection.clj @@ -6,7 +6,7 @@ [formulare.core :as form])) (defn link-selection [instance schema form req] - (view/layout! + (view/layout :request req :content [[:h1 diff --git a/src/wanijo/instance/view/show.clj b/src/wanijo/instance/view/show.clj index 2f4a29a..585db9e 100644 --- a/src/wanijo/instance/view/show.clj +++ b/src/wanijo/instance/view/show.clj @@ -11,7 +11,7 @@ [wanijo.visualisation.viz :as viz])) (defn show [instance schemas req] - (view/layout! + (view/layout :request req :content [[:h1 diff --git a/src/wanijo/instance/view/starred.clj b/src/wanijo/instance/view/starred.clj index cedc18c..dbe8e42 100644 --- a/src/wanijo/instance/view/starred.clj +++ b/src/wanijo/instance/view/starred.clj @@ -5,7 +5,7 @@ [wanijo.infrastructure.time :refer [prettify-dt]])) (defn starred [instances req] - (view/layout! + (view/layout :request req :content [[:h1 "Starred instances"] diff --git a/src/wanijo/schema/middleware.clj b/src/wanijo/schema/middleware.clj index e571007..c1f4610 100644 --- a/src/wanijo/schema/middleware.clj +++ b/src/wanijo/schema/middleware.clj @@ -1,41 +1,39 @@ (ns wanijo.schema.middleware (:require [ring.util.response :as resp] [wanijo.infrastructure.routing :refer [path]] - [wanijo.schema.db :as domain])) + [wanijo.schema.db :as db])) -(defn wrap-user-schemas [handler] +(defn wrap-user-schemas! [handler] (fn [req] (if-let [uuid (get-in req [:session :uuid])] (handler (assoc-in req [:session :schemas] - (domain/accessible-schemas! uuid))) + (db/accessible-schemas! uuid))) (handler req)))) -(defn write-permission-middleware [schema-fn] +(defn write-permission-middleware! [schema-fn] (fn [handler] (fn [req] - (let [uuid (schema-fn req) - check-fn domain/has-user-write-permissions?] - (if (check-fn uuid (get-in req [:session :uuid])) + (let [uuid (schema-fn req)] + (if (db/has-user-write-permissions? uuid (-> req :session :uuid)) (handler req) (assoc (resp/redirect (path :schema-show {:uuid uuid})) :flash ["No write permission for schema"])))))) -(defn wrap-allowed-to-write [] - (write-permission-middleware #(get-in % [:params :uuid]))) +(defn wrap-allowed-to-write! [] + (write-permission-middleware! #(get-in % [:params :uuid]))) -(defn wrap-allowed-to-read +(defn wrap-allowed-to-read! ([schema-fn] - (wrap-allowed-to-read schema-fn - (fn [_] - (assoc (resp/redirect (path :schema-overview)) - :flash ["No read permission for schema"])))) + (wrap-allowed-to-read! schema-fn + (fn [_] + (assoc (resp/redirect (path :schema-overview)) + :flash ["No read permission for schema"])))) ([schema-fn not-allowed-fn] (fn [handler] (fn [req] - (let [uuid (schema-fn req) - check-fn domain/has-user-read-permissions?] - (if (check-fn uuid (get-in req [:session :uuid])) + (let [uuid (schema-fn req)] + (if (db/has-user-read-permissions? uuid (-> req :session :uuid)) (handler req) (not-allowed-fn req))))))) diff --git a/src/wanijo/schema/routes.clj b/src/wanijo/schema/routes.clj index e1dcb65..3ccf066 100644 --- a/src/wanijo/schema/routes.clj +++ b/src/wanijo/schema/routes.clj @@ -86,7 +86,7 @@ (POST (register! :schema-new "/schema/new") [] new!) (comp/wrap-routes read-routes - (middleware/wrap-allowed-to-read + (middleware/wrap-allowed-to-read! #(get-in % [:route-params :uuid]))) (comp/wrap-routes write-routes - (middleware/wrap-allowed-to-write))) + (middleware/wrap-allowed-to-write!))) diff --git a/src/wanijo/schema/view.clj b/src/wanijo/schema/view.clj index 5e8b8d7..695e842 100644 --- a/src/wanijo/schema/view.clj +++ b/src/wanijo/schema/view.clj @@ -14,7 +14,7 @@ (let [session (:session req) uuid (:uuid session) schemas (domain/all-created-by! uuid)] - (view/layout! + (view/layout :request req :content [[:h1 "All schemas"] @@ -37,7 +37,7 @@ (hform/submit-button "Create"))]))) (defn show-schema! [schema attrs assign-form conn-form req] - (view/layout! + (view/layout :request req :content [[:h1 "Schema " diff --git a/src/wanijo/user/view.clj b/src/wanijo/user/view.clj index accf0ff..253596d 100644 --- a/src/wanijo/user/view.clj +++ b/src/wanijo/user/view.clj @@ -12,7 +12,7 @@ :spec ::domain/ident}}}) (defn profile! [req user] - (view/layout! + (view/layout :session (:session req) :content [[:h1 "Hi, " (get-in req [:session :ident])] diff --git a/src/wanijo/visualisation/routes.clj b/src/wanijo/visualisation/routes.clj index 122e72b..0c71232 100644 --- a/src/wanijo/visualisation/routes.clj +++ b/src/wanijo/visualisation/routes.clj @@ -12,7 +12,7 @@ [view :as vis-view]])) (defn all-instances [req] - (view/layout! + (view/layout :request req :content [[:h1 "All Instances"] diff --git a/src/wanijo/visualisation/view.clj b/src/wanijo/visualisation/view.clj index f891ce0..73414cd 100644 --- a/src/wanijo/visualisation/view.clj +++ b/src/wanijo/visualisation/view.clj @@ -6,7 +6,7 @@ [wanijo.infrastructure.view :as view])) (defn index [instance req] - (view/layout! + (view/layout :request req :head (list (include-css "/css/vis-network.min.css") (include-js "/js/vis-network.min.js" From 0588e5173098b0370dfe3d7c73a77e3ef5de5545 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Mon, 9 Sep 2019 09:18:25 +0200 Subject: [PATCH 06/11] dependencies --- project.clj | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project.clj b/project.clj index d727d33..3370e61 100644 --- a/project.clj +++ b/project.clj @@ -20,6 +20,12 @@ [hiccup "1.0.5"] [joshavg/formulare "0.5.0-SNAPSHOT"] + ;; compojure uses old transitive dependencies of ring + ;; specifiy them here explicitly so newer versions + ;; will be used + [ring/ring-core "1.7.1"] + [ring/ring-codec "1.1.2"] + ;; neo4j [gorillalabs/neo4j-clj "2.0.1" :exclusions [org.bouncycastle/bcprov-jdk15on @@ -44,7 +50,7 @@ [jonase/eastwood "LATEST"] [lein-bikeshed "LATEST"] [lein-cloverage "LATEST"] - [cider/cider-nrepl "0.21.1"] + [cider/cider-nrepl "0.22.2"] [lein-kibit "LATEST"]]} :uberjar {:aot :all :main wanijo.main}} From e52de87cbb31ffcc60b1bad9cfacc2ed7f7cbd6e Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Tue, 15 Oct 2019 09:36:28 +0200 Subject: [PATCH 07/11] remove unused import --- src/wanijo/infrastructure/view.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wanijo/infrastructure/view.clj b/src/wanijo/infrastructure/view.clj index 73399ae..7d1ef53 100644 --- a/src/wanijo/infrastructure/view.clj +++ b/src/wanijo/infrastructure/view.clj @@ -1,7 +1,6 @@ (ns wanijo.infrastructure.view (:require [hiccup [page :refer [html5 include-js include-css]] - [form :as hform] [core :refer [h]]] [wanijo.infrastructure.routing :refer [path]])) From 723f7fd09b35437bca6d5b4619ee9378a6c2d9e5 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Tue, 15 Oct 2019 09:57:59 +0200 Subject: [PATCH 08/11] deleting schemas - again! --- src/wanijo/instance/view/show.clj | 78 ++++++++++++------------------- src/wanijo/main.clj | 5 +- src/wanijo/schema/db.clj | 8 ++-- 3 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/wanijo/instance/view/show.clj b/src/wanijo/instance/view/show.clj index 585db9e..a8dca0c 100644 --- a/src/wanijo/instance/view/show.clj +++ b/src/wanijo/instance/view/show.clj @@ -10,6 +10,32 @@ [markdown.core :as md] [wanijo.visualisation.viz :as viz])) +(defn links-table [heading direction instance] + [:section.links-in + [:h2 (h heading)] + [:table + [:thead + [:tr + [:th "Name"] + [:th "Instance"] + [:th "Schema"] + [:th "Created"]]] + [:tbody + (for [{:keys [link source schema target] :as row} (direction instance) + :let [name (:name link) + empty (empty? name) + name (if empty [:i "empty"] (h name)) + other (or source target)]] + [:tr + [:td name + (view-instance/tags-for-search row)] + [:td [:a {:href (path :instance-show other)} + (h (:name other))]] + [:td [:a {:href (path :instance-list + {:schema-uuid (:uuid schema)})} + (h (:name schema))]] + [:td (prettify-dt (:created_at link))]])]]]) + (defn show [instance schemas req] (view/layout :request req @@ -61,55 +87,9 @@ [:h2 "Visualisation"] [:p (viz/single-instance instance)]]) (when (seq (:links-out instance)) - [:section.links-out - [:h2 "Outgoing Links"] - [:table - [:thead - [:tr - [:th "Name"] - [:th "Instance"] - [:th "Schema"] - [:th "Created"]]] - [:tbody - (for [{:keys [link target schema] :as row} (:links-out instance) - :let [name (:name link) - empty (empty? name) - name (if empty [:i "empty"] (h name))]] - [:tr - [:td - name - (view-instance/tags-for-search row)] - [:td [:a {:href (path :instance-show target)} - (h (:name target))]] - [:td [:a {:href (path :instance-list - {:schema-uuid (:uuid schema)})} - (h (:name schema))]] - [:td (prettify-dt (:created_at link))]])]]]) + (links-table "Outgoing links" :links-out instance)) (when (seq (:links-in instance)) - [:section.links-in - [:h2 "Incoming Links"] - [:table - [:thead - [:tr - [:th "Name"] - [:th "Instance"] - [:th "Schema"] - [:th "Created"]]] - [:tbody - (for [{:keys [link source schema] :as row} (:links-in instance) - :let [name (:name link) - empty (empty? name) - name (if empty [:i "empty"] (h name))]] - [:tr - [:td - name - (view-instance/tags-for-search row)] - [:td [:a {:href (path :instance-show source)} - (h (:name source))]] - [:td [:a {:href (path :instance-list - {:schema-uuid (:uuid schema)})} - (h (:name schema))]] - [:td (prettify-dt (:created_at link))]])]]]) + (links-table "Incoming links" :links-in instance)) [:section.quick-edits [:h2 "Quick edits"] [:section.link-instance @@ -118,7 +98,7 @@ (for [schema schemas] [:li [:a {:href (path :instance-link-selection - {:uuid (:uuid instance) + {:uuid (:uuid instance) :schema-uuid (:uuid schema)})} (h (:name schema))]])]] [:section.tag-instance diff --git a/src/wanijo/main.clj b/src/wanijo/main.clj index b98dee8..0ae1a40 100644 --- a/src/wanijo/main.clj +++ b/src/wanijo/main.clj @@ -6,10 +6,9 @@ (defonce server (atom nil)) (defn start-server! - [& {:keys [port join? handler] + [& {:keys [port join?] :or {port 3080 - join? true - handler wanijo-handler/standalone-app}}] + join? true}}] (reset! server (run-jetty wanijo-handler/standalone-app {:port port diff --git a/src/wanijo/schema/db.clj b/src/wanijo/schema/db.clj index e8c4ca0..7515a2d 100644 --- a/src/wanijo/schema/db.clj +++ b/src/wanijo/schema/db.clj @@ -93,10 +93,10 @@ {:user_uuid user-uuid}))) (neo4j/defquery delete - "MATCH (s:schema) - WHERE s.uuid = {uuid} - OPTIONAL MATCH (s)--(a:attribute) - DELETE a + "MATCH (s:schema {uuid:{uuid}}) + WITH s + OPTIONAL MATCH (s)--(a:attribute)-[cb:created_by]-(:user) + DELETE cb, a WITH s MATCH (s)-[c]-() DELETE c, s") From 465ef3a75d56cd80e62675ceb666ed7751074a57 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Wed, 16 Oct 2019 14:45:36 +0200 Subject: [PATCH 09/11] bulk link creation - saving does not work yet --- resources/app/stylesheets/app.less | 9 ++ src/wanijo/instance/forms.clj | 14 +++ src/wanijo/instance/routes.clj | 86 ++++++++++++------- .../instance/view/bulk_link_selection.clj | 24 ++++++ src/wanijo/instance/view/link_selection.clj | 2 +- src/wanijo/instance/view/show.clj | 11 ++- 6 files changed, 111 insertions(+), 35 deletions(-) create mode 100644 src/wanijo/instance/view/bulk_link_selection.clj diff --git a/resources/app/stylesheets/app.less b/resources/app/stylesheets/app.less index 171048b..c58d3bc 100644 --- a/resources/app/stylesheets/app.less +++ b/resources/app/stylesheets/app.less @@ -108,6 +108,7 @@ img, svg { align-items: center; margin-top: 0; background-color: ThreeDShadow; + //noinspection CssUnknownTarget background-image: url("/img/logo-full-flipped.svg"); background-size: contain; background-position: right; @@ -203,6 +204,14 @@ form { grid-template-columns: 30% 70%; grid-auto-flow: row; + fieldset { + display: grid; + grid-column: 1 e("/") 3; + grid-template-columns: 30% 70%; + grid-auto-flow: row; + margin-bottom: @text-padding-h; + } + label, input, select, textarea, .flash { margin-bottom: .7rem; padding: @text-padding-v @text-padding-h / 2; diff --git a/src/wanijo/instance/forms.clj b/src/wanijo/instance/forms.clj index d98fc47..c1cbae0 100644 --- a/src/wanijo/instance/forms.clj +++ b/src/wanijo/instance/forms.clj @@ -17,6 +17,20 @@ (:uuid %)) instances)}}}) +(defn bulk-link-form [link-forms] + (map (fn [{:keys [schema form]}] + (let [name-field (keyword (str "name-" (:uuid schema))) + instances-field (keyword (str "instances-" (:uuid schema)))] + {:schema schema + :form (-> form + (assoc-in [:fields name-field] + (-> form :fields :name)) + (update :fields dissoc :name) + (assoc-in [:fields instances-field] + (-> form :fields :instances)) + (update :fields dissoc :instances))})) + link-forms)) + (defn attr-type->widget [attr-type] (case attr-type ("markdown" "text") :textarea diff --git a/src/wanijo/instance/routes.clj b/src/wanijo/instance/routes.clj index f7a994b..10a78b2 100644 --- a/src/wanijo/instance/routes.clj +++ b/src/wanijo/instance/routes.clj @@ -3,10 +3,13 @@ GET POST DELETE]] [ring.util.response :as resp] [formulare.core :as form] - [wanijo.instance.view.edit :refer [edit]] - [wanijo.instance.view.instances :refer [instances]] - [wanijo.instance.view.show :refer [show]] - [wanijo.instance.view.link-selection :refer [link-selection]] + [wanijo.instance.view + [edit :refer [edit]] + [instances :refer [instances]] + [show :refer [show]] + [link-selection :refer [link-selection]] + [bulk-link-selection :refer [bulk-link-selection]] + [starred :refer [starred]]] [wanijo.instance.view.starred :refer [starred]] [wanijo.instance.db :as domain] [wanijo.instance.forms :as forms-inst] @@ -16,13 +19,13 @@ [wanijo.infrastructure.routing :refer [register! path]] [wanijo.attribute.db :as db-attr])) -(defn list! [schema-uuid req] +(defn route-list! [schema-uuid req] (instances (domain-schema/find-by-uuid! schema-uuid) (domain/find-by-schema! schema-uuid) (forms-inst/with-attributes (db-attr/required! schema-uuid)) req)) -(defn new! [req] +(defn route-new! [req] (let [schema-uuid (get-in req [:params :schema-uuid]) user-uuid (get-in req [:session :uuid]) req-attrs (db-attr/required! schema-uuid) @@ -37,12 +40,12 @@ instance) (resp/redirect (path :instance-list (:params req)))) - (list! schema-uuid req)))) + (route-list! schema-uuid req)))) (defn instance! [uuid] (domain/full-instance-by-uuid! uuid)) -(defn show! [uuid req] +(defn route-show! [uuid req] (let [user-uuid (-> req :session :uuid) instance (assoc (instance! uuid) :starred @@ -55,7 +58,7 @@ (defn form! [attrs] (forms-inst/with-attributes attrs)) -(defn edit-form! [uuid req] +(defn route-edit-form! [uuid req] (let [instance (instance! uuid) attrs (db-attr/find-by-instance! uuid) user-uuid (get-in req [:session :uuid])] @@ -65,7 +68,7 @@ (domain-schema/accessible-schemas! user-uuid) req))) -(defn edit! [uuid req] +(defn route-edit! [uuid req] (let [attrs (db-attr/find-by-instance! uuid) form-def (form! attrs)] (if (form/valid? form-def req) @@ -74,9 +77,9 @@ instance (assoc form-instance :uuid uuid)] (domain/edit! instance) (resp/redirect (path :instance-show instance))) - (show! uuid req)))) + (route-show! uuid req)))) -(defn delete! [uuid] +(defn route-delete! [uuid] (let [schema (domain-schema/find-by-instance! uuid)] (domain/delete! uuid) (resp/redirect (path :instance-list @@ -86,13 +89,13 @@ (forms-inst/link-form (domain/find-by-schema! schema-uuid))) -(defn link-selection! [uuid schema-uuid req] +(defn route-link-selection! [uuid schema-uuid req] (link-selection (instance! uuid) (domain-schema/find-by-uuid! schema-uuid) (link-form! schema-uuid) req)) -(defn create-link! [uuid schema-uuid req] +(defn route-create-link! [uuid schema-uuid req] (let [form (link-form! schema-uuid)] (if (form/valid? form req) (let [form-data (form/form-data form req)] @@ -101,68 +104,89 @@ :to (:instances form-data) :by (get-in req [:session :uuid])}) (resp/redirect (path :instance-edit-form {:uuid uuid}))) - (link-selection! uuid schema-uuid req)))) + (route-link-selection! uuid schema-uuid req)))) -(defn delete-link! [uuid link-uuid] +(defn route-delete-link! [uuid link-uuid] (domain-link/delete! link-uuid) (resp/redirect (path :instance-edit-form {:uuid uuid}))) -(defn mark-starred! [uuid req] +(defn route-mark-starred! [uuid req] (domain/mark-starred! uuid (-> req :session :uuid)) (resp/redirect (path :instance-show {:uuid uuid}))) -(defn remove-starred! [uuid req] +(defn route-remove-starred! [uuid req] (domain/remove-starred! uuid (-> req :session :uuid)) (resp/redirect (path :instance-show {:uuid uuid}))) -(defn list-starred! [req] +(defn route-list-starred! [req] (starred (domain/starred-by-user! (-> req :session :uuid)) req)) +(defn route-bulk-link-selection! [uuid req] + (let [user-uuid (-> req :session :uuid)] + (bulk-link-selection (domain/full-instance-by-uuid! uuid) + (->> (domain-schema/accessible-schemas! + user-uuid) + (map (fn [schema] + {:form (link-form! (:uuid schema)) + :schema schema})) + (forms-inst/bulk-link-form)) + req))) + +(defn route-create-bulk-link! [uuid req] + (clojure.pprint/pprint req) + (resp/redirect (path :instance-show {:uuid uuid}))) + (defroutes routes (wrap-routes (GET (register! :instance-list "/instance/list/:schema-uuid") [schema-uuid :as req] - (list! schema-uuid req)) + (route-list! schema-uuid req)) (middleware-schema/wrap-allowed-to-read! #(get-in % [:params :schema-uuid]))) (POST (register! :instance-new "/instance/new") [] - new!) + route-new!) (GET (register! :instance-show "/instance/:uuid") [uuid :as req] - (show! uuid req)) + (route-show! uuid req)) (GET (register! :instance-edit-form "/instance/:uuid/edit") [uuid :as req] - (edit-form! uuid req)) + (route-edit-form! uuid req)) (POST (register! :instance-edit "/instance/:uuid") [uuid :as req] - (edit! uuid req)) + (route-edit! uuid req)) (DELETE (register! :instance-delete "/instance/:uuid") [uuid] - (delete! uuid)) + (route-delete! uuid)) (GET (register! :instance-link-selection "/instance/:uuid/link/:schema-uuid") [uuid schema-uuid :as req] - (link-selection! uuid schema-uuid req)) + (route-link-selection! uuid schema-uuid req)) (POST (register! :instance-link-create "/instance/:uuid/link/:schema-uuid") [uuid schema-uuid :as req] - (create-link! uuid schema-uuid req)) + (route-create-link! uuid schema-uuid req)) (DELETE (register! :instance-link-delete "/instance/:uuid/link/:link-uuid") [uuid link-uuid] - (delete-link! uuid link-uuid)) + (route-delete-link! uuid link-uuid)) (POST (register! :instance-mark-starred "/instance/:uuid/starred") [uuid :as req] - (mark-starred! uuid req)) + (route-mark-starred! uuid req)) (DELETE (register! :instance-remove-starred "/instance/:uuid/starred") [uuid :as req] - (remove-starred! uuid req)) + (route-remove-starred! uuid req)) (GET (register! :instance-list-starred "/instance/starred/list") [:as req] - (list-starred! req))) + (route-list-starred! req)) + (GET (register! :instance-bulk-link-selection "/instance/:uuid/bulk-link") + [uuid :as req] + (route-bulk-link-selection! uuid req)) + (POST (register! :instance-bulk-link-create "/instance/:uuid/bulk-link") + [uuid :as req] + (route-create-bulk-link! uuid req))) diff --git a/src/wanijo/instance/view/bulk_link_selection.clj b/src/wanijo/instance/view/bulk_link_selection.clj new file mode 100644 index 0000000..a53602c --- /dev/null +++ b/src/wanijo/instance/view/bulk_link_selection.clj @@ -0,0 +1,24 @@ +(ns wanijo.instance.view.bulk-link-selection + (:require [hiccup.form :as hform] + [hiccup.core :refer [h]] + [wanijo.infrastructure.view :as view] + [wanijo.infrastructure.routing :refer [path]] + [formulare.core :as form] + [ring.util.anti-forgery :refer [anti-forgery-field]])) + +(defn bulk-link-selection [instance forms req] + (view/layout + :request req + :content + [[:h1 + [:small "Link " (-> instance :schema :name h) " "] + (h (:name instance)) + [:small " with..."]] + (hform/form-to + [:post (path :instance-bulk-link-create instance)] + (anti-forgery-field) + (for [{:keys [schema form]} forms] + [:fieldset + [:legend "Schema " [:strong (-> schema :name h)]] + (form/render-widgets form nil req)]) + (hform/submit-button "Link!"))])) diff --git a/src/wanijo/instance/view/link_selection.clj b/src/wanijo/instance/view/link_selection.clj index 3b845f2..7c50ca4 100644 --- a/src/wanijo/instance/view/link_selection.clj +++ b/src/wanijo/instance/view/link_selection.clj @@ -10,7 +10,7 @@ :request req :content [[:h1 - [:small "Link " (-> instance :schema :name) " "] + [:small "Link " (-> instance :schema :name h) " "] (h (:name instance)) [:small " with "] (h (:name schema))] diff --git a/src/wanijo/instance/view/show.clj b/src/wanijo/instance/view/show.clj index a8dca0c..015082d 100644 --- a/src/wanijo/instance/view/show.clj +++ b/src/wanijo/instance/view/show.clj @@ -63,7 +63,10 @@ "Edit Instance"] " | " [:a {:href (path :vis-explore {:instance-uuid (:uuid instance)})} - "Explore from here"]]] + "Explore from here"] + " | " + [:a {:href "#quick-edits"} + "Quick edits"]]] (when (seq (:tags instance)) [:section.tags (view-tag/tag-list (:tags instance))]) @@ -91,7 +94,7 @@ (when (seq (:links-in instance)) (links-table "Incoming links" :links-in instance)) [:section.quick-edits - [:h2 "Quick edits"] + [:h2 {:id "quick-edits"} "Quick edits"] [:section.link-instance [:h3 "Link Instance with Instance of Schema..."] [:ul @@ -100,7 +103,9 @@ [:a {:href (path :instance-link-selection {:uuid (:uuid instance) :schema-uuid (:uuid schema)})} - (h (:name schema))]])]] + (h (:name schema))]])] + [:a {:href (path :instance-bulk-link-selection instance)} + "Bulk create links"]] [:section.tag-instance [:h3 "Add or create Tags"] (view-tag/new-tag-form instance)]]])) From 39e677c2f9bce3e15fd8c469636d0a386a95b2be Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Wed, 16 Oct 2019 14:52:42 +0200 Subject: [PATCH 10/11] fix error on bulk link form submit --- src/wanijo/instance/view/bulk_link_selection.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wanijo/instance/view/bulk_link_selection.clj b/src/wanijo/instance/view/bulk_link_selection.clj index a53602c..8248ce9 100644 --- a/src/wanijo/instance/view/bulk_link_selection.clj +++ b/src/wanijo/instance/view/bulk_link_selection.clj @@ -20,5 +20,6 @@ (for [{:keys [schema form]} forms] [:fieldset [:legend "Schema " [:strong (-> schema :name h)]] - (form/render-widgets form nil req)]) + (rest + (form/render-widgets form nil req))]) (hform/submit-button "Link!"))])) From 0cf9596f87cd85dd05742dedfa99b4508abb3743 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Wed, 16 Oct 2019 16:38:43 +0200 Subject: [PATCH 11/11] more elegant no-anti-forgery-field-rendering --- project.clj | 2 +- src/wanijo/instance/forms.clj | 4 ++-- src/wanijo/instance/view/bulk_link_selection.clj | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 3370e61..679e53f 100644 --- a/project.clj +++ b/project.clj @@ -18,7 +18,7 @@ commons-codec]] [ring/ring-json "0.5.0"] [hiccup "1.0.5"] - [joshavg/formulare "0.5.0-SNAPSHOT"] + [joshavg/formulare "0.6.0"] ;; compojure uses old transitive dependencies of ring ;; specifiy them here explicitly so newer versions diff --git a/src/wanijo/instance/forms.clj b/src/wanijo/instance/forms.clj index c1cbae0..1103c2a 100644 --- a/src/wanijo/instance/forms.clj +++ b/src/wanijo/instance/forms.clj @@ -19,8 +19,8 @@ (defn bulk-link-form [link-forms] (map (fn [{:keys [schema form]}] - (let [name-field (keyword (str "name-" (:uuid schema))) - instances-field (keyword (str "instances-" (:uuid schema)))] + (let [name-field (keyword (str "name[" (:uuid schema) "]")) + instances-field (keyword (str "instances[" (:uuid schema) "]"))] {:schema schema :form (-> form (assoc-in [:fields name-field] diff --git a/src/wanijo/instance/view/bulk_link_selection.clj b/src/wanijo/instance/view/bulk_link_selection.clj index 8248ce9..5b77f6a 100644 --- a/src/wanijo/instance/view/bulk_link_selection.clj +++ b/src/wanijo/instance/view/bulk_link_selection.clj @@ -7,6 +7,7 @@ [ring.util.anti-forgery :refer [anti-forgery-field]])) (defn bulk-link-selection [instance forms req] + (clojure.pprint/pprint forms) (view/layout :request req :content @@ -20,6 +21,8 @@ (for [{:keys [schema form]} forms] [:fieldset [:legend "Schema " [:strong (-> schema :name h)]] - (rest - (form/render-widgets form nil req))]) + (form/render-widgets form + nil + req + {:render-anti-forgery-field? false})]) (hform/submit-button "Link!"))]))