Compare commits
12 Commits
4b6db84afc
..
v3.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 528b7004e3 | |||
| 41c4667eb4 | |||
| c3ed36f178 | |||
| 93e55e8e37 | |||
| 3f12b60261 | |||
| 6d13fa425a | |||
| a0a987d561 | |||
| 3e04da3926 | |||
| 87d3c27b65 | |||
| 36546c46c9 | |||
| ac27ea3176 | |||
| eb3cf72969 |
@@ -19,7 +19,9 @@ jobs:
|
|||||||
# existing clone in /opt/tanabata. See docs/DEPLOY.md for runner setup.
|
# existing clone in /opt/tanabata. See docs/DEPLOY.md for runner setup.
|
||||||
#
|
#
|
||||||
# Only shell steps here (no `uses:` actions), so the host needs git + docker
|
# Only shell steps here (no `uses:` actions), so the host needs git + docker
|
||||||
# and nothing else — no node, no rsync.
|
# and nothing else — no node, no go, no rsync. The test step below runs the
|
||||||
|
# Go and Node toolchains inside throwaway containers, so nothing has to be
|
||||||
|
# installed on the host.
|
||||||
runs-on: host
|
runs-on: host
|
||||||
|
|
||||||
env:
|
env:
|
||||||
@@ -35,6 +37,47 @@ jobs:
|
|||||||
git fetch --prune origin
|
git fetch --prune origin
|
||||||
git reset --hard origin/master
|
git reset --hard origin/master
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
working-directory: /opt/tanabata
|
||||||
|
# Everything runs INSIDE throwaway toolchain containers — the host only
|
||||||
|
# needs docker (which it already uses for `docker compose`). Nothing (Go,
|
||||||
|
# Node, Postgres, vips/ffmpeg/exiftool) has to be installed on the host.
|
||||||
|
# The orchestration below uses only bash builtins + docker. A failure here
|
||||||
|
# fails the job, so a red build never reaches production. Module/npm caches
|
||||||
|
# persist in named volumes for speed.
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
docker rm -f tfm-ci-db >/dev/null 2>&1 || true
|
||||||
|
docker network rm tfm-ci-net >/dev/null 2>&1 || true
|
||||||
|
docker network create tfm-ci-net >/dev/null
|
||||||
|
trap 'docker rm -f tfm-ci-db >/dev/null 2>&1 || true; docker network rm tfm-ci-net >/dev/null 2>&1 || true' EXIT
|
||||||
|
|
||||||
|
docker run -d --name tfm-ci-db --network tfm-ci-net \
|
||||||
|
-e POSTGRES_PASSWORD=postgres postgres:14-alpine >/dev/null
|
||||||
|
# Wait for Postgres, using pg_isready inside the DB container (no host tools).
|
||||||
|
for ((i = 0; i < 30; i++)); do
|
||||||
|
docker exec tfm-ci-db pg_isready -U postgres >/dev/null 2>&1 && break
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
# Backend: full suite, including the integration tests, against the
|
||||||
|
# ephemeral Postgres. -buildvcs=false since the .git dir isn't mounted.
|
||||||
|
docker run --rm --network tfm-ci-net \
|
||||||
|
-v /opt/tanabata/backend:/src -w /src \
|
||||||
|
-v tfm-ci-gomod:/go/pkg/mod -v tfm-ci-gocache:/root/.cache/go-build \
|
||||||
|
-e CGO_ENABLED=0 \
|
||||||
|
-e TANABATA_TEST_ADMIN_DSN="postgres://postgres:postgres@tfm-ci-db:5432/postgres?sslmode=disable" \
|
||||||
|
golang:1.26-alpine go test -buildvcs=false -count=1 ./...
|
||||||
|
|
||||||
|
# Frontend: type-check + production build (also validates openapi via
|
||||||
|
# the generate:types prestep).
|
||||||
|
docker run --rm \
|
||||||
|
-v /opt/tanabata:/repo -w /repo/frontend \
|
||||||
|
-v tfm-ci-npm:/root/.npm \
|
||||||
|
node:22-alpine sh -c "npm ci && npm run check && npm run build"
|
||||||
|
|
||||||
- name: Build image and start the stack
|
- name: Build image and start the stack
|
||||||
working-directory: /opt/tanabata
|
working-directory: /opt/tanabata
|
||||||
# .env must already exist in DEPLOY_DIR on the host (secrets + DB mode).
|
# .env must already exist in DEPLOY_DIR on the host (secrets + DB mode).
|
||||||
|
|||||||
@@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
@@ -98,3 +98,8 @@ npm run dev # Vite dev server
|
|||||||
npm run build # production build
|
npm run build # production build
|
||||||
npm run generate:types # regenerate API types from openapi.yaml
|
npm run generate:types # regenerate API types from openapi.yaml
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Licensed under the GNU Affero General Public License v3.0 or later
|
||||||
|
(AGPL-3.0-or-later). See [`LICENSE`](LICENSE) for the full text.
|
||||||
|
|||||||
@@ -45,10 +45,10 @@ type Pool struct {
|
|||||||
// SortKey / SortOrder control how the pool's files are ordered. When SortKey
|
// SortKey / SortOrder control how the pool's files are ordered. When SortKey
|
||||||
// is PoolSortManual, files follow the manual position order and can be
|
// is PoolSortManual, files follow the manual position order and can be
|
||||||
// reordered; otherwise they are sorted automatically and reordering is a no-op.
|
// reordered; otherwise they are sorted automatically and reordering is a no-op.
|
||||||
SortKey string
|
SortKey string
|
||||||
SortOrder string
|
SortOrder string
|
||||||
FileCount int
|
FileCount int
|
||||||
CreatedAt time.Time // extracted from UUID v7 via UUIDCreatedAt
|
CreatedAt time.Time // extracted from UUID v7 via UUIDCreatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
// PoolFile is a File with its ordering position within a pool.
|
// PoolFile is a File with its ordering position within a pool.
|
||||||
|
|||||||
@@ -1614,7 +1614,13 @@ func replaceDSNDatabase(dsn, newDB string) string {
|
|||||||
}
|
}
|
||||||
return dsn + " dbname=" + newDB
|
return dsn + " dbname=" + newDB
|
||||||
}
|
}
|
||||||
// URL style: not used in our defaults, but handled for completeness.
|
// URL style (e.g. postgres://user:pass@host:port/dbname?opts): the database
|
||||||
|
// is the URL path. CI passes this form via TANABATA_TEST_ADMIN_DSN, so it
|
||||||
|
// must swap the path to point the suite at its per-run database.
|
||||||
|
if u, err := url.Parse(dsn); err == nil {
|
||||||
|
u.Path = "/" + newDB
|
||||||
|
return u.String()
|
||||||
|
}
|
||||||
return dsn
|
return dsn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,13 +3,16 @@
|
|||||||
Tanabata is deployed by a [Gitea Actions](https://docs.gitea.com/usage/actions/overview)
|
Tanabata is deployed by a [Gitea Actions](https://docs.gitea.com/usage/actions/overview)
|
||||||
workflow ([`.gitea/workflows/deploy.yml`](../.gitea/workflows/deploy.yml)) that
|
workflow ([`.gitea/workflows/deploy.yml`](../.gitea/workflows/deploy.yml)) that
|
||||||
runs on the **production host itself**. On every push to `master` it updates the
|
runs on the **production host itself**. On every push to `master` it updates the
|
||||||
git clone in `/opt/tanabata` and runs `docker compose up -d --build` there, so the
|
git clone in `/opt/tanabata`, runs the test suite (backend + frontend, in
|
||||||
image is built from the freshly-pushed code and the stack is restarted.
|
throwaway toolchain containers), and — only if it passes — runs
|
||||||
|
`docker compose up -d --build` there, so the image is built from the
|
||||||
|
freshly-pushed code and the stack is restarted.
|
||||||
|
|
||||||
```
|
```
|
||||||
push master ──> Gitea (container) ──> act_runner (host, "host" label)
|
push master ──> Gitea (container) ──> act_runner (host, "host" label)
|
||||||
│ git fetch + reset --hard (in /opt/tanabata)
|
│ git fetch + reset --hard (in /opt/tanabata)
|
||||||
└ docker compose up -d --build
|
│ run tests (go + node in containers; ephemeral Postgres)
|
||||||
|
└ docker compose up -d --build (only if tests pass)
|
||||||
```
|
```
|
||||||
|
|
||||||
The Gitea server runs in a container, but the **runner runs directly on the host**
|
The Gitea server runs in a container, but the **runner runs directly on the host**
|
||||||
|
|||||||
@@ -9,8 +9,8 @@
|
|||||||
"build": "npm run generate:types && vite build",
|
"build": "npm run generate:types && vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"prepare": "svelte-kit sync || echo ''",
|
"prepare": "svelte-kit sync || echo ''",
|
||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
"check": "npm run generate:types && svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
"check:watch": "npm run generate:types && svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
"format": "prettier --write .",
|
"format": "prettier --write .",
|
||||||
"format:check": "prettier --check ."
|
"format:check": "prettier --check ."
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -138,6 +138,8 @@
|
|||||||
class:focused
|
class:focused
|
||||||
use:lazyload
|
use:lazyload
|
||||||
data-file-index={index}
|
data-file-index={index}
|
||||||
|
role="button"
|
||||||
|
tabindex="-1"
|
||||||
onpointerdown={onPointerDown}
|
onpointerdown={onPointerDown}
|
||||||
onpointermove={onPointerMoveInternal}
|
onpointermove={onPointerMoveInternal}
|
||||||
onpointerup={() => {
|
onpointerup={() => {
|
||||||
|
|||||||
@@ -89,6 +89,18 @@
|
|||||||
if (previewSrc) URL.revokeObjectURL(previewSrc);
|
if (previewSrc) URL.revokeObjectURL(previewSrc);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// content_datetime is stored/returned as a UTC ISO instant, but
|
||||||
|
// <input type="datetime-local"> works in local wall-clock time with no zone.
|
||||||
|
// Shift by the local offset so the field shows local time; the save path
|
||||||
|
// (new Date(value).toISOString()) parses it back as local and re-encodes UTC.
|
||||||
|
function isoToLocalInput(iso?: string | null): string {
|
||||||
|
if (!iso) return '';
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (Number.isNaN(d.getTime())) return '';
|
||||||
|
const local = new Date(d.getTime() - d.getTimezoneOffset() * 60000);
|
||||||
|
return local.toISOString().slice(0, 16); // YYYY-MM-DDTHH:mm (local)
|
||||||
|
}
|
||||||
|
|
||||||
async function loadFile(id: string) {
|
async function loadFile(id: string) {
|
||||||
loading = true;
|
loading = true;
|
||||||
error = '';
|
error = '';
|
||||||
@@ -101,9 +113,7 @@
|
|||||||
if (fileId !== id) return; // paged on; ignore
|
if (fileId !== id) return; // paged on; ignore
|
||||||
file = fileData;
|
file = fileData;
|
||||||
notes = fileData.notes ?? '';
|
notes = fileData.notes ?? '';
|
||||||
contentDatetime = fileData.content_datetime
|
contentDatetime = isoToLocalInput(fileData.content_datetime);
|
||||||
? fileData.content_datetime.slice(0, 16) // YYYY-MM-DDTHH:mm
|
|
||||||
: '';
|
|
||||||
isPublic = fileData.is_public ?? false;
|
isPublic = fileData.is_public ?? false;
|
||||||
metadataNodes = objectToNodes(fileData.metadata);
|
metadataNodes = objectToNodes(fileData.metadata);
|
||||||
dirty = false;
|
dirty = false;
|
||||||
@@ -489,39 +499,43 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- Prev / Next -->
|
<!-- Prev / Next: the whole left/right side of the preview is a tap zone -->
|
||||||
{#if prevId}
|
{#if prevId}
|
||||||
<button
|
<button
|
||||||
class="nav-btn nav-prev"
|
class="nav-zone nav-prev"
|
||||||
onclick={() => prevId && onNavigate(prevId)}
|
onclick={() => prevId && onNavigate(prevId)}
|
||||||
aria-label="Previous file"
|
aria-label="Previous file"
|
||||||
>
|
>
|
||||||
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" aria-hidden="true">
|
<span class="nav-chip">
|
||||||
<path
|
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" aria-hidden="true">
|
||||||
d="M11 3L5 9L11 15"
|
<path
|
||||||
stroke="currentColor"
|
d="M11 3L5 9L11 15"
|
||||||
stroke-width="2"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
stroke-width="2"
|
||||||
stroke-linejoin="round"
|
stroke-linecap="round"
|
||||||
/>
|
stroke-linejoin="round"
|
||||||
</svg>
|
/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
{#if nextId}
|
{#if nextId}
|
||||||
<button
|
<button
|
||||||
class="nav-btn nav-next"
|
class="nav-zone nav-next"
|
||||||
onclick={() => nextId && onNavigate(nextId)}
|
onclick={() => nextId && onNavigate(nextId)}
|
||||||
aria-label="Next file"
|
aria-label="Next file"
|
||||||
>
|
>
|
||||||
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" aria-hidden="true">
|
<span class="nav-chip">
|
||||||
<path
|
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" aria-hidden="true">
|
||||||
d="M7 3L13 9L7 15"
|
<path
|
||||||
stroke="currentColor"
|
d="M7 3L13 9L7 15"
|
||||||
stroke-width="2"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
stroke-width="2"
|
||||||
stroke-linejoin="round"
|
stroke-linecap="round"
|
||||||
/>
|
stroke-linejoin="round"
|
||||||
</svg>
|
/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
@@ -554,7 +568,7 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<label class="field-label" for="datetime">Date taken</label>
|
<label class="field-label" for="datetime">Content date</label>
|
||||||
<input
|
<input
|
||||||
id="datetime"
|
id="datetime"
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
@@ -746,15 +760,17 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Whole preview area is a link: click opens the original in a new tab. */
|
/* The link fills the area for centring, but only the image itself is
|
||||||
|
clickable (pointer-events below) — tapping the black margins does nothing,
|
||||||
|
so "open original" fires only on the preview. */
|
||||||
.preview-link {
|
.preview-link {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
cursor: zoom-in;
|
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.preview-img {
|
.preview-img {
|
||||||
@@ -762,12 +778,14 @@
|
|||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
display: block;
|
display: block;
|
||||||
|
cursor: zoom-in;
|
||||||
|
pointer-events: auto; /* only the image opens the original */
|
||||||
}
|
}
|
||||||
|
|
||||||
.preview-busy {
|
.preview-busy {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
z-index: 2;
|
z-index: 4; /* above the nav zones — an in-flight replace blocks paging */
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -808,33 +826,58 @@
|
|||||||
background-color: #1a1010;
|
background-color: #1a1010;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---- Nav buttons ---- */
|
/* ---- Nav zones ----
|
||||||
.nav-btn {
|
Each covers the full-height left/right portion of the preview so paging
|
||||||
|
only needs a tap on that side, not a precise hit on the arrow. They sit
|
||||||
|
above the image, so over a full-width image the sides page and the centre
|
||||||
|
still opens the original. The dark hint gradient shows on hover only, to
|
||||||
|
keep photos clean on touch where there is no hover. */
|
||||||
|
.nav-zone {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
top: 0;
|
||||||
transform: translateY(-50%);
|
bottom: 0;
|
||||||
width: 40px;
|
width: 30%;
|
||||||
height: 40px;
|
max-width: 220px;
|
||||||
border-radius: 50%;
|
|
||||||
border: none;
|
border: none;
|
||||||
background-color: rgba(0, 0, 0, 0.55);
|
background: none;
|
||||||
color: #fff;
|
padding: 0 12px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: background-color 0.15s;
|
z-index: 3;
|
||||||
}
|
-webkit-tap-highlight-color: transparent;
|
||||||
|
|
||||||
.nav-btn:hover {
|
|
||||||
background-color: rgba(0, 0, 0, 0.8);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-prev {
|
.nav-prev {
|
||||||
left: 10px;
|
left: 0;
|
||||||
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
.nav-next {
|
.nav-next {
|
||||||
right: 10px;
|
right: 0;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-prev:hover {
|
||||||
|
background: linear-gradient(to right, rgba(0, 0, 0, 0.3), transparent);
|
||||||
|
}
|
||||||
|
.nav-next:hover {
|
||||||
|
background: linear-gradient(to left, rgba(0, 0, 0, 0.3), transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-chip {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: rgba(0, 0, 0, 0.55);
|
||||||
|
color: #fff;
|
||||||
|
transition: background-color 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-zone:hover .nav-chip {
|
||||||
|
background-color: rgba(0, 0, 0, 0.8);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---- Metadata panel ---- */
|
/* ---- Metadata panel ---- */
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import { untrack } from 'svelte';
|
||||||
import type { Tag } from '$lib/api/types';
|
import type { Tag } from '$lib/api/types';
|
||||||
import { fetchAllTags } from '$lib/api/tags';
|
import { fetchAllTags } from '$lib/api/tags';
|
||||||
import { buildDslFilter, parseDslFilter, tokenLabel } from '$lib/utils/dsl';
|
import { buildDslFilter, parseDslFilter, tokenLabel } from '$lib/utils/dsl';
|
||||||
@@ -16,7 +17,9 @@
|
|||||||
|
|
||||||
let tags = $state<Tag[]>([]);
|
let tags = $state<Tag[]>([]);
|
||||||
let search = $state('');
|
let search = $state('');
|
||||||
let tokens = $state<string[]>(parseDslFilter(value));
|
// Seed from the prop once; the $effect below keeps it in sync afterwards, so
|
||||||
|
// read it untracked to avoid the state-referenced-locally warning.
|
||||||
|
let tokens = $state<string[]>(untrack(() => parseDslFilter(value)));
|
||||||
let tagNames = $derived(
|
let tagNames = $derived(
|
||||||
new Map(tags.filter((t) => t.id && t.name).map((t) => [t.id as string, t.name as string]))
|
new Map(tags.filter((t) => t.id && t.name).map((t) => [t.id as string, t.name as string]))
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,21 +1,32 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { selectionStore, selectionCount } from '$lib/stores/selection';
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
|
count: number;
|
||||||
|
onClear: () => void;
|
||||||
onEditTags: () => void;
|
onEditTags: () => void;
|
||||||
onAddToPool: () => void;
|
onAddToPool: () => void;
|
||||||
onMarkReviewed: () => void;
|
onMarkReviewed: () => void;
|
||||||
onDelete: () => void;
|
onDelete: () => void;
|
||||||
|
// Optional: only shown in a pool context (removes the files from that pool
|
||||||
|
// without deleting them). Omitted on the global files list.
|
||||||
|
onRemoveFromPool?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { onEditTags, onAddToPool, onMarkReviewed, onDelete }: Props = $props();
|
let {
|
||||||
|
count,
|
||||||
|
onClear,
|
||||||
|
onEditTags,
|
||||||
|
onAddToPool,
|
||||||
|
onMarkReviewed,
|
||||||
|
onDelete,
|
||||||
|
onRemoveFromPool
|
||||||
|
}: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="bar" role="toolbar" aria-label="Selection actions">
|
<div class="bar" role="toolbar" aria-label="Selection actions">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Count / deselect all -->
|
<!-- Count / deselect all -->
|
||||||
<button class="count" onclick={() => selectionStore.exit()} title="Clear selection">
|
<button class="count" onclick={onClear} title="Clear selection">
|
||||||
<span class="num">{$selectionCount}</span>
|
<span class="num">{count}</span>
|
||||||
<span class="label">selected</span>
|
<span class="label">selected</span>
|
||||||
<svg
|
<svg
|
||||||
class="close-icon"
|
class="close-icon"
|
||||||
@@ -39,6 +50,9 @@
|
|||||||
<button class="action edit-tags" onclick={onEditTags}>Edit tags</button>
|
<button class="action edit-tags" onclick={onEditTags}>Edit tags</button>
|
||||||
<button class="action add-pool" onclick={onAddToPool}>Add to pool</button>
|
<button class="action add-pool" onclick={onAddToPool}>Add to pool</button>
|
||||||
<button class="action mark-reviewed" onclick={onMarkReviewed}>Mark reviewed</button>
|
<button class="action mark-reviewed" onclick={onMarkReviewed}>Mark reviewed</button>
|
||||||
|
{#if onRemoveFromPool}
|
||||||
|
<button class="action remove-pool" onclick={onRemoveFromPool}>Remove from pool</button>
|
||||||
|
{/if}
|
||||||
<button class="action delete" onclick={onDelete}>Delete</button>
|
<button class="action delete" onclick={onDelete}>Delete</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -72,6 +86,7 @@
|
|||||||
.row {
|
.row {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,6 +139,7 @@
|
|||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-tags {
|
.edit-tags {
|
||||||
@@ -150,6 +166,15 @@
|
|||||||
background-color: color-mix(in srgb, var(--color-success) 15%, transparent);
|
background-color: color-mix(in srgb, var(--color-success) 15%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.remove-pool {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-pool:hover {
|
||||||
|
background-color: color-mix(in srgb, var(--color-accent) 15%, transparent);
|
||||||
|
color: var(--color-text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
.delete {
|
.delete {
|
||||||
color: var(--color-danger);
|
color: var(--color-danger);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
let { tag, onclick, size = 'md', focused = false, index }: Props = $props();
|
let { tag, onclick, size = 'md', focused = false, index }: Props = $props();
|
||||||
|
|
||||||
const color = tag.color ?? tag.category_color;
|
let color = $derived(tag.color ?? tag.category_color);
|
||||||
const style = color ? `background-color: #${color}` : '';
|
let style = $derived(color ? `background-color: #${color}` : '');
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if onclick}
|
{#if onclick}
|
||||||
|
|||||||
@@ -42,8 +42,7 @@ export function createRovingGrid<T extends Item>(opts: RovingGridOptions<T>) {
|
|||||||
function isFormTarget(t: EventTarget | null): boolean {
|
function isFormTarget(t: EventTarget | null): boolean {
|
||||||
return (
|
return (
|
||||||
t instanceof HTMLElement &&
|
t instanceof HTMLElement &&
|
||||||
(t.isContentEditable ||
|
(t.isContentEditable || ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(t.tagName))
|
||||||
['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(t.tagName))
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -107,6 +107,7 @@
|
|||||||
class:on={isAdmin}
|
class:on={isAdmin}
|
||||||
role="switch"
|
role="switch"
|
||||||
aria-checked={isAdmin}
|
aria-checked={isAdmin}
|
||||||
|
aria-label="Admin"
|
||||||
onclick={() => (isAdmin = !isAdmin)}><span class="thumb"></span></button
|
onclick={() => (isAdmin = !isAdmin)}><span class="thumb"></span></button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@@ -121,6 +122,7 @@
|
|||||||
class:on={canCreate}
|
class:on={canCreate}
|
||||||
role="switch"
|
role="switch"
|
||||||
aria-checked={canCreate}
|
aria-checked={canCreate}
|
||||||
|
aria-label="Can create"
|
||||||
onclick={() => (canCreate = !canCreate)}><span class="thumb"></span></button
|
onclick={() => (canCreate = !canCreate)}><span class="thumb"></span></button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@@ -140,6 +142,7 @@
|
|||||||
class:danger={isBlocked}
|
class:danger={isBlocked}
|
||||||
role="switch"
|
role="switch"
|
||||||
aria-checked={isBlocked}
|
aria-checked={isBlocked}
|
||||||
|
aria-label="Blocked"
|
||||||
onclick={() => (isBlocked = !isBlocked)}><span class="thumb"></span></button
|
onclick={() => (isBlocked = !isBlocked)}><span class="thumb"></span></button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
import SelectionBar from '$lib/components/layout/SelectionBar.svelte';
|
import SelectionBar from '$lib/components/layout/SelectionBar.svelte';
|
||||||
import InfiniteScroll from '$lib/components/common/InfiniteScroll.svelte';
|
import InfiniteScroll from '$lib/components/common/InfiniteScroll.svelte';
|
||||||
import { fileSorting, type FileSortField } from '$lib/stores/sorting';
|
import { fileSorting, type FileSortField } from '$lib/stores/sorting';
|
||||||
import { selectionStore, selectionActive } from '$lib/stores/selection';
|
import { selectionStore, selectionActive, selectionCount } from '$lib/stores/selection';
|
||||||
import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
|
import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
|
||||||
import BulkTagEditor from '$lib/components/file/BulkTagEditor.svelte';
|
import BulkTagEditor from '$lib/components/file/BulkTagEditor.svelte';
|
||||||
import PoolPicker from '$lib/components/file/PoolPicker.svelte';
|
import PoolPicker from '$lib/components/file/PoolPicker.svelte';
|
||||||
@@ -129,9 +129,7 @@
|
|||||||
selectionStore.exit();
|
selectionStore.exit();
|
||||||
try {
|
try {
|
||||||
await api.post('/files/bulk/review', { file_ids: ids, needs_review: false });
|
await api.post('/files/bulk/review', { file_ids: ids, needs_review: false });
|
||||||
files = files.map((f) =>
|
files = files.map((f) => (ids.includes(f.id ?? '') ? { ...f, needs_review: false } : f));
|
||||||
ids.includes(f.id ?? '') ? { ...f, needs_review: false } : f
|
|
||||||
);
|
|
||||||
} catch {
|
} catch {
|
||||||
// ignore — list already reflects the intended state optimistically
|
// ignore — list already reflects the intended state optimistically
|
||||||
}
|
}
|
||||||
@@ -148,7 +146,8 @@
|
|||||||
function handleKey(e: KeyboardEvent) {
|
function handleKey(e: KeyboardEvent) {
|
||||||
if (e.key === 'Escape') {
|
if (e.key === 'Escape') {
|
||||||
if (tagEditorOpen) tagEditorOpen = false;
|
if (tagEditorOpen) tagEditorOpen = false;
|
||||||
else if (poolPickerOpen) return; // PoolPicker owns Escape (clear search, then close)
|
else if (poolPickerOpen)
|
||||||
|
return; // PoolPicker owns Escape (clear search, then close)
|
||||||
else if (confirmDeleteFiles) confirmDeleteFiles = false;
|
else if (confirmDeleteFiles) confirmDeleteFiles = false;
|
||||||
else if (activeFileId) return;
|
else if (activeFileId) return;
|
||||||
else if ($selectionActive) selectionStore.exit();
|
else if ($selectionActive) selectionStore.exit();
|
||||||
@@ -784,6 +783,8 @@
|
|||||||
|
|
||||||
{#if $selectionActive}
|
{#if $selectionActive}
|
||||||
<SelectionBar
|
<SelectionBar
|
||||||
|
count={$selectionCount}
|
||||||
|
onClear={() => selectionStore.exit()}
|
||||||
onEditTags={openTagEditor}
|
onEditTags={openTagEditor}
|
||||||
onAddToPool={openPoolPicker}
|
onAddToPool={openPoolPicker}
|
||||||
onMarkReviewed={markSelectionReviewed}
|
onMarkReviewed={markSelectionReviewed}
|
||||||
|
|||||||
@@ -1,11 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { api } from '$lib/api/client';
|
import { api } from '$lib/api/client';
|
||||||
import {
|
import { getDuplicates, dismissDuplicate, type DuplicatePairDistance } from '$lib/api/duplicates';
|
||||||
getDuplicates,
|
|
||||||
dismissDuplicate,
|
|
||||||
type DuplicatePairDistance
|
|
||||||
} from '$lib/api/duplicates';
|
|
||||||
import Thumb from '$lib/components/file/Thumb.svelte';
|
import Thumb from '$lib/components/file/Thumb.svelte';
|
||||||
import DuplicateMergeDialog from '$lib/components/file/DuplicateMergeDialog.svelte';
|
import DuplicateMergeDialog from '$lib/components/file/DuplicateMergeDialog.svelte';
|
||||||
import FileViewer from '$lib/components/file/FileViewer.svelte';
|
import FileViewer from '$lib/components/file/FileViewer.svelte';
|
||||||
@@ -296,7 +292,9 @@
|
|||||||
{#each c.files.filter((f) => f.id !== keep) as other (other.id)}
|
{#each c.files.filter((f) => f.id !== keep) as other (other.id)}
|
||||||
{@const dist = distanceFromKeep(c, keep, other.id)}
|
{@const dist = distanceFromKeep(c, keep, other.id)}
|
||||||
<div class="actrow">
|
<div class="actrow">
|
||||||
<span class="aname" title={other.original_name ?? ''}>{other.original_name ?? '—'}</span>
|
<span class="aname" title={other.original_name ?? ''}
|
||||||
|
>{other.original_name ?? '—'}</span
|
||||||
|
>
|
||||||
<span
|
<span
|
||||||
class="dist"
|
class="dist"
|
||||||
class:unknown={dist === null}
|
class:unknown={dist === null}
|
||||||
|
|||||||
@@ -7,6 +7,8 @@
|
|||||||
import FileViewer from '$lib/components/file/FileViewer.svelte';
|
import FileViewer from '$lib/components/file/FileViewer.svelte';
|
||||||
import FilterBar from '$lib/components/file/FilterBar.svelte';
|
import FilterBar from '$lib/components/file/FilterBar.svelte';
|
||||||
import PoolPicker from '$lib/components/file/PoolPicker.svelte';
|
import PoolPicker from '$lib/components/file/PoolPicker.svelte';
|
||||||
|
import BulkTagEditor from '$lib/components/file/BulkTagEditor.svelte';
|
||||||
|
import SelectionBar from '$lib/components/layout/SelectionBar.svelte';
|
||||||
import InfiniteScroll from '$lib/components/common/InfiniteScroll.svelte';
|
import InfiniteScroll from '$lib/components/common/InfiniteScroll.svelte';
|
||||||
import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
|
import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
|
||||||
import { parseDslFilter } from '$lib/utils/dsl';
|
import { parseDslFilter } from '$lib/utils/dsl';
|
||||||
@@ -44,11 +46,13 @@
|
|||||||
let filterOpen = $state(false);
|
let filterOpen = $state(false);
|
||||||
let activeTokens = $derived(parseDslFilter(filterParam));
|
let activeTokens = $derived(parseDslFilter(filterParam));
|
||||||
|
|
||||||
// ---- Selection (for removal) ----
|
// ---- Selection + bulk actions (mirrors the files page) ----
|
||||||
let selectedIds = $state(new Set<string>());
|
let selectedIds = $state(new Set<string>());
|
||||||
let selectionMode = $derived(selectedIds.size > 0);
|
let selectionMode = $derived(selectedIds.size > 0);
|
||||||
let lastSelectedIdx = $state<number | null>(null);
|
let lastSelectedIdx = $state<number | null>(null);
|
||||||
let confirmRemove = $state(false);
|
let confirmRemove = $state(false);
|
||||||
|
let confirmDeleteFiles = $state(false);
|
||||||
|
let tagEditorOpen = $state(false);
|
||||||
let poolPickerOpen = $state(false);
|
let poolPickerOpen = $state(false);
|
||||||
|
|
||||||
// ---- Add files mode ----
|
// ---- Add files mode ----
|
||||||
@@ -238,10 +242,20 @@
|
|||||||
lastSelectedIdx = idx;
|
lastSelectedIdx = idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function clearSelection() {
|
||||||
|
selectedIds = new Set();
|
||||||
|
lastSelectedIdx = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function openTagEditor() {
|
||||||
|
tagEditorOpen = true;
|
||||||
|
void tick().then(() => document.querySelector<HTMLInputElement>('.tag-sheet input')?.focus());
|
||||||
|
}
|
||||||
|
|
||||||
async function removeSelected() {
|
async function removeSelected() {
|
||||||
confirmRemove = false;
|
confirmRemove = false;
|
||||||
const ids = [...selectedIds];
|
const ids = [...selectedIds];
|
||||||
selectedIds = new Set();
|
clearSelection();
|
||||||
try {
|
try {
|
||||||
await api.post(`/pools/${poolId}/files/remove`, { file_ids: ids });
|
await api.post(`/pools/${poolId}/files/remove`, { file_ids: ids });
|
||||||
files = files.filter((f) => !ids.includes(f.id ?? ''));
|
files = files.filter((f) => !ids.includes(f.id ?? ''));
|
||||||
@@ -251,6 +265,34 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mark the selection as review-done; optimistically clear the local badges.
|
||||||
|
async function markSelectionReviewed() {
|
||||||
|
const ids = [...selectedIds];
|
||||||
|
if (ids.length === 0) return;
|
||||||
|
clearSelection();
|
||||||
|
try {
|
||||||
|
await api.post('/files/bulk/review', { file_ids: ids, needs_review: false });
|
||||||
|
files = files.map((f) => (ids.includes(f.id ?? '') ? { ...f, needs_review: false } : f));
|
||||||
|
} catch {
|
||||||
|
// ignore — the list already reflects the intended state
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move the selection to trash. Trashed files drop out of the pool view (which
|
||||||
|
// only lists live files); pool membership is kept, so file_count is left to
|
||||||
|
// the server's truth on the next load rather than adjusted optimistically.
|
||||||
|
async function deleteSelected() {
|
||||||
|
confirmDeleteFiles = false;
|
||||||
|
const ids = [...selectedIds];
|
||||||
|
clearSelection();
|
||||||
|
try {
|
||||||
|
await api.post('/files/bulk/delete', { file_ids: ids });
|
||||||
|
files = files.filter((f) => !ids.includes(f.id ?? ''));
|
||||||
|
} catch {
|
||||||
|
// silently ignore — list already updated optimistically
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ---- File viewer overlay (shallow routing) ----
|
// ---- File viewer overlay (shallow routing) ----
|
||||||
// Open the viewer on top of the still-mounted pool grid so the back button (and
|
// Open the viewer on top of the still-mounted pool grid so the back button (and
|
||||||
// the viewer's own close) returns here — with the pool's list and scroll intact —
|
// the viewer's own close) returns here — with the pool's list and scroll intact —
|
||||||
@@ -629,8 +671,8 @@
|
|||||||
aria-label="Sort files"
|
aria-label="Sort files"
|
||||||
>
|
>
|
||||||
<option value="manual">Manual order</option>
|
<option value="manual">Manual order</option>
|
||||||
<option value="content_datetime">Date</option>
|
<option value="content_datetime">Content date</option>
|
||||||
<option value="created">Date added</option>
|
<option value="created">Created</option>
|
||||||
<option value="original_name">Name</option>
|
<option value="original_name">Name</option>
|
||||||
</select>
|
</select>
|
||||||
{#if sortKey !== 'manual'}
|
{#if sortKey !== 'manual'}
|
||||||
@@ -739,46 +781,61 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- Selection bar (remove mode) -->
|
<!-- Selection actions — same set as the files page, plus Remove from pool. -->
|
||||||
{#if selectionMode && !addMode}
|
{#if selectionMode && !addMode}
|
||||||
<div class="selection-bar" role="toolbar">
|
<SelectionBar
|
||||||
<button
|
count={selectedIds.size}
|
||||||
class="sel-cancel"
|
onClear={clearSelection}
|
||||||
onclick={() => {
|
onEditTags={openTagEditor}
|
||||||
selectedIds = new Set();
|
onAddToPool={() => (poolPickerOpen = true)}
|
||||||
lastSelectedIdx = null;
|
onMarkReviewed={markSelectionReviewed}
|
||||||
}}
|
onRemoveFromPool={() => (confirmRemove = true)}
|
||||||
>
|
onDelete={() => (confirmDeleteFiles = true)}
|
||||||
<span class="sel-num">{selectedIds.size}</span>
|
/>
|
||||||
<span class="sel-label">selected</span>
|
{/if}
|
||||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" aria-hidden="true">
|
|
||||||
<path
|
<!-- Bulk tag editor sheet -->
|
||||||
d="M2 2l10 10M12 2L2 12"
|
{#if tagEditorOpen}
|
||||||
stroke="currentColor"
|
<!-- svelte-ignore a11y_click_events_have_key_events -->
|
||||||
stroke-width="1.8"
|
<div class="picker-backdrop" role="presentation" onclick={() => (tagEditorOpen = false)}></div>
|
||||||
stroke-linecap="round"
|
<div class="picker-sheet tag-sheet" role="dialog" aria-label="Edit tags">
|
||||||
/>
|
<div class="picker-header">
|
||||||
</svg>
|
<span class="picker-title"
|
||||||
</button>
|
>Edit tags — {selectedIds.size} file{selectedIds.size !== 1 ? 's' : ''}</span
|
||||||
<div class="sel-spacer"></div>
|
>
|
||||||
<button class="sel-action add-action" onclick={() => (poolPickerOpen = true)}>
|
<button class="picker-close" onclick={() => (tagEditorOpen = false)} aria-label="Close">
|
||||||
Add to pool
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">
|
||||||
</button>
|
<path
|
||||||
<button class="sel-action remove-action" onclick={() => (confirmRemove = true)}>
|
d="M3 3l10 10M13 3L3 13"
|
||||||
Remove from pool
|
stroke="currentColor"
|
||||||
</button>
|
stroke-width="1.8"
|
||||||
|
stroke-linecap="round"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="tag-sheet-body">
|
||||||
|
<BulkTagEditor fileIds={[...selectedIds]} onDone={() => (tagEditorOpen = false)} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
{#if confirmDeleteFiles}
|
||||||
|
<ConfirmDialog
|
||||||
|
message={`Move ${selectedIds.size} file${selectedIds.size !== 1 ? 's' : ''} to trash?`}
|
||||||
|
confirmLabel="Move to trash"
|
||||||
|
danger
|
||||||
|
onConfirm={deleteSelected}
|
||||||
|
onCancel={() => (confirmDeleteFiles = false)}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Add the selected files to another pool (reuses the file picker; the order
|
<!-- Add the selected files to another pool (reuses the file picker; the order
|
||||||
follows the selection's insertion order). -->
|
follows the selection's insertion order). -->
|
||||||
{#if poolPickerOpen}
|
{#if poolPickerOpen}
|
||||||
<PoolPicker
|
<PoolPicker
|
||||||
fileIds={[...selectedIds]}
|
fileIds={[...selectedIds]}
|
||||||
onAdded={() => {
|
onAdded={clearSelection}
|
||||||
selectedIds = new Set();
|
|
||||||
lastSelectedIdx = null;
|
|
||||||
}}
|
|
||||||
onClose={() => (poolPickerOpen = false)}
|
onClose={() => (poolPickerOpen = false)}
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -1222,21 +1279,64 @@
|
|||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---- Selection bar ---- */
|
/* ---- Bulk tag editor sheet (shared shell with the files page) ---- */
|
||||||
.selection-bar {
|
.picker-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 10px;
|
inset: 0;
|
||||||
right: 10px;
|
z-index: 110;
|
||||||
bottom: 65px;
|
background: rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.picker-sheet {
|
||||||
|
position: fixed;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
z-index: 111;
|
||||||
background-color: var(--color-bg-secondary);
|
background-color: var(--color-bg-secondary);
|
||||||
border-radius: 10px;
|
border-radius: 14px 14px 0 0;
|
||||||
box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);
|
padding-bottom: env(safe-area-inset-bottom, 0px);
|
||||||
padding: 10px 14px;
|
max-height: 70dvh;
|
||||||
z-index: 100;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
animation: slide-up 0.18s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-sheet {
|
||||||
|
max-height: 80dvh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.picker-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 4px;
|
padding: 14px 16px 10px;
|
||||||
animation: slide-up 0.18s ease-out;
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.picker-title {
|
||||||
|
flex: 1;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.picker-close {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
padding: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.picker-close:hover {
|
||||||
|
color: var(--color-text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-sheet-body {
|
||||||
|
padding: 0 14px 16px;
|
||||||
|
overflow-y: auto;
|
||||||
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes slide-up {
|
@keyframes slide-up {
|
||||||
@@ -1250,62 +1350,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.sel-cancel {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 5px;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 4px 6px;
|
|
||||||
border-radius: 6px;
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
font-family: inherit;
|
|
||||||
}
|
|
||||||
.sel-cancel:hover {
|
|
||||||
background-color: color-mix(in srgb, var(--color-accent) 12%, transparent);
|
|
||||||
color: var(--color-text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.sel-num {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: var(--color-text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.sel-label {
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sel-spacer {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sel-action {
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 6px 10px;
|
|
||||||
border-radius: 6px;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-family: inherit;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.add-action {
|
|
||||||
color: var(--color-accent);
|
|
||||||
}
|
|
||||||
.add-action:hover {
|
|
||||||
background-color: color-mix(in srgb, var(--color-accent) 15%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.remove-action {
|
|
||||||
color: var(--color-danger);
|
|
||||||
}
|
|
||||||
.remove-action:hover {
|
|
||||||
background-color: color-mix(in srgb, var(--color-danger) 15%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---- Add files overlay ---- */
|
/* ---- Add files overlay ---- */
|
||||||
.add-overlay {
|
.add-overlay {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 36 KiB |
@@ -10,53 +10,28 @@
|
|||||||
"theme_color": "#312F45",
|
"theme_color": "#312F45",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "/images/android-icon-36x36.png",
|
"src": "/images/icon-tile-192x192.png",
|
||||||
"sizes": "36x36",
|
|
||||||
"type": "image/png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "/images/android-icon-48x48.png",
|
|
||||||
"sizes": "48x48",
|
|
||||||
"type": "image/png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "/images/android-icon-72x72.png",
|
|
||||||
"sizes": "72x72",
|
|
||||||
"type": "image/png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "/images/android-icon-96x96.png",
|
|
||||||
"sizes": "96x96",
|
|
||||||
"type": "image/png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "/images/android-icon-144x144.png",
|
|
||||||
"sizes": "144x144",
|
|
||||||
"type": "image/png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "/images/pwa-192x192.png",
|
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image/png",
|
"type": "image/png",
|
||||||
"purpose": "any"
|
"purpose": "any"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "/images/pwa-512x512.png",
|
"src": "/images/icon-tile-512x512.png",
|
||||||
"sizes": "512x512",
|
"sizes": "512x512",
|
||||||
"type": "image/png",
|
"type": "image/png",
|
||||||
"purpose": "any"
|
"purpose": "any"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "/images/pwa-maskable-192x192.png",
|
"src": "/images/icon-maskable-192x192.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image/png",
|
"type": "image/png",
|
||||||
"purpose": "maskable"
|
"purpose": "maskable"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "/images/pwa-maskable-512x512.png",
|
"src": "/images/icon-maskable-512x512.png",
|
||||||
"sizes": "512x512",
|
"sizes": "512x512",
|
||||||
"type": "image/png",
|
"type": "image/png",
|
||||||
"purpose": "maskable"
|
"purpose": "maskable"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ info:
|
|||||||
description: |
|
description: |
|
||||||
REST API for Tanabata File Manager — a multi-user, tag-based web file manager.
|
REST API for Tanabata File Manager — a multi-user, tag-based web file manager.
|
||||||
|
|
||||||
|
## Versioning
|
||||||
|
The `version` field above is the product release (tracks the app's 3.0.0).
|
||||||
|
The URL path version (`/api/v1`) is the API compatibility version and changes
|
||||||
|
only on a breaking contract change — the two are intentionally independent.
|
||||||
|
|
||||||
## Authentication
|
## Authentication
|
||||||
All endpoints require a Bearer JWT token in the `Authorization` header,
|
All endpoints require a Bearer JWT token in the `Authorization` header,
|
||||||
except `POST /auth/login`, `POST /auth/refresh` (which carry their own
|
except `POST /auth/login`, `POST /auth/refresh` (which carry their own
|
||||||
@@ -35,7 +40,8 @@ info:
|
|||||||
Example: `{r=1,&,m~image%}` → needs review AND is an image.
|
Example: `{r=1,&,m~image%}` → needs review AND is an image.
|
||||||
version: 3.0.0
|
version: 3.0.0
|
||||||
license:
|
license:
|
||||||
name: Proprietary
|
name: AGPL-3.0-or-later
|
||||||
|
url: https://www.gnu.org/licenses/agpl-3.0.html
|
||||||
|
|
||||||
servers:
|
servers:
|
||||||
- url: /api/v1
|
- url: /api/v1
|
||||||
|
|||||||