Compare commits
No commits in common. "main" and "better_error" have entirely different histories.
main
...
better_err
16 changed files with 896 additions and 1725 deletions
661
LICENSE
661
LICENSE
|
@ -1,661 +0,0 @@
|
||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your version
|
|
||||||
supports such interaction) an opportunity to receive the Corresponding
|
|
||||||
Source of your version by providing access to the Corresponding Source
|
|
||||||
from a network server at no charge, through some standard or customary
|
|
||||||
means of facilitating copying of software. This Corresponding Source
|
|
||||||
shall include the Corresponding Source for any work covered by version 3
|
|
||||||
of the GNU General Public License that is incorporated pursuant to the
|
|
||||||
following paragraph.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU Affero General Public License from time to time. Such new versions
|
|
||||||
will be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU Affero General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU Affero General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU Affero General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
syng2
|
|
||||||
Copyright (C) 2022 Christoph Stahl
|
|
||||||
|
|
||||||
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/>.
|
|
17
README.md
17
README.md
|
@ -1,7 +1,20 @@
|
||||||
# Syng web client
|
# foundation-vue
|
||||||
|
|
||||||
This is the web client for [Syng](https://github.com/christofsteel/syng)
|
This template should help get you started developing with Vue 3 in Vite.
|
||||||
|
|
||||||
|
## Recommended IDE Setup
|
||||||
|
|
||||||
|
[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
|
||||||
|
|
||||||
|
## Customize configuration
|
||||||
|
|
||||||
|
See [Vite Configuration Reference](https://vitejs.dev/config/).
|
||||||
|
|
||||||
|
## Project Setup
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm install
|
||||||
|
```
|
||||||
|
|
||||||
### Compile and Hot-Reload for Development
|
### Compile and Hot-Reload for Development
|
||||||
|
|
||||||
|
|
1610
package-lock.json
generated
1610
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "syng-web",
|
"name": "syng-web",
|
||||||
"version": "2.0.4",
|
"version": "2.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
|
|
135
src/App.vue
135
src/App.vue
|
@ -10,7 +10,6 @@ import WelcomeReveal from './components/WelcomeReveal.vue'
|
||||||
import GetUserName from './components/GetUserName.vue'
|
import GetUserName from './components/GetUserName.vue'
|
||||||
import Footer from './components/Footer.vue'
|
import Footer from './components/Footer.vue'
|
||||||
import AlreadyQueued from './components/AlreadyQueued.vue'
|
import AlreadyQueued from './components/AlreadyQueued.vue'
|
||||||
import Config from './components/Config.vue'
|
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
@ -32,10 +31,7 @@ const state = ref({
|
||||||
'last_msg': "",
|
'last_msg': "",
|
||||||
'join_msg': null,
|
'join_msg': null,
|
||||||
'uid': null,
|
'uid': null,
|
||||||
'double_entry': {'artist': null, 'title': null, 'reason': null},
|
'double_entry': {'artist': null, 'title': null, 'reason': null}
|
||||||
'waiting_room_policy': null,
|
|
||||||
'config': {},
|
|
||||||
'kiosk': false
|
|
||||||
})
|
})
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
@ -70,11 +66,6 @@ function setCurrentName(name) { state.value.current_name = name }
|
||||||
function updateName(evt) { evt.target.textContent = state.value.name;}
|
function updateName(evt) { evt.target.textContent = state.value.name;}
|
||||||
function setServer(server) { state.value.server = server }
|
function setServer(server) { state.value.server = server }
|
||||||
function setSearchTerm(searchTerm) { state.value.search.searchTerm = searchTerm }
|
function setSearchTerm(searchTerm) { state.value.search.searchTerm = searchTerm }
|
||||||
function update_config(config) {
|
|
||||||
state.socket.emit("update_config", {"config": config})
|
|
||||||
close_config()
|
|
||||||
}
|
|
||||||
function setKiosk(kiosk) { state.value.kiosk = kiosk }
|
|
||||||
|
|
||||||
function search() {
|
function search() {
|
||||||
var yt_checker = /^(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/;
|
var yt_checker = /^(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/;
|
||||||
|
@ -86,14 +77,6 @@ function search() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_config() {
|
|
||||||
state.socket.emit("show_config");
|
|
||||||
}
|
|
||||||
|
|
||||||
function waitingRoomToQueue(uuid) {
|
|
||||||
state.socket.emit("waiting-room-to-queue", {"uuid": uuid})
|
|
||||||
}
|
|
||||||
|
|
||||||
function append(entry) {
|
function append(entry) {
|
||||||
checked_append_with_name(entry, state.value.name)
|
checked_append_with_name(entry, state.value.name)
|
||||||
}
|
}
|
||||||
|
@ -104,39 +87,55 @@ function checked_append_with_name(entry, name) {
|
||||||
$("#getusername").foundation("open");
|
$("#getusername").foundation("open");
|
||||||
} else {
|
} else {
|
||||||
$("#getusername").foundation("close");
|
$("#getusername").foundation("close");
|
||||||
raw_append(entry.ident, name, entry.source, entry.title, entry.artist, state.value.uid);
|
|
||||||
|
var splitUserName = name.toLowerCase().split(/\b/).filter(e => e.trim().length > 3);
|
||||||
|
var uid_in_queue = false;
|
||||||
|
var name_in_queue = false;
|
||||||
|
for (const entry of state.value.queue) {
|
||||||
|
/* if(entry.uid == state.value.uid && !state.value.admin) {
|
||||||
|
state.value.double_entry = entry;
|
||||||
|
state.value.double_entry.reason = "uid";
|
||||||
|
uid_in_queue = true;
|
||||||
|
break;
|
||||||
|
} */
|
||||||
|
|
||||||
|
var splitEntryUserName = entry.performer.toLowerCase().split(/\b/).filter(e => e.trim().length > 3);
|
||||||
|
var difference = splitUserName.filter(x => splitEntryUserName.includes(x));
|
||||||
|
if (difference.length > 0) {
|
||||||
|
state.value.double_entry = entry;
|
||||||
|
state.value.double_entry.reason = "name";
|
||||||
|
name_in_queue = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(name_in_queue || uid_in_queue) {
|
||||||
|
state.value.current_entry = entry;
|
||||||
|
$("#alreadyqueued").foundation("open");
|
||||||
|
} else {
|
||||||
|
raw_append(entry.ident, name, entry.source, state.value.uid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function append_anyway(entry) {
|
function raw_append(ident, name, source, uid) {
|
||||||
$("#getusername").foundation("close");
|
$("#getusername").foundation("close");
|
||||||
$("#alreadyqueued").foundation("close");
|
$("#alreadyqueued").foundation("close");
|
||||||
|
|
||||||
state.value.current_name = null;
|
state.value.current_name = null;
|
||||||
state.value.current_entry = null;
|
state.value.current_entry = null;
|
||||||
state.value.double_entry = {'artist': null, 'title': null, 'reason': null};
|
state.value.double_entry = {'artist': null, 'title': null, 'reason': null};
|
||||||
state.socket.emit("append-anyway", {"ident": entry.ident, "performer": entry.performer, "source": entry.source, "title": entry.title, "artist": entry.artist, "uid": null });
|
state.socket.emit("append", {"ident": ident, "performer": name, "source": source, "uid": uid });
|
||||||
$("#queue-tab-title").click();
|
$("#queue-tab-title").click();
|
||||||
}
|
}
|
||||||
|
|
||||||
function raw_append(ident, name, source, title, artist, uid) {
|
function wait_append(ident, name, source, uid) {
|
||||||
$("#getusername").foundation("close");
|
$("#getusername").foundation("close");
|
||||||
$("#alreadyqueued").foundation("close");
|
$("#alreadyqueued").foundation("close");
|
||||||
|
|
||||||
state.value.current_name = null;
|
state.value.current_name = null;
|
||||||
state.value.current_entry = null;
|
state.value.current_entry = null;
|
||||||
state.value.double_entry = {'artist': null, 'title': null, 'reason': null};
|
state.socket.emit("waiting-room-append", {"ident": ident, "performer": name, "source": source, "uid": uid });
|
||||||
state.socket.emit("append", {"ident": ident, "performer": name, "source": source, "title":title, "artist": artist,"uid": uid });
|
|
||||||
$("#queue-tab-title").click();
|
|
||||||
}
|
|
||||||
|
|
||||||
function wait_append(entry) {
|
|
||||||
$("#getusername").foundation("close");
|
|
||||||
$("#alreadyqueued").foundation("close");
|
|
||||||
|
|
||||||
state.socket.emit("waiting-room-append", {"ident": entry.ident, "performer": entry.performer, "source": entry.source, "title": entry.title, "artist": entry.artist, "uid": null });
|
|
||||||
state.value.current_name = null;
|
|
||||||
state.value.current_entry = null;
|
|
||||||
$("#queue-tab-title").click();
|
$("#queue-tab-title").click();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,9 +144,6 @@ function close_name() {
|
||||||
state.value.current_entry = null
|
state.value.current_entry = null
|
||||||
state.value.current_name = null
|
state.value.current_name = null
|
||||||
}
|
}
|
||||||
function close_config() {
|
|
||||||
$("#config").foundation("close")
|
|
||||||
}
|
|
||||||
|
|
||||||
function close_already_queued() {
|
function close_already_queued() {
|
||||||
$("#alreadyqueued").foundation("close");
|
$("#alreadyqueued").foundation("close");
|
||||||
|
@ -175,10 +171,6 @@ function moveUp(uuid) {
|
||||||
state.socket.emit("move-up", {"uuid": uuid})
|
state.socket.emit("move-up", {"uuid": uuid})
|
||||||
}
|
}
|
||||||
|
|
||||||
function moveTo(data) {
|
|
||||||
state.socket.emit("move-to", data)
|
|
||||||
}
|
|
||||||
|
|
||||||
function skip(uuid) {
|
function skip(uuid) {
|
||||||
state.socket.emit("skip", {"uuid": uuid})
|
state.socket.emit("skip", {"uuid": uuid})
|
||||||
}
|
}
|
||||||
|
@ -198,18 +190,6 @@ function registerSocketEvents() {
|
||||||
state.value.queue=val.queue
|
state.value.queue=val.queue
|
||||||
state.value.recent=val.recent
|
state.value.recent=val.recent
|
||||||
state.value.waiting_room = val.waiting_room
|
state.value.waiting_room = val.waiting_room
|
||||||
state.value.waiting_room_policy = val.config.waiting_room_policy
|
|
||||||
})
|
|
||||||
|
|
||||||
state.socket.on("config", (response) => {
|
|
||||||
state.value.config=response
|
|
||||||
$("#config").foundation("open")
|
|
||||||
})
|
|
||||||
|
|
||||||
state.socket.on("update_config", (response) => {
|
|
||||||
console.log(response)
|
|
||||||
state.value.waiting_room_policy = response["waiting_room_policy"]
|
|
||||||
console.log(state)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
state.socket.on("msg", (response) => {
|
state.socket.on("msg", (response) => {
|
||||||
|
@ -217,12 +197,6 @@ function registerSocketEvents() {
|
||||||
$("#msg").foundation("open")
|
$("#msg").foundation("open")
|
||||||
})
|
})
|
||||||
|
|
||||||
state.socket.on("ask_for_waitingroom", (response) => {
|
|
||||||
state.value.double_entry = response.old_entry;
|
|
||||||
state.value.current_entry = response.current_entry;
|
|
||||||
$("#alreadyqueued").foundation("open");
|
|
||||||
})
|
|
||||||
|
|
||||||
state.socket.on("err", (response) => {
|
state.socket.on("err", (response) => {
|
||||||
console.log(response)
|
console.log(response)
|
||||||
switch(response.type) {
|
switch(response.type) {
|
||||||
|
@ -231,18 +205,6 @@ function registerSocketEvents() {
|
||||||
var date = new Date(response.end_time * 1000).toLocaleString();
|
var date = new Date(response.end_time * 1000).toLocaleString();
|
||||||
state.value.last_msg = prefix + date;
|
state.value.last_msg = prefix + date;
|
||||||
break;
|
break;
|
||||||
case "JSON_MALFORMED":
|
|
||||||
state.value.last_msg = "Malformed JSON in config"
|
|
||||||
break;
|
|
||||||
case "NO_ADMIN":
|
|
||||||
state.value.last_msg = "Forbidden: Not in admin mode"
|
|
||||||
break;
|
|
||||||
case "PROFANITY":
|
|
||||||
state.value.last_msg = "Your name \"" + response.name + "\" may contain profanity, please choose another name!"
|
|
||||||
break;
|
|
||||||
case "NAME_LENGTH":
|
|
||||||
state.value.last_msg = "Your name \"" + response.name + "\" is to long (> 50 Characters), please choose another name!"
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
state.value.last_msg = "Unknown Error";
|
state.value.last_msg = "Unknown Error";
|
||||||
break;
|
break;
|
||||||
|
@ -270,8 +232,10 @@ function joinRoom() {
|
||||||
} else {
|
} else {
|
||||||
state.value.join_msg = "<strong>No such room!</strong> <br/>" +
|
state.value.join_msg = "<strong>No such room!</strong> <br/>" +
|
||||||
"Please use the correct room code your organizer provided you.<br/>" +
|
"Please use the correct room code your organizer provided you.<br/>" +
|
||||||
"To host your own syng powered karaoke events, please download and " +
|
"To host your own syng powered karaoke parties, please download and " +
|
||||||
"install <a href='https://github.com/christofsteel/syng' target='_blank'>Syng</a>"
|
"install <a href='https://git.k-fortytwo.de/christofsteel/syng2.git' " +
|
||||||
|
"target='_blank'>Syng</a> and run it with <pre>syng-client " +
|
||||||
|
state.value.server + "</pre>"
|
||||||
if(state.value.joined) {
|
if(state.value.joined) {
|
||||||
state.socket.disconnect()
|
state.socket.disconnect()
|
||||||
setTimeout(() => connect(), 2000)
|
setTimeout(() => connect(), 2000)
|
||||||
|
@ -283,7 +247,7 @@ function joinRoom() {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="page">
|
<div class="page">
|
||||||
<div class="row" :id="state.kiosk ? 'main-content-kiosk' : 'main-content'">
|
<div class="row" id="main-content">
|
||||||
<MobileLayout
|
<MobileLayout
|
||||||
v-show="state.is_small"
|
v-show="state.is_small"
|
||||||
:state="state"
|
:state="state"
|
||||||
|
@ -293,8 +257,6 @@ function joinRoom() {
|
||||||
@skip="skip"
|
@skip="skip"
|
||||||
@skipCurrent="skipCurrent"
|
@skipCurrent="skipCurrent"
|
||||||
@moveUp="moveUp"
|
@moveUp="moveUp"
|
||||||
@moveTo="moveTo"
|
|
||||||
@waitingRoomToQueue="waitingRoomToQueue"
|
|
||||||
/>
|
/>
|
||||||
<DesktopLayout
|
<DesktopLayout
|
||||||
v-show="!state.is_small"
|
v-show="!state.is_small"
|
||||||
|
@ -305,8 +267,6 @@ function joinRoom() {
|
||||||
@skip="skip"
|
@skip="skip"
|
||||||
@skipCurrent="skipCurrent"
|
@skipCurrent="skipCurrent"
|
||||||
@moveUp="moveUp"
|
@moveUp="moveUp"
|
||||||
@moveTo="moveTo"
|
|
||||||
@waitingRoomToQueue="waitingRoomToQueue"
|
|
||||||
/>
|
/>
|
||||||
<WelcomeReveal
|
<WelcomeReveal
|
||||||
v-if="!state.joined"
|
v-if="!state.joined"
|
||||||
|
@ -315,13 +275,11 @@ function joinRoom() {
|
||||||
:joinMsg="state.join_msg"
|
:joinMsg="state.join_msg"
|
||||||
:name="state.name"
|
:name="state.name"
|
||||||
:secret="state.secret"
|
:secret="state.secret"
|
||||||
:kiosk="state.kiosk"
|
|
||||||
@connect="connect"
|
@connect="connect"
|
||||||
@update:room="setRoomCode"
|
@update:room="setRoomCode"
|
||||||
@update:name="setName"
|
@update:name="setName"
|
||||||
@update:server="setServer"
|
@update:server="setServer"
|
||||||
@update:secret="setSecret"
|
@update:secret="setSecret"
|
||||||
@update:kiosk="setKiosk"
|
|
||||||
/>
|
/>
|
||||||
<GetUserName
|
<GetUserName
|
||||||
:current_name="state.current_name"
|
:current_name="state.current_name"
|
||||||
|
@ -331,12 +289,10 @@ function joinRoom() {
|
||||||
@close_name="close_name"
|
@close_name="close_name"
|
||||||
/>
|
/>
|
||||||
<AlreadyQueued
|
<AlreadyQueued
|
||||||
@append="append_anyway"
|
@append="raw_append(state.current_entry.ident, state.name ? state.name : state.current_name, state.current_entry.source, state.uid)"
|
||||||
@wait="wait_append"
|
@wait="(uid) => wait_append(state.current_entry.ident, state.name ? state.name : state.current_name, state.current_entry.source, null)"
|
||||||
@cancel="close_already_queued"
|
@cancel="close_already_queued"
|
||||||
:waiting_room_policy="state.waiting_room_policy"
|
|
||||||
:double_entry="state.double_entry"
|
:double_entry="state.double_entry"
|
||||||
:current_entry="state.current_entry"
|
|
||||||
/>
|
/>
|
||||||
<div class="reveal" id="msg" data-reveal>
|
<div class="reveal" id="msg" data-reveal>
|
||||||
{{ state.last_msg }}
|
{{ state.last_msg }}
|
||||||
|
@ -347,13 +303,9 @@ function joinRoom() {
|
||||||
</div>
|
</div>
|
||||||
<Footer
|
<Footer
|
||||||
:name="state.name"
|
:name="state.name"
|
||||||
:admin="state.admin"
|
|
||||||
:kiosk="state.kiosk"
|
|
||||||
@update:name="setName"
|
@update:name="setName"
|
||||||
@logout="emptyLocalStorageAndLogout"
|
@logout="emptyLocalStorageAndLogout"
|
||||||
@config="show_config"
|
|
||||||
/>
|
/>
|
||||||
<Config :config="state.config" @update_config="update_config" @close="close_config"/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -371,15 +323,10 @@ function joinRoom() {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-content {
|
#main-content {
|
||||||
height: calc(100vh - 50px);
|
height: calc(100vh - 50px);
|
||||||
max-height: 100vh;
|
max-height: 100vh;
|
||||||
max-width: 100vw;
|
max-width: 100vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-content-kiosk {
|
|
||||||
height: 100vh;
|
|
||||||
max-height: 100vh;
|
|
||||||
max-width: 100vw;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
const emits = defineEmits(["append", "wait", "cancel"]);
|
const emits = defineEmits(["append", "wait", "cancel"]);
|
||||||
const props = defineProps(["double_entry", "current_entry", "waiting_room_policy"]);
|
const props = defineProps(["double_entry"]);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="reveal" id="alreadyqueued" data-reveal >
|
<div class="reveal" id="alreadyqueued" data-reveal >
|
||||||
|
@ -8,22 +8,22 @@ const props = defineProps(["double_entry", "current_entry", "waiting_room_policy
|
||||||
<p>
|
<p>
|
||||||
<b>{{double_entry.artist}} - {{double_entry.title}}</b> <i>({{double_entry.performer}})</i>
|
<b>{{double_entry.artist}} - {{double_entry.title}}</b> <i>({{double_entry.performer}})</i>
|
||||||
</p>
|
</p>
|
||||||
<p>To give everyone a chance to sing, you are limited to one song in the active queue, but you can add yourself to the <b>waiting room</b>.
|
<p>You can
|
||||||
Songs in the waiting room will be added to the queue, once your old song leaves the queue.</p>
|
|
||||||
<p>If you think this is an error, you can</p>
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>choose another name, or</li>
|
<li>append the song anyway, or</li>
|
||||||
<li>add it to the waiting room and talk to the organizers for manual insertion into the queue.</li>
|
<li>add it to the <i>waiting room</i>.</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</p>
|
||||||
|
<p>Songs in the waiting room will be added to the queue, once the last song of the performer leaves the queue.</p>
|
||||||
<div class="grid-x">
|
<div class="grid-x">
|
||||||
<div class="cell medium-6 small-12 btn">
|
<div class="cell medium-6 small-12 btn">
|
||||||
<button class="button expanded" @click="$emit('wait', current_entry)">Add to waiting room</button>
|
<button class="button expanded" @click="$emit('wait', double_entry.reason == 'uid' ? double_entry.uid : null)">Waiting room</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="cell medium-6 small-12 btn">
|
<div class="cell medium-6 small-12 btn">
|
||||||
<button class="button expanded alert" @click="$emit('cancel')">Cancel</button>
|
<button class="button expanded" @click="$emit('append')">Append anyway</button>
|
||||||
</div>
|
</div>
|
||||||
<div v-show="waiting_room_policy && waiting_room_policy.toLowerCase() == 'optional'" class="cell medium-12 small-12 btn">
|
<div class="cell medium-12 small-12 btn">
|
||||||
<button class="button expanded" @click="$emit('append', current_entry)">Append Anyway</button>
|
<button class="button expanded alert" @click="$emit('cancel')">Cancel</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const props = defineProps(["config"])
|
|
||||||
const emits = defineEmits(["update_config", "close"])
|
|
||||||
|
|
||||||
const new_cfg = ref({"config": ""})
|
|
||||||
|
|
||||||
function update_new_cfg(evt) {
|
|
||||||
new_cfg.value.config = evt.target.value
|
|
||||||
}
|
|
||||||
|
|
||||||
function send_cfg() {
|
|
||||||
console.log(new_cfg.value.config)
|
|
||||||
emits('update_config', new_cfg.value.config)
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="reveal" id="config" data-reveal >
|
|
||||||
<h1>Config</h1>
|
|
||||||
<textarea @input="update_new_cfg">{{config}}</textarea>
|
|
||||||
<div class="grid-x">
|
|
||||||
<div class="cell medium-6 small-12 btn">
|
|
||||||
<button
|
|
||||||
class="button expanded"
|
|
||||||
@click="send_cfg"
|
|
||||||
>
|
|
||||||
Ok
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="cell medium-6 small-12 btn">
|
|
||||||
<button class="button expanded alert" @click="$emit('close')">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
|
@ -4,7 +4,7 @@ import QueueDesktop from './QueueDesktop.vue'
|
||||||
import RecentDesktop from './RecentDesktop.vue'
|
import RecentDesktop from './RecentDesktop.vue'
|
||||||
|
|
||||||
const props = defineProps(['state']);
|
const props = defineProps(['state']);
|
||||||
const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skipCurrent', 'moveUp'])
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,13 +14,10 @@ const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skip
|
||||||
<QueueDesktop
|
<QueueDesktop
|
||||||
:queue="state.queue"
|
:queue="state.queue"
|
||||||
:waiting_room="state.waiting_room"
|
:waiting_room="state.waiting_room"
|
||||||
:waiting_room_policy="state.waiting_room_policy"
|
|
||||||
:admin="state.admin"
|
:admin="state.admin"
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@moveTo="(data) => $emit('moveTo', data)"
|
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@waitingRoomToQueue="(uuid) => $emit('waitingRoomToQueue', uuid)"
|
|
||||||
/>
|
/>
|
||||||
<RecentDesktop :recent="state.recent" :admin="state.admin" />
|
<RecentDesktop :recent="state.recent" :admin="state.admin" />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
const props = defineProps(['admin', 'entry', 'current', 'firstStartedAt', 'offset', 'currentTime', 'waitingRoom'])
|
const props = defineProps(['admin', 'entry', 'current', 'firstStartedAt', 'offset', 'currentTime', 'waitingRoom'])
|
||||||
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp'])
|
||||||
|
|
||||||
function skip() {
|
function skip() {
|
||||||
if(props.current) {
|
if(props.current) {
|
||||||
|
@ -16,9 +16,6 @@ const eta = computed(() =>{
|
||||||
let startTime = new Date(props.firstStartedAt * 1000)
|
let startTime = new Date(props.firstStartedAt * 1000)
|
||||||
let playBackSeconds = (now - startTime) / 1000
|
let playBackSeconds = (now - startTime) / 1000
|
||||||
let etaSeconds = Math.round(props.offset - playBackSeconds)
|
let etaSeconds = Math.round(props.offset - playBackSeconds)
|
||||||
if (etaSeconds < 0) {
|
|
||||||
etaSeconds = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isNaN(etaSeconds)) {
|
if (isNaN(etaSeconds)) {
|
||||||
return null
|
return null
|
||||||
|
@ -27,56 +24,10 @@ const eta = computed(() =>{
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const dragging = (e) => {
|
|
||||||
const data = {
|
|
||||||
uuid: props.entry.uuid,
|
|
||||||
index: $(e.target.closest('li')).index()}
|
|
||||||
console.log(data)
|
|
||||||
e.dataTransfer.clearData()
|
|
||||||
e.dataTransfer.setData('application/json', JSON.stringify(data))
|
|
||||||
e.dataTransfer.effectAllowed = 'move'
|
|
||||||
}
|
|
||||||
|
|
||||||
const dragend = (e) => {
|
|
||||||
e.preventDefault()
|
|
||||||
e.target.closest('li').classList.remove('draggedoverBottom')
|
|
||||||
e.target.closest('li').classList.remove('draggedoverTop')
|
|
||||||
}
|
|
||||||
|
|
||||||
const dropped = (e) => {
|
|
||||||
e.preventDefault()
|
|
||||||
e.target.closest('li').classList.remove('draggedoverBottom')
|
|
||||||
e.target.closest('li').classList.remove('draggedoverTop')
|
|
||||||
const drop_index = $(e.target.closest('li')).index()
|
|
||||||
const element = JSON.parse(e.dataTransfer.getData('application/json'))
|
|
||||||
if (element.index < drop_index) {
|
|
||||||
emits('moveTo', {"uuid": element.uuid , "target": drop_index + 1})
|
|
||||||
} else {
|
|
||||||
emits('moveTo', {"uuid": element.uuid , "target": drop_index})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const dragover = (e) => {
|
|
||||||
e.preventDefault()
|
|
||||||
e.dataTransfer.dropEffect = 'move'
|
|
||||||
const element = JSON.parse(e.dataTransfer.getData('application/json'))
|
|
||||||
const index = $(e.target.closest('li')).index()
|
|
||||||
if (index < element.index) {
|
|
||||||
e.target.closest('li').classList.add('draggedoverTop')
|
|
||||||
} else {
|
|
||||||
e.target.closest('li').classList.add('draggedoverBottom')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const dragleave = (e) => {
|
|
||||||
e.preventDefault()
|
|
||||||
e.target.closest('li').classList.remove('draggedoverTop')
|
|
||||||
e.target.closest('li').classList.remove('draggedoverBottom')
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<li :class="[{ current: current }, {waitingRoom: waitingRoom}]" :draggable="admin" @dragstart="dragging" @dragend="dragend" @dragover="dragover" @dragleave="dragleave" @drop="dropped">
|
<li :class="[{ current: current }, {waitingRoom: waitingRoom}]">
|
||||||
<div class="grid-x">
|
<div class="grid-x">
|
||||||
<div class="cell" :class="{'small-9': admin}">
|
<div class="cell" :class="{'small-9': admin}">
|
||||||
<span class="artist">{{ entry.artist }}</span>
|
<span class="artist">{{ entry.artist }}</span>
|
||||||
|
@ -85,21 +36,15 @@ const dragleave = (e) => {
|
||||||
<span v-if="!current && !waitingRoom" class="eta">{{ eta }}</span>
|
<span v-if="!current && !waitingRoom" class="eta">{{ eta }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="admin" class="cell small-3">
|
<div v-if="admin" class="cell small-3">
|
||||||
<button v-if="!waitingRoom" class="button alert fright" @click="skip">
|
<button class="button alert fright" @click="skip">
|
||||||
<font-awesome-icon icon="fa-solid fa-times" />
|
<font-awesome-icon icon="fa-solid fa-times" />
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="button success fright"
|
class="button alert fright"
|
||||||
v-if="waitingRoom"
|
v-if="!current && !waitingRoom"
|
||||||
@click="$emit('waitingRoomToQueue', entry.uuid)" >
|
@click="$emit('moveUp', entry.uuid)" >
|
||||||
<font-awesome-icon icon="fa-solid fa-arrows-up-to-line" />
|
<font-awesome-icon icon="fa-solid fa-arrow-up" />
|
||||||
</button>
|
</button>
|
||||||
<!-- <button -->
|
|
||||||
<!-- class="button warning fright" -->
|
|
||||||
<!-- v-if="!current && !waitingRoom" -->
|
|
||||||
<!-- @click="$emit('moveUp', entry.uuid)" > -->
|
|
||||||
<!-- <font-awesome-icon icon="fa-solid fa-arrow-up" /> -->
|
|
||||||
<!-- </button> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -125,12 +70,4 @@ const dragleave = (e) => {
|
||||||
content: "in ";
|
content: "in ";
|
||||||
}
|
}
|
||||||
|
|
||||||
.draggedoverTop {
|
|
||||||
border-top: 2px solid #008000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.draggedoverBottom {
|
|
||||||
border-bottom: 2px solid #008000;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
const props = defineProps(['name', 'admin', 'kiosk'])
|
const props = defineProps(['name'])
|
||||||
const emits = defineEmits(['update:name', 'logout', 'config'])
|
const emits = defineEmits(['update:name', 'logout'])
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<footer v-if="!kiosk">
|
<footer>
|
||||||
Name: <span
|
Name: <span
|
||||||
class="userName"
|
class="userName"
|
||||||
@keyup.enter="(evt) => evt.target.blur()"
|
@keyup.enter="(evt) => evt.target.blur()"
|
||||||
|
@ -13,7 +13,6 @@ const emits = defineEmits(['update:name', 'logout', 'config'])
|
||||||
{{ name }}
|
{{ name }}
|
||||||
</span>
|
</span>
|
||||||
<div class="button alert fright" @click="$emit('logout')">Log out</div>
|
<div class="button alert fright" @click="$emit('logout')">Log out</div>
|
||||||
<div v-if="admin" class="button alert fright" @click="$emit('config')">Config</div>
|
|
||||||
</footer>
|
</footer>
|
||||||
</template>
|
</template>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
|
@ -5,7 +5,7 @@ import RecentTab from './RecentTab.vue'
|
||||||
import TabHeader from './TabHeader.vue'
|
import TabHeader from './TabHeader.vue'
|
||||||
|
|
||||||
const props = defineProps(['state']);
|
const props = defineProps(['state']);
|
||||||
const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skipCurrent', 'moveUp'])
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -23,12 +23,9 @@ const emit = defineEmits(['update:searchTerm', 'search', 'append', 'skip', 'skip
|
||||||
:queue="state.queue"
|
:queue="state.queue"
|
||||||
:admin="state.admin"
|
:admin="state.admin"
|
||||||
:waiting_room="state.waiting_room"
|
:waiting_room="state.waiting_room"
|
||||||
:waiting_room_policy="state.waiting_room_policy"
|
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@moveTo="(data) => $emit('moveTo', data)"
|
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@waitingRoomToQueue="(uuid) => $emit('waitingRoomToQueue', uuid)"
|
|
||||||
/>
|
/>
|
||||||
<RecentTab :recent="state.recent" :admin="state.admin" />
|
<RecentTab :recent="state.recent" :admin="state.admin" />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import QueueInner from './QueueInner.vue'
|
import QueueInner from './QueueInner.vue'
|
||||||
|
|
||||||
const props = defineProps(['queue', 'waiting_room', 'admin', 'waiting_room_policy']);
|
const props = defineProps(['queue', 'waiting_room', 'admin']);
|
||||||
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp'])
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -12,12 +12,9 @@ const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue'
|
||||||
:queue="queue"
|
:queue="queue"
|
||||||
:admin="admin"
|
:admin="admin"
|
||||||
:waiting_room="waiting_room"
|
:waiting_room="waiting_room"
|
||||||
:waiting_room_policy="waiting_room_policy"
|
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@moveTo="(data) => $emit('moveTo', data)"
|
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@waitingRoomToQueue="(uuid) => $emit('waitingRoomToQueue', uuid)"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
import { onMounted, reactive } from 'vue'
|
import { onMounted, reactive } from 'vue'
|
||||||
import Entry from './Entry.vue'
|
import Entry from './Entry.vue'
|
||||||
|
|
||||||
const props = defineProps(['queue', 'waiting_room', 'admin', 'waiting_room_policy']);
|
const props = defineProps(['queue', 'waiting_room', 'admin']);
|
||||||
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp'])
|
||||||
|
|
||||||
let currentTime = reactive({time: Date.now()})
|
let currentTime = reactive({time: Date.now()})
|
||||||
|
|
||||||
|
@ -23,15 +23,12 @@ function offset(index) {
|
||||||
}
|
}
|
||||||
return _offset
|
return _offset
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="vsplit">
|
<div class="vsplit">
|
||||||
<div id="queue-list-wrapper" class="results">
|
<div id="queue-list-wrapper" class="results">
|
||||||
<ul id="queue" class="vertical menu" @drop="dropHandler">
|
<ul id="queue" class="vertical menu">
|
||||||
<Entry
|
<Entry
|
||||||
v-for="(entry, index) in queue"
|
v-for="(entry, index) in queue"
|
||||||
:entry="entry"
|
:entry="entry"
|
||||||
|
@ -43,12 +40,11 @@ function offset(index) {
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@moveTo="(data) => $emit('moveTo', data)"
|
|
||||||
/>
|
/>
|
||||||
</ul>
|
</ul>
|
||||||
<div v-show="waiting_room_policy" class="header">Waiting room</div>
|
<div class="header">Waiting room</div>
|
||||||
<ul id="waiting_room" class="vertical menu">
|
<ul id="waiting_room" class="vertical menu">
|
||||||
<Entry v-show="waiting_room_policy"
|
<Entry
|
||||||
v-for="(entry, index) in waiting_room"
|
v-for="(entry, index) in waiting_room"
|
||||||
:entry="entry"
|
:entry="entry"
|
||||||
:admin="admin"
|
:admin="admin"
|
||||||
|
@ -56,7 +52,6 @@ function offset(index) {
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@waitingRoomToQueue="(uuid) => $emit('waitingRoomToQueue', uuid)"
|
|
||||||
/>
|
/>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import QueueInner from './QueueInner.vue'
|
import QueueInner from './QueueInner.vue'
|
||||||
|
|
||||||
const props = defineProps(['queue', 'waiting_room', 'admin', 'waiting_room_policy']);
|
const props = defineProps(['queue', 'waiting_room', 'admin']);
|
||||||
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue', 'moveTo'])
|
const emits = defineEmits(['skip', 'skipCurrent', 'moveUp'])
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -11,12 +11,9 @@ const emits = defineEmits(['skip', 'skipCurrent', 'moveUp', 'waitingRoomToQueue'
|
||||||
:queue="queue"
|
:queue="queue"
|
||||||
:admin="admin"
|
:admin="admin"
|
||||||
:waiting_room="waiting_room"
|
:waiting_room="waiting_room"
|
||||||
:waiting_room_policy="waiting_room_policy"
|
|
||||||
@skip="(uuid) => $emit('skip', uuid)"
|
@skip="(uuid) => $emit('skip', uuid)"
|
||||||
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
@moveUp="(uuid) => $emit('moveUp', uuid)"
|
||||||
@skipCurrent="$emit('skipCurrent')"
|
@skipCurrent="$emit('skipCurrent')"
|
||||||
@waitingRoomToQueue="(uuid) => $emit('waitingRoomToQueue', uuid)"
|
|
||||||
@moveTo="(data) => $emit('moveTo', data)"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
import { onMounted, onBeforeUnmount } from 'vue'
|
import { onMounted, onBeforeUnmount } from 'vue'
|
||||||
import $ from 'jquery'
|
import $ from 'jquery'
|
||||||
|
|
||||||
const emits = defineEmits(['connect', 'update:room', 'update:name', 'update:server', 'update:secret', 'update:kiosk'])
|
const emits = defineEmits(['connect', 'update:room', 'update:name', 'update:server', 'update:secret'])
|
||||||
const props = defineProps(['room', 'server', 'secret', 'name', 'joinMsg', 'kiosk'])
|
const props = defineProps(['room', 'server', 'secret', 'name', 'joinMsg'])
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
$(document).foundation();
|
$(document).foundation();
|
||||||
|
@ -54,11 +54,6 @@ onBeforeUnmount(() => {
|
||||||
<input type="password" @input="$emit('update:secret', $event.target.value)" :value="secret" placeholder="Leave free, if not admin">
|
<input type="password" @input="$emit('update:secret', $event.target.value)" :value="secret" placeholder="Leave free, if not admin">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="medium-12 cell">
|
|
||||||
<label>Kiosk mode
|
|
||||||
<input type="checkbox" id="kiosk" @change="$emit('update:kiosk', $event.target.checked)">
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -6,7 +6,7 @@ import App from './App.vue'
|
||||||
import Main from './Main.vue'
|
import Main from './Main.vue'
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
||||||
import { faMagnifyingGlass, faList, faChair, faArrowUp, faHistory, faPlus, faStepForward, faTimes, faArrowsUpToLine } from '@fortawesome/free-solid-svg-icons'
|
import { faMagnifyingGlass, faList, faChair, faArrowUp, faHistory, faPlus, faStepForward, faTimes } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { faYoutube } from '@fortawesome/free-brands-svg-icons'
|
import { faYoutube } from '@fortawesome/free-brands-svg-icons'
|
||||||
|
|
||||||
import 'foundation-sites/dist/css/foundation.min.css'
|
import 'foundation-sites/dist/css/foundation.min.css'
|
||||||
|
@ -20,7 +20,6 @@ library.add(faYoutube)
|
||||||
library.add(faTimes)
|
library.add(faTimes)
|
||||||
library.add(faArrowUp)
|
library.add(faArrowUp)
|
||||||
library.add(faChair)
|
library.add(faChair)
|
||||||
library.add(faArrowsUpToLine)
|
|
||||||
|
|
||||||
window.jQuery = jquery;
|
window.jQuery = jquery;
|
||||||
window.$ = jquery;
|
window.$ = jquery;
|
||||||
|
|
Loading…
Add table
Reference in a new issue