diff --git a/.dockerignore b/.dockerignore
index 563ba71..ae7c191 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
-/node_modules
-/build
\ No newline at end of file
+/client/node_modules
+/build
+/data
+/server/vendor
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 0d08982..64de960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-node_modules
-/dist
-/*.log
-/.vscode
\ No newline at end of file
+/client/node_modules
+/client/dist
+*.log
+/.vscode
+/server/bin
+/server/data
+/server/vendor
+/release
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4186dc0..af9c507 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,37 @@
-FROM alpine:3.11 AS build
+FROM golang:1.13 AS build
-RUN apk add --no-cache nodejs npm git make
+ARG HTTP_PROXY=
+ARG HTTPS_PROXY=
+ARG http_proxy=
+ARG https_proxy=
+
+RUN apt-get update && apt-get install -y build-essential git bash curl
+
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+ && apt-get install -y nodejs
COPY . /src
+
WORKDIR /src
-RUN npm install && make build
+RUN ( cd client && npm install ) \
+ && ( cd server && go mod vendor ) \
+ && make ARCH_TARGETS=amd64 release
-FROM alpine:3.11
+FROM busybox
-COPY --from=build /src/dist /app
+COPY --from=build /src/release/server-linux-amd64 /app
WORKDIR /app
-RUN apk add --no-cache caddy
-
-COPY misc/dokku/Caddyfile /app/Caddyfile
-COPY misc/dokku/CHECKS /app/CHECKS
+COPY misc/dokku/CHECKS /client/CHECKS
EXPOSE 80
-CMD ["caddy"]
\ No newline at end of file
+VOLUME /data
+
+ENV GUESSTIMATE_HTTP_ADDRESS=:80
+ENV GUESSTIMATE_HTTP_PUBLIC_DIR=/app/public
+ENV GUESSTIMATE_DATA_PATH=/data/guesstimate.db
+
+CMD ["/app/bin/server", "-config", "config.yml"]
\ No newline at end of file
diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..bae94e1
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are 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.
+
+ 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.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ 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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ 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 AGPL, see
+.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index dd7574a..d0cc526 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
DOKKU_URL := dokku@dev.lookingfora.name:guesstimate
watch:
- npm run dev
+ modd
-build: clean
- npm run build
+install-deps:
+ cd client && npm install
+
+build: clean build-server build-client
+
+build-client:
+ cd client && npm run build
+
+build-server:
+ cd server && CGO_ENABLED=0 go build -mod=vendor -v -o bin/server ./cmd/server
clean:
- rm -rf dist
+ rm -rf client/dist server/bin release
dokku-build:
docker build \
@@ -19,4 +27,8 @@ dokku-run:
dokku-deploy:
$(if $(shell git config remote.dokku.url),, git remote add dokku $(DOKKU_URL))
- git push -f dokku $(shell git rev-parse HEAD):refs/heads/master
\ No newline at end of file
+ git push -f dokku $(shell git rev-parse HEAD):refs/heads/master
+
+.PHONY: release
+release: clean
+ @misc/script/release.sh
\ No newline at end of file
diff --git a/package-lock.json b/client/package-lock.json
similarity index 99%
rename from package-lock.json
rename to client/package-lock.json
index 57c3e08..adab4f1 100644
--- a/package-lock.json
+++ b/client/package-lock.json
@@ -82,6 +82,11 @@
"integrity": "sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==",
"dev": true
},
+ "@types/json-merge-patch": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/@types/json-merge-patch/-/json-merge-patch-0.0.4.tgz",
+ "integrity": "sha1-pSgtqWkKgSpiEoo0cIr0dqMI2UE="
+ },
"@types/minimatch": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -1729,7 +1734,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
- "dev": true,
"requires": {
"is-arguments": "^1.0.4",
"is-date-object": "^1.0.1",
@@ -1753,7 +1757,6 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
- "dev": true,
"requires": {
"object-keys": "^1.0.12"
}
@@ -2041,7 +2044,6 @@
"version": "1.17.5",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
- "dev": true,
"requires": {
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
@@ -2060,7 +2062,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
- "dev": true,
"requires": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
@@ -3351,8 +3352,7 @@
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"get-caller-file": {
"version": "1.0.3",
@@ -3482,7 +3482,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dev": true,
"requires": {
"function-bind": "^1.1.1"
}
@@ -3505,8 +3504,7 @@
"has-symbols": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
- "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
- "dev": true
+ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
},
"has-value": {
"version": "1.0.0",
@@ -4013,8 +4011,7 @@
"is-arguments": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
- "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
- "dev": true
+ "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
},
"is-binary-path": {
"version": "1.0.1",
@@ -4034,8 +4031,7 @@
"is-callable": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
- "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
- "dev": true
+ "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
},
"is-data-descriptor": {
"version": "0.1.4",
@@ -4060,8 +4056,7 @@
"is-date-object": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
- "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
- "dev": true
+ "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
},
"is-descriptor": {
"version": "0.1.6",
@@ -4158,7 +4153,6 @@
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
- "dev": true,
"requires": {
"has": "^1.0.3"
}
@@ -4173,7 +4167,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
- "dev": true,
"requires": {
"has-symbols": "^1.0.1"
}
@@ -4214,6 +4207,14 @@
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
"dev": true
},
+ "json-merge-patch": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz",
+ "integrity": "sha1-+ixrWvh9p3uuKWalidUuI+2B/kA=",
+ "requires": {
+ "deep-equal": "^1.0.0"
+ }
+ },
"json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -4772,14 +4773,12 @@
"object-inspect": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
- "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
- "dev": true
+ "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
},
"object-is": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
"integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.5"
@@ -4788,8 +4787,7 @@
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
- "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
- "dev": true
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
},
"object-path": {
"version": "0.11.4",
@@ -4810,7 +4808,6 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
- "dev": true,
"requires": {
"define-properties": "^1.1.2",
"function-bind": "^1.1.1",
@@ -5609,7 +5606,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
"integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.0-next.1"
@@ -6461,7 +6457,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
"integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.5"
@@ -6471,7 +6466,6 @@
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
"integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.5",
@@ -6482,7 +6476,6 @@
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
"integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.5",
@@ -6493,7 +6486,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
"integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
- "dev": true,
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.5"
diff --git a/package.json b/client/package.json
similarity index 94%
rename from package.json
rename to client/package.json
index c5c1c3d..a302201 100644
--- a/package.json
+++ b/client/package.json
@@ -5,9 +5,11 @@
"main": "src/index.js",
"dependencies": {
"@types/bs58": "^4.0.1",
+ "@types/json-merge-patch": "0.0.4",
"bs58": "^4.0.1",
"bulma": "^0.8.2",
"bulma-switch": "^2.0.0",
+ "json-merge-patch": "^0.2.3",
"preact": "^10.4.1",
"preact-markup": "^1.6.0",
"preact-render-to-string": "^5.1.6",
diff --git a/src/assets/favicon.ico b/client/src/assets/favicon.ico
similarity index 100%
rename from src/assets/favicon.ico
rename to client/src/assets/favicon.ico
diff --git a/src/assets/icons/android-chrome-192x192.png b/client/src/assets/icons/android-chrome-192x192.png
similarity index 100%
rename from src/assets/icons/android-chrome-192x192.png
rename to client/src/assets/icons/android-chrome-192x192.png
diff --git a/src/assets/icons/android-chrome-512x512.png b/client/src/assets/icons/android-chrome-512x512.png
similarity index 100%
rename from src/assets/icons/android-chrome-512x512.png
rename to client/src/assets/icons/android-chrome-512x512.png
diff --git a/src/assets/icons/apple-touch-icon.png b/client/src/assets/icons/apple-touch-icon.png
similarity index 100%
rename from src/assets/icons/apple-touch-icon.png
rename to client/src/assets/icons/apple-touch-icon.png
diff --git a/src/assets/icons/favicon-16x16.png b/client/src/assets/icons/favicon-16x16.png
similarity index 100%
rename from src/assets/icons/favicon-16x16.png
rename to client/src/assets/icons/favicon-16x16.png
diff --git a/src/assets/icons/favicon-32x32.png b/client/src/assets/icons/favicon-32x32.png
similarity index 100%
rename from src/assets/icons/favicon-32x32.png
rename to client/src/assets/icons/favicon-32x32.png
diff --git a/src/assets/icons/mstile-150x150.png b/client/src/assets/icons/mstile-150x150.png
similarity index 100%
rename from src/assets/icons/mstile-150x150.png
rename to client/src/assets/icons/mstile-150x150.png
diff --git a/src/components/app.tsx b/client/src/components/app.tsx
similarity index 100%
rename from src/components/app.tsx
rename to client/src/components/app.tsx
diff --git a/src/components/editable-text/index.tsx b/client/src/components/editable-text/index.tsx
similarity index 92%
rename from src/components/editable-text/index.tsx
rename to client/src/components/editable-text/index.tsx
index 7ae7eb3..969fa8c 100644
--- a/src/components/editable-text/index.tsx
+++ b/client/src/components/editable-text/index.tsx
@@ -15,8 +15,13 @@ const EditableText: FunctionalComponent = ({ onChange, value,
const [ editMode, setEditMode ] = useState(false);
useEffect(() => {
- if (onChange) onChange(internalValue);
+ if (internalValue === value) return;
+ if (onChange) onChange(internalValue);
}, [internalValue]);
+
+ useEffect(() => {
+ setInternalValue(value);
+ }, [value])
const onEditIconClick = () => {
setEditMode(true);
diff --git a/src/components/editable-text/style.module.css b/client/src/components/editable-text/style.module.css
similarity index 100%
rename from src/components/editable-text/style.module.css
rename to client/src/components/editable-text/style.module.css
diff --git a/src/components/editable-text/style.module.css.d.ts b/client/src/components/editable-text/style.module.css.d.ts
similarity index 100%
rename from src/components/editable-text/style.module.css.d.ts
rename to client/src/components/editable-text/style.module.css.d.ts
diff --git a/src/components/estimation-range.tsx b/client/src/components/estimation-range.tsx
similarity index 100%
rename from src/components/estimation-range.tsx
rename to client/src/components/estimation-range.tsx
diff --git a/src/components/header/index.tsx b/client/src/components/header/index.tsx
similarity index 100%
rename from src/components/header/index.tsx
rename to client/src/components/header/index.tsx
diff --git a/src/components/header/style.module.css b/client/src/components/header/style.module.css
similarity index 100%
rename from src/components/header/style.module.css
rename to client/src/components/header/style.module.css
diff --git a/src/components/header/style.module.css.d.ts b/client/src/components/header/style.module.css.d.ts
similarity index 100%
rename from src/components/header/style.module.css.d.ts
rename to client/src/components/header/style.module.css.d.ts
diff --git a/src/components/project-time-unit.tsx b/client/src/components/project-time-unit.tsx
similarity index 100%
rename from src/components/project-time-unit.tsx
rename to client/src/components/project-time-unit.tsx
diff --git a/src/components/tabs/index.tsx b/client/src/components/tabs/index.tsx
similarity index 100%
rename from src/components/tabs/index.tsx
rename to client/src/components/tabs/index.tsx
diff --git a/src/components/tabs/style.module.css b/client/src/components/tabs/style.module.css
similarity index 100%
rename from src/components/tabs/style.module.css
rename to client/src/components/tabs/style.module.css
diff --git a/src/components/tabs/style.module.css.d.ts b/client/src/components/tabs/style.module.css.d.ts
similarity index 100%
rename from src/components/tabs/style.module.css.d.ts
rename to client/src/components/tabs/style.module.css.d.ts
diff --git a/client/src/hooks/use-debounce.tsx b/client/src/hooks/use-debounce.tsx
new file mode 100644
index 0000000..82a645a
--- /dev/null
+++ b/client/src/hooks/use-debounce.tsx
@@ -0,0 +1,19 @@
+import { useMemo, useState } from "preact/hooks";
+
+export default function useDebounce(func: Function, delay: number) {
+ const [id, setId] = useState(null)
+ return useMemo(
+ (...args) => {
+ if (id) {
+ clearTimeout(id)
+ } else {
+ setId(
+ window.setTimeout(() => {
+ setId(null)
+ func(...args)
+ }, delay)
+ )
+ }
+ }, [func]
+ )
+}
diff --git a/src/hooks/use-local-storage.ts b/client/src/hooks/use-local-storage.ts
similarity index 100%
rename from src/hooks/use-local-storage.ts
rename to client/src/hooks/use-local-storage.ts
diff --git a/src/hooks/use-media-query.ts b/client/src/hooks/use-media-query.ts
similarity index 100%
rename from src/hooks/use-media-query.ts
rename to client/src/hooks/use-media-query.ts
diff --git a/client/src/hooks/use-previous.ts b/client/src/hooks/use-previous.ts
new file mode 100644
index 0000000..0b81fb9
--- /dev/null
+++ b/client/src/hooks/use-previous.ts
@@ -0,0 +1,11 @@
+import { useEffect, useRef } from "preact/hooks";
+
+export function usePrevious(value: T): T|undefined {
+ const ref = useRef();
+
+ useEffect(() => {
+ ref.current = value;
+ }, [value]);
+
+ return ref.current as T|undefined;
+}
\ No newline at end of file
diff --git a/client/src/hooks/use-project-estimations.ts b/client/src/hooks/use-project-estimations.ts
new file mode 100644
index 0000000..b0e235b
--- /dev/null
+++ b/client/src/hooks/use-project-estimations.ts
@@ -0,0 +1,35 @@
+import { Project } from "../models/project";
+import { useState, useEffect } from "preact/hooks";
+import { getProjectWeightedMean, getProjectStandardDeviation } from "../util/stat";
+
+export interface Estimation {
+ e: number
+ sd: number
+}
+
+export interface ProjetEstimations {
+ p99: Estimation
+ p90: Estimation
+ p68: Estimation
+}
+
+export function useProjectEstimations(p :Project): ProjetEstimations {
+ const [ estimations, setEstimations ] = useState({
+ p99: { e: 0, sd: 0 },
+ p90: { e: 0, sd: 0 },
+ p68: { e: 0, sd: 0 },
+ });
+
+ useEffect(() => {
+ const projectWeightedMean = getProjectWeightedMean(p)
+ const projectStandardDeviation = getProjectStandardDeviation(p);
+
+ setEstimations({
+ p99: { e: projectWeightedMean, sd: (projectStandardDeviation * 3) },
+ p90: { e: projectWeightedMean, sd: (projectStandardDeviation * 1.645) },
+ p68: { e: projectWeightedMean, sd: (projectStandardDeviation) },
+ })
+ }, [p.tasks]);
+
+ return estimations;
+}
\ No newline at end of file
diff --git a/client/src/hooks/use-project-reducer.ts b/client/src/hooks/use-project-reducer.ts
new file mode 100644
index 0000000..36e155d
--- /dev/null
+++ b/client/src/hooks/use-project-reducer.ts
@@ -0,0 +1,325 @@
+import { Project } from "../models/project";
+import { Task, TaskID, EstimationConfidence, TaskCategoryID, TaskCategory } from "../models/task";
+import { useReducer } from "preact/hooks";
+import { generate as diff } from "json-merge-patch";
+import { applyPatch } from "../util/patch";
+
+
+export interface Action {
+ type: string
+}
+
+export type ProjectReducerActions =
+AddTask |
+RemoveTask |
+UpdateTaskEstimation |
+UpdateProjectLabel |
+UpdateTaskLabel |
+UpdateParam |
+UpdateTaskCategoryLabel |
+UpdateTaskCategoryCost |
+AddTaskCategory |
+RemoveTaskCategory |
+PatchProject
+
+export function useProjectReducer(project: Project) {
+ return useReducer(projectReducer, project);
+}
+
+export function projectReducer(project: Project, action: ProjectReducerActions): Project {
+ console.log(action);
+ switch(action.type) {
+ case ADD_TASK:
+ return handleAddTask(project, action as AddTask);
+
+ case REMOVE_TASK:
+ return handleRemoveTask(project, action as RemoveTask);
+
+ case UPDATE_TASK_ESTIMATION:
+ return handleUpdateTaskEstimation(project, action as UpdateTaskEstimation);
+
+ case UPDATE_PROJECT_LABEL:
+ return handleUpdateProjectLabel(project, action as UpdateProjectLabel);
+
+ case UPDATE_TASK_LABEL:
+ return handleUpdateTaskLabel(project, action as UpdateTaskLabel);
+
+ case UPDATE_PARAM:
+ return handleUpdateParam(project, action as UpdateParam);
+
+ case ADD_TASK_CATEGORY:
+ return handleAddTaskCategory(project, action as AddTaskCategory);
+
+ case REMOVE_TASK_CATEGORY:
+ return handleRemoveTaskCategory(project, action as RemoveTaskCategory);
+
+ case UPDATE_TASK_CATEGORY_LABEL:
+ return handleUpdateTaskCategoryLabel(project, action as UpdateTaskCategoryLabel);
+
+ case UPDATE_TASK_CATEGORY_COST:
+ return handleUpdateTaskCategoryCost(project, action as UpdateTaskCategoryCost);
+
+ case PATCH_PROJECT:
+ return handlePatchProject(project, action as PatchProject);
+ }
+
+ return project;
+}
+
+export interface AddTask extends Action {
+ task: Task
+}
+
+export const ADD_TASK = "ADD_TASK";
+
+export function addTask(task: Task): AddTask {
+ return { type: ADD_TASK, task };
+}
+
+export function handleAddTask(project: Project, action: AddTask): Project {
+ const task = { ...action.task };
+ return {
+ ...project,
+ tasks: {
+ ...project.tasks,
+ [task.id]: task,
+ }
+ };
+}
+
+export interface RemoveTask extends Action {
+ id: TaskID
+}
+
+export const REMOVE_TASK = "REMOVE_TASK";
+
+export function removeTask(id: TaskID): RemoveTask {
+ return { type: REMOVE_TASK, id };
+}
+
+export function handleRemoveTask(project: Project, action: RemoveTask): Project {
+ const tasks = { ...project.tasks };
+ delete tasks[action.id];
+ return {
+ ...project,
+ tasks
+ };
+}
+
+export interface UpdateTaskEstimation extends Action {
+ id: TaskID
+ confidence: string
+ value: number
+}
+
+export const UPDATE_TASK_ESTIMATION = "UPDATE_TASK_ESTIMATION";
+
+export function updateTaskEstimation(id: TaskID, confidence: EstimationConfidence, value: number): UpdateTaskEstimation {
+ return { type: UPDATE_TASK_ESTIMATION, id, confidence, value };
+}
+
+export function handleUpdateTaskEstimation(project: Project, action: UpdateTaskEstimation): Project {
+ const estimations = {
+ ...project.tasks[action.id].estimations,
+ [action.confidence]: action.value
+ };
+
+ if (estimations.likely < estimations.optimistic) {
+ estimations.likely = estimations.optimistic;
+ }
+
+ if (estimations.pessimistic < estimations.likely) {
+ estimations.pessimistic = estimations.likely;
+ }
+
+ return {
+ ...project,
+ tasks: {
+ ...project.tasks,
+ [action.id]: {
+ ...project.tasks[action.id],
+ estimations: estimations,
+ }
+ }
+ };
+}
+
+
+export interface UpdateProjectLabel extends Action {
+ label: string
+}
+
+export const UPDATE_PROJECT_LABEL = "UPDATE_PROJECT_LABEL";
+
+export function updateProjectLabel(label: string): UpdateProjectLabel {
+ return { type: UPDATE_PROJECT_LABEL, label };
+}
+
+export function handleUpdateProjectLabel(project: Project, action: UpdateProjectLabel): Project {
+ return {
+ ...project,
+ label: action.label
+ };
+}
+
+export interface UpdateTaskLabel extends Action {
+ id: TaskID
+ label: string
+}
+
+export const UPDATE_TASK_LABEL = "UPDATE_TASK_LABEL";
+
+export function updateTaskLabel(id: TaskID, label: string): UpdateTaskLabel {
+ return { type: UPDATE_TASK_LABEL, id, label };
+}
+
+export function handleUpdateTaskLabel(project: Project, action: UpdateTaskLabel): Project {
+ return {
+ ...project,
+ tasks: {
+ ...project.tasks,
+ [action.id]: {
+ ...project.tasks[action.id],
+ label: action.label,
+ }
+ }
+ };
+}
+
+export interface UpdateParam extends Action {
+ name: string
+ value: any
+}
+
+export const UPDATE_PARAM = "UPDATE_PARAM";
+
+export function updateParam(name: string, value: any): UpdateParam {
+ return { type: UPDATE_PARAM, name, value };
+}
+
+export function handleUpdateParam(project: Project, action: UpdateParam): Project {
+ return {
+ ...project,
+ params: {
+ ...project.params,
+ [action.name]: action.value,
+ }
+ };
+}
+
+export interface UpdateTaskCategoryLabel extends Action {
+ categoryId: TaskCategoryID
+ label: string
+}
+
+export const UPDATE_TASK_CATEGORY_LABEL = "UPDATE_TASK_CATEGORY_LABEL";
+
+export function updateTaskCategoryLabel(categoryId: TaskCategoryID, label: string): UpdateTaskCategoryLabel {
+ return { type: UPDATE_TASK_CATEGORY_LABEL, categoryId, label };
+}
+
+export function handleUpdateTaskCategoryLabel(project: Project, action: UpdateTaskCategoryLabel): Project {
+ return {
+ ...project,
+ params: {
+ ...project.params,
+ taskCategories: {
+ ...project.params.taskCategories,
+ [action.categoryId]: {
+ ...project.params.taskCategories[action.categoryId],
+ label: action.label
+ },
+ }
+ }
+ };
+}
+
+export interface UpdateTaskCategoryCost extends Action {
+ categoryId: TaskCategoryID
+ costPerTimeUnit: number
+}
+
+export const UPDATE_TASK_CATEGORY_COST = "UPDATE_TASK_CATEGORY_COST";
+
+export function updateTaskCategoryCost(categoryId: TaskCategoryID, costPerTimeUnit: number): UpdateTaskCategoryCost {
+ return { type: UPDATE_TASK_CATEGORY_COST, categoryId, costPerTimeUnit };
+}
+
+export function handleUpdateTaskCategoryCost(project: Project, action: UpdateTaskCategoryCost): Project {
+ return {
+ ...project,
+ params: {
+ ...project.params,
+ taskCategories: {
+ ...project.params.taskCategories,
+ [action.categoryId]: {
+ ...project.params.taskCategories[action.categoryId],
+ costPerTimeUnit: action.costPerTimeUnit
+ },
+ }
+ }
+ };
+}
+
+export const ADD_TASK_CATEGORY = "ADD_TASK_CATEGORY";
+
+export interface AddTaskCategory extends Action {
+ taskCategory: TaskCategory
+}
+
+export function addTaskCategory(taskCategory: TaskCategory): AddTaskCategory {
+ return { type: ADD_TASK_CATEGORY, taskCategory };
+}
+
+export function handleAddTaskCategory(project: Project, action: AddTaskCategory): Project {
+ const taskCategory = { ...action.taskCategory };
+ return {
+ ...project,
+ params: {
+ ...project.params,
+ taskCategories: {
+ ...project.params.taskCategories,
+ [taskCategory.id]: taskCategory,
+ }
+ }
+ };
+}
+
+export interface RemoveTaskCategory extends Action {
+ taskCategoryId: TaskCategoryID
+}
+
+export const REMOVE_TASK_CATEGORY = "REMOVE_TASK_CATEGORY";
+
+export function removeTaskCategory(taskCategoryId: TaskCategoryID): RemoveTaskCategory {
+ return { type: REMOVE_TASK_CATEGORY, taskCategoryId };
+}
+
+export function handleRemoveTaskCategory(project: Project, action: RemoveTaskCategory): Project {
+ const taskCategories = { ...project.params.taskCategories };
+ delete taskCategories[action.taskCategoryId];
+ return {
+ ...project,
+ params: {
+ ...project.params,
+ taskCategories
+ }
+ };
+}
+
+export interface PatchProject extends Action {
+ from: Project
+}
+
+export const PATCH_PROJECT = "PATCH_PROJECT";
+
+export function patchProject(from: Project): PatchProject {
+ return { type: PATCH_PROJECT, from };
+}
+
+export function handlePatchProject(project: Project, action: PatchProject): Project {
+ const p = diff(project, action.from);
+ console.log('patch to apply', p);
+ if (!p) return project;
+ return applyPatch(project, p) as Project;
+}
\ No newline at end of file
diff --git a/client/src/hooks/use-server-sync.ts b/client/src/hooks/use-server-sync.ts
new file mode 100644
index 0000000..022adaa
--- /dev/null
+++ b/client/src/hooks/use-server-sync.ts
@@ -0,0 +1,108 @@
+import { Project } from "../models/project";
+import { usePrevious } from "./use-previous";
+import { useEffect, useState } from "preact/hooks";
+import { generate as diff } from "json-merge-patch";
+import useDebounce from "./use-debounce";
+
+export interface ServerSyncOptions {
+ projectURL: string
+ refreshInterval: number
+ syncDelay: number
+}
+
+export const defaultOptions = {
+ refreshInterval: 10000,
+ projectURL: `//${window.location.host}/api/v1/projects`,
+ syncDelay: 5000,
+}
+
+export function useServerSync(project: Project, applyServerUpdate: (project: Project) => void, options: ServerSyncOptions = defaultOptions) {
+ options = Object.assign({}, defaultOptions, options);
+
+ const [ version, setVersion ] = useState(0);
+
+ const handleAPIResponse = (res: Response) => {
+ // If the project does not yet exist, create it
+ if (res.status === 404) {
+ return createProject(project, options)
+ .then(res => res.json())
+ .then(result => {
+ setVersion(result.version);
+ })
+ ;
+ }
+
+ // In case of conflict, notify of new server version
+ if (res.status === 409) {
+ return res.json().then((result: any) => {
+ applyServerUpdate(result.project);
+ setVersion(result.version);
+ });
+ }
+
+ // If the server version is not modified, do nothing
+ if (res.status === 304) {
+ return;
+ }
+
+ return res.json().then((result: any) => {
+ applyServerUpdate(result.project);
+ setVersion(result.version);
+ });
+ };
+
+ // Force refresh periodically
+ useEffect(() => {
+ const intervalId = window.setInterval(() => {
+ refreshProject(project, version, options).then(handleAPIResponse);
+ }, options.refreshInterval);
+ return () => clearInterval(intervalId);
+ }, [version]);
+
+ useEffect(() => {
+ const timeoutId =window.setTimeout(() => {
+ console.log('executing debounced patch');
+
+ let previousProject: Project|any = usePrevious(project);
+ if (!previousProject) previousProject = {};
+
+ // Trigger patch if project has changed
+
+ const patch = diff(previousProject, project);
+
+ console.log('generated patch', patch);
+
+ if (!patch) return;
+
+ patchProject(project, patch, version, options).then(handleAPIResponse);
+ }, options.syncDelay);
+ return () => clearTimeout(timeoutId);
+ });
+
+}
+
+function refreshProject(project: Project, version: number, options: ServerSyncOptions): Promise {
+ return fetch(`${options.projectURL}/${project.id}?version=${version}`, {
+ method: 'GET'
+ });
+}
+
+function createProject(project: Project, options: ServerSyncOptions): Promise {
+ return fetch(`${options.projectURL}/${project.id}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ project })
+ });
+}
+
+function patchProject(project: Project, patch: Object, version: number, options: ServerSyncOptions): Promise {
+ return fetch(`${options.projectURL}/${project.id}`, {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ version, patch })
+ });
+};
diff --git a/src/hooks/use-stored-project-list.ts b/client/src/hooks/use-stored-project-list.ts
similarity index 100%
rename from src/hooks/use-stored-project-list.ts
rename to client/src/hooks/use-stored-project-list.ts
diff --git a/src/index.html b/client/src/index.html
similarity index 100%
rename from src/index.html
rename to client/src/index.html
diff --git a/src/index.js b/client/src/index.js
similarity index 100%
rename from src/index.js
rename to client/src/index.js
diff --git a/src/models/params.ts b/client/src/models/params.ts
similarity index 90%
rename from src/models/params.ts
rename to client/src/models/params.ts
index 8f9160f..a28ea01 100644
--- a/src/models/params.ts
+++ b/client/src/models/params.ts
@@ -2,20 +2,20 @@ import { TaskCategory, TaskCategoryID } from "./task";
import { Project } from "./project";
export interface TaskCategoriesIndex {
- [id: string]: TaskCategory
+ [id: string]: TaskCategory
}
export interface TimeUnit {
- label: string
- acronym: string
+ label: string
+ acronym: string
}
export interface Params {
- taskCategories: TaskCategoriesIndex
- timeUnit: TimeUnit
- currency: string
- roundUpEstimations: boolean
- hideFinancialPreviewOnPrint: boolean
+ taskCategories: TaskCategoriesIndex
+ timeUnit: TimeUnit
+ currency: string
+ roundUpEstimations: boolean
+ hideFinancialPreviewOnPrint: boolean
}
export const defaults = {
diff --git a/client/src/models/project.ts b/client/src/models/project.ts
new file mode 100644
index 0000000..87f8978
--- /dev/null
+++ b/client/src/models/project.ts
@@ -0,0 +1,29 @@
+import { Task, TaskCategory, TaskID } from './task';
+import { Params, defaults } from "./params";
+import { uuidV4 } from "../util/uuid";
+
+export type ProjectID = string;
+
+export interface Project {
+ id: ProjectID
+ label: string
+ description: string
+ tasks: Tasks
+ params: Params
+}
+
+export interface Tasks {
+ [id: string]: Task
+}
+
+export function newProject(id?: string): Project {
+ return {
+ id: id ? id : uuidV4(),
+ label: "",
+ description: "",
+ tasks: {},
+ params: {
+ ...defaults
+ },
+ };
+}
\ No newline at end of file
diff --git a/src/models/task.ts b/client/src/models/task.ts
similarity index 71%
rename from src/models/task.ts
rename to client/src/models/task.ts
index ef20a24..118599c 100644
--- a/src/models/task.ts
+++ b/client/src/models/task.ts
@@ -4,24 +4,24 @@ import { defaults } from "./params";
export type TaskID = string
export enum EstimationConfidence {
- Optimistic = "optimistic",
- Likely = "likely",
- Pessimistic = "pessimistic"
+ Optimistic = "optimistic",
+ Likely = "likely",
+ Pessimistic = "pessimistic"
}
export interface Task {
- id: TaskID
- label: string
- category: TaskCategoryID
- estimations: { [confidence in EstimationConfidence]: number }
+ id: TaskID
+ label: string
+ category: TaskCategoryID
+ estimations: { [confidence in EstimationConfidence]: number }
}
export type TaskCategoryID = string
export interface TaskCategory {
- id: TaskCategoryID
- label: string
- costPerTimeUnit: number
+ id: TaskCategoryID
+ label: string
+ costPerTimeUnit: number
}
export function newTask(label: string, category: TaskCategoryID): Task {
diff --git a/src/routes/home/index.tsx b/client/src/routes/home/index.tsx
similarity index 100%
rename from src/routes/home/index.tsx
rename to client/src/routes/home/index.tsx
diff --git a/src/routes/home/style.module.css b/client/src/routes/home/style.module.css
similarity index 100%
rename from src/routes/home/style.module.css
rename to client/src/routes/home/style.module.css
diff --git a/src/routes/home/style.module.css.d.ts b/client/src/routes/home/style.module.css.d.ts
similarity index 100%
rename from src/routes/home/style.module.css.d.ts
rename to client/src/routes/home/style.module.css.d.ts
diff --git a/src/routes/notfound/index.tsx b/client/src/routes/notfound/index.tsx
similarity index 100%
rename from src/routes/notfound/index.tsx
rename to client/src/routes/notfound/index.tsx
diff --git a/src/routes/notfound/style.module.css b/client/src/routes/notfound/style.module.css
similarity index 100%
rename from src/routes/notfound/style.module.css
rename to client/src/routes/notfound/style.module.css
diff --git a/src/routes/notfound/style.module.css.d.ts b/client/src/routes/notfound/style.module.css.d.ts
similarity index 100%
rename from src/routes/notfound/style.module.css.d.ts
rename to client/src/routes/notfound/style.module.css.d.ts
diff --git a/src/routes/project/estimation-tab.tsx b/client/src/routes/project/estimation-tab.tsx
similarity index 100%
rename from src/routes/project/estimation-tab.tsx
rename to client/src/routes/project/estimation-tab.tsx
diff --git a/src/routes/project/export-tab.tsx b/client/src/routes/project/export-tab.tsx
similarity index 100%
rename from src/routes/project/export-tab.tsx
rename to client/src/routes/project/export-tab.tsx
diff --git a/src/routes/project/financial-preview.tsx b/client/src/routes/project/financial-preview.tsx
similarity index 100%
rename from src/routes/project/financial-preview.tsx
rename to client/src/routes/project/financial-preview.tsx
diff --git a/src/routes/project/index.tsx b/client/src/routes/project/index.tsx
similarity index 87%
rename from src/routes/project/index.tsx
rename to client/src/routes/project/index.tsx
index da7045f..e00555e 100644
--- a/src/routes/project/index.tsx
+++ b/client/src/routes/project/index.tsx
@@ -1,8 +1,8 @@
import { FunctionalComponent, h } from "preact";
import { useEffect } from "preact/hooks";
import style from "./style.module.css";
-import { newProject } from "../../models/project";
-import { useProjectReducer, updateProjectLabel } from "../../hooks/use-project-reducer";
+import { newProject, Project } from "../../models/project";
+import { useProjectReducer, updateProjectLabel, patchProject } from "../../hooks/use-project-reducer";
import { getProjectStorageKey } from "../../util/storage";
import { useLocalStorage } from "../../hooks/use-local-storage";
import EditableText from "../../components/editable-text";
@@ -10,6 +10,7 @@ import Tabs from "../../components/tabs";
import EstimationTab from "./estimation-tab";
import ParamsTab from "./params-tab";
import ExportTab from "./export-tab";
+import { useServerSync } from "../../hooks/use-server-sync";
export interface ProjectProps {
projectId: string
@@ -19,6 +20,10 @@ const Project: FunctionalComponent = ({ projectId }) => {
const projectStorageKey = getProjectStorageKey(projectId);
const [ storedProject, storeProject ] = useLocalStorage(projectStorageKey, newProject(projectId));
const [ project, dispatch ] = useProjectReducer(storedProject);
+
+ useServerSync(project, (project: Project) => {
+ dispatch(patchProject(project));
+ });
const onProjectLabelChange = (projectLabel: string) => {
dispatch(updateProjectLabel(projectLabel));
diff --git a/src/routes/project/params-tab.tsx b/client/src/routes/project/params-tab.tsx
similarity index 100%
rename from src/routes/project/params-tab.tsx
rename to client/src/routes/project/params-tab.tsx
diff --git a/src/routes/project/repartition-preview.tsx b/client/src/routes/project/repartition-preview.tsx
similarity index 100%
rename from src/routes/project/repartition-preview.tsx
rename to client/src/routes/project/repartition-preview.tsx
diff --git a/src/routes/project/style.module.css b/client/src/routes/project/style.module.css
similarity index 100%
rename from src/routes/project/style.module.css
rename to client/src/routes/project/style.module.css
diff --git a/src/routes/project/style.module.css.d.ts b/client/src/routes/project/style.module.css.d.ts
similarity index 100%
rename from src/routes/project/style.module.css.d.ts
rename to client/src/routes/project/style.module.css.d.ts
diff --git a/src/routes/project/task-categories-table.tsx b/client/src/routes/project/task-categories-table.tsx
similarity index 100%
rename from src/routes/project/task-categories-table.tsx
rename to client/src/routes/project/task-categories-table.tsx
diff --git a/src/routes/project/tasks-table.tsx b/client/src/routes/project/tasks-table.tsx
similarity index 100%
rename from src/routes/project/tasks-table.tsx
rename to client/src/routes/project/tasks-table.tsx
diff --git a/src/routes/project/time-preview.tsx b/client/src/routes/project/time-preview.tsx
similarity index 100%
rename from src/routes/project/time-preview.tsx
rename to client/src/routes/project/time-preview.tsx
diff --git a/src/style/index.css b/client/src/style/index.css
similarity index 100%
rename from src/style/index.css
rename to client/src/style/index.css
diff --git a/src/style/index.css.d.ts b/client/src/style/index.css.d.ts
similarity index 100%
rename from src/style/index.css.d.ts
rename to client/src/style/index.css.d.ts
diff --git a/client/src/util/patch.ts b/client/src/util/patch.ts
new file mode 100644
index 0000000..32d8649
--- /dev/null
+++ b/client/src/util/patch.ts
@@ -0,0 +1,45 @@
+
+// React/Redux compatible implementation of RFC 7396
+// See https://tools.ietf.org/html/rfc7396
+//
+// Pseudo algorithm:
+//
+// define MergePatch(Target, Patch):
+// if Patch is an Object:
+// if Target is not an Object:
+// Target = {} # Ignore the contents and set it to an empty Object
+// for each Name/Value pair in Patch:
+// if Value is null:
+// if Name exists in Target:
+// remove the Name/Value pair from Target
+// else:
+// Target[Name] = MergePatch(Target[Name], Value)
+// return Target
+// else:
+// return Patch
+
+export function applyPatch(target: any, patch: any): Object {
+ if (!isObject(patch)) {
+ return patch;
+ }
+
+ if (!isObject(target)) {
+ target = {};
+ }
+
+ Object.keys(patch).forEach((key: any) => {
+ const value = patch[key];
+ target = { ...target };
+ if (value === null) {
+ delete target[key];
+ } else {
+ target[key] = applyPatch(target[key], value);
+ }
+ });
+
+ return target;
+}
+
+function isObject(value: any): boolean {
+ return value === Object(value);
+}
\ No newline at end of file
diff --git a/src/util/stat.ts b/client/src/util/stat.ts
similarity index 100%
rename from src/util/stat.ts
rename to client/src/util/stat.ts
diff --git a/src/util/storage.ts b/client/src/util/storage.ts
similarity index 100%
rename from src/util/storage.ts
rename to client/src/util/storage.ts
diff --git a/src/util/uuid.ts b/client/src/util/uuid.ts
similarity index 100%
rename from src/util/uuid.ts
rename to client/src/util/uuid.ts
diff --git a/tsconfig.json b/client/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to client/tsconfig.json
diff --git a/webpack.config.js b/client/webpack.config.js
similarity index 95%
rename from webpack.config.js
rename to client/webpack.config.js
index 3596984..272ddb7 100644
--- a/webpack.config.js
+++ b/client/webpack.config.js
@@ -23,6 +23,11 @@ module.exports = {
port: 8080,
historyApiFallback: true,
hot: env.NODE_ENV === 'development',
+ proxy: {
+ '/api': {
+ target: 'http://127.0.0.1:8081',
+ }
+ }
},
module: {
rules: [
diff --git a/misc/dokku/Caddyfile b/misc/dokku/Caddyfile
deleted file mode 100644
index 080bcca..0000000
--- a/misc/dokku/Caddyfile
+++ /dev/null
@@ -1,6 +0,0 @@
-*:80
-gzip
-log stderr
-rewrite {
- to {path} {path}/ /index.html
-}
\ No newline at end of file
diff --git a/misc/script/release.sh b/misc/script/release.sh
new file mode 100755
index 0000000..81b67f9
--- /dev/null
+++ b/misc/script/release.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+set -eo pipefail
+
+OS_TARGETS=( linux )
+ARCH_TARGETS=${ARCH_TARGETS:-amd64 arm 386}
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+PROJECT_DIR="$DIR/../.."
+
+function build {
+
+ local name=$1
+ local srcdir=$2
+ local os=$3
+ local arch=$4
+
+ local dirname="$name-$os-$arch"
+ local destdir="$PROJECT_DIR/release/$dirname"
+
+ rm -rf "$destdir"
+ mkdir -p "$destdir"
+
+ echo "building $dirname..."
+
+ CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" go build \
+ -mod=vendor \
+ -ldflags="-s -w -X 'main.GitRef=$(current_commit_ref)' -X 'main.ProjectVersion=$(current_version)' -X 'main.BuildDate=$(current_date)'" \
+ -gcflags=-trimpath="${PWD}" \
+ -asmflags=-trimpath="${PWD}" \
+ -o "$destdir/bin/$name" \
+ "$srcdir"
+}
+
+function current_date {
+ date '+%Y-%m-%d %H:%M'
+}
+
+function current_commit_ref {
+ git log -n 1 --pretty="format:%h"
+}
+
+function current_version {
+ local latest_tag=$(git describe --abbrev=0 2>/dev/null)
+ echo ${latest_tag:-0.0.0}
+}
+
+function copy {
+
+ local name=$1
+ local os=$2
+ local arch=$3
+ local src=$4
+ local dest=$5
+
+ local dirname="$name-$os-$arch"
+ local destdir="$PROJECT_DIR/release/$dirname"
+
+ echo "copying '$src' to '$destdir/$dest'..."
+
+ mkdir -p "$(dirname $destdir/$dest)"
+
+ cp -rfL $src "$destdir/$dest"
+
+}
+
+function dump_default_conf {
+ # Generate and copy configuration file
+ local command=$1
+ local os=$2
+ local arch=$3
+ local tmp_conf=$(mktemp)
+
+ go run "$PROJECT_DIR/server/cmd/$command" -dump-config > "$tmp_conf"
+ copy "$command" $os $arch "$tmp_conf" "config.yml"
+ rm -f "$tmp_conf" "$patched_conf"
+}
+
+function compress {
+
+ local name=$1
+ local os=$2
+ local arch=$3
+
+ local dirname="$name-$os-$arch"
+ local destdir="$PROJECT_DIR/release/$dirname"
+
+ echo "compressing $dirname..."
+ tar -czf "$destdir.tar.gz" -C "$destdir/../" "$dirname"
+}
+
+function build_guesstimate_client {
+ (
+ cd client
+ npm run build
+ )
+}
+
+function release_guesstimate {
+ local os=$1
+ local arch=$2
+
+ # Build and copy server files
+ (
+ cd server
+ build 'server' "$PROJECT_DIR/server/cmd/server" $os $arch
+ dump_default_conf 'server' $os $arch
+ )
+
+ copy 'server' $os $arch "$PROJECT_DIR/client/dist" "public"
+ copy 'server' $os $arch "$PROJECT_DIR/README.md" "README.md"
+ compress 'server' $os $arch
+
+}
+
+function main {
+ build_guesstimate_client
+
+ for os in ${OS_TARGETS[@]}; do
+ for arch in ${ARCH_TARGETS[@]}; do
+ release_guesstimate $os $arch
+ done
+ done
+}
+
+main
\ No newline at end of file
diff --git a/modd.conf b/modd.conf
new file mode 100644
index 0000000..f59a696
--- /dev/null
+++ b/modd.conf
@@ -0,0 +1,19 @@
+server/**/*.go
+!server/**/*_test.go
+server/data/config.yml
+.env
+modd.conf {
+ prep: make build-server
+ prep: cd server && [ -e data/config.yml ] || ( mkdir -p data && bin/server -dump-config > data/config.yml )
+ prep: cd server && [ -e .env ] || ( cp .env.dist .env )
+ daemon: cd server && ( set -o allexport && source .env && set +o allexport && bin/server -config data/config.yml )
+}
+
+{
+ daemon: cd client && npm run dev
+}
+
+server/**/*.go
+server/**/*_test.go {
+ prep: cd server && go clean -testcache && go test -race -v ./...
+}
\ No newline at end of file
diff --git a/server/.env b/server/.env
new file mode 100644
index 0000000..892ca3e
--- /dev/null
+++ b/server/.env
@@ -0,0 +1 @@
+GUESSTIMATE_DATA_PATH=data/guesstimate.db
\ No newline at end of file
diff --git a/server/.env.dist b/server/.env.dist
new file mode 100644
index 0000000..892ca3e
--- /dev/null
+++ b/server/.env.dist
@@ -0,0 +1 @@
+GUESSTIMATE_DATA_PATH=data/guesstimate.db
\ No newline at end of file
diff --git a/server/cmd/server/container.go b/server/cmd/server/container.go
new file mode 100644
index 0000000..dcb5de9
--- /dev/null
+++ b/server/cmd/server/container.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+ "forge.cadoles.com/wpetit/guesstimate/internal/config"
+ "forge.cadoles.com/wpetit/guesstimate/internal/model"
+ "forge.cadoles.com/wpetit/guesstimate/internal/storm"
+ "gitlab.com/wpetit/goweb/service"
+ "gitlab.com/wpetit/goweb/service/build"
+)
+
+func getServiceContainer(conf *config.Config) (*service.Container, error) {
+ // Initialize and configure service container
+ ctn := service.NewContainer()
+
+ ctn.Provide(build.ServiceName, build.ServiceProvider(ProjectVersion, GitRef, BuildDate))
+
+ // Create and expose config service provider
+ ctn.Provide(config.ServiceName, config.ServiceProvider(conf))
+
+ ctn.Provide(storm.ServiceName, storm.ServiceProvider(
+ storm.WithPath(conf.Data.Path),
+ storm.WithObjects(&model.ProjectEntry{}),
+ storm.WithInit(true),
+ storm.WithReIndex(true),
+ ))
+
+ return ctn, nil
+}
diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go
new file mode 100644
index 0000000..a6c5c0d
--- /dev/null
+++ b/server/cmd/server/main.go
@@ -0,0 +1,117 @@
+package main
+
+import (
+ "net/http"
+
+ "forge.cadoles.com/wpetit/guesstimate/internal/route"
+ "github.com/go-chi/chi"
+ "github.com/go-chi/chi/middleware"
+ "gitlab.com/wpetit/goweb/middleware/container"
+
+ "flag"
+ "fmt"
+ "log"
+
+ "os"
+
+ "forge.cadoles.com/wpetit/guesstimate/internal/config"
+ "github.com/pkg/errors"
+)
+
+//nolint: gochecknoglobals
+var (
+ configFile = ""
+ workdir = ""
+ dumpConfig = false
+ version = false
+)
+
+// nolint: gochecknoglobals
+var (
+ GitRef = "unknown"
+ ProjectVersion = "unknown"
+ BuildDate = "unknown"
+)
+
+//nolint: gochecknoinits
+func init() {
+ flag.StringVar(&configFile, "config", configFile, "configuration file")
+ flag.StringVar(&workdir, "workdir", workdir, "working directory")
+ flag.BoolVar(&dumpConfig, "dump-config", dumpConfig, "dump configuration and exit")
+ flag.BoolVar(&version, "version", version, "show version and exit")
+}
+
+func main() {
+ flag.Parse()
+
+ if version {
+ fmt.Printf("%s (%s) - %s\n", ProjectVersion, GitRef, BuildDate)
+
+ os.Exit(0)
+ }
+
+ // Switch to new working directory if defined
+ if workdir != "" {
+ if err := os.Chdir(workdir); err != nil {
+ log.Fatalf("%+v", errors.Wrapf(err, "could not change working directory to '%s'", workdir))
+ }
+ }
+
+ // Load configuration file if defined, use default configuration otherwise
+ var conf *config.Config
+
+ var err error
+
+ if configFile != "" {
+ conf, err = config.NewFromFile(configFile)
+ if err != nil {
+ log.Fatalf("%+v", errors.Wrapf(err, "could not load config file '%s'", configFile))
+ }
+ } else {
+ if dumpConfig {
+ conf = config.NewDumpDefault()
+ } else {
+ conf = config.NewDefault()
+ }
+
+ }
+
+ // Dump configuration if asked
+ if dumpConfig {
+ if err := config.Dump(conf, os.Stdout); err != nil {
+ log.Fatalf("%+v", errors.Wrap(err, "could not dump config"))
+ }
+
+ os.Exit(0)
+ }
+
+ if err := config.WithEnvironment(conf); err != nil {
+ log.Fatalf("%+v", errors.Wrap(err, "could not override config with environment"))
+ }
+
+ // Create service container
+ ctn, err := getServiceContainer(conf)
+ if err != nil {
+ log.Fatalf("%+v", errors.Wrap(err, "could not create service container"))
+ }
+
+ r := chi.NewRouter()
+
+ // Define base middlewares
+ r.Use(middleware.Logger)
+ r.Use(middleware.Recoverer)
+
+ // Expose service container on router
+ r.Use(container.ServiceContainer(ctn))
+
+ // Define routes
+ if err := route.Mount(r, conf); err != nil {
+ log.Fatalf("%+v", errors.Wrap(err, "could not mount http routes"))
+ }
+
+ log.Printf("listening on '%s'", conf.HTTP.Address)
+
+ if err := http.ListenAndServe(conf.HTTP.Address, r); err != nil {
+ log.Fatalf("%+v", errors.Wrapf(err, "could not listen on '%s'", conf.HTTP.Address))
+ }
+}
diff --git a/server/go.mod b/server/go.mod
new file mode 100644
index 0000000..c6e2517
--- /dev/null
+++ b/server/go.mod
@@ -0,0 +1,18 @@
+module forge.cadoles.com/wpetit/guesstimate
+
+go 1.14
+
+require (
+ github.com/asdine/storm/v3 v3.1.1
+ github.com/caarlos0/env/v6 v6.2.1
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/go-chi/chi v4.1.1+incompatible
+ github.com/gorilla/websocket v1.4.2 // indirect
+ github.com/pkg/errors v0.9.1
+ gitlab.com/wpetit/goweb v0.0.0-20200418152305-76dea96a46ce
+ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+ gopkg.in/evanphx/json-patch.v4 v4.5.0
+ gopkg.in/yaml.v2 v2.2.8
+)
+
+// replace gitlab.com/wpetit/goweb => ../goweb
diff --git a/server/go.sum b/server/go.sum
new file mode 100644
index 0000000..4a15dba
--- /dev/null
+++ b/server/go.sum
@@ -0,0 +1,268 @@
+cdr.dev/slog v1.3.0 h1:MYN1BChIaVEGxdS7I5cpdyMC0+WfJfK8BETAfzfLUGQ=
+cdr.dev/slog v1.3.0/go.mod h1:C5OL99WyuOK8YHZdYY57dAPN1jK2WJlCdq2VP6xeQns=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.49.0/go.mod h1:hGvAdzcWNbyuxS3nWhD7H2cIJxjRRTRLQVB0bdputVY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
+github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
+github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
+github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwvZMJY1tzqBvQgpaZiQRuIDD40jM=
+github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
+github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
+github.com/alecthomas/chroma v0.7.0 h1:z+0HgTUmkpRDRz0SRSdMaqOLfJV4F+N1FPDZUZIDUzw=
+github.com/alecthomas/chroma v0.7.0/go.mod h1:1U/PfCsTALWWYHDnsIQkxEBM0+6LLe0v8+RSVMOwxeY=
+github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
+github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
+github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
+github.com/asdine/storm/v3 v3.1.1 h1:5ESJvmcNhQQOFcvpxkIHcZs7mp8Z6XGdBqEoAgf+11g=
+github.com/asdine/storm/v3 v3.1.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0=
+github.com/caarlos0/env/v6 v6.2.1 h1:/bFpX1dg4TNioJjg7mrQaSrBoQvRfLUHNfXivdFbbEo=
+github.com/caarlos0/env/v6 v6.2.1/go.mod h1:3LpmfcAYCG6gCiSgDLaFR5Km1FRpPwFvBbRcjHar6Sw=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
+github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
+github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
+github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-chi/chi v4.1.1+incompatible h1:MmTgB0R8Bt/jccxp+t6S/1VGIKdJw5J74CK/c9tTfA4=
+github.com/go-chi/chi v4.1.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
+github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.2-0.20191216170541-340f1ebe299e/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
+github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
+github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
+gitlab.com/wpetit/goweb v0.0.0-20200418152305-76dea96a46ce h1:B3inZUHFr/FpA3jb+ZeSSHk3FSpB0xkQ0TjePhRokxw=
+gitlab.com/wpetit/goweb v0.0.0-20200418152305-76dea96a46ce/go.mod h1:Gfv7cBOw1T2XwXMsLm1d9kAjMAdNtLMjPv+yCzRO9qk=
+go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/evanphx/json-patch.v4 v4.5.0 h1:MFA/3y/6L7wj4hG4wS4gsDw+ihxOSu6heF2zB2NUFtU=
+gopkg.in/evanphx/json-patch.v4 v4.5.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
diff --git a/server/internal/config/config.go b/server/internal/config/config.go
new file mode 100644
index 0000000..788c52a
--- /dev/null
+++ b/server/internal/config/config.go
@@ -0,0 +1,79 @@
+package config
+
+import (
+ "io"
+ "io/ioutil"
+
+ "github.com/caarlos0/env/v6"
+ "github.com/pkg/errors"
+
+ "gopkg.in/yaml.v2"
+)
+
+type Config struct {
+ HTTP HTTPConfig `yaml:"http"`
+ Data DataConfig `ymal:"data"`
+}
+
+type HTTPConfig struct {
+ Address string `yaml:"address" env:"GUESSTIMATE_HTTP_ADDRESS"`
+ PublicDir string `yaml:"publicDir" env:"GUESSTIMATE_PUBLIC_DIR"`
+}
+
+type DataConfig struct {
+ Path string `yaml:"path" env:"GUESSTIMATE_DATA_PATH"`
+}
+
+// NewFromFile retrieves the configuration from the given file
+func NewFromFile(filepath string) (*Config, error) {
+ config := NewDefault()
+
+ data, err := ioutil.ReadFile(filepath)
+ if err != nil {
+ return nil, errors.Wrapf(err, "could not read file '%s'", filepath)
+ }
+
+ if err := yaml.Unmarshal(data, config); err != nil {
+ return nil, errors.Wrapf(err, "could not unmarshal configuration")
+ }
+
+ return config, nil
+}
+
+func WithEnvironment(conf *Config) error {
+ if err := env.Parse(conf); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func NewDumpDefault() *Config {
+ config := NewDefault()
+ return config
+}
+
+func NewDefault() *Config {
+ return &Config{
+ HTTP: HTTPConfig{
+ Address: ":8081",
+ PublicDir: "public",
+ },
+ Data: DataConfig{
+ Path: "guesstimate.db",
+ },
+ }
+}
+
+func Dump(config *Config, w io.Writer) error {
+ data, err := yaml.Marshal(config)
+ if err != nil {
+ return errors.Wrap(err, "could not dump config")
+ }
+
+ if _, err := w.Write(data); err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/server/internal/config/provider.go b/server/internal/config/provider.go
new file mode 100644
index 0000000..0e768ed
--- /dev/null
+++ b/server/internal/config/provider.go
@@ -0,0 +1,9 @@
+package config
+
+import "gitlab.com/wpetit/goweb/service"
+
+func ServiceProvider(config *Config) service.Provider {
+ return func(ctn *service.Container) (interface{}, error) {
+ return config, nil
+ }
+}
diff --git a/server/internal/config/service.go b/server/internal/config/service.go
new file mode 100644
index 0000000..e57c05d
--- /dev/null
+++ b/server/internal/config/service.go
@@ -0,0 +1,33 @@
+package config
+
+import (
+ "github.com/pkg/errors"
+ "gitlab.com/wpetit/goweb/service"
+)
+
+const ServiceName service.Name = "config"
+
+// From retrieves the config service in the given container
+func From(container *service.Container) (*Config, error) {
+ service, err := container.Service(ServiceName)
+ if err != nil {
+ return nil, errors.Wrapf(err, "error while retrieving '%s' service", ServiceName)
+ }
+
+ srv, ok := service.(*Config)
+ if !ok {
+ return nil, errors.Errorf("retrieved service is not a valid '%s' service", ServiceName)
+ }
+
+ return srv, nil
+}
+
+// Must retrieves the config service in the given container or panic otherwise
+func Must(container *service.Container) *Config {
+ srv, err := From(container)
+ if err != nil {
+ panic(err)
+ }
+
+ return srv
+}
diff --git a/server/internal/model/project.go b/server/internal/model/project.go
new file mode 100644
index 0000000..6b1178f
--- /dev/null
+++ b/server/internal/model/project.go
@@ -0,0 +1,29 @@
+package model
+
+type ProjectID string
+
+type ProjectEntry struct {
+ ID ProjectID `storm:"id"`
+ Version uint64 `storm:"index"`
+ Project *Project
+}
+
+type Project struct {
+ ID ProjectID `json:"id" storm:"id"`
+ Label string `json:"label"`
+ Description string `json:"description"`
+ Tasks map[TaskID]Task `json:"tasks"`
+ Params Params `json:"params"`
+}
+
+type Params struct {
+ TaskCategories map[TaskCategoryID]TaskCategory `json:"taskCategories"`
+ TimeUnit TimeUnit `json:"timeUnit"`
+ Currency string `json:"currency"`
+ RoundUpEstimations bool `json:"roundUpEstimations"`
+}
+
+type TimeUnit struct {
+ Acronym string `json:"acronym"`
+ Label string `json:"label"`
+}
diff --git a/server/internal/model/task.go b/server/internal/model/task.go
new file mode 100644
index 0000000..7fce8ec
--- /dev/null
+++ b/server/internal/model/task.go
@@ -0,0 +1,24 @@
+package model
+
+type TaskID string
+
+type Task struct {
+ ID TaskID `json:"id"`
+ Label string `json:"label"`
+ Estimations TaskEstimations `json:"estimations"`
+ CategoryID TaskCategoryID `json:"category"`
+}
+
+type TaskEstimations struct {
+ Optimistic float64 `json:"optimistic"`
+ Likely float64 `json:"likely"`
+ Pessimistic float64 `json:"pessimistic"`
+}
+
+type TaskCategoryID string
+
+type TaskCategory struct {
+ ID TaskCategoryID `json:"id"`
+ Label string `json:"label"`
+ CostPerTimeUnit float64 `json:"costPerTimeUnit"`
+}
diff --git a/server/internal/route/mount.go b/server/internal/route/mount.go
new file mode 100644
index 0000000..da26801
--- /dev/null
+++ b/server/internal/route/mount.go
@@ -0,0 +1,32 @@
+package route
+
+import (
+ "net/http"
+ "path"
+
+ "forge.cadoles.com/wpetit/guesstimate/internal/config"
+ "github.com/go-chi/chi"
+ "gitlab.com/wpetit/goweb/static"
+)
+
+func Mount(r *chi.Mux, config *config.Config) error {
+ r.Route("/api/v1", func(r chi.Router) {
+ r.Get("/projects/{projectID}", handleGetProject)
+ r.Post("/projects/{projectID}", handleCreateProject)
+ r.Patch("/projects/{projectID}", handlePatchProject)
+ r.Delete("/projects/{projectID}", handleDeleteProject)
+ })
+
+ clientIndex := path.Join(config.HTTP.PublicDir, "index.html")
+
+ serveClientIndex := func(w http.ResponseWriter, r *http.Request) {
+ http.ServeFile(w, r, clientIndex)
+ }
+
+ r.Get("/p/*", serveClientIndex)
+
+ notFoundHandler := r.NotFoundHandler()
+ r.Get("/*", static.Dir(config.HTTP.PublicDir, "", notFoundHandler))
+
+ return nil
+}
diff --git a/server/internal/route/project.go b/server/internal/route/project.go
new file mode 100644
index 0000000..5b6846f
--- /dev/null
+++ b/server/internal/route/project.go
@@ -0,0 +1,248 @@
+package route
+
+import (
+ "encoding/json"
+ "log"
+ "net/http"
+ "strconv"
+
+ jsonpatch "gopkg.in/evanphx/json-patch.v4"
+
+ "forge.cadoles.com/wpetit/guesstimate/internal/model"
+ "forge.cadoles.com/wpetit/guesstimate/internal/storm"
+ "github.com/go-chi/chi"
+ "github.com/pkg/errors"
+ "gitlab.com/wpetit/goweb/middleware/container"
+)
+
+type projectResponse struct {
+ Version uint64 `json:"version"`
+ Project *model.Project `json:"project"`
+}
+
+func handleGetProject(w http.ResponseWriter, r *http.Request) {
+ ctn := container.Must(r.Context())
+ db := storm.Must(ctn)
+
+ projectID := getProjectID(r)
+
+ var (
+ version uint64
+ err error
+ )
+
+ rawVersion := r.URL.Query().Get("version")
+ if rawVersion != "" {
+ version, err = strconv.ParseUint(rawVersion, 10, 64)
+ if err != nil {
+ http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+
+ return
+ }
+ }
+
+ tx, err := db.Begin(false)
+ if err != nil {
+ panic(errors.Wrap(err, "could not start transaction"))
+ }
+
+ defer func() {
+ if err := tx.Rollback(); err != nil && err != storm.ErrNotInTransaction {
+ panic(errors.Wrap(err, "could not rollback transaction"))
+ }
+ }()
+
+ entry := &model.ProjectEntry{}
+ if err := tx.One("ID", projectID, entry); err != nil {
+ if err == storm.ErrNotFound {
+ http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+
+ return
+ }
+
+ panic(errors.Wrapf(err, "could not find project '%s'", projectID))
+ }
+
+ if rawVersion != "" && entry.Version == version {
+ http.Error(w, http.StatusText(http.StatusNotModified), http.StatusNotModified)
+
+ return
+ }
+
+ if err := writeJSON(w, http.StatusOK, &projectResponse{entry.Version, entry.Project}); err != nil {
+ panic(errors.Wrap(err, "could not write json"))
+ }
+}
+
+type createRequest struct {
+ Project *model.Project `json:"project"`
+}
+
+func handleCreateProject(w http.ResponseWriter, r *http.Request) {
+ ctn := container.Must(r.Context())
+ db := storm.Must(ctn)
+
+ projectID := getProjectID(r)
+
+ log.Printf("handling create request for project %s", projectID)
+
+ createReq := &createRequest{}
+ if err := parseJSONBody(r, createReq); err != nil {
+ http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+
+ panic(errors.Wrap(err, "could not parse create request"))
+ }
+
+ tx, err := db.Begin(true)
+ if err != nil {
+ panic(errors.Wrap(err, "could not start transaction"))
+ }
+
+ defer func() {
+ if err := tx.Rollback(); err != nil && err != storm.ErrNotInTransaction {
+ panic(errors.Wrap(err, "could not rollback transaction"))
+ }
+ }()
+
+ entry := &model.ProjectEntry{}
+
+ err = tx.One("ID", projectID, entry)
+ if err == nil {
+ http.Error(w, http.StatusText(http.StatusConflict), http.StatusConflict)
+ return
+ }
+
+ if err != storm.ErrNotFound {
+ panic(errors.Wrapf(err, "could not check project '%s'", projectID))
+ }
+
+ entry.ID = projectID
+ entry.Project = createReq.Project
+ entry.Version = 0
+
+ if err := tx.Save(entry); err != nil {
+ panic(errors.Wrap(err, "could not save project"))
+ }
+
+ if err := tx.Commit(); err != nil {
+ panic(errors.Wrap(err, "could not commit transaction"))
+ }
+
+ if err := writeJSON(w, http.StatusCreated, &projectResponse{entry.Version, entry.Project}); err != nil {
+ panic(errors.Wrap(err, "could not write json response"))
+ }
+}
+
+type patchRequest struct {
+ Version uint64 `json:"version"`
+ Patch json.RawMessage `json:"patch"`
+}
+
+func handlePatchProject(w http.ResponseWriter, r *http.Request) {
+ ctn := container.Must(r.Context())
+ db := storm.Must(ctn)
+
+ projectID := getProjectID(r)
+
+ log.Printf("handling patch request for project %s", projectID)
+
+ patchReq := &patchRequest{}
+ if err := parseJSONBody(r, patchReq); err != nil {
+ http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+
+ panic(errors.Wrap(err, "could not parse patch request"))
+ }
+
+ tx, err := db.Begin(true)
+ if err != nil {
+ panic(errors.Wrap(err, "could not start transaction"))
+ }
+
+ defer func() {
+ if err := tx.Rollback(); err != nil && err != storm.ErrNotInTransaction {
+ panic(errors.Wrap(err, "could not rollback transaction"))
+ }
+ }()
+
+ entry := &model.ProjectEntry{}
+ if err := tx.One("ID", projectID, entry); err != nil {
+ if err == storm.ErrNotFound {
+ http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+
+ return
+ }
+
+ panic(errors.Wrapf(err, "could not find project '%s'", projectID))
+ }
+
+ if entry.Version != patchReq.Version {
+ if err := writeJSON(w, http.StatusConflict, &projectResponse{entry.Version, entry.Project}); err != nil {
+ panic(errors.Wrap(err, "could not write json response"))
+ }
+
+ return
+ }
+
+ projectData, err := json.Marshal(entry.Project)
+ if err != nil {
+ panic(errors.Wrap(err, "could not marshal project"))
+ }
+
+ projectData, err = jsonpatch.MergePatch(projectData, patchReq.Patch)
+ if err != nil {
+ panic(errors.Wrap(err, "could not merge project patch"))
+ }
+
+ newProject := &model.Project{}
+ if err := json.Unmarshal(projectData, newProject); err != nil {
+ panic(errors.Wrap(err, "could not merge project patch"))
+ }
+
+ entry.Version++
+ entry.Project = newProject
+
+ if err := tx.Save(entry); err != nil {
+ panic(errors.Wrap(err, "could not save project"))
+ }
+
+ if err := tx.Commit(); err != nil {
+ panic(errors.Wrap(err, "could not commit transaction"))
+ }
+
+ if err := writeJSON(w, http.StatusOK, &projectResponse{entry.Version, entry.Project}); err != nil {
+ panic(errors.Wrap(err, "could not write json response"))
+ }
+}
+
+func handleDeleteProject(w http.ResponseWriter, r *http.Request) {
+
+}
+
+func getProjectID(r *http.Request) model.ProjectID {
+ return model.ProjectID(chi.URLParam(r, "projectID"))
+}
+
+func parseJSONBody(r *http.Request, payload interface{}) (err error) {
+ decoder := json.NewDecoder(r.Body)
+
+ defer func() {
+ if err = r.Body.Close(); err != nil {
+ err = errors.Wrap(err, "could not close request body")
+ }
+ }()
+
+ if err := decoder.Decode(payload); err != nil {
+ return errors.Wrap(err, "could not decode request body")
+ }
+
+ return nil
+}
+
+func writeJSON(w http.ResponseWriter, statusCode int, data interface{}) error {
+ encoder := json.NewEncoder(w)
+ encoder.SetIndent("", " ")
+ w.WriteHeader(statusCode)
+ w.Header().Set("Content-Type", "application/json")
+
+ return encoder.Encode(data)
+}
diff --git a/server/internal/storm/error.go b/server/internal/storm/error.go
new file mode 100644
index 0000000..103ced1
--- /dev/null
+++ b/server/internal/storm/error.go
@@ -0,0 +1,10 @@
+package storm
+
+import (
+ "github.com/asdine/storm/v3"
+)
+
+var (
+ ErrNotFound = storm.ErrNotFound
+ ErrNotInTransaction = storm.ErrNotInTransaction
+)
diff --git a/server/internal/storm/option.go b/server/internal/storm/option.go
new file mode 100644
index 0000000..4e7ee92
--- /dev/null
+++ b/server/internal/storm/option.go
@@ -0,0 +1,51 @@
+package storm
+
+type Option struct {
+ Path string
+ Objects []interface{}
+ ReIndex bool
+ Init bool
+}
+
+type OptionFunc func(*Option)
+
+func DefaultOption() *Option {
+ return MergeOption(
+ &Option{},
+ WithPath("data.db"),
+ WithInit(true),
+ WithReIndex(true),
+ )
+}
+
+func MergeOption(opt *Option, funcs ...OptionFunc) *Option {
+ for _, fn := range funcs {
+ fn(opt)
+ }
+
+ return opt
+}
+
+func WithPath(path string) OptionFunc {
+ return func(opt *Option) {
+ opt.Path = path
+ }
+}
+
+func WithReIndex(reindex bool) OptionFunc {
+ return func(opt *Option) {
+ opt.ReIndex = reindex
+ }
+}
+
+func WithInit(init bool) OptionFunc {
+ return func(opt *Option) {
+ opt.Init = init
+ }
+}
+
+func WithObjects(objects ...interface{}) OptionFunc {
+ return func(opt *Option) {
+ opt.Objects = objects
+ }
+}
diff --git a/server/internal/storm/provider.go b/server/internal/storm/provider.go
new file mode 100644
index 0000000..e00fbcc
--- /dev/null
+++ b/server/internal/storm/provider.go
@@ -0,0 +1,48 @@
+package storm
+
+import (
+ "reflect"
+
+ "github.com/asdine/storm/v3"
+ "github.com/pkg/errors"
+ "gitlab.com/wpetit/goweb/service"
+)
+
+func ServiceProvider(funcs ...OptionFunc) service.Provider {
+ opt := MergeOption(
+ DefaultOption(),
+ funcs...,
+ )
+
+ db, err := storm.Open(opt.Path)
+
+ if err == nil && opt.Objects != nil {
+ err = migrate(db, opt.Objects, opt.Init, opt.ReIndex)
+ }
+
+ return func(ctn *service.Container) (interface{}, error) {
+ if err != nil {
+ return nil, err
+ }
+ return db, nil
+ }
+}
+
+func migrate(db *storm.DB, objects []interface{}, init, reindex bool) error {
+ for _, o := range objects {
+ if init {
+ if err := db.Init(o); err != nil {
+ return errors.Wrapf(err, "could not init object '%s'", reflect.TypeOf(o).String())
+ }
+ }
+
+ if reindex {
+ if err := db.ReIndex(o); err != nil {
+ return errors.Wrapf(err, "could not reindex object '%s'", reflect.TypeOf(o).String())
+ }
+ }
+
+ }
+
+ return nil
+}
diff --git a/server/internal/storm/service.go b/server/internal/storm/service.go
new file mode 100644
index 0000000..15bacfd
--- /dev/null
+++ b/server/internal/storm/service.go
@@ -0,0 +1,34 @@
+package storm
+
+import (
+ "github.com/asdine/storm/v3"
+ "github.com/pkg/errors"
+ "gitlab.com/wpetit/goweb/service"
+)
+
+const ServiceName service.Name = "storm"
+
+// From retrieves the storm service in the given container
+func From(container *service.Container) (*storm.DB, error) {
+ service, err := container.Service(ServiceName)
+ if err != nil {
+ return nil, errors.Wrapf(err, "error while retrieving '%s' service", ServiceName)
+ }
+
+ srv, ok := service.(*storm.DB)
+ if !ok {
+ return nil, errors.Errorf("retrieved service is not a valid '%s' service", ServiceName)
+ }
+
+ return srv, nil
+}
+
+// Must retrieves the storm service in the given container or panic otherwise
+func Must(container *service.Container) *storm.DB {
+ srv, err := From(container)
+ if err != nil {
+ panic(err)
+ }
+
+ return srv
+}
diff --git a/src/hooks/use-project-estimations.ts b/src/hooks/use-project-estimations.ts
deleted file mode 100644
index eae69bb..0000000
--- a/src/hooks/use-project-estimations.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Project } from "../models/project";
-import { useState, useEffect } from "preact/hooks";
-import { getProjectWeightedMean, getProjectStandardDeviation } from "../util/stat";
-
-export interface Estimation {
- e: number
- sd: number
-}
-
-export interface ProjetEstimations {
- p99: Estimation
- p90: Estimation
- p68: Estimation
-}
-
-export function useProjectEstimations(p :Project): ProjetEstimations {
- const [ estimations, setEstimations ] = useState({
- p99: { e: 0, sd: 0 },
- p90: { e: 0, sd: 0 },
- p68: { e: 0, sd: 0 },
- });
-
- useEffect(() => {
- const projectWeightedMean = getProjectWeightedMean(p)
- const projectStandardDeviation = getProjectStandardDeviation(p);
-
- setEstimations({
- p99: { e: projectWeightedMean, sd: (projectStandardDeviation * 3) },
- p90: { e: projectWeightedMean, sd: (projectStandardDeviation * 1.645) },
- p68: { e: projectWeightedMean, sd: (projectStandardDeviation) },
- })
- }, [p.tasks]);
-
- return estimations;
-}
\ No newline at end of file
diff --git a/src/hooks/use-project-reducer.ts b/src/hooks/use-project-reducer.ts
deleted file mode 100644
index 1c9c9d1..0000000
--- a/src/hooks/use-project-reducer.ts
+++ /dev/null
@@ -1,301 +0,0 @@
-import { Project } from "../models/project";
-import { Task, TaskID, EstimationConfidence, TaskCategoryID, TaskCategory } from "../models/task";
-import { useReducer } from "preact/hooks";
-
-export interface Action {
- type: string
-}
-
-export type ProjectReducerActions =
- AddTask |
- RemoveTask |
- UpdateTaskEstimation |
- UpdateProjectLabel |
- UpdateTaskLabel |
- UpdateParam |
- UpdateTaskCategoryLabel |
- UpdateTaskCategoryCost |
- AddTaskCategory |
- RemoveTaskCategory
-
-export function useProjectReducer(project: Project) {
- return useReducer(projectReducer, project);
-}
-
-export function projectReducer(project: Project, action: ProjectReducerActions): Project {
- console.log(action);
- switch(action.type) {
- case ADD_TASK:
- return handleAddTask(project, action as AddTask);
-
- case REMOVE_TASK:
- return handleRemoveTask(project, action as RemoveTask);
-
- case UPDATE_TASK_ESTIMATION:
- return handleUpdateTaskEstimation(project, action as UpdateTaskEstimation);
-
- case UPDATE_PROJECT_LABEL:
- return handleUpdateProjectLabel(project, action as UpdateProjectLabel);
-
- case UPDATE_TASK_LABEL:
- return handleUpdateTaskLabel(project, action as UpdateTaskLabel);
-
- case UPDATE_PARAM:
- return handleUpdateParam(project, action as UpdateParam);
-
- case ADD_TASK_CATEGORY:
- return handleAddTaskCategory(project, action as AddTaskCategory);
-
- case REMOVE_TASK_CATEGORY:
- return handleRemoveTaskCategory(project, action as RemoveTaskCategory);
-
- case UPDATE_TASK_CATEGORY_LABEL:
- return handleUpdateTaskCategoryLabel(project, action as UpdateTaskCategoryLabel);
-
- case UPDATE_TASK_CATEGORY_COST:
- return handleUpdateTaskCategoryCost(project, action as UpdateTaskCategoryCost);
- }
-
- return project;
-}
-
-export interface AddTask extends Action {
- task: Task
-}
-
-export const ADD_TASK = "ADD_TASK";
-
-export function addTask(task: Task): AddTask {
- return { type: ADD_TASK, task };
-}
-
-export function handleAddTask(project: Project, action: AddTask): Project {
- const task = { ...action.task };
- return {
- ...project,
- tasks: {
- ...project.tasks,
- [task.id]: task,
- }
- };
-}
-
-export interface RemoveTask extends Action {
- id: TaskID
-}
-
-export const REMOVE_TASK = "REMOVE_TASK";
-
-export function removeTask(id: TaskID): RemoveTask {
- return { type: REMOVE_TASK, id };
-}
-
-export function handleRemoveTask(project: Project, action: RemoveTask): Project {
- const tasks = { ...project.tasks };
- delete tasks[action.id];
- return {
- ...project,
- tasks
- };
-}
-
-export interface UpdateTaskEstimation extends Action {
- id: TaskID
- confidence: string
- value: number
-}
-
-export const UPDATE_TASK_ESTIMATION = "UPDATE_TASK_ESTIMATION";
-
-export function updateTaskEstimation(id: TaskID, confidence: EstimationConfidence, value: number): UpdateTaskEstimation {
- return { type: UPDATE_TASK_ESTIMATION, id, confidence, value };
-}
-
-export function handleUpdateTaskEstimation(project: Project, action: UpdateTaskEstimation): Project {
- const estimations = {
- ...project.tasks[action.id].estimations,
- [action.confidence]: action.value
- };
-
- if (estimations.likely < estimations.optimistic) {
- estimations.likely = estimations.optimistic;
- }
-
- if (estimations.pessimistic < estimations.likely) {
- estimations.pessimistic = estimations.likely;
- }
-
- return {
- ...project,
- tasks: {
- ...project.tasks,
- [action.id]: {
- ...project.tasks[action.id],
- estimations: estimations,
- }
- }
- };
-}
-
-
-export interface UpdateProjectLabel extends Action {
- label: string
-}
-
-export const UPDATE_PROJECT_LABEL = "UPDATE_PROJECT_LABEL";
-
-export function updateProjectLabel(label: string): UpdateProjectLabel {
- return { type: UPDATE_PROJECT_LABEL, label };
-}
-
-export function handleUpdateProjectLabel(project: Project, action: UpdateProjectLabel): Project {
- return {
- ...project,
- label: action.label
- };
-}
-
-export interface UpdateTaskLabel extends Action {
- id: TaskID
- label: string
-}
-
-export const UPDATE_TASK_LABEL = "UPDATE_TASK_LABEL";
-
-export function updateTaskLabel(id: TaskID, label: string): UpdateTaskLabel {
- return { type: UPDATE_TASK_LABEL, id, label };
-}
-
-export function handleUpdateTaskLabel(project: Project, action: UpdateTaskLabel): Project {
- return {
- ...project,
- tasks: {
- ...project.tasks,
- [action.id]: {
- ...project.tasks[action.id],
- label: action.label,
- }
- }
- };
-}
-
-export interface UpdateParam extends Action {
- name: string
- value: any
-}
-
-export const UPDATE_PARAM = "UPDATE_PARAM";
-
-export function updateParam(name: string, value: any): UpdateParam {
- return { type: UPDATE_PARAM, name, value };
-}
-
-export function handleUpdateParam(project: Project, action: UpdateParam): Project {
- return {
- ...project,
- params: {
- ...project.params,
- [action.name]: action.value,
- }
- };
-}
-
-export interface UpdateTaskCategoryLabel extends Action {
- categoryId: TaskCategoryID
- label: string
-}
-
-export const UPDATE_TASK_CATEGORY_LABEL = "UPDATE_TASK_CATEGORY_LABEL";
-
-export function updateTaskCategoryLabel(categoryId: TaskCategoryID, label: string): UpdateTaskCategoryLabel {
- return { type: UPDATE_TASK_CATEGORY_LABEL, categoryId, label };
-}
-
-export function handleUpdateTaskCategoryLabel(project: Project, action: UpdateTaskCategoryLabel): Project {
- return {
- ...project,
- params: {
- ...project.params,
- taskCategories: {
- ...project.params.taskCategories,
- [action.categoryId]: {
- ...project.params.taskCategories[action.categoryId],
- label: action.label
- },
- }
- }
- };
-}
-
-export interface UpdateTaskCategoryCost extends Action {
- categoryId: TaskCategoryID
- costPerTimeUnit: number
-}
-
-export const UPDATE_TASK_CATEGORY_COST = "UPDATE_TASK_CATEGORY_COST";
-
-export function updateTaskCategoryCost(categoryId: TaskCategoryID, costPerTimeUnit: number): UpdateTaskCategoryCost {
- return { type: UPDATE_TASK_CATEGORY_COST, categoryId, costPerTimeUnit };
-}
-
-export function handleUpdateTaskCategoryCost(project: Project, action: UpdateTaskCategoryCost): Project {
- return {
- ...project,
- params: {
- ...project.params,
- taskCategories: {
- ...project.params.taskCategories,
- [action.categoryId]: {
- ...project.params.taskCategories[action.categoryId],
- costPerTimeUnit: action.costPerTimeUnit
- },
- }
- }
- };
-}
-
-export const ADD_TASK_CATEGORY = "ADD_TASK_CATEGORY";
-
-export interface AddTaskCategory extends Action {
- taskCategory: TaskCategory
-}
-
-export function addTaskCategory(taskCategory: TaskCategory): AddTaskCategory {
- return { type: ADD_TASK_CATEGORY, taskCategory };
-}
-
-export function handleAddTaskCategory(project: Project, action: AddTaskCategory): Project {
- const taskCategory = { ...action.taskCategory };
- return {
- ...project,
- params: {
- ...project.params,
- taskCategories: {
- ...project.params.taskCategories,
- [taskCategory.id]: taskCategory,
- }
- }
- };
-}
-
-export interface RemoveTaskCategory extends Action {
- taskCategoryId: TaskCategoryID
-}
-
-export const REMOVE_TASK_CATEGORY = "REMOVE_TASK_CATEGORY";
-
-export function removeTaskCategory(taskCategoryId: TaskCategoryID): RemoveTaskCategory {
- return { type: REMOVE_TASK_CATEGORY, taskCategoryId };
-}
-
-export function handleRemoveTaskCategory(project: Project, action: RemoveTaskCategory): Project {
- const taskCategories = { ...project.params.taskCategories };
- delete taskCategories[action.taskCategoryId];
- return {
- ...project,
- params: {
- ...project.params,
- taskCategories
- }
- };
-}
\ No newline at end of file
diff --git a/src/models/project.ts b/src/models/project.ts
deleted file mode 100644
index b2be846..0000000
--- a/src/models/project.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Task, TaskCategory, TaskID } from './task';
-import { Params, defaults } from "./params";
-import { uuidV4 } from "../util/uuid";
-
-export type ProjectID = string;
-
-export interface Project {
- id: ProjectID
- label: string
- description: string
- tasks: Tasks
- params: Params
-}
-
-export interface Tasks {
- [id: string]: Task
-}
-
-export function newProject(id?: string): Project {
- return {
- id: id ? id : uuidV4(),
- label: "",
- description: "",
- tasks: {},
- params: {
- ...defaults
- },
- };
-}
\ No newline at end of file