Merge pull request 'Update Rust crate tempfile to v3.16.0' (#441) from renovate/tempfile-3.x-lockfile into master

Reviewed-on: #441

.drone.yml

@@ -14,7 +14,7 @@ steps:
   - cargo test
 
 - name: app_deploy
-  image: node:21
+  image: node:22
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: AWS_ACCESS_KEY_ID

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,7 +1,5 @@
 # GeneIT
 
-WIP project
-
 ## Setup dev env
 1. Install prerequisites:
    1. docker

geneit_app/package.json

@@ -5,36 +5,45 @@
   "type": "module",
   "dependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@emotion/react": "^11.11.4",
+    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.11.0",
+    "@emotion/styled": "^11.13.0",
-    "@fontsource/roboto": "^5.0.13",
+    "@fontsource/roboto": "^5.1.0",
+    "@fullcalendar/core": "^6.1.15",
+    "@fullcalendar/daygrid": "^6.1.15",
+    "@fullcalendar/interaction": "^6.1.15",
+    "@fullcalendar/list": "^6.1.15",
+    "@fullcalendar/react": "^6.1.15",
     "@mdi/js": "^7.2.96",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^5.15.17",
+    "@mui/icons-material": "^6.1.2",
-    "@mui/lab": "^5.0.0-alpha.140",
+    "@mui/lab": "^6.0.0-beta.10",
-    "@mui/material": "^5.15.17",
+    "@mui/material": "^6.1.2",
-    "@mui/x-data-grid": "^7.1.1",
+    "@mui/x-data-grid": "^7.18.0",
-    "@mui/x-tree-view": "^7.4.0",
+    "@mui/x-date-pickers": "^7.18.0",
-    "@testing-library/jest-dom": "^6.4.5",
+    "@mui/x-tree-view": "^7.18.0",
-    "@testing-library/react": "^15.0.7",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.0.0",
-    "@types/jest": "^29.0.0",
+    "@types/jest": "^29.5.13",
-    "@types/react": "^18.3.2",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "^4.3.2",
-    "date-and-time": "^3.2.0",
+    "date-and-time": "^3.6.0",
+    "dayjs": "^1.11.13",
     "email-validator": "^2.0.4",
-    "filesize": "^10.1.2",
+    "filesize": "^10.1.6",
-    "jspdf": "^2.5.1",
+    "jspdf": "^2.5.2",
+    "mui-color-input": "^5.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-easy-crop": "^5.0.7",
+    "react-easy-crop": "^5.0.8",
-    "react-router-dom": "^6.23.1",
+    "react-qr-code": "^2.0.14",
+    "react-router-dom": "^7.0.0",
     "react-zoom-pan-pinch": "^3.4.4",
     "svg2pdf.js": "^2.2.3",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.2",
-    "vite": "^5.2.11",
+    "vite": "^6.0.0",
-    "vite-tsconfig-paths": "^4.3.2",
+    "vite-tsconfig-paths": "^5.0.1",
     "web-vitals": "^3.5.2"
   },
   "scripts": {

geneit_app/src/App.tsx

@@ -16,29 +16,33 @@ import { NewAccountRoute } from "./routes/auth/NewAccountRoute";
 import { OIDCCbRoute } from "./routes/auth/OIDCCbRoute";
 import { PasswordForgottenRoute } from "./routes/auth/PasswordForgottenRoute";
 import { ResetPasswordRoute } from "./routes/auth/ResetPasswordRoute";
-import { FamilyHomeRoute } from "./routes/family/genealogy/FamilyHomeRoute";
-import {
-  FamilyCreateMemberRoute,
-  FamilyEditMemberRoute,
-  FamilyMemberRoute,
-} from "./routes/family/genealogy/FamilyMemberRoute";
 import { FamilySettingsRoute } from "./routes/family/FamilySettingsRoute";
 import { FamilyUsersListRoute } from "./routes/family/FamilyUsersListRoute";
-import { BaseAuthenticatedPage } from "./widgets/BaseAuthenticatedPage";
+import { AccommodationsHomeRoute } from "./routes/family/accommodations/AccommodationsHomeRoute";
-import { BaseFamilyRoute } from "./widgets/BaseFamilyRoute";
+import { AccommodationsReservationsRoute } from "./routes/family/accommodations/AccommodationsReservationsRoute";
-import { BaseLoginPage } from "./widgets/BaseLoginpage";
+import { AccommodationsSettingsRoute } from "./routes/family/accommodations/AccommodationsSettingsRoute";
-import { FamilyMembersListRoute } from "./routes/family/genealogy/FamilyMembersListRoute";
 import {
   FamilyCoupleRoute,
   FamilyCreateCoupleRoute,
   FamilyEditCoupleRoute,
 } from "./routes/family/genealogy/FamilyCoupleRoute";
 import { FamilyCouplesListRoute } from "./routes/family/genealogy/FamilyCouplesListRoute";
-import { FamilyTreeRoute } from "./routes/family/genealogy/FamilyTreeRoute";
+import { FamilyHomeRoute } from "./routes/family/genealogy/FamilyHomeRoute";
+import {
+  FamilyCreateMemberRoute,
+  FamilyEditMemberRoute,
+  FamilyMemberRoute,
+} from "./routes/family/genealogy/FamilyMemberRoute";
 import { FamilyMemberTreeRoute } from "./routes/family/genealogy/FamilyMemberTreeRoute";
-import { GenealogyHomeRoute } from "./routes/family/genealogy/GenealogyHomeRoute";
+import { FamilyMembersListRoute } from "./routes/family/genealogy/FamilyMembersListRoute";
-import { BaseGenealogyRoute } from "./widgets/genealogy/BaseGenealogyRoute";
+import { FamilyTreeRoute } from "./routes/family/genealogy/FamilyTreeRoute";
 import { GenalogySettingsRoute } from "./routes/family/genealogy/GenalogySettingsRoute";
+import { GenealogyHomeRoute } from "./routes/family/genealogy/GenealogyHomeRoute";
+import { BaseAuthenticatedPage } from "./widgets/BaseAuthenticatedPage";
+import { BaseFamilyRoute } from "./widgets/BaseFamilyRoute";
+import { BaseLoginPage } from "./widgets/BaseLoginpage";
+import { BaseAccommodationsRoute } from "./widgets/accommodations/BaseAccommodationsRoute";
+import { BaseGenealogyRoute } from "./widgets/genealogy/BaseGenealogyRoute";
 
 interface AuthContext {
   signedIn: boolean;
@@ -110,6 +114,22 @@ export function App(): React.ReactElement {
                 <Route path="*" element={<NotFoundRoute />} />
               </Route>
 
+              <Route
+                path="accommodations/*"
+                element={<BaseAccommodationsRoute />}
+              >
+                <Route path="" element={<AccommodationsHomeRoute />} />
+                <Route
+                  path="reservations"
+                  element={<AccommodationsReservationsRoute />}
+                />
+                <Route
+                  path="settings"
+                  element={<AccommodationsSettingsRoute />}
+                />
+                <Route path="*" element={<NotFoundRoute />} />
+              </Route>
+
               <Route path="settings" element={<FamilySettingsRoute />} />
               <Route path="users" element={<FamilyUsersListRoute />} />
               <Route path="*" element={<NotFoundRoute />} />

geneit_app/src/api/FamilyApi.ts

@@ -88,10 +88,12 @@ export class Family implements FamilyAPI {
 export class ExtendedFamilyInfo extends Family {
   public disable_couple_photos: boolean;
   public enable_genealogy: boolean;
+  public enable_accommodations: boolean;
   constructor(p: any) {
     super(p);
     this.disable_couple_photos = p.disable_couple_photos;
     this.enable_genealogy = p.enable_genealogy;
+    this.enable_accommodations = p.enable_accommodations;
   }
 }
 
@@ -235,6 +237,7 @@ export class FamilyApi {
     id: number;
     name?: string;
     enable_genealogy?: boolean;
+    enable_accommodations?: boolean;
     disable_couple_photos?: boolean;
   }): Promise<void> {
     await APIClient.exec({
@@ -243,6 +246,7 @@ export class FamilyApi {
       jsonData: {
         name: settings.name,
         enable_genealogy: settings.enable_genealogy,
+        enable_accommodations: settings.enable_accommodations,
         disable_couple_photos: settings.disable_couple_photos,
       },
     });

geneit_app/src/api/ServerApi.ts

@@ -32,6 +32,9 @@ interface Constraints {
   member_country: LenConstraint;
   member_sex: LenConstraint;
   member_note: LenConstraint;
+  accommodation_name_len: LenConstraint;
+  accommodation_description_len: LenConstraint;
+  accommodation_calendar_name_len: LenConstraint;
 }
 
 interface OIDCProvider {

geneit_app/src/api/accommodations/AccommodationListApi.tsx

@@ -0,0 +1,124 @@
+import { APIClient } from "../ApiClient";
+import { Family } from "../FamilyApi";
+
+export interface Accommodation {
+  id: number;
+  family_id: number;
+  time_create: number;
+  time_update: number;
+  name: string;
+  need_validation: boolean;
+  description?: string;
+  color?: string;
+  open_to_reservations: boolean;
+}
+
+export class AccommodationsList {
+  private list: Accommodation[];
+  private map: Map<number, Accommodation>;
+
+  constructor(list: Accommodation[]) {
+    this.list = list;
+    this.map = new Map();
+
+    for (const m of list) {
+      this.map.set(m.id, m);
+    }
+
+    this.list.sort((a, b) =>
+      a.name.toLowerCase().localeCompare(b.name.toLocaleLowerCase())
+    );
+  }
+
+  public get isEmpty(): boolean {
+    return this.list.length === 0;
+  }
+
+  public get size(): number {
+    return this.list.length;
+  }
+
+  public get fullList(): Accommodation[] {
+    return this.list;
+  }
+
+  filter(predicate: (m: Accommodation) => boolean): Accommodation[] {
+    return this.list.filter(predicate);
+  }
+
+  get openToReservationList(): Accommodation[] {
+    return this.filter((a) => a.open_to_reservations);
+  }
+
+  get(id: number): Accommodation | undefined {
+    return this.map.get(id);
+  }
+}
+
+export interface UpdateAccommodation {
+  name: string;
+  need_validation: boolean;
+  description?: string;
+  color?: string;
+  open_to_reservations: boolean;
+}
+
+export class AccommodationListApi {
+  /**
+   * Get the list of accommodation of a family
+   */
+  static async GetListOfFamily(family: Family): Promise<AccommodationsList> {
+    const data = (
+      await APIClient.exec({
+        method: "GET",
+        uri: `/family/${family.family_id}/accommodations/list/list`,
+      })
+    ).data;
+
+    return new AccommodationsList(data);
+  }
+
+  /**
+   * Create a new accommodation
+   */
+  static async Create(
+    family: Family,
+    accommodation: UpdateAccommodation
+  ): Promise<Accommodation> {
+    return (
+      await APIClient.exec({
+        method: "POST",
+        uri: `/family/${family.family_id}/accommodations/list/create`,
+        jsonData: accommodation,
+      })
+    ).data;
+  }
+
+  /**
+   * Update an accommodation
+   */
+  static async Update(
+    accommodation: Accommodation,
+    update: UpdateAccommodation
+  ): Promise<Accommodation> {
+    return (
+      await APIClient.exec({
+        method: "PUT",
+        uri: `/family/${accommodation.family_id}/accommodations/list/${accommodation.id}`,
+        jsonData: update,
+      })
+    ).data;
+  }
+
+  /**
+   * Delete an accommodation
+   */
+  static async Delete(accommodation: Accommodation): Promise<Accommodation> {
+    return (
+      await APIClient.exec({
+        method: "DELETE",
+        uri: `/family/${accommodation.family_id}/accommodations/list/${accommodation.id}`,
+      })
+    ).data;
+  }
+}

geneit_app/src/api/accommodations/AccommodationsCalendarURLApi.tsx

@@ -0,0 +1,69 @@
+import { APIClient } from "../ApiClient";
+import { Family } from "../FamilyApi";
+
+export interface NewCalendarURL {
+  accommodation_id?: number;
+  name: string;
+}
+
+export interface AccommodationCalendarURL {
+  id: number;
+  family_id: number;
+  accommodation_id: number;
+  user_id: number;
+  name: string;
+  token: string;
+  time_create: number;
+  time_used: number;
+}
+
+export class AccommodationsCalendarURLApi {
+  /**
+   * Create a new accommodation calendar URL
+   */
+  static async Create(
+    family: Family,
+    calendar: NewCalendarURL
+  ): Promise<AccommodationCalendarURL> {
+    return (
+      await APIClient.exec({
+        method: "POST",
+        uri: `/family/${family.family_id}/accommodations/reservations_calendars/create`,
+        jsonData: calendar,
+      })
+    ).data;
+  }
+
+  /**
+   * Get accommodation calendar URL route
+   */
+  static CalendarURL(c: AccommodationCalendarURL): string {
+    return `${APIClient.backendURL()}/acccommodations_calendar/${c.token}`;
+  }
+
+  /**
+   * Get accommodations calendars list
+   */
+  static async GetList(family: Family): Promise<AccommodationCalendarURL[]> {
+    return (
+      await APIClient.exec({
+        method: "GET",
+        uri: `/family/${family.family_id}/accommodations/reservations_calendars/list`,
+      })
+    ).data;
+  }
+
+  /**
+   * Delete an accommodation calendar
+   */
+  static async Delete(
+    calendar: AccommodationCalendarURL
+  ): Promise<AccommodationCalendarURL> {
+    return (
+      await APIClient.exec({
+        method: "DELETE",
+        uri: `/family/${calendar.family_id}/accommodations/reservations_calendars/${calendar.id}`,
+      })
+    ).data;
+  }
+}

geneit_app/src/api/accommodations/AccommodationsReservationsApi.tsx

@@ -0,0 +1,175 @@
+import { APIClient } from "../ApiClient";
+import { Family } from "../FamilyApi";
+import { Accommodation } from "./AccommodationListApi";
+
+export enum ValidateResaResult {
+  Success,
+  Error,
+  Conflict,
+}
+
+export interface AccommodationReservation {
+  id: number;
+  family_id: number;
+  accommodation_id: number;
+  user_id: number;
+  time_create: number;
+  time_update: number;
+  reservation_start: number;
+  reservation_end: number;
+  validated?: boolean;
+}
+
+export class AccommodationsReservationsList {
+  private list: AccommodationReservation[];
+  private map: Map<number, AccommodationReservation>;
+
+  constructor(list: AccommodationReservation[]) {
+    this.list = list;
+    this.map = new Map();
+
+    for (const m of list) {
+      this.map.set(m.id, m);
+    }
+
+    this.list.sort((a, b) => a.reservation_start - b.reservation_start);
+  }
+
+  public get isEmpty(): boolean {
+    return this.list.length === 0;
+  }
+
+  public get size(): number {
+    return this.list.length;
+  }
+
+  public get fullList(): AccommodationReservation[] {
+    return this.list;
+  }
+
+  filter(
+    predicate: (m: AccommodationReservation) => boolean
+  ): AccommodationReservation[] {
+    return this.list.filter(predicate);
+  }
+
+  forAccommodation(id: number): AccommodationReservation[] {
+    return this.filter((a) => a.accommodation_id === id);
+  }
+
+  get(id: number): AccommodationReservation | undefined {
+    return this.map.get(id);
+  }
+}
+
+export interface UpdateAccommodationReservation {
+  start: number;
+  end: number;
+  accommodation_id: number;
+  reservation_id?: number;
+}
+
+export class AccommodationsReservationsApi {
+  /**
+   * Create a new reservation
+   */
+  static async Create(
+    family: Family,
+    reservation: UpdateAccommodationReservation
+  ): Promise<AccommodationReservation> {
+    return (
+      await APIClient.exec({
+        method: "POST",
+        uri: `/family/${family.family_id}/accommodations/reservations/accommodation/${reservation.accommodation_id}/create`,
+        jsonData: {
+          start: reservation.start,
+          end: reservation.end,
+        },
+      })
+    ).data;
+  }
+
+  /**
+   * Get the entire list of accommodations of a family
+   */
+  static async FullListOfFamily(
+    family: Family
+  ): Promise<AccommodationsReservationsList> {
+    const data = (
+      await APIClient.exec({
+        method: "GET",
+        uri: `/family/${family.family_id}/accommodations/reservations/full_list`,
+      })
+    ).data;
+
+    return new AccommodationsReservationsList(data);
+  }
+
+  /**
+   * Get the reservations of a given time interval for an accommodation
+   */
+  static async ReservationsForInterval(
+    family: Family,
+    accommodation: Accommodation,
+    start: number,
+    end: number
+  ): Promise<AccommodationsReservationsList> {
+    const data = (
+      await APIClient.exec({
+        method: "GET",
+        uri: `/family/${family.family_id}/accommodations/reservations/accommodation/${accommodation.id}/for_interval?start=${start}&end=${end}`,
+      })
+    ).data;
+
+    return new AccommodationsReservationsList(data);
+  }
+
+  /**
+   * Update a reservation
+   */
+  static async Update(
+    family: Family,
+    r: UpdateAccommodationReservation
+  ): Promise<void> {
+    await APIClient.exec({
+      method: "PATCH",
+      uri: `/family/${family.family_id}/accommodations/reservation/${r.reservation_id}`,
+      jsonData: {
+        start: r.start,
+        end: r.end,
+      },
+    });
+  }
+
+  /**
+   * Delete a reservation
+   */
+  static async Delete(r: AccommodationReservation): Promise<void> {
+    await APIClient.exec({
+      method: "DELETE",
+      uri: `/family/${r.family_id}/accommodations/reservation/${r.id}`,
+    });
+  }
+
+  /**
+   * Validate or reject a reservation request
+   */
+  static async Validate(
+    r: AccommodationReservation,
+    accept: boolean
+  ): Promise<ValidateResaResult> {
+    const res = await APIClient.exec({
+      method: "POST",
+      uri: `/family/${r.family_id}/accommodations/reservation/${r.id}/validate`,
+      jsonData: {
+        validate: accept,
+      },
+      allowFail: true,
+    });
+
+    if (res.status >= 200 && res.status <= 299)
+      return ValidateResaResult.Success;
+    if (res.status === 409) return ValidateResaResult.Conflict;
+    return ValidateResaResult.Error;
+  }
+}

geneit_app/src/dialogs/accommodations/CreateAccommodationCalendarURLDialog.tsx

@@ -0,0 +1,92 @@
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+} from "@mui/material";
+import React from "react";
+import { ServerApi } from "../../api/ServerApi";
+import { NewCalendarURL } from "../../api/accommodations/AccommodationsCalendarURLApi";
+import { checkConstraint } from "../../utils/form_utils";
+import { useAccommodations } from "../../widgets/accommodations/BaseAccommodationsRoute";
+import { PropEdit } from "../../widgets/forms/PropEdit";
+import { PropSelect } from "../../widgets/forms/PropSelect";
+
+export function CreateAccommodationCalendarURLDialog(p: {
+  open: boolean;
+  onClose: () => void;
+  onSubmitted: (c: NewCalendarURL) => void;
+}): React.ReactElement {
+  const [calendar, setCalendar] = React.useState<NewCalendarURL>({ name: "" });
+
+  const accommodations = useAccommodations();
+
+  const nameErr = checkConstraint(
+    ServerApi.Config.constraints.accommodation_calendar_name_len,
+    calendar?.name
+  );
+
+  const clearForm = () => {
+    setCalendar({ name: "" });
+  };
+
+  const cancel = () => {
+    clearForm();
+    p.onClose();
+  };
+
+  const submit = async () => {
+    clearForm();
+    p.onSubmitted(calendar!);
+  };
+
+  return (
+    <Dialog open={p.open} onClose={cancel}>
+      <DialogTitle>Création d'un calendrier</DialogTitle>
+      <DialogContent style={{ display: "flex", flexDirection: "column" }}>
+        <PropEdit
+          editable
+          label="Nom"
+          value={calendar?.name}
+          onValueChange={(s) =>
+            setCalendar((a) => {
+              return {
+                ...a!,
+                name: s!,
+              };
+            })
+          }
+          size={ServerApi.Config.constraints.accommodation_calendar_name_len}
+          helperText={nameErr}
+        />
+
+        <PropSelect
+          editing
+          label="Logement ciblé"
+          onValueChange={(v) => {
+            setCalendar((a) => {
+              return {
+                ...a!,
+                accommodation_id: v !== "A" && v ? Number(v) : undefined,
+              };
+            });
+          }}
+          options={[
+            { label: "Tous les logements", value: "A" },
+            ...accommodations.accommodations.fullList.map((a) => {
+              return { label: a.name, value: a.id.toString() };
+            }),
+          ]}
+          value={calendar.accommodation_id?.toString() ?? "A"}
+        />
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={cancel}>Annuler</Button>
+        <Button onClick={submit} disabled={!!nameErr}>
+          Créer
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+}

geneit_app/src/dialogs/accommodations/InstallCalendarDialog.tsx

@@ -0,0 +1,72 @@
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  FormControl,
+  IconButton,
+  InputAdornment,
+  OutlinedInput,
+  Typography,
+} from "@mui/material";
+import QRCode from "react-qr-code";
+import {
+  AccommodationCalendarURL,
+  AccommodationsCalendarURLApi,
+} from "../../api/accommodations/AccommodationsCalendarURLApi";
+import { CopyToClipboard } from "../../widgets/CopyToClipboard";
+
+export function InstallCalendarDialog(p: {
+  cal?: AccommodationCalendarURL;
+  onClose: () => void;
+}): React.ReactElement {
+  if (!p.cal) return <></>;
+
+  return (
+    <Dialog open={true} onClose={p.onClose}>
+      <DialogTitle>Installation du calendrier</DialogTitle>
+      <DialogContent>
+        <DialogContentText>
+          <Typography>
+            Afin d'installer le calendrier <i>{p.cal.name}</i> sur votre
+            appareil, veuillez utiliser l'URL suivante :
+          </Typography>
+          <br />
+          <FormControl fullWidth variant="outlined">
+            <OutlinedInput
+              value={AccommodationsCalendarURLApi.CalendarURL(p.cal!)}
+              endAdornment={
+                <InputAdornment position="end">
+                  <CopyToClipboard
+                    content={AccommodationsCalendarURLApi.CalendarURL(p.cal!)}
+                  >
+                    <IconButton>
+                      <ContentCopyIcon />
+                    </IconButton>
+                  </CopyToClipboard>
+                </InputAdornment>
+              }
+            />
+            <div
+              style={{
+                margin: "20px auto",
+                padding: "20px",
+                backgroundColor: "white",
+              }}
+            >
+              <QRCode
+                value={AccommodationsCalendarURLApi.CalendarURL(p.cal!)}
+              />
+            </div>
+          </FormControl>
+        </DialogContentText>
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={p.onClose}>Fermer</Button>
+      </DialogActions>
+    </Dialog>
+  );
+}

geneit_app/src/dialogs/accommodations/UpdateAccommodationDialog.tsx

@@ -0,0 +1,155 @@
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Tooltip,
+} from "@mui/material";
+import React from "react";
+import { ServerApi } from "../../api/ServerApi";
+import { UpdateAccommodation } from "../../api/accommodations/AccommodationListApi";
+import { checkConstraint } from "../../utils/form_utils";
+import { PropCheckbox } from "../../widgets/forms/PropCheckbox";
+import { PropEdit } from "../../widgets/forms/PropEdit";
+import { PropColorPicker } from "../../widgets/forms/PropColorPicker";
+
+export function UpdateAccommodationDialog(p: {
+  open: boolean;
+  create: boolean;
+  onClose: () => void;
+  onSubmitted: (c: UpdateAccommodation) => void;
+  accommodation: UpdateAccommodation | undefined;
+}): React.ReactElement {
+  const [accommodation, setAccommodation] = React.useState<
+    UpdateAccommodation | undefined
+  >();
+
+  const nameErr = checkConstraint(
+    ServerApi.Config.constraints.accommodation_name_len,
+    accommodation?.name
+  );
+  const descriptionErr = checkConstraint(
+    ServerApi.Config.constraints.accommodation_description_len,
+    accommodation?.description
+  );
+
+  const clearForm = () => {
+    setAccommodation(undefined);
+  };
+
+  const cancel = () => {
+    clearForm();
+    p.onClose();
+  };
+
+  const submit = async () => {
+    clearForm();
+    p.onSubmitted(accommodation!);
+  };
+
+  React.useEffect(() => {
+    if (!accommodation) setAccommodation(p.accommodation);
+  }, [p.open, p.accommodation]);
+
+  return (
+    <Dialog open={p.open} onClose={cancel}>
+      <DialogTitle>
+        {p.create ? "Création" : "Mise à jour"} d'un logement
+      </DialogTitle>
+      <DialogContent style={{ display: "flex", flexDirection: "column" }}>
+        <PropEdit
+          editable
+          label="Nom"
+          value={accommodation?.name}
+          onValueChange={(s) =>
+            setAccommodation((a) => {
+              return {
+                ...a!,
+                name: s!,
+              };
+            })
+          }
+          size={ServerApi.Config.constraints.accommodation_name_len}
+          helperText={nameErr}
+        />
+
+        <PropEdit
+          editable
+          label="Description"
+          value={accommodation?.description}
+          onValueChange={(s) =>
+            setAccommodation((a) => {
+              return {
+                ...a!,
+                description: s!,
+              };
+            })
+          }
+          size={ServerApi.Config.constraints.accommodation_description_len}
+          helperText={descriptionErr}
+        />
+
+        <PropColorPicker
+          editable
+          label="Couleur"
+          value={accommodation?.color}
+          onChange={(s) =>
+            setAccommodation((a) => {
+              return {
+                ...a!,
+                color: s!,
+              };
+            })
+          }
+        />
+
+        <PropCheckbox
+          editable
+          label="Ouvert aux réservations"
+          checked={accommodation?.open_to_reservations === true}
+          onValueChange={(c) =>
+            setAccommodation((a) => {
+              return {
+                ...a!,
+                open_to_reservations: c,
+              };
+            })
+          }
+        />
+
+        <Tooltip
+          title={
+            "Permet de spécifier si un administrateur de la famille doit valider manuellement les demandes de réservation pour qu'elles soient validées"
+          }
+        >
+          <PropCheckbox
+            checkboxAlwaysVisible
+            editable={accommodation?.open_to_reservations === true}
+            label="Validation des réservations par un administrateur requise"
+            checked={accommodation?.need_validation === true}
+            onValueChange={(c) =>
+              setAccommodation((a) => {
+                return {
+                  ...a!,
+                  need_validation: c,
+                };
+              })
+            }
+          />
+        </Tooltip>
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={cancel}>Annuler</Button>
+        <Button
+          onClick={submit}
+          disabled={
+            !!nameErr || (!!accommodation?.description && !!descriptionErr)
+          }
+        >
+          {p.create ? "Créer" : "Mettre à jour"}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+}

geneit_app/src/dialogs/accommodations/UpdateReservationDialog.tsx

@@ -0,0 +1,192 @@
+import {
+  Alert,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+} from "@mui/material";
+import React from "react";
+import {
+  AccommodationReservation,
+  AccommodationsReservationsApi,
+  UpdateAccommodationReservation,
+} from "../../api/accommodations/AccommodationsReservationsApi";
+import { useAlert } from "../../hooks/context_providers/AlertDialogProvider";
+import { fmtUnixDate } from "../../utils/time_utils";
+import { useFamily } from "../../widgets/BaseFamilyRoute";
+import { useAccommodations } from "../../widgets/accommodations/BaseAccommodationsRoute";
+import { PropDateInput } from "../../widgets/forms/PropDateInput";
+import { PropSelect } from "../../widgets/forms/PropSelect";
+
+export function UpdateReservationDialog(p: {
+  open: boolean;
+  create: boolean;
+  reservation?: UpdateAccommodationReservation;
+  onClose: () => void;
+  onSubmitted: (c: UpdateAccommodationReservation) => void;
+}): React.ReactElement {
+  const alert = useAlert();
+
+  const family = useFamily();
+  const accommodations = useAccommodations();
+
+  const [reservation, setReservation] = React.useState<
+    UpdateAccommodationReservation | undefined
+  >();
+
+  const [conflicts, setConflicts] = React.useState<
+    AccommodationReservation[] | undefined
+  >(undefined);
+
+  const clearForm = () => {
+    setReservation(undefined);
+  };
+
+  const cancel = () => {
+    clearForm();
+    p.onClose();
+  };
+
+  const submit = async () => {
+    clearForm();
+    p.onSubmitted(reservation!);
+  };
+
+  React.useEffect(() => {
+    if (!reservation) setReservation(p.reservation);
+  }, [p.open, p.reservation]);
+
+  React.useEffect(() => {
+    setConflicts(undefined);
+    (async () => {
+      try {
+        if (
+          !reservation ||
+          reservation.accommodation_id < 1 ||
+          reservation.start < 1 ||
+          reservation.start > reservation.end
+        ) {
+          setConflicts([]);
+          return;
+        }
+
+        setConflicts(
+          (
+            await AccommodationsReservationsApi.ReservationsForInterval(
+              family.family,
+              accommodations.accommodations.get(reservation.accommodation_id)!,
+              reservation.start,
+              reservation.end
+            )
+          ).filter(
+            (r) =>
+              r.id !== p.reservation?.reservation_id && r.validated !== false
+          )
+        );
+      } catch (e) {
+        console.error(e);
+        alert(
+          "Echec de la vérification de la présence de conflits de calendrier !"
+        );
+      }
+    })();
+  }, [
+    p.open,
+    reservation?.accommodation_id,
+    reservation?.start,
+    reservation?.end,
+  ]);
+
+  return (
+    <Dialog open={p.open} onClose={cancel}>
+      <DialogTitle>
+        {p.create ? "Création" : "Mise à jour"} d'une réservation
+      </DialogTitle>
+      <DialogContent style={{ display: "flex", flexDirection: "column" }}>
+        <PropSelect
+          editing={p.create}
+          label="Logement ciblé"
+          onValueChange={(v) => {
+            setReservation((a) => {
+              return {
+                ...a!,
+                accommodation_id: Number(v),
+              };
+            });
+          }}
+          options={accommodations.accommodations.openToReservationList.map(
+            (a) => {
+              return { label: a.name, value: a.id.toString() };
+            }
+          )}
+          value={
+            reservation?.accommodation_id === -1
+              ? ""
+              : reservation?.accommodation_id?.toString()
+          }
+        />
+
+        <PropDateInput
+          editable
+          label="Date de début"
+          value={reservation?.start}
+          onChange={(s) => {
+            setReservation((r) => {
+              return { ...r!, start: s ?? -1 };
+            });
+          }}
+          minDate={Math.floor(new Date().getTime() / 1000) - 3600 * 24 * 60}
+          canSetMiddleDay
+        />
+
+        <PropDateInput
+          editable
+          label="Date de fin"
+          value={reservation?.end}
+          lastSecOfDay={true}
+          onChange={(s) => {
+            setReservation((r) => {
+              return { ...r!, end: s ?? -1 };
+            });
+          }}
+          minDate={reservation?.start}
+          canSetMiddleDay
+        />
+
+        {conflicts && conflicts.length > 0 && (
+          <Alert severity="error">
+            <p>
+              Cette réservation est en conflit avec d'autres réservations sur
+              les intervalles suivants :
+            </p>
+            <ul>
+              {conflicts.map((c, num) => (
+                <li key={num}>
+                  Réservation du {fmtUnixDate(c.reservation_start)} au{" "}
+                  {fmtUnixDate(c.reservation_end)}
+                </li>
+              ))}
+            </ul>
+          </Alert>
+        )}
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={cancel}>Annuler</Button>
+        <Button
+          onClick={submit}
+          disabled={
+            !(
+              (reservation?.accommodation_id ?? -1) > 0 &&
+              (reservation?.start ?? -1) > 0 &&
+              (reservation?.end ?? -1) > (reservation?.start ?? 0) &&
+              (conflicts?.length ?? 0) === 0
+            )
+          }
+        >
+          {p.create ? "Créer" : "Mettre à jour"}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+}

geneit_app/src/hooks/context_providers/accommodations/CreateAccommodationCalendarURLDialogProvider.tsx

@@ -0,0 +1,52 @@
+import React, { PropsWithChildren } from "react";
+import { NewCalendarURL } from "../../../api/accommodations/AccommodationsCalendarURLApi";
+import { CreateAccommodationCalendarURLDialog } from "../../../dialogs/accommodations/CreateAccommodationCalendarURLDialog";
+
+type DialogContext = () => Promise<NewCalendarURL | undefined>;
+
+const DialogContextK = React.createContext<DialogContext | null>(null);
+
+export function CreateAccommodationCalendarURLDialogProvider(
+  p: PropsWithChildren
+): React.ReactElement {
+  const [open, setOpen] = React.useState(false);
+
+  const cb = React.useRef<null | ((a: NewCalendarURL | undefined) => void)>(
+    null
+  );
+
+  const handleClose = (res?: NewCalendarURL) => {
+    setOpen(false);
+
+    if (cb.current !== null) cb.current(res);
+    cb.current = null;
+  };
+
+  const hook: DialogContext = () => {
+    setOpen(true);
+
+    return new Promise((res) => {
+      cb.current = res;
+    });
+  };
+
+  return (
+    <>
+      <DialogContextK.Provider value={hook}>
+        {p.children}
+      </DialogContextK.Provider>
+
+      {open && (
+        <CreateAccommodationCalendarURLDialog
+          open={open}
+          onClose={handleClose}
+          onSubmitted={handleClose}
+        />
+      )}
+    </>
+  );
+}
+
+export function useCreateAccommodationCalendarURL(): DialogContext {
+  return React.useContext(DialogContextK)!;
+}

geneit_app/src/hooks/context_providers/accommodations/InstallCalendarDialogProvider.tsx

@@ -0,0 +1,44 @@
+import React, { PropsWithChildren } from "react";
+import { AccommodationCalendarURL } from "../../../api/accommodations/AccommodationsCalendarURLApi";
+import { InstallCalendarDialog } from "../../../dialogs/accommodations/InstallCalendarDialog";
+
+type DialogContext = (cal: AccommodationCalendarURL) => Promise<void>;
+
+const DialogContextK = React.createContext<DialogContext | null>(null);
+
+export function InstallCalendarDialogProvider(
+  p: PropsWithChildren
+): React.ReactElement {
+  const [cal, setCal] = React.useState<AccommodationCalendarURL | undefined>();
+
+  const cb = React.useRef<null | (() => void)>(null);
+
+  const handleClose = () => {
+    setCal(undefined);
+
+    if (cb.current !== null) cb.current();
+    cb.current = null;
+  };
+
+  const hook: DialogContext = (c) => {
+    setCal(c);
+
+    return new Promise((res) => {
+      cb.current = res;
+    });
+  };
+
+  return (
+    <>
+      <DialogContextK.Provider value={hook}>
+        {p.children}
+      </DialogContextK.Provider>
+
+      {cal && <InstallCalendarDialog cal={cal} onClose={handleClose} />}
+    </>
+  );
+}
+
+export function useInstallCalendarDialog(): DialogContext {
+  return React.useContext(DialogContextK)!;
+}

geneit_app/src/hooks/context_providers/accommodations/UpdateAccommodationDialogProvider.tsx

@@ -0,0 +1,64 @@
+import React, { PropsWithChildren } from "react";
+import { UpdateAccommodation } from "../../../api/accommodations/AccommodationListApi";
+import { UpdateAccommodationDialog } from "../../../dialogs/accommodations/UpdateAccommodationDialog";
+
+type DialogContext = (
+  accommodation: UpdateAccommodation,
+  create: boolean
+) => Promise<UpdateAccommodation | undefined>;
+
+const DialogContextK = React.createContext<DialogContext | null>(null);
+
+export function UpdateAccommodationDialogProvider(
+  p: PropsWithChildren
+): React.ReactElement {
+  const [open, setOpen] = React.useState(false);
+
+  const [accommodation, setAccommodation] = React.useState<
+    UpdateAccommodation | undefined
+  >(undefined);
+  const [create, setCreate] = React.useState(false);
+
+  const cb = React.useRef<
+    null | ((a: UpdateAccommodation | undefined) => void)
+  >(null);
+
+  const handleClose = (res?: UpdateAccommodation) => {
+    setOpen(false);
+
+    if (cb.current !== null) cb.current(res);
+    cb.current = null;
+  };
+
+  const hook: DialogContext = (accommodation, create) => {
+    setAccommodation(accommodation);
+    setCreate(create);
+    setOpen(true);
+
+    return new Promise((res) => {
+      cb.current = res;
+    });
+  };
+
+  return (
+    <>
+      <DialogContextK.Provider value={hook}>
+        {p.children}
+      </DialogContextK.Provider>
+
+      {open && (
+        <UpdateAccommodationDialog
+          open={open}
+          accommodation={accommodation}
+          create={create}
+          onClose={handleClose}
+          onSubmitted={handleClose}
+        />
+      )}
+    </>
+  );
+}
+
+export function useUpdateAccommodation(): DialogContext {
+  return React.useContext(DialogContextK)!;
+}

geneit_app/src/hooks/context_providers/accommodations/UpdateReservationDialogProvider.tsx

@@ -0,0 +1,64 @@
+import React, { PropsWithChildren } from "react";
+import { UpdateAccommodationReservation } from "../../../api/accommodations/AccommodationsReservationsApi";
+import { UpdateReservationDialog } from "../../../dialogs/accommodations/UpdateReservationDialog";
+
+type DialogContext = (
+  reservation: UpdateAccommodationReservation,
+  create: boolean
+) => Promise<UpdateAccommodationReservation | undefined>;
+
+const DialogContextK = React.createContext<DialogContext | null>(null);
+
+export function UpdateReservationDialogProvider(
+  p: PropsWithChildren
+): React.ReactElement {
+  const [open, setOpen] = React.useState(false);
+
+  const [reservation, setReservation] = React.useState<
+    UpdateAccommodationReservation | undefined
+  >(undefined);
+  const [create, setCreate] = React.useState(false);
+
+  const cb = React.useRef<
+    null | ((a: UpdateAccommodationReservation | undefined) => void)
+  >(null);
+
+  const handleClose = (res?: UpdateAccommodationReservation) => {
+    setOpen(false);
+
+    if (cb.current !== null) cb.current(res);
+    cb.current = null;
+  };
+
+  const hook: DialogContext = (accommodation, create) => {
+    setReservation(accommodation);
+    setCreate(create);
+    setOpen(true);
+
+    return new Promise((res) => {
+      cb.current = res;
+    });
+  };
+
+  return (
+    <>
+      <DialogContextK.Provider value={hook}>
+        {p.children}
+      </DialogContextK.Provider>
+
+      {open && (
+        <UpdateReservationDialog
+          open={open}
+          reservation={reservation}
+          create={create}
+          onClose={handleClose}
+          onSubmitted={handleClose}
+        />
+      )}
+    </>
+  );
+}
+
+export function useUpdateAccommodationReservation(): DialogContext {
+  return React.useContext(DialogContextK)!;
+}

geneit_app/src/routes/auth/LoginRoute.tsx

@@ -11,7 +11,7 @@ import {
 } from "@mui/material";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
-import Grid from "@mui/material/Grid";
+import Grid from "@mui/material/Grid2";
 import TextField from "@mui/material/TextField";
 import Typography from "@mui/material/Typography";
 import * as React from "react";
@@ -167,7 +167,7 @@ export function LoginRoute(): React.ReactElement {
         </Button>
 
         <Grid container>
-          <Grid item xs>
+          <Grid size={"grow"}>
             <Typography variant="body2" color={"primary"}>
               <Link
                 to="/password_forgotten"
@@ -177,7 +177,7 @@ export function LoginRoute(): React.ReactElement {
               </Link>
             </Typography>
           </Grid>
-          <Grid item>
+          <Grid>
             <Typography variant="body2" color={"primary"}>
               <Link
                 to="/new-account"

geneit_app/src/routes/family/FamilySettingsRoute.tsx

@@ -71,6 +71,9 @@ function FamilySettingsCard(): React.ReactElement {
   const [enableGenealogy, setEnableGenealogy] = React.useState(
     family.family.enable_genealogy
   );
+  const [enableAccommodations, setEnableAccommodations] = React.useState(
+    family.family.enable_accommodations
+  );
 
   const canEdit = family.family.is_admin;
 
@@ -86,6 +89,7 @@ function FamilySettingsCard(): React.ReactElement {
         id: family.family.family_id,
         name: newName,
         enable_genealogy: enableGenealogy,
+        enable_accommodations: enableAccommodations,
       });
 
       family.reloadFamilyInfo();
@@ -118,14 +122,12 @@ function FamilySettingsCard(): React.ReactElement {
             label="Identifiant"
             value={family.family.family_id}
           />
-
           <TextField
             disabled
             fullWidth
             label="Création de la famille"
             value={formatDate(family.family.time_create)}
           />
-
           <TextField
             fullWidth
             label="Nom de la famille"
@@ -136,7 +138,6 @@ function FamilySettingsCard(): React.ReactElement {
               maxLength: ServerApi.Config.constraints.family_name_len.max,
             }}
           />
-
           <FormControlLabel
             disabled={!canEdit}
             control={
@@ -147,6 +148,16 @@ function FamilySettingsCard(): React.ReactElement {
             }
             label="Activer le module de généalogie"
           />
+          <FormControlLabel
+            disabled={!canEdit}
+            control={
+              <Switch
+                checked={enableAccommodations}
+                onChange={(_e, c) => setEnableAccommodations(c)}
+              />
+            }
+            label="Activer le module de réservation de logements"
+          />
         </Box>
       </CardContent>
       <CardActions>

geneit_app/src/routes/family/accommodations/AccommodationsHomeRoute.tsx

@@ -0,0 +1,21 @@
+import { FamilyPageTitle } from "../../../widgets/FamilyPageTitle";
+import { useAccommodations } from "../../../widgets/accommodations/BaseAccommodationsRoute";
+
+export function AccommodationsHomeRoute(): React.ReactElement {
+  const accommodations = useAccommodations();
+  return (
+    <>
+      <FamilyPageTitle title="Réservation de logements" />
+      <div style={{ margin: "20px" }}>
+        <p>
+          Depuis cette section de l'application, vous pouvez effectuer des
+          réservations de logements.
+        </p>
+        <p>&nbsp;</p>
+        <p>
+          Nombre de logements définis : {accommodations.accommodations.size}
+        </p>
+      </div>
+    </>
+  );
+}

geneit_app/src/routes/family/accommodations/AccommodationsReservationsRoute.tsx

@@ -0,0 +1,598 @@
+import { DateSelectArg, EventClickArg } from "@fullcalendar/core";
+import frLocale from "@fullcalendar/core/locales/fr";
+import dayGridPlugin from "@fullcalendar/daygrid";
+import interactionPlugin from "@fullcalendar/interaction";
+import listPlugin from "@fullcalendar/list";
+import FullCalendar from "@fullcalendar/react";
+import DeleteIcon from "@mui/icons-material/Delete";
+import EditIcon from "@mui/icons-material/Edit";
+import RuleIcon from "@mui/icons-material/Rule";
+import {
+  Alert,
+  Avatar,
+  Card,
+  CardActions,
+  CardContent,
+  CardHeader,
+  Checkbox,
+  FormControl,
+  FormControlLabel,
+  FormGroup,
+  FormLabel,
+  IconButton,
+  Menu,
+  MenuItem,
+  Popover,
+  Tooltip,
+  Typography,
+} from "@mui/material";
+import { red } from "@mui/material/colors";
+import React from "react";
+import { FamilyApi, FamilyUser } from "../../../api/FamilyApi";
+import { Accommodation } from "../../../api/accommodations/AccommodationListApi";
+import {
+  AccommodationReservation,
+  AccommodationsReservationsApi,
+  AccommodationsReservationsList,
+  ValidateResaResult,
+} from "../../../api/accommodations/AccommodationsReservationsApi";
+import { useAlert } from "../../../hooks/context_providers/AlertDialogProvider";
+import { useConfirm } from "../../../hooks/context_providers/ConfirmDialogProvider";
+import { useLoadingMessage } from "../../../hooks/context_providers/LoadingMessageProvider";
+import { useSnackbar } from "../../../hooks/context_providers/SnackbarProvider";
+import { useUpdateAccommodationReservation } from "../../../hooks/context_providers/accommodations/UpdateReservationDialogProvider";
+import {
+  fmtUnixDate,
+  fmtUnixDateFullCalendar,
+} from "../../../utils/time_utils";
+import { AsyncWidget } from "../../../widgets/AsyncWidget";
+import { useUser } from "../../../widgets/BaseAuthenticatedPage";
+import { useFamily } from "../../../widgets/BaseFamilyRoute";
+import { FamilyPageTitle } from "../../../widgets/FamilyPageTitle";
+import { useAccommodations } from "../../../widgets/accommodations/BaseAccommodationsRoute";
+
+export function AccommodationsReservationsRoute(): React.ReactElement {
+  const snackbar = useSnackbar();
+  const alert = useAlert();
+  const confirm = useConfirm();
+  const loadingMessage = useLoadingMessage();
+
+  const loadKey = React.useRef(1);
+
+  const user = useUser();
+  const family = useFamily();
+  const accommodations = useAccommodations();
+  const updateReservation = useUpdateAccommodationReservation();
+
+  const [reservations, setReservations] = React.useState<
+    AccommodationsReservationsList | undefined
+  >();
+  const [users, setUsers] = React.useState<FamilyUser[] | null>(null);
+
+  const [showValidated, setShowValidated] = React.useState(true);
+  const [showRejected, setShowRejected] = React.useState(true);
+  const [showPending, setShowPending] = React.useState(true);
+
+  const [hiddenPeople, setHiddenPeople] = React.useState<Set<number>>(
+    new Set()
+  );
+  const [hiddenAccommodations, setHiddenAccommodations] = React.useState<
+    Set<number>
+  >(new Set());
+
+  const eventPopupAnchor = React.useRef<HTMLDivElement>(null);
+  const [activeEvent, setActiveEvent] = React.useState<
+    | undefined
+    | {
+        user: FamilyUser;
+        accommodation: Accommodation;
+        reservation: AccommodationReservation;
+
+        x: number;
+        y: number;
+        w: number;
+        h: number;
+      }
+  >();
+
+  const [validateResaAnchorEl, setValidateResaAnchorEl] =
+    React.useState<null | HTMLElement>(null);
+
+  const load = async () => {
+    setReservations(
+      await AccommodationsReservationsApi.FullListOfFamily(family.family)
+    );
+    setUsers(await FamilyApi.GetUsersList(family.family.family_id));
+  };
+
+  const reload = async () => {
+    loadKey.current += 1;
+    setUsers(null);
+  };
+
+  const visibleReservations = React.useMemo(() => {
+    return reservations?.filter((r) => {
+      if (!showValidated && r.validated === true) return false;
+      if (!showPending && r.validated === null) return false;
+      if (!showRejected && r.validated === false) return false;
+      if (hiddenPeople.has(r.user_id)) return false;
+      if (hiddenAccommodations.has(r.accommodation_id)) return false;
+      return true;
+    });
+  }, [
+    showValidated,
+    showRejected,
+    showPending,
+    hiddenPeople,
+    hiddenAccommodations,
+    reservations,
+  ]);
+
+  const onSelect = async (d: DateSelectArg) => {
+    try {
+      const resa = await updateReservation(
+        {
+          accommodation_id: -1,
+          start: Math.floor(d.start.getTime() / 1000),
+          end: Math.floor(d.end.getTime() / 1000),
+        },
+        true
+      );
+
+      if (!resa) return;
+
+      loadingMessage.show("Création de la réservation en cours...");
+
+      await AccommodationsReservationsApi.Create(family.family, resa);
+
+      reload();
+      snackbar("La réservation a été créée avec succès !");
+    } catch (e) {
+      console.error("Failed to create a reservation!", e);
+      alert("Échec de la création de la réservation!");
+    } finally {
+      loadingMessage.hide();
+    }
+  };
+
+  const onEventClick = (ev: EventClickArg) => {
+    const id: number = ev.event.extendedProps.id;
+    const resa = reservations?.get(id)!;
+    const acc = accommodations.accommodations.get(resa.accommodation_id)!;
+
+    const user = users?.find((u) => u.user_id === resa.user_id);
+
+    if (!user) {
+      console.error(`User ${resa.user_id} not found!`);
+      return;
+    }
+
+    const loc = ev.el.getBoundingClientRect();
+    setActiveEvent({
+      reservation: resa,
+      accommodation: acc,
+      user: user,
+
+      x: loc.left,
+      y: loc.top,
+      w: loc.width,
+      h: loc.height,
+    });
+  };
+
+  const respondToResaRequest = async (
+    r: AccommodationReservation,
+    validate: boolean
+  ) => {
+    try {
+      loadingMessage.show("Validation de la réservation en cours...");
+
+      setValidateResaAnchorEl(null);
+      setActiveEvent(undefined);
+
+      const res = await AccommodationsReservationsApi.Validate(r, validate);
+
+      if (res === ValidateResaResult.Conflict) {
+        throw new Error(
+          "The reservation is in conflict with other reservations!"
+        );
+      } else if (res === ValidateResaResult.Error) {
+        throw new Error("Failed to validate the reservation!");
+      }
+
+      reload();
+      snackbar("La réservation a été mise à jour avec succès !");
+    } catch (e) {
+      console.error("Failed to respond to reservation request!", e);
+      alert(`Echec de l'enregistrement de la réponse à la réservation ! ${e}`);
+    } finally {
+      loadingMessage.hide();
+    }
+  };
+
+  const validateReservation = async (r: AccommodationReservation) => {
+    respondToResaRequest(r, true);
+  };
+
+  const rejectReservation = async (r: AccommodationReservation) => {
+    if (
+      !(await confirm(
+        "Voulez-vous vraiment rejeter cette demande de réservation ?"
+      ))
+    )
+      return;
+    respondToResaRequest(r, false);
+  };
+
+  const changeReservation = async (r: AccommodationReservation) => {
+    try {
+      const ac = accommodations.accommodations.get(r.accommodation_id);
+      if (
+        ac?.need_validation &&
+        !(await confirm(
+          "Voulez-vous vraiment changer cette réservation ? Celle-ci devra être de nouveau validée !"
+        ))
+      )
+        return;
+
+      const newResa = await updateReservation(
+        {
+          reservation_id: r.id,
+          accommodation_id: r.accommodation_id,
+          start: r.reservation_start,
+          end: r.reservation_end,
+        },
+        false
+      );
+
+      if (!newResa) return;
+
+      setActiveEvent(undefined);
+      loadingMessage.show("Mise à jour de la réservation en cours...");
+
+      await AccommodationsReservationsApi.Update(family.family, newResa);
+
+      reload();
+      snackbar("La réservation a été mise à jour avec succès !");
+    } catch (e) {
+      console.error("Failed to update a reservation!", e);
+      alert("Échec de la mise à jour de la réservation!");
+    } finally {
+      loadingMessage.hide();
+    }
+  };
+
+  const deleteReservation = async (r: AccommodationReservation) => {
+    try {
+      if (
+        !(await confirm(
+          "Voulez-vous vraiment supprimer cette réservation ? L'opération n'est pas réversible !"
+        ))
+      )
+        return;
+
+      setActiveEvent(undefined);
+      loadingMessage.show("Suppression de la réservation en cours...");
+
+      await AccommodationsReservationsApi.Delete(r);
+
+      reload();
+      snackbar("La réservation a été supprimée avec succès !");
+    } catch (e) {
+      console.error("Failed to delete a reservation!", e);
+      alert("Échec de la suppression de la réservation!");
+    } finally {
+      loadingMessage.hide();
+    }
+  };
+
+  return (
+    <>
+      <FamilyPageTitle title="Réservations" />
+      <AsyncWidget
+        loadKey={loadKey.current}
+        load={load}
+        errMsg="Echec du chargement de la liste des réservations !"
+        build={() => (
+          <div style={{ display: "flex", flexDirection: "row" }}>
+            <div style={{ flex: 1, maxWidth: "250px", marginRight: "20px" }}>
+              <Alert severity="info">
+                Cliquez sur le calendrier pour créer une réservation.
+              </Alert>
+
+              {/* Invitation status */}
+              <FormControl
+                sx={{ m: 3 }}
+                component="fieldset"
+                variant="standard"
+              >
+                <FormLabel component="legend">Status</FormLabel>
+                <FormGroup>
+                  <FormControlLabel
+                    control={
+                      <Checkbox
+                        checked={showValidated}
+                        onChange={(_ev, v) => setShowValidated(v)}
+                        color="success"
+                      />
+                    }
+                    label="Validées"
+                  />
+                  <FormControlLabel
+                    control={
+                      <Checkbox
+                        checked={showRejected}
+                        onChange={(_ev, v) => setShowRejected(v)}
+                        color="error"
+                      />
+                    }
+                    label="Rejetées"
+                  />
+                  <FormControlLabel
+                    control={
+                      <Checkbox
+                        checked={showPending}
+                        onChange={(_ev, v) => setShowPending(v)}
+                        color="info"
+                      />
+                    }
+                    label="En attente de validation"
+                  />
+                </FormGroup>
+              </FormControl>
+
+              {/* Accommodations */}
+              <FormControl
+                sx={{ m: 3 }}
+                component="fieldset"
+                variant="standard"
+              >
+                <FormLabel component="legend">Logements</FormLabel>
+                <FormGroup>
+                  {accommodations.accommodations.fullList.map((a) => (
+                    <FormControlLabel
+                      key={a.id}
+                      control={
+                        <Checkbox
+                          sx={{
+                            color: "#" + a.color,
+                            "&.Mui-checked": {
+                              color: "#" + a.color,
+                            },
+                          }}
+                          checked={!hiddenAccommodations.has(a.id)}
+                          onChange={(_ev, v) => {
+                            if (v) hiddenAccommodations.delete(a.id);
+                            else hiddenAccommodations.add(a.id);
+                            setHiddenAccommodations(
+                              new Set(hiddenAccommodations)
+                            );
+                          }}
+                        />
+                      }
+                      label={a.name}
+                    />
+                  ))}
+                </FormGroup>
+              </FormControl>
+
+              {/* People */}
+              <FormControl
+                sx={{ m: 3 }}
+                component="fieldset"
+                variant="standard"
+              >
+                <FormLabel component="legend">Personnes</FormLabel>
+                <FormGroup>
+                  {users?.map((u) => (
+                    <FormControlLabel
+                      key={u.user_id}
+                      control={
+                        <Checkbox
+                          checked={!hiddenPeople.has(u.user_id)}
+                          onChange={(_ev, v) => {
+                            if (v) hiddenPeople.delete(u.user_id);
+                            else hiddenPeople.add(u.user_id);
+                            setHiddenPeople(new Set(hiddenPeople));
+                          }}
+                        />
+                      }
+                      label={u.user_name}
+                    />
+                  ))}
+                </FormGroup>
+              </FormControl>
+            </div>
+
+            {/* The calendar */}
+            <div style={{ flex: 5 }}>
+              <FullCalendar
+                editable={true}
+                selectable={true}
+                plugins={[dayGridPlugin, listPlugin, interactionPlugin]}
+                initialView="dayGridMonth"
+                height="700px"
+                locale={frLocale}
+                headerToolbar={{
+                  left: "prev,next today",
+                  center: "title",
+                  right: "dayGridMonth,dayGridWeek,dayGridDay,listWeek",
+                }}
+                select={onSelect}
+                eventClick={onEventClick}
+                events={visibleReservations?.map((r) => {
+                  const a = accommodations.accommodations.get(
+                    r.accommodation_id
+                  )!;
+                  const u = users?.find((u) => u.user_id === r.user_id);
+                  return {
+                    title: `${u?.user_name} - ${a.name}`,
+                    start: fmtUnixDateFullCalendar(r.reservation_start, false),
+                    end: fmtUnixDateFullCalendar(r.reservation_end, true),
+                    allDay: true,
+                    color: a.color ? "#" + a.color : undefined,
+                    borderColor:
+                      r.validated === true
+                        ? "green"
+                        : r.validated === false
+                        ? "red"
+                        : "grey ",
+                    extendedProps: {
+                      id: r.id,
+                    },
+                  };
+                })}
+              />
+            </div>
+
+            {/* Calendar event popover */}
+            <div
+              ref={eventPopupAnchor}
+              id="active-event-anchor"
+              style={{
+                position: "fixed",
+                top: activeEvent?.y + "px",
+                left: activeEvent?.x + "px",
+                width: activeEvent?.w + "px",
+                height: activeEvent?.h + "px",
+                backgroundColor: "pink",
+                zIndex: 0,
+              }}
+            ></div>
+            <Popover
+              open={activeEvent !== undefined}
+              anchorEl={eventPopupAnchor.current}
+              onClose={() => {
+                setActiveEvent(undefined);
+              }}
+              anchorOrigin={{
+                vertical: "bottom",
+                horizontal: "left",
+              }}
+            >
+              <Card sx={{ maxWidth: 345 }} elevation={6}>
+                <CardHeader
+                  avatar={
+                    <Avatar sx={{ bgcolor: red[500] }}>
+                      {activeEvent?.user.user_name
+                        .substring(0, 1)
+                        .toLocaleUpperCase()}
+                    </Avatar>
+                  }
+                  title={activeEvent?.user.user_name}
+                  subheader={activeEvent?.user.user_mail}
+                />
+
+                <CardContent>
+                  <Typography variant="body2" color="text.secondary">
+                    <p>
+                      Réservation de {activeEvent?.accommodation.name}
+                      <br />
+                      <em>{activeEvent?.accommodation.description}</em>
+                    </p>
+                    <p>
+                      Du{" "}
+                      {fmtUnixDate(
+                        activeEvent?.reservation.reservation_start ?? 0
+                      )}{" "}
+                      <br />
+                      Au{" "}
+                      {fmtUnixDate(
+                        activeEvent?.reservation.reservation_end ?? 0
+                      )}
+                    </p>
+                    <p>
+                      <strong>
+                        {activeEvent?.reservation.validated === false ? (
+                          <span style={{ color: "#f44336" }}>Refusée</span>
+                        ) : activeEvent?.reservation.validated === true ? (
+                          <span style={{ color: "#66bb6a" }}>Validée</span>
+                        ) : (
+                          <span style={{ color: "#29b6f6" }}>
+                            En attente de validation
+                          </span>
+                        )}
+                      </strong>
+                    </p>
+                  </Typography>
+                </CardContent>
+                <CardActions disableSpacing>
+                  {activeEvent?.accommodation.need_validation &&
+                    family.family.is_admin && (
+                      <>
+                        <Tooltip
+                          title="Valider (ou rejeter) la réservation"
+                          arrow
+                        >
+                          <IconButton
+                            onClick={(e) =>
+                              setValidateResaAnchorEl(e.currentTarget)
+                            }
+                          >
+                            <RuleIcon />
+                          </IconButton>
+                        </Tooltip>
+                        <Menu
+                          anchorEl={validateResaAnchorEl}
+                          open={!!validateResaAnchorEl && !!activeEvent}
+                          onClose={() => setValidateResaAnchorEl(null)}
+                        >
+                          <MenuItem
+                            disabled={
+                              activeEvent.reservation.validated === true
+                            }
+                            onClick={() =>
+                              validateReservation(activeEvent.reservation)
+                            }
+                          >
+                            Valider
+                          </MenuItem>
+                          <MenuItem
+                            disabled={
+                              activeEvent.reservation.validated === false
+                            }
+                            onClick={() =>
+                              rejectReservation(activeEvent.reservation)
+                            }
+                          >
+                            Rejeter
+                          </MenuItem>
+                        </Menu>
+                      </>
+                    )}
+
+                  {user.user.id === activeEvent?.reservation.user_id && (
+                    <>
+                      <Tooltip title="Modifier les dates de réservation" arrow>
+                        <IconButton
+                          disabled={
+                            !activeEvent.accommodation.open_to_reservations
+                          }
+                          onClick={() =>
+                            changeReservation(activeEvent?.reservation)
+                          }
+                        >
+                          <EditIcon />
+                        </IconButton>
+                      </Tooltip>
+                      <Tooltip title="Supprimer la réservation" arrow>
+                        <IconButton
+                          color="error"
+                          onClick={() =>
+                            deleteReservation(activeEvent?.reservation)
+                          }
+                        >
+                          <DeleteIcon />
+                        </IconButton>
+                      </Tooltip>
+                    </>
+                  )}
+                </CardActions>
+              </Card>
+            </Popover>
+          </div>
+        )}
+      />
+    </>
+  );
+}

geneit_app/src/routes/family/accommodations/AccommodationsSettingsRoute.tsx

@@ -0,0 +1,410 @@
+import AddIcon from "@mui/icons-material/Add";
+import CheckIcon from "@mui/icons-material/Check";
+import CloseIcon from "@mui/icons-material/Close";
+import HouseIcon from "@mui/icons-material/House";
+import {
+  Alert,
+  Button,
+  Card,
+  CardActions,
+  CardContent,
+  Typography,
+} from "@mui/material";
+import React from "react";
+import {
+  Accommodation,
+  AccommodationListApi,
+} from "../../../api/accommodations/AccommodationListApi";
+import {
+  AccommodationCalendarURL,
+  AccommodationsCalendarURLApi,
+} from "../../../api/accommodations/AccommodationsCalendarURLApi";
+import { useConfirm } from "../../../hooks/context_providers/ConfirmDialogProvider";
+import { useLoadingMessage } from "../../../hooks/context_providers/LoadingMessageProvider";
+import { useSnackbar } from "../../../hooks/context_providers/SnackbarProvider";
+import { useCreateAccommodationCalendarURL } from "../../../hooks/context_providers/accommodations/CreateAccommodationCalendarURLDialogProvider";
+import { useInstallCalendarDialog } from "../../../hooks/context_providers/accommodations/InstallCalendarDialogProvider";
+import { useUpdateAccommodation } from "../../../hooks/context_providers/accommodations/UpdateAccommodationDialogProvider";
+import { AsyncWidget } from "../../../widgets/AsyncWidget";
+import { useFamily } from "../../../widgets/BaseFamilyRoute";
+import { FamilyCard } from "../../../widgets/FamilyCard";
+import { TimeWidget } from "../../../widgets/TimeWidget";
+import { useAccommodations } from "../../../widgets/accommodations/BaseAccommodationsRoute";
+
+const CARDS_WIDTH = "500px";
+
+export function AccommodationsSettingsRoute(): React.ReactElement {
+  return (
+    <>
+      <AccommodationsListCard />
+      <AccommodationsCalURLsCard />
+    </>
+  );
+}
+
+function AccommodationsListCard(): React.ReactElement {
+  const loading = useLoadingMessage();
+  const confirm = useConfirm();
+  const snackbar = useSnackbar();
+
+  const family = useFamily();
+  const accommodations = useAccommodations();
+
+  const [error, setError] = React.useState<string>();
+  const [success, setSuccess] = React.useState<string>();
+
+  const updateAccommodation = useUpdateAccommodation();
+
+  const createAccommodation = async () => {
+    setError(undefined);
+    setSuccess(undefined);
+    try {
+      const accommodation = await updateAccommodation(
+        {
+          name: "",
+          open_to_reservations: true,
+          need_validation: false,
+          color: "2196f3",
+        },
+        true
+      );
+
+      if (!accommodation) return;
+
+      loading.show("Création du logement en cours...");
+
+      await AccommodationListApi.Create(family.family, accommodation);
+
+      snackbar("Le logement a été créé avec succès !");
+      await accommodations.reloadAccommodationsList();
+    } catch (e) {
+      console.error("Failed to create accommodation!", e);
+      setError(`Échec de la création du logement! ${e}`);
+    } finally {
+      loading.hide();
+    }
+  };
+
+  const requestUpdateAccommodation = async (a: Accommodation) => {
+    setError(undefined);
+    setSuccess(undefined);
+    try {
+      const update = await updateAccommodation(a, false);
+      if (!update) return;
+
+      loading.show("Mise à jour du logement en cours...");
+
+      await AccommodationListApi.Update(a, update);
+
+      snackbar("Le logement a été créé avec succès !");
+      await accommodations.reloadAccommodationsList();
+    } catch (e) {
+      console.error("Failed to update accommodation!", e);
+      setError(`Échec de la mise à jour du logement! ${e}`);
+    } finally {
+      loading.hide();
+    }
+  };
+
+  const deleteAccommodation = async (a: Accommodation) => {
+    setError(undefined);
+    setSuccess(undefined);
+    try {
+      if (
+        !(await confirm(
+          `Voulez-vous vraiment supprimer le logement '${a.name}' ? Cette opération est définitive !`
+        ))
+      )
+        return;
+      loading.show("Suppression du logement en cours...");
+
+      await AccommodationListApi.Delete(a);
+
+      snackbar("Le logement a été supprimé avec succès !");
+      await accommodations.reloadAccommodationsList();
+    } catch (e) {
+      console.error("Failed to delete accommodation!", e);
+      setError(`Échec de la suppression du logement! ${e}`);
+    } finally {
+      loading.hide();
+    }
+  };
+
+  return (
+    <FamilyCard error={error} success={success} style={{ width: CARDS_WIDTH }}>
+      <CardContent>
+        <Typography gutterBottom variant="h5" component="div">
+          Logements
+        </Typography>
+
+        {/* Display the list of accommodations */}
+        {accommodations.accommodations.isEmpty && (
+          <div style={{ textAlign: "center", margin: "25px" }}>
+            Aucun logement enregistré pour le moment !
+          </div>
+        )}
+        {accommodations.accommodations.fullList.map((a) => (
+          <AccommodationCard
+            accommodation={a}
+            onRequestUpdate={requestUpdateAccommodation}
+            onRequestDelete={deleteAccommodation}
+          />
+        ))}
+
+        {family.family.is_admin && (
+          <Button
+            startIcon={<AddIcon />}
+            variant="outlined"
+            color="info"
+            fullWidth
+            onClick={createAccommodation}
+            size={"large"}
+          >
+            Ajouter un logement
+          </Button>
+        )}
+      </CardContent>
+    </FamilyCard>
+  );
+}
+
+function AccommodationCard(p: {
+  accommodation: Accommodation;
+  onRequestUpdate: (a: Accommodation) => void;
+  onRequestDelete: (a: Accommodation) => void;
+}): React.ReactElement {
+  const family = useFamily();
+  return (
+    <Card sx={{ minWidth: 275, margin: "10px 0px" }} variant="outlined">
+      <CardContent>
+        <Typography sx={{ fontSize: 14 }} color="text.secondary" gutterBottom>
+          Mis à jour il y a <TimeWidget time={p.accommodation.time_update} />
+        </Typography>
+        <Typography variant="h5" component="div">
+          <HouseIcon sx={{ color: "#" + p.accommodation.color }} />{" "}
+          {p.accommodation.name}
+        </Typography>
+        <Typography sx={{ mb: 1.5 }} color="text.secondary">
+          {p.accommodation.description}
+        </Typography>
+        <Typography variant="body2">
+          <BoolIcon checked={p.accommodation.open_to_reservations} /> Ouvert aux
+          réservations
+          <br />
+          <BoolIcon checked={!p.accommodation.need_validation} /> Réservation
+          sans validation d'un administrateur
+        </Typography>
+      </CardContent>
+      {family.family.is_admin && (
+        <CardActions>
+          <span style={{ flex: 1 }}></span>
+          <Button
+            size="small"
+            onClick={() => p.onRequestUpdate(p.accommodation)}
+          >
+            Modifier
+          </Button>
+          <Button
+            size="small"
+            color="error"
+            onClick={() => p.onRequestDelete(p.accommodation)}
+          >
+            Supprimer
+          </Button>
+        </CardActions>
+      )}
+    </Card>
+  );
+}
+
+function BoolIcon(p: { checked?: boolean }): React.ReactElement {
+  return p.checked ? (
+    <CheckIcon color="success" />
+  ) : (
+    <CloseIcon color="error" />
+  );
+}
+
+function AccommodationsCalURLsCard(): React.ReactElement {
+  const key = React.useRef(0);
+
+  const confirm = useConfirm();
+  const loading = useLoadingMessage();
+
+  const [error, setError] = React.useState<string>();
+  const [success, setSuccess] = React.useState<string>();
+
+  const [list, setList] = React.useState<
+    AccommodationCalendarURL[] | undefined
+  >();
+
+  const family = useFamily();
+
+  const createCalendarURLDialog = useCreateAccommodationCalendarURL();
+  const calendarURLDialog = useInstallCalendarDialog();
+
+  const load = async () => {
+    setList(await AccommodationsCalendarURLApi.GetList(family.family));
+  };
+
+  const reload = () => {
+    key.current += 1;
+    setList(undefined);
+  };
+
+  const onRequestDelete = async (c: AccommodationCalendarURL) => {
+    setError(undefined);
+    setSuccess(undefined);
+    try {
+      if (
+        !(await confirm(
+          `Voulez-vous vraiment supprimer le calendrier '${c.name}' ? Cette opération est définitive !`
+        ))
+      )
+        return;
+
+      loading.show("Suppression du calendrier en cours...");
+
+      await AccommodationsCalendarURLApi.Delete(c);
+
+      setSuccess("Le calendrier a été supprimé avec succès !");
+      reload();
+    } catch (e) {
+      console.error("Failed to delete accommodation!", e);
+      setError(`Échec de la suppression du logement! ${e}`);
+    } finally {
+      loading.hide();
+    }
+  };
+
+  const createCalendarURL = async () => {
+    try {
+      const newCal = await createCalendarURLDialog();
+
+      if (!newCal) return;
+
+      loading.show("Création du calendrier en cours...");
+
+      const cal = await AccommodationsCalendarURLApi.Create(
+        family.family,
+        newCal
+      );
+
+      setSuccess("Le calendrier a été créé avec succès !");
+
+      reload();
+
+      calendarURLDialog(cal);
+    } catch (e) {
+      console.error("Failed to create new accommodation calendar URL!", e);
+      setError(`Échec de la création du calendrier! ${e}`);
+    } finally {
+      loading.hide();
+    }
+  };
+
+  return (
+    <FamilyCard error={error} success={success} style={{ width: CARDS_WIDTH }}>
+      <CardContent>
+        <Typography gutterBottom variant="h5" component="div">
+          URL de calendriers
+        </Typography>
+        <Typography>
+          Vous pouvez, si vous le souhaitez, importer dans votre application de
+          calendrier le planning de réservation des logements. Pour ce faire, il
+          vous suffit de créer une URL de calendrier.
+        </Typography>
+
+        <Alert severity="info">
+          Les calendriers créés ici ne sont visible que par vous. Vous ne pouvez
+          pas manipuler les calendriers créés par les autres membres de la
+          famille.
+        </Alert>
+
+        <Button
+          startIcon={<AddIcon />}
+          variant="outlined"
+          color="info"
+          fullWidth
+          onClick={createCalendarURL}
+          size={"large"}
+        >
+          Créer un calendrier
+        </Button>
+
+        <br />
+        <br />
+
+        <AsyncWidget
+          ready={list !== undefined}
+          loadKey={key.current}
+          load={load}
+          errMsg="Echec du chargement de la liste des calendriers !"
+          build={() =>
+            list?.length === 0 ? (
+              <>
+                <p style={{ textAlign: "center" }}>
+                  Vous n'avez créé aucun calendrier pour le moment !
+                </p>
+              </>
+            ) : (
+              <>
+                {list?.map((c) => (
+                  <CalendarItem c={c} onRequestDelete={onRequestDelete} />
+                ))}
+              </>
+            )
+          }
+        />
+      </CardContent>
+    </FamilyCard>
+  );
+}
+
+function CalendarItem(p: {
+  c: AccommodationCalendarURL;
+  onRequestDelete: (c: AccommodationCalendarURL) => void;
+}): React.ReactElement {
+  const accommodations = useAccommodations();
+
+  const installCal = useInstallCalendarDialog();
+
+  return (
+    <Card sx={{ minWidth: 275, margin: "10px 0px" }} variant="outlined">
+      <CardContent>
+        <Typography
+          sx={{ fontSize: 14 }}
+          color="text.secondary"
+          gutterBottom
+        ></Typography>
+        <Typography variant="h5" component="div">
+          {p.c.name}
+        </Typography>
+        <Typography sx={{ mb: 1.5 }} color="text.secondary">
+          {p.c.accommodation_id
+            ? accommodations.accommodations.get(p.c.accommodation_id)?.name
+            : "Tous les logements"}
+        </Typography>
+        <Typography variant="body2">
+          Créé il y a <TimeWidget time={p.c.time_create} />
+          <br />
+          Utilisé il y a <TimeWidget time={p.c.time_used} />
+        </Typography>
+      </CardContent>
+
+      <CardActions>
+        <span style={{ flex: 1 }}></span>
+        <Button size="small" onClick={() => installCal(p.c)}>
+          Installer
+        </Button>
+        <Button
+          size="small"
+          color="error"
+          onClick={() => p.onRequestDelete(p.c)}
+        >
+          Supprimer
+        </Button>
+      </CardActions>
+    </Card>
+  );
+}

geneit_app/src/routes/family/genealogy/FamilyCoupleRoute.tsx

@@ -3,7 +3,8 @@ import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadIcon from "@mui/icons-material/FileDownload";
 import SaveIcon from "@mui/icons-material/Save";
-import { Button, Grid, Stack } from "@mui/material";
+import { Button, Stack } from "@mui/material";
+import Grid from "@mui/material/Grid2";
 import React from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { ServerApi } from "../../../api/ServerApi";
@@ -352,7 +353,7 @@ export function CouplePage(p: {
 
       <Grid container spacing={2}>
         {/* General info */}
-        <Grid item sm={12} md={6}>
+        <Grid size={{ sm: 12, md: 6 }}>
           <PropertiesBox title="Informations générales">
             {/* Husband */}
             <br />
@@ -427,7 +428,7 @@ export function CouplePage(p: {
 
         {
           /* Photo */ !family.family.disable_couple_photos && (
-            <Grid item sm={12} md={6}>
+            <Grid size={{ sm: 12, md: 6 }}>
               <PropertiesBox title="Photo">
                 <div style={{ textAlign: "center" }}>
                   <CouplePhoto couple={couple} width={150} />
@@ -474,7 +475,7 @@ export function CouplePage(p: {
 
         {/* Children */}
         {p.children && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title="Enfants">
               {p.children.length === 0 ? (
                 <>Aucun enfant</>

geneit_app/src/routes/family/genealogy/FamilyMemberRoute.tsx

@@ -7,12 +7,12 @@ import FileDownloadIcon from "@mui/icons-material/FileDownload";
 import SaveIcon from "@mui/icons-material/Save";
 import {
   Button,
-  Grid,
   ListItemAvatar,
   ListItemButton,
   ListItemText,
   Stack,
 } from "@mui/material";
+import Grid from "@mui/material/Grid2";
 import * as EmailValidator from "email-validator";
 import React from "react";
 import { useNavigate, useParams } from "react-router-dom";
@@ -384,7 +384,7 @@ export function MemberPage(p: {
 
       <Grid container spacing={2}>
         {/* General info */}
-        <Grid item sm={12} md={6}>
+        <Grid size={{ sm: 12, md: 6 }}>
           <PropertiesBox title="Informations générales">
             {/* Sex */}
             <SexSelection
@@ -504,7 +504,7 @@ export function MemberPage(p: {
         </Grid>
 
         {/* Photo */}
-        <Grid item sm={12} md={6}>
+        <Grid size={{ sm: 12, md: 6 }}>
           <PropertiesBox title="Photo">
             <div style={{ textAlign: "center" }}>
               <MemberPhoto member={member} width={150} />
@@ -549,7 +549,7 @@ export function MemberPage(p: {
 
         {/* Contact */}
         {(p.editing || member.hasContactInfo) && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title="Contact">
               {/* Email */}
               <PropEdit
@@ -630,7 +630,7 @@ export function MemberPage(p: {
 
         {/* Bio */}
         {(p.editing || member.hasNote) && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title="Biographie">
               <PropEdit
                 label="Biographie"
@@ -651,7 +651,7 @@ export function MemberPage(p: {
 
         {/* Couples */}
         {p.couples && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title={member.sex === "F" ? "Époux" : "Épouse"}>
               {p.couples!.length === 0 ? (
                 <>{member.sex === "F" ? "Aucun époux" : "Aucune épouse"}</>
@@ -678,7 +678,7 @@ export function MemberPage(p: {
 
         {/* Children */}
         {p.children && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title="Enfants">
               {p.children.length === 0 ? (
                 <>Aucun enfant</>
@@ -707,7 +707,7 @@ export function MemberPage(p: {
 
         {/* Siblings */}
         {p.siblings && (
-          <Grid item sm={12} md={6}>
+          <Grid size={{ sm: 12, md: 6 }}>
             <PropertiesBox title="Frères et sœurs">
               {p.siblings.length === 0 ? (
                 <>Aucun frère ou sœur</>

geneit_app/src/utils/form_utils.ts

@@ -0,0 +1,21 @@
+import { LenConstraint } from "../api/ServerApi";
+
+/**
+ * Check if a constraint was respected or not
+ *
+ * @returns An error message appropriate for the constraint
+ * violation, if any, or undefined otherwise
+ */
+export function checkConstraint(
+  constraint: LenConstraint,
+  value: string | undefined
+): string | undefined {
+  value = value ?? "";
+  if (value.length < constraint.min)
+    return `Veuillez indiquer au moins ${constraint.min} caractères !`;
+
+  if (value.length > constraint.max)
+    return `Veuillez indiquer au maximum ${constraint.max} caractères !`;
+
+  return undefined;
+}

geneit_app/src/utils/time_utils.ts

@@ -0,0 +1,31 @@
+/**
+ * Get formatted UNIX date
+ */
+export function fmtUnixDate(time: number): string {
+  return new Date(time * 1000).toLocaleString("fr-FR");
+}
+
+/**
+ * Get formatted UNIX date for Full Calendar
+ */
+export function fmtUnixDateFullCalendar(
+  time: number,
+  correctEnd: boolean
+): string {
+  let d = new Date(time * 1000);
+
+  if (d.getHours() > 0 && correctEnd)
+    d = new Date(time * 1000 + 3600 * 24 * 1000);
+
+  const s = `${d.getFullYear()}-${(d.getMonth() + 1)
+    .toString(10)
+    .padStart(2, "0")}-${d.getDate().toString(10).padStart(2, "0")}`; /*T${d
+    .getHours()
+    .toString(10)
+    .padStart(2, "0")}:${d.getMinutes().toString(10).padStart(2, "0")}:${d
+    .getSeconds()
+    .toString(10)
+    .padStart(2, "0")}`*/
+
+  return s;
+}

geneit_app/src/widgets/BaseFamilyRoute.tsx

@@ -5,12 +5,14 @@ import {
   mdiCrowd,
   mdiFamilyTree,
   mdiFileTree,
+  mdiHomeGroup,
   mdiHumanMaleFemale,
   mdiLockCheck,
   mdiPlus,
   mdiRefresh,
 } from "@mdi/js";
 import Icon from "@mdi/react";
+import CalendarMonthIcon from "@mui/icons-material/CalendarMonth";
 import HomeIcon from "@mui/icons-material/Home";
 import {
   Box,
@@ -184,6 +186,24 @@ export function BaseFamilyRoute(): React.ReactElement {
                   </>
                 )}
 
+                {family?.enable_accommodations && (
+                  <>
+                    <Divider sx={{ my: 1 }} />
+                    <ListSubheader component="div">Logements</ListSubheader>
+
+                    <FamilyLink
+                      icon={<HomeIcon />}
+                      label="Accueil"
+                      uri="accommodations"
+                    />
+                    <FamilyLink
+                      icon={<CalendarMonthIcon />}
+                      label="Réservations"
+                      uri="accommodations/reservations"
+                    />
+                  </>
+                )}
+
                 <Divider sx={{ my: 1 }} />
                 <ListSubheader component="div">Administration</ListSubheader>
 
@@ -207,6 +227,14 @@ export function BaseFamilyRoute(): React.ReactElement {
                   />
                 )}
 
+                {family?.enable_accommodations && (
+                  <FamilyLink
+                    icon={<Icon path={mdiHomeGroup} size={1} />}
+                    label="Logements"
+                    uri="accommodations/settings"
+                  />
+                )}
+
                 {/* Invitation code */}
 
                 <ListItem

geneit_app/src/widgets/BaseLoginpage.tsx

@@ -3,7 +3,7 @@ import Icon from "@mdi/react";
 import Avatar from "@mui/material/Avatar";
 import Box from "@mui/material/Box";
 import CssBaseline from "@mui/material/CssBaseline";
-import Grid from "@mui/material/Grid";
+import Grid from "@mui/material/Grid2";
 import Paper from "@mui/material/Paper";
 import Typography from "@mui/material/Typography";
 import * as React from "react";
@@ -28,7 +28,8 @@ function Copyright(props: any) {
         style={{ color: "inherit" }}
       >
         Pierre HUBERT
-      </a>{" "}
+      </a>
+      {" 2023-"}
       {new Date().getFullYear()}
       {"."}
     </Typography>
@@ -40,10 +41,7 @@ export function BaseLoginPage() {
     <Grid container component="main" sx={{ height: "100vh" }}>
       <CssBaseline />
       <Grid
-        item
+        size={{ xs: false, sm: 4, md: 7 }}
-        xs={false}
-        sm={4}
-        md={7}
         sx={{
           backgroundImage: "url(/login_splash.jpg)",
           backgroundRepeat: "no-repeat",
@@ -55,7 +53,12 @@ export function BaseLoginPage() {
           backgroundPosition: "center",
         }}
       />
-      <Grid item xs={12} sm={8} md={5} component={Paper} elevation={6} square>
+      <Grid
+        size={{ xs: 12, sm: 8, md: 5 }}
+        component={Paper}
+        elevation={6}
+        square
+      >
         <Box
           sx={{
             my: 8,

geneit_app/src/widgets/CopyToClipboard.tsx

@@ -0,0 +1,30 @@
+import { ButtonBase } from "@mui/material";
+import { PropsWithChildren } from "react";
+import { useSnackbar } from "../hooks/context_providers/SnackbarProvider";
+
+export function CopyToClipboard(
+  p: PropsWithChildren<{ content: string }>
+): React.ReactElement {
+  const snackbar = useSnackbar();
+
+  const copy = () => {
+    navigator.clipboard.writeText(p.content);
+    snackbar(`${p.content} a été copié dans le presse papier.`);
+  };
+
+  return (
+    <ButtonBase
+      onClick={copy}
+      style={{
+        display: "inline-block",
+        alignItems: "unset",
+        textAlign: "unset",
+        position: "relative",
+        padding: "0px",
+      }}
+      disableRipple
+    >
+      {p.children}
+    </ButtonBase>
+  );
+}

geneit_app/src/widgets/FamilyCard.tsx

@@ -2,10 +2,14 @@ import { Alert, Card } from "@mui/material";
 import { PropsWithChildren } from "react";
 
 export function FamilyCard(
-  p: PropsWithChildren<{ error?: string; success?: string }>
+  p: PropsWithChildren<{
+    error?: string;
+    success?: string;
+    style?: React.CSSProperties | undefined;
+  }>
 ): React.ReactElement {
   return (
-    <Card style={{ margin: "10px auto", maxWidth: "450px" }}>
+    <Card style={{ ...p.style, margin: "10px auto", maxWidth: "450px" }}>
       {p.error && <Alert severity="error">{p.error}</Alert>}
       {p.success && <Alert severity="success">{p.success}</Alert>}
 

geneit_app/src/widgets/accommodations/BaseAccommodationsRoute.tsx

@@ -0,0 +1,84 @@
+import React from "react";
+import { Outlet } from "react-router-dom";
+import {
+  AccommodationListApi,
+  AccommodationsList,
+} from "../../api/accommodations/AccommodationListApi";
+import { CreateAccommodationCalendarURLDialogProvider } from "../../hooks/context_providers/accommodations/CreateAccommodationCalendarURLDialogProvider";
+import { InstallCalendarDialogProvider } from "../../hooks/context_providers/accommodations/InstallCalendarDialogProvider";
+import { UpdateAccommodationDialogProvider } from "../../hooks/context_providers/accommodations/UpdateAccommodationDialogProvider";
+import { UpdateReservationDialogProvider } from "../../hooks/context_providers/accommodations/UpdateReservationDialogProvider";
+import { AsyncWidget } from "../AsyncWidget";
+import { useFamily } from "../BaseFamilyRoute";
+
+interface AccommodationsContext {
+  accommodations: AccommodationsList;
+  reloadAccommodationsList: () => Promise<void>;
+}
+
+const AccommodationsContextK =
+  React.createContext<AccommodationsContext | null>(null);
+
+export function BaseAccommodationsRoute(): React.ReactElement {
+  const family = useFamily();
+
+  const [accommodations, setAccommodations] =
+    React.useState<null | AccommodationsList>(null);
+
+  const loadKey = React.useRef(1);
+
+  const loadPromise = React.useRef<() => void>();
+
+  const load = async () => {
+    setAccommodations(
+      await AccommodationListApi.GetListOfFamily(family.family)
+    );
+  };
+
+  const onReload = async () => {
+    loadKey.current += 1;
+    setAccommodations(null);
+
+    return new Promise<void>((res, _rej) => {
+      loadPromise.current = () => res();
+    });
+  };
+
+  return (
+    <AsyncWidget
+      ready={accommodations !== null}
+      loadKey={`${family.familyId}-${loadKey.current}`}
+      load={load}
+      errMsg="Échec du chargement des informations sur les logements de la famille !"
+      build={() => {
+        if (loadPromise.current != null) {
+          loadPromise.current?.();
+          loadPromise.current = undefined;
+        }
+
+        return (
+          <AccommodationsContextK.Provider
+            value={{
+              accommodations: accommodations!,
+              reloadAccommodationsList: onReload,
+            }}
+          >
+            <UpdateAccommodationDialogProvider>
+              <CreateAccommodationCalendarURLDialogProvider>
+                <InstallCalendarDialogProvider>
+                  <UpdateReservationDialogProvider>
+                    <Outlet />
+                  </UpdateReservationDialogProvider>
+                </InstallCalendarDialogProvider>
+              </CreateAccommodationCalendarURLDialogProvider>
+            </UpdateAccommodationDialogProvider>
+          </AccommodationsContextK.Provider>
+        );
+      }}
+    />
+  );
+}
+
+export function useAccommodations(): AccommodationsContext {
+  return React.useContext(AccommodationsContextK)!;
+}

geneit_app/src/widgets/forms/PropCheckbox.tsx

@@ -5,16 +5,20 @@ export function PropCheckbox(p: {
   label: string;
   checked: boolean | undefined;
   onValueChange: (v: boolean) => void;
+  checkboxAlwaysVisible?: boolean;
 }): React.ReactElement {
-  if (!p.editable && p.checked)
+  if (!p.checkboxAlwaysVisible) {
-    return <Typography variant="body2">{p.label}</Typography>;
+    if (!p.editable && p.checked)
+      return <Typography variant="body2">{p.label}</Typography>;
 
-  if (!p.editable) return <></>;
+    if (!p.editable) return <></>;
+  }
 
   return (
     <FormControlLabel
       control={
         <Checkbox
+          disabled={!p.editable}
           checked={p.checked}
           onChange={(e) => p.onValueChange(e.target.checked)}
         />

geneit_app/src/widgets/forms/PropColorPicker.tsx

@@ -0,0 +1,24 @@
+import { MuiColorInput } from "mui-color-input";
+import { PropEdit } from "./PropEdit";
+
+export function PropColorPicker(p: {
+  editable: boolean;
+  label: string;
+  value?: string;
+  onChange: (v: string | undefined) => void;
+}): React.ReactElement {
+  if (!p.editable) {
+    if (!p.value) return <></>;
+
+    return <PropEdit editable={false} label={p.label} value={`#${p.value}`} />;
+  }
+
+  return (
+    <MuiColorInput
+      value={"#" + (p.value ?? "")}
+      fallbackValue="#ffffff"
+      format="hex"
+      onChange={(_v, c) => p.onChange(c.hex.substring(1))}
+    />
+  );
+}

geneit_app/src/widgets/forms/PropDateInput.tsx

@@ -0,0 +1,103 @@
+import { LocalizationProvider } from "@mui/x-date-pickers";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
+import { DatePicker } from "@mui/x-date-pickers/DatePicker";
+import dayjs from "dayjs";
+import "dayjs/locale/fr";
+import { fmtUnixDate } from "../../utils/time_utils";
+import { PropEdit } from "./PropEdit";
+import { Checkbox, FormControlLabel } from "@mui/material";
+
+export function PropDateInput(p: {
+  editable: boolean;
+  label: string;
+  value: number | undefined;
+  onChange: (v: number | undefined) => void;
+  lastSecOfDay?: boolean;
+  minDate?: number;
+  maxDate?: number;
+  canSetMiddleDay?: boolean;
+}): React.ReactElement {
+  // Check for mid-day value
+  let isMidDay = false;
+  if (p.value) {
+    const d = new Date(p.value * 1000);
+    isMidDay =
+      d.getHours() === 12 && d.getMinutes() === 0 && d.getSeconds() === 0;
+  }
+
+  // Shift value
+  let shiftV = p.value;
+  if (shiftV && p.lastSecOfDay) {
+    const d = new Date(shiftV * 1000);
+    if (d.getHours() === 0) {
+      shiftV -= 1;
+    }
+  }
+
+  if (!p.editable) {
+    if (!shiftV) return <></>;
+
+    return (
+      <PropEdit editable={false} label={p.label} value={fmtUnixDate(shiftV)} />
+    );
+  }
+
+  const value = dayjs(
+    shiftV && p.value! > 0 ? new Date(shiftV * 1000) : undefined
+  );
+
+  const minDate = p.minDate ? dayjs(new Date(p.minDate * 1000)) : undefined;
+  const maxDate = p.maxDate ? dayjs(new Date(p.maxDate * 1000)) : undefined;
+
+  return (
+    <>
+      <div style={{ height: "10px" }}></div>
+      <LocalizationProvider dateAdapter={AdapterDayjs} adapterLocale="fr">
+        <DatePicker
+          label={p.label}
+          value={value}
+          onChange={(v) => {
+            if (v && p.lastSecOfDay) {
+              v = v.set("hours", 23);
+              v = v.set("minutes", 59);
+              v = v.set("seconds", 59);
+            }
+            p.onChange?.(v ? v.unix() : undefined);
+          }}
+          minDate={minDate}
+          maxDate={maxDate}
+        />
+      </LocalizationProvider>
+      {p.canSetMiddleDay && (
+        <FormControlLabel
+          disabled={!p.value}
+          control={
+            <Checkbox
+              checked={isMidDay}
+              onChange={(_ev, midDay) => {
+                let v = value;
+                if (midDay) {
+                  v = v.set("hours", 12);
+                  v = v.set("minutes", 0);
+                  v = v.set("seconds", 0);
+                } else if (p.lastSecOfDay) {
+                  v = v.set("hours", 23);
+                  v = v.set("minutes", 59);
+                  v = v.set("seconds", 59);
+                } else {
+                  v = v.set("hours", 0);
+                  v = v.set("minutes", 0);
+                  v = v.set("seconds", 0);
+                }
+
+                p.onChange(v.unix());
+              }}
+            />
+          }
+          label="Mi-journée"
+        />
+      )}
+      <div style={{ height: "30px" }}></div>
+    </>
+  );
+}

geneit_app/src/widgets/forms/PropEdit.tsx

@@ -14,6 +14,7 @@ export function PropEdit(p: {
   multiline?: boolean;
   minRows?: number;
   maxRows?: number;
+  helperText?: string;
 }): React.ReactElement {
   if (((!p.editable && p.value) ?? "") === "") return <></>;
 
@@ -44,6 +45,7 @@ export function PropEdit(p: {
           !p.checkValue(p.value)) ||
         false
       }
+      helperText={p.helperText}
     />
   );
 }

geneit_app/src/widgets/forms/PropSelect.tsx

@@ -2,7 +2,7 @@ import { FormControl, InputLabel, MenuItem, Select } from "@mui/material";
 import { PropEdit } from "./PropEdit";
 
 export interface SelectOption {
-  value: string;
+  value: string | undefined;
   label: string;
 }
 
@@ -19,6 +19,7 @@ export function PropSelect(p: {
     const value = p.options.find((o) => o.value === p.value)?.label;
     return <PropEdit label={p.label} editable={p.editing} value={value} />;
   }
+
   return (
     <FormControl fullWidth variant="filled" style={{ marginBottom: "15px" }}>
       <InputLabel>{p.label}</InputLabel>

geneit_app/src/widgets/genealogy/BaseGenealogyRoute.tsx

@@ -5,14 +5,14 @@ import { MemberApi, MembersList } from "../../api/genealogy/MemberApi";
 import { AsyncWidget } from "../AsyncWidget";
 import { useFamily } from "../BaseFamilyRoute";
 
-interface FamilyContext {
+interface GenealogyContext {
   members: MembersList;
   couples: CouplesList;
   reloadMembersList: () => Promise<void>;
   reloadCouplesList: () => Promise<void>;
 }
 
-const GenealogyContextK = React.createContext<FamilyContext | null>(null);
+const GenealogyContextK = React.createContext<GenealogyContext | null>(null);
 
 export function BaseGenealogyRoute(): React.ReactElement {
   const family = useFamily();
@@ -68,6 +68,6 @@ export function BaseGenealogyRoute(): React.ReactElement {
   );
 }
 
-export function useGenealogy(): FamilyContext {
+export function useGenealogy(): GenealogyContext {
   return React.useContext(GenealogyContextK)!;
 }

geneit_backend/Cargo.toml

@@ -7,34 +7,37 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.21"
-env_logger = "0.11.3"
+env_logger = "0.11.5"
-clap = { version = "4.5.4", features = ["derive", "env"] }
+clap = { version = "4.5.17", features = ["derive", "env"] }
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
-anyhow = "1.0.83"
+lazy-regex = "3.3.0"
-actix-web = "4.5.1"
+anyhow = "1.0.87"
+actix-web = "4.9.0"
 actix-cors = "0.7.0"
-actix-multipart = "0.6.1"
+actix-multipart = "0.7.0"
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.30"
-diesel = { version = "2.1.6", features = ["postgres"] }
+diesel = { version = "2.2.4", features = ["postgres"] }
 diesel_migrations = "2.1.0"
-serde = { version = "1.0.198", features = ["derive"] }
+serde = { version = "1.0.210", features = ["derive"] }
-serde_json = "1.0.117"
+serde_json = "1.0.128"
-mailchecker = "6.0.4"
+mailchecker = "6.0.8"
-redis = "0.25.3"
+redis = "0.27.0"
-lettre = "0.11.7"
+lettre = "0.11.8"
 rand = "0.8.5"
-bcrypt = "0.15.1"
+bcrypt = "0.16.0"
 light-openid = "1.0.2"
 thiserror = "1.0.60"
 serde_with = "3.8.1"
 rust_iso3166 = "0.1.12"
-rust-s3 = "0.33.0"
+rust-s3 = "0.35.1"
 sha2 = "0.10.8"
 image = "0.25.1"
 uuid = { version = "1.8.0", features = ["v4"] }
 httpdate = "1.0.3"
-zip = "1.2.3"
+zip = "2.2.0"
 mime_guess = "2.0.4"
-tempfile = "3.10.1"
+tempfile = "3.12.0"
 base64 = "0.22.0"
+ical = { version = "0.11.0", features = ["generator", "ical", "vcard"] }
+chrono = "0.4.38"

geneit_backend/Dockerfile

@@ -6,4 +6,4 @@ RUN apt-get update \
 
 COPY geneit_backend /usr/local/bin/geneit_backend
 
-ENTRYPOINT /usr/local/bin/geneit_backend
+ENTRYPOINT ["/usr/local/bin/geneit_backend"]

geneit_backend/migrations/2024-05-23-163128_accommodation_module/down.sql

@@ -0,0 +1,6 @@
+ALTER TABLE public.families
+    DROP COLUMN enable_accommodations;
+
+DROP TABLE IF EXISTS accommodations_reservations_cals_urls;
+DROP TABLE IF EXISTS accommodations_reservations;
+DROP TABLE IF EXISTS accommodations_list;

geneit_backend/migrations/2024-05-23-163128_accommodation_module/up.sql

@@ -0,0 +1,52 @@
+-- Add column to toggle accommodations module
+ALTER TABLE public.families
+    ADD enable_accommodations boolean NOT NULL DEFAULT false;
+COMMENT
+    ON COLUMN public.families.enable_accommodations IS 'Specify whether accommodations feature is enabled for the family';
+
+
+-- Create tables
+CREATE TABLE IF NOT EXISTS accommodations_list
+(
+    id                   SERIAL PRIMARY KEY,
+    family_id            integer     NOT NULL REFERENCES families,
+    time_create          BIGINT      NOT NULL,
+    time_update          BIGINT      NOT NULL,
+    name                 VARCHAR(50) NOT NULL,
+    need_validation      BOOLEAN     NOT NULL DEFAULT true,
+    description          text        NULL,
+    color                VARCHAR(6)  NULL,
+    open_to_reservations BOOLEAN     NOT NULL DEFAULT false
+);
+
+COMMENT ON COLUMN accommodations_list.need_validation is 'true if family admin review is required for validation. False otherwise';
+COMMENT ON COLUMN accommodations_list.open_to_reservations is 'true if reservations can be created / updated. False otherwise';
+
+CREATE TABLE IF NOT EXISTS accommodations_reservations
+(
+    id                SERIAL PRIMARY KEY,
+    family_id         integer NOT NULL REFERENCES families ON DELETE CASCADE,
+    accommodation_id  integer NOT NULL REFERENCES accommodations_list ON DELETE CASCADE,
+    user_id           INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
+    time_create       BIGINT  NOT NULL,
+    time_update       BIGINT  NOT NULL,
+    reservation_start BIGINT  NOT NULL,
+    reservation_end   BIGINT  NOT NULL,
+    validated         BOOLEAN NULL
+);
+
+COMMENT ON COLUMN accommodations_reservations.validated is 'null if not reviewed yet. true if reservation is accepted. false if reservation is rejected';
+
+CREATE TABLE IF NOT EXISTS accommodations_reservations_cals_urls
+(
+    id               SERIAL PRIMARY KEY,
+    family_id        integer     NOT NULL REFERENCES families ON DELETE CASCADE,
+    accommodation_id integer     NULL REFERENCES accommodations_list ON DELETE CASCADE,
+    user_id          INTEGER     NOT NULL REFERENCES users ON DELETE CASCADE,
+    name             VARCHAR(50) NOT NULL,
+    token            VARCHAR(50) NOT NULL,
+    time_create      BIGINT      NOT NULL,
+    time_used        BIGINT      NOT NULL
+);
+
+COMMENT ON COLUMN accommodations_reservations_cals_urls.accommodation_id is 'null to get reservations of all accommodations. otherwise get the reservations of the specified accommodation only';

geneit_backend/src/app_config.rs

@@ -194,6 +194,7 @@ impl AppConfig {
                 db: self.redis_db_number,
                 username: self.redis_username.clone(),
                 password: Some(self.redis_password.clone()),
+                protocol: Default::default(),
             },
         }
     }
@@ -245,7 +246,7 @@ impl AppConfig {
     }
 
     /// Get S3 bucket
-    pub fn s3_bucket(&self) -> anyhow::Result<Bucket> {
+    pub fn s3_bucket(&self) -> anyhow::Result<Box<Bucket>> {
         Ok(Bucket::new(
             &self.s3_bucket_name,
             Region::Custom {

geneit_backend/src/connections/redis_connection.rs

@@ -45,14 +45,14 @@ where
 {
     let value_str = serde_json::to_string(value)?;
 
-    execute_request(|conn| Ok(conn.set_ex(key, value_str, lifetime.as_secs())?))?;
+    execute_request(|conn| Ok(conn.set_ex::<_, _, ()>(key, value_str, lifetime.as_secs())?))?;
 
     Ok(())
 }
 
 /// Remove a value from Redis
 pub async fn remove_value(key: &str) -> anyhow::Result<()> {
-    execute_request(|conn| Ok(conn.del(key)?))?;
+    execute_request(|conn| Ok(conn.del::<_, ()>(key)?))?;
 
     Ok(())
 }

geneit_backend/src/connections/s3_connection.rs

@@ -22,11 +22,11 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
             log::debug!("The bucket already exists.");
             return Ok(());
         }
-        Err(S3Error::Http(404, s)) if s.contains("<Code>NoSuchKey</Code>") => {
+        Err(S3Error::HttpFailWithBody(404, s)) if s.contains("<Code>NoSuchKey</Code>") => {
             log::warn!("Failed to fetch bucket location, but it seems that bucket exists.");
             return Ok(());
         }
-        Err(S3Error::Http(404, s)) if s.contains("<Code>NoSuchBucket</Code>") => {
+        Err(S3Error::HttpFailWithBody(404, s)) if s.contains("<Code>NoSuchBucket</Code>") => {
             log::warn!("The bucket does not seem to exists, trying to create it!")
         }
         Err(e) => {

geneit_backend/src/constants.rs

@@ -60,6 +60,10 @@ pub struct StaticConstraints {
     pub member_country: SizeConstraint,
     pub member_sex: SizeConstraint,
     pub member_note: SizeConstraint,
+
+    pub accommodation_name_len: SizeConstraint,
+    pub accommodation_description_len: SizeConstraint,
+    pub accommodation_calendar_name_len: SizeConstraint,
 }
 
 impl Default for StaticConstraints {
@@ -91,6 +95,10 @@ impl Default for StaticConstraints {
             member_country: SizeConstraint::new(0, 2),
             member_sex: SizeConstraint::new(0, 1),
             member_note: SizeConstraint::new(0, 35000),
+
+            accommodation_name_len: SizeConstraint::new(1, 50),
+            accommodation_description_len: SizeConstraint::new(0, 500),
+            accommodation_calendar_name_len: SizeConstraint::new(2, 50),
         }
     }
 }
@@ -134,3 +142,10 @@ pub const THUMB_WIDTH: u32 = 350;
 
 /// Thumbnail height
 pub const THUMB_HEIGHT: u32 = 350;
+
+/// Accommodations reservations calendars tokens len
+pub const ACCOMMODATIONS_RESERVATIONS_CALENDARS_TOKENS_LEN: usize = 50;
+
+/// Minimum interval before calendar used time update
+pub const ACCOMMODATIONS_RESERVATIONS_CAL_URL_TIME_USED_UPDATE_MIN_INTERVAL: Duration =
+    Duration::from_secs(60);

geneit_backend/src/controllers/accommodations_list_controller.rs

@@ -0,0 +1,115 @@
+use crate::constants::StaticConstraints;
+use crate::controllers::HttpResult;
+use crate::extractors::accommodation_extractor::FamilyAndAccommodationInPath;
+use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
+use crate::models::Accommodation;
+use crate::services::accommodations_list_service;
+use actix_web::{web, HttpResponse};
+
+#[derive(thiserror::Error, Debug)]
+enum AccommodationListControllerErr {
+    #[error("Invalid name length!")]
+    InvalidNameLength,
+    #[error("Invalid description length!")]
+    InvalidDescriptionLength,
+    #[error("Malformed color!")]
+    MalformedColor,
+}
+
+#[derive(serde::Deserialize, Clone)]
+pub struct AccommodationRequest {
+    pub name: String,
+    pub need_validation: bool,
+    pub description: Option<String>,
+    pub color: Option<String>,
+    pub open_to_reservations: bool,
+}
+
+impl AccommodationRequest {
+    pub async fn to_accommodation(self, accommodation: &mut Accommodation) -> anyhow::Result<()> {
+        let c = StaticConstraints::default();
+
+        if !c.accommodation_name_len.validate(&self.name) {
+            return Err(AccommodationListControllerErr::InvalidNameLength.into());
+        }
+        accommodation.name = self.name;
+
+        if let Some(d) = &self.description {
+            if !c.accommodation_description_len.validate(d) {
+                return Err(AccommodationListControllerErr::InvalidDescriptionLength.into());
+            }
+        }
+        accommodation.description.clone_from(&self.description);
+
+        if let Some(c) = &self.color {
+            if !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c) {
+                return Err(AccommodationListControllerErr::MalformedColor.into());
+            }
+        }
+        accommodation.color.clone_from(&self.color);
+
+        accommodation.need_validation = self.need_validation;
+        accommodation.open_to_reservations = self.open_to_reservations;
+        Ok(())
+    }
+}
+
+/// Create a new accommodation
+pub async fn create(
+    m: FamilyInPathWithAdminMembership,
+    req: web::Json<AccommodationRequest>,
+) -> HttpResult {
+    let mut accommodation = accommodations_list_service::create(m.family_id()).await?;
+
+    if let Err(e) = req.0.to_accommodation(&mut accommodation).await {
+        log::error!("Failed to apply accommodation information! {e}");
+        accommodations_list_service::delete(&mut accommodation).await?;
+        return Ok(HttpResponse::BadRequest().body(e.to_string()));
+    }
+
+    if let Err(e) = accommodations_list_service::update(&mut accommodation).await {
+        log::error!("Failed to update accommodation information! {e}");
+        accommodations_list_service::delete(&mut accommodation).await?;
+        return Ok(HttpResponse::InternalServerError().finish());
+    }
+
+    Ok(HttpResponse::Ok().json(accommodation))
+}
+
+/// Get the full list of accommodations
+pub async fn get_full_list(m: FamilyInPath) -> HttpResult {
+    Ok(HttpResponse::Ok()
+        .json(accommodations_list_service::get_all_of_family(m.family_id()).await?))
+}
+
+/// Get the information of a single accommodation
+pub async fn get_single(m: FamilyAndAccommodationInPath) -> HttpResult {
+    Ok(HttpResponse::Ok().json(m.to_accommodation()))
+}
+
+/// Update an accommodation
+pub async fn update(
+    m: FamilyAndAccommodationInPath,
+    req: web::Json<AccommodationRequest>,
+    _admin: FamilyInPathWithAdminMembership,
+) -> HttpResult {
+    let mut accommodation = m.to_accommodation();
+
+    if let Err(e) = req.0.to_accommodation(&mut accommodation).await {
+        log::error!("Failed to parse accommodation information! {e}");
+        return Ok(HttpResponse::BadRequest().body(e.to_string()));
+    }
+
+    accommodations_list_service::update(&mut accommodation).await?;
+
+    Ok(HttpResponse::Accepted().finish())
+}
+
+/// Delete an accommodation
+pub async fn delete(
+    m: FamilyAndAccommodationInPath,
+    _admin: FamilyInPathWithAdminMembership,
+) -> HttpResult {
+    accommodations_list_service::delete(&mut m.to_accommodation()).await?;
+    Ok(HttpResponse::Ok().finish())
+}

geneit_backend/src/controllers/accommodations_reservations_calendars_controller.rs

@@ -0,0 +1,163 @@
+use ical::{generator::*, *};
+
+use actix_web::{web, HttpResponse};
+use chrono::DateTime;
+
+use crate::constants::StaticConstraints;
+use crate::controllers::HttpResult;
+use crate::extractors::accommodation_reservation_calendar_extractor::FamilyAndAccommodationReservationCalendarInPath;
+use crate::extractors::family_extractor::FamilyInPath;
+use crate::models::{AccommodationID, ReservationStatus};
+use crate::services::{
+    accommodations_list_service, accommodations_reservations_calendars_service,
+    accommodations_reservations_service, families_service,
+};
+use crate::utils::time_utils::time;
+
+#[derive(serde::Deserialize)]
+pub struct CreateCalendarQuery {
+    accommodation_id: Option<AccommodationID>,
+    name: String,
+}
+
+/// Create a calendar
+pub async fn create(a: FamilyInPath, req: web::Json<CreateCalendarQuery>) -> HttpResult {
+    let accommodation_id = match req.accommodation_id {
+        Some(i) => {
+            let accommodation = match accommodations_list_service::get_by_id(i).await {
+                Ok(a) => a,
+                Err(e) => {
+                    log::error!("Failed to get accommodation information! {e}");
+                    return Ok(HttpResponse::NotFound()
+                        .json("The accommodation was not found in the family!"));
+                }
+            };
+
+            if accommodation.family_id() != a.family_id() {
+                return Ok(
+                    HttpResponse::NotFound().json("The accommodation was not found in the family!")
+                );
+            }
+
+            Some(accommodation.id())
+        }
+        None => None,
+    };
+
+    let conf = StaticConstraints::default();
+    if !conf.accommodation_calendar_name_len.validate(&req.name) {
+        return Ok(HttpResponse::BadRequest().json("Invalid accommodation name!"));
+    }
+
+    let calendar = accommodations_reservations_calendars_service::create(
+        a.user_id(),
+        a.family_id(),
+        accommodation_id,
+        &req.name,
+    )
+    .await?;
+
+    Ok(HttpResponse::Ok().json(calendar))
+}
+
+/// Get the list of calendars of a user
+pub async fn get_list(a: FamilyInPath) -> HttpResult {
+    let users =
+        accommodations_reservations_calendars_service::get_all_of_user(a.user_id(), a.family_id())
+            .await?;
+    Ok(HttpResponse::Ok().json(users))
+}
+
+/// Delete a calendar
+pub async fn delete(resa: FamilyAndAccommodationReservationCalendarInPath) -> HttpResult {
+    accommodations_reservations_calendars_service::delete(resa.to_reservation()).await?;
+    Ok(HttpResponse::Ok().json("Calendar successfully deleted"))
+}
+
+fn fmt_date(time: i64) -> String {
+    let res = DateTime::from_timestamp(time, 0).expect("Failed to parse date");
+
+    /*format!(
+        "{:0>4}{:0>2}{:0>2}T{:0>2}{:0>2}",
+        res.year(),
+        res.month(),
+        res.day(),
+        res.minute(),
+        res.second()
+    )*/
+
+    res.format("%Y%m%dT%H%M%S").to_string()
+}
+
+#[derive(serde::Deserialize)]
+pub struct AnonymousAccessURL {
+    token: String,
+}
+
+/// Get the content of the calendar
+pub async fn anonymous_access(req: web::Path<AnonymousAccessURL>) -> HttpResult {
+    let mut calendar =
+        match accommodations_reservations_calendars_service::get_by_token(&req.token).await {
+            Ok(c) => c,
+            Err(e) => {
+                log::error!("Calendar information could not be retrieved: {e}");
+                return Ok(HttpResponse::NotFound().body("Calendar not found!"));
+            }
+        };
+
+    let accommodations =
+        accommodations_list_service::get_all_of_family(calendar.family_id()).await?;
+    let members = families_service::get_memberships_of_family(calendar.family_id()).await?;
+
+    // Get calendar associated events
+    let events = match calendar.accommodation_id() {
+        None => {
+            accommodations_reservations_service::get_all_of_family(calendar.family_id()).await?
+        }
+        Some(a) => accommodations_reservations_service::get_all_of_accommodation(a).await?,
+    };
+
+    let mut cal = IcalCalendarBuilder::version("2.0")
+        .gregorian()
+        .prodid("-//geneit//")
+        .build();
+
+    for ev in events {
+        let accommodation = accommodations
+            .iter()
+            .find(|a| a.id() == ev.accommodation_id())
+            .unwrap();
+        let member_name = members
+            .iter()
+            .find(|a| a.membership.user_id() == ev.user_id())
+            .map(|m| m.user_name.as_str())
+            .unwrap_or("other user");
+
+        let event = IcalEventBuilder::tzid("Europe/Paris")
+            .uid(format!("resa-{}", ev.id().0))
+            .changed(fmt_date(ev.time_update))
+            .start(fmt_date(ev.reservation_start))
+            .end(fmt_date(ev.reservation_end))
+            .set(ical_property!("SUMMARY", member_name))
+            .set(ical_property!("LOCATION", &accommodation.name))
+            .set(ical_property!(
+                "STATUS",
+                match ev.status() {
+                    ReservationStatus::Pending => "TENTATIVE",
+                    ReservationStatus::Accepted => "CONFIRMED",
+                    ReservationStatus::Rejected => "CANCELLED",
+                }
+            ))
+            .build();
+        cal.events.push(event);
+    }
+
+    if calendar.should_update_last_used() {
+        calendar.time_used = time() as i64;
+        accommodations_reservations_calendars_service::update(&calendar).await?;
+    }
+
+    Ok(HttpResponse::Ok()
+        .content_type("text/calendar")
+        .body(cal.generate()))
+}

geneit_backend/src/controllers/accommodations_reservations_controller.rs

@@ -0,0 +1,223 @@
+use crate::controllers::HttpResult;
+use crate::extractors::accommodation_extractor::FamilyAndAccommodationInPath;
+use crate::extractors::accommodation_reservation_extractor::FamilyAndAccommodationReservationInPath;
+use crate::extractors::family_extractor::FamilyInPath;
+use crate::models::{Accommodation, AccommodationReservationID, NewAccommodationReservation};
+use crate::services::accommodations_reservations_service;
+use crate::utils::time_utils::time;
+use actix_web::{web, HttpResponse};
+
+#[derive(serde::Deserialize)]
+pub struct UpdateReservationQuery {
+    start: usize,
+    end: usize,
+}
+
+impl UpdateReservationQuery {
+    /// Check whether a reservation request is valid or not
+    async fn validate(
+        &self,
+        a: &Accommodation,
+        resa_id: Option<AccommodationReservationID>,
+    ) -> anyhow::Result<Option<&str>> {
+        if !a.open_to_reservations {
+            return Ok(Some(
+                "The accommodation is not open to reservations creation / update!",
+            ));
+        }
+
+        if (self.start as i64) < (time() as i64 - 3600 * 24 * 30) {
+            return Ok(Some("Start time is too far in the past!"));
+        }
+
+        if self.start == self.end {
+            return Ok(Some("Start and end time must be different!"));
+        }
+
+        if self.start > self.end {
+            return Ok(Some("End time happens before start time!"));
+        }
+
+        let existing = accommodations_reservations_service::get_reservations_for_time_interval(
+            a.id(),
+            self.start,
+            self.end,
+        )
+        .await?;
+
+        if existing
+            .iter()
+            .any(|r| r.validated != Some(false) && resa_id != Some(r.id()))
+        {
+            return Ok(Some("This reservation is in conflict with another one!"));
+        }
+
+        Ok(None)
+    }
+}
+
+/// Create a reservation
+pub async fn create_reservation(
+    a: FamilyAndAccommodationInPath,
+    req: web::Json<UpdateReservationQuery>,
+) -> HttpResult {
+    if let Some(err) = req.validate(&a, None).await? {
+        return Ok(HttpResponse::BadRequest().json(err));
+    }
+
+    let mut reservation =
+        accommodations_reservations_service::create(&NewAccommodationReservation {
+            family_id: a.family_id().0,
+            accommodation_id: a.id().0,
+            user_id: a.membership().user_id().0,
+            time_create: time() as i64,
+            time_update: time() as i64,
+            reservation_start: req.start as i64,
+            reservation_end: req.end as i64,
+        })
+        .await?;
+
+    // Auto validate reservation if requested
+    if !a.need_validation {
+        reservation.validated = Some(true);
+
+        accommodations_reservations_service::update(&mut reservation).await?;
+    }
+
+    Ok(HttpResponse::Ok().json(reservation))
+}
+
+/// Get the reservations for a given accommodation
+pub async fn get_accommodation_reservations(a: FamilyAndAccommodationInPath) -> HttpResult {
+    Ok(HttpResponse::Ok()
+        .json(accommodations_reservations_service::get_all_of_accommodation(a.id()).await?))
+}
+
+#[derive(serde::Deserialize)]
+pub struct CheckAvailabilityQuery {
+    start: usize,
+    end: usize,
+}
+
+/// Check reservation availability
+pub async fn get_accommodation_reservations_for_interval(
+    a: FamilyAndAccommodationInPath,
+    req: web::Query<CheckAvailabilityQuery>,
+) -> HttpResult {
+    if req.start > req.end {
+        return Ok(HttpResponse::BadRequest().json("start should be smaller than end!"));
+    }
+
+    let res = accommodations_reservations_service::get_reservations_for_time_interval(
+        a.id(),
+        req.start,
+        req.end,
+    )
+    .await?;
+
+    Ok(HttpResponse::Ok().json(res))
+}
+
+/// Get the full list of accommodations reservations for a family
+pub async fn full_list(m: FamilyInPath) -> HttpResult {
+    Ok(HttpResponse::Ok()
+        .json(accommodations_reservations_service::get_all_of_family(m.family_id()).await?))
+}
+
+/// Get a single accommodation reservation
+pub async fn get_single(m: FamilyAndAccommodationReservationInPath) -> HttpResult {
+    Ok(HttpResponse::Ok().json(m.to_reservation()))
+}
+
+/// Update a reservation
+pub async fn update_single(
+    m: FamilyAndAccommodationReservationInPath,
+    req: web::Json<UpdateReservationQuery>,
+) -> HttpResult {
+    if let Some(err) = req.validate(m.as_accommodation(), Some(m.id())).await? {
+        return Ok(HttpResponse::BadRequest().json(err));
+    }
+
+    if m.membership().user_id() != m.user_id() {
+        return Ok(
+            HttpResponse::BadRequest().json("Only the owner of a reservation can change it!")
+        );
+    }
+
+    let need_validation = m.as_accommodation().need_validation;
+
+    let mut reservation = m.to_reservation();
+    reservation.reservation_start = req.start as i64;
+    reservation.reservation_end = req.end as i64;
+
+    if need_validation {
+        reservation.validated = None;
+    }
+
+    accommodations_reservations_service::update(&mut reservation).await?;
+
+    Ok(HttpResponse::Accepted().finish())
+}
+
+/// Delete a reservation
+pub async fn delete(m: FamilyAndAccommodationReservationInPath) -> HttpResult {
+    if m.membership().user_id() != m.user_id() {
+        return Ok(
+            HttpResponse::BadRequest().json("Only the owner of a reservation can delete it!")
+        );
+    }
+
+    accommodations_reservations_service::delete(m.to_reservation()).await?;
+
+    Ok(HttpResponse::Accepted().finish())
+}
+
+#[derive(serde::Deserialize)]
+pub struct ValidateQuery {
+    validate: bool,
+}
+
+/// Validate or reject a reservation
+pub async fn validate_or_reject(
+    m: FamilyAndAccommodationReservationInPath,
+    q: web::Json<ValidateQuery>,
+) -> HttpResult {
+    if !m.membership().is_admin {
+        return Ok(
+            HttpResponse::BadRequest().json("Only a family admin can validate a reservation!")
+        );
+    }
+
+    if m.validated == Some(q.validate) {
+        return Ok(
+            HttpResponse::AlreadyReported().json("This reservation has already been processed!")
+        );
+    }
+
+    // In case of re-validation, check that the time is still available
+    if m.validated == Some(false) && q.validate {
+        let potential_conflicts =
+            accommodations_reservations_service::get_reservations_for_time_interval(
+                m.accommodation_id(),
+                m.reservation_start as usize,
+                m.reservation_end as usize,
+            )
+            .await?;
+
+        if potential_conflicts
+            .iter()
+            .any(|a| a.validated != Some(false))
+        {
+            return Ok(HttpResponse::Conflict().json(
+                "This cannot be accepted as it would create a conflict with another reservation!",
+            ));
+        }
+    }
+
+    // Update reservation validation status
+    let mut reservation = m.to_reservation();
+    reservation.validated = Some(q.validate);
+    accommodations_reservations_service::update(&mut reservation).await?;
+
+    Ok(HttpResponse::Accepted().finish())
+}

geneit_backend/src/controllers/families_controller.rs

@@ -80,6 +80,7 @@ struct RichFamilyInfo {
     #[serde(flatten)]
     membership: FamilyMembership,
     enable_genealogy: bool,
+    enable_accommodations: bool,
     disable_couple_photos: bool,
 }
 
@@ -90,6 +91,7 @@ pub async fn single_info(f: FamilyInPath) -> HttpResult {
     Ok(HttpResponse::Ok().json(RichFamilyInfo {
         membership,
         enable_genealogy: family.enable_genealogy,
+        enable_accommodations: family.enable_accommodations,
         disable_couple_photos: family.disable_couple_photos,
     }))
 }
@@ -105,6 +107,7 @@ pub async fn leave(f: FamilyInPath) -> HttpResult {
 pub struct UpdateFamilyBody {
     name: Option<String>,
     enable_genealogy: Option<bool>,
+    enable_accommodations: Option<bool>,
     disable_couple_photos: Option<bool>,
 }
 
@@ -127,6 +130,10 @@ pub async fn update(
         family.enable_genealogy = enable_genealogy;
     }
 
+    if let Some(enable_accommodations) = req.enable_accommodations {
+        family.enable_accommodations = enable_accommodations;
+    }
+
     if let Some(disable_couple_photos) = req.disable_couple_photos {
         family.disable_couple_photos = disable_couple_photos;
     }

geneit_backend/src/controllers/mod.rs

@@ -5,6 +5,9 @@ use actix_web::HttpResponse;
 use std::fmt::{Debug, Display, Formatter};
 use zip::result::ZipError;
 
+pub mod accommodations_list_controller;
+pub mod accommodations_reservations_calendars_controller;
+pub mod accommodations_reservations_controller;
 pub mod auth_controller;
 pub mod couples_controller;
 pub mod data_controller;

geneit_backend/src/extractors/accommodation_extractor.rs

@@ -0,0 +1,83 @@
+use crate::extractors::family_extractor::FamilyInPath;
+use crate::models::{Accommodation, AccommodationID, FamilyID, Membership};
+use crate::services::accommodations_list_service;
+use actix_web::dev::Payload;
+use actix_web::{FromRequest, HttpRequest};
+use serde::Deserialize;
+use std::ops::Deref;
+
+#[derive(thiserror::Error, Debug)]
+enum AccommodationExtractorErr {
+    #[error("Accommodation {0:?} does not belong to family {1:?}!")]
+    AccommodationNotInFamily(AccommodationID, FamilyID),
+}
+
+#[derive(Debug)]
+pub struct FamilyAndAccommodationInPath(Membership, Accommodation);
+
+impl FamilyAndAccommodationInPath {
+    async fn load_accommodation_from_path(
+        family: FamilyInPath,
+        accommodation_id: AccommodationID,
+    ) -> anyhow::Result<Self> {
+        let accommodation = accommodations_list_service::get_by_id(accommodation_id).await?;
+        if accommodation.family_id() != family.family_id() {
+            return Err(AccommodationExtractorErr::AccommodationNotInFamily(
+                accommodation.id(),
+                family.family_id(),
+            )
+            .into());
+        }
+
+        Ok(Self(family.into(), accommodation))
+    }
+}
+
+impl Deref for FamilyAndAccommodationInPath {
+    type Target = Accommodation;
+
+    fn deref(&self) -> &Self::Target {
+        &self.1
+    }
+}
+
+impl FamilyAndAccommodationInPath {
+    pub fn membership(&self) -> &Membership {
+        &self.0
+    }
+
+    pub fn to_accommodation(self) -> Accommodation {
+        self.1
+    }
+}
+
+#[derive(Deserialize)]
+struct AccommodationIDInPath {
+    accommodation_id: AccommodationID,
+}
+
+impl FromRequest for FamilyAndAccommodationInPath {
+    type Error = actix_web::Error;
+    type Future = futures_util::future::LocalBoxFuture<'static, Result<Self, Self::Error>>;
+
+    fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
+        let req = req.clone();
+        Box::pin(async move {
+            let family = FamilyInPath::extract(&req).await?;
+
+            let accommodation_id = actix_web::web::Path::<AccommodationIDInPath>::from_request(
+                &req,
+                &mut Payload::None,
+            )
+            .await?
+            .accommodation_id;
+
+            Self::load_accommodation_from_path(family, accommodation_id)
+                .await
+                .map_err(|e| {
+                    log::error!("Failed to extract accommodation ID from URL! {}", e);
+                    actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
+                })
+        })
+    }
+}

geneit_backend/src/extractors/accommodation_reservation_calendar_extractor.rs

@@ -0,0 +1,93 @@
+use crate::extractors::family_extractor::FamilyInPath;
+use crate::models::{
+    AccommodationReservationCalendar, AccommodationReservationCalendarID, FamilyID, Membership,
+};
+use crate::services::accommodations_reservations_calendars_service;
+use actix_web::dev::Payload;
+use actix_web::{FromRequest, HttpRequest};
+use serde::Deserialize;
+use std::ops::Deref;
+
+#[derive(thiserror::Error, Debug)]
+enum AccommodationCalendarExtractorErr {
+    #[error("Calendar {0:?} does not belong to user or family {1:?}!")]
+    CalendarNotOfUserOrFamily(AccommodationReservationCalendarID, FamilyID),
+}
+
+#[derive(Debug)]
+pub struct FamilyAndAccommodationReservationCalendarInPath(
+    Membership,
+    AccommodationReservationCalendar,
+);
+
+impl FamilyAndAccommodationReservationCalendarInPath {
+    async fn load_calendar_from_path(
+        family: FamilyInPath,
+        calendar_id: AccommodationReservationCalendarID,
+    ) -> anyhow::Result<Self> {
+        let accommodation =
+            accommodations_reservations_calendars_service::get_by_id(calendar_id).await?;
+        if accommodation.family_id() != family.family_id()
+            || accommodation.user_id() != family.user_id()
+        {
+            return Err(
+                AccommodationCalendarExtractorErr::CalendarNotOfUserOrFamily(
+                    accommodation.id(),
+                    family.family_id(),
+                )
+                .into(),
+            );
+        }
+
+        Ok(Self(family.into(), accommodation))
+    }
+}
+
+impl Deref for FamilyAndAccommodationReservationCalendarInPath {
+    type Target = AccommodationReservationCalendar;
+
+    fn deref(&self) -> &Self::Target {
+        &self.1
+    }
+}
+
+impl FamilyAndAccommodationReservationCalendarInPath {
+    pub fn membership(&self) -> &Membership {
+        &self.0
+    }
+
+    pub fn to_reservation(self) -> AccommodationReservationCalendar {
+        self.1
+    }
+}
+
+#[derive(Deserialize)]
+struct AccommodationIDInPath {
+    cal_id: AccommodationReservationCalendarID,
+}
+
+impl FromRequest for FamilyAndAccommodationReservationCalendarInPath {
+    type Error = actix_web::Error;
+    type Future = futures_util::future::LocalBoxFuture<'static, Result<Self, Self::Error>>;
+
+    fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
+        let req = req.clone();
+        Box::pin(async move {
+            let family = FamilyInPath::extract(&req).await?;
+
+            let accommodation_id = actix_web::web::Path::<AccommodationIDInPath>::from_request(
+                &req,
+                &mut Payload::None,
+            )
+            .await?
+            .cal_id;
+
+            Self::load_calendar_from_path(family, accommodation_id)
+                .await
+                .map_err(|e| {
+                    log::error!("Failed to extract calendar ID from URL! {}", e);
+                    actix_web::error::ErrorNotFound("Could not fetch calendar information!")
+                })
+        })
+    }
+}

geneit_backend/src/extractors/accommodation_reservation_extractor.rs

@@ -0,0 +1,103 @@
+use crate::extractors::family_extractor::FamilyInPath;
+use crate::models::{
+    Accommodation, AccommodationReservation, AccommodationReservationID, FamilyID, Membership,
+};
+use crate::services::{accommodations_list_service, accommodations_reservations_service};
+use actix_web::dev::Payload;
+use actix_web::{FromRequest, HttpRequest};
+use serde::Deserialize;
+use std::fmt::Debug;
+use std::ops::Deref;
+
+#[derive(thiserror::Error, Debug)]
+enum AccommodationReservationExtractorErr {
+    #[error("Accommodation reservation {0:?} does not belong to family {1:?}!")]
+    AccommodationNotInFamily(AccommodationReservationID, FamilyID),
+}
+
+#[derive(Debug)]
+pub struct FamilyAndAccommodationReservationInPath(
+    Membership,
+    Accommodation,
+    AccommodationReservation,
+);
+
+impl FamilyAndAccommodationReservationInPath {
+    async fn load_accommodation_reservation_from_path(
+        family: FamilyInPath,
+        reservation_id: AccommodationReservationID,
+    ) -> anyhow::Result<Self> {
+        let reservation = accommodations_reservations_service::get_by_id(reservation_id).await?;
+        let accommodation =
+            accommodations_list_service::get_by_id(reservation.accommodation_id()).await?;
+
+        if accommodation.family_id() != family.family_id()
+            || reservation.family_id() != family.family_id()
+        {
+            return Err(
+                AccommodationReservationExtractorErr::AccommodationNotInFamily(
+                    reservation.id(),
+                    family.family_id(),
+                )
+                .into(),
+            );
+        }
+
+        Ok(Self(family.into(), accommodation, reservation))
+    }
+}
+
+impl Deref for FamilyAndAccommodationReservationInPath {
+    type Target = AccommodationReservation;
+
+    fn deref(&self) -> &Self::Target {
+        &self.2
+    }
+}
+
+impl FamilyAndAccommodationReservationInPath {
+    pub fn membership(&self) -> &Membership {
+        &self.0
+    }
+
+    pub fn as_accommodation(&self) -> &Accommodation {
+        &self.1
+    }
+
+    pub fn to_accommodation(self) -> Accommodation {
+        self.1
+    }
+
+    pub fn to_reservation(self) -> AccommodationReservation {
+        self.2
+    }
+}
+
+#[derive(Deserialize)]
+struct ReservationIDInPath {
+    reservation_id: AccommodationReservationID,
+}
+
+impl FromRequest for FamilyAndAccommodationReservationInPath {
+    type Error = actix_web::Error;
+    type Future = futures_util::future::LocalBoxFuture<'static, Result<Self, Self::Error>>;
+
+    fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
+        let req = req.clone();
+        Box::pin(async move {
+            let family = FamilyInPath::extract(&req).await?;
+
+            let reservation_id =
+                actix_web::web::Path::<ReservationIDInPath>::from_request(&req, &mut Payload::None)
+                    .await?
+                    .reservation_id;
+
+            Self::load_accommodation_reservation_from_path(family, reservation_id)
+                .await
+                .map_err(|e| {
+                    log::error!("Failed to extract accommodation ID from URL! {}", e);
+                    actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
+                })
+        })
+    }
+}

geneit_backend/src/extractors/mod.rs

@@ -1,3 +1,6 @@
+pub mod accommodation_extractor;
+pub mod accommodation_reservation_calendar_extractor;
+pub mod accommodation_reservation_extractor;
 pub mod couple_extractor;
 pub mod family_extractor;
 pub mod member_extractor;

geneit_backend/src/main.rs

@@ -6,8 +6,10 @@ use actix_web::{web, App, HttpServer};
 use geneit_backend::app_config::AppConfig;
 use geneit_backend::connections::{db_connection, s3_connection};
 use geneit_backend::controllers::{
-    auth_controller, couples_controller, data_controller, families_controller, members_controller,
+    accommodations_list_controller, accommodations_reservations_calendars_controller,
-    photos_controller, server_controller, users_controller,
+    accommodations_reservations_controller, auth_controller, couples_controller, data_controller,
+    families_controller, members_controller, photos_controller, server_controller,
+    users_controller,
 };
 
 #[actix_web::main]
@@ -204,6 +206,79 @@ async fn main() -> std::io::Result<()> {
                 "/family/{id}/genealogy/data/import",
                 web::put().to(data_controller::import_family),
             )
+            // [ACCOMODATIONS] List controller
+            .route(
+                "/family/{id}/accommodations/list/create",
+                web::post().to(accommodations_list_controller::create),
+            )
+            .route(
+                "/family/{id}/accommodations/list/list",
+                web::get().to(accommodations_list_controller::get_full_list),
+            )
+            .route(
+                "/family/{id}/accommodations/list/{accommodation_id}",
+                web::get().to(accommodations_list_controller::get_single),
+            )
+            .route(
+                "/family/{id}/accommodations/list/{accommodation_id}",
+                web::put().to(accommodations_list_controller::update),
+            )
+            .route(
+                "/family/{id}/accommodations/list/{accommodation_id}",
+                web::delete().to(accommodations_list_controller::delete),
+            )
+            // [ACCOMODATIONS] Reservations controller
+            .route(
+                "/family/{id}/accommodations/reservations/accommodation/{accommodation_id}",
+                web::get()
+                    .to(accommodations_reservations_controller::get_accommodation_reservations),
+            )
+            .route(
+                "/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/for_interval",
+                web::get()
+                    .to(accommodations_reservations_controller::get_accommodation_reservations_for_interval),
+            )
+            .route(
+                "/family/{id}/accommodations/reservations/full_list",
+                web::get().to(accommodations_reservations_controller::full_list),
+            )
+            .route(
+                "/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/create",
+                web::post().to(accommodations_reservations_controller::create_reservation),
+            )
+            .route(
+                "/family/{id}/accommodations/reservation/{reservation_id}",
+                web::get().to(accommodations_reservations_controller::get_single),
+            )
+            .route(
+                "/family/{id}/accommodations/reservation/{reservation_id}",
+                web::patch().to(accommodations_reservations_controller::update_single),
+            )
+            .route(
+                "/family/{id}/accommodations/reservation/{reservation_id}",
+                web::delete().to(accommodations_reservations_controller::delete),
+            )
+            .route(
+                "/family/{id}/accommodations/reservation/{reservation_id}/validate",
+                web::post().to(accommodations_reservations_controller::validate_or_reject),
+            )
+            // [ACCOMMODATIONS] Calendars controller
+            .route(
+                "/family/{id}/accommodations/reservations_calendars/create",
+                web::post().to(accommodations_reservations_calendars_controller::create),
+            )
+            .route(
+                "/family/{id}/accommodations/reservations_calendars/list",
+                web::get().to(accommodations_reservations_calendars_controller::get_list),
+            )
+            .route(
+                "/family/{id}/accommodations/reservations_calendars/{cal_id}",
+                web::delete().to(accommodations_reservations_calendars_controller::delete),
+            )
+            .route(
+                "/acccommodations_calendar/{token}",
+                web::get().to(accommodations_reservations_calendars_controller::anonymous_access),
+            )
             // Photos controller
             .route(
                 "/photo/{id}",

geneit_backend/src/models.rs

@@ -1,6 +1,11 @@
 use crate::app_config::AppConfig;
-use crate::schema::{couples, families, members, memberships, photos, users};
+use crate::constants;
+use crate::schema::{
+    accommodations_list, accommodations_reservations, accommodations_reservations_cals_urls,
+    couples, families, members, memberships, photos, users,
+};
 use crate::utils::crypt_utils::sha256;
+use crate::utils::time_utils::time;
 use diesel::prelude::*;
 
 /// User ID holder
@@ -66,6 +71,7 @@ pub struct Family {
     pub invitation_code: String,
     pub disable_couple_photos: bool,
     pub enable_genealogy: bool,
+    pub enable_accommodations: bool,
 }
 
 impl Family {
@@ -308,7 +314,7 @@ pub struct NewMember {
     pub time_update: i64,
 }
 
-/// Member ID holder
+/// Couple ID holder
 #[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, Eq, PartialEq, Hash)]
 pub struct CoupleID(pub i32);
 
@@ -441,3 +447,153 @@ pub struct NewCouple {
     pub time_create: i64,
     pub time_update: i64,
 }
+
+/// Accommodation ID holder
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, Eq, PartialEq, Hash)]
+pub struct AccommodationID(pub i32);
+
+#[derive(Queryable, Debug, serde::Serialize)]
+pub struct Accommodation {
+    id: i32,
+    family_id: i32,
+    time_create: i64,
+    pub time_update: i64,
+    pub name: String,
+    pub need_validation: bool,
+    pub description: Option<String>,
+    pub color: Option<String>,
+    pub open_to_reservations: bool,
+}
+
+impl Accommodation {
+    pub fn id(&self) -> AccommodationID {
+        AccommodationID(self.id)
+    }
+
+    pub fn family_id(&self) -> FamilyID {
+        FamilyID(self.family_id)
+    }
+}
+
+#[derive(Insertable)]
+#[diesel(table_name = accommodations_list)]
+pub struct NewAccommodation {
+    pub family_id: i32,
+    pub name: String,
+    pub time_create: i64,
+    pub time_update: i64,
+}
+
+/// Accommodation reservation ID holder
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, Eq, PartialEq, Hash)]
+pub struct AccommodationReservationID(pub i32);
+
+pub enum ReservationStatus {
+    Pending,
+    Accepted,
+    Rejected,
+}
+
+#[derive(Queryable, Debug, serde::Serialize)]
+pub struct AccommodationReservation {
+    id: i32,
+    family_id: i32,
+    accommodation_id: i32,
+    user_id: i32,
+    time_create: i64,
+    pub time_update: i64,
+    pub reservation_start: i64,
+    pub reservation_end: i64,
+    pub validated: Option<bool>,
+}
+
+impl AccommodationReservation {
+    pub fn id(&self) -> AccommodationReservationID {
+        AccommodationReservationID(self.id)
+    }
+
+    pub fn accommodation_id(&self) -> AccommodationID {
+        AccommodationID(self.accommodation_id)
+    }
+
+    pub fn family_id(&self) -> FamilyID {
+        FamilyID(self.family_id)
+    }
+
+    pub fn user_id(&self) -> UserID {
+        UserID(self.user_id)
+    }
+
+    pub fn status(&self) -> ReservationStatus {
+        match self.validated {
+            None => ReservationStatus::Pending,
+            Some(true) => ReservationStatus::Accepted,
+            Some(false) => ReservationStatus::Rejected,
+        }
+    }
+}
+
+#[derive(Insertable)]
+#[diesel(table_name = accommodations_reservations)]
+pub struct NewAccommodationReservation {
+    pub family_id: i32,
+    pub accommodation_id: i32,
+    pub user_id: i32,
+    pub time_create: i64,
+    pub time_update: i64,
+    pub reservation_start: i64,
+    pub reservation_end: i64,
+}
+
+/// Accommodation reservation calendar ID holder
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, Eq, PartialEq, Hash)]
+pub struct AccommodationReservationCalendarID(pub i32);
+
+#[derive(Queryable, Debug, serde::Serialize)]
+pub struct AccommodationReservationCalendar {
+    id: i32,
+    family_id: i32,
+    accommodation_id: Option<i32>,
+    user_id: i32,
+    name: String,
+    token: String,
+    pub time_create: i64,
+    pub time_used: i64,
+}
+
+impl AccommodationReservationCalendar {
+    pub fn id(&self) -> AccommodationReservationCalendarID {
+        AccommodationReservationCalendarID(self.id)
+    }
+
+    pub fn accommodation_id(&self) -> Option<AccommodationID> {
+        self.accommodation_id.map(AccommodationID)
+    }
+
+    pub fn family_id(&self) -> FamilyID {
+        FamilyID(self.family_id)
+    }
+
+    pub fn user_id(&self) -> UserID {
+        UserID(self.user_id)
+    }
+
+    pub fn should_update_last_used(&self) -> bool {
+        (self.time_used
+            + constants::ACCOMMODATIONS_RESERVATIONS_CAL_URL_TIME_USED_UPDATE_MIN_INTERVAL.as_secs()
+                as i64)
+            < time() as i64
+    }
+}
+
+#[derive(Insertable)]
+#[diesel(table_name = accommodations_reservations_cals_urls)]
+pub struct NewAccommodationReservationCalendar {
+    pub family_id: i32,
+    pub accommodation_id: Option<i32>,
+    pub user_id: i32,
+    pub name: String,
+    pub token: String,
+    pub time_create: i64,
+    pub time_used: i64,
+}

geneit_backend/src/schema.rs

@@ -1,5 +1,50 @@
 // @generated automatically by Diesel CLI.
 
+diesel::table! {
+    accommodations_list (id) {
+        id -> Int4,
+        family_id -> Int4,
+        time_create -> Int8,
+        time_update -> Int8,
+        #[max_length = 50]
+        name -> Varchar,
+        need_validation -> Bool,
+        description -> Nullable<Text>,
+        #[max_length = 6]
+        color -> Nullable<Varchar>,
+        open_to_reservations -> Bool,
+    }
+}
+
+diesel::table! {
+    accommodations_reservations (id) {
+        id -> Int4,
+        family_id -> Int4,
+        accommodation_id -> Int4,
+        user_id -> Int4,
+        time_create -> Int8,
+        time_update -> Int8,
+        reservation_start -> Int8,
+        reservation_end -> Int8,
+        validated -> Nullable<Bool>,
+    }
+}
+
+diesel::table! {
+    accommodations_reservations_cals_urls (id) {
+        id -> Int4,
+        family_id -> Int4,
+        accommodation_id -> Nullable<Int4>,
+        user_id -> Int4,
+        #[max_length = 50]
+        name -> Varchar,
+        #[max_length = 50]
+        token -> Varchar,
+        time_create -> Int8,
+        time_used -> Int8,
+    }
+}
+
 diesel::table! {
     couples (id) {
         id -> Int4,
@@ -30,6 +75,7 @@ diesel::table! {
         invitation_code -> Varchar,
         disable_couple_photos -> Bool,
         enable_genealogy -> Bool,
+        enable_accommodations -> Bool,
     }
 }
 
@@ -119,6 +165,13 @@ diesel::table! {
     }
 }
 
+diesel::joinable!(accommodations_list -> families (family_id));
+diesel::joinable!(accommodations_reservations -> accommodations_list (accommodation_id));
+diesel::joinable!(accommodations_reservations -> families (family_id));
+diesel::joinable!(accommodations_reservations -> users (user_id));
+diesel::joinable!(accommodations_reservations_cals_urls -> accommodations_list (accommodation_id));
+diesel::joinable!(accommodations_reservations_cals_urls -> families (family_id));
+diesel::joinable!(accommodations_reservations_cals_urls -> users (user_id));
 diesel::joinable!(couples -> families (family_id));
 diesel::joinable!(couples -> photos (photo_id));
 diesel::joinable!(members -> families (family_id));
@@ -127,6 +180,9 @@ diesel::joinable!(memberships -> families (family_id));
 diesel::joinable!(memberships -> users (user_id));
 
 diesel::allow_tables_to_appear_in_same_query!(
+    accommodations_list,
+    accommodations_reservations,
+    accommodations_reservations_cals_urls,
     couples,
     families,
     members,

geneit_backend/src/services/accommodations_list_service.rs

@@ -0,0 +1,103 @@
+use crate::connections::db_connection;
+use crate::models::{Accommodation, AccommodationID, FamilyID, NewAccommodation};
+use crate::schema::accommodations_list;
+use crate::utils::time_utils::time;
+use diesel::prelude::*;
+
+/// Create a new accommodation
+pub async fn create(family_id: FamilyID) -> anyhow::Result<Accommodation> {
+    db_connection::execute(|conn| {
+        let res: Accommodation = diesel::insert_into(accommodations_list::table)
+            .values(&NewAccommodation {
+                family_id: family_id.0,
+                name: "".to_string(),
+                time_create: time() as i64,
+                time_update: time() as i64,
+            })
+            .get_result(conn)?;
+
+        Ok(res)
+    })
+}
+
+/// Get the information of an accommodation
+pub async fn get_by_id(id: AccommodationID) -> anyhow::Result<Accommodation> {
+    db_connection::execute(|conn| {
+        accommodations_list::table
+            .filter(accommodations_list::dsl::id.eq(id.0))
+            .first(conn)
+    })
+}
+
+/// Get all the accommodations of a family
+pub async fn get_all_of_family(id: FamilyID) -> anyhow::Result<Vec<Accommodation>> {
+    db_connection::execute(|conn| {
+        accommodations_list::table
+            .filter(accommodations_list::dsl::family_id.eq(id.0))
+            .get_results(conn)
+    })
+}
+
+/// Check whether accommodation with a given id exists or not
+pub async fn exists(
+    family_id: FamilyID,
+    accommodation_id: AccommodationID,
+) -> anyhow::Result<bool> {
+    db_connection::execute(|conn| {
+        let count: i64 = accommodations_list::table
+            .filter(
+                accommodations_list::id
+                    .eq(accommodation_id.0)
+                    .and(accommodations_list::family_id.eq(family_id.0)),
+            )
+            .count()
+            .get_result(conn)?;
+
+        Ok(count != 0)
+    })
+}
+
+/// Update the information of an accommodation
+pub async fn update(accommodation: &mut Accommodation) -> anyhow::Result<()> {
+    accommodation.time_update = time() as i64;
+
+    db_connection::execute(|conn| {
+        diesel::update(
+            accommodations_list::dsl::accommodations_list
+                .filter(accommodations_list::dsl::id.eq(accommodation.id().0)),
+        )
+        .set((
+            accommodations_list::dsl::time_update.eq(accommodation.time_update),
+            accommodations_list::dsl::name.eq(accommodation.name.to_string()),
+            accommodations_list::dsl::need_validation.eq(accommodation.need_validation),
+            accommodations_list::dsl::description.eq(accommodation.description.clone()),
+            accommodations_list::dsl::color.eq(accommodation.color.clone()),
+            accommodations_list::dsl::open_to_reservations.eq(accommodation.open_to_reservations),
+        ))
+        .execute(conn)
+    })?;
+
+    Ok(())
+}
+
+/// Delete an accommodation
+pub async fn delete(accommodation: &mut Accommodation) -> anyhow::Result<()> {
+    // Remove the accommodation
+    db_connection::execute(|conn| {
+        diesel::delete(
+            accommodations_list::dsl::accommodations_list
+                .filter(accommodations_list::dsl::id.eq(accommodation.id().0)),
+        )
+        .execute(conn)
+    })?;
+
+    Ok(())
+}
+
+/// Delete all the accommodations of a family
+pub async fn delete_all_family(family_id: FamilyID) -> anyhow::Result<()> {
+    for mut m in get_all_of_family(family_id).await? {
+        delete(&mut m).await?;
+    }
+    Ok(())
+}

geneit_backend/src/services/accommodations_reservations_calendars_service.rs

@@ -0,0 +1,98 @@
+use crate::connections::db_connection;
+use crate::constants;
+use crate::models::{
+    AccommodationID, AccommodationReservationCalendar, AccommodationReservationCalendarID,
+    FamilyID, NewAccommodationReservationCalendar, UserID,
+};
+use crate::schema::accommodations_reservations_cals_urls;
+use crate::utils::string_utils::rand_str;
+use crate::utils::time_utils::time;
+use diesel::prelude::*;
+
+/// Create a new reservation calendar entry
+pub async fn create(
+    user_id: UserID,
+    family_id: FamilyID,
+    accommodation_id: Option<AccommodationID>,
+    name: &str,
+) -> anyhow::Result<AccommodationReservationCalendar> {
+    db_connection::execute(|conn| {
+        let res: AccommodationReservationCalendar =
+            diesel::insert_into(accommodations_reservations_cals_urls::table)
+                .values(&NewAccommodationReservationCalendar {
+                    family_id: family_id.0,
+                    accommodation_id: accommodation_id.map(|i| i.0),
+                    user_id: user_id.0,
+                    name: name.to_string(),
+                    token: rand_str(constants::ACCOMMODATIONS_RESERVATIONS_CALENDARS_TOKENS_LEN),
+                    time_create: time() as i64,
+                    time_used: time() as i64,
+                })
+                .get_result(conn)?;
+
+        Ok(res)
+    })
+}
+
+/// Update the information of a reservations calendar
+pub async fn update(cal: &AccommodationReservationCalendar) -> anyhow::Result<()> {
+    db_connection::execute(|conn| {
+        diesel::update(
+            accommodations_reservations_cals_urls::dsl::accommodations_reservations_cals_urls
+                .filter(accommodations_reservations_cals_urls::dsl::id.eq(cal.id().0)),
+        )
+        .set((accommodations_reservations_cals_urls::dsl::time_used.eq(cal.time_used),))
+        .execute(conn)
+    })?;
+
+    Ok(())
+}
+
+/// Get all the calendars of a user
+pub async fn get_all_of_user(
+    user: UserID,
+    family: FamilyID,
+) -> anyhow::Result<Vec<AccommodationReservationCalendar>> {
+    db_connection::execute(|conn| {
+        accommodations_reservations_cals_urls::table
+            .filter(
+                accommodations_reservations_cals_urls::dsl::family_id
+                    .eq(family.0)
+                    .and(accommodations_reservations_cals_urls::dsl::user_id.eq(user.0)),
+            )
+            .get_results(conn)
+    })
+}
+
+/// Get a single calendar by its id
+pub async fn get_by_id(
+    id: AccommodationReservationCalendarID,
+) -> anyhow::Result<AccommodationReservationCalendar> {
+    db_connection::execute(|conn| {
+        accommodations_reservations_cals_urls::table
+            .filter(accommodations_reservations_cals_urls::dsl::id.eq(id.0))
+            .get_result(conn)
+    })
+}
+
+/// Get a single calendar by its token
+pub async fn get_by_token(token: &str) -> anyhow::Result<AccommodationReservationCalendar> {
+    db_connection::execute(|conn| {
+        accommodations_reservations_cals_urls::table
+            .filter(accommodations_reservations_cals_urls::dsl::token.eq(token))
+            .get_result(conn)
+    })
+}
+
+/// Delete a calendar
+pub async fn delete(r: AccommodationReservationCalendar) -> anyhow::Result<()> {
+    db_connection::execute(|conn| {
+        diesel::delete(
+            accommodations_reservations_cals_urls::dsl::accommodations_reservations_cals_urls
+                .filter(accommodations_reservations_cals_urls::dsl::id.eq(r.id().0)),
+        )
+        .execute(conn)
+    })?;
+
+    Ok(())
+}

geneit_backend/src/services/accommodations_reservations_service.rs

@@ -0,0 +1,101 @@
+use crate::connections::db_connection;
+use crate::models::{
+    AccommodationID, AccommodationReservation, AccommodationReservationID, FamilyID,
+    NewAccommodationReservation,
+};
+use crate::schema::accommodations_reservations;
+use crate::utils::time_utils::time;
+use diesel::prelude::*;
+
+/// Create a new reservation
+pub async fn create(new: &NewAccommodationReservation) -> anyhow::Result<AccommodationReservation> {
+    db_connection::execute(|conn| {
+        let res: AccommodationReservation = diesel::insert_into(accommodations_reservations::table)
+            .values(new)
+            .get_result(conn)?;
+
+        Ok(res)
+    })
+}
+
+/// Update a reservation
+pub async fn update(r: &mut AccommodationReservation) -> anyhow::Result<()> {
+    r.time_update = time() as i64;
+
+    db_connection::execute(|conn| {
+        diesel::update(
+            accommodations_reservations::dsl::accommodations_reservations
+                .filter(accommodations_reservations::dsl::id.eq(r.id().0)),
+        )
+        .set((
+            accommodations_reservations::dsl::time_update.eq(r.time_update),
+            accommodations_reservations::dsl::validated.eq(r.validated),
+            accommodations_reservations::dsl::reservation_start.eq(r.reservation_start),
+            accommodations_reservations::dsl::reservation_end.eq(r.reservation_end),
+        ))
+        .execute(conn)
+    })?;
+
+    Ok(())
+}
+
+/// Delete a reservation
+pub async fn delete(r: AccommodationReservation) -> anyhow::Result<()> {
+    // Remove the reservation
+    db_connection::execute(|conn| {
+        diesel::delete(
+            accommodations_reservations::dsl::accommodations_reservations
+                .filter(accommodations_reservations::dsl::id.eq(r.id().0)),
+        )
+        .execute(conn)
+    })?;
+
+    Ok(())
+}
+
+/// Get all the reservations of an accommodation
+pub async fn get_all_of_accommodation(
+    id: AccommodationID,
+) -> anyhow::Result<Vec<AccommodationReservation>> {
+    db_connection::execute(|conn| {
+        accommodations_reservations::table
+            .filter(accommodations_reservations::dsl::accommodation_id.eq(id.0))
+            .get_results(conn)
+    })
+}
+
+/// Get all the reservations of a family
+pub async fn get_all_of_family(id: FamilyID) -> anyhow::Result<Vec<AccommodationReservation>> {
+    db_connection::execute(|conn| {
+        accommodations_reservations::table
+            .filter(accommodations_reservations::dsl::family_id.eq(id.0))
+            .get_results(conn)
+    })
+}
+
+/// Get a single accommodation reservation by its id
+pub async fn get_by_id(id: AccommodationReservationID) -> anyhow::Result<AccommodationReservation> {
+    db_connection::execute(|conn| {
+        accommodations_reservations::table
+            .filter(accommodations_reservations::dsl::id.eq(id.0))
+            .get_result(conn)
+    })
+}
+
+/// Get the reservations that are between a given interval of time for a given accommodation
+pub async fn get_reservations_for_time_interval(
+    id: AccommodationID,
+    start: usize,
+    end: usize,
+) -> anyhow::Result<Vec<AccommodationReservation>> {
+    db_connection::execute(|conn| {
+        accommodations_reservations::table
+            .filter(
+                accommodations_reservations::dsl::accommodation_id
+                    .eq(id.0)
+                    .and(accommodations_reservations::dsl::reservation_start.lt((end) as i64))
+                    .and(accommodations_reservations::dsl::reservation_end.gt((start) as i64)),
+            )
+            .get_results(conn)
+    })
+}

geneit_backend/src/services/families_service.rs

@@ -5,7 +5,9 @@ use crate::models::{
     Family, FamilyID, FamilyMembership, Membership, NewFamily, NewMembership, UserID,
 };
 use crate::schema::{families, memberships};
-use crate::services::{couples_service, members_service, users_service};
+use crate::services::{
+    accommodations_list_service, couples_service, members_service, users_service,
+};
 use crate::utils::string_utils::rand_str;
 use crate::utils::time_utils::time;
 use diesel::prelude::*;
@@ -127,9 +129,9 @@ pub async fn update_membership(membership: &Membership) -> anyhow::Result<()> {
 #[derive(serde::Serialize)]
 pub struct FamilyMember {
     #[serde(flatten)]
-    membership: Membership,
+    pub membership: Membership,
-    user_name: String,
+    pub user_name: String,
-    user_mail: String,
+    pub user_mail: String,
 }
 
 /// Get information about the users of a family
@@ -175,6 +177,7 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> {
                 families::dsl::name.eq(family.name.clone()),
                 families::dsl::invitation_code.eq(family.invitation_code.clone()),
                 families::dsl::enable_genealogy.eq(family.enable_genealogy),
+                families::dsl::enable_accommodations.eq(family.enable_accommodations),
                 families::dsl::disable_couple_photos.eq(family.disable_couple_photos),
             ))
             .execute(conn)
@@ -185,6 +188,9 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> {
 
 /// Delete a family
 pub async fn delete_family(family_id: FamilyID) -> anyhow::Result<()> {
+    // Delete all family accommodations
+    accommodations_list_service::delete_all_family(family_id).await?;
+
     // Delete all family couples
     couples_service::delete_all_family(family_id).await?;
 

geneit_backend/src/services/members_service.rs

@@ -147,7 +147,7 @@ pub mod loop_detection {
         prev: Option<&'a LoopStack<'a>>,
     }
 
-    impl<'a> LoopStack<'a> {
+    impl LoopStack<'_> {
         pub fn contains(&self, id: MemberID) -> bool {
             if let Some(ls) = &self.prev {
                 if ls.contains(id) {

geneit_backend/src/services/mod.rs

@@ -1,5 +1,8 @@
 //! # Backend services
 
+pub mod accommodations_list_service;
+pub mod accommodations_reservations_calendars_service;
+pub mod accommodations_reservations_service;
 pub mod couples_service;
 pub mod families_service;
 pub mod login_token_service;