Compare commits
1 Commits
20260402
...
0e70086ee4
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e70086ee4 |
77
.drone.yml
77
.drone.yml
@@ -4,69 +4,32 @@ type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: web_build
|
||||
image: node:25
|
||||
volumes:
|
||||
- name: web_app
|
||||
path: /tmp/web_build
|
||||
commands:
|
||||
- cd geneit_app
|
||||
- npm install
|
||||
- npm run lint
|
||||
- npm run build
|
||||
- mv dist /tmp/web_build
|
||||
|
||||
- name: backend_check
|
||||
image: rust
|
||||
volumes:
|
||||
- name: rust_registry
|
||||
path: /usr/local/cargo/registry
|
||||
commands:
|
||||
- apt update && apt install -y cmake
|
||||
- rustup component add clippy
|
||||
- cd geneit_backend
|
||||
- cargo clippy -- -D warnings
|
||||
- cargo test
|
||||
|
||||
- name: backend_compile
|
||||
image: rust
|
||||
volumes:
|
||||
- name: rust_registry
|
||||
path: /usr/local/cargo/registry
|
||||
- name: web_app
|
||||
path: /tmp/web_build
|
||||
- name: release
|
||||
path: /tmp/release
|
||||
depends_on:
|
||||
- backend_check
|
||||
- web_build
|
||||
commands:
|
||||
- cd geneit_backend
|
||||
- mv /tmp/web_build/dist static
|
||||
- cargo build --release
|
||||
- cp target/release/geneit_backend /tmp/release
|
||||
|
||||
- name: gitea_release
|
||||
image: plugins/gitea-release
|
||||
depends_on:
|
||||
- backend_compile
|
||||
when:
|
||||
event:
|
||||
- tag
|
||||
volumes:
|
||||
- name: release
|
||||
path: /tmp/release
|
||||
- name: app_deploy
|
||||
image: node:22
|
||||
environment:
|
||||
PLUGIN_API_KEY:
|
||||
from_secret: API_KEY # needs repository read & write access
|
||||
settings:
|
||||
base_url: https://gitea.communiquons.org
|
||||
files: /tmp/release/*
|
||||
checksum: sha512
|
||||
|
||||
volumes:
|
||||
- name: rust_registry
|
||||
temp: {}
|
||||
- name: web_app
|
||||
temp: {}
|
||||
- name: release
|
||||
temp: {}
|
||||
AWS_ACCESS_KEY_ID:
|
||||
from_secret: AWS_ACCESS_KEY_ID
|
||||
AWS_SECRET_ACCESS_KEY:
|
||||
from_secret: AWS_SECRET_ACCESS_KEY
|
||||
AWS_DEFAULT_REGION: us-east-1
|
||||
commands:
|
||||
# Build website
|
||||
- cd geneit_app
|
||||
- npm install
|
||||
- GENERATE_SOURCEMAP=false npm run build
|
||||
# Install AWS
|
||||
- curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
|
||||
- unzip awscliv2.zip
|
||||
- ./aws/install
|
||||
- aws configure set default.s3.signature_version s3v4
|
||||
# Upload to bucket
|
||||
- bash upload_bucket.sh
|
||||
|
||||
674
LICENSE
674
LICENSE
@@ -1,674 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
15
Makefile
15
Makefile
@@ -1,15 +0,0 @@
|
||||
all: app backend
|
||||
|
||||
app:
|
||||
cd geneit_app && npm run build && cd ..
|
||||
rm -rf geneit_backend/static
|
||||
mv geneit_app/dist geneit_backend/static
|
||||
|
||||
backend: app
|
||||
cd geneit_backend && cargo clippy -- -D warnings && cargo build --release
|
||||
|
||||
DOCKER_TEMP_DIR := $(shell mktemp -d)
|
||||
backend_docker: backend
|
||||
cp geneit_backend/target/release/geneit_backend $(DOCKER_TEMP_DIR)
|
||||
docker build -t pierre42100/geneit_backend -f geneit_backend/Dockerfile "$(DOCKER_TEMP_DIR)"
|
||||
rm -rf $(DOCKER_TEMP_DIR)
|
||||
25
README.md
25
README.md
@@ -1,5 +1,7 @@
|
||||
# GeneIT
|
||||
|
||||
WIP project
|
||||
|
||||
## Setup dev env
|
||||
1. Install prerequisites:
|
||||
1. docker
|
||||
@@ -10,8 +12,7 @@
|
||||
2. Start services:
|
||||
```bash
|
||||
cd geneit_backend
|
||||
mkdir -p storage/{rustfs,db,redis-data,redis-conf}
|
||||
docker compose up
|
||||
docker-compose up
|
||||
```
|
||||
|
||||
|
||||
@@ -23,7 +24,7 @@ cargo install diesel_cli --no-default-features --features postgres
|
||||
```
|
||||
|
||||
|
||||
4. Initialize database manually (or it will be done automatically when the backend is started):
|
||||
4. Initialize database:
|
||||
|
||||
```bash
|
||||
diesel migration run
|
||||
@@ -35,9 +36,19 @@ diesel migration run
|
||||
> PGPASSWORD=pass psql -h localhost -p 5432 -U user -d geneit
|
||||
> ```
|
||||
|
||||
## Test OIDC credentials
|
||||
Emails:
|
||||
|
||||
Useful links:
|
||||
```
|
||||
harley@qlik.example
|
||||
barb@qlik.example
|
||||
quinn@qlik.example
|
||||
sim@qlik.example
|
||||
phillie@qlik.example
|
||||
peta@qlik.example
|
||||
sibylla@qlik.example
|
||||
evan@qlik.example
|
||||
franklin@qlik.example
|
||||
```
|
||||
|
||||
* Mailcatcher: http://localhost:1080/
|
||||
* Rustfs console: http://localhost:9090 (credentials: `topsecret` / `topsecret`)
|
||||
* Dex OpenID configuration: http://127.0.0.1:9001/dex/.well-known/openid-configuration
|
||||
Password: `Password1!`
|
||||
|
||||
@@ -1 +1 @@
|
||||
VITE_APP_BACKEND=http://localhost:8000/api
|
||||
VITE_APP_BACKEND=http://localhost:8000
|
||||
@@ -1 +1 @@
|
||||
VITE_APP_BACKEND=/api
|
||||
VITE_APP_BACKEND=https://geneit-backend.communiquons.org
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import tseslint from 'typescript-eslint'
|
||||
|
||||
export default tseslint.config(
|
||||
{ ignores: ['dist'] },
|
||||
{
|
||||
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
},
|
||||
plugins: {
|
||||
'react-hooks': reactHooks,
|
||||
'react-refresh': reactRefresh,
|
||||
},
|
||||
rules: {
|
||||
...reactHooks.configs.recommended.rules,
|
||||
'react-refresh/only-export-components': [
|
||||
'warn',
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
},
|
||||
},
|
||||
)
|
||||
5460
geneit_app/package-lock.json
generated
5460
geneit_app/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,54 +3,70 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
||||
"@emotion/react": "^11.11.4",
|
||||
"@emotion/styled": "^11.11.0",
|
||||
"@fontsource/roboto": "^5.0.13",
|
||||
"@fullcalendar/core": "^6.1.14",
|
||||
"@fullcalendar/daygrid": "^6.1.14",
|
||||
"@fullcalendar/interaction": "^6.1.14",
|
||||
"@fullcalendar/list": "^6.1.14",
|
||||
"@fullcalendar/react": "^6.1.14",
|
||||
"@mdi/js": "^7.2.96",
|
||||
"@mdi/react": "^1.6.1",
|
||||
"@mui/icons-material": "^5.15.17",
|
||||
"@mui/lab": "^5.0.0-alpha.140",
|
||||
"@mui/material": "^5.15.17",
|
||||
"@mui/x-data-grid": "^7.1.1",
|
||||
"@mui/x-date-pickers": "^7.7.0",
|
||||
"@mui/x-tree-view": "^7.4.0",
|
||||
"@testing-library/jest-dom": "^6.4.5",
|
||||
"@testing-library/react": "^16.0.0",
|
||||
"@testing-library/user-event": "^14.0.0",
|
||||
"@types/jest": "^29.0.0",
|
||||
"@types/react": "^18.3.2",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
"@vitejs/plugin-react": "^4.2.1",
|
||||
"date-and-time": "^3.2.0",
|
||||
"dayjs": "^1.11.11",
|
||||
"email-validator": "^2.0.4",
|
||||
"filesize": "^10.1.2",
|
||||
"jspdf": "^2.5.1",
|
||||
"mui-color-input": "^2.0.3",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-easy-crop": "^5.0.7",
|
||||
"react-qr-code": "^2.0.14",
|
||||
"react-router-dom": "^6.23.1",
|
||||
"react-zoom-pan-pinch": "^3.4.4",
|
||||
"svg2pdf.js": "^2.2.3",
|
||||
"typescript": "^5.4.5",
|
||||
"vite": "^5.2.11",
|
||||
"vite-tsconfig-paths": "^4.3.2",
|
||||
"web-vitals": "^3.5.2"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint .",
|
||||
"start": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@fontsource/roboto": "^5.2.10",
|
||||
"@fullcalendar/core": "^6.1.20",
|
||||
"@fullcalendar/daygrid": "^6.1.20",
|
||||
"@fullcalendar/interaction": "^6.1.20",
|
||||
"@fullcalendar/list": "^6.1.20",
|
||||
"@fullcalendar/react": "^6.1.20",
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@mdi/react": "^1.6.1",
|
||||
"@mui/icons-material": "^7.3.9",
|
||||
"@mui/lab": "^7.0.1-beta.23",
|
||||
"@mui/material": "^7.3.9",
|
||||
"@mui/x-data-grid": "^8.28.2",
|
||||
"@mui/x-date-pickers": "^8.27.2",
|
||||
"@mui/x-tree-view": "^8.27.2",
|
||||
"date-and-time": "^4.4.0",
|
||||
"dayjs": "^1.11.20",
|
||||
"email-validator": "^2.0.4",
|
||||
"filesize": "^11.0.15",
|
||||
"jspdf": "^4.2.1",
|
||||
"mui-color-input": "^8.0.0",
|
||||
"react": "^19.2.4",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-easy-crop": "^5.5.7",
|
||||
"react-qr-code": "^2.0.18",
|
||||
"react-router-dom": "^7.13.2",
|
||||
"react-zoom-pan-pinch": "^3.7.0",
|
||||
"svg2pdf.js": "^2.7.0"
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@vitejs/plugin-react": "^6.0.1",
|
||||
"eslint": "^10.1.0",
|
||||
"eslint-plugin-react-hooks": "0.0.0-experimental-80b1cab3-20260331",
|
||||
"eslint-plugin-react-refresh": "^0.5.2",
|
||||
"globals": "^17.4.0",
|
||||
"typescript": "^6.0.2",
|
||||
"typescript-eslint": "^8.58.0",
|
||||
"vite": "^8.0.3"
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,10 +59,7 @@ export function App(): React.ReactElement {
|
||||
|
||||
const context: AuthContext = {
|
||||
signedIn: signedIn,
|
||||
setSignedIn: (s) => {
|
||||
location.reload();
|
||||
setSignedIn(s);
|
||||
},
|
||||
setSignedIn: (s) => setSignedIn(s),
|
||||
};
|
||||
|
||||
const router = createBrowserRouter(
|
||||
@@ -152,8 +149,8 @@ export function App(): React.ReactElement {
|
||||
<Route path="*" element={<NotFoundRoute />} />
|
||||
</Route>
|
||||
)}
|
||||
</>,
|
||||
),
|
||||
</>
|
||||
)
|
||||
);
|
||||
|
||||
return (
|
||||
@@ -163,7 +160,6 @@ export function App(): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useAuth(): AuthContext {
|
||||
return React.useContext(AuthContextK)!;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
import { AuthApi } from "./AuthApi";
|
||||
|
||||
interface APIResponse {
|
||||
data: unknown;
|
||||
data: any;
|
||||
status: number;
|
||||
}
|
||||
|
||||
export class ApiError extends Error {
|
||||
constructor(
|
||||
message: string,
|
||||
public code: number,
|
||||
public data: unknown,
|
||||
) {
|
||||
constructor(message: string, public code: number, public data: any) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@@ -40,11 +36,11 @@ export class APIClient {
|
||||
uri: string;
|
||||
method: "GET" | "POST" | "DELETE" | "PATCH" | "PUT";
|
||||
allowFail?: boolean;
|
||||
jsonData?: unknown;
|
||||
jsonData?: any;
|
||||
formData?: FormData;
|
||||
}): Promise<APIResponse> {
|
||||
let body = undefined;
|
||||
const headers: { [k: string]: string } = {
|
||||
let headers: any = {
|
||||
"X-auth-token": AuthApi.SignedIn ? AuthApi.AuthToken : "none",
|
||||
};
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ export class AuthApi {
|
||||
*/
|
||||
static async CreateAccount(
|
||||
name: string,
|
||||
mail: string,
|
||||
mail: string
|
||||
): Promise<CreateAccountResult> {
|
||||
const res = await APIClient.exec({
|
||||
uri: "/auth/create_account",
|
||||
@@ -77,7 +77,7 @@ export class AuthApi {
|
||||
*/
|
||||
static async LoginWithPassword(
|
||||
mail: string,
|
||||
password: string,
|
||||
password: string
|
||||
): Promise<PasswordLoginResult> {
|
||||
const res = await APIClient.exec({
|
||||
uri: "/auth/password_login",
|
||||
@@ -96,10 +96,7 @@ export class AuthApi {
|
||||
return PasswordLoginResult.InvalidCredentials;
|
||||
case 200:
|
||||
case 201:
|
||||
localStorage.setItem(
|
||||
TokenStateKey,
|
||||
(res.data as { token: string }).token,
|
||||
);
|
||||
localStorage.setItem(TokenStateKey, res.data.token);
|
||||
return PasswordLoginResult.Success;
|
||||
default:
|
||||
return PasswordLoginResult.Error;
|
||||
@@ -118,20 +115,20 @@ export class AuthApi {
|
||||
method: "POST",
|
||||
jsonData: { provider: id },
|
||||
})
|
||||
).data as { url: string };
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finish OpenID login
|
||||
*/
|
||||
static async FinishOpenIDLogin(code: string, state: string): Promise<void> {
|
||||
const res = (
|
||||
const res: { user_id: number; token: string } = (
|
||||
await APIClient.exec({
|
||||
uri: "/auth/finish_openid_login",
|
||||
method: "POST",
|
||||
jsonData: { code: code, state: state },
|
||||
})
|
||||
).data as { user_id: number; token: string };
|
||||
).data;
|
||||
|
||||
localStorage.setItem(TokenStateKey, res.token);
|
||||
}
|
||||
@@ -170,7 +167,7 @@ export class AuthApi {
|
||||
* Check reset password token
|
||||
*/
|
||||
static async CheckResetPasswordToken(
|
||||
token: string,
|
||||
token: string
|
||||
): Promise<CheckResetTokenResponse> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -178,7 +175,7 @@ export class AuthApi {
|
||||
method: "POST",
|
||||
jsonData: { token: token },
|
||||
})
|
||||
).data as CheckResetTokenResponse;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -186,7 +183,7 @@ export class AuthApi {
|
||||
*/
|
||||
static async ResetPassword(
|
||||
token: string,
|
||||
newPassword: string,
|
||||
newPassword: string
|
||||
): Promise<void> {
|
||||
await APIClient.exec({
|
||||
uri: "/auth/reset_password",
|
||||
|
||||
@@ -85,17 +85,11 @@ export class Family implements FamilyAPI {
|
||||
}
|
||||
}
|
||||
|
||||
interface ExtendedFamilyInfoAPI extends FamilyAPI {
|
||||
disable_couple_photos: boolean;
|
||||
enable_genealogy: boolean;
|
||||
enable_accommodations: boolean;
|
||||
}
|
||||
|
||||
export class ExtendedFamilyInfo extends Family {
|
||||
public disable_couple_photos: boolean;
|
||||
public enable_genealogy: boolean;
|
||||
public enable_accommodations: boolean;
|
||||
constructor(p: ExtendedFamilyInfoAPI) {
|
||||
constructor(p: any) {
|
||||
super(p);
|
||||
this.disable_couple_photos = p.disable_couple_photos;
|
||||
this.enable_genealogy = p.enable_genealogy;
|
||||
@@ -161,13 +155,12 @@ export class FamilyApi {
|
||||
* Get the list of families
|
||||
*/
|
||||
static async GetList(): Promise<Family[]> {
|
||||
const res = (
|
||||
return (
|
||||
await APIClient.exec({
|
||||
method: "GET",
|
||||
uri: "/family/list",
|
||||
})
|
||||
).data as FamilyAPI[];
|
||||
return res.map((f: FamilyAPI) => new Family(f));
|
||||
).data.map((f: FamilyAPI) => new Family(f));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -179,7 +172,7 @@ export class FamilyApi {
|
||||
uri: `/family/${id}`,
|
||||
});
|
||||
|
||||
return new ExtendedFamilyInfo(res.data as ExtendedFamilyInfoAPI);
|
||||
return new ExtendedFamilyInfo(res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -211,7 +204,7 @@ export class FamilyApi {
|
||||
method: "GET",
|
||||
uri: `/family/${id}/users`,
|
||||
})
|
||||
).data as FamilyUser[];
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -74,7 +74,7 @@ export class ServerApi {
|
||||
uri: "/server/config",
|
||||
method: "GET",
|
||||
})
|
||||
).data as ServerConfig;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -33,7 +33,7 @@ export class UserApi {
|
||||
uri: "/user/info",
|
||||
method: "GET",
|
||||
})
|
||||
).data as User;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,7 +54,7 @@ export class UserApi {
|
||||
*/
|
||||
static async ReplacePassword(
|
||||
oldPwd: string,
|
||||
newPwd: string,
|
||||
newPwd: string
|
||||
): Promise<ReplacePasswordResponse> {
|
||||
const res = await APIClient.exec({
|
||||
uri: "/user/replace_password",
|
||||
@@ -98,7 +98,7 @@ export class UserApi {
|
||||
* Check delete account token
|
||||
*/
|
||||
static async CheckDeleteAccountToken(
|
||||
token: string,
|
||||
token: string
|
||||
): Promise<DeleteAccountTokenInfo> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -106,7 +106,7 @@ export class UserApi {
|
||||
method: "POST",
|
||||
jsonData: { token: token },
|
||||
})
|
||||
).data as DeleteAccountTokenInfo;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,7 +26,7 @@ export class AccommodationsList {
|
||||
}
|
||||
|
||||
this.list.sort((a, b) =>
|
||||
a.name.toLowerCase().localeCompare(b.name.toLocaleLowerCase()),
|
||||
a.name.toLowerCase().localeCompare(b.name.toLocaleLowerCase())
|
||||
);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ export class AccommodationListApi {
|
||||
method: "GET",
|
||||
uri: `/family/${family.family_id}/accommodations/list/list`,
|
||||
})
|
||||
).data as Accommodation[];
|
||||
).data;
|
||||
|
||||
return new AccommodationsList(data);
|
||||
}
|
||||
@@ -83,7 +83,7 @@ export class AccommodationListApi {
|
||||
*/
|
||||
static async Create(
|
||||
family: Family,
|
||||
accommodation: UpdateAccommodation,
|
||||
accommodation: UpdateAccommodation
|
||||
): Promise<Accommodation> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -91,7 +91,7 @@ export class AccommodationListApi {
|
||||
uri: `/family/${family.family_id}/accommodations/list/create`,
|
||||
jsonData: accommodation,
|
||||
})
|
||||
).data as Accommodation;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -99,7 +99,7 @@ export class AccommodationListApi {
|
||||
*/
|
||||
static async Update(
|
||||
accommodation: Accommodation,
|
||||
update: UpdateAccommodation,
|
||||
update: UpdateAccommodation
|
||||
): Promise<Accommodation> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -107,7 +107,7 @@ export class AccommodationListApi {
|
||||
uri: `/family/${accommodation.family_id}/accommodations/list/${accommodation.id}`,
|
||||
jsonData: update,
|
||||
})
|
||||
).data as Accommodation;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -119,6 +119,6 @@ export class AccommodationListApi {
|
||||
method: "DELETE",
|
||||
uri: `/family/${accommodation.family_id}/accommodations/list/${accommodation.id}`,
|
||||
})
|
||||
).data as Accommodation;
|
||||
).data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ export class AccommodationsCalendarURLApi {
|
||||
*/
|
||||
static async Create(
|
||||
family: Family,
|
||||
calendar: NewCalendarURL,
|
||||
calendar: NewCalendarURL
|
||||
): Promise<AccommodationCalendarURL> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -31,7 +31,7 @@ export class AccommodationsCalendarURLApi {
|
||||
uri: `/family/${family.family_id}/accommodations/reservations_calendars/create`,
|
||||
jsonData: calendar,
|
||||
})
|
||||
).data as AccommodationCalendarURL;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,20 +50,20 @@ export class AccommodationsCalendarURLApi {
|
||||
method: "GET",
|
||||
uri: `/family/${family.family_id}/accommodations/reservations_calendars/list`,
|
||||
})
|
||||
).data as AccommodationCalendarURL[];
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete an accommodation calendar
|
||||
*/
|
||||
static async Delete(
|
||||
calendar: AccommodationCalendarURL,
|
||||
calendar: AccommodationCalendarURL
|
||||
): Promise<AccommodationCalendarURL> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
method: "DELETE",
|
||||
uri: `/family/${calendar.family_id}/accommodations/reservations_calendars/${calendar.id}`,
|
||||
})
|
||||
).data as AccommodationCalendarURL;
|
||||
).data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ export class AccommodationsReservationsList {
|
||||
}
|
||||
|
||||
filter(
|
||||
predicate: (m: AccommodationReservation) => boolean,
|
||||
predicate: (m: AccommodationReservation) => boolean
|
||||
): AccommodationReservation[] {
|
||||
return this.list.filter(predicate);
|
||||
}
|
||||
@@ -75,7 +75,7 @@ export class AccommodationsReservationsApi {
|
||||
*/
|
||||
static async Create(
|
||||
family: Family,
|
||||
reservation: UpdateAccommodationReservation,
|
||||
reservation: UpdateAccommodationReservation
|
||||
): Promise<AccommodationReservation> {
|
||||
return (
|
||||
await APIClient.exec({
|
||||
@@ -86,21 +86,21 @@ export class AccommodationsReservationsApi {
|
||||
end: reservation.end,
|
||||
},
|
||||
})
|
||||
).data as AccommodationReservation;
|
||||
).data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the entire list of accommodations of a family
|
||||
*/
|
||||
static async FullListOfFamily(
|
||||
family: Family,
|
||||
family: Family
|
||||
): Promise<AccommodationsReservationsList> {
|
||||
const data = (
|
||||
await APIClient.exec({
|
||||
method: "GET",
|
||||
uri: `/family/${family.family_id}/accommodations/reservations/full_list`,
|
||||
})
|
||||
).data as AccommodationReservation[];
|
||||
).data;
|
||||
|
||||
return new AccommodationsReservationsList(data);
|
||||
}
|
||||
@@ -112,14 +112,14 @@ export class AccommodationsReservationsApi {
|
||||
family: Family,
|
||||
accommodation: Accommodation,
|
||||
start: number,
|
||||
end: number,
|
||||
end: number
|
||||
): Promise<AccommodationsReservationsList> {
|
||||
const data = (
|
||||
await APIClient.exec({
|
||||
method: "GET",
|
||||
uri: `/family/${family.family_id}/accommodations/reservations/accommodation/${accommodation.id}/for_interval?start=${start}&end=${end}`,
|
||||
})
|
||||
).data as AccommodationReservation[];
|
||||
).data;
|
||||
|
||||
return new AccommodationsReservationsList(data);
|
||||
}
|
||||
@@ -129,7 +129,7 @@ export class AccommodationsReservationsApi {
|
||||
*/
|
||||
static async Update(
|
||||
family: Family,
|
||||
r: UpdateAccommodationReservation,
|
||||
r: UpdateAccommodationReservation
|
||||
): Promise<void> {
|
||||
await APIClient.exec({
|
||||
method: "PATCH",
|
||||
@@ -156,7 +156,7 @@ export class AccommodationsReservationsApi {
|
||||
*/
|
||||
static async Validate(
|
||||
r: AccommodationReservation,
|
||||
accept: boolean,
|
||||
accept: boolean
|
||||
): Promise<ValidateResaResult> {
|
||||
const res = await APIClient.exec({
|
||||
method: "POST",
|
||||
|
||||
@@ -166,7 +166,7 @@ export class CoupleApi {
|
||||
jsonData: m,
|
||||
});
|
||||
|
||||
return new Couple(res.data as CoupleApiInterface);
|
||||
return new Couple(res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -174,28 +174,26 @@ export class CoupleApi {
|
||||
*/
|
||||
static async GetSingle(
|
||||
family_id: number,
|
||||
couple_id: number,
|
||||
couple_id: number
|
||||
): Promise<Couple> {
|
||||
const res = await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/couple/${couple_id}`,
|
||||
method: "GET",
|
||||
});
|
||||
|
||||
return new Couple(res.data as CoupleApiInterface);
|
||||
return new Couple(res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the entire list of couples of a family
|
||||
*/
|
||||
static async GetEntireList(family_id: number): Promise<CouplesList> {
|
||||
const res = (
|
||||
await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/couples`,
|
||||
method: "GET",
|
||||
})
|
||||
).data as CoupleApiInterface[];
|
||||
const res = await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/couples`,
|
||||
method: "GET",
|
||||
});
|
||||
|
||||
return new CouplesList(res.map((d) => new Couple(d)));
|
||||
return new CouplesList(res.data.map((d: any) => new Couple(d)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,7 +12,7 @@ export class DataApi {
|
||||
uri: `/family/${family_id}/genealogy/data/export`,
|
||||
method: "GET",
|
||||
});
|
||||
return res.data as Blob;
|
||||
return res.data;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -26,6 +26,6 @@ export class DataApi {
|
||||
method: "PUT",
|
||||
formData: fd,
|
||||
});
|
||||
return res.data as Blob;
|
||||
return res.data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ export class Member implements MemberDataApi {
|
||||
const firstName = this.first_name ?? "";
|
||||
|
||||
return firstName.length === 0
|
||||
? (this.last_name ?? "")
|
||||
? this.last_name ?? ""
|
||||
: `${firstName} ${this.last_name?.toUpperCase() ?? ""}`;
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ export class Member implements MemberDataApi {
|
||||
const lastName = this.last_name ?? "";
|
||||
|
||||
return lastName.length === 0
|
||||
? (this.last_name ?? "")
|
||||
? this.last_name ?? ""
|
||||
: `${lastName} ${this.first_name ?? ""}`;
|
||||
}
|
||||
|
||||
@@ -164,14 +164,14 @@ export class Member implements MemberDataApi {
|
||||
}
|
||||
|
||||
get displayBirthDeath(): string {
|
||||
const birthDeath = [];
|
||||
let birthDeath = [];
|
||||
if (this.dateOfBirth) birthDeath.push(fmtDate(this.dateOfBirth));
|
||||
if (this.dateOfDeath) birthDeath.push(fmtDate(this.dateOfDeath));
|
||||
return birthDeath.join(" - ");
|
||||
}
|
||||
|
||||
get displayBirthDeathShort(): string {
|
||||
const birthDeath = [];
|
||||
let birthDeath = [];
|
||||
if (this.birth_year) birthDeath.push(this.birth_year.toString());
|
||||
if (this.death_year) birthDeath.push(this.death_year.toString());
|
||||
return birthDeath.join(" - ");
|
||||
@@ -226,7 +226,7 @@ export class MembersList {
|
||||
this.list.sort((a, b) =>
|
||||
a.invertedFullName
|
||||
.toLowerCase()
|
||||
.localeCompare(b.invertedFullName.toLocaleLowerCase()),
|
||||
.localeCompare(b.invertedFullName.toLocaleLowerCase())
|
||||
);
|
||||
}
|
||||
|
||||
@@ -257,7 +257,7 @@ export class MembersList {
|
||||
childrenOfCouple(c: Couple): Member[] {
|
||||
if (!c.husband && !c.wife) return [];
|
||||
return this.list.filter(
|
||||
(m) => m.mother === c.wife && m.father === c.husband,
|
||||
(m) => m.mother === c.wife && m.father === c.husband
|
||||
);
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ export class MembersList {
|
||||
(m) =>
|
||||
m.id !== p?.id &&
|
||||
((m.mother && m.mother === p?.mother) ||
|
||||
(m.father && m.father === p?.father)),
|
||||
(m.father && m.father === p?.father))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -277,15 +277,13 @@ export class MemberApi {
|
||||
* Create a new member
|
||||
*/
|
||||
static async Create(m: Member): Promise<Member> {
|
||||
const res = (
|
||||
await APIClient.exec({
|
||||
uri: `/family/${m.family_id}/genealogy/member/create`,
|
||||
method: "POST",
|
||||
jsonData: m,
|
||||
})
|
||||
).data as MemberDataApi;
|
||||
const res = await APIClient.exec({
|
||||
uri: `/family/${m.family_id}/genealogy/member/create`,
|
||||
method: "POST",
|
||||
jsonData: m,
|
||||
});
|
||||
|
||||
return new Member(res);
|
||||
return new Member(res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -293,30 +291,26 @@ export class MemberApi {
|
||||
*/
|
||||
static async GetSingle(
|
||||
family_id: number,
|
||||
member_id: number,
|
||||
member_id: number
|
||||
): Promise<Member> {
|
||||
const res = (
|
||||
await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/member/${member_id}`,
|
||||
method: "GET",
|
||||
})
|
||||
).data as MemberDataApi;
|
||||
const res = await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/member/${member_id}`,
|
||||
method: "GET",
|
||||
});
|
||||
|
||||
return new Member(res);
|
||||
return new Member(res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the entire list of family members of a family
|
||||
*/
|
||||
static async GetEntireList(family_id: number): Promise<MembersList> {
|
||||
const res = (
|
||||
await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/members`,
|
||||
method: "GET",
|
||||
})
|
||||
).data as MemberDataApi[];
|
||||
const res = await APIClient.exec({
|
||||
uri: `/family/${family_id}/genealogy/members`,
|
||||
method: "GET",
|
||||
});
|
||||
|
||||
return new MembersList(res.map((d) => new Member(d)));
|
||||
return new MembersList(res.data.map((d: any) => new Member(d)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -27,11 +27,11 @@ export function UpdateAccommodationDialog(p: {
|
||||
|
||||
const nameErr = checkConstraint(
|
||||
ServerApi.Config.constraints.accommodation_name_len,
|
||||
accommodation?.name,
|
||||
accommodation?.name
|
||||
);
|
||||
const descriptionErr = checkConstraint(
|
||||
ServerApi.Config.constraints.accommodation_description_len,
|
||||
accommodation?.description,
|
||||
accommodation?.description
|
||||
);
|
||||
|
||||
const clearForm = () => {
|
||||
@@ -49,9 +49,7 @@ export function UpdateAccommodationDialog(p: {
|
||||
};
|
||||
|
||||
React.useEffect(() => {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
if (!accommodation) setAccommodation(p.accommodation);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [p.open, p.accommodation]);
|
||||
|
||||
return (
|
||||
|
||||
@@ -54,13 +54,10 @@ export function UpdateReservationDialog(p: {
|
||||
};
|
||||
|
||||
React.useEffect(() => {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
if (!reservation) setReservation(p.reservation);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [p.open, p.reservation]);
|
||||
|
||||
React.useEffect(() => {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
setConflicts(undefined);
|
||||
(async () => {
|
||||
try {
|
||||
@@ -80,21 +77,20 @@ export function UpdateReservationDialog(p: {
|
||||
family.family,
|
||||
accommodations.accommodations.get(reservation.accommodation_id)!,
|
||||
reservation.start,
|
||||
reservation.end,
|
||||
reservation.end
|
||||
)
|
||||
).filter(
|
||||
(r) =>
|
||||
r.id !== p.reservation?.reservation_id && r.validated !== false,
|
||||
),
|
||||
r.id !== p.reservation?.reservation_id && r.validated !== false
|
||||
)
|
||||
);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert(
|
||||
"Echec de la vérification de la présence de conflits de calendrier !",
|
||||
"Echec de la vérification de la présence de conflits de calendrier !"
|
||||
);
|
||||
}
|
||||
})();
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [
|
||||
p.open,
|
||||
reservation?.accommodation_id,
|
||||
@@ -122,7 +118,7 @@ export function UpdateReservationDialog(p: {
|
||||
options={accommodations.accommodations.openToReservationList.map(
|
||||
(a) => {
|
||||
return { label: a.name, value: a.id.toString() };
|
||||
},
|
||||
}
|
||||
)}
|
||||
value={
|
||||
reservation?.accommodation_id === -1
|
||||
|
||||
@@ -63,7 +63,6 @@ export function AlertDialogProvider(p: PropsWithChildren): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useAlert(): AlertContext {
|
||||
return React.useContext(AlertContextK)!;
|
||||
}
|
||||
|
||||
@@ -11,20 +11,20 @@ import React, { PropsWithChildren } from "react";
|
||||
type ConfirmContext = (
|
||||
message: string,
|
||||
title?: string,
|
||||
confirmButton?: string,
|
||||
confirmButton?: string
|
||||
) => Promise<boolean>;
|
||||
|
||||
const ConfirmContextK = React.createContext<ConfirmContext | null>(null);
|
||||
|
||||
export function ConfirmDialogProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [open, setOpen] = React.useState(false);
|
||||
|
||||
const [title, setTitle] = React.useState<string | undefined>(undefined);
|
||||
const [message, setMessage] = React.useState("");
|
||||
const [confirmButton, setConfirmButton] = React.useState<string | undefined>(
|
||||
undefined,
|
||||
undefined
|
||||
);
|
||||
|
||||
const cb = React.useRef<null | ((a: boolean) => void)>(null);
|
||||
@@ -78,7 +78,6 @@ export function ConfirmDialogProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useConfirm(): ConfirmContext {
|
||||
return React.useContext(ConfirmContextK)!;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ const darkTheme = createTheme(
|
||||
mode: "dark",
|
||||
},
|
||||
},
|
||||
dataGridFr,
|
||||
dataGridFr
|
||||
);
|
||||
|
||||
const lightTheme = createTheme(
|
||||
@@ -20,7 +20,7 @@ const lightTheme = createTheme(
|
||||
mode: "light",
|
||||
},
|
||||
},
|
||||
dataGridFr,
|
||||
dataGridFr
|
||||
);
|
||||
|
||||
interface DarkThemeContext {
|
||||
@@ -32,7 +32,7 @@ const DarkThemeContextK = React.createContext<DarkThemeContext | null>(null);
|
||||
|
||||
export function DarkThemeProvider(p: PropsWithChildren): React.ReactElement {
|
||||
const [enabled, setEnabled] = React.useState(
|
||||
localStorage.getItem(localStorageKey) === "true",
|
||||
localStorage.getItem(localStorageKey) === "true"
|
||||
);
|
||||
|
||||
return (
|
||||
@@ -52,7 +52,6 @@ export function DarkThemeProvider(p: PropsWithChildren): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useDarkTheme(): DarkThemeContext {
|
||||
return React.useContext(DarkThemeContextK)!;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ const LoadingMessageContextK =
|
||||
React.createContext<LoadingMessageContext | null>(null);
|
||||
|
||||
export function LoadingMessageProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [open, setOpen] = React.useState(false);
|
||||
|
||||
@@ -59,7 +59,6 @@ export function LoadingMessageProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useLoadingMessage(): LoadingMessageContext {
|
||||
return React.useContext(LoadingMessageContextK)!;
|
||||
}
|
||||
|
||||
@@ -38,7 +38,6 @@ export function SnackbarProvider(p: PropsWithChildren): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useSnackbar(): SnackbarContext {
|
||||
return React.useContext(SnackbarContextK)!;
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@ type DialogContext = () => Promise<NewCalendarURL | undefined>;
|
||||
const DialogContextK = React.createContext<DialogContext | null>(null);
|
||||
|
||||
export function CreateAccommodationCalendarURLDialogProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [open, setOpen] = React.useState(false);
|
||||
|
||||
const cb = React.useRef<null | ((a: NewCalendarURL | undefined) => void)>(
|
||||
null,
|
||||
null
|
||||
);
|
||||
|
||||
const handleClose = (res?: NewCalendarURL) => {
|
||||
@@ -47,7 +47,6 @@ export function CreateAccommodationCalendarURLDialogProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useCreateAccommodationCalendarURL(): DialogContext {
|
||||
return React.useContext(DialogContextK)!;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ type DialogContext = (cal: AccommodationCalendarURL) => Promise<void>;
|
||||
const DialogContextK = React.createContext<DialogContext | null>(null);
|
||||
|
||||
export function InstallCalendarDialogProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [cal, setCal] = React.useState<AccommodationCalendarURL | undefined>();
|
||||
|
||||
@@ -39,7 +39,6 @@ export function InstallCalendarDialogProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useInstallCalendarDialog(): DialogContext {
|
||||
return React.useContext(DialogContextK)!;
|
||||
}
|
||||
|
||||
@@ -4,13 +4,13 @@ import { UpdateAccommodationDialog } from "../../../dialogs/accommodations/Updat
|
||||
|
||||
type DialogContext = (
|
||||
accommodation: UpdateAccommodation,
|
||||
create: boolean,
|
||||
create: boolean
|
||||
) => Promise<UpdateAccommodation | undefined>;
|
||||
|
||||
const DialogContextK = React.createContext<DialogContext | null>(null);
|
||||
|
||||
export function UpdateAccommodationDialogProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [open, setOpen] = React.useState(false);
|
||||
|
||||
@@ -59,7 +59,6 @@ export function UpdateAccommodationDialogProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useUpdateAccommodation(): DialogContext {
|
||||
return React.useContext(DialogContextK)!;
|
||||
}
|
||||
|
||||
@@ -4,13 +4,13 @@ import { UpdateReservationDialog } from "../../../dialogs/accommodations/UpdateR
|
||||
|
||||
type DialogContext = (
|
||||
reservation: UpdateAccommodationReservation,
|
||||
create: boolean,
|
||||
create: boolean
|
||||
) => Promise<UpdateAccommodationReservation | undefined>;
|
||||
|
||||
const DialogContextK = React.createContext<DialogContext | null>(null);
|
||||
|
||||
export function UpdateReservationDialogProvider(
|
||||
p: PropsWithChildren,
|
||||
p: PropsWithChildren
|
||||
): React.ReactElement {
|
||||
const [open, setOpen] = React.useState(false);
|
||||
|
||||
@@ -59,7 +59,6 @@ export function UpdateReservationDialogProvider(
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useUpdateAccommodationReservation(): DialogContext {
|
||||
return React.useContext(DialogContextK)!;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import ReactDOM from "react-dom/client";
|
||||
import { App } from "./App";
|
||||
import { ServerApi } from "./api/ServerApi";
|
||||
import "./index.css";
|
||||
import reportWebVitals from "./reportWebVitals";
|
||||
|
||||
// Roboto font
|
||||
import "@fontsource/roboto/300.css";
|
||||
@@ -60,3 +61,8 @@ async function init() {
|
||||
}
|
||||
|
||||
init();
|
||||
|
||||
// If you want to start measuring performance in your app, pass a function
|
||||
// to log results (for example: reportWebVitals(console.log))
|
||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
||||
reportWebVitals();
|
||||
|
||||
15
geneit_app/src/reportWebVitals.ts
Normal file
15
geneit_app/src/reportWebVitals.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import { ReportHandler } from 'web-vitals';
|
||||
|
||||
const reportWebVitals = (onPerfEntry?: ReportHandler) => {
|
||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
||||
getCLS(onPerfEntry);
|
||||
getFID(onPerfEntry);
|
||||
getFCP(onPerfEntry);
|
||||
getLCP(onPerfEntry);
|
||||
getTTFB(onPerfEntry);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
export default reportWebVitals;
|
||||
@@ -48,13 +48,12 @@ export function FamiliesListRoute(): React.ReactElement {
|
||||
return (
|
||||
<AsyncWidget
|
||||
ready={families !== null}
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`families-list-${loadKey.current}`}
|
||||
load={load}
|
||||
errMsg="Echec du chargement de la liste des familles"
|
||||
build={() => (
|
||||
<>
|
||||
{families!.length === 0 ? (
|
||||
{families!!.length === 0 ? (
|
||||
<NoFamilyWidget
|
||||
onRequestCreateFamily={onRequestCreateFamily}
|
||||
onRequestJoinFamily={onRequestJoinFamily}
|
||||
@@ -191,7 +190,7 @@ function FamilyCard(p: {
|
||||
if (
|
||||
!p.f.CanLeave ||
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment quitter la famille " + p.f.name + " ?",
|
||||
"Voulez-vous vraiment quitter la famille " + p.f.name + " ?"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -201,7 +200,7 @@ function FamilyCard(p: {
|
||||
p.onFamilyLeft();
|
||||
|
||||
alert(
|
||||
`La famille ${p.f.name} a été retirée de votre liste de familles !`,
|
||||
`La famille ${p.f.name} a été retirée de votre liste de familles !`
|
||||
);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
||||
@@ -14,10 +14,10 @@ import React from "react";
|
||||
import { ServerApi } from "../api/ServerApi";
|
||||
import { ReplacePasswordResponse, User, UserApi } from "../api/UserApi";
|
||||
import { useAlert } from "../hooks/context_providers/AlertDialogProvider";
|
||||
import { useConfirm } from "../hooks/context_providers/ConfirmDialogProvider";
|
||||
import { formatDate } from "../utils/time_utils";
|
||||
import { useUser } from "../widgets/BaseAuthenticatedPage";
|
||||
import { useConfirm } from "../hooks/context_providers/ConfirmDialogProvider";
|
||||
import { PasswordInput } from "../widgets/PasswordInput";
|
||||
import { formatDate } from "../widgets/TimeWidget";
|
||||
|
||||
export function ProfileRoute(): React.ReactElement {
|
||||
const user = useUser();
|
||||
@@ -172,7 +172,7 @@ function ChangePasswordCard(): React.ReactElement {
|
||||
break;
|
||||
case ReplacePasswordResponse.TooManyRequests:
|
||||
setError(
|
||||
"Trop de tentatives de changement de mot de passe, veuillez réessayer ultérieurement !",
|
||||
"Trop de tentatives de changement de mot de passe, veuillez réessayer ultérieurement !"
|
||||
);
|
||||
break;
|
||||
}
|
||||
@@ -257,7 +257,7 @@ function DeleteAccountButton(): React.ReactElement {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous initier la suppression de votre compte ?",
|
||||
"Suppression de compte",
|
||||
"Suppression de compte"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -265,7 +265,7 @@ function DeleteAccountButton(): React.ReactElement {
|
||||
await UserApi.RequestAccountDeletion();
|
||||
|
||||
await alert(
|
||||
"Demande de suppression de compte enregistrée avec succès. Veuillez consulter votre boîte mail.",
|
||||
"Demande de suppression de compte enregistrée avec succès. Veuillez consulter votre boîte mail."
|
||||
);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import VisibilityIcon from "@mui/icons-material/Visibility";
|
||||
import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
|
||||
import { Visibility, VisibilityOff } from "@mui/icons-material";
|
||||
import {
|
||||
Alert,
|
||||
CircularProgress,
|
||||
@@ -40,7 +39,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
const handleClickShowPassword = () => setShowPassword((show) => !show);
|
||||
|
||||
const handleMouseDownPassword = (
|
||||
event: React.MouseEvent<HTMLButtonElement>,
|
||||
event: React.MouseEvent<HTMLButtonElement>
|
||||
) => {
|
||||
event.preventDefault();
|
||||
};
|
||||
@@ -55,7 +54,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
switch (res) {
|
||||
case PasswordLoginResult.TooManyRequests:
|
||||
setError(
|
||||
"Trop de tentatives de connection. Veuillez réessayer ultérieurement.",
|
||||
"Trop de tentatives de connection. Veuillez réessayer ultérieurement."
|
||||
);
|
||||
break;
|
||||
|
||||
@@ -84,7 +83,6 @@ export function LoginRoute(): React.ReactElement {
|
||||
setLoading(true);
|
||||
|
||||
const res = await AuthApi.StartOpenIDLogin(id);
|
||||
// eslint-disable-next-line react-hooks/immutability
|
||||
window.location.href = res.url;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
@@ -150,7 +148,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
onMouseDown={handleMouseDownPassword}
|
||||
edge="end"
|
||||
>
|
||||
{showPassword ? <VisibilityOffIcon /> : <VisibilityIcon />}
|
||||
{showPassword ? <VisibilityOff /> : <Visibility />}
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
</InputAdornment>
|
||||
@@ -169,7 +167,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
</Button>
|
||||
|
||||
<Grid container>
|
||||
<Grid size={"grow"}>
|
||||
<Grid item xs>
|
||||
<Typography variant="body2" color={"primary"}>
|
||||
<Link
|
||||
to="/password_forgotten"
|
||||
@@ -179,7 +177,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
</Link>
|
||||
</Typography>
|
||||
</Grid>
|
||||
<Grid>
|
||||
<Grid item>
|
||||
<Typography variant="body2" color={"primary"}>
|
||||
<Link
|
||||
to="/new-account"
|
||||
|
||||
@@ -14,9 +14,9 @@ import { FamilyApi } from "../../api/FamilyApi";
|
||||
import { ServerApi } from "../../api/ServerApi";
|
||||
import { useAlert } from "../../hooks/context_providers/AlertDialogProvider";
|
||||
import { useConfirm } from "../../hooks/context_providers/ConfirmDialogProvider";
|
||||
import { formatDate } from "../../utils/time_utils";
|
||||
import { useFamily } from "../../widgets/BaseFamilyRoute";
|
||||
import { FamilyCard } from "../../widgets/FamilyCard";
|
||||
import { formatDate } from "../../widgets/TimeWidget";
|
||||
|
||||
export function FamilySettingsRoute(): React.ReactElement {
|
||||
const alert = useAlert();
|
||||
@@ -29,7 +29,7 @@ export function FamilySettingsRoute(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment supprimer cette famille, et toute les données qui s'y rattachent ? Cette opération est absolument irréversible !",
|
||||
"Voulez-vous vraiment supprimer cette famille, et toute les données qui s'y rattachent ? Cette opération est absolument irréversible !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -69,10 +69,10 @@ function FamilySettingsCard(): React.ReactElement {
|
||||
|
||||
const [newName, setNewName] = React.useState(family.family.name);
|
||||
const [enableGenealogy, setEnableGenealogy] = React.useState(
|
||||
family.family.enable_genealogy,
|
||||
family.family.enable_genealogy
|
||||
);
|
||||
const [enableAccommodations, setEnableAccommodations] = React.useState(
|
||||
family.family.enable_accommodations,
|
||||
family.family.enable_accommodations
|
||||
);
|
||||
|
||||
const canEdit = family.family.is_admin;
|
||||
|
||||
@@ -38,7 +38,6 @@ export function FamilyUsersListRoute(): React.ReactElement {
|
||||
|
||||
return (
|
||||
<AsyncWidget
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${family.family.family_id}-${key.current}`}
|
||||
errMsg="Echec du chargement de la liste des utilisateurs de la famille !"
|
||||
load={load}
|
||||
@@ -63,7 +62,7 @@ function UsersTable(p: {
|
||||
const family = useFamily();
|
||||
|
||||
const [rowModesModel, setRowModesModel] = React.useState<GridRowModesModel>(
|
||||
{},
|
||||
{}
|
||||
);
|
||||
|
||||
const handleEditClick = (id: GridRowId) => () => {
|
||||
@@ -80,7 +79,7 @@ function UsersTable(p: {
|
||||
const user = p.users.find((u) => u.user_id === id)!;
|
||||
if (
|
||||
!(await confirm(
|
||||
`Voulez-vous vraiment retirer ${user.user_name} de cette famille ?`,
|
||||
`Voulez-vous vraiment retirer ${user.user_name} de cette famille ?`
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -138,10 +137,8 @@ function UsersTable(p: {
|
||||
<GridActionsCellItem
|
||||
icon={<SaveIcon />}
|
||||
label="Save"
|
||||
material={{
|
||||
sx: {
|
||||
color: "primary.main",
|
||||
},
|
||||
sx={{
|
||||
color: "primary.main",
|
||||
}}
|
||||
onClick={handleSaveClick(id)}
|
||||
/>,
|
||||
|
||||
@@ -74,7 +74,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
const [showPending, setShowPending] = React.useState(true);
|
||||
|
||||
const [hiddenPeople, setHiddenPeople] = React.useState<Set<number>>(
|
||||
new Set(),
|
||||
new Set()
|
||||
);
|
||||
const [hiddenAccommodations, setHiddenAccommodations] = React.useState<
|
||||
Set<number>
|
||||
@@ -100,7 +100,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
|
||||
const load = async () => {
|
||||
setReservations(
|
||||
await AccommodationsReservationsApi.FullListOfFamily(family.family),
|
||||
await AccommodationsReservationsApi.FullListOfFamily(family.family)
|
||||
);
|
||||
setUsers(await FamilyApi.GetUsersList(family.family.family_id));
|
||||
};
|
||||
@@ -136,7 +136,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
start: Math.floor(d.start.getTime() / 1000),
|
||||
end: Math.floor(d.end.getTime() / 1000),
|
||||
},
|
||||
true,
|
||||
true
|
||||
);
|
||||
|
||||
if (!resa) return;
|
||||
@@ -157,7 +157,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
|
||||
const onEventClick = (ev: EventClickArg) => {
|
||||
const id: number = ev.event.extendedProps.id;
|
||||
const resa = reservations!.get(id)!;
|
||||
const resa = reservations?.get(id)!;
|
||||
const acc = accommodations.accommodations.get(resa.accommodation_id)!;
|
||||
|
||||
const user = users?.find((u) => u.user_id === resa.user_id);
|
||||
@@ -182,7 +182,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
|
||||
const respondToResaRequest = async (
|
||||
r: AccommodationReservation,
|
||||
validate: boolean,
|
||||
validate: boolean
|
||||
) => {
|
||||
try {
|
||||
loadingMessage.show("Validation de la réservation en cours...");
|
||||
@@ -194,7 +194,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
|
||||
if (res === ValidateResaResult.Conflict) {
|
||||
throw new Error(
|
||||
"The reservation is in conflict with other reservations!",
|
||||
"The reservation is in conflict with other reservations!"
|
||||
);
|
||||
} else if (res === ValidateResaResult.Error) {
|
||||
throw new Error("Failed to validate the reservation!");
|
||||
@@ -217,7 +217,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
const rejectReservation = async (r: AccommodationReservation) => {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment rejeter cette demande de réservation ?",
|
||||
"Voulez-vous vraiment rejeter cette demande de réservation ?"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -230,7 +230,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
if (
|
||||
ac?.need_validation &&
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment changer cette réservation ? Celle-ci devra être de nouveau validée !",
|
||||
"Voulez-vous vraiment changer cette réservation ? Celle-ci devra être de nouveau validée !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -242,7 +242,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
start: r.reservation_start,
|
||||
end: r.reservation_end,
|
||||
},
|
||||
false,
|
||||
false
|
||||
);
|
||||
|
||||
if (!newResa) return;
|
||||
@@ -266,7 +266,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment supprimer cette réservation ? L'opération n'est pas réversible !",
|
||||
"Voulez-vous vraiment supprimer cette réservation ? L'opération n'est pas réversible !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -290,7 +290,6 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
<>
|
||||
<FamilyPageTitle title="Réservations" />
|
||||
<AsyncWidget
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={loadKey.current}
|
||||
load={load}
|
||||
errMsg="Echec du chargement de la liste des réservations !"
|
||||
@@ -366,7 +365,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
if (v) hiddenAccommodations.delete(a.id);
|
||||
else hiddenAccommodations.add(a.id);
|
||||
setHiddenAccommodations(
|
||||
new Set(hiddenAccommodations),
|
||||
new Set(hiddenAccommodations)
|
||||
);
|
||||
}}
|
||||
/>
|
||||
@@ -423,7 +422,7 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
eventClick={onEventClick}
|
||||
events={visibleReservations?.map((r) => {
|
||||
const a = accommodations.accommodations.get(
|
||||
r.accommodation_id,
|
||||
r.accommodation_id
|
||||
)!;
|
||||
const u = users?.find((u) => u.user_id === r.user_id);
|
||||
return {
|
||||
@@ -436,8 +435,8 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
r.validated === true
|
||||
? "green"
|
||||
: r.validated === false
|
||||
? "red"
|
||||
: "grey ",
|
||||
? "red"
|
||||
: "grey ",
|
||||
extendedProps: {
|
||||
id: r.id,
|
||||
},
|
||||
@@ -494,12 +493,12 @@ export function AccommodationsReservationsRoute(): React.ReactElement {
|
||||
<p>
|
||||
Du{" "}
|
||||
{fmtUnixDate(
|
||||
activeEvent?.reservation.reservation_start ?? 0,
|
||||
activeEvent?.reservation.reservation_start ?? 0
|
||||
)}{" "}
|
||||
<br />
|
||||
Au{" "}
|
||||
{fmtUnixDate(
|
||||
activeEvent?.reservation.reservation_end ?? 0,
|
||||
activeEvent?.reservation.reservation_end ?? 0
|
||||
)}
|
||||
</p>
|
||||
<p>
|
||||
|
||||
@@ -66,7 +66,7 @@ function AccommodationsListCard(): React.ReactElement {
|
||||
need_validation: false,
|
||||
color: "2196f3",
|
||||
},
|
||||
true,
|
||||
true
|
||||
);
|
||||
|
||||
if (!accommodation) return;
|
||||
@@ -112,7 +112,7 @@ function AccommodationsListCard(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
`Voulez-vous vraiment supprimer le logement '${a.name}' ? Cette opération est définitive !`,
|
||||
`Voulez-vous vraiment supprimer le logement '${a.name}' ? Cette opération est définitive !`
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -258,7 +258,7 @@ function AccommodationsCalURLsCard(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
`Voulez-vous vraiment supprimer le calendrier '${c.name}' ? Cette opération est définitive !`,
|
||||
`Voulez-vous vraiment supprimer le calendrier '${c.name}' ? Cette opération est définitive !`
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -287,7 +287,7 @@ function AccommodationsCalURLsCard(): React.ReactElement {
|
||||
|
||||
const cal = await AccommodationsCalendarURLApi.Create(
|
||||
family.family,
|
||||
newCal,
|
||||
newCal
|
||||
);
|
||||
|
||||
setSuccess("Le calendrier a été créé avec succès !");
|
||||
@@ -337,7 +337,6 @@ function AccommodationsCalURLsCard(): React.ReactElement {
|
||||
|
||||
<AsyncWidget
|
||||
ready={list !== undefined}
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={key.current}
|
||||
load={load}
|
||||
errMsg="Echec du chargement de la liste des calendriers !"
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/* eslint-disable react-hooks/immutability */
|
||||
import ClearIcon from "@mui/icons-material/Clear";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
import EditIcon from "@mui/icons-material/Edit";
|
||||
import FileDownloadIcon from "@mui/icons-material/FileDownload";
|
||||
import SaveIcon from "@mui/icons-material/Save";
|
||||
import { Button, Stack } from "@mui/material";
|
||||
import Grid from "@mui/material/Grid";
|
||||
import { Button, Grid, Stack } from "@mui/material";
|
||||
import React from "react";
|
||||
import { useNavigate, useParams } from "react-router-dom";
|
||||
import { ServerApi } from "../../../api/ServerApi";
|
||||
@@ -112,7 +110,7 @@ export function FamilyCoupleRoute(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment supprimer cette fiche de couple ? L'opération n'est pas réversible !",
|
||||
"Voulez-vous vraiment supprimer cette fiche de couple ? L'opération n'est pas réversible !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -131,7 +129,6 @@ export function FamilyCoupleRoute(): React.ReactElement {
|
||||
|
||||
return (
|
||||
<AsyncWidget
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${coupleId}-${count.current}`}
|
||||
load={load}
|
||||
ready={couple !== undefined}
|
||||
@@ -232,7 +229,7 @@ export function CouplePage(p: {
|
||||
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
const [couple, setCouple] = React.useState(
|
||||
new Couple(structuredClone(p.couple)),
|
||||
new Couple(structuredClone(p.couple))
|
||||
);
|
||||
|
||||
const updatedCouple = () => {
|
||||
@@ -242,7 +239,7 @@ export function CouplePage(p: {
|
||||
|
||||
const save = async () => {
|
||||
loadingMessage.show(
|
||||
"Enregistrement des informations du couple en cours...",
|
||||
"Enregistrement des informations du couple en cours..."
|
||||
);
|
||||
await p.onSave!(couple);
|
||||
loadingMessage.hide();
|
||||
@@ -252,7 +249,7 @@ export function CouplePage(p: {
|
||||
if (
|
||||
changed &&
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !",
|
||||
"Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -355,7 +352,7 @@ export function CouplePage(p: {
|
||||
|
||||
<Grid container spacing={2}>
|
||||
{/* General info */}
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Informations générales">
|
||||
{/* Husband */}
|
||||
<br />
|
||||
@@ -430,7 +427,7 @@ export function CouplePage(p: {
|
||||
|
||||
{
|
||||
/* Photo */ !family.family.disable_couple_photos && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Photo">
|
||||
<div style={{ textAlign: "center" }}>
|
||||
<CouplePhoto couple={couple} width={150} />
|
||||
@@ -477,7 +474,7 @@ export function CouplePage(p: {
|
||||
|
||||
{/* Children */}
|
||||
{p.children && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Enfants">
|
||||
{p.children.length === 0 ? (
|
||||
<>Aucun enfant</>
|
||||
@@ -493,7 +490,7 @@ export function CouplePage(p: {
|
||||
<div style={{ display: "flex", justifyContent: "end" }}>
|
||||
<RouterLink
|
||||
to={family.family.URL(
|
||||
`genealogy/member/create?mother=${couple.wife}&father=${couple.husband}`,
|
||||
`genealogy/member/create?mother=${couple.wife}&father=${couple.husband}`
|
||||
)}
|
||||
>
|
||||
<Button>Nouveau</Button>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useFamily } from "../../../widgets/BaseFamilyRoute";
|
||||
import { FamilyPageTitle } from "../../../widgets/FamilyPageTitle";
|
||||
|
||||
export function FamilyHomeRoute(): React.ReactElement {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/* eslint-disable react-hooks/immutability */
|
||||
import { mdiFamilyTree } from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import ClearIcon from "@mui/icons-material/Clear";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
import EditIcon from "@mui/icons-material/Edit";
|
||||
@@ -8,12 +7,12 @@ import FileDownloadIcon from "@mui/icons-material/FileDownload";
|
||||
import SaveIcon from "@mui/icons-material/Save";
|
||||
import {
|
||||
Button,
|
||||
Grid,
|
||||
ListItemAvatar,
|
||||
ListItemButton,
|
||||
ListItemText,
|
||||
Stack,
|
||||
} from "@mui/material";
|
||||
import Grid from "@mui/material/Grid";
|
||||
import * as EmailValidator from "email-validator";
|
||||
import React from "react";
|
||||
import { useNavigate, useParams } from "react-router-dom";
|
||||
@@ -126,7 +125,7 @@ export function FamilyMemberRoute(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment supprimer cette fiche membre ? L'opération n'est pas réversible !",
|
||||
"Voulez-vous vraiment supprimer cette fiche membre ? L'opération n'est pas réversible !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -145,7 +144,6 @@ export function FamilyMemberRoute(): React.ReactElement {
|
||||
|
||||
return (
|
||||
<AsyncWidget
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${memberId}-${count.current}`}
|
||||
load={load}
|
||||
ready={member !== undefined}
|
||||
@@ -252,7 +250,7 @@ export function MemberPage(p: {
|
||||
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
const [member, setMember] = React.useState(
|
||||
new Member(structuredClone(p.member)),
|
||||
new Member(structuredClone(p.member))
|
||||
);
|
||||
|
||||
const updatedMember = () => {
|
||||
@@ -262,7 +260,7 @@ export function MemberPage(p: {
|
||||
|
||||
const save = async () => {
|
||||
loadingMessage.show(
|
||||
"Enregistrement des informations du membre en cours...",
|
||||
"Enregistrement des informations du membre en cours..."
|
||||
);
|
||||
await p.onSave!(member);
|
||||
loadingMessage.hide();
|
||||
@@ -272,7 +270,7 @@ export function MemberPage(p: {
|
||||
if (
|
||||
changed &&
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !",
|
||||
"Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -386,7 +384,7 @@ export function MemberPage(p: {
|
||||
|
||||
<Grid container spacing={2}>
|
||||
{/* General info */}
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Informations générales">
|
||||
{/* Sex */}
|
||||
<SexSelection
|
||||
@@ -506,7 +504,7 @@ export function MemberPage(p: {
|
||||
</Grid>
|
||||
|
||||
{/* Photo */}
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Photo">
|
||||
<div style={{ textAlign: "center" }}>
|
||||
<MemberPhoto member={member} width={150} />
|
||||
@@ -551,7 +549,7 @@ export function MemberPage(p: {
|
||||
|
||||
{/* Contact */}
|
||||
{(p.editing || member.hasContactInfo) && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Contact">
|
||||
{/* Email */}
|
||||
<PropEdit
|
||||
@@ -632,7 +630,7 @@ export function MemberPage(p: {
|
||||
|
||||
{/* Bio */}
|
||||
{(p.editing || member.hasNote) && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Biographie">
|
||||
<PropEdit
|
||||
label="Biographie"
|
||||
@@ -653,7 +651,7 @@ export function MemberPage(p: {
|
||||
|
||||
{/* Couples */}
|
||||
{p.couples && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title={member.sex === "F" ? "Époux" : "Épouse"}>
|
||||
{p.couples!.length === 0 ? (
|
||||
<>{member.sex === "F" ? "Aucun époux" : "Aucune épouse"}</>
|
||||
@@ -668,7 +666,7 @@ export function MemberPage(p: {
|
||||
to={family.family.URL(
|
||||
`genealogy/couple/create?${
|
||||
member.sex === "F" ? "wife" : "husband"
|
||||
}=${member.id}`,
|
||||
}=${member.id}`
|
||||
)}
|
||||
>
|
||||
<Button>Nouveau</Button>
|
||||
@@ -680,7 +678,7 @@ export function MemberPage(p: {
|
||||
|
||||
{/* Children */}
|
||||
{p.children && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Enfants">
|
||||
{p.children.length === 0 ? (
|
||||
<>Aucun enfant</>
|
||||
@@ -697,7 +695,7 @@ export function MemberPage(p: {
|
||||
to={family.family.URL(
|
||||
`genealogy/member/create?${
|
||||
member.sex === "F" ? "mother" : "father"
|
||||
}=${member.id}`,
|
||||
}=${member.id}`
|
||||
)}
|
||||
>
|
||||
<Button>Nouveau</Button>
|
||||
@@ -709,7 +707,7 @@ export function MemberPage(p: {
|
||||
|
||||
{/* Siblings */}
|
||||
{p.siblings && (
|
||||
<Grid size={{ sm: 12, md: 6 }}>
|
||||
<Grid item sm={12} md={6}>
|
||||
<PropertiesBox title="Frères et sœurs">
|
||||
{p.siblings.length === 0 ? (
|
||||
<>Aucun frère ou sœur</>
|
||||
@@ -725,7 +723,7 @@ export function MemberPage(p: {
|
||||
<div style={{ display: "flex", justifyContent: "end" }}>
|
||||
<RouterLink
|
||||
to={family.family.URL(
|
||||
`genealogy/member/create?mother=${member.mother}&father=${member.father}`,
|
||||
`genealogy/member/create?mother=${member.mother}&father=${member.father}`
|
||||
)}
|
||||
>
|
||||
<Button>Nouveau</Button>
|
||||
@@ -750,7 +748,7 @@ function CoupleItem(p: {
|
||||
const genealogy = useGenealogy();
|
||||
|
||||
const statusStr = ServerApi.Config.couples_states.find(
|
||||
(c) => c.code === p.couple.state,
|
||||
(c) => c.code === p.couple.state
|
||||
)?.fr;
|
||||
|
||||
const status = [];
|
||||
|
||||
5
geneit_app/src/setupTests.ts
Normal file
5
geneit_app/src/setupTests.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
||||
// allows you to do things like:
|
||||
// expect(element).toHaveTextContent(/react/i)
|
||||
// learn more: https://github.com/testing-library/jest-dom
|
||||
import '@testing-library/jest-dom';
|
||||
@@ -20,7 +20,7 @@ export function getRadianAngle(degreeValue: number): number {
|
||||
export function rotateSize(
|
||||
width: number,
|
||||
height: number,
|
||||
rotation: number,
|
||||
rotation: number
|
||||
): { width: number; height: number } {
|
||||
const rotRad = getRadianAngle(rotation);
|
||||
|
||||
@@ -39,7 +39,7 @@ export default async function getCroppedImg(
|
||||
imageSrc: string,
|
||||
pixelCrop: Area,
|
||||
rotation = 0,
|
||||
flip = { horizontal: false, vertical: false },
|
||||
flip = { horizontal: false, vertical: false }
|
||||
): Promise<Blob> {
|
||||
const image = await createImage(imageSrc);
|
||||
const canvas = document.createElement("canvas");
|
||||
@@ -55,7 +55,7 @@ export default async function getCroppedImg(
|
||||
const { width: bBoxWidth, height: bBoxHeight } = rotateSize(
|
||||
image.width,
|
||||
image.height,
|
||||
rotation,
|
||||
rotation
|
||||
);
|
||||
|
||||
// set canvas size to match the bounding box
|
||||
@@ -93,14 +93,14 @@ export default async function getCroppedImg(
|
||||
0,
|
||||
0,
|
||||
pixelCrop.width,
|
||||
pixelCrop.height,
|
||||
pixelCrop.height
|
||||
);
|
||||
|
||||
// As Base64 string
|
||||
// return croppedCanvas.toDataURL('image/jpeg');
|
||||
|
||||
// As a blob
|
||||
return await new Promise((resolve) => {
|
||||
return await new Promise((resolve, _reject) => {
|
||||
croppedCanvas.toBlob((file) => {
|
||||
resolve(file!);
|
||||
}, "image/jpeg");
|
||||
|
||||
@@ -14,8 +14,8 @@ export async function selectFileToUpload(p: {
|
||||
fileEl.click();
|
||||
|
||||
// Wait for a file to be chosen
|
||||
await new Promise((res) =>
|
||||
fileEl.addEventListener("change", () => res(null)),
|
||||
await new Promise((res, _rej) =>
|
||||
fileEl.addEventListener("change", () => res(null))
|
||||
);
|
||||
|
||||
if ((fileEl.files?.length ?? 0) === 0) return null;
|
||||
@@ -25,8 +25,8 @@ export async function selectFileToUpload(p: {
|
||||
if (p.maxSize && file.size > p.maxSize) {
|
||||
throw new Error(
|
||||
`Le fichier sélectionné est trop lourd ! (taille maximale acceptée : ${filesize(
|
||||
p.maxSize,
|
||||
)})`,
|
||||
p.maxSize
|
||||
)})`
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
const canvas: HTMLCanvasElement = document.createElement("canvas");
|
||||
const charLen: Map<string, Map<string, number>> = new Map();
|
||||
let canvas: HTMLCanvasElement = document.createElement("canvas");
|
||||
let charLen: Map<string, Map<string, number>> = new Map();
|
||||
|
||||
/**
|
||||
* Uses canvas.measureText to compute and return the width of the given text of given font in pixels.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export function getAllIndexes(s: string, val: string): number[] {
|
||||
const indexes = [];
|
||||
let i = -1;
|
||||
export function getAllIndexes(s: string, val: string) {
|
||||
var indexes = [],
|
||||
i = -1;
|
||||
while ((i = s.indexOf(val, i + 1)) !== -1) {
|
||||
indexes.push(i);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import { format } from "date-and-time";
|
||||
|
||||
/**
|
||||
* Get formatted UNIX date
|
||||
*/
|
||||
@@ -12,7 +10,7 @@ export function fmtUnixDate(time: number): string {
|
||||
*/
|
||||
export function fmtUnixDateFullCalendar(
|
||||
time: number,
|
||||
correctEnd: boolean,
|
||||
correctEnd: boolean
|
||||
): string {
|
||||
let d = new Date(time * 1000);
|
||||
|
||||
@@ -31,65 +29,3 @@ export function fmtUnixDateFullCalendar(
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a date into a human-readable form
|
||||
*/
|
||||
export function formatDate(time: number): string {
|
||||
const t = new Date();
|
||||
t.setTime(1000 * time);
|
||||
return format(t, "DD/MM/YYYY HH:mm:ss");
|
||||
}
|
||||
|
||||
/**
|
||||
* Get human readable time between to dates
|
||||
*/
|
||||
export function timeDiff(a: number, b: number): string {
|
||||
let diff = b - a;
|
||||
|
||||
if (diff === 0) return "maintenant";
|
||||
if (diff === 1) return "1 seconde";
|
||||
|
||||
if (diff < 60) {
|
||||
return `${diff} secondes`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diff / 60);
|
||||
|
||||
if (diff === 1) return "1 minute";
|
||||
if (diff < 24) {
|
||||
return `${diff} minutes`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diff / 60);
|
||||
|
||||
if (diff === 1) return "1 heure";
|
||||
if (diff < 24) {
|
||||
return `${diff} heures`;
|
||||
}
|
||||
|
||||
const diffDays = Math.floor(diff / 24);
|
||||
|
||||
if (diffDays === 1) return "1 jour";
|
||||
if (diffDays < 31) {
|
||||
return `${diffDays} jours`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diffDays / 31);
|
||||
|
||||
if (diff < 12) {
|
||||
return `${diff} mois`;
|
||||
}
|
||||
|
||||
const diffYears = Math.floor(diffDays / 365);
|
||||
|
||||
if (diffYears === 1) return "1 an";
|
||||
return `${diffYears} ans`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get human readable time diff from a given timestamp to today
|
||||
*/
|
||||
export function timeDiffFromNow(time: number): string {
|
||||
return timeDiff(time, Math.floor(new Date().getTime() / 1000));
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
import { Alert, Box, Button, CircularProgress } from "@mui/material";
|
||||
import React from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
|
||||
const State = {
|
||||
Loading: 0,
|
||||
Ready: 1,
|
||||
Error: 2,
|
||||
} as const;
|
||||
|
||||
type State = keyof typeof State;
|
||||
enum State {
|
||||
Loading,
|
||||
Ready,
|
||||
Error,
|
||||
}
|
||||
|
||||
export function AsyncWidget(p: {
|
||||
loadKey: unknown;
|
||||
loadKey: any;
|
||||
load: () => Promise<void>;
|
||||
errMsg: string;
|
||||
build: () => React.ReactElement;
|
||||
ready?: boolean;
|
||||
errAdditionalElement?: () => React.ReactElement;
|
||||
}): React.ReactElement {
|
||||
const [state, setState] = React.useState<number>(State.Loading);
|
||||
const [state, setState] = useState(State.Loading);
|
||||
|
||||
const counter = useRef<any | null>(null);
|
||||
|
||||
const load = async () => {
|
||||
try {
|
||||
@@ -30,11 +30,12 @@ export function AsyncWidget(p: {
|
||||
}
|
||||
};
|
||||
|
||||
React.useEffect(() => {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
useEffect(() => {
|
||||
if (counter.current === p.loadKey) return;
|
||||
counter.current = p.loadKey;
|
||||
|
||||
load();
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [p.loadKey]);
|
||||
});
|
||||
|
||||
if (state === State.Error)
|
||||
return (
|
||||
@@ -47,6 +48,10 @@ export function AsyncWidget(p: {
|
||||
height: "100%",
|
||||
flex: "1",
|
||||
flexDirection: "column",
|
||||
backgroundColor: (theme) =>
|
||||
theme.palette.mode === "light"
|
||||
? theme.palette.grey[100]
|
||||
: theme.palette.grey[900],
|
||||
}}
|
||||
>
|
||||
<Alert
|
||||
@@ -59,7 +64,7 @@ export function AsyncWidget(p: {
|
||||
|
||||
<Button onClick={load}>Réessayer</Button>
|
||||
|
||||
{p.errAdditionalElement?.()}
|
||||
{p.errAdditionalElement && p.errAdditionalElement()}
|
||||
</Box>
|
||||
);
|
||||
|
||||
@@ -73,6 +78,10 @@ export function AsyncWidget(p: {
|
||||
alignItems: "center",
|
||||
height: "100%",
|
||||
flex: "1",
|
||||
backgroundColor: (theme) =>
|
||||
theme.palette.mode === "light"
|
||||
? theme.palette.grey[100]
|
||||
: theme.palette.grey[900],
|
||||
}}
|
||||
>
|
||||
<CircularProgress />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { mdiFamilyTree } from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import SettingsIcon from "@mui/icons-material/Settings";
|
||||
import { Box, Button } from "@mui/material";
|
||||
import AppBar from "@mui/material/AppBar";
|
||||
@@ -43,13 +43,9 @@ export function BaseAuthenticatedPage(): React.ReactElement {
|
||||
setAnchorEl(null);
|
||||
};
|
||||
|
||||
const signOut = async () => {
|
||||
const signOut = () => {
|
||||
handleCloseMenu();
|
||||
try {
|
||||
await AuthApi.SignOut();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
AuthApi.SignOut();
|
||||
navigate("/");
|
||||
auth.setSignedIn(false);
|
||||
};
|
||||
@@ -150,7 +146,6 @@ export function BaseAuthenticatedPage(): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useUser(): UserContext {
|
||||
return React.useContext(UserContextK)!;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
mdiPlus,
|
||||
mdiRefresh,
|
||||
} from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import CalendarMonthIcon from "@mui/icons-material/CalendarMonth";
|
||||
import HomeIcon from "@mui/icons-material/Home";
|
||||
import {
|
||||
@@ -54,7 +54,7 @@ export function BaseFamilyRoute(): React.ReactElement {
|
||||
|
||||
const loadKey = React.useRef(1);
|
||||
|
||||
const loadPromise = React.useRef<() => void>(null);
|
||||
const loadPromise = React.useRef<() => void>();
|
||||
|
||||
const load = async () => {
|
||||
const familyID = Number(familyId);
|
||||
@@ -65,7 +65,7 @@ export function BaseFamilyRoute(): React.ReactElement {
|
||||
loadKey.current += 1;
|
||||
setFamily(null);
|
||||
|
||||
return new Promise<void>((res) => {
|
||||
return new Promise<void>((res, _rej) => {
|
||||
loadPromise.current = () => res();
|
||||
});
|
||||
};
|
||||
@@ -79,7 +79,7 @@ export function BaseFamilyRoute(): React.ReactElement {
|
||||
try {
|
||||
if (
|
||||
!(await confirm(
|
||||
"Voulez-vous vraiment générer un nouveau code d'invitation pour cette famille ? Cette action aura pour effet d'invalider l'ancien code !",
|
||||
"Voulez-vous vraiment générer un nouveau code d'invitation pour cette famille ? Cette action aura pour effet d'invalider l'ancien code !"
|
||||
))
|
||||
)
|
||||
return;
|
||||
@@ -98,14 +98,13 @@ export function BaseFamilyRoute(): React.ReactElement {
|
||||
return (
|
||||
<AsyncWidget
|
||||
ready={family !== null}
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${familyId}-${loadKey.current}`}
|
||||
load={load}
|
||||
errMsg="Échec du chargement des informations de la famille !"
|
||||
build={() => {
|
||||
if (loadPromise.current != null) {
|
||||
loadPromise.current?.();
|
||||
loadPromise.current = null;
|
||||
loadPromise.current = undefined;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -288,7 +287,6 @@ export function BaseFamilyRoute(): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useFamily(): FamilyContext {
|
||||
return React.useContext(FamilyContextK)!;
|
||||
}
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
import { mdiFamilyTree } from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import Avatar from "@mui/material/Avatar";
|
||||
import Box from "@mui/material/Box";
|
||||
import CssBaseline from "@mui/material/CssBaseline";
|
||||
import Grid from "@mui/material/Grid";
|
||||
import Paper from "@mui/material/Paper";
|
||||
import Typography from "@mui/material/Typography";
|
||||
import * as React from "react";
|
||||
import { Link, Outlet } from "react-router-dom";
|
||||
import { DarkThemeButton } from "./DarkThemeButton";
|
||||
|
||||
function Copyright(): React.ReactElement {
|
||||
function Copyright(props: any) {
|
||||
return (
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
align="center"
|
||||
style={{ marginTop: "20px" }}
|
||||
sx={{ mt: 5 }}
|
||||
{...props}
|
||||
>
|
||||
{"Copyright © "}
|
||||
<a
|
||||
@@ -27,8 +28,7 @@ function Copyright(): React.ReactElement {
|
||||
style={{ color: "inherit" }}
|
||||
>
|
||||
Pierre HUBERT
|
||||
</a>
|
||||
{" 2023-"}
|
||||
</a>{" "}
|
||||
{new Date().getFullYear()}
|
||||
{"."}
|
||||
</Typography>
|
||||
@@ -40,7 +40,10 @@ export function BaseLoginPage() {
|
||||
<Grid container component="main" sx={{ height: "100vh" }}>
|
||||
<CssBaseline />
|
||||
<Grid
|
||||
size={{ xs: false, sm: 4, md: 7 }}
|
||||
item
|
||||
xs={false}
|
||||
sm={4}
|
||||
md={7}
|
||||
sx={{
|
||||
backgroundImage: "url(/login_splash.jpg)",
|
||||
backgroundRepeat: "no-repeat",
|
||||
@@ -52,12 +55,7 @@ export function BaseLoginPage() {
|
||||
backgroundPosition: "center",
|
||||
}}
|
||||
/>
|
||||
<Grid
|
||||
size={{ xs: 12, sm: 8, md: 5 }}
|
||||
component={Paper}
|
||||
elevation={6}
|
||||
square
|
||||
>
|
||||
<Grid item xs={12} sm={8} md={5} component={Paper} elevation={6} square>
|
||||
<Box
|
||||
sx={{
|
||||
my: 8,
|
||||
@@ -90,7 +88,7 @@ export function BaseLoginPage() {
|
||||
{/* inner page */}
|
||||
<Outlet />
|
||||
|
||||
<Copyright />
|
||||
<Copyright sx={{ mt: 5 }} />
|
||||
</Box>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { mdiBabyCarriage, mdiCross } from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
|
||||
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
|
||||
import { TreeItem, SimpleTreeView } from "@mui/x-tree-view";
|
||||
|
||||
@@ -16,7 +16,7 @@ import { useBlocker } from "react-router-dom";
|
||||
export function ConfirmLeaveWithoutSaveDialog(p: {
|
||||
shouldBlock: boolean;
|
||||
}): React.ReactElement {
|
||||
const blocker = useBlocker(p.shouldBlock);
|
||||
let blocker = useBlocker(p.shouldBlock);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (blocker.state === "blocked" && !p.shouldBlock) {
|
||||
@@ -49,8 +49,8 @@ export function ConfirmLeaveWithoutSaveDialog(p: {
|
||||
</DialogContentText>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={confirmNavigation}>Quitter la page</Button>
|
||||
<Button onClick={cancelNavigation} autoFocus>
|
||||
<Button onClick={confirmNavigation as any}>Quitter la page</Button>
|
||||
<Button onClick={cancelNavigation as any} autoFocus>
|
||||
Rester sur la page
|
||||
</Button>
|
||||
</DialogActions>
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
} from "@mui/material";
|
||||
import { Member, fmtDate } from "../api/genealogy/MemberApi";
|
||||
import { MemberPhoto } from "./MemberPhoto";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import FemaleIcon from "@mui/icons-material/Female";
|
||||
import MaleIcon from "@mui/icons-material/Male";
|
||||
|
||||
@@ -37,7 +37,7 @@ export function MemberItem(p: {
|
||||
secondary={
|
||||
p.member?.dead
|
||||
? `${fmtDate(p.member?.dateOfBirth)} - ${fmtDate(
|
||||
p.member?.dateOfDeath,
|
||||
p.member?.dateOfDeath
|
||||
)}`
|
||||
: fmtDate(p.member?.dateOfBirth)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import VisibilityIcon from "@mui/icons-material/Visibility";
|
||||
import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
|
||||
import { Visibility, VisibilityOff } from "@mui/icons-material";
|
||||
import {
|
||||
FormControl,
|
||||
FormHelperText,
|
||||
@@ -51,7 +50,7 @@ export function PasswordInput(p: {
|
||||
onMouseDown={handleMouseDownPassword}
|
||||
edge="end"
|
||||
>
|
||||
{showPassword ? <VisibilityOffIcon /> : <VisibilityIcon />}
|
||||
{showPassword ? <VisibilityOff /> : <Visibility />}
|
||||
</IconButton>
|
||||
</InputAdornment>
|
||||
}
|
||||
|
||||
@@ -1,5 +1,58 @@
|
||||
import { Tooltip } from "@mui/material";
|
||||
import { formatDate, timeDiffFromNow } from "../utils/time_utils";
|
||||
import date from "date-and-time";
|
||||
|
||||
export function formatDate(time: number): string {
|
||||
const t = new Date();
|
||||
t.setTime(1000 * time);
|
||||
return date.format(t, "DD/MM/YYYY HH:mm:ss");
|
||||
}
|
||||
|
||||
export function timeDiff(a: number, b: number): string {
|
||||
let diff = b - a;
|
||||
|
||||
if (diff === 0) return "maintenant";
|
||||
if (diff === 1) return "1 seconde";
|
||||
|
||||
if (diff < 60) {
|
||||
return `${diff} secondes`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diff / 60);
|
||||
|
||||
if (diff === 1) return "1 minute";
|
||||
if (diff < 24) {
|
||||
return `${diff} minutes`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diff / 60);
|
||||
|
||||
if (diff === 1) return "1 heure";
|
||||
if (diff < 24) {
|
||||
return `${diff} heures`;
|
||||
}
|
||||
|
||||
const diffDays = Math.floor(diff / 24);
|
||||
|
||||
if (diffDays === 1) return "1 jour";
|
||||
if (diffDays < 31) {
|
||||
return `${diffDays} jours`;
|
||||
}
|
||||
|
||||
diff = Math.floor(diffDays / 31);
|
||||
|
||||
if (diff < 12) {
|
||||
return `${diff} mois`;
|
||||
}
|
||||
|
||||
const diffYears = Math.floor(diffDays / 365);
|
||||
|
||||
if (diffYears === 1) return "1 an";
|
||||
return `${diffYears} ans`;
|
||||
}
|
||||
|
||||
export function timeDiffFromNow(time: number): string {
|
||||
return timeDiff(time, Math.floor(new Date().getTime() / 1000));
|
||||
}
|
||||
|
||||
export function TimeWidget(p: { time: number }): React.ReactElement {
|
||||
return (
|
||||
|
||||
@@ -27,11 +27,11 @@ export function BaseAccommodationsRoute(): React.ReactElement {
|
||||
|
||||
const loadKey = React.useRef(1);
|
||||
|
||||
const loadPromise = React.useRef<() => void>(null);
|
||||
const loadPromise = React.useRef<() => void>();
|
||||
|
||||
const load = async () => {
|
||||
setAccommodations(
|
||||
await AccommodationListApi.GetListOfFamily(family.family),
|
||||
await AccommodationListApi.GetListOfFamily(family.family)
|
||||
);
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ export function BaseAccommodationsRoute(): React.ReactElement {
|
||||
loadKey.current += 1;
|
||||
setAccommodations(null);
|
||||
|
||||
return new Promise<void>((res) => {
|
||||
return new Promise<void>((res, _rej) => {
|
||||
loadPromise.current = () => res();
|
||||
});
|
||||
};
|
||||
@@ -47,14 +47,13 @@ export function BaseAccommodationsRoute(): React.ReactElement {
|
||||
return (
|
||||
<AsyncWidget
|
||||
ready={accommodations !== null}
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${family.familyId}-${loadKey.current}`}
|
||||
load={load}
|
||||
errMsg="Échec du chargement des informations sur les logements de la famille !"
|
||||
build={() => {
|
||||
if (loadPromise.current != null) {
|
||||
loadPromise.current?.();
|
||||
loadPromise.current = null;
|
||||
loadPromise.current = undefined;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -80,7 +79,6 @@ export function BaseAccommodationsRoute(): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useAccommodations(): AccommodationsContext {
|
||||
return React.useContext(AccommodationsContextK)!;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ export function MemberInput(p: {
|
||||
return (
|
||||
<Autocomplete
|
||||
value={p.current ? genealogy.members.get(p.current) : undefined}
|
||||
onChange={(_event: unknown, newValue: Member | null | undefined) => {
|
||||
onChange={(_event: any, newValue: Member | null | undefined) => {
|
||||
p.onValueChange(newValue?.id);
|
||||
}}
|
||||
inputValue={inputValue}
|
||||
@@ -69,14 +69,14 @@ export function MemberInput(p: {
|
||||
sx={{ width: "100%" }}
|
||||
filterOptions={(options, state) => {
|
||||
const res = options.filter((m) =>
|
||||
m?.fullName.toLowerCase().includes(state.inputValue),
|
||||
m?.fullName.toLowerCase().includes(state.inputValue)
|
||||
);
|
||||
res.length = Math.min(20, res.length);
|
||||
return res;
|
||||
}}
|
||||
getOptionLabel={(o) => o?.fullName ?? ""}
|
||||
renderInput={(params) => <TextField {...params} label={p.label} />}
|
||||
renderOption={(_props, option) => (
|
||||
renderOption={(_props, option, _state) => (
|
||||
<MemberItem
|
||||
member={option}
|
||||
onClick={() => p.onValueChange(option?.id)}
|
||||
|
||||
@@ -22,7 +22,7 @@ export function BaseGenealogyRoute(): React.ReactElement {
|
||||
|
||||
const loadKey = React.useRef(1);
|
||||
|
||||
const loadPromise = React.useRef<() => void>(null);
|
||||
const loadPromise = React.useRef<() => void>();
|
||||
|
||||
const load = async () => {
|
||||
setMembers(await MemberApi.GetEntireList(family.familyId));
|
||||
@@ -34,7 +34,7 @@ export function BaseGenealogyRoute(): React.ReactElement {
|
||||
setMembers(null);
|
||||
setCouples(null);
|
||||
|
||||
return new Promise<void>((res) => {
|
||||
return new Promise<void>((res, _rej) => {
|
||||
loadPromise.current = () => res();
|
||||
});
|
||||
};
|
||||
@@ -42,14 +42,13 @@ export function BaseGenealogyRoute(): React.ReactElement {
|
||||
return (
|
||||
<AsyncWidget
|
||||
ready={members !== null && couples !== null}
|
||||
// eslint-disable-next-line react-hooks/refs
|
||||
loadKey={`${family.familyId}-${loadKey.current}`}
|
||||
load={load}
|
||||
errMsg="Échec du chargement des informations de généalogie de la famille !"
|
||||
build={() => {
|
||||
if (loadPromise.current != null) {
|
||||
loadPromise.current?.();
|
||||
loadPromise.current = null;
|
||||
loadPromise.current = undefined;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -69,7 +68,6 @@ export function BaseGenealogyRoute(): React.ReactElement {
|
||||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line react-refresh/only-export-components
|
||||
export function useGenealogy(): GenealogyContext {
|
||||
return React.useContext(GenealogyContextK)!;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { mdiXml } from "@mdi/js";
|
||||
import { Icon } from "@mdi/react";
|
||||
import Icon from "@mdi/react";
|
||||
import PictureAsPdfIcon from "@mui/icons-material/PictureAsPdf";
|
||||
import { IconButton, Tooltip } from "@mui/material";
|
||||
import jsPDF from "jspdf";
|
||||
@@ -89,7 +89,7 @@ function center(container_width: number, el_width: number): number {
|
||||
|
||||
function buildSimpleTreeNode(
|
||||
tree: FamilyTreeNode,
|
||||
depth: number,
|
||||
depth: number
|
||||
): SimpleTreeNode {
|
||||
if (depth === 0) throw new Error("Too much recursion reached!");
|
||||
|
||||
@@ -100,7 +100,7 @@ function buildSimpleTreeNode(
|
||||
let childrenToProcess = tree.down;
|
||||
if (depth > 1)
|
||||
tree.couples?.forEach(
|
||||
(c) => (childrenToProcess = childrenToProcess?.concat(c.down)),
|
||||
(c) => (childrenToProcess = childrenToProcess?.concat(c.down))
|
||||
);
|
||||
else childrenToProcess = [];
|
||||
|
||||
@@ -156,7 +156,7 @@ export function SimpleFamilyTree(p: {
|
||||
|
||||
const tree = React.useMemo(
|
||||
() => buildSimpleTreeNode(p.tree, p.depth),
|
||||
[p.tree, p.depth],
|
||||
[p.tree, p.depth]
|
||||
);
|
||||
|
||||
const height = p.depth * (CARD_HEIGHT + LEVEL_SPACING) - LEVEL_SPACING;
|
||||
@@ -250,42 +250,44 @@ function NodeArea(p: {
|
||||
childrenLinkDestY?: number;
|
||||
node: SimpleTreeNode;
|
||||
}): React.ReactElement {
|
||||
let parent_x_offset: number;
|
||||
|
||||
let pers1 = p.node.member;
|
||||
let pers2 = p.node.spouse?.member;
|
||||
let didSwap = false;
|
||||
|
||||
// Show male of the left (all the time)
|
||||
if (pers2?.sex === "M") {
|
||||
const s = pers1;
|
||||
let s = pers1;
|
||||
pers1 = pers2;
|
||||
pers2 = s;
|
||||
didSwap = true;
|
||||
}
|
||||
|
||||
const parent_x_offset = p.x + center(p.node.width, p.node.parentWidth);
|
||||
parent_x_offset = p.x + center(p.node.width, p.node.parentWidth);
|
||||
|
||||
const unusedChildrenWidth = p.node.width - p.node.childrenWidth;
|
||||
let unusedChildrenWidth = p.node.width - p.node.childrenWidth;
|
||||
let downXOffset = p.x + Math.floor(unusedChildrenWidth / 2);
|
||||
|
||||
const endFirstFaceX =
|
||||
let endFirstFaceX =
|
||||
parent_x_offset +
|
||||
Math.floor((memberCardWidth(pers1) - FACE_WIDTH) / 2) +
|
||||
FACE_WIDTH;
|
||||
|
||||
const beginingOfSecondCardX =
|
||||
let beginingOfSecondCardX =
|
||||
parent_x_offset + p.node.parentWidth - memberCardWidth(pers2);
|
||||
|
||||
const beginSecondFaceX =
|
||||
let beginSecondFaceX =
|
||||
p.node.spouse &&
|
||||
beginingOfSecondCardX + (memberCardWidth(pers2) - FACE_WIDTH) / 2;
|
||||
|
||||
const middleParentFaceY = p.y + Math.floor(FACE_HEIGHT / 2);
|
||||
let middleParentFaceY = p.y + Math.floor(FACE_HEIGHT / 2);
|
||||
|
||||
// Compute points for link between children and parent
|
||||
let parentLinkX = didSwap
|
||||
? beginSecondFaceX! + Math.floor(FACE_WIDTH / 2)
|
||||
: parent_x_offset + Math.floor(memberCardWidth(pers1) / 2);
|
||||
const parentLinkY = p.y;
|
||||
let parentLinkY = p.y;
|
||||
|
||||
// Remove ugly little shifts
|
||||
if (Math.abs(parentLinkX - (p.childrenLinkDestX ?? 0)) < 10)
|
||||
@@ -299,7 +301,7 @@ function NodeArea(p: {
|
||||
if (
|
||||
pers2 &&
|
||||
p.node.down.every(
|
||||
(n) => n.member.father === pers1.id && n.member.mother !== pers2!.id,
|
||||
(n) => n.member.father === pers1.id && n.member.mother !== pers2!.id
|
||||
)
|
||||
) {
|
||||
childrenLinkX = parent_x_offset + Math.floor(memberCardWidth(pers1) / 2);
|
||||
@@ -310,7 +312,7 @@ function NodeArea(p: {
|
||||
else if (
|
||||
pers2 &&
|
||||
p.node.down.every(
|
||||
(n) => n.member.father !== pers1.id && n.member.mother === pers2!.id,
|
||||
(n) => n.member.father !== pers1.id && n.member.mother === pers2!.id
|
||||
)
|
||||
) {
|
||||
childrenLinkX = beginSecondFaceX! + Math.floor(memberCardWidth(pers2) / 2);
|
||||
@@ -369,7 +371,6 @@ function NodeArea(p: {
|
||||
node={n}
|
||||
/>
|
||||
);
|
||||
// eslint-disable-next-line react-hooks/immutability
|
||||
downXOffset += n.width + SIBLINGS_SPACING;
|
||||
return el;
|
||||
})}
|
||||
@@ -418,7 +419,7 @@ function MemberCard(p: {
|
||||
<tspan
|
||||
x={center(
|
||||
w,
|
||||
getTextWidth(p.member.lastNameUpperCase ?? "", NAME_FONT),
|
||||
getTextWidth(p.member.lastNameUpperCase ?? "", NAME_FONT)
|
||||
)}
|
||||
dy="14"
|
||||
font-size="13"
|
||||
@@ -429,7 +430,7 @@ function MemberCard(p: {
|
||||
<tspan
|
||||
x={center(
|
||||
w,
|
||||
getTextWidth(p.member.displayBirthDeathShort, BIRTH_FONT),
|
||||
getTextWidth(p.member.displayBirthDeathShort, BIRTH_FONT)
|
||||
)}
|
||||
dy="14"
|
||||
font-size="10"
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ES2020",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
@@ -1,7 +1,21 @@
|
||||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"lib": ["dom", "dom.iterable", "esnext"],
|
||||
"types": ["vite/client"],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "node",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx"
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"target": "ES2022",
|
||||
"lib": ["ES2023"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@@ -1,7 +1,15 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import viteTsconfigPaths from "vite-tsconfig-paths";
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
})
|
||||
// depending on your application, base can also be "/"
|
||||
base: "/",
|
||||
plugins: [react(), viteTsconfigPaths()],
|
||||
server: {
|
||||
// this ensures that the browser opens upon server start
|
||||
open: true,
|
||||
// this sets a default port to 3000
|
||||
port: 3000,
|
||||
},
|
||||
});
|
||||
|
||||
1
geneit_backend/.gitignore
vendored
1
geneit_backend/.gitignore
vendored
@@ -1,4 +1,3 @@
|
||||
target/
|
||||
storage/
|
||||
.idea
|
||||
static/
|
||||
3384
geneit_backend/Cargo.lock
generated
3384
geneit_backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,46 +1,43 @@
|
||||
[package]
|
||||
name = "geneit_backend"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.29"
|
||||
env_logger = "0.11.10"
|
||||
clap = { version = "4.6.0", features = ["derive", "env"] }
|
||||
lazy_static = "1.5.0"
|
||||
lazy-regex = "3.6.0"
|
||||
anyhow = "1.0.102"
|
||||
actix-web = "4.13.0"
|
||||
actix-cors = "0.7.1"
|
||||
actix-multipart = "0.7.2"
|
||||
actix-remote-ip = "1.0.0"
|
||||
futures-util = "0.3.32"
|
||||
diesel = { version = "2.3.7", features = ["postgres"] }
|
||||
diesel_migrations = "2.3.1"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = "1.0.149"
|
||||
mailchecker = "6.0.20"
|
||||
redis = "1.1.0"
|
||||
lettre = "0.11.20"
|
||||
rand = "0.10.0"
|
||||
bcrypt = "0.19.0"
|
||||
light-openid = "1.1.0"
|
||||
thiserror = "2.0.18"
|
||||
serde_with = "3.18.0"
|
||||
rust_iso3166 = "0.1.14"
|
||||
rust-s3 = "0.37.1"
|
||||
sha2 = "0.11.0"
|
||||
image = "0.25.10"
|
||||
uuid = { version = "1.23.0", features = ["v4"] }
|
||||
log = "0.4.21"
|
||||
env_logger = "0.11.3"
|
||||
clap = { version = "4.5.4", features = ["derive", "env"] }
|
||||
lazy_static = "1.4.0"
|
||||
lazy-regex = "3.1.0"
|
||||
anyhow = "1.0.83"
|
||||
actix-web = "4.5.1"
|
||||
actix-cors = "0.7.0"
|
||||
actix-multipart = "0.6.1"
|
||||
actix-remote-ip = "0.1.0"
|
||||
futures-util = "0.3.30"
|
||||
diesel = { version = "2.1.6", features = ["postgres"] }
|
||||
diesel_migrations = "2.1.0"
|
||||
serde = { version = "1.0.198", features = ["derive"] }
|
||||
serde_json = "1.0.117"
|
||||
mailchecker = "6.0.4"
|
||||
redis = "0.25.3"
|
||||
lettre = "0.11.7"
|
||||
rand = "0.8.5"
|
||||
bcrypt = "0.15.1"
|
||||
light-openid = "1.0.2"
|
||||
thiserror = "1.0.60"
|
||||
serde_with = "3.8.1"
|
||||
rust_iso3166 = "0.1.12"
|
||||
rust-s3 = "0.34.0"
|
||||
sha2 = "0.10.8"
|
||||
image = "0.25.1"
|
||||
uuid = { version = "1.8.0", features = ["v4"] }
|
||||
httpdate = "1.0.3"
|
||||
zip = "8.5.0"
|
||||
mime_guess = "2.0.5"
|
||||
tempfile = "3.27.0"
|
||||
base64 = "0.22.1"
|
||||
zip = "2.0.0"
|
||||
mime_guess = "2.0.4"
|
||||
tempfile = "3.10.1"
|
||||
base64 = "0.22.0"
|
||||
ical = { version = "0.11.0", features = ["generator", "ical", "vcard"] }
|
||||
chrono = "0.4.44"
|
||||
hex = "0.4.3"
|
||||
rust-embed = { version = "8.11.0", features = ["mime-guess"] }
|
||||
build-time = "0.1.3"
|
||||
chrono = "0.4.38"
|
||||
@@ -6,4 +6,4 @@ RUN apt-get update \
|
||||
|
||||
COPY geneit_backend /usr/local/bin/geneit_backend
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/geneit_backend"]
|
||||
ENTRYPOINT /usr/local/bin/geneit_backend
|
||||
|
||||
10
geneit_backend/build_docker_image.sh
Executable file
10
geneit_backend/build_docker_image.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
cargo build --release
|
||||
|
||||
TEMP_DIR=$(mktemp -d)
|
||||
cp target/release/geneit_backend "$TEMP_DIR"
|
||||
|
||||
docker build -f Dockerfile "$TEMP_DIR" -t pierre42100/geneit_backend
|
||||
|
||||
rm -r $TEMP_DIR
|
||||
|
||||
@@ -1,150 +1,51 @@
|
||||
services:
|
||||
rustfs:
|
||||
image: rustfs/rustfs:1.0.0-alpha.90
|
||||
user: "1000"
|
||||
restart: unless-stopped
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
minio:
|
||||
image: minio/minio
|
||||
environment:
|
||||
- RUSTFS_ACCESS_KEY=topsecret
|
||||
- RUSTFS_SECRET_KEY=topsecret
|
||||
- RUSTFS_CONSOLE_ENABLE=true
|
||||
- RUSTFS_ADDRESS=0.0.0.0:9000
|
||||
- RUSTFS_CONSOLE_ENABLE=true
|
||||
- RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9090
|
||||
- RUSTFS_VOLUMES=/data
|
||||
- MINIO_ROOT_USER=topsecret
|
||||
- MINIO_ROOT_PASSWORD=topsecret
|
||||
volumes:
|
||||
- ./storage/rustfs:/data
|
||||
- ./storage/minio:/data
|
||||
command: ["minio", "server", "/data", "--console-address", ":9090"]
|
||||
ports:
|
||||
- "9000:9000"
|
||||
- "9090:9090"
|
||||
- 9000:9000
|
||||
- 9090:9090
|
||||
expose:
|
||||
- 9000
|
||||
read_only: true
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD",
|
||||
"sh", "-c",
|
||||
"curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9090/rustfs/console/health"
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
- 9000
|
||||
|
||||
db:
|
||||
image: postgres:18
|
||||
user: "1000"
|
||||
restart: unless-stopped
|
||||
image: postgres
|
||||
ports:
|
||||
- "5432:5432"
|
||||
expose:
|
||||
- 5432
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
environment:
|
||||
- POSTGRES_USER=user
|
||||
- POSTGRES_PASSWORD=pass
|
||||
- POSTGRES_DB=geneit
|
||||
- PGDATA=/data
|
||||
read_only: true
|
||||
healthcheck:
|
||||
test: [ "CMD-SHELL", "pg_isready -U user" ]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
volumes:
|
||||
- ./storage/db:/data
|
||||
tmpfs:
|
||||
- /tmp
|
||||
- /run/postgresql
|
||||
- ./storage/db:/var/lib/postgresql/data
|
||||
|
||||
mailcatcher:
|
||||
image: dockage/mailcatcher:0.9.0
|
||||
restart: unless-stopped
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
read_only: true
|
||||
ports:
|
||||
- "1080:1080"
|
||||
- "1025:1025"
|
||||
healthcheck:
|
||||
test: wget --no-verbose --tries=1 --spider http://127.0.0.1:1080 || exit 1
|
||||
interval: 5m
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
start_period: 2m
|
||||
- 1080:1080
|
||||
- 1025:1025
|
||||
|
||||
redis:
|
||||
image: redis:alpine
|
||||
restart: unless-stopped
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
read_only: true
|
||||
command: redis-server --requirepass ${REDIS_PASS:-secretredis}
|
||||
ports:
|
||||
- "6379:6379"
|
||||
healthcheck:
|
||||
test: [ "CMD-SHELL", "redis-cli --no-auth-warning --pass ${REDIS_PASS:-secretredis} ping | grep PONG" ]
|
||||
interval: 1s
|
||||
timeout: 3s
|
||||
retries: 5
|
||||
- 6379:6379
|
||||
volumes:
|
||||
- ./storage/redis-data:/data
|
||||
- ./storage/redis-conf:/usr/local/etc/redis/redis.conf
|
||||
|
||||
oidc:
|
||||
image: dexidp/dex
|
||||
user: "1000"
|
||||
restart: unless-stopped
|
||||
image: qlik/simple-oidc-provider
|
||||
environment:
|
||||
- REDIRECTS=http://localhost:3000/oidc_cb
|
||||
- PORT=9001
|
||||
ports:
|
||||
- "9001:9001"
|
||||
command: [ "dex", "serve", "/conf/dex.config.yaml" ]
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
configs:
|
||||
- source: dex-config
|
||||
target: /conf/dex.config.yaml
|
||||
healthcheck:
|
||||
test: wget --no-verbose --tries=1 --spider http://localhost:9001/dex/healthz || exit 1
|
||||
interval: 5m
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
start_period: 2m
|
||||
- 9001:9001
|
||||
|
||||
configs:
|
||||
dex-config:
|
||||
content: |
|
||||
issuer: http://127.0.0.1:9001/dex
|
||||
|
||||
storage:
|
||||
type: memory
|
||||
|
||||
web:
|
||||
http: 0.0.0.0:9001
|
||||
|
||||
oauth2:
|
||||
skipApprovalScreen: false
|
||||
|
||||
connectors:
|
||||
- type: mockCallback
|
||||
id: mock
|
||||
name: Example
|
||||
|
||||
staticClients:
|
||||
- id: foo
|
||||
secret: bar
|
||||
redirectURIs:
|
||||
- http://localhost:5173/oidc_cb
|
||||
name: Project
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
use clap::Parser;
|
||||
use redis::{IntoConnectionInfo, RedisConnectionInfo};
|
||||
use s3::creds::Credentials;
|
||||
use s3::{Bucket, Region};
|
||||
|
||||
@@ -12,7 +11,7 @@ pub struct AppConfig {
|
||||
pub listen_address: String,
|
||||
|
||||
/// Website origin
|
||||
#[clap(short, long, env, default_value = "http://localhost:5173")]
|
||||
#[clap(short, long, env, default_value = "http://localhost:3000")]
|
||||
pub website_origin: String,
|
||||
|
||||
/// Proxy IP, might end with a star "*"
|
||||
@@ -99,7 +98,7 @@ pub struct AppConfig {
|
||||
#[arg(
|
||||
long,
|
||||
env,
|
||||
default_value = "http://localhost:9001/dex/.well-known/openid-configuration"
|
||||
default_value = "http://localhost:9001/.well-known/openid-configuration"
|
||||
)]
|
||||
pub oidc_configuration_url: String,
|
||||
|
||||
@@ -189,16 +188,14 @@ impl AppConfig {
|
||||
|
||||
/// Get Redis connection configuration
|
||||
pub fn redis_connection_config(&self) -> redis::ConnectionInfo {
|
||||
let mut settings = RedisConnectionInfo::default().set_db(self.redis_db_number);
|
||||
if let Some(username) = self.redis_username.as_ref() {
|
||||
settings = settings.set_username(username);
|
||||
redis::ConnectionInfo {
|
||||
addr: redis::ConnectionAddr::Tcp(self.redis_hostname.clone(), self.redis_port),
|
||||
redis: redis::RedisConnectionInfo {
|
||||
db: self.redis_db_number,
|
||||
username: self.redis_username.clone(),
|
||||
password: Some(self.redis_password.clone()),
|
||||
},
|
||||
}
|
||||
settings = settings.set_password(&self.redis_password);
|
||||
|
||||
redis::ConnectionAddr::Tcp(self.redis_hostname.clone(), self.redis_port)
|
||||
.into_connection_info()
|
||||
.expect("could not parse redis connection info!")
|
||||
.set_redis_settings(settings)
|
||||
}
|
||||
|
||||
/// Get password reset URL
|
||||
@@ -248,7 +245,7 @@ impl AppConfig {
|
||||
}
|
||||
|
||||
/// Get S3 bucket
|
||||
pub fn s3_bucket(&self) -> anyhow::Result<Box<Bucket>> {
|
||||
pub fn s3_bucket(&self) -> anyhow::Result<Bucket> {
|
||||
Ok(Bucket::new(
|
||||
&self.s3_bucket_name,
|
||||
Region::Custom {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
use crate::app_config::AppConfig;
|
||||
use diesel::result::{DatabaseErrorKind, Error};
|
||||
use diesel::{Connection, PgConnection};
|
||||
use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
|
||||
use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
|
||||
use std::cell::RefCell;
|
||||
|
||||
const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
|
||||
@@ -21,7 +21,7 @@ where
|
||||
if POSTGRES_CONNECTION.with(|i| i.borrow().is_none()) {
|
||||
let database_url = AppConfig::get().db_connection_chain();
|
||||
let conn = PgConnection::establish(&database_url)
|
||||
.unwrap_or_else(|_| panic!("Error connecting to {database_url}"));
|
||||
.unwrap_or_else(|_| panic!("Error connecting to {}", database_url));
|
||||
|
||||
POSTGRES_CONNECTION.with(|i| *i.borrow_mut() = Some(conn))
|
||||
}
|
||||
@@ -38,7 +38,7 @@ where
|
||||
POSTGRES_CONNECTION.with(|i| *i.borrow_mut() = None)
|
||||
}
|
||||
|
||||
log::error!("Database query error! {e:?}");
|
||||
log::error!("Database query error! {:?}", e);
|
||||
Err(e.into())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,14 +45,14 @@ where
|
||||
{
|
||||
let value_str = serde_json::to_string(value)?;
|
||||
|
||||
execute_request(|conn| Ok(conn.set_ex::<_, _, ()>(key, value_str, lifetime.as_secs())?))?;
|
||||
execute_request(|conn| Ok(conn.set_ex(key, value_str, lifetime.as_secs())?))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove a value from Redis
|
||||
pub async fn remove_value(key: &str) -> anyhow::Result<()> {
|
||||
execute_request(|conn| Ok(conn.del::<_, ()>(key)?))?;
|
||||
execute_request(|conn| Ok(conn.del(key)?))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
|
||||
log::warn!("The bucket does not seem to exists, trying to create it!")
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Got unexpected error when querying bucket info: {e}");
|
||||
log::error!("Got unexpected error when querying bucket info: {}", e);
|
||||
return Err(BucketServiceError::FailedFetchBucketInfo.into());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ use crate::extractors::accommodation_extractor::FamilyAndAccommodationInPath;
|
||||
use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
|
||||
use crate::models::Accommodation;
|
||||
use crate::services::accommodations_list_service;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
enum AccommodationListControllerErr {
|
||||
@@ -34,17 +34,17 @@ impl AccommodationRequest {
|
||||
}
|
||||
accommodation.name = self.name;
|
||||
|
||||
if let Some(d) = &self.description
|
||||
&& !c.accommodation_description_len.validate(d)
|
||||
{
|
||||
return Err(AccommodationListControllerErr::InvalidDescriptionLength.into());
|
||||
if let Some(d) = &self.description {
|
||||
if !c.accommodation_description_len.validate(d) {
|
||||
return Err(AccommodationListControllerErr::InvalidDescriptionLength.into());
|
||||
}
|
||||
}
|
||||
accommodation.description.clone_from(&self.description);
|
||||
|
||||
if let Some(c) = &self.color
|
||||
&& !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c)
|
||||
{
|
||||
return Err(AccommodationListControllerErr::MalformedColor.into());
|
||||
if let Some(c) = &self.color {
|
||||
if !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c) {
|
||||
return Err(AccommodationListControllerErr::MalformedColor.into());
|
||||
}
|
||||
}
|
||||
accommodation.color.clone_from(&self.color);
|
||||
|
||||
@@ -84,7 +84,7 @@ pub async fn get_full_list(m: FamilyInPath) -> HttpResult {
|
||||
|
||||
/// Get the information of a single accommodation
|
||||
pub async fn get_single(m: FamilyAndAccommodationInPath) -> HttpResult {
|
||||
Ok(HttpResponse::Ok().json(m.to_accommodation()))
|
||||
Ok(HttpResponse::Ok().json(&m.to_accommodation()))
|
||||
}
|
||||
|
||||
/// Update an accommodation
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use ical::{generator::*, *};
|
||||
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_web::{web, HttpResponse};
|
||||
use chrono::DateTime;
|
||||
|
||||
use crate::constants::StaticConstraints;
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::extractors::family_extractor::FamilyInPath;
|
||||
use crate::models::{Accommodation, AccommodationReservationID, NewAccommodationReservation};
|
||||
use crate::services::accommodations_reservations_service;
|
||||
use crate::utils::time_utils::time;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct UpdateReservationQuery {
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::services::login_token_service::LoginTokenValue;
|
||||
use crate::services::rate_limiter_service::RatedAction;
|
||||
use crate::services::{login_token_service, openid_service, rate_limiter_service, users_service};
|
||||
use actix_remote_ip::RemoteIP;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct CreateAccountBody {
|
||||
@@ -79,7 +79,10 @@ pub async fn request_reset_password(
|
||||
match users_service::get_by_mail(&req.mail).await {
|
||||
Ok(mut user) => users_service::request_reset_password(&mut user).await?,
|
||||
Err(e) => {
|
||||
log::error!("Could not locate user account {e}! (error silently ignored)");
|
||||
log::error!(
|
||||
"Could not locate user account {}! (error silently ignored)",
|
||||
e
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +122,7 @@ pub async fn check_reset_password_token(
|
||||
RatedAction::CheckResetPasswordTokenFailed,
|
||||
)
|
||||
.await?;
|
||||
log::error!("Password reset token could not be used: {e}");
|
||||
log::error!("Password reset token could not be used: {}", e);
|
||||
return Ok(HttpResponse::NotFound().finish());
|
||||
}
|
||||
};
|
||||
@@ -153,7 +156,7 @@ pub async fn reset_password(remote_ip: RemoteIP, req: web::Json<ResetPasswordBod
|
||||
RatedAction::CheckResetPasswordTokenFailed,
|
||||
)
|
||||
.await?;
|
||||
log::error!("Password reset token could not be used: {e}");
|
||||
log::error!("Password reset token could not be used: {}", e);
|
||||
return Ok(HttpResponse::NotFound().finish());
|
||||
}
|
||||
};
|
||||
@@ -193,7 +196,7 @@ pub async fn password_login(remote_ip: RemoteIP, req: web::Json<PasswordLoginQue
|
||||
let user = match users_service::get_by_mail(&req.mail).await {
|
||||
Ok(u) => u,
|
||||
Err(e) => {
|
||||
log::error!("Auth failed: could not find account by mail! {e}");
|
||||
log::error!("Auth failed: could not find account by mail! {}", e);
|
||||
rate_limiter_service::record_action(remote_ip.0, RatedAction::FailedPasswordLogin)
|
||||
.await?;
|
||||
return Ok(HttpResponse::Unauthorized().json("Invalid credentials"));
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use crate::controllers::HttpResult;
|
||||
use crate::controllers::members_controller::RequestDate;
|
||||
use crate::controllers::HttpResult;
|
||||
use crate::extractors::couple_extractor::FamilyAndCoupleInPath;
|
||||
use crate::extractors::family_extractor::FamilyInPath;
|
||||
use crate::models::{Couple, CoupleState, MemberID, PhotoID};
|
||||
use crate::services::{couples_service, members_service, photos_service};
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_multipart::form::tempfile::TempFile;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
serde_with::with_prefix!(prefix_wedding "wedding_");
|
||||
serde_with::with_prefix!(prefix_divorce "divorce_");
|
||||
@@ -48,22 +48,22 @@ impl CoupleRequest {
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(husband) = self.husband
|
||||
&& !members_service::exists(couple.family_id(), husband).await?
|
||||
{
|
||||
return Err(CoupleControllerErr::HusbandNotExisting.into());
|
||||
if let Some(husband) = self.husband {
|
||||
if !members_service::exists(couple.family_id(), husband).await? {
|
||||
return Err(CoupleControllerErr::HusbandNotExisting.into());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(d) = &self.wedding
|
||||
&& !d.check()
|
||||
{
|
||||
return Err(CoupleControllerErr::MalformedDateOfWedding.into());
|
||||
if let Some(d) = &self.wedding {
|
||||
if !d.check() {
|
||||
return Err(CoupleControllerErr::MalformedDateOfWedding.into());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(d) = &self.divorce
|
||||
&& !d.check()
|
||||
{
|
||||
return Err(CoupleControllerErr::MalformedDateOfDivorce.into());
|
||||
if let Some(d) = &self.divorce {
|
||||
if !d.check() {
|
||||
return Err(CoupleControllerErr::MalformedDateOfDivorce.into());
|
||||
}
|
||||
}
|
||||
|
||||
couple.set_wife(self.wife);
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
use crate::connections::s3_connection;
|
||||
use crate::constants;
|
||||
use crate::controllers::HttpResult;
|
||||
use crate::controllers::couples_controller::CoupleRequest;
|
||||
use crate::controllers::members_controller::MemberRequest;
|
||||
use crate::controllers::HttpResult;
|
||||
use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
|
||||
use crate::models::{CoupleID, MemberID, PhotoID};
|
||||
use crate::services::photos_service::UploadedFile;
|
||||
use crate::services::{couples_service, members_service, photos_service};
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_multipart::form::tempfile::TempFile;
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_web::HttpResponse;
|
||||
use mime_guess::Mime;
|
||||
use std::collections::HashMap;
|
||||
@@ -183,9 +183,9 @@ pub async fn import_family(
|
||||
}
|
||||
|
||||
if let Err(e) = req_member_data.to_member(member).await {
|
||||
log::error!("Error while processing import (member {req_id:?}) - {e}");
|
||||
log::error!("Error while processing import (member {:?}) - {e}", req_id);
|
||||
return Ok(
|
||||
HttpResponse::BadRequest().json(format!("Failed to validate member {req_id:?}!"))
|
||||
HttpResponse::BadRequest().json(format!("Failed to validate member {:?}!", req_id))
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use crate::constants::{FAMILY_INVITATION_CODE_LEN, StaticConstraints};
|
||||
use crate::constants::{StaticConstraints, FAMILY_INVITATION_CODE_LEN};
|
||||
use crate::controllers::HttpResult;
|
||||
use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
|
||||
use crate::models::{FamilyMembership, UserID};
|
||||
@@ -7,7 +7,7 @@ use crate::services::rate_limiter_service::RatedAction;
|
||||
use crate::services::{families_service, rate_limiter_service};
|
||||
use crate::utils::string_utils::rand_str;
|
||||
use actix_remote_ip::RemoteIP;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
#[derive(Debug, serde::Deserialize)]
|
||||
pub struct CreateFamilyReq {
|
||||
|
||||
@@ -5,9 +5,9 @@ use crate::extractors::member_extractor::FamilyAndMemberInPath;
|
||||
use crate::models::{Member, MemberID, PhotoID, Sex};
|
||||
use crate::services::{members_service, photos_service};
|
||||
use crate::utils::countries_utils;
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_multipart::form::tempfile::TempFile;
|
||||
use actix_web::{HttpResponse, web};
|
||||
use actix_multipart::form::MultipartForm;
|
||||
use actix_web::{web, HttpResponse};
|
||||
|
||||
serde_with::with_prefix!(prefix_birth "birth_");
|
||||
serde_with::with_prefix!(prefix_death "death_");
|
||||
@@ -95,10 +95,10 @@ fn check_opt_str_val(
|
||||
c: SizeConstraint,
|
||||
err: MemberControllerErr,
|
||||
) -> anyhow::Result<()> {
|
||||
if let Some(v) = val
|
||||
&& !c.validate(v)
|
||||
{
|
||||
return Err(err.into());
|
||||
if let Some(v) = val {
|
||||
if !c.validate(v) {
|
||||
return Err(err.into());
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -151,10 +151,10 @@ impl MemberRequest {
|
||||
MemberControllerErr::MalformedEmailAddress,
|
||||
)?;
|
||||
|
||||
if let Some(mail) = &self.email
|
||||
&& !mailchecker::is_valid(mail)
|
||||
{
|
||||
return Err(MemberControllerErr::InvalidEmailAddress.into());
|
||||
if let Some(mail) = &self.email {
|
||||
if !mailchecker::is_valid(mail) {
|
||||
return Err(MemberControllerErr::InvalidEmailAddress.into());
|
||||
}
|
||||
}
|
||||
|
||||
check_opt_str_val(
|
||||
@@ -187,22 +187,22 @@ impl MemberRequest {
|
||||
MemberControllerErr::MalformedCountry,
|
||||
)?;
|
||||
|
||||
if let Some(c) = &self.country
|
||||
&& !countries_utils::is_code_valid(c)
|
||||
{
|
||||
return Err(MemberControllerErr::InvalidCountryCode.into());
|
||||
if let Some(c) = &self.country {
|
||||
if !countries_utils::is_code_valid(c) {
|
||||
return Err(MemberControllerErr::InvalidCountryCode.into());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(d) = &self.birth
|
||||
&& !d.check()
|
||||
{
|
||||
return Err(MemberControllerErr::MalformedDateOfBirth.into());
|
||||
if let Some(d) = &self.birth {
|
||||
if !d.check() {
|
||||
return Err(MemberControllerErr::MalformedDateOfBirth.into());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(d) = &self.death
|
||||
&& !d.check()
|
||||
{
|
||||
return Err(MemberControllerErr::MalformedDateOfDeath.into());
|
||||
if let Some(d) = &self.death {
|
||||
if !d.check() {
|
||||
return Err(MemberControllerErr::MalformedDateOfDeath.into());
|
||||
}
|
||||
}
|
||||
|
||||
check_opt_str_val(
|
||||
@@ -221,10 +221,10 @@ impl MemberRequest {
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(father) = self.father
|
||||
&& !members_service::exists(member.family_id(), father).await?
|
||||
{
|
||||
return Err(MemberControllerErr::FatherNotExisting.into());
|
||||
if let Some(father) = self.father {
|
||||
if !members_service::exists(member.family_id(), father).await? {
|
||||
return Err(MemberControllerErr::FatherNotExisting.into());
|
||||
}
|
||||
}
|
||||
|
||||
member.first_name = self.first_name;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//! # API controller
|
||||
|
||||
use actix_web::HttpResponse;
|
||||
use actix_web::body::BoxBody;
|
||||
use actix_web::HttpResponse;
|
||||
use std::fmt::{Debug, Display, Formatter};
|
||||
use zip::result::ZipError;
|
||||
|
||||
@@ -16,7 +16,6 @@ pub mod members_controller;
|
||||
pub mod photos_controller;
|
||||
pub mod server_controller;
|
||||
pub mod users_controller;
|
||||
pub mod web_app_controller;
|
||||
|
||||
/// Custom error to ease controller writing
|
||||
#[derive(Debug)]
|
||||
@@ -32,7 +31,7 @@ impl Display for HttpErr {
|
||||
|
||||
impl actix_web::error::ResponseError for HttpErr {
|
||||
fn error_response(&self) -> HttpResponse<BoxBody> {
|
||||
log::error!("Error while processing request! {self}");
|
||||
log::error!("Error while processing request! {}", self);
|
||||
HttpResponse::InternalServerError().body("Failed to execute request!")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ use crate::controllers::HttpResult;
|
||||
use crate::models::PhotoID;
|
||||
use crate::services::photos_service;
|
||||
use actix_web::http::header;
|
||||
use actix_web::{HttpRequest, HttpResponse, web};
|
||||
use actix_web::{web, HttpRequest, HttpResponse};
|
||||
use std::ops::Add;
|
||||
use std::time::{Duration, UNIX_EPOCH};
|
||||
|
||||
@@ -36,23 +36,24 @@ async fn get_photo(id: &PhotoIdPath, full_size: bool, req: HttpRequest) -> HttpR
|
||||
};
|
||||
|
||||
// Check if an upload is un-necessary
|
||||
if let Some(c) = req.headers().get(header::IF_NONE_MATCH)
|
||||
&& c.to_str().unwrap_or("") == hash
|
||||
{
|
||||
return Ok(HttpResponse::NotModified().finish());
|
||||
if let Some(c) = req.headers().get(header::IF_NONE_MATCH) {
|
||||
if c.to_str().unwrap_or("") == hash {
|
||||
return Ok(HttpResponse::NotModified().finish());
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(c) = req.headers().get(header::IF_MODIFIED_SINCE) {
|
||||
let date_str = c.to_str().unwrap_or("");
|
||||
if let Ok(date) = httpdate::parse_http_date(date_str)
|
||||
&& date
|
||||
if let Ok(date) = httpdate::parse_http_date(date_str) {
|
||||
if date
|
||||
.add(Duration::from_secs(1))
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap()
|
||||
.as_secs()
|
||||
>= photo.time_create as u64
|
||||
{
|
||||
return Ok(HttpResponse::NotModified().finish());
|
||||
{
|
||||
return Ok(HttpResponse::NotModified().finish());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,11 @@ use crate::utils::countries_utils;
|
||||
use crate::utils::countries_utils::CountryCode;
|
||||
use actix_web::{HttpResponse, Responder};
|
||||
|
||||
/// Default hello route
|
||||
pub async fn home() -> impl Responder {
|
||||
HttpResponse::Ok().json("GeneIT API service.")
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, serde::Serialize)]
|
||||
struct ServerConfig<'a> {
|
||||
constraints: StaticConstraints,
|
||||
|
||||
@@ -9,8 +9,8 @@ use crate::services::login_token_service::LoginToken;
|
||||
use crate::services::rate_limiter_service::RatedAction;
|
||||
use crate::services::{rate_limiter_service, users_service};
|
||||
use actix_remote_ip::RemoteIP;
|
||||
use actix_web::HttpResponse;
|
||||
use actix_web::web::Json;
|
||||
use actix_web::HttpResponse;
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
struct UserAPI<'a> {
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
pub use serve_static::{root_index, serve_static_content};
|
||||
|
||||
/// Web asset hosting placeholder in debug mode
|
||||
#[cfg(debug_assertions)]
|
||||
mod serve_static {
|
||||
use actix_web::{HttpResponse, Responder};
|
||||
|
||||
pub async fn root_index() -> impl Responder {
|
||||
HttpResponse::Ok().body("Hello world! Debug=on for GeneIT!")
|
||||
}
|
||||
|
||||
pub async fn serve_static_content() -> impl Responder {
|
||||
HttpResponse::NotFound().body("Hello world! Static assets are not served in debug mode")
|
||||
}
|
||||
}
|
||||
|
||||
/// Web asset hosting in release mode
|
||||
#[cfg(not(debug_assertions))]
|
||||
mod serve_static {
|
||||
use crate::utils::crypt_utils::sha256;
|
||||
use crate::utils::time_utils;
|
||||
use actix_web::http::header;
|
||||
use actix_web::{HttpRequest, HttpResponse, Responder, web};
|
||||
use rust_embed::RustEmbed;
|
||||
use std::cmp::max;
|
||||
use std::ops::Add;
|
||||
use std::time::Duration;
|
||||
|
||||
#[derive(RustEmbed)]
|
||||
#[folder = "static/"]
|
||||
struct WebAsset;
|
||||
|
||||
fn handle_embedded_file(path: &str, can_fallback: bool, req: HttpRequest) -> HttpResponse {
|
||||
match (WebAsset::get(path), can_fallback) {
|
||||
(Some(content), _) => {
|
||||
let digest = hex::encode(sha256(content.data.as_ref()));
|
||||
let file_time = max(time_utils::time_start_of_day(), time_utils::build_time());
|
||||
|
||||
// Check if the browser already knows the file by date
|
||||
if let Some(c) = req.headers().get(header::IF_MODIFIED_SINCE) {
|
||||
let date_str = c.to_str().unwrap_or("");
|
||||
if let Ok(date) = httpdate::parse_http_date(date_str)
|
||||
&& date.add(Duration::from_secs(1))
|
||||
>= time_utils::unix_to_system_time(file_time)
|
||||
{
|
||||
return HttpResponse::NotModified().finish();
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the browser already knows the etag
|
||||
if let Some(c) = req.headers().get(header::IF_NONE_MATCH)
|
||||
&& c.to_str().unwrap_or("") == digest
|
||||
{
|
||||
return HttpResponse::NotModified().finish();
|
||||
}
|
||||
|
||||
HttpResponse::Ok()
|
||||
.content_type(content.metadata.mimetype())
|
||||
.insert_header(("etag", digest))
|
||||
.insert_header(("last-modified", time_utils::unix_to_http_date(file_time)))
|
||||
.body(content.data.into_owned())
|
||||
}
|
||||
(None, false) => HttpResponse::NotFound().body("404 Not Found"),
|
||||
(None, true) => handle_embedded_file("index.html", false, req),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn root_index(req: HttpRequest) -> impl Responder {
|
||||
handle_embedded_file("index.html", false, req)
|
||||
}
|
||||
|
||||
pub async fn serve_static_content(req: HttpRequest, path: web::Path<String>) -> impl Responder {
|
||||
handle_embedded_file(path.as_ref(), !path.as_ref().starts_with("static/"), req)
|
||||
}
|
||||
}
|
||||
@@ -75,7 +75,7 @@ impl FromRequest for FamilyAndAccommodationInPath {
|
||||
Self::load_accommodation_from_path(family, accommodation_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract accommodation ID from URL! {e}");
|
||||
log::error!("Failed to extract accommodation ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -85,7 +85,7 @@ impl FromRequest for FamilyAndAccommodationReservationCalendarInPath {
|
||||
Self::load_calendar_from_path(family, accommodation_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract calendar ID from URL! {e}");
|
||||
log::error!("Failed to extract calendar ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch calendar information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -95,7 +95,7 @@ impl FromRequest for FamilyAndAccommodationReservationInPath {
|
||||
Self::load_accommodation_reservation_from_path(family, reservation_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract accommodation ID from URL! {e}");
|
||||
log::error!("Failed to extract accommodation ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -71,7 +71,7 @@ impl FromRequest for FamilyAndCoupleInPath {
|
||||
FamilyAndCoupleInPath::load_couple_from_path(family, couple_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract couple ID from URL! {e}");
|
||||
log::error!("Failed to extract couple ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch couple information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -62,7 +62,7 @@ impl FromRequest for FamilyInPath {
|
||||
FamilyInPath::load_family_from_path(&token, family_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract family ID from URL! {e}");
|
||||
log::error!("Failed to extract family ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch family information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -71,7 +71,7 @@ impl FromRequest for FamilyAndMemberInPath {
|
||||
FamilyAndMemberInPath::load_member_from_path(family, member_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract member ID from URL! {e}");
|
||||
log::error!("Failed to extract member ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch member information!")
|
||||
})
|
||||
})
|
||||
|
||||
@@ -2,14 +2,14 @@ use actix_cors::Cors;
|
||||
use actix_multipart::form::tempfile::TempFileConfig;
|
||||
use actix_remote_ip::RemoteIPConfig;
|
||||
use actix_web::middleware::Logger;
|
||||
use actix_web::{App, HttpServer, web};
|
||||
use actix_web::{web, App, HttpServer};
|
||||
use geneit_backend::app_config::AppConfig;
|
||||
use geneit_backend::connections::{db_connection, s3_connection};
|
||||
use geneit_backend::controllers::{
|
||||
accommodations_list_controller, accommodations_reservations_calendars_controller,
|
||||
accommodations_reservations_controller, auth_controller, couples_controller, data_controller,
|
||||
families_controller, members_controller, photos_controller, server_controller,
|
||||
users_controller, web_app_controller,
|
||||
users_controller,
|
||||
};
|
||||
|
||||
#[actix_web::main]
|
||||
@@ -40,259 +40,254 @@ async fn main() -> std::io::Result<()> {
|
||||
.max_age(3600),
|
||||
)
|
||||
.wrap(Logger::default())
|
||||
.app_data(web::Data::new(RemoteIPConfig::parse_opt(
|
||||
AppConfig::get().proxy_ip.clone(),
|
||||
)))
|
||||
.app_data(web::Data::new(RemoteIPConfig {
|
||||
proxy: AppConfig::get().proxy_ip.clone(),
|
||||
}))
|
||||
// Uploaded files
|
||||
.app_data(TempFileConfig::default().directory(&AppConfig::get().temp_dir))
|
||||
// Config controller
|
||||
.route("/", web::get().to(server_controller::home))
|
||||
.route(
|
||||
"/api/server/config",
|
||||
"/server/config",
|
||||
web::get().to(server_controller::server_config),
|
||||
)
|
||||
// Auth controller
|
||||
.route(
|
||||
"/api/auth/create_account",
|
||||
"/auth/create_account",
|
||||
web::post().to(auth_controller::create_account),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/request_reset_password",
|
||||
"/auth/request_reset_password",
|
||||
web::post().to(auth_controller::request_reset_password),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/check_reset_password_token",
|
||||
"/auth/check_reset_password_token",
|
||||
web::post().to(auth_controller::check_reset_password_token),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/reset_password",
|
||||
"/auth/reset_password",
|
||||
web::post().to(auth_controller::reset_password),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/password_login",
|
||||
"/auth/password_login",
|
||||
web::post().to(auth_controller::password_login),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/start_openid_login",
|
||||
"/auth/start_openid_login",
|
||||
web::post().to(auth_controller::start_openid_login),
|
||||
)
|
||||
.route(
|
||||
"/api/auth/finish_openid_login",
|
||||
"/auth/finish_openid_login",
|
||||
web::post().to(auth_controller::finish_openid_login),
|
||||
)
|
||||
.route("/api/auth/logout", web::get().to(auth_controller::logout))
|
||||
.route("/auth/logout", web::get().to(auth_controller::logout))
|
||||
// User controller
|
||||
.route("/api/user/info", web::get().to(users_controller::auth_info))
|
||||
.route("/user/info", web::get().to(users_controller::auth_info))
|
||||
.route(
|
||||
"/api/user/update_profile",
|
||||
"/user/update_profile",
|
||||
web::post().to(users_controller::update_profile),
|
||||
)
|
||||
.route(
|
||||
"/api/user/replace_password",
|
||||
"/user/replace_password",
|
||||
web::post().to(users_controller::replace_password),
|
||||
)
|
||||
.route(
|
||||
"/api/user/request_delete",
|
||||
"/user/request_delete",
|
||||
web::get().to(users_controller::request_delete_account),
|
||||
)
|
||||
.route(
|
||||
"/api/user/check_delete_token",
|
||||
"/user/check_delete_token",
|
||||
web::post().to(users_controller::check_delete_token),
|
||||
)
|
||||
.route(
|
||||
"/api/user/delete_account",
|
||||
"/user/delete_account",
|
||||
web::post().to(users_controller::delete_account),
|
||||
)
|
||||
// Families controller
|
||||
.route(
|
||||
"/api/family/create",
|
||||
"/family/create",
|
||||
web::post().to(families_controller::create),
|
||||
)
|
||||
.route("/api/family/join", web::post().to(families_controller::join))
|
||||
.route("/api/family/list", web::get().to(families_controller::list))
|
||||
.route("/family/join", web::post().to(families_controller::join))
|
||||
.route("/family/list", web::get().to(families_controller::list))
|
||||
.route(
|
||||
"/api/family/{id}",
|
||||
"/family/{id}",
|
||||
web::get().to(families_controller::single_info),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/leave",
|
||||
"/family/{id}/leave",
|
||||
web::post().to(families_controller::leave),
|
||||
)
|
||||
.route("/api/family/{id}", web::patch().to(families_controller::update))
|
||||
.route("/family/{id}", web::patch().to(families_controller::update))
|
||||
.route(
|
||||
"/api/family/{id}",
|
||||
"/family/{id}",
|
||||
web::delete().to(families_controller::delete),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/renew_invitation_code",
|
||||
"/family/{id}/renew_invitation_code",
|
||||
web::post().to(families_controller::renew_invitation_code),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/users",
|
||||
"/family/{id}/users",
|
||||
web::get().to(families_controller::users),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/user/{user_id}",
|
||||
"/family/{id}/user/{user_id}",
|
||||
web::patch().to(families_controller::update_membership),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/user/{user_id}",
|
||||
"/family/{id}/user/{user_id}",
|
||||
web::delete().to(families_controller::delete_membership),
|
||||
)
|
||||
// [GENEALOGY] Members controller
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/create",
|
||||
"/family/{id}/genealogy/member/create",
|
||||
web::post().to(members_controller::create),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/members",
|
||||
"/family/{id}/genealogy/members",
|
||||
web::get().to(members_controller::get_all),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/{member_id}",
|
||||
"/family/{id}/genealogy/member/{member_id}",
|
||||
web::get().to(members_controller::get_single),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/{member_id}",
|
||||
"/family/{id}/genealogy/member/{member_id}",
|
||||
web::put().to(members_controller::update),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/{member_id}",
|
||||
"/family/{id}/genealogy/member/{member_id}",
|
||||
web::delete().to(members_controller::delete),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/{member_id}/photo",
|
||||
"/family/{id}/genealogy/member/{member_id}/photo",
|
||||
web::put().to(members_controller::set_photo),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/member/{member_id}/photo",
|
||||
"/family/{id}/genealogy/member/{member_id}/photo",
|
||||
web::delete().to(members_controller::remove_photo),
|
||||
)
|
||||
// [GENEALOGY] Couples controller
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/create",
|
||||
"/family/{id}/genealogy/couple/create",
|
||||
web::post().to(couples_controller::create),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couples",
|
||||
"/family/{id}/genealogy/couples",
|
||||
web::get().to(couples_controller::get_all),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/{couple_id}",
|
||||
"/family/{id}/genealogy/couple/{couple_id}",
|
||||
web::get().to(couples_controller::get_single),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/{couple_id}",
|
||||
"/family/{id}/genealogy/couple/{couple_id}",
|
||||
web::put().to(couples_controller::update),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/{couple_id}",
|
||||
"/family/{id}/genealogy/couple/{couple_id}",
|
||||
web::delete().to(couples_controller::delete),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/{couple_id}/photo",
|
||||
"/family/{id}/genealogy/couple/{couple_id}/photo",
|
||||
web::put().to(couples_controller::set_photo),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/couple/{couple_id}/photo",
|
||||
"/family/{id}/genealogy/couple/{couple_id}/photo",
|
||||
web::delete().to(couples_controller::remove_photo),
|
||||
)
|
||||
// [GENEALOGY] Data controller
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/data/export",
|
||||
"/family/{id}/genealogy/data/export",
|
||||
web::get().to(data_controller::export_family),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/genealogy/data/import",
|
||||
"/family/{id}/genealogy/data/import",
|
||||
web::put().to(data_controller::import_family),
|
||||
)
|
||||
// [ACCOMODATIONS] List controller
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/list/create",
|
||||
"/family/{id}/accommodations/list/create",
|
||||
web::post().to(accommodations_list_controller::create),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/list/list",
|
||||
"/family/{id}/accommodations/list/list",
|
||||
web::get().to(accommodations_list_controller::get_full_list),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/list/{accommodation_id}",
|
||||
"/family/{id}/accommodations/list/{accommodation_id}",
|
||||
web::get().to(accommodations_list_controller::get_single),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/list/{accommodation_id}",
|
||||
"/family/{id}/accommodations/list/{accommodation_id}",
|
||||
web::put().to(accommodations_list_controller::update),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/list/{accommodation_id}",
|
||||
"/family/{id}/accommodations/list/{accommodation_id}",
|
||||
web::delete().to(accommodations_list_controller::delete),
|
||||
)
|
||||
// [ACCOMODATIONS] Reservations controller
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations/accommodation/{accommodation_id}",
|
||||
"/family/{id}/accommodations/reservations/accommodation/{accommodation_id}",
|
||||
web::get()
|
||||
.to(accommodations_reservations_controller::get_accommodation_reservations),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/for_interval",
|
||||
"/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/for_interval",
|
||||
web::get()
|
||||
.to(accommodations_reservations_controller::get_accommodation_reservations_for_interval),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations/full_list",
|
||||
"/family/{id}/accommodations/reservations/full_list",
|
||||
web::get().to(accommodations_reservations_controller::full_list),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/create",
|
||||
"/family/{id}/accommodations/reservations/accommodation/{accommodation_id}/create",
|
||||
web::post().to(accommodations_reservations_controller::create_reservation),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
"/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
web::get().to(accommodations_reservations_controller::get_single),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
"/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
web::patch().to(accommodations_reservations_controller::update_single),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
"/family/{id}/accommodations/reservation/{reservation_id}",
|
||||
web::delete().to(accommodations_reservations_controller::delete),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservation/{reservation_id}/validate",
|
||||
"/family/{id}/accommodations/reservation/{reservation_id}/validate",
|
||||
web::post().to(accommodations_reservations_controller::validate_or_reject),
|
||||
)
|
||||
// [ACCOMMODATIONS] Calendars controller
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations_calendars/create",
|
||||
"/family/{id}/accommodations/reservations_calendars/create",
|
||||
web::post().to(accommodations_reservations_calendars_controller::create),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations_calendars/list",
|
||||
"/family/{id}/accommodations/reservations_calendars/list",
|
||||
web::get().to(accommodations_reservations_calendars_controller::get_list),
|
||||
)
|
||||
.route(
|
||||
"/api/family/{id}/accommodations/reservations_calendars/{cal_id}",
|
||||
"/family/{id}/accommodations/reservations_calendars/{cal_id}",
|
||||
web::delete().to(accommodations_reservations_calendars_controller::delete),
|
||||
)
|
||||
.route(
|
||||
"/api/acccommodations_calendar/{token}",
|
||||
"/acccommodations_calendar/{token}",
|
||||
web::get().to(accommodations_reservations_calendars_controller::anonymous_access),
|
||||
)
|
||||
// Photos controller
|
||||
.route(
|
||||
"/api/photo/{id}",
|
||||
"/photo/{id}",
|
||||
web::get().to(photos_controller::get_full_size),
|
||||
)
|
||||
.route(
|
||||
"/api/photo/{id}/thumbnail",
|
||||
"/photo/{id}/thumbnail",
|
||||
web::get().to(photos_controller::get_thumbnail),
|
||||
)
|
||||
// Static web app controller
|
||||
.route("/", web::get().to(web_app_controller::root_index))
|
||||
.route(
|
||||
"/{tail:.*}",
|
||||
web::get().to(web_app_controller::serve_static_content),
|
||||
)
|
||||
})
|
||||
.bind(AppConfig::get().listen_address.as_str())?
|
||||
.run()
|
||||
|
||||
@@ -43,7 +43,7 @@ impl User {
|
||||
.as_deref()
|
||||
.map(|hash| {
|
||||
bcrypt::verify(password, hash).unwrap_or_else(|e| {
|
||||
log::error!("Failed to validate password! {e}");
|
||||
log::error!("Failed to validate password! {}", e);
|
||||
false
|
||||
})
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@ use crate::utils::string_utils::rand_str;
|
||||
use crate::utils::time_utils::time;
|
||||
use actix_web::dev::Payload;
|
||||
use actix_web::{FromRequest, HttpRequest};
|
||||
use std::future::{Ready, ready};
|
||||
use std::future::{ready, Ready};
|
||||
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
enum LoginTokenServiceError {
|
||||
@@ -125,13 +125,13 @@ async fn load_token_info(token: &LoginTokenValue) -> anyhow::Result<Option<Login
|
||||
let token = match user_tokens.iter_mut().find(|t| t.key == key) {
|
||||
Some(t) => t,
|
||||
None => {
|
||||
log::error!("Could not find token for key '{key}' (missing token)");
|
||||
log::error!("Could not find token for key '{}' (missing token)", key);
|
||||
return Ok(None);
|
||||
}
|
||||
};
|
||||
|
||||
if token.is_expired() {
|
||||
log::error!("Could not find token for key '{key}' (token expired)");
|
||||
log::error!("Could not find token for key '{}' (token expired)", key);
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ impl FromRequest for LoginToken {
|
||||
|
||||
let token = match load_token_info(&token).await {
|
||||
Err(e) => {
|
||||
log::error!("Failed to load auth token! {e}");
|
||||
log::error!("Failed to load auth token! {}", e);
|
||||
return Err(actix_web::error::ErrorPreconditionFailed(
|
||||
"Failed to check auth token!",
|
||||
));
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user