LICENSE.md

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

README.md

@@ -23,5 +23,4 @@ To bundle Javascript with esbuild inside the web/ directory :
 
 ```
 npx esbuild assets/js/main.js --bundle --outfile=public/js/main.js
-```
-
+```

config.yaml

@@ -1,51 +1,9 @@
 name: PARCOURSMOB
 
-menu_items:
-  - name: dashboard
-    title: Tableau de bord
-    link: /app/
-    icon: hero:outline/home
-  - name: beneficiaries
-    title: Bénéficiaires
-    link: /app/beneficiaries/
-    icon: hero:outline/user-group
-  - name: journeys
-    title: Déplacements
-    link: /app/journeys/
-    icon: hero:outline/map
-  - name: solidarity_transport
-    title: Transport solidaire
-    link: /app/solidarity-transport/
-    icon: tabler-icons:car
-  - name: organized_carpool
-    title: Covoiturage solidaire
-    link: /app/organized-carpool/
-    icon: tabler-icons:car
-  - name: vehicles
-    title: Véhicules partagés
-    link: /app/vehicles/
-    icon: tabler-icons:car
-  - name: vehicles_management
-    title: Gestion des véhicules
-    link: /app/vehicles-management/
-    icon: hero:outline/briefcase
-  - name: agenda
-    title: Agenda dispositifs
-    link: /app/agenda/
-    icon: hero:outline/calendar
-  - name: directory
-    title: Répertoire solutions
-    link: /app/directory/
-    icon: hero:outline/document-text
-  - name: support
-    title: Support
-    link: /app/support/
-    icon: hero:outline/support
-
 views:
   generic:
     files:
-      - web/layouts/layout.html
+      - web/layouts/layout.html 
       - web/layouts/_partials/mainmenu.html
   dashboard:
     files:
@@ -72,8 +30,6 @@ views:
         - web/layouts/beneficiaries/_partials/beneficiary-files.html
         - web/layouts/beneficiaries/_partials/beneficiary-organizations.html
         - web/layouts/beneficiaries/_partials/beneficiary-diags.html
-        - web/layouts/beneficiaries/_partials/beneficiary-wallet.html
-        - web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
         - web/layouts/beneficiaries/display.html
     create_diag:
       files:
@@ -81,7 +37,6 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:
@@ -99,19 +54,18 @@ views:
         - web/layouts/administration/_partials/groups_admins.html
         - web/layouts/administration/_partials/group_members.html
         - web/layouts/group/settings.html
-
   vehicles:
-    search:
-      files:
+    search: 
+      files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles/search.html
-    booking_display:
-      files:
+    booking_display: 
+      files: 
         - web/layouts/vehicles/booking-display.html
         - web/layouts/vehicles_management/_partials/booking-diags.html
-    bookings_list:
-      files:
+    bookings_list: 
+      files: 
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles/bookings-list.html
     create_booking_diag:
@@ -123,8 +77,8 @@ views:
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles_management/_partials/vehicles-list.html
         - web/layouts/vehicles_management/overview.html
-    bookings_list:
-      files:
+    bookings_list: 
+      files: 
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles_management/bookings-list.html
     fleet_add:
@@ -140,15 +94,14 @@ views:
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/agenda/_partials/address.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles_management/fleet-update.html
-    booking_display:
-      files:
+    booking_display: 
+      files: 
         - web/layouts/vehicles_management/booking-display.html
         - web/layouts/vehicles_management/_partials/booking-diags.html
-    delete_booking:
-      files:
+    delete_booking: 
+      files: 
         - web/layouts/vehicles_management/delete-booking.html
     create_vehicle_diag:
       files:
@@ -156,25 +109,25 @@ views:
     create_booking_diag:
       files:
         - web/layouts/vehicles_management/create-booking-diag.html
-  agenda:
-    list:
-      files:
+  agenda: 
+    list: 
+      files: 
         - web/layouts/agenda/home.html
-    history:
-      files:
+    history: 
+      files: 
         - web/layouts/agenda/history.html
-    display_event:
-      files:
+    display_event: 
+      files: 
         - web/layouts/agenda/_partials/subscribers-table.html
         - web/layouts/agenda/display-event.html
         - web/layouts/agenda/_partials/event-files.html
-    create_event:
-      files:
+    create_event: 
+      files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
         - web/layouts/agenda/_partials/event-files.html
-    delete_subscriber:
-      files:
+    delete_subscriber: 
+      files: 
         - web/layouts/agenda/delete-subscriber.html
     history_event:
       files:
@@ -187,20 +140,18 @@ views:
     delete:
       files:
         - web/layouts/agenda/delete-event.html
-  directory:
-    home:
-      files:
+  directory: 
+    home: 
+      files: 
         - web/layouts/directory/home.html
-  journeys:
-    search:
-      files:
-        - web/layouts/_partials/orb_address_autocomplete.html
+  journeys: 
+    search: 
+      files: 
+        - web/layouts/_partials/address_autocomplete.html
         - web/layouts/journeys/_partials/journeys-all.html
         - web/layouts/journeys/_partials/journeys-others.html
         - web/layouts/journeys/_partials/journeys-carpool.html
-        - web/layouts/journeys/_partials/journeys-public-transit-motis.html
-        - web/layouts/journeys/_partials/journeys-solidarity-transport.html
-        - web/layouts/journeys/_partials/journeys-organized-carpools.html
+        - web/layouts/journeys/_partials/journeys-public-transit.html
         - web/layouts/journeys/search.html
     list:
       files:
@@ -229,7 +180,7 @@ views:
       files:
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/group_module/create_group.html
-
+  
     display_group:
       files:
         - web/layouts/group_module/display_group.html
@@ -251,72 +202,6 @@ views:
       files:
         - web/layouts/diags/history-diags.html
 
-  solidarity_transport:
-    overview:
-      files:
-        - web/layouts/solidarity_transport/_partials/drivers_list.html
-        - web/layouts/solidarity_transport/_partials/bookings_list.html
-        - web/layouts/solidarity_transport/_partials/bookings_history.html
-        - web/layouts/solidarity_transport/overview.html
-    driver_create:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/driver_create.html
-    driver_update:
-      files:
-        - web/layouts/agenda/_partials/address.html
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/driver_update.html
-    driver_display:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/_partials/driver_availabilities.html
-        - web/layouts/solidarity_transport/_partials/driver_history.html
-        - web/layouts/solidarity_transport/_partials/driver_documents.html
-        - web/layouts/solidarity_transport/driver_display.html
-    driver_journey:
-      files:
-        - web/layouts/solidarity_transport/_partials/journey_map.html
-        - sms/solidarity_transport/request_driver.tmpl
-        - web/layouts/_partials/submit_with_sms.html
-        - web/layouts/solidarity_transport/_partials/journey_preview.html
-        - web/layouts/solidarity_transport/driver_journey.html
-    booking_display:
-      files:
-        - web/layouts/solidarity_transport/_partials/journey_map.html
-        - web/layouts/solidarity_transport/_partials/journey_preview.html
-        - web/layouts/solidarity_transport/booking_display.html
-
-    ext:
-      booking_proposal:
-        files:
-          - sms/solidarity_transport/driver_accept.tmpl
-          - web/layouts/_partials/submit_with_sms.html
-          - web/layouts/solidarity_transport/_partials/journey_map.html
-          - web/layouts/solidarity_transport/_partials/journey_preview.html
-          - web/layouts/solidarity_transport/ext/booking_proposal.html
-
-  organized_carpool:
-    overview:
-      files:
-        - web/layouts/organized_carpool/_partials/drivers_list.html
-        - web/layouts/organized_carpool/_partials/bookings_list.html
-        - web/layouts/organized_carpool/overview.html
-    driver_create:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/driver_create.html
-    driver_display:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/_partials/driver_availabilities.html
-        - web/layouts/solidarity_transport/_partials/driver_documents.html
-        - web/layouts/organized_carpool/driver_display.html
-    journey:
-      files:
-        - web/layouts/organized_carpool/_partials/journey_preview.html
-        - web/layouts/organized_carpool/journey.html
-
   administration:
     home:
       files:
@@ -342,7 +227,7 @@ views:
       files:
         - web/layouts/administration/_partials/bookings_list.html
         - web/layouts/administration/bookings_stats.html
-    settings:
+    settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html
         - web/layouts/administration/_partials/group_members.html
@@ -352,30 +237,27 @@ views:
       files:
         - web/layouts/auth/groups.html
     lost_password:
-      init:
-        files:
+      init: 
+        files: 
           - web/layouts/auth/lost-password-init.html
-      recover:
+      recover: 
         form:
-          files:
+          files: 
             - web/layouts/auth/lost-password-recover.html
-        ko:
+        ko: 
           files:
             - web/layouts/auth/lost-password-recover-ko.html
     onboarding:
       form:
         files:
           - web/layouts/auth/onboarding.html
-      ko:
+      ko: 
         files:
           - web/layouts/auth/onboarding-ko.html
 
 icons:
   svg:
     coopgo:parcoursmob/monogram: <svg xmlns="http://www.w3.org/2000/svg" class="%s" viewBox="0 0 61.85 33.58"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#243887;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M44.978,0C31.337,0,28.1,6.824,27.875,15.505H39.536V9.434a.727.727,0,0,1,1.123-.607L52.6,16.453,40.659,24.08a.729.729,0,0,1-1.123-.608v-6.1H27.865c.075,8.427,1.527,16.213,17.113,16.213,14.867,0,16.872-7.764,16.872-17.032C61.85,7.91,59.894,0,44.978,0Z"/><polygon class="cls-1" points="41.412 21.385 49.133 16.453 41.412 11.521 41.412 21.385"/><path class="cls-2" d="M14.175,11.4l-.019,4.151H26.311a14.781,14.781,0,0,0,.819-5.141C27.046,3.767,22.545,0,14.764,0H1.052A1.147,1.147,0,0,0,0,1.24V31.87a1.149,1.149,0,0,0,1.094,1.239H11.525a1.145,1.145,0,0,0,1.051-1.239V10.41h.758C13.88,10.41,14.175,10.756,14.175,11.4Z"/><path class="cls-2" d="M14.148,17.3l-.015,3.514H18.97A7.521,7.521,0,0,0,25.458,17.3Z"/></g></g></svg>
-    hero:outline/archive-box: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" /></svg>
-    hero:outline/arrow-long-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3" /></svg>
-    hero:outline/arrow-path-rounded-square: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 12c0-1.232-.046-2.453-.138-3.662a4.006 4.006 0 0 0-3.7-3.7 48.678 48.678 0 0 0-7.324 0 4.006 4.006 0 0 0-3.7 3.7c-.017.22-.032.441-.046.662M19.5 12l3-3m-3 3-3-3m-12 3c0 1.232.046 2.453.138 3.662a4.006 4.006 0 0 0 3.7 3.7 48.656 48.656 0 0 0 7.324 0 4.006 4.006 0 0 0 3.7-3.7c.017-.22.032-.441.046-.662M4.5 12l3 3m-3-3-3 3" /></svg>
     hero:outline/briefcase: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
     hero:outline/support: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" /></svg>
     hero:outline/group_module: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" /></svg>
@@ -389,7 +271,6 @@ icons:
     hero:outline/information-circle: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" /></svg>
     hero:outline/map: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" /></svg>
     hero:outline/office-building: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" /></svg>
-    hero:outline/paper-airplane: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M6 12 3.269 3.125A59.769 59.769 0 0 1 21.485 12 59.768 59.768 0 0 1 3.27 20.875L5.999 12Zm0 0h7.5" /></svg>
     hero:outline/paper-clip: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M18.375 12.739l-7.693 7.693a4.5 4.5 0 01-6.364-6.364l10.94-10.94A3 3 0 1119.5 7.372L8.552 18.32m.009-.01l-.01.01m5.699-9.941l-7.81 7.81a1.5 1.5 0 002.112 2.13" /></svg>
     hero:outline/plus-circle: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
     hero:outline/shield-check: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" /></svg>
@@ -404,10 +285,9 @@ icons:
     tabler-icons:car: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-car %s" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><circle cx="7" cy="17" r="2"></circle><circle cx="17" cy="17" r="2"></circle><path d="M5 17h-2v-6l2 -5h9l4 5h1a2 2 0 0 1 2 2v4h-2m-4 0h-6m-6 -6h15m-6 0v-5"></path></svg>
     tabler-icons:walk: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-walk %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="13" cy="4" r="1" /><line x1="7" y1="21" x2="10" y2="17" /><path d="M16 21l-2 -4l-3 -3l1 -6" /><path d="M6 12l2 -3l4 -1l3 3l3 1" /></svg>
     tabler-icons:bus: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bus %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="6" cy="17" r="2" /><circle cx="18" cy="17" r="2" /><path d="M4 17h-2v-11a1 1 0 0 1 1 -1h14a5 7 0 0 1 5 7v5h-2m-4 0h-8" /><polyline points="16 5 17.5 12 22 12" /><line x1="2" y1="10" x2="17" y2="10" /><line x1="7" y1="5" x2="7" y2="10" /><line x1="12" y1="5" x2="12" y2="10" /></svg>
-    tabler-icons:train: <svg  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-train %s"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M21 13c0 -3.87 -3.37 -7 -10 -7h-8" /><path d="M3 15h16a2 2 0 0 0 2 -2" /><path d="M3 6v5h17.5" /><path d="M3 11v4" /><path d="M8 11v-5" /><path d="M13 11v-4.5" /><path d="M3 19h18" /></svg>
 
 emails:
-  onboarding:
+  onboarding: 
     new_administrator:
       subject: PARCOURSMOB - Vous avez été invité comme administrateur
       files:
@@ -428,10 +308,10 @@ emails:
       files:
         - emails/layout.html
         - emails/onboarding/existing-member.html
-  auth:
+  auth: 
     retrieve_password:
       subject: PAROURSMOB - Réinitialisez votre mot de passe
-      files:
+      files: 
         - emails/layout.html
         - emails/auth/retrieve-password.html
   fleets:
@@ -453,19 +333,3 @@ emails:
       files:
         - emails/layout.html
         - emails/onboarding/delete-subscriber.html
-  solidarity_transport:
-    boking_driver_accept:
-      subject: Trajet accepté par un conducteur
-      files:
-        - emails/layout.html
-        - emails/solidarity_transport/booking_driver_accept.html
-    boking_driver_decline:
-      subject: Trajet accepté par un conducteur
-      files:
-        - emails/layout.html
-        - emails/solidarity_transport/booking_driver_accept.html
-
-sms:
-  solidarity_transport:
-    request_driver:
-      - sms/solidarity_transport/request_driver.tmpl

emails/auth/retrieve-password.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Bonjour,</p>
 <p>Vous avez demandé à réinitialiser votre mot de passe pour <b>{{.username}}</b></p>
-<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="{{ .baseUrl }}/auth/lost-password/recover?key={{.key}}">{{ .baseUrl }}/auth/lost-password/recover?key={{.key}}</a></p>
-{{end}}
+<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="http://localhost:9000/auth/lost-password/recover?key={{.key}}">http://localhost:9000/auth/lost-password/recover?key={{.key}}</a></p>
+{{end}}

emails/onboarding/existing-administrator.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="{{ .baseUrl }}">{{ .baseUrl }}</a> pour y accéder</p>
-{{end}}
+<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
+{{end}}

emails/onboarding/existing-member.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="{{ .baseUrl }}">{{ .baseUrl }}</a> pour y accéder</p>
-{{end}}
+<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
+{{end}}

emails/onboarding/new-administrator.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="{{ .baseUrl }}/auth/onboarding?key={{.key}}">{{ .baseUrl }}/auth/onboarding?key={{.key}}</a></p>
-{{end}}
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
+{{end}}

emails/onboarding/new-member.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="{{ .baseUrl }}/auth/onboarding?key={{.key}}">{{ .baseUrl }}/auth/onboarding?key={{.key}}</a></p>
-{{end}}
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
+{{end}}

emails/onboarding/support_emailing.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez reçu un commentaire sur PARCOURSMOB de la part de <b>{{.user}}</b></p>
-<p>{{unescapeHTML .key}}</p>
-{{end}}
+<p>{{.key}}</p>
+{{end}}

emails/solidarity_transport/booking_driver_accept.html

@@ -1,5 +0,0 @@
-{{define "content"}}
-<p>Bonjour,</p>
-<p>Trajet accepté par un conducteur.</p>
-<p>Voir le trajet : <a href="{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}</a></p>
-{{end}}

emails/solidarity_transport/booking_driver_decline.html

@@ -1,5 +0,0 @@
-{{define "content"}}
-<p>Bonjour,</p>
-<p>Trajet refusé par un conducteur.</p>
-<p>Voir le trajet : <a href="{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}</a></p>
-{{end}}

sms/solidarity_transport/driver_accept.tmpl

@@ -1 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}.{{ end }}

sms/solidarity_transport/request_driver.tmpl

@@ -1,2 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] Nouvelle demande de trajet solidaire le {{ .datetime }}.
-Acceptez ou refusez sur {{ .baseUrl }}/ext/st/bp/{booking_id}{{ end }}

web/assets/css/main.css

@@ -1,15 +1,6 @@
-@import "tailwindcss";
-
-@theme {
-  --color-co-blue: #243887;
-  --color-co-lightblue: #907eff;
-  --color-co-red: #ff1300;
-  --color-co-green: #6cc11f;
-  --color-co-yellow: #ffdd00;
-  --color-co-orange: #ff5300;
-
-  --radius-co: 40%;
-}
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
 @font-face {
     font-family: "Manometer";
@@ -25,7 +16,4 @@
     html {
         font-family: Bitter, serif; 
     }
-    input {
-      padding: 2px;
-    }
-}
+}

web/assets/js/main.js

@@ -1,11 +1,6 @@
 import '@kingshott/iodine';
 import Alpine from 'alpinejs'
-import { Protocol } from "pmtiles";
-import { layers, namedFlavor } from '@protomaps/basemaps';
  
 window.Alpine = Alpine
  
-Alpine.start()
-
-let protocol = new Protocol();
-maplibregl.addProtocol("pmtiles",protocol.tile);
+Alpine.start()

web/layouts/_partials/address_autocomplete.html

@@ -1,12 +1,13 @@
 {{ define "address_autocomplete" }}
 
-<div class="col-span-6 relative" x-data='{
-    input: {{if .Address}}"{{.Address.properties.label}}"{{else}}null{{end}},
-    address: {{if .Address}}JSON.stringify({{template "geojson" .Address}}){{else}}null{{end}},
-    addressObject: {{if .Address}}{{template "geojson" .Address }}{{else}}null{{end}},
+
+<div class="col-span-6 relative" x-data="{
+    input: {{if .Address}}'{{.Address.Properties.label}}'{{else}}null{{end}},
+    address: {{if .Address}}JSON.stringify({{printf "%s" .Address.MarshalJSON}}){{else}}null{{end}},
+    addressObject: {{if .Address}}{{printf "%s" .Address.MarshalJSON}}{{else}}null{{end}},
     responselength: 0,
     async autocomplete() {
-        if(this.input == null || this.input == "") {
+        if(this.input == null || this.input == '') {
             this.responselength = 0
             return []
         }
@@ -14,31 +15,26 @@
             this.responselength = 0
             return []
         }
-        if(this.input.length < 3) {
-            this.responselength = 0
-            return []
-        }
-        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
+        result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
         json = await result.json()
-        console.log(json)
 
-        this.responselength = json["features"].length
-        return json["features"]
+        this.responselength = json['features'].length
+        return json['features']
     },
     select(a) {
         this.address = JSON.stringify(a)
         this.addressObject = a
         this.input = a.properties.label
     }
-}'>
+}">
     <input type="hidden" name="{{ .FieldName }}" x-model="address">
     <label for="address" class="block text-sm font-medium text-gray-700">{{ if .FieldLabel }}{{.FieldLabel}}{{else}}Adresse{{end}}</label>
     <input type="text" 
-        class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
+        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
         x-model="input">
 
     <ul x-show="responselength > 0"
-    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
+    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
         <template x-for="item in autocomplete">
             <a href="#">
                 <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 
@@ -49,15 +45,4 @@
         </template>
     </ul>
 </div>
-{{ end }}
-
-{{define "geojson"}}{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [{{index .geometry.coordinates 0}}, {{index .geometry.coordinates 1}}],
-  },
-  "properties": {
-    "label": "{{.properties.label}}"
-  }
-}{{end}}
+{{ end }}

web/layouts/_partials/mainmenu.html

@@ -1,20 +1,19 @@
 {{define "mainmenu"}}
 
-{{range .LayoutState.Menu}}
-{{if moduleAvailable .name }}
+{{range .LayoutState.MenuItems}}
 <nav class="px-2 space-y-1">
-    <a href="{{.link}}"
-        {{ if eq .name $.LayoutState.ActiveMenu }}
+    <a href="{{.Link}}"
+        {{ if .Active }}
         class="bg-white text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{ else}}
-        class="text-white hover:bg-white hover:bg-opacity-5 hover:text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
+        class="text-white hover:bg-white hover:bg-opacity-5 group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{end}}
 
-        {{$.IconSet.Icon .icon "mr-4 flex-shrink-0 h-6 w-6"}}
+        {{$.IconSet.Icon .Icon "mr-4 flex-shrink-0 h-6 w-6"}}
         
-        {{.title}}
+        {{.Title}}
     </a>
 </nav>
 {{end}}
-{{end}}
-{{end}}
+
+{{end}}

web/layouts/_partials/orb_address_autocomplete.html

@@ -1,64 +0,0 @@
-
-{{ define "address_autocomplete" }}
-
-<div class="col-span-6 relative" x-data='{
-    input: {{if .Address}}"{{.Address.Properties.label}}"{{else}}null{{end}},
-    address: {{if .Address}}JSON.stringify({{template "geojson" .Address}}){{else}}null{{end}},
-    addressObject: {{if .Address}}{{template "geojson" .Address }}{{else}}null{{end}},
-    responselength: 0,
-    async autocomplete() {
-        if(this.input == null || this.input == "") {
-            this.responselength = 0
-            return []
-        }
-        if(this.addressObject != null && this.input == this.addressObject.properties.label) {
-            this.responselength = 0
-            return []
-        }
-        if(this.input.length < 3) {
-            this.responselength = 0
-            return []
-        }
-        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
-        json = await result.json()
-        console.log(json)
-
-        this.responselength = json["features"].length
-        return json["features"]
-    },
-    select(a) {
-        this.address = JSON.stringify(a)
-        this.addressObject = a
-        this.input = a.properties.label
-    }
-}'>
-    <input type="hidden" name="{{ .FieldName }}" x-model="address">
-    <label for="address" class="block text-sm font-medium text-gray-700">{{ if .FieldLabel }}{{.FieldLabel}}{{else}}Adresse{{end}}</label>
-    <input type="text" 
-        class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
-        x-model="input">
-
-    <ul x-show="responselength > 0"
-    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
-        <template x-for="item in autocomplete">
-            <a href="#">
-                <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 
-                    @click="select(item)">
-                    <span class="font-normal block truncate" x-text="item.properties.label" ></span>
-                </li>
-            </a>
-        </template>
-    </ul>
-</div>
-{{ end }}
-
-{{define "geojson"}}{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [{{index .Point 0}}, {{index .Point 1}}],
-  },
-  "properties": {
-    "label": "{{.Properties.label}}"
-  }
-}{{end}}

web/layouts/_partials/submit_with_sms.html

@@ -1,56 +0,0 @@
-{{ define "submit_with_sms" }}
-{{ $dialog := (or .ComponentState.dialogVar "dialog") }}
-{{ $fieldName := (or .ComponentState.fieldName "message") }}
-{{ $submitText := (or .ComponentState.submitText "Valider") }}
-{{ $headerText := (or .ComponentState.headerText "Envoyer un message") }}
-{{ $cancelText := (or .ComponentState.cancelText "Annuler" )}}
-{{ $validateText := (or .ComponentState.validateText "Envoyer" )}}
-{{ $infoText := (or .ComponentState.infoText "Le message suivant sera envoyé. Vous pouvez le personnaliser." )}}
-{{ $doNotSendText := (or .ComponentState.doNotSendText "Ne pas envoyer le message par SMS." )}}
-{{ $doNotSendOption := eq .ComponentState.doNotSendOption true }}
-<div  x-data="{ {{ $dialog }}: false}" class="text-center">
-  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-    {{ .ComponentState.submitText }}
-  </button>
-  <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-     <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-     <div class="fixed inset-0 z-10 overflow-y-auto">
-       <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-         <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-           <div>
-             <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{$.IconSet.Icon "hero:outline/paper-airplane" "h-6 w-6"}}
-             </div>
-             <div class="mt-3 text-center sm:mt-5">
-               <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">{{ $headerText }}</h3>
-               <div class="mt-2">
-                 <p class="text-sm text-gray-500"></p>
-               </div>
-               <div>
-                 <label for="message" class="block text-sm font-medium text-gray-700">{{$infoText}}</label>
-                 <div class="mt-1">
-                   <textarea rows="4" name="message" id="message" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">{{template "sms_template" .SMSState }}</textarea>
-                 </div>
-               </div>
-              {{ if $doNotSendOption}}
-               <div>
-                 <div class="mt-1 flex flex-row justify-items-center items-center">
-                  <div class="flex-none m-4"><input type="checkbox" name="do_not_send" id="do_not_send" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm" /></div>
-                  <label for="do_not_send" class="flex text-sm text-gray-700 align-middle">{{$doNotSendText}}</label>
-                 </div>
-               </div>
-             </div>
-            {{end}}
-             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-               <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">{{ $cancelText }}</button>
-               <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">{{ $validateText }}</button>
-             </div>
-           </div>
-         </div>
-       </div>
-     </div>
-  </div>
-</div>
-{{ end }}

web/layouts/administration/bookings_stats.html

@@ -34,4 +34,4 @@
 
 {{template "bookings_list" .}}
 
-{{end}}
+{{end}}

web/layouts/agenda/_partials/address.html

@@ -22,7 +22,7 @@
             this.responselength = 0
             this.address = this.def
             this.input = `{{ .Default.properties.label}}`
-            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
             json = await result.json()
 
             bb = json['features'][0]
@@ -33,7 +33,7 @@
                 return [bb]
         }
         
-            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
             json = await result.json()
 
         this.responselength = json['features'].length
@@ -64,4 +64,4 @@
         </template>
     </ul>
 </div>
-{{ end }}
+{{ end }}

web/layouts/agenda/create-event.html

@@ -8,7 +8,7 @@
         fields: {
             name: null,
             type: null,
-            description: '',
+            description: null,
             allday: false,
             startdate: null,
             enddate: null,
@@ -50,16 +50,6 @@
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -113,12 +103,10 @@
                         <div class="col-span-6">
                             <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
                             <div class="mt-1">
-                                <!-- <textarea rows="4" name="description" id="descrpition" x-model="fields.description"
+                                <textarea rows="4" name="description" id="descrpition" x-model="fields.description"
                                     @blur="validateField('description')"
                                     :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea> -->
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                             </div>
                         </div>
 
@@ -289,4 +277,4 @@
     </form>
 </div>
 
-{{end}}
+{{end}}

web/layouts/agenda/display-event.html

@@ -78,7 +78,7 @@
                             {{if .ViewState.event.Description}}
                             <div class="sm:col-span-2">
                                 <dt class="text-sm font-medium text-gray-500">Description</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ unescapeHTML .ViewState.event.Description}}</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.event.Description}}</dd>
                             </div>
                             {{end}}
                         </dl>
@@ -219,4 +219,4 @@
         </div>
     </div>
 </main>
-{{ end }}
+{{ end }}

web/layouts/agenda/home.html

@@ -29,7 +29,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -116,4 +116,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/agenda/updateEvent.html

@@ -44,16 +44,6 @@
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -109,12 +99,10 @@
                             <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
                             <div class="mt-1">
                                 
-                <!--<textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
+                                <textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
                                     x-model="fields.description" @blur="validateField('description')"
                                     :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>-->
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                                
                                 </div>
                         </div>
@@ -264,4 +252,4 @@ class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm
  </div>
  </div>
 {{end}}
-{{end}}
+{{end}}

web/layouts/auth/groups.html

@@ -5,7 +5,7 @@
         <link rel="stylesheet" href="/public/css/main.css" />
         <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
         <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-        <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
+        <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
     </head>
     <body class="h-full">
         <div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8 h-">
@@ -37,4 +37,4 @@
           </div>
     </body>
 </html>
-{{end}}
+{{end}}

web/layouts/auth/onboarding.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-    <link rel="stylesheet" href="/public/css/main.css" />
+        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
     </head>
     <body class="h-full">
         <form method="post">
@@ -51,4 +51,4 @@
         </form>
     </body>
 </html>
-{{end}}
+{{end}}

web/layouts/beneficiaries/_partials/beneficiary-files.html

@@ -120,9 +120,7 @@ x-data="{
                         
                     </div>
                     <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
+                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
                   </div>
                 </div>
               </div>

web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html

@@ -1,7 +0,0 @@
-{{define "beneficiary_solidarity_transport"}}
-<div class="px-4 py-6 sm:px-6 text-center">
-  <p class="text-center text-lg">Trajets réalisés : {{ .ViewState.solidarity_transport_stats.count }}</p>
-  <p class="text-center text-lg">Kilomètres réalisés : {{ .ViewState.solidarity_transport_stats.km}} km</p>
-
-</div>
-{{end}}

web/layouts/beneficiaries/_partials/beneficiary-wallet.html

@@ -1,46 +0,0 @@
-{{define "beneficiary_wallet"}}
-<div class="px-4 py-6 sm:px-6 text-center"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <p class="text-center text-lg">Solde : {{if .ViewState.beneficiary.Data.wallet}}{{ .ViewState.beneficiary.Data.wallet }}{{else}}0{{end}} €</p>
-  <button  @click="walletdialog = !walletdialog" 
-    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-                                
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité de l'utilisateur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.beneficiary.ID}}/credit" class="my-4">
-              <div class="my-8">
-                <input type="number" id="amount" name="amount" value="0"
-                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</div>
-{{end}}

web/layouts/beneficiaries/create.html

@@ -14,8 +14,6 @@
             birthdate: null,
             file_number: null
         },
-        other_properties: {},
-        other_properties_serialized: null,
         rules: {
             first_name: ['required'],
             last_name: ['required'],
@@ -43,7 +41,6 @@
             this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
         },
         submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
             this.validate()
             if(!this.formValidation.valid) {
                 this.isFormValid = false
@@ -53,7 +50,6 @@
         }
     }">
     <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
@@ -105,7 +101,7 @@
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier</label>
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
                             <input type="text" name="file_number" id="file_number" placeholder=""
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
                                 x-model="fields.file_number" @blur="validateField('file_number')"
@@ -137,62 +133,6 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="situation" class="block text-sm font-medium text-gray-700">Situation sociale</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.situation"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="">Inconnu</option>
-                                    <option value="BRSA">BRSA</option>
-                                    <option value="Demandeur d'emploi">Demandeur d'emploi</option>
-                                    <option value="Chantier">Chantier d'insertion</option>
-                                    <option value="Jeune -25">Jeune -25</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="situation" class="block text-sm font-medium text-gray-700">Motif d'inscription</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.subscription_reason"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="Autre">Inconnu</option>
-                                    <option value="Pas de permis">Pas de permis</option>
-                                    <option value="Pas de véhicule">Pas de véhicule</option>
-                                    <option value="Perte d'autonomie">Perte d'autonomie</option>
-                                    <option value="Autre">Autre</option>
-                                </select>
-                            </div>
-                        </div>
-                        {{if moduleAvailable "solidarity_transport"}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="status" class="block text-sm font-medium text-gray-700">Statut (prioritaire / non prioritaire)</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="status" name="status" autocomplete="status" x-model="other_properties.status"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="Non prioritaire">Non prioritaire</option>
-                                    <option value="Prioritaire">Prioritaire</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="previous_solidarity_transport" class="block text-sm font-medium text-gray-700">Nombre de transports solidaires précédents</label>
-                            <input type="number" name="previous solidarity_transport" id="previous_solidarity_transport" placeholder="0"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.previous_solidarity_transport">
-                        </div>
-                        {{end}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </div>
 
                         <!-- <div class="col-span-3 sm:col-span-3">
                             <label class="block text-sm font-medium text-gray-700"> Photo </label>
@@ -240,4 +180,4 @@
         </div>
     </form>
 </div>
-{{end}}
+{{end}}

web/layouts/beneficiaries/display.html

@@ -12,18 +12,16 @@
             <div>
                 <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.beneficiary.Data.first_name}}
                     {{.ViewState.beneficiary.Data.last_name}}</h1>
-                <p class="text-sm font-bold text-co-red">{{if .ViewState.beneficiary.Data.archived}}Bénéficiaire archivé{{end}}
                 <p class="text-sm font-medium text-gray-500">{{if .ViewState.beneficiary.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.beneficiary.Metadata.created}}</time>{{end}}
+                        datetime="2022-07-25">{{.ViewState.beneficiary.Metadata.created}}</time> par
+                    <a href="#" class="text-gray-900">Conseiller 1</a>{{end}}
                 </p>
             </div>
         </div>
         <div
             class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-            {{if not .ViewState.beneficiary.Data.archived}}<a href="/app/beneficiaries/{{ .ViewState.beneficiary.ID }}/archive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Archiver</button></a>{{end}}
-            {{if .ViewState.beneficiary.Data.archived}}<a href="/app/beneficiaries/{{ .ViewState.beneficiary.ID }}/unarchive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Désarchiver</button></a>{{end}}
+            <!-- <button type="button"
+                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
             <a href="/app/beneficiaries/{{.ViewState.beneficiary.ID}}/update" class="inline-flex"><button type="button"
                     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
         </div>
@@ -40,18 +38,6 @@
                     </div>
                     <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
                         <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if moduleAvailable "solidarity_transport"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if beneficiaryValidatedProfile .ViewState.beneficiary .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{end}}
                             {{if .ViewState.beneficiary.Data.email}}
                             <div class="sm:col-span-1">
                                 <dt class="text-sm font-medium text-gray-500">Email</dt>
@@ -85,40 +71,10 @@
                             {{end}}
                             {{if .ViewState.beneficiary.Data.file_number}}
                             <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier</dt>
+                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.file_number}}</dd>
                             </div>
                             {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.status}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Statut</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.status}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.situation}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Situation sociale</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.situation}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.subscription_reason}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Motif d'inscription</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.subscription_reason}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.last_subscription_date}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Dernière adhésion</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ (timeFrom .ViewState.beneficiary.Data.other_properties.last_subscription_date).Format "02/01/2006" }}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.comment}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Commentaire</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.comment}}</dd>
-                            </div>
-                            {{end}}
                         </dl>
                     </div>
                 </div>
@@ -177,28 +133,15 @@
                                         :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Documents </a>
 
-                                        {{if moduleAvailable "solidarity_transport"}}
-                                        <a href="#" @click="tab = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-                                        
-                                        <a href="#" @click="tab = 'solidarity_transport'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'solidarity_transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Transport solidaire </a>
-                                        {{end}}
-
-
                                         <a href="#" @click="tab = 'organizations'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Gestionnaires </a>
 
-                                        <!--<a href="#" @click="tab = 'diags'"
+                                        <a href="#" @click="tab = 'diags'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'diags' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Diagnostics </a>-->
+                                            Diagnostics </a>
                                     </nav>
                                 </div>
                             </div>
@@ -206,10 +149,8 @@
 
                         <div x-show="tab == 'documents'">{{template "beneficiary_files" .}}</div>
                         <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "beneficiary_wallet" .}}</div>
-                        {{if moduleAvailable "solidarity_transport"}}<div x-show="tab == 'solidarity_transport'">{{template "beneficiary_solidarity_transport" .}}</div>{{end}}
                         <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
-                        <!--<div x-show="tab == 'diags'">{{template "beneficiary_diags" .}}</div>-->
+                        <div x-show="tab == 'diags'">{{template "beneficiary_diags" .}}</div>
                     </div>
                 </div>
             </section>
@@ -220,4 +161,4 @@
         </section>
     </div>
 </main>
-{{end}}
+{{end}}

web/layouts/beneficiaries/list.html

@@ -14,13 +14,6 @@
                     Exporter
                 </button>
             </a>
-            <a href="/app/beneficiaries/?archived=true">
-                <button type="button"
-                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                    {{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
-                    Bénéficiaires archivés
-                </button>
-            </a>
             <a href="/app/beneficiaries/create">
                 <button type="button"
                     class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
@@ -52,7 +45,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -170,4 +163,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/beneficiaries/update.html

@@ -15,8 +15,6 @@
             file_number: '{{ .ViewState.Data.file_number }}',
             gender: {{.ViewState.Data.gender}}
         },
-        other_properties: {{if .ViewState.Data.other_properties}}{{ json .ViewState.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: null,
         rules: {
             first_name: ['required'],
             last_name: ['required'],
@@ -44,7 +42,6 @@
             this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
         },
         submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
             this.validate()
             if(!this.formValidation.valid) {
                 this.isFormValid = false
@@ -54,7 +51,6 @@
         }
     }">
     <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
@@ -107,7 +103,7 @@
                         </div>
 
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier</label>
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
                             <input type="text" name="file_number" id="file_number"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.file_number" @blur="validateField('file_number')"
@@ -130,8 +126,8 @@
                         <div class="col-span-6 sm:col-span-3">
                             <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                             <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="fields.gender"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-3xs-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
                                     <option value="0">Inconnu</option>
                                     <option value="1" :selected="fields.gender == '1'">Masculin</option>
                                     <option value="2" :selected="fields.gender == '2'">Féminin</option>
@@ -139,63 +135,6 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="situation" class="block text-sm font-medium text-gray-700">Situation sociale</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.situation"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="">Inconnu</option>
-                                    <option value="BRSA">BRSA</option>
-                                    <option value="Demandeur d'emploi">Demandeur d'emploi</option>
-                                    <option value="Chantier">Chantier</option>
-                                    <option value="Jeune -25">Jeune -25</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="situation" class="block text-sm font-medium text-gray-700">Motif d'inscription</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="subscription_reason" name="subscription_reason" autocomplete="subscription_reason" x-model="other_properties.subscription_reason"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="Autre">Inconnu</option>
-                                    <option value="Pas de permis">Pas de permis</option>
-                                    <option value="Pas de véhicule">Pas de véhicule</option>
-                                    <option value="Perte d'autonomie">Perte d'autonomie</option>
-                                    <option value="Autre">Autre</option>
-                                </select>
-                            </div>
-                        </div>
-                        {{if moduleAvailable "solidarity_transport"}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="status" class="block text-sm font-medium text-gray-700">Statut (prioritaire / non prioritaire)</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="status" name="status" autocomplete="status" x-model="other_properties.status"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="Non prioritaire">Non prioritaire</option>
-                                    <option value="Prioritaire">Prioritaire</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="previous_solidarity_transport" class="block text-sm font-medium text-gray-700">Nombre de transports solidaires précédents</label>
-                            <input type="text" name="previous solidarity_transport" id="previous_solidarity_transport" placeholder="0"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.previous_solidarity_transport">
-                        </div>
-                        {{end}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </div>
-
 
                         <!-- <div class="col-span-3 sm:col-span-3">
                             <label class="block text-sm font-medium text-gray-700"> Photo </label>
@@ -224,12 +163,7 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
                     {{ $fieldName := "address" }}
-                    {{if .ViewState.Data.address}}
-                    {{$default := .ViewState.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
+                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
                     <!-- will dolater : tags, groups, ... -->
 
                 </div>
@@ -247,4 +181,4 @@
         </div>
     </form>
 </div>
-{{end}}
+{{end}}

web/layouts/dashboard/_partials/bookings-widget.html

@@ -1,9 +1,12 @@
 {{define "bookings_widget"}}
-<!--<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
+<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
     <div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
         <div class="ml-4 mt-2">
             <h3 class="text-lg leading-6 font-medium text-gray-900">Prochaines réservations</h3>
         </div>
+        <!-- <div class="ml-4 mt-2 flex-shrink-0">
+          <button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
+        </div> -->
     </div>
     <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .}}
@@ -25,5 +28,5 @@
             Reservation des véhicules
         </button>
     </a>
-</div>-->
-{{end}}
+</div>
+{{end}}

web/layouts/dashboard/dashboard.html

@@ -69,15 +69,9 @@
 
 
       {{template "beneficiaries_widget" .ViewState.beneficiaries}}
-
-      {{if moduleAvailable "agenda"}}
-        {{template "agenda_widget" .ViewState.events}}
-      {{end}}
-
-      {{if moduleAvailable "vehicles_management"}}
-        {{template "bookings_widget" .ViewState.fleets}}
-      {{end}}
+      {{template "agenda_widget" .ViewState.events}}
+      {{template "bookings_widget" .ViewState.fleets}}
 
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/journeys/_partials/journeys-all.html

@@ -1,62 +1,97 @@
 {{define "journeys_all"}}
 <div>
     {{ if gt (len .ViewState.carpools) 0}}
-    <div class="px-4 pt-4 flex text-sm text-grey-900">
+    {{$carpool := (index .ViewState.carpools 0)}}
+    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold">
         <div class="flex-1">
-            {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
-            <span class=" font-bold">{{len .ViewState.carpools}} trajets disponibles</span> sur les applications de covoiturage.
+            {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}} Covoiturage
+            {{if $carpool.days.monday}}
+            entre {{$carpool.outward.monday.mintime}} et {{$carpool.outward.monday.maxtime}}
+            {{else if $carpool.days.tuesday}}
+            entre {{$carpool.outward.tuesday.mintime}} et {{$carpool.outward.tuesday.maxtime}}
+            {{else if $carpool.days.wednesday}}
+            entre {{$carpool.outward.wednesday.mintime}} et {{$carpool.outward.wednesday.maxtime}}
+            {{else if $carpool.days.thursday}}
+            entre {{$carpool.outward.thursday.mintime}} et {{$carpool.outward.thursday.maxtime}}
+            {{else if $carpool.days.friday}}
+            entre {{$carpool.outward.friday.mintime}} et {{$carpool.outward.friday.maxtime}}
+            {{else if $carpool.days.saturday}}
+            entre {{$carpool.outward.saturday.mintime}} et {{$carpool.outward.saturday.maxtime}}
+            {{else if $carpool.days.sunday}}
+            entre {{$carpool.outward.sunday.mintime}} et {{$carpool.outward.sunday.maxtime}}
+            {{end}}
+            (Temps trajet : {{divideFloat64 $carpool.duration 60.0 | printf "%.0f"}} Minutes)
         </div>
-        <div></div>
+        <div>
+            <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+                RIDYGO
+            </span>
+        </div>
+    </div>
+
+    <div class="flex items-center justify-center text-sm my-4">
+        <span class="ml-2 mt-1">
+            {{$carpool.from.address}}, {{$carpool.from.city}}
+        </span>
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
+        <span class="ml-2 mt-1">
+            {{$carpool.to.address}}, {{$carpool.to.city}}
+        </span>
+    </div>
+
+    <div class="p-4 pb-8 flex items-center justify-center">
+        <span class="text-xs text-md">Conducteur : </span>
+        <span class="ml-2 mt-1 h-5 rounded-xl bg-gray-200 flex items-center justify-center ring-8 ring-white text-black p-2 text-sm">
+            {{$carpool.driver.alias}}
+        </span>
     </div>
 
     <div class="p-4 text-center">
-        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'carpool'">Voir les trajets disponibles</button>
+        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'carpool'">{{ len .ViewState.carpools}} solutions en covoiturage : les voir toutes</button>
     </div>
     
 
     {{end}}
 
-    {{ if and .ViewState.journeys (gt (len .ViewState.journeys) 0)}}
-    {{$itinerary := index .ViewState.journeys 0}}
-    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold">
+    {{ if gt (len .ViewState.journeys.Journeys) 0}}
+    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold border-t-2">
         <div class="flex-1">
             {{.IconSet.Icon "tabler-icons:bus" "h-6 w-6 inline-flex mr-4"}}
-            {{$itinerary.StartTime.Format "15:04"}} - {{$itinerary.EndTime.Format "15:04"}}
-            ({{divideInt $itinerary.Duration 60}} Minutes)
+            {{(timeFrom (index .ViewState.journeys.Journeys 0).Departure).Format "15:04"}} - {{(timeFrom (index .ViewState.journeys.Journeys 0).Arrival).Format "15:04"}}
+            ({{(index .ViewState.journeys.Journeys 0).Duration.Minutes | printf "%.0f"}} Minutes)
         </div>
         <div></div>
     </div>
     <div class="p-4 pb-8 flex">
-        {{range $itinerary.Legs }}
-        {{if or (or (or (eq .Mode "BUS") (eq .Mode "REGIONAL_FAST_RAIL")) (eq .Mode "REGIONAL_RAIL") (eq .Mode "COACH")) }}
-        <!--<span class="ml-2 px-2 py-1 text-sm text-gray-500 whitespace-nowrap">
-        {{.AgencyName}} 
-        </span>-->
-    <span class="ml-2 rounded-xl px-2 py-1 flex items-center justify-center ring-8 ring-white text-sm whitespace-nowrap" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-            {{.RouteShortName}}
+        {{$firstwalk := true}}
+        {{range (index .ViewState.journeys.Journeys 0).Sections}}
+        {{if eq .Type "street_network"}}
+        <span class="ml-2 mt-1 h-5 w-5 rounded-co bg-gray-200 flex items-center justify-center ring-8 ring-white text-white">
+            {{$.IconSet.Icon "tabler-icons:walk" "h-4 w-4 stroke-gray-800"}}
         </span>
+        {{if $firstwalk}}
+        {{$firstwalk = false}}
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
+        {{end}}
+        {{end}}
+        {{if eq .Type "public_transport"}}
+        <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+            {{if eq .Display.Network "Antibes - Envibus"}}Envibus{{else}}{{.Display.Network}}{{end}} Ligne {{.Display.Label}}
+        </span>
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
         {{end}}
         {{end}}
         <div class="flex-1"></div>
         <button class="text-sm px-2 py-1 bg-gray-200 text-co-blue rounded-xl" @click="tab = 'public-transit'">Voir le détail</button>
     </div>
     <div class="p-4 text-center">
-        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'public-transit'">{{ len .ViewState.journeys}} solutions en transports en commun : les voir toutes</button>
+        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'public-transit'">{{ len .ViewState.journeys.Journeys}} solutions en transports en commun : les voir toutes</button>
     </div>
 
     {{end}}
 
-  {{if moduleAvailable "organized_carpool"}}
-  {{template "journeys_organized_carpool" .}}
-  {{end}}
-
-  {{if moduleAvailable "solidarity_transport"}}
-  {{template "journeys_solidarity_transport" .}}
-  {{end}}
-
-  {{if moduleAvailable "vehicles"}}
     <!--VEHICLES-->
-    <div class="px-4 pt-16 flex text-sm text-grey-900">
+    <div class="px-4 pt-16 flex text-sm text-grey-900  border-t-2">
         <div class="flex-1">
             {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
             <span class=" font-bold">{{len .ViewState.vehicles}} véhicules</span> partagés disponibles ce jour là et la semaine suivante
@@ -66,6 +101,5 @@
     <div class="p-4 text-center">
         <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
     </div>
-  {{end}}
 </div>
-{{end}}
+{{end}}

web/layouts/journeys/_partials/journeys-carpool.html

@@ -1,11 +1,10 @@
 {{define "journeys_carpool"}}
-<div>
+
 {{ if eq (len .ViewState.carpools) 0}}
 <p class="p-12 text-gray-500 text-center text-md">Aucun covoiturage disponible pour ce trajet.</p>
 {{end}}
 
 {{$first := true}}
-{{$i := 0}}
 {{range .ViewState.carpools}}
 {{if $first}}
 {{$first = false}}
@@ -14,132 +13,44 @@
 <div class="p-4 border-t-2 pb-8">
 {{end}}
     <div class="flex text-sm text-grey-900 font-bold">
-      <div class="flex-1">Trajet en covoiturage avec {{.ExtraMembers.ocss.Driver.Alias}}</div>
+        {{if .days.monday}}
+        <div class="flex-1">Départ entre {{.outward.monday.mintime}} et {{.outward.monday.maxtime}}</div>
+        {{else if .days.tuesday}}
+        <div class="flex-1">Départ entre {{.outward.tuesday.mintime}} et {{.outward.tuesday.maxtime}}</div>
+        {{else if .days.wednesday}}
+        <div class="flex-1">Départ entre {{.outward.wednesday.mintime}} et {{.outward.wednesday.maxtime}}</div>
+        {{else if .days.thursday}}
+        <div class="flex-1">Départ entre {{.outward.thursday.mintime}} et {{.outward.thursday.maxtime}}</div>
+        {{else if .days.friday}}
+        <div class="flex-1">Départ entre {{.outward.friday.mintime}} et {{.outward.friday.maxtime}}</div>
+        {{else if .days.saturday}}
+        <div class="flex-1">Départ entre {{.outward.saturday.mintime}} et {{.outward.saturday.maxtime}}</div>
+        {{else if .days.sunday}}
+        <div class="flex-1">Départ entre {{.outward.sunday.mintime}} et {{.outward.sunday.maxtime}}</div>
+        {{end}}
+        <div>{{divideFloat64 .duration 60.0 | printf "%.0f"}} Minutes</div>
     </div>
-    <!--{{if .ExtraMembers.ocss.PassengerPickupDate}}<div class="text-xs">Départ {{(timeFrom .ExtraMembers.ocss.PassengerPickupDate)}}</div>{{end}}-->
-    <!--<div class="flex items-center justify-center text-sm my-4">
+    <div class="flex items-center justify-center text-sm my-4">
         <span class="ml-2 mt-1">
+            {{.from.address}}, {{.from.city}}
         </span>
         {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
         <span class="ml-2 mt-1">
+            {{.to.address}}, {{.to.city}}
         </span>
-    </div>-->
+    </div>
 
     <div class="p-4 pb-8 flex items-center justify-center">
-        <!--<span class="text-xs text-md">Avec </span>
+        <span class="text-xs text-md">Avec </span>
         <span class="ml-2 mt-1 h-5 rounded-xl bg-gray-200 flex items-center justify-center ring-8 ring-white text-black p-2 text-sm">
-        </span>-->
+            {{.driver.alias}}
+        </span>
 
         <span class="text-xs text-md"> sur l'application </span>
         <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
-            Blablacar Daily
+            RIDYGO
         </span>
-
-    </div>
-    <p class=" text-center text-xs">Accéder au trajet :<br /> <a href="{{.ExtraMembers.ocss.WebUrl}}" class="text-co-blue">{{.ExtraMembers.ocss.WebUrl}}</a></p>
-    <div  x-data="{dialog{{$i}}: false}" class="text-center">
-        <button @click="dialog{{$i}} = !dialog{{$i}}" class="m-4 rounded-xl px-4 py-1 mt-8 bg-gray-200 text-co-blue text-sm">Envoyer le lien par SMS</button>
-        <div x-show="dialog{{$i}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-        <form method="POST" action="/app/sms/send">
-
-            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-            <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-                <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-                <div>
-                    <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{$.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-                    </div>
-                    <div class="mt-3 text-center sm:mt-5">
-                        <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Envoyer un message</h3>
-                        <div class="mt-2">
-                            <p class="text-sm text-gray-500"></p>
-                        </div>
-                        <div>
-                            <label for="message" class="block text-sm font-medium text-gray-700">Message</label>
-                            <div class="mt-1">
-                              <textarea rows="4" name="message" id="message" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">Un covoiturage est disponible sur {{.ExtraMembers.ocss.WebUrl}}.</textarea>
-                            </div>
-                          </div>
-                    </div>
-                </div>
-<br /><br />
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json $.ViewState.beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: null,
-                        },
-                        selectbeneficiary(beneficiary) {
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        },
-                    }">
-                        <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                          
-                          <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                            <!-- Heroicon name: solid/selector -->
-                            <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                              <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                            </svg>
-                          </button>
-                      
-                          <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-
-
-                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <button @click="dialog{{$i}} = !dialog{{$i}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
-                    <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Envoyer</button>
-                </div>
-                </div>
-            </div>
-            </div>
-        </form>
-    </div>
-
     </div>
 </div>
 {{end}}
-</div>
-{{end}}
+{{end}}

web/layouts/journeys/_partials/journeys-organized-carpools.html

@@ -1,54 +0,0 @@
-
-{{define "journeys_organized_carpool"}}
-{{if .ViewState.organized_carpools}}
-{{ if eq (len .ViewState.organized_carpools) 0}}
-<p class="p-12 text-gray-500 text-center text-md">Aucun covoitureur solidaire disponible pour ce trajet.</p>
-{{else}}
-
-<h3 class="p-4 text-lg">Covoitureurs solidaires</h3>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Covoitureurs disponibles
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Arrivée conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Distance du covoiturage
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.organized_carpools }}
-    {{ $driver := (index $.ViewState.solidarity_drivers .Driver.Id)}}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDepartureAddress }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverArrivalAddress }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Distance }} km</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/organized-carpool/drivers/{{$driver.ID}}/journeys/{{.Id}}?{{unescapeHTML $.ViewState.querystring}}">
-          Organiser
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}
-{{end}}

web/layouts/journeys/_partials/journeys-others.html

@@ -1,7 +1,6 @@
 {{define "journeys_others"}}
 
 <!--VEHICLES-->
-{{if moduleAvailable "vehicles"}}
 <div class="p-4 flex text-sm text-grey-900">
     <div class="flex-1">
         {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
@@ -35,5 +34,5 @@
 <div class="p-4 text-center">
     <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
 </div>
-{{end}}
-{{end}}
+
+{{end}}

web/layouts/journeys/_partials/journeys-public-transit-motis.html

@@ -1,108 +0,0 @@
-{{ define "journeys_public_transit" }}
-{{ range .ViewState.journeys }}
-<div class="p-4 pb-8">
-    <div class="flex text-md text-grey-900 font-bold">
-        <div class="flex-1">{{ .StartTime.Format "15:04" }} - {{ .EndTime.Format "15:04" }}</div>
-        <div>{{ divideInt .Duration 60 }} Minutes</div>
-    </div>
-    <div class="flow-root">
-        <ul role="list" class="-mb-8">
-            {{$firstwalk := true}}
-            {{range .Legs}}
-            {{if eq .Mode "WALK" }}
-            {{if .Distance}}
-            <li>
-                <div class="relative py-4">
-                    {{if $firstwalk}}
-                    {{$firstwalk = false}}
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    {{end}}
-                    <div class="relative flex space-x-3">
-                        <div>
-                          <span class="ml-2 h-4 w-4 rounded-co bg-gray-200 flex items-center justify-center ring-8 ring-white text-white">
-                            {{$.IconSet.Icon "tabler-icons:walk" "h-3 w-3 stroke-gray-800"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                          {{if .Distance}}
-                          <div>
-                            <p class="text-xs text-gray-500">Marcher  <a href="#" class="font-medium text-gray-900">{{ .Distance }}m</a></p>
-                          </div>
-                          {{ else }}
-                          <div>
-                            <p class="text-xs text-gray-500">Attendre  <a href="#" class="font-medium text-gray-900">{{ divideInt .Duration 60 }} minutes</a></p>
-                          </div>
-                          {{ end }}
-                        </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{end}}
-            {{if or (eq .Mode "BUS") (eq .Mode "COACH")}}
-            <li>
-                <div class="relative py-4">
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    <div class="relative flex space-x-3">
-                        <div>
-              <span class="h-8 w-8 rounded-co bg-co-blue flex items-center justify-center ring-8 ring-white" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-                            {{$.IconSet.Icon "tabler-icons:bus" "h-5 w-5 stroke-white"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                            <div>
-                              <p class="text-md text-gray-500">{{.AgencyName}} <a href="#" class="font-medium text-gray-900">Ligne {{.RouteShortName}}</a></p>
-                            </div>
-                        </div>
-                      </div>
-                      <div class="ml-16 pt-2">
-                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{.StartTime.Format "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{.EndTime.Format "15:04"}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">Direction <a href="#" class="font-medium text-gray-900">{{.Headsign}}</a></p>
-                          </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{if or (eq .Mode "REGIONAL_FAST_RAIL") (eq .Mode "REGIONAL_RAIL") }}
-            <li>
-                <div class="relative py-4">
-                    <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>
-                    <div class="relative flex space-x-3">
-                        <div>
-              <span class="h-8 w-8 rounded-co bg-co-blue flex items-center justify-center ring-8 ring-white" style="background-color: #{{.RouteColor}}; color: #{{.RouteTextColor}}">
-                            {{$.IconSet.Icon "tabler-icons:train" "h-5 w-5 stroke-white"}}
-                          </span>
-                        </div>
-                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
-                            <div>
-                              <p class="text-md text-gray-500">{{.AgencyName}} <a href="#" class="font-medium text-gray-900">TER {{.RouteShortName}}</a></p>
-                            </div>
-                        </div>
-                      </div>
-                      <div class="ml-16 pt-2">
-                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{.StartTime.Format "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{.EndTime.Format "15:04"}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
-                          </div>
-                          <div>
-                            <p class="text-sm text-gray-500">Direction <a href="#" class="font-medium text-gray-900">{{.Headsign}}</a></p>
-                          </div>
-                      </div>
-                </div>
-            </li>
-            {{end}}
-            {{end}}
-        </ul>
-    </div>
-
-</div>
-{{ end }}
-{{ end }}

web/layouts/journeys/_partials/journeys-public-transit.html

@@ -1,11 +1,10 @@
 {{define "journeys_public_transit"}}
 
-{{ if or (not .ViewState.journeys) (eq (len .ViewState.journeys.Journeys) 0)}}
+{{ if eq (len .ViewState.journeys.Journeys) 0}}
 <p class="p-12 text-gray-500 text-center text-md">Aucun transport en commun pour ce trajet.</p>
 {{end}}
 
 {{$first := true}}
-{{if .ViewState.journeys}}
 {{range .ViewState.journeys.Journeys}}
 {{if $first}}
 {{$first = false}}
@@ -79,5 +78,4 @@
     </div>
 </div>
 {{end}}
-{{end}}
-{{end}}
+{{end}}

web/layouts/journeys/_partials/journeys-solidarity-transport.html

@@ -1,65 +0,0 @@
-
-{{define "journeys_solidarity_transport"}}
-
-{{ if eq (len .ViewState.driver_journeys) 0}}
-<p class="p-12 text-gray-500 text-center text-md">Aucun conducteur solidaire disponible pour ce trajet.</p>
-{{else}}
-
-<h3 class="p-4 text-lg">Transport solidaire</h3>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteurs disponibles
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Distance conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Distance passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Commentaire
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.driver_journeys }}
-    {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}}
-
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }}
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-        {{else}}
-        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        {{end}}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}">
-          Organiser
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/journeys/search.html

@@ -6,13 +6,13 @@
           <p class="mt-2 text-sm text-gray-700"></p>
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-          <!--<a href="/app/journeys/groups_covoiturage">
+          <a href="/app/journeys/groups_covoiturage">
             <button type="button"
               class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
               {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
               Gestion des groupes
             </button>
-          </a>-->
+          </a>
         </div>
       </div>
 
@@ -39,14 +39,14 @@
                                 <label for="departuredate" class="block text-sm font-medium text-gray-700">Le</label>
                                 <div class="mt-1">
                                     <input type="date" id="departuredate" name="departuredate" value="{{.ViewState.departuredate}}"
-                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
+                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
                                 </div>
                             </div>
                             <div class="lg:col-span-1">
                                 <label for="departuretime" class="block text-sm font-medium text-gray-700">A</label>
                                 <div class="mt-1">
                                     <input type="time" id="departuretime" name="departuretime" value="{{.ViewState.departuretime}}"
-                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
                                 </div>
                             </div>
                             
@@ -81,7 +81,7 @@
 
                                 <option value="public-transit">Transports</option>
 
-                                <option value="solidarity-transport">Transport solidaire</option> -->
+                                <!-- <option value="active-modes">Modes actifs</option> -->
 
                                 <option value="others">Autres</option>
                             </select>
@@ -105,18 +105,11 @@
                                         :class="tab == 'public-transit' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Transports </a>
 
-                                    {{ if moduleAvailable "solidarity_transport"}}
-                                    <a href="#" @click="tab = 'solidarity-transport'"
+                                    <!-- <a href="#" @click="tab = 'active-modes'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'solidarity-transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Transport solidaire </a>
-                                    {{end}}
-                                    {{if moduleAvailable "organized_carpool"}}
-                                    <a href="#" @click="tab = 'organized-carpool'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'organized-carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Covoiturage solidaire </a>
-                                    {{end}}
+                                        :class="tab == 'active-modes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Modes actifs </a> -->
+
                                     <a href="#" @click="tab = 'others'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                         :class="tab == 'others' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
@@ -129,8 +122,6 @@
                     <div x-show="tab == 'all'">{{template "journeys_all" .}}</div>
                     <div x-show="tab == 'carpool'">{{template "journeys_carpool" .}}</div>
                     <div x-show="tab == 'public-transit'">{{template "journeys_public_transit" .}}</div>
-                    <div x-show="tab == 'organized-carpool'">{{template "journeys_organized_carpool" .}}</div>
-                    <div x-show="tab == 'solidarity-transport'">{{template "journeys_solidarity_transport" .}}</div>
                     <div x-show="tab == 'others'">{{template "journeys_others" .}}</div>
                 </div>
             </div>
@@ -140,4 +131,4 @@
     </div>
  
 </div>
-{{end}}
+{{end}}

web/layouts/layout.html

@@ -5,17 +5,9 @@
 <head>
   <title>PARCOURSMOB</title>
   <link rel="stylesheet" href="/public/css/main.css" />
-  <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
-  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
+  <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
   <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pmtiles@^4.3.0/dist/pmtiles.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@protomaps/basemaps@5/dist/basemaps.js" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7/turf.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/polyline@0.2.0/src/polyline.js"></script>
-  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
+  <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
 </head>
 
 <body class="h-full" x-data="{ offCanvasMenu: false }">
@@ -183,4 +175,4 @@
 </body>
 
 </html>
-{{end}}
+{{end}}

web/layouts/members/display.html

@@ -54,7 +54,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.first_name}}</dd>
                             </div>
                             <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prénom</dt>
+                                <dt class="text-sm font-medium text-gray-500">Prénon</dt>
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
                                </dd>
                             </div>

web/layouts/organized_carpool/_partials/bookings_list.html

@@ -1,82 +0,0 @@
-
-{{ define "carpool_bookings_list" }}
-{{if eq (len .ViewState.bookings) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
-{{else}}
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Statut
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{range .ViewState.bookings}}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/organized-carpool/drivers/{{.DriverId}}">
-        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
-        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
-        </a>
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
-        </a>
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerPickup.Properties.label }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerDrop.Properties.label }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerPickupDate.Format "02/01/2006 15:04" }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ if eq .Status "WAITING_CONFIRMATION"}}
-        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
-        {{ else if eq .Status "VALIDATED"}}
-        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
-        {{ else if eq .Status "CANCELLED"}}
-        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
-        {{ end }}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/organized_carpool/_partials/driver_availabilities.html

@@ -1,119 +0,0 @@
-
-{{define "driver_availabilities"}}
-
-<div class="bg-white shadow sm:rounded-lg"
-  x-data="{
-    availabilitiesdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Trajets</h2>
-  </div>
-  <div class="border-t border-gray-200 px-4">
-    <div class="">
-      {{ range .ViewState.trips }}
-      {{$departure := index .Features 0}}
-      {{$destination := index .Features 1}}
-      <div class="my-10">
-      <div class="flex flex-row my-2">
-        {{range .ExtraMembers.properties.schedules}}
-        <span class="p-1 text-xs mr-2 bg-co-blue text-white rounded-lg">
-        {{ if eq .day "SUN"}}Dimanche
-        {{ else if eq .day "MON"}}Lundi
-        {{ else if eq .day "TUE"}}Mardi
-        {{ else if eq .day "WED"}}Mercredi
-        {{ else if eq .day "THU"}}Jeudi
-        {{ else if eq .day "FRI"}}Vendredi
-        {{ else if eq .day "SAT"}}Samedi
-        {{ end }}
-        {{.time_of_day}}
-
-        </span>
-        {{end}}
-      </div>
-      <div class="flex flex-row">
-        <div class="flex-1 text-sm">
-          {{$departure.Properties.label}}
-        </div>
-        <div>
-          {{$.IconSet.Icon "hero:outline/chevron-right" "h-5 w-5 mr-3"}}
-        </div>
-        <div class="flex-1 text-sm text-right">
-          {{$destination.Properties.label}}
-        </div>
-      </div>
-      <div>
-        <div class="flex-none text-sm text-right"><a class="text-co-blue" href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/trips/{{.ExtraMembers.id}}/delete">Supprimer</a></div>
-      </div>
-      </div>
-      {{ end }}
-    </div>
-    <button type="button" @click="availabilitiesdialog = !availabilitiesdialog" 
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-      {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-      Ajouter un trajet
-    </button>
-  </div>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="availabilitiesdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-                                
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Ajouter un trajet</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Paramétrer un nouveau trajet du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/organized-carpool/drivers/{{.ViewState.driver.ID}}/trips" class="my-4">
-              <div class="my-8">
-                
-                    {{ $fieldName := "address_departure" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address "FieldLabel" "Départ") }}
-
-              </div>
-              <div class="my-8">
-                
-                    {{ $fieldName := "address_destination" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address_destination "FieldLabel" "Destination") }}
-
-              </div>
-              <div class="my-4">
-                <input name="days.monday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Lundi &nbsp;&nbsp;
-                <input name="days.tuesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mardi &nbsp;&nbsp;
-                <input name="days.wednesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mercredi &nbsp;&nbsp;
-                <input name="days.thursday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Jeudi &nbsp;&nbsp;
-                <input name="days.friday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Vendredi &nbsp;&nbsp;
-                <input name="days.saturday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Samedi &nbsp;&nbsp;
-                <input name="days.sunday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Dimanche &nbsp;&nbsp;
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">Aller à :</div>
-                <input type="time" id="outwardtime" name="outwardtime" value="08:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-2xl" />
-                
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">Retour à :</div>
-                <input type="time" id="returntime" name="returntime" value="18:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-2xl" />
-                
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="availabilitiesdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
- </div>
-
-{{end}}

web/layouts/organized_carpool/_partials/drivers_list.html

@@ -1,80 +0,0 @@
-
-{{ define "carpool_drivers_list" }}
-<div class="sm:flex sm:items-center">
-  <div class="sm:flex-auto">
-    <p class="mt-2 text-sm text-gray-700"></p>
-  </div>
-  <div class="m-4 sm:ml-16 sm:flex-none">
-    <!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
-        Exporter
-      </button>
-    </a>-->
-    <a href="/app/organized-carpool/?archived=true">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          {{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
-            Covoitureurs archivés
-      </button>
-    </a>
-    <a href="/app/organized-carpool/drivers/create">
-      <button type="button"
-        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-        {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-        Ajouter un covoitureur solidaire
-      </button>
-    </a>
-  </div>
-</div>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Nom
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Téléphone
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.drivers }}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address_destination}}{{.Data.address_destination.properties.label}}{{end}}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.phone_number }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/organized-carpool/drivers/{{.ID}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{ end }}

web/layouts/organized_carpool/_partials/journey_preview.html

@@ -1,271 +0,0 @@
-
-{{define "journey_preview"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Le trajet</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">Informations sur le trajet</h2>
-        </div>
-      </div>
-      <div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 0).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 1).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 0).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 1).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900">0 EUR</dd>
-                            </div>
-                        </dl>
-                    </div>
-                    <div>
-        <div id="map" class="w-full h-full"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json (index .journey.Features 0) }},
-      {{ json (index .journey.Features 1) }},
-    ]
-  }
-
-
-  map.on('load', async () => {
-    map.addSource('trip', {
-      type: "geojson",
-      data: {{ json (index .journey.Features 2) }}
-    })
-    map.addLayer({
-      'id': 'trip',
-      'type': 'line',
-      'source': 'trip',
-      'layout': {
-        'line-join': 'round',
-        'line-cap': 'round',
-      },
-      'paint': {
-        'line-color': '#243887',
-        'line-width': 3
-      },
-    });
-
-    map.addSource('points', {
-      type: "geojson",
-      data: geojsonPoints
-    })
-    map.addLayer({
-      'id': 'points',
-      'type': 'circle',
-      'source': 'points',
-      'paint': {
-        'circle-color': '#243887',
-        'circle-radius': 8
-      },
-    });
-    var bbox=turf.bbox(geojsonPoints)
-    map.fitBounds(bbox, { padding: 30 })
-  })
-</script>
-                    </div>
-      </div>
-    </div>
-  <div class="py-4 grid grid-cols-1 gap-6 sm:grid-cols-2">
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Conducteur</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">{{.driver.Data.first_name}} {{.driver.Data.last_name}}</h2>
-        </div>
-      </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .driver.Data.gender (ne .driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-
-    </div>
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Passager</h3>
-        <h2 class="text-sm leading-6 font-medium text-gray-600">{{if ne .passenger.ID "" }}{{.passenger.Data.first_name}} {{.passenger.Data.last_name}}{{end}}</h2>
-        </div>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-        {{if eq .passenger.ID ""}}
-        <form method="GET">
-                        
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .search}}'{{.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        },
-                    }">
-                        <input type="hidden" name="passengerid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                          
-                          <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                            <!-- Heroicon name: solid/selector -->
-                            <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                              <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                            </svg>
-                          </button>
-                      
-                          <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-                    <button type="submit" class="inline-flex w-full justify-center max-w-xs bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                      Valider
-                    </button>
-                    </div>
-                  </form>
-
-        {{ else }}
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .passenger.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .passenger.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .passenger.Data.gender (ne .passenger.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .passenger.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
-                            </div>
-                        </dl>
-                    </div>
-
-        {{end}}
-      </div>
-      </div>
-
-{{end}}

web/layouts/organized_carpool/driver_create.html

@@ -1,178 +0,0 @@
-
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Créer un covoitureur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            first_name: null,
-            last_name: null,
-            email: null,
-            phone_number: null,
-            birthdate: null,
-        },
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName "FieldLabel" "Adresse principale" }}
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                    {{ $fieldName2 := "address_destination" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName2 "FieldLabel" "Adresse destination" }}
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </div>
-                        </div> -->
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--<div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
-                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </div>
-            </div>
-        </div>-->
-
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/organized-carpool/">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-            Créer le covoitureur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/organized_carpool/driver_display.html

@@ -1,144 +0,0 @@
-
-{{define "content"}}
-<main class="py-10">
-    <!-- Page header -->
-    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
-        <div class="flex items-center space-x-5">
-            <div class="flex-shrink-0">
-                <div class="relative">
-                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.driver.ID}}/picture" alt="">
-                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
-                </div>
-            </div>
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.driver.Data.first_name}}
-                    {{.ViewState.driver.Data.last_name}}</h1>
-                <p class="text-sm font-bold text-co-red">{{if .ViewState.driver.Data.archived}}Conducteur archivé{{end}}
-                <p class="text-sm font-medium text-gray-500">{{if .ViewState.driver.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.driver.Metadata.created}}</time> par
-                    <a href="#" class="text-gray-900">Conseiller 1</a>{{end}}
-                </p>
-            </div>
-        </div>
-        <div
-            class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-            {{if not .ViewState.driver.Data.archived}}<a href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}/archive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Archiver</button></a>{{end}}
-            {{if .ViewState.driver.Data.archived}}<a href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}/unarchive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Désarchiver</button></a>{{end}}
-            <!-- <button type="button"
-                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-<!--            <a href="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/update" class="inline-flex"><button type="button"
-                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>-->
-        </div>
-    </div>
-
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="driver-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="driver-information-title" class="text-lg leading-6 font-medium text-gray-900">
-                            Informations personnelles</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conducteur solidaire.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .ViewState.driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.gender (ne .ViewState.driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .ViewState.driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse principale</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address_destination}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse destination</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address_destination.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-                </div>
-            </section>
-
-            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: 'documents',
-                    to(event) {
-                        this.tab = event.target.value
-                    }
-                }">
-                <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-                    <div class="divide-y divide-gray-200">
-                        <div>
-                            <div class="sm:hidden">
-                                <label for="tabs" class="sr-only">Select a tab</label>
-                                <select id="tabs" name="tabs" @change="to"
-                                    class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
-                                    <!--<option value="notes">Notes</option>-->
-
-                                    <!-- <option value="journeys">Déplacements</option>
-
-                                    <option value="vehicles">Véhicules</option>
-
-                                    <option value="events">Dispositifs</option> -->
-
-                                    <option value="documents">Documents</option>
-                                </select>
-                            </div>
-                            <div class="hidden sm:block">
-                                <div class="border-b border-gray-200 pl-4">
-                                    <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                                        <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                        <!--<a href="#" @click="tab = 'notes'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'notes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Notes </a>-->
-
-                                        <a href="#" @click="tab = 'documents'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Documents </a>
-
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <section class="lg:col-start-3 lg:col-span-1">
-        {{template "driver_availabilities" .}}
-        </section>
-    </div>
-</main>
-{{end}}

web/layouts/organized_carpool/journey.html

@@ -1,17 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Organiser le covoiturage</h1>
-</div>
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "journey" .ViewState.journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
-{{if ne .ViewState.passenger.ID ""}}
-<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex justify-items-center">
-  <form method="POST">
-    <button class="w-100 bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-      Envoyer la mise en relation
-    </button>
-  </form>
-</div>
-{{end}}
-
-{{end}}

web/layouts/organized_carpool/overview.html

@@ -1,48 +0,0 @@
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-  <h1 class="text-2xl font-semibold text-gray-900">Covoiturage solidaire</h1>
-
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-        tab: 'drivers',
-        to(event) {
-            this.tab = event.target.value
-        }
-    }">
-        <div class="divide-y divide-gray-200">
-            <div>
-                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4">
-                        <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
-                            <a href="#" @click="tab = 'drivers'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Covoitureurs solidaires </a>
-                            
-                            <!--<a href="#" @click="tab = 'beneficiaries'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Bénéficiaires </a>-->
-
-                            <a href="#" @click="tab = 'trips'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-                        </nav>
-                    </div>
-                </div>
-            </div>
-
-            <div x-show="tab == 'drivers'">{{template "carpool_drivers_list" .}}</div>
-
-
-            <div x-show="tab == 'beneficiaries'">1</div>
-            <div x-show="tab == 'trips'">{{template "carpool_bookings_list" .}}</div>
-
-        </div>
-    </div>
-
-
-</div>
-
-{{ end }}

web/layouts/solidarity_transport/_partials/bookings_history.html

@@ -1,82 +0,0 @@
-
-{{ define "solidarity_bookings_history" }}
-{{if eq (len .ViewState.bookings_history) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
-{{else}}
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Statut
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{range .ViewState.bookings_history}}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
-        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
-        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
-        </a>
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
-        </a>
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerPickup.Properties.label }} 
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerDrop.Properties.label }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerPickupDate.Format "02/01/2006 15:04" }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ if eq .Status "WAITING_CONFIRMATION"}}
-        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
-        {{ else if eq .Status "VALIDATED"}}
-        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
-        {{ else if eq .Status "CANCELLED"}}
-        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
-        {{ end }}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/solidarity_transport/_partials/bookings_list.html

@@ -1,83 +0,0 @@
-
-{{ define "solidarity_bookings_list" }}
-{{if eq (len .ViewState.bookings) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
-{{else}}
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Statut
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{range .ViewState.bookings}}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
-        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
-        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
-        </a>
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
-        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
-        </a>
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerPickup.Properties.label }} 
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.PassengerDrop.Properties.label }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }} 
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ if eq .Status "WAITING_CONFIRMATION"}}
-        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
-        {{ else if eq .Status "VALIDATED"}}
-        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
-        {{ else if eq .Status "CANCELLED"}}
-        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
-        {{ end }}
-        {{if and .Data.motivation (or (or (eq .Data.motivation "Santé") (eq .Data.motivation "Insertion")) (eq .Data.motivation "Administratif"))}}<div class="mt-4"><span class="text-xs p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.Data.motivation}}</span></div>{{end}}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/solidarity_transport/_partials/driver_availabilities.html

@@ -1,90 +0,0 @@
-{{define "driver_availabilities"}}
-
-<div class="bg-white shadow sm:rounded-lg"
-  x-data="{
-    availabilitiesdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Disponibilités</h2>
-  </div>
-  <div class="border-t border-gray-200 px-4">
-    <div class="py-4">
-      {{ range .ViewState.availabilities }}
-      <div class="flex flex-row">
-        <div class="flex-none">
-        {{ if eq .Day 0}}Dimanche
-        {{ else if eq .Day 1}}Lundi
-        {{ else if eq .Day 2}}Mardi
-        {{ else if eq .Day 3}}Mercredi
-        {{ else if eq .Day 4}}Jeudi
-        {{ else if eq .Day 5}}Vendredi
-        {{ else if eq .Day 6}}Samedi
-        {{ end }}
-        {{.StartTime}} - {{ .EndTime }}
-        </div>
-        <div class="flex-auto">&nbsp;</div>
-        <div class="flex-none text-sm"><a class="text-co-blue" href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/availabilities/{{.Id}}/delete">Supprimer</a></div>
-      </div>
-      {{ end }}
-    </div>
-    <button type="button" @click="availabilitiesdialog = !availabilitiesdialog" 
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-      {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-      Ajouter une disponibilité
-    </button>
-  </div>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="availabilitiesdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-                                
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Ajouter une disponibilité</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Paramétrer la nouvelle disponibilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/availabilities" class="my-4">
-              <div class="my-8">
-                
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.driver.Data.address) }}
-
-              </div>
-              <div class="my-4">
-                <input name="days.monday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Lundi &nbsp;&nbsp;
-                <input name="days.tuesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mardi &nbsp;&nbsp;
-                <input name="days.wednesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mercredi &nbsp;&nbsp;
-                <input name="days.thursday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Jeudi &nbsp;&nbsp;
-                <input name="days.friday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Vendredi &nbsp;&nbsp;
-                <input name="days.saturday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Samedi &nbsp;&nbsp;
-                <input name="days.sunday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Dimanche &nbsp;&nbsp;
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">De</div>
-                <input type="time" id="starttime" name="starttime" value="06:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-l-2xl border-l-0">
-                <div class="p-1 px-4">à</div>
-                <input type="time" id="endtime" name="endtime" value="20:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
-                
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="availabilitiesdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
- </div>
-
-{{end}}

web/layouts/solidarity_transport/_partials/driver_documents.html

@@ -1,138 +0,0 @@
-
-{{define "driver_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    validateField(field) {
-        this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-    },
-    submit(event) {
-        this.validate()
-        if(!this.formValidation.valid) {
-            this.isFormValid = false
-            event.preventDefault()
-        }
-        return this.formValidation.valid
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-
-
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">Actions</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <a href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                </a>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
-        <div class="md:grid md:grid-cols-6 p-2">
-            <div class="sm:col-span-2">
-                <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
-                <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                    x-model="fields.type" @blur="validateField('type')"
-                    :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                    <option value="" selected>Sélectionner un type</option>
-                    {{range .ViewState.drivers_file_types}}
-                    <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                    {{end}}
-                </select>
-              </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl p-2"
-                          x-model="fields.name" @blur="validateField('name')"
-                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-              </div>
-              <div class="sm:col-span-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
-                  </div>
-                </div>
-              </div>
-        </div>
-        <button type="submit"
-            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-            Ajouter le document
-        </button>
-    </form>
-
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/driver_history.html

@@ -1,7 +0,0 @@
-{{define "driver_history"}}
-<div class="px-4 py-6 sm:px-6 text-center">
-  <p class="text-center text-lg">Trajets réalisés : {{ .ViewState.stats.bookings.count }}</p>
-  <p class="text-center text-lg">Kilomètres réalisés : {{ .ViewState.stats.bookings.km}} km</p>
-
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/drivers_list.html

@@ -1,78 +0,0 @@
-{{ define "solidarity_drivers_list" }}
-<div class="sm:flex sm:items-center">
-  <div class="sm:flex-auto">
-    <p class="mt-2 text-sm text-gray-700"></p>
-  </div>
-  <div class="m-4 sm:ml-16 sm:flex-none">
-    <!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
-        Exporter
-      </button>
-    </a>-->
-    <a href="/app/solidarity-transport/?archived=true">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          {{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
-            Conducteurs archivés
-      </button>
-    </a>
-    <a href="/app/solidarity-transport/drivers/create">
-      <button type="button"
-        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-        {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-        Ajouter un conducteur solidaire
-      </button>
-    </a>
-  </div>
-</div>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Nom
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Adresse
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Téléphone
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.drivers }}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.phone_number }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if solidarityDriverValidatedProfile . (solidarityDocuments .ID) }}
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-        {{else}}
-        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        {{end}}
-      </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{.ID}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{ end }}

web/layouts/solidarity_transport/_partials/journey_map.html

@@ -1,89 +0,0 @@
-{{ define "journey_map" }}
-<div id="map" class="w-full h-full"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json .driver_journey.DriverDeparture }},
-      {{ json .driver_journey.PassengerPickup }},
-      {{ json .driver_journey.PassengerDrop }},
-      {{ json .driver_journey.DriverArrival }}
-    ]
-  }
-  const driverGeojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json .driver_journey.DriverDeparture }},
-      {{ json .driver_journey.DriverArrival }}
-    ]
-  }
-  const passengerGeojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {{ json .driver_journey.PassengerPickup }},
-      {{ json .driver_journey.PassengerDrop }},
-    ]
-  }
-
-
-  map.on('load', async () => {
-    {{if .driver_journey.JourneyPolyline}}
-    var linestring = polyline.toGeoJSON('{{.driver_journey.JourneyPolyline}}');
-    map.addSource('trip', {
-      type: "geojson",
-      data: linestring
-    })
-    map.addLayer({
-      'id': 'trip',
-      'type': 'line',
-      'source': 'trip',
-      'layout': {
-        'line-join': 'round',
-        'line-cap': 'round',
-      },
-      'paint': {
-        'line-color': '#243887',
-        'line-width': 3
-      },
-    });
-    {{end}}
-
-    map.addSource('driver_points', {
-      type: "geojson",
-      data: driverGeojsonPoints
-    })
-    map.addLayer({
-      'id': 'driver_points',
-      'type': 'circle',
-      'source': 'driver_points',
-      'paint': {
-        'circle-color': '#000'
-      },
-    });
-    map.addSource('passenger_points', {
-      type: "geojson",
-      data: passengerGeojsonPoints
-    })
-    map.addLayer({
-      'id': 'passenger_points',
-      'type': 'circle',
-      'source': 'passenger_points',
-      'paint': {
-        'circle-color': '#243887',
-        'circle-radius': 8
-      },
-    });
-    var bbox=turf.bbox(geojsonPoints)
-
-    map.fitBounds(bbox, { padding: 50 })
-  })
-</script>
- 
-{{ end }}

web/layouts/solidarity_transport/_partials/journey_preview.html

@@ -1,261 +0,0 @@
-{{define "journey_preview"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Le trajet</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">Informations sur le trajet</h2>
-        </div>
-        <div>
-          {{if eq .driver_journey.Noreturn true}}<span class="text-sm p-2 bg-co-red text-white rounded-xl">Aller simple</span>{{else}}<span class="text-sm p-2 bg-co-red text-white rounded-xl">Aller-retour</span>{{end}}
-        </div>
-      </div>
-      <div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerPickup.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerDrop.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverDeparture.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Destination conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverArrival.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Kilomètres passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.PassengerDistance}} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Kilomètres conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver_journey.DriverDistance}} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Horaire départ conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ .driver_journey.DriverDepartureDate.Format "02/01/2006 15:04"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Horaire rendez vous passager</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ timeFormat .driver_journey.PassengerPickupDate "02/01/2006 15:04"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Temps de trajet (passager)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.0f" .driver_journey.Duration.Minutes }} min</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ .driver_journey.Price.Amount }} {{ .driver_journey.Price.Currency}}</dd>
-                            </div>
-                        </dl>
-                    </div>
-  <div>
-      {{ template "journey_map" . }}
-
-  </div>
-      </div>
-    </div>
-  <div class="py-4 grid grid-cols-1 gap-6 sm:grid-cols-2">
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2 grid-cols-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Conducteur</h3>
-          <h2 class="text-sm leading-6 font-medium text-gray-600">{{.driver.Data.first_name}} {{.driver.Data.last_name}}</h2>
-        </div>
-      </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if solidarityDriverValidatedProfile .driver (solidarityDocuments .driver.ID)}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .driver.Data.gender (ne .driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .driver.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-
-    </div>
-    <div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-      <div class="px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2">
-          <h3 class="text-lg leading-6 font-medium text-gray-900">Passager</h3>
-        <h2 class="text-sm leading-6 font-medium text-gray-600">{{if ne .passenger.ID "" }}{{.passenger.Data.first_name}} {{.passenger.Data.last_name}}{{end}}</h2>
-        </div>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-        {{if eq .passenger.ID ""}}
-        <form method="GET">
-                        
-                    <div x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .beneficiaries}},
-                        filteredBeneficiaries: (beneficiaries, text) => {
-                            if(text=='') {
-                              return beneficiaries
-                            }
-                            return beneficiaries.filter(b => b['data']['first_name'].toLowerCase().includes(text.toLowerCase()) || b['data']['last_name'].toLowerCase().includes(text.toLowerCase()))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .search}}'{{.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        },
-                    }">
-                        <input type="hidden" name="passengerid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Selectionner un bénéficiaire</label>
-                        <div class="relative mt-1 mb-4">
-                          <input autocomplete="off" @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                          
-                          <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                            <!-- Heroicon name: solid/selector -->
-                            <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                              <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                            </svg>
-                          </button>
-                      
-                          <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                            <!--
-                              Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                      
-                              Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                            -->
-                            <template x-for="beneficiary in filteredBeneficiaries(beneficiaries, text)">
-                                <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                                <!-- Selected: "font-semibold" -->
-                                <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                        
-                                <!--
-                                    Checkmark, only display for selected option.
-                        
-                                    Active: "text-white", Not Active: "text-indigo-600"
-                                -->
-                                <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                    <!-- Heroicon name: solid/check -->
-                                    <!-- <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                    </svg> -->
-                                </span>
-                                </li>
-                            </template>
-                      
-                            <!-- More items... -->
-                          </ul>
-                        </div>
-                      </div>
-                    <button type="submit" class="inline-flex w-full justify-center max-w-xs bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                      Valider
-                    </button>
-                    </div>
-                  </form>
-
-        {{ else }}
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if beneficiaryValidatedProfile .passenger (beneficiaryDocuments .passenger.ID)}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .passenger.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .passenger.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .passenger.Data.gender (ne .passenger.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .passenger.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .passenger.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
-                            </div>
-                        </dl>
-                    </div>
-
-        {{end}}
-      </div>
-      </div>
-
-{{end}}

web/layouts/solidarity_transport/booking_display.html

@@ -1,124 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">
-      Transport solidaire
-    </h1>
-    {{if and .ViewState.booking.Data.motivation (or (or (eq .ViewState.booking.Data.motivation "Santé") (eq .ViewState.booking.Data.motivation "Insertion")) (eq .ViewState.booking.Data.motivation "Administratif"))}}<div class="mt-4"><span class="text-sm p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.ViewState.booking.Data.motivation}}</span></div>{{end}}
-      {{ if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-      <div class="mt-4"><span class="p-2 text-sm bg-gray-300 rounded-2xl px-4">Attente confirmation</span></div>
-      {{ else if eq .ViewState.booking.Status "VALIDATED"}}
-      <div class="mt-4"><span class="p-1 text-sm bg-co-green rounded-2xl px-4">Validé</span></div>
-      {{ else if eq .ViewState.booking.Status "CANCELLED"}}
-  <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé : {{.ViewState.booking.Data.reason}}</span></div>
-      {{ end }}
-<div
-  class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-
-
-    {{$dialog := "modif"}}
-<div  x-data="{ {{ $dialog }}: false}">
-  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-white border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-    Modifier
-  </button>
-  <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-     <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-     <div class="fixed inset-0 z-10 overflow-y-auto">
-       <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-         <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-           <form method="POST">
-             <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{$.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-             </div>
-             <div class="mt-3 text-center sm:mt-5">
-               <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Modifier</h3>
-               <div class="mt-2">
-                 <p class="text-sm text-gray-500"></p>
-               </div>
-               <div>
-                 <label for="driver_distance" class="block text-sm font-medium text-gray-700">Kilomètres conducteur</label>
-                 <div class="mt-1">
-                    <input type="text" name="driver_distance" id="driver_distance" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm" value="{{.ViewState.booking.Journey.DriverDistance}}" />
-                 </div>
-               </div>
-             </div>
-             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-               <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
-               <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Valider</button>
-             </div>
-           </form>
-         </div>
-       </div>
-     </div>
-</div>
-</div>
-
-  <!-- <button type="button"
-       class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-  {{if eq .ViewState.booking.Status "CANCELLED" }}
-    <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&departuredate={{ .ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02"}}&departuretime={{ .ViewState.booking.Journey.PassengerPickupDate.Format "15:04"}}" class="inline-flex"><button type="button"
-     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Solliciter un autre conducteur</button></a>
-  {{end}}
-  {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-  <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex"><button type="button"
-     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Confirmer</button></a>
-  {{end}}
-  {{if ne .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-  <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex"><button type="button"
-     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Remettre en attente</button></a>
-  {{end}}
-  {{if ne .ViewState.booking.Status "CANCELLED" }}
-  <!--<a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/cancel" class="inline-flex"><button type="button"
-     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Annuler</button></a>-->
-{{$dialog := "cancel"}}
-<div  x-data="{ {{ $dialog }}: false}">
-  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-red border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-    Annuler 
-  </button>
-  <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-     <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-     <div class="fixed inset-0 z-10 overflow-y-auto">
-       <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-         <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-           <form method="POST" action="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/cancel">
-             <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{$.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-             </div>
-             <div class="mt-3 text-center sm:mt-5">
-               <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Annuler</h3>
-               <div class="mt-2">
-                 <p class="text-sm text-gray-500"></p>
-               </div>
-               <div>
-                 <label for="reason" class="block text-sm font-medium text-gray-700">Raison de l'annulation</label>
-                 <div class="mt-1">
-                    <select name="reason" id="reason" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm">
-                      <option value="Trajet annulé par le passager">Trajet annulé par le passager</option>
-                      <option value="Trajet non réalisé">Trajet non réalisé</option>
-                      <option value="Refusé par le bénévole">Refusé par le bénévole</option>
-                      <option value="Autre" selected="selected">Autre</option>
-                    </select>
-                 </div>
-               </div>
-             </div>
-             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-               <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
-               <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Valider</button>
-             </div>
-           </form>
-         </div>
-       </div>
-     </div>
-  </div>
-</div>
-  {{end}}
-</div>
-</div>
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "driver_journey" .ViewState.booking.Journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
-</div>
-
-{{ end }}

web/layouts/solidarity_transport/driver_create.html

@@ -1,190 +0,0 @@
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Créer un conducteur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            first_name: null,
-            last_name: null,
-            email: null,
-            phone_number: null,
-            birthdate: null,
-        },
-        other_properties: {},
-        other_properties_serialized: null,
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-                        
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </div>
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </div>
-                        </div> -->
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--<div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
-                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </div>
-            </div>
-        </div>-->
-
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/solidarity-transport/">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le conducteur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/solidarity_transport/driver_display.html

@@ -1,172 +0,0 @@
-{{define "content"}}
-<main class="py-10">
-    <!-- Page header -->
-    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
-        <div class="flex items-center space-x-5">
-            <div class="flex-shrink-0">
-                <div class="relative">
-                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.driver.ID}}/picture" alt="">
-                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
-                </div>
-            </div>
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.driver.Data.first_name}}
-                    {{.ViewState.driver.Data.last_name}}</h1>
-                <p class="text-sm font-medium text-gray-500">{{if .ViewState.driver.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.driver.Metadata.created}}</time> par
-                    <a href="#" class="text-gray-900">Conseiller 1</a>{{end}}
-                </p>
-            </div>
-        </div>
-        <div
-            class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-            {{if not .ViewState.driver.Data.archived}}<a href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}/archive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Archiver</button></a>{{end}}
-            {{if .ViewState.driver.Data.archived}}<a href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}/unarchive"><button type="button"
-              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Désarchiver</button></a>{{end}}
-            <!-- <button type="button"
-                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-            <a href="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/update" class="inline-flex"><button type="button"
-                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
-        </div>
-    </div>
-
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="driver-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="driver-information-title" class="text-lg leading-6 font-medium text-gray-900">
-                            Informations personnelles</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conducteur solidaire.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if solidarityDriverValidatedProfile .ViewState.driver .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
-                            {{if .ViewState.driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.gender (ne .ViewState.driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .ViewState.driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.other_properties .ViewState.driver.Data.other_properties.last_subscription_date}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Dernière adhésion</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ .ViewState.driver.Data.other_properties.last_subscription_date}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.other_properties .ViewState.driver.Data.other_properties.comment}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Commentaire</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ .ViewState.driver.Data.other_properties.comment}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-                </div>
-            </section>
-
-            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: 'documents',
-                    to(event) {
-                        this.tab = event.target.value
-                    }
-                }">
-                <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-                    <div class="divide-y divide-gray-200">
-                        <div>
-                            <div class="sm:hidden">
-                                <label for="tabs" class="sr-only">Select a tab</label>
-                                <select id="tabs" name="tabs" @change="to"
-                                    class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
-                                    <!--<option value="notes">Notes</option>-->
-
-                                    <!-- <option value="journeys">Déplacements</option>
-
-                                    <option value="vehicles">Véhicules</option>
-
-                                    <option value="events">Dispositifs</option> -->
-
-                                    <option value="documents">Documents</option>
-                                    
-                                    <option value="history">Historique</option>
-                                </select>
-                            </div>
-                            <div class="hidden sm:block">
-                                <div class="border-b border-gray-200 pl-4">
-                                    <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                                        <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                        <!--<a href="#" @click="tab = 'notes'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'notes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Notes </a>-->
-
-                                        <a href="#" @click="tab = 'documents'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Documents </a>
-                                        
-                                        <a href="#" @click="tab = 'history'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'history' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Transport solidaires </a>
-
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-                        <div x-show="tab == 'history'">{{template "driver_history" .}}</div>
-
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <section class="lg:col-start-3 lg:col-span-1">
-        {{template "driver_availabilities" .}}
-        </section>
-    </div>
-</main>
-{{end}}

web/layouts/solidarity_transport/driver_journey.html

@@ -1,72 +0,0 @@
-
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Organiser le transport solidaire</h1>
-    <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-          <p class="mt-2 text-sm text-gray-700"></p>
-        </div>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/journeys/{{.ViewState.driver_journey.Id}}/noreturn">
-            {{if .ViewState.driver_journey.Noreturn}}
-            <button type="submit"
-              class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-              {{$.IconSet.Icon "hero:outline/arrow-path-rounded-square" "h-5 w-5 mr-3"}}
-              Changer en aller-retour
-            </button>
-            {{else}}
-            <button type="submit"
-              class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-              {{$.IconSet.Icon "hero:outline/arrow-long-right" "h-5 w-5 mr-3"}}
-              Changer en aller simple
-            </button>
-            {{end}}
-          </form>
-        </div>
-      </div>
-</div>
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "driver_journey" .ViewState.driver_journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
-          {{if ne .ViewState.passenger.ID ""}}
-<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex flex-col justify-items-center">
-  {{if .ViewState.passenger}}
-  {{$wallet := (or .ViewState.passenger.Data.wallet 0.0)}}
-  {{if lt $wallet .ViewState.driver_journey.Price.Amount}}
-    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant.</p>
-    {{end}}
-  <form method="POST">
-    {{if not .ViewState.driver_journey.Noreturn}}
-    <div class="m-auto text-center">
-      <label for="return_waiting_time" class="block text-sm font-medium text-gray-700">Durée d'attente à destination (minutes)</label>
-      <input type="number" name="return_waiting_time" value="30"
-        class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto" />
-    </div>
-    {{end}}
-    <div class="m-auto text-center">
-      <label for="motivation" class="block text-sm font-medium text-gray-700">Motif du trajet</label>
-    <select name="motivation" id="motivation"
-        class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto">
-      <option value="Administratif">Administratif (trajet garanti)</option>
-      <option value="Commerce">Commerce</option>
-      <option value="Courses">Courses</option>
-      <option value="Insertion">Insertion (trajet garanti)</option>
-      <option value="Loisirs">Loisirs</option>
-      <option value="Visite à un proche">Visite à un proche</option>
-      <option value="Santé">Santé (trajet garanti)</option>
-      <option selected="selected" value="">Autre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
-    </select>
-    </div>
-    {{template "submit_with_sms" 
-      dict  "IconSet" .IconSet 
-            "Viewstate" .ViewState 
-            "ComponentState" (dict "submitText" "Envoyer la mise en relation"
-                                   "doNotSendOption" true) 
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name") 
-                             "datetime" (timeFormat .ViewState.driver_journey.PassengerPickupDate "02/01/2006 15:04")
-                             "baseUrl" (.ViewState.config.GetString "base_url") )}}
-  </form>
-    {{end}}
-</div>
-{{end}}
-
-{{ end }}

web/layouts/solidarity_transport/driver_update.html

@@ -1,195 +0,0 @@
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Modifier le conducteur</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-          first_name: '{{.ViewState.driver.Data.first_name}}',
-          last_name: '{{.ViewState.driver.Data.last_name}}',
-          email: '{{.ViewState.driver.Data.email}}' ,
-          phone_number: '{{.ViewState.driver.Data.phone_number}}',
-          birthdate: {{if .ViewState.driver.Data.birthdate}}'{{ (timeFrom .ViewState.driver.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-        },
-        other_properties: {{if .ViewState.driver.Data.other_properties}}{{ json .ViewState.driver.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: '{{ json .ViewState.driver.Data.other_properties }}',
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{if .ViewState.driver.Data.address}}
-                    {{$default := .ViewState.driver.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-                        
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </div>
-
-                        <!-- <div class="col-span-3 sm:col-span-3">
-                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
-                            <div class="mt-1 flex items-center space-x-5">
-                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
-                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
-                                </span>
-                                <button type="button"
-                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    Charger la photo
-                                </button>
-                            </div>
-                        </div> -->
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--<div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
-                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                </div>
-            </div>
-        </div>-->
-
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-<a href="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Modifier le conducteur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
-

web/layouts/solidarity_transport/ext/booking_proposal.html

@@ -1,99 +0,0 @@
-
-{{define "main"}}
-<html class="h-full bg-gray-50">
-    <head>
-        <title>PARCOURSMOB</title>
-        <link rel="stylesheet" href="/public/css/main.css" />
-  <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
-  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
-  <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pmtiles@^4.3.0/dist/pmtiles.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@protomaps/basemaps@5/dist/basemaps.js" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7/turf.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/polyline@0.2.0/src/polyline.js"></script>
-  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
-    </head>
-    <body class="h-full">
-      <div class="flex flex-col justify-center py-12">
-            <div class="">
-              <h2 class="m-4 mt-6 text-center text-3xl font-extrabold text-gray-900">Demande de trajet solidaire</h2>
-              <p class="m-4 text-center">
-              {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-                Vous avez une nouvelle demande de trajet
-              {{else if eq .ViewState.booking.Status "VALIDATED"}}
-                Demande déjà validée 
-              {{else if eq .ViewState.booking.Status "CANCELLED"}}
-                Trajet annulé
-              {{end}}
-              </p>
-      </div>
-      <div class="h-50 w-full">
-  {{template "journey_map" (dict "driver_journey" .ViewState.booking.Journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
-      </div>
-       <div class="grid grid-cols-1">
-                    <div class="p-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Type de de trajet</dt>
-                                {{if .ViewState.booking.Journey.Noreturn}}<dd class="mt-1 text-gray-900">Aller simple (pas de retour)</dd>
-              {{else}}<dd class="mt-1 text-gray-900">Aller-retour ({{.ViewState.booking.ReturnWaitingDuration | shortDuration}} d'attente estimée sur place)</dd>{{end}}
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Passager</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.passenger.Data.first_name}} {{.ViewState.passenger.Data.last_name}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Lieu de récupération du passager</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.booking.Journey.PassengerPickup.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Lieu de destination</dt>
-                                <dd class="mt-1 text-gray-900">{{.ViewState.booking.Journey.PassengerDrop.Properties.label}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Date et heure du rendez-vous</dt>
-                                <dd class="mt-1 text-gray-900">{{ timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04"}}</dd>
-                            </div>
-                            {{if eq .ViewState.booking.Status "VALIDATED"}}
-                            <div class="sm:col-span-1">
-                                <dt class="font-medium text-gray-500">Numéro de téléphone du passager</dt>
-                                <dd class="mt-1 text-co-blue"><a href="tel:{{.ViewState.passenger.Data.phone_number}}">{{ .ViewState.passenger.Data.phone_number}}</a></dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-  <div>
-          </div>
-          <div class="flex flex-col justify-center m-4 sm:flex-row">
-              {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
-          <form method="POST">
-              <input type="hidden" name="action" value="confirm" />
-    {{template "submit_with_sms" 
-      dict  "IconSet" .IconSet 
-            "Viewstate" .ViewState 
-            "ComponentState" (dict "submitText" "Valider"
-                                   "headerText" "Validez le trajet" 
-                                   "infoText" "Le message suivant sera envoyé à votre passager. Vous pouvez le personnaliser.") 
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name") 
-                             "driver_first_name" .ViewState.driver.Data.first_name
-                             "driver_last_name" .ViewState.driver.Data.last_name
-                             "address" .ViewState.booking.Journey.PassengerDrop.Properties.label
-                             "date" (timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04")
-                             "phone_number" .ViewState.driver.Data.phone_number)}}
-            </form>
-          <form method="POST">
-              <input type="hidden" name="action" value="cancel" />
-            <button type="submit"
-              class="m-4 inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-red px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2 sm:w-auto">
-              Refuser
-                          </button>
-            </form>
-              {{end}}
-            </div>
-      </div>
-    </body>
-</html>
-{{end}}

web/layouts/solidarity_transport/overview.html

@@ -1,54 +0,0 @@
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-  <h1 class="text-2xl font-semibold text-gray-900">Transport solidaire</h1>
-
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-        tab: 'drivers',
-        to(event) {
-            this.tab = event.target.value
-        }
-    }">
-        <div class="divide-y divide-gray-200">
-            <div>
-                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4">
-                        <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
-                            <a href="#" @click="tab = 'drivers'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Conducteurs </a>
-                            
-                            <!--<a href="#" @click="tab = 'beneficiaries'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Bénéficiaires </a>-->
-
-                            <a href="#" @click="tab = 'solidarityService'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-                            
-                            <a href="#" @click="tab = 'solidarityHistory'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityHistory' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets passés </a>
-                        </nav>
-                    </div>
-                </div>
-            </div>
-
-            <div x-show="tab == 'drivers'">{{template "solidarity_drivers_list" .}}</div>
-
-
-            <div x-show="tab == 'beneficiaries'">1</div>
-            <div x-show="tab == 'solidarityService'">{{template "solidarity_bookings_list" .}}</div>
-            <div x-show="tab == 'solidarityHistory'">{{template "solidarity_bookings_history" .}}</div>
-
-        </div>
-    </div>
-
-
-</div>
-
-{{ end }}

web/layouts/support/support.html

@@ -1,17 +1,6 @@
 {{define "content"}}
 
-<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6" x-data="{
-        comment: '',
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.comment
- 
-            quill.on('text-change', () => {
-                this.comment = quill.root.innerHTML
-            })
-        },
-    }">
+ <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6">
     <h1 class="text-2xl font-semibold text-gray-900">Demande de support technique</h1>
     <div class="bg-white py-2 px-4 shadow sm:rounded-lg sm:px-10">
         <p class="text-sm text-gray-600 p-4">
@@ -21,11 +10,9 @@
 
         <div class="mb-4 w-full bg-gray-50 rounded-3xl border border-gray-200 dark:bg-gray-700 dark:border-gray-600">
             <div class="py-2 px-4 rounded-3xl bg-white dark:bg-gray-800">
-              <label class="sr-only">Votre message</label>
+                <label class="sr-only">Votre message</label>
                 
-              <div x-ref="quill" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm"></div>
-              <input type="hidden" name="comment" x-model="comment" />
-              
+                <textarea name="comment" rows="4" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm" placeholder="Votre message..."  required></textarea>
             </div>
             <div class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600">
                 <button type="submit" value="send message" class="px-2 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">

web/layouts/vehicles/booking-display.html

@@ -66,6 +66,11 @@
                     </div>
                 </div>
             </div>
+            <div>
+                <div>
+                    {{template "booking_diags" .}}
+                </div>
+            </div>
         </div>
         <div class="lg:col-start-2 lg:col-span-2">
             <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
@@ -198,4 +203,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/_partials/bookings-list.html

@@ -3,7 +3,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -39,10 +39,6 @@
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
-                                    {{else if or .Deleted .Data.Deleted}}
-                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
-                                        Annulé
-                                    </span>
                                     {{else}}
                                         {{if eq .Status 1 }}
                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
@@ -71,11 +67,8 @@
                                     {{if .Data.administrator_unavailability}}
                                     <div class="text-gray-900" ></div>
                                     {{else}}
-                                    <div class="text-gray-900" >
-                                        <!--<img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.Driver}}/picture" alt="">-->
-                                        {{ (index $.ViewState.drivers_map .Driver).Data.first_name }}
-                                        {{ (index $.ViewState.drivers_map .Driver).Data.last_name }}
-                                    </div>
+                                    <div class="text-gray-900" ><img class="h-6 w-6 rounded-co"
+                                        src="/app/beneficiaries/{{.Driver}}/picture" alt=""></div>
                                     {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
@@ -101,4 +94,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/_partials/vehicles-list.html

@@ -3,7 +3,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -121,4 +121,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/booking-display.html

@@ -9,15 +9,8 @@
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none"
             x-data="{
                 changeVehicle: false,
-                selectedvehicle: '',
-                submitSelectedvehicle(event) {
-                    if(this.selectedvehicle == '') {
-                        event.preventDefault()
-                    }
-                    return true
-                }
+                selectedvehicle: ''
             }">
-            {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
             <button type="button" @click="changeVehicle = ! changeVehicle"
                 class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
                 Changer de véhicule
@@ -28,7 +21,6 @@
                     Annuler
                 </button>
             </a>
-            {{end}}
 
             <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
                 <div class="fixed inset-0 bg-gray-900 bg-opacity-30 transition-opacity"></div>
@@ -39,7 +31,7 @@
                             <div class="text-center">
                                 <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3>
                             </div>
-                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4" @submit="submitSelectedvehicle">
+                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4">
                                 <select x-model="selectedvehicle" id="vehicle" name="vehicle" class="mt-1 block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-co-blue focus:outline-none focus:ring-co-blue sm:text-sm">
                                     <option value=""></option>
                                     {{range .ViewState.alternative_vehicles }}
@@ -83,65 +75,45 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.beneficiary.Data.phone_number}}</dd>
                                 </div>
-                                {{if .ViewState.beneficiary.Data.birthdate}}
+                                {{if .ViewState.Data.birthdate}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom
-                                        .ViewState.beneficiary.Data.birthdate).Format
+                                        .ViewState.Data.birthdate).Format
                                         "02/01/2006"}}</dd>
                                 </div>
                                 {{end}}
-                                {{if and .ViewState.beneficiary.Data.gender (ne .ViewState.Data.gender "0")}}
+                                {{if and .ViewState.Data.gender (ne .ViewState.Data.gender "0")}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{genderISO5218
-                                        .ViewState.beneficiary.Data.gender}}</dd>
+                                        .ViewState.Data.gender}}</dd>
                                 </div>
                                 {{end}}
-                                {{if .ViewState.beneficiary.Data.address}}
+                                {{if .ViewState.Data.address}}
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Adresse</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.beneficiary.Data.address.properties.label}}
+                                        {{.ViewState.Data.address.properties.label}}
                                     </dd>
                                 </div>
                                 {{end}}
-                                {{if .ViewState.beneficiary.Data.file_number}}
-                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.beneficiary.Data.file_number}}
-                                    </dd>
-                                </div>
-                                {{end}}
-                                <div>
-                                    <a href="/app/beneficiaries/{{.ViewState.beneficiary.ID}}">
-                                        <button type="button"
-                                            class="w-full items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Fiche bénéficiaire</button>
-                                    </a>
-                                </div>
-                                
                             </dl>
                         </div>
                     </div>
                 </div>
             </div>
-            <!--<div>
+            <div>
                 {{template "booking_diags" .}}
-            </div>-->
+            </div>
         </div>
         <div class="lg:col-start-2 lg:col-span-2">
             <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
                 <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                     <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                         <div class="ml-4 mt-4">
-                            {{if or .ViewState.booking.Data.Deleted .ViewState.booking.Deleted}}
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</h3>
-                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
-                            {{else}}
                             <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
-                            {{end}}
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
                             <!-- <button type="button"
@@ -189,11 +161,11 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.vehicle.Data.licence_plate}}</dd>
                                 </div>
-                                <!--<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Kilométrage</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.vehicle.Data.kilometers}} km</dd>
-                                </div>-->
+                                </div>
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Type</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
@@ -211,9 +183,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
-                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -233,9 +203,7 @@
                                         x-data="{ updateOpen: false }">
                                         <div class="w-full inline-flex" x-show="!updateOpen">
                                             <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
-                                            {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                             <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                            {{end}}
                                         </div>
                                         <form method="POST" class="inline-flex" x-show="updateOpen">
                                             <div class="flex-1">
@@ -255,9 +223,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
-                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -277,9 +243,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
-                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -349,4 +313,4 @@
         </div>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/bookings-list.html

@@ -9,7 +9,7 @@
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             
-            <a href="/exports/fleets/bookings">
+            <a href="/api/cache/{{.ViewState.cacheid}}/export">
                 <button type="button"
                     class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                     {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}

web/layouts/vehicles_management/fleet-add.html

@@ -10,13 +10,11 @@
             licence_plate: null,
             name: null,
             type: null,
-            informations: '',
         },
         rules: {
             licence_plate: ['required'], // 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'
             name: ['required'],
             type: ['required'],
-            informations: ['optional']
         },
         formValidation: {
             valid: false,
@@ -24,19 +22,9 @@
                 name: {valid: null},
                 licence_plate: {valid: null},
                 type: {valid: null},
-                informations: {valid: null},
             }
         },
         isFormValid: true,
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.fields.informations
- 
-            quill.on('text-change', () => {
-                this.fields.informations = quill.root.innerHTML
-            })
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
         },
@@ -106,13 +94,13 @@
                                 @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
                                 :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
-                        <!--<div class="col-span-3">
+                        <div class="col-span-3">
                             <label for="kilometers"
                                 class="block text-sm font-medium text-gray-700">Kilométrage</label>
                             <input type="text" name="kilometers" id="kilometers" placeholder="1 km"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.kilometers">
-                        </div>-->
+                        </div>
                     </div>
                 </div>
             </div>
@@ -130,8 +118,8 @@
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques</label>
                         <div class="mt-1">
-                            <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl"></div>
-                            <input type="hidden" name="informations" x-model="fields.informations" />
+                            <textarea rows="4" name="informations" id="informations"
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                         </div>
                     </div>
                 </div>
@@ -150,4 +138,4 @@
         </div>
     </form>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/fleet-display.html

@@ -69,7 +69,7 @@
                                 {{if .ViewState.vehicle.Data.informations}}
                                 <div class="sm:col-span-2">
                                     <dt class="text-sm font-medium text-gray-500">Informations pratiques pour le bénéficiaire</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{unescapeHTML .ViewState.vehicle.Data.informations}}</dd>
+                                    <dd class="mt-1 text-sm text-gray-900">{{.ViewState.vehicle.Data.informations}}</dd>
                                 </div>
                                 {{end}}
 
@@ -110,10 +110,6 @@
                                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                         Retiré
                                                     </span>
-                                                    {{else if or .Deleted .Data.Deleted}}
-                                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                                        Annulé
-                                                    </span>
                                                     {{else}}
                                                         {{if eq .Status 1 }}
                                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
@@ -138,10 +134,8 @@
                                                     {{else}}
                                                     <div class="text-gray-900" >
                                                         <a href="/app/beneficiaries/{{.Driver}}">
-                                                            <!--<img class="h-6 w-6 rounded-co"
-                                                            src="/app/beneficiaries/{{.Driver}}/picture" alt="">-->
-                                                            {{(index $.ViewState.beneficiaries .Driver).Data.first_name}}
-                                                            {{(index $.ViewState.beneficiaries .Driver).Data.last_name}}
+                                                            <img class="h-6 w-6 rounded-co"
+                                                            src="/app/beneficiaries/{{.Driver}}/picture" alt="">
                                                         </a>
                                                     </div>
                                                     {{end}}
@@ -189,6 +183,9 @@
                         {{end}}
                     </ul>
                 </div>
+                <div class="mt-6">
+                    {{template "vehicle_diags" .}}
+                </div>
             </section>
         </div>
     </main>
@@ -246,4 +243,4 @@
         </form>
     </div>
 </div>
-{{end}}
+{{end}}

web/layouts/vehicles_management/fleet-update.html

@@ -10,7 +10,6 @@
             licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}',
             name: '{{ .ViewState.vehicle.Data.name }}',
             kilometers: '{{ .ViewState.vehicle.Data.kilometers }}',
-            informations: '{{ .ViewState.vahicle.Data.informations}}',
         },
         rules: {
             licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
@@ -24,15 +23,6 @@
             }
         },
         isFormValid: true,
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.fields.informations
- 
-            quill.on('text-change', () => {
-                this.fields.informations = quill.root.innerHTML
-            })
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
         },
@@ -105,7 +95,7 @@
                                 @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
                                 :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
-                        <!--<div class="col-span-3">
+                        <div class="col-span-3">
                             <label for="kilometers"
                                 class="block text-sm font-medium text-gray-700">Kilométrage</label>
                             <input type="text" name="kilometers" id="kilometers" placeholder="1200 km"
@@ -113,7 +103,7 @@
                                 x-model="fields.kilometers"
                                 @blur="fields.kilometers; validateField('kilometers')"
                                 :class="formValidation.fields.kilometers.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>-->
+                        </div>
                     </div>
                 </div>
             </div>
@@ -126,18 +116,13 @@
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     {{ $fieldName := "address" }}
-                    {{if .ViewState.Data.address}}
-                    {{$default := .ViewState.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
+                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.vehicle.Data.address) }}
 
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>
                         <div class="mt-1">
-                            <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl"></div>
-                            <input type="hidden" name="informations" x-model="fields.informations" />
+                            <textarea rows="4" name="informations" id="informations"
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                         </div>
                     </div>
                 </div>
@@ -156,4 +141,4 @@
         </div>
     </form>
 </div>
-{{end}}
+{{end}}

web/node_modules/.bin/detect-libc

@@ -1 +0,0 @@
-../detect-libc/bin/detect-libc.js

web/node_modules/.bin/jiti

@@ -1 +0,0 @@
-../jiti/lib/jiti-cli.mjs

web/node_modules/.bin/tailwindcss

@@ -1 +0,0 @@
-../@tailwindcss/cli/dist/index.mjs

web/node_modules/.package-lock.json

@@ -1,401 +0,0 @@
-{
-  "name": "web",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@tailwindcss/cli": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/cli/-/cli-4.0.9.tgz",
-      "integrity": "sha512-obJvIxu4SCA3PLQYDB7tz9Biv3LFB6+YM/DXNNqwjEMRBNr7Y7LLBk3Cl6xwM+/TxJlA2rEV/t+XwkbldcxeXA==",
-      "license": "MIT",
-      "dependencies": {
-        "@parcel/watcher": "^2.5.1",
-        "@tailwindcss/node": "4.0.9",
-        "@tailwindcss/oxide": "4.0.9",
-        "enhanced-resolve": "^5.18.1",
-        "lightningcss": "^1.29.1",
-        "mri": "^1.2.0",
-        "picocolors": "^1.1.1",
-        "tailwindcss": "4.0.9"
-      },
-      "bin": {
-        "tailwindcss": "dist/index.mjs"
-      }
-    },
-    "node_modules/@tailwindcss/node": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.0.9.tgz",
-      "integrity": "sha512-tOJvdI7XfJbARYhxX+0RArAhmuDcczTC46DGCEziqxzzbIaPnfYaIyRT31n4u8lROrsO7Q6u/K9bmQHL2uL1bQ==",
-      "license": "MIT",
-      "dependencies": {
-        "enhanced-resolve": "^5.18.1",
-        "jiti": "^2.4.2",
-        "tailwindcss": "4.0.9"
-      }
-    },
-    "node_modules/@tailwindcss/oxide": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.0.9.tgz",
-      "integrity": "sha512-eLizHmXFqHswJONwfqi/WZjtmWZpIalpvMlNhTM99/bkHtUs6IqgI1XQ0/W5eO2HiRQcIlXUogI2ycvKhVLNcA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.0.9",
-        "@tailwindcss/oxide-darwin-arm64": "4.0.9",
-        "@tailwindcss/oxide-darwin-x64": "4.0.9",
-        "@tailwindcss/oxide-freebsd-x64": "4.0.9",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.0.9",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.0.9",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.0.9",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.0.9",
-        "@tailwindcss/oxide-linux-x64-musl": "4.0.9",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.0.9",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.0.9"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.0.9.tgz",
-      "integrity": "sha512-v0D8WqI/c3WpWH1kq/HP0J899ATLdGZmENa2/emmNjubT0sWtEke9W9+wXeEoACuGAhF9i3PO5MeyditpDCiWQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.0.9.tgz",
-      "integrity": "sha512-Kvp0TCkfeXyeehqLJr7otsc4hd/BUPfcIGrQiwsTVCfaMfjQZCG7DjI+9/QqPZha8YapLA9UoIcUILRYO7NE1Q==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "license": "ISC"
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "license": "MIT",
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
-    "node_modules/lightningcss": {
-      "version": "1.29.1",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
-      "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
-      "license": "MPL-2.0",
-      "dependencies": {
-        "detect-libc": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.29.1",
-        "lightningcss-darwin-x64": "1.29.1",
-        "lightningcss-freebsd-x64": "1.29.1",
-        "lightningcss-linux-arm-gnueabihf": "1.29.1",
-        "lightningcss-linux-arm64-gnu": "1.29.1",
-        "lightningcss-linux-arm64-musl": "1.29.1",
-        "lightningcss-linux-x64-gnu": "1.29.1",
-        "lightningcss-linux-x64-musl": "1.29.1",
-        "lightningcss-win32-arm64-msvc": "1.29.1",
-        "lightningcss-win32-x64-msvc": "1.29.1"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.29.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
-      "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.29.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.1.tgz",
-      "integrity": "sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mri": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT"
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC"
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/tailwindcss": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.9.tgz",
-      "integrity": "sha512-12laZu+fv1ONDRoNR9ipTOpUD7RN9essRVkX36sjxuRUInpN7hIiHN4lBd/SIFjbISvnXzp8h/hXzmU8SQQYhw==",
-      "license": "MIT"
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    }
-  }
-}

web/node_modules/@parcel/watcher-linux-x64-glibc/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present Devon Govett
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

web/node_modules/@parcel/watcher-linux-x64-glibc/README.md

@@ -1 +0,0 @@
-This is the linux-x64-glibc build of @parcel/watcher. See https://github.com/parcel-bundler/watcher for details.

web/node_modules/@parcel/watcher-linux-x64-glibc/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "@parcel/watcher-linux-x64-glibc",
-  "version": "2.5.1",
-  "main": "watcher.node",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/parcel-bundler/watcher.git"
-  },
-  "description": "A native C++ Node module for querying and subscribing to filesystem events. Used by Parcel 2.",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/parcel"
-  },
-  "files": [
-    "watcher.node"
-  ],
-  "engines": {
-    "node": ">= 10.0.0"
-  },
-  "os": [
-    "linux"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "libc": [
-    "glibc"
-  ]
-}

web/node_modules/@parcel/watcher-linux-x64-musl/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present Devon Govett
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

web/node_modules/@parcel/watcher-linux-x64-musl/README.md

@@ -1 +0,0 @@
-This is the linux-x64-musl build of @parcel/watcher. See https://github.com/parcel-bundler/watcher for details.

web/node_modules/@parcel/watcher-linux-x64-musl/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "@parcel/watcher-linux-x64-musl",
-  "version": "2.5.1",
-  "main": "watcher.node",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/parcel-bundler/watcher.git"
-  },
-  "description": "A native C++ Node module for querying and subscribing to filesystem events. Used by Parcel 2.",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/parcel"
-  },
-  "files": [
-    "watcher.node"
-  ],
-  "engines": {
-    "node": ">= 10.0.0"
-  },
-  "os": [
-    "linux"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "libc": [
-    "musl"
-  ]
-}

web/node_modules/@parcel/watcher/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present Devon Govett
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

web/node_modules/@parcel/watcher/README.md

@@ -1,135 +0,0 @@
-# @parcel/watcher
-
-A native C++ Node module for querying and subscribing to filesystem events. Used by [Parcel 2](https://github.com/parcel-bundler/parcel).
-
-## Features
-
-- **Watch** - subscribe to realtime recursive directory change notifications when files or directories are created, updated, or deleted.
-- **Query** - performantly query for historical change events in a directory, even when your program is not running.
-- **Native** - implemented in C++ for performance and low-level integration with the operating system.
-- **Cross platform** - includes backends for macOS, Linux, Windows, FreeBSD, and Watchman.
-- **Performant** - events are throttled in C++ so the JavaScript thread is not overwhelmed during large filesystem changes (e.g. `git checkout` or `npm install`).
-- **Scalable** - tens of thousands of files can be watched or queried at once with good performance.
-
-## Example
-
-```javascript
-const watcher = require('@parcel/watcher');
-const path = require('path');
-
-// Subscribe to events
-let subscription = await watcher.subscribe(process.cwd(), (err, events) => {
-  console.log(events);
-});
-
-// later on...
-await subscription.unsubscribe();
-
-// Get events since some saved snapshot in the past
-let snapshotPath = path.join(process.cwd(), 'snapshot.txt');
-let events = await watcher.getEventsSince(process.cwd(), snapshotPath);
-
-// Save a snapshot for later
-await watcher.writeSnapshot(process.cwd(), snapshotPath);
-```
-
-## Watching
-
-`@parcel/watcher` supports subscribing to realtime notifications of changes in a directory. It works recursively, so changes in sub-directories will also be emitted.
-
-Events are throttled and coalesced for performance during large changes like `git checkout` or `npm install`, and a single notification will be emitted with all of the events at the end.
-
-Only one notification will be emitted per file. For example, if a file was both created and updated since the last event, you'll get only a `create` event. If a file is both created and deleted, you will not be notifed of that file. Renames cause two events: a `delete` for the old name, and a `create` for the new name.
-
-```javascript
-let subscription = await watcher.subscribe(process.cwd(), (err, events) => {
-  console.log(events);
-});
-```
-
-Events have two properties:
-
-- `type` - the event type: `create`, `update`, or `delete`.
-- `path` - the absolute path to the file or directory.
-
-To unsubscribe from change notifications, call the `unsubscribe` method on the returned subscription object.
-
-```javascript
-await subscription.unsubscribe();
-```
-
-`@parcel/watcher` has the following watcher backends, listed in priority order:
-
-- [FSEvents](https://developer.apple.com/documentation/coreservices/file_system_events) on macOS
-- [Watchman](https://facebook.github.io/watchman/) if installed
-- [inotify](http://man7.org/linux/man-pages/man7/inotify.7.html) on Linux
-- [ReadDirectoryChangesW](https://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v%3Dvs.85%29.aspx) on Windows
-- [kqueue](https://man.freebsd.org/cgi/man.cgi?kqueue) on FreeBSD, or as an alternative to FSEvents on macOS
-
-You can specify the exact backend you wish to use by passing the `backend` option. If that backend is not available on the current platform, the default backend will be used instead. See below for the list of backend names that can be passed to the options.
-
-## Querying
-
-`@parcel/watcher` also supports querying for historical changes made in a directory, even when your program is not running. This makes it easy to invalidate a cache and re-build only the files that have changed, for example. It can be **significantly** faster than traversing the entire filesystem to determine what files changed, depending on the platform.
-
-In order to query for historical changes, you first need a previous snapshot to compare to. This can be saved to a file with the `writeSnapshot` function, e.g. just before your program exits.
-
-```javascript
-await watcher.writeSnapshot(dirPath, snapshotPath);
-```
-
-When your program starts up, you can query for changes that have occurred since that snapshot using the `getEventsSince` function.
-
-```javascript
-let events = await watcher.getEventsSince(dirPath, snapshotPath);
-```
-
-The events returned are exactly the same as the events that would be passed to the `subscribe` callback (see above).
-
-`@parcel/watcher` has the following watcher backends, listed in priority order:
-
-- [FSEvents](https://developer.apple.com/documentation/coreservices/file_system_events) on macOS
-- [Watchman](https://facebook.github.io/watchman/) if installed
-- [fts](http://man7.org/linux/man-pages/man3/fts.3.html) (brute force) on Linux and FreeBSD
-- [FindFirstFile](https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-findfirstfilea) (brute force) on Windows
-
-The FSEvents (macOS) and Watchman backends are significantly more performant than the brute force backends used by default on Linux and Windows, for example returning results in miliseconds instead of seconds for large directory trees. This is because a background daemon monitoring filesystem changes on those platforms allows us to query cached data rather than traversing the filesystem manually (brute force).
-
-macOS has good performance with FSEvents by default. For the best performance on other platforms, install [Watchman](https://facebook.github.io/watchman/) and it will be used by `@parcel/watcher` automatically.
-
-You can specify the exact backend you wish to use by passing the `backend` option. If that backend is not available on the current platform, the default backend will be used instead. See below for the list of backend names that can be passed to the options.
-
-## Options
-
-All of the APIs in `@parcel/watcher` support the following options, which are passed as an object as the last function argument.
-
-- `ignore` - an array of paths or glob patterns to ignore. uses [`is-glob`](https://github.com/micromatch/is-glob) to distinguish paths from globs. glob patterns are parsed with [`micromatch`](https://github.com/micromatch/micromatch) (see [features](https://github.com/micromatch/micromatch#matching-features)).
-  - paths can be relative or absolute and can either be files or directories. No events will be emitted about these files or directories or their children.
-  - glob patterns match on relative paths from the root that is watched. No events will be emitted for matching paths.
-- `backend` - the name of an explicitly chosen backend to use. Allowed options are `"fs-events"`, `"watchman"`, `"inotify"`, `"kqueue"`, `"windows"`, or `"brute-force"` (only for querying). If the specified backend is not available on the current platform, the default backend will be used instead.
-
-## WASM
-
-The `@parcel/watcher-wasm` package can be used in place of `@parcel/watcher` on unsupported platforms. It relies on the Node `fs` module, so in non-Node environments such as browsers, an `fs` polyfill will be needed.
-
-**Note**: the WASM implementation is significantly less efficient than the native implementations because it must crawl the file system to watch each directory individually. Use the native `@parcel/watcher` package wherever possible.
-
-```js
-import {subscribe} from '@parcel/watcher-wasm';
-
-// Use the module as documented above.
-subscribe(/* ... */);
-```
-
-## Who is using this?
-
-- [Parcel 2](https://parceljs.org/)
-- [VSCode](https://code.visualstudio.com/updates/v1_62#_file-watching-changes)
-- [Tailwind CSS Intellisense](https://github.com/tailwindlabs/tailwindcss-intellisense)
-- [Gatsby Cloud](https://twitter.com/chatsidhartha/status/1435647412828196867)
-- [Nx](https://nx.dev)
-- [Nuxt](https://nuxt.com)
-
-## License
-
-MIT

web/node_modules/@parcel/watcher/binding.gyp

@@ -1,93 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "watcher",
-      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "sources": [ "src/binding.cc", "src/Watcher.cc", "src/Backend.cc", "src/DirTree.cc", "src/Glob.cc", "src/Debounce.cc" ],
-      "include_dirs" : ["<!(node -p \"require('node-addon-api').include_dir\")"],
-      'cflags!': [ '-fno-exceptions', '-std=c++17' ],
-      'cflags_cc!': [ '-fno-exceptions', '-std=c++17' ],
-      "conditions": [
-        ['OS=="mac"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/unix/fts.cc",
-            "src/macos/FSEventsBackend.cc",
-            "src/kqueue/KqueueBackend.cc"
-          ],
-          "link_settings": {
-            "libraries": ["CoreServices.framework"]
-          },
-          "defines": [
-            "WATCHMAN",
-            "BRUTE_FORCE",
-            "FS_EVENTS",
-            "KQUEUE"
-          ],
-          "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
-          }
-        }],
-        ['OS=="mac" and target_arch=="arm64"', {
-          "xcode_settings": {
-            "ARCHS": ["arm64"]
-          }
-        }],
-        ['OS=="linux" or OS=="android"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/linux/InotifyBackend.cc",
-            "src/unix/legacy.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "INOTIFY",
-            "BRUTE_FORCE"
-          ]
-        }],
-        ['OS=="win"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/windows/WindowsBackend.cc",
-            "src/windows/win_utils.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "WINDOWS",
-            "BRUTE_FORCE"
-          ],
-          "msvs_settings": {
-            "VCCLCompilerTool": {
-              "ExceptionHandling": 1,  # /EHsc
-              "AdditionalOptions": ['-std:c++17']
-            }
-          }
-        }],
-        ['OS=="freebsd"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/unix/fts.cc",
-            "src/kqueue/KqueueBackend.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "BRUTE_FORCE",
-            "KQUEUE"
-          ]
-        }]
-      ]
-    }
-  ],
-  "variables": {
-    "openssl_fips": "",
-    "node_use_dtrace": "false"
-  }
-}

web/node_modules/@parcel/watcher/index.d.ts

@@ -1,49 +0,0 @@
-declare type FilePath = string;
-declare type GlobPattern = string;
-
-declare namespace ParcelWatcher {
-  export type BackendType = 
-    | 'fs-events'
-    | 'watchman'
-    | 'inotify'
-    | 'windows'
-    | 'brute-force';
-  export type EventType = 'create' | 'update' | 'delete';
-  export interface Options {
-    ignore?: (FilePath|GlobPattern)[];
-    backend?: BackendType;
-  }
-  export type SubscribeCallback = (
-    err: Error | null,
-    events: Event[]
-  ) => unknown;
-  export interface AsyncSubscription {
-    unsubscribe(): Promise<void>;
-  }
-  export interface Event {
-    path: FilePath;
-    type: EventType;
-  }
-  export function getEventsSince(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<Event[]>;
-  export function subscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<AsyncSubscription>;
-  export function unsubscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<void>;
-  export function writeSnapshot(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<FilePath>;
-}
-
-export = ParcelWatcher;

web/node_modules/@parcel/watcher/index.js

@@ -1,41 +0,0 @@
-const {createWrapper} = require('./wrapper');
-
-let name = `@parcel/watcher-${process.platform}-${process.arch}`;
-if (process.platform === 'linux') {
-  const { MUSL, family } = require('detect-libc');
-  if (family === MUSL) {
-    name += '-musl';
-  } else {
-    name += '-glibc';
-  }
-}
-
-let binding;
-try {
-  binding = require(name);
-} catch (err) {
-  handleError(err);
-  try {
-    binding = require('./build/Release/watcher.node');
-  } catch (err) {
-    handleError(err);
-    try {
-      binding = require('./build/Debug/watcher.node');
-    } catch (err) {
-      handleError(err);
-      throw new Error(`No prebuild or local build of @parcel/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`);
-    }
-  }
-}
-
-function handleError(err) {
-  if (err?.code !== 'MODULE_NOT_FOUND') {
-    throw err;
-  }
-}
-
-const wrapper = createWrapper(binding);
-exports.writeSnapshot = wrapper.writeSnapshot;
-exports.getEventsSince = wrapper.getEventsSince;
-exports.subscribe = wrapper.subscribe;
-exports.unsubscribe = wrapper.unsubscribe;

web/node_modules/@parcel/watcher/index.js.flow

@@ -1,48 +0,0 @@
-// @flow
-declare type FilePath = string;
-declare type GlobPattern = string;
-
-export type BackendType = 
-  | 'fs-events'
-  | 'watchman'
-  | 'inotify'
-  | 'windows'
-  | 'brute-force';
-export type EventType = 'create' | 'update' | 'delete';
-export interface Options {
-  ignore?: Array<FilePath | GlobPattern>,
-  backend?: BackendType
-}
-export type SubscribeCallback = (
-  err: ?Error,
-  events: Array<Event>
-) => mixed;
-export interface AsyncSubscription {
-  unsubscribe(): Promise<void>
-}
-export interface Event {
-  path: FilePath,
-  type: EventType
-}
-declare module.exports: {
-  getEventsSince(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<Array<Event>>,
-  subscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<AsyncSubscription>,
-  unsubscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<void>,
-  writeSnapshot(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<FilePath>
-}

web/node_modules/@parcel/watcher/package.json

@@ -1,88 +0,0 @@
-{
-  "name": "@parcel/watcher",
-  "version": "2.5.1",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/parcel-bundler/watcher.git"
-  },
-  "description": "A native C++ Node module for querying and subscribing to filesystem events. Used by Parcel 2.",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/parcel"
-  },
-  "files": [
-    "index.js",
-    "index.js.flow",
-    "index.d.ts",
-    "wrapper.js",
-    "package.json",
-    "README.md",
-    "LICENSE",
-    "src",
-    "scripts/build-from-source.js",
-    "binding.gyp"
-  ],
-  "scripts": {
-    "prebuild": "prebuildify --napi --strip --tag-libc",
-    "format": "prettier --write \"./**/*.{js,json,md}\"",
-    "build": "node-gyp rebuild",
-    "install": "node scripts/build-from-source.js",
-    "test": "mocha"
-  },
-  "engines": {
-    "node": ">= 10.0.0"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,json,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "dependencies": {
-    "detect-libc": "^1.0.3",
-    "is-glob": "^4.0.3",
-    "micromatch": "^4.0.5",
-    "node-addon-api": "^7.0.0"
-  },
-  "devDependencies": {
-    "esbuild": "^0.19.8",
-    "fs-extra": "^10.0.0",
-    "husky": "^7.0.2",
-    "lint-staged": "^11.1.2",
-    "mocha": "^9.1.1",
-    "napi-wasm": "^1.1.0",
-    "prebuildify": "^6.0.1",
-    "prettier": "^2.3.2"
-  },
-  "binary": {
-    "napi_versions": [
-      3
-    ]
-  },
-  "optionalDependencies": {
-    "@parcel/watcher-darwin-x64": "2.5.1",
-    "@parcel/watcher-darwin-arm64": "2.5.1",
-    "@parcel/watcher-win32-x64": "2.5.1",
-    "@parcel/watcher-win32-arm64": "2.5.1",
-    "@parcel/watcher-win32-ia32": "2.5.1",
-    "@parcel/watcher-linux-x64-glibc": "2.5.1",
-    "@parcel/watcher-linux-x64-musl": "2.5.1",
-    "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-    "@parcel/watcher-linux-arm64-musl": "2.5.1",
-    "@parcel/watcher-linux-arm-glibc": "2.5.1",
-    "@parcel/watcher-linux-arm-musl": "2.5.1",
-    "@parcel/watcher-android-arm64": "2.5.1",
-    "@parcel/watcher-freebsd-x64": "2.5.1"
-  }
-}

web/node_modules/@parcel/watcher/scripts/build-from-source.js

@@ -1,13 +0,0 @@
-#!/usr/bin/env node
-
-const {spawn} = require('child_process');
-
-if (process.env.npm_config_build_from_source === 'true') {
-  build();
-}
-
-function build() {
-  spawn('node-gyp', ['rebuild'], { stdio: 'inherit', shell: true }).on('exit', function (code) {
-    process.exit(code);
-  });
-}

web/node_modules/@parcel/watcher/src/Backend.cc

@@ -1,182 +0,0 @@
-#ifdef FS_EVENTS
-#include "macos/FSEventsBackend.hh"
-#endif
-#ifdef WATCHMAN
-#include "watchman/WatchmanBackend.hh"
-#endif
-#ifdef WINDOWS
-#include "windows/WindowsBackend.hh"
-#endif
-#ifdef INOTIFY
-#include "linux/InotifyBackend.hh"
-#endif
-#ifdef KQUEUE
-#include "kqueue/KqueueBackend.hh"
-#endif
-#ifdef __wasm32__
-#include "wasm/WasmBackend.hh"
-#endif
-#include "shared/BruteForceBackend.hh"
-
-#include "Backend.hh"
-#include <unordered_map>
-
-static std::unordered_map<std::string, std::shared_ptr<Backend>> sharedBackends;
-
-std::shared_ptr<Backend> getBackend(std::string backend) {
-  // Use FSEvents on macOS by default.
-  // Use watchman by default if available on other platforms.
-  // Fall back to brute force.
-  #ifdef FS_EVENTS
-    if (backend == "fs-events" || backend == "default") {
-      return std::make_shared<FSEventsBackend>();
-    }
-  #endif
-  #ifdef WATCHMAN
-    if ((backend == "watchman" || backend == "default") && WatchmanBackend::checkAvailable()) {
-      return std::make_shared<WatchmanBackend>();
-    }
-  #endif
-  #ifdef WINDOWS
-    if (backend == "windows" || backend == "default") {
-      return std::make_shared<WindowsBackend>();
-    }
-  #endif
-  #ifdef INOTIFY
-    if (backend == "inotify" || backend == "default") {
-      return std::make_shared<InotifyBackend>();
-    }
-  #endif
-  #ifdef KQUEUE
-    if (backend == "kqueue" || backend == "default") {
-      return std::make_shared<KqueueBackend>();
-    }
-  #endif
-  #ifdef __wasm32__
-    if (backend == "wasm" || backend == "default") {
-      return std::make_shared<WasmBackend>();
-    }
-  #endif
-  if (backend == "brute-force" || backend == "default") {
-    return std::make_shared<BruteForceBackend>();
-  }
-
-  return nullptr;
-}
-
-std::shared_ptr<Backend> Backend::getShared(std::string backend) {
-  auto found = sharedBackends.find(backend);
-  if (found != sharedBackends.end()) {
-    return found->second;
-  }
-
-  auto result = getBackend(backend);
-  if (!result) {
-    return getShared("default");
-  }
-
-  result->run();
-  sharedBackends.emplace(backend, result);
-  return result;
-}
-
-void removeShared(Backend *backend) {
-  for (auto it = sharedBackends.begin(); it != sharedBackends.end(); it++) {
-    if (it->second.get() == backend) {
-      sharedBackends.erase(it);
-      break;
-    }
-  }
-
-  // Free up memory.
-  if (sharedBackends.size() == 0) {
-    sharedBackends.rehash(0);
-  }
-}
-
-void Backend::run() {
-  #ifndef __wasm32__
-    mThread = std::thread([this] () {
-      try {
-        start();
-      } catch (std::exception &err) {
-        handleError(err);
-      }
-    });
-
-    if (mThread.joinable()) {
-      mStartedSignal.wait();
-    }
-  #else
-    try {
-      start();
-    } catch (std::exception &err) {
-      handleError(err);
-    }
-  #endif
-}
-
-void Backend::notifyStarted() {
-  mStartedSignal.notify();
-}
-
-void Backend::start() {
-  notifyStarted();
-}
-
-Backend::~Backend() {
-  #ifndef __wasm32__
-    // Wait for thread to stop
-    if (mThread.joinable()) {
-      // If the backend is being destroyed from the thread itself, detach, otherwise join.
-      if (mThread.get_id() == std::this_thread::get_id()) {
-        mThread.detach();
-      } else {
-        mThread.join();
-      }
-    }
-  #endif
-}
-
-void Backend::watch(WatcherRef watcher) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  auto res = mSubscriptions.find(watcher);
-  if (res == mSubscriptions.end()) {
-    try {
-      this->subscribe(watcher);
-      mSubscriptions.insert(watcher);
-    } catch (std::exception &err) {
-      unref();
-      throw;
-    }
-  }
-}
-
-void Backend::unwatch(WatcherRef watcher) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  size_t deleted = mSubscriptions.erase(watcher);
-  if (deleted > 0) {
-    this->unsubscribe(watcher);
-    unref();
-  }
-}
-
-void Backend::unref() {
-  if (mSubscriptions.size() == 0) {
-    removeShared(this);
-  }
-}
-
-void Backend::handleWatcherError(WatcherError &err) {
-  unwatch(err.mWatcher);
-  err.mWatcher->notifyError(err);
-}
-
-void Backend::handleError(std::exception &err) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  for (auto it = mSubscriptions.begin(); it != mSubscriptions.end(); it++) {
-    (*it)->notifyError(err);
-  }
-
-  removeShared(this);
-}

web/node_modules/@parcel/watcher/src/Backend.hh

@@ -1,37 +0,0 @@
-#ifndef BACKEND_H
-#define BACKEND_H
-
-#include "Event.hh"
-#include "Watcher.hh"
-#include "Signal.hh"
-#include <thread>
-
-class Backend {
-public:
-  virtual ~Backend();
-  void run();
-  void notifyStarted();
-
-  virtual void start();
-  virtual void writeSnapshot(WatcherRef watcher, std::string *snapshotPath) = 0;
-  virtual void getEventsSince(WatcherRef watcher, std::string *snapshotPath) = 0;
-  virtual void subscribe(WatcherRef watcher) = 0;
-  virtual void unsubscribe(WatcherRef watcher) = 0;
-
-  static std::shared_ptr<Backend> getShared(std::string backend);
-
-  void watch(WatcherRef watcher);
-  void unwatch(WatcherRef watcher);
-  void unref();
-  void handleWatcherError(WatcherError &err);
-
-  std::mutex mMutex;
-  std::thread mThread;
-private:
-  std::unordered_set<WatcherRef> mSubscriptions;
-  Signal mStartedSignal;
-
-  void handleError(std::exception &err);
-};
-
-#endif