Merge branch 'develop' into dependency-updates

pull/14/head
Trivernis 6 years ago committed by GitHub
commit 462faddfc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

@ -4,8 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [0.1.0] - 2019-05-19
### Added ### Added
@ -14,17 +13,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Chat to the bingo game (renderd with markdown-it) - Chat to the bingo game (renderd with markdown-it)
- Postgres session storage - Postgres session storage
- sql-file directory `sql` - sql-file directory `sql`
- LICENSE.md (GPL v3)
- eslint to dev dependencys
- table creation script for bingo
- sql scripts for bingo
- data management class for bingo
- libs with utils and global variables
- css for startpage (wip)
- file for css animations
- pug file for startpage
- bingo lobbys
- kick function for bingo
- grid size input
- bingo status bar
- bingo chat commands
- cookie info dialog
- chat and round notifications
### Changed
## Changed
- changed export of `app.js` to the asynchronous init function that returns the app object - changed export of `app.js` to the asynchronous init function that returns the app object
- `bin/www` now calls the init function of `app.js` - `bin/www` now calls the init function of `app.js`
- graphql bingo api
- bingo frontend
- moved some bingo pug files to ./bingo/includes/
- style of `code`
- font to Ubuntu and Ubuntu Monospace
- grid size limit to 5
- improved sql grid word insertion query
### Removed ### Removed
- sqlite3 sesssion storage - sqlite3 sesssion storage
- old frontend
- old bingo pug files
- riddle and users (currently deactivated)
### Fixed ### Fixed
- mobile layout - mobile layout
- code style issues
- Bingo button not shown on refresh
- bingo chat style (images too large)
- backend now returns precise error messages
- setting words won't result in deleting all of them and resaving
- words can now only be set when no round is active
- username allowing emojis
- username can have a length of 0 (now at least 1 character)
- mozilla didn't have a fancy scrollbar (no webkit browser)
- kicked users can join lobby on active round
- users can't join lobby on active round
- server crash on too big phrases

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

@ -1,4 +1,4 @@
# whooshy # whooshy [![CodeFactor](https://www.codefactor.io/repository/github/trivernis/whooshy/badge/develop)](https://www.codefactor.io/repository/github/trivernis/whooshy/overview/develop) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0)
This repository is the node.js webserver running on `(beta.)trivernis.net`. This repository is the node.js webserver running on `(beta.)trivernis.net`.

@ -5,41 +5,38 @@ const createError = require('http-errors'),
logger = require('morgan'), logger = require('morgan'),
compileSass = require('express-compile-sass'), compileSass = require('express-compile-sass'),
session = require('express-session'), session = require('express-session'),
pg = require('pg'),
pgSession = require('connect-pg-simple')(session), pgSession = require('connect-pg-simple')(session),
fsx = require('fs-extra'), fsx = require('fs-extra'),
yaml = require('js-yaml'),
graphqlHTTP = require('express-graphql'), graphqlHTTP = require('express-graphql'),
{buildSchema} = require('graphql'), {buildSchema} = require('graphql'),
{importSchema} = require('graphql-import'), {importSchema} = require('graphql-import'),
globals = require('./lib/globals'),
settings = globals.settings,
indexRouter = require('./routes/index'), indexRouter = require('./routes/index'),
usersRouter = require('./routes/users'), //usersRouter = require('./routes/users'),
riddleRouter = require('./routes/riddle'), //riddleRouter = require('./routes/riddle'),
changelogRouter = require('./routes/changelog'),
bingoRouter = require('./routes/bingo'); bingoRouter = require('./routes/bingo');
let settings = yaml.safeLoad(fsx.readFileSync('default-config.yaml'));
if (fsx.existsSync('config.yaml'))
Object.assign(settings, yaml.safeLoad(fsx.readFileSync('config.yaml')));
async function init() { async function init() {
// grapql default resolver // grapql default resolver
let graphqlResolver = (request, response) => { let graphqlResolver = async (request, response) => {
return { return {
time: Date.now(), time: Date.now(),
bingo: bingoRouter.graphqlResolver(request, response) bingo: await bingoRouter.graphqlResolver(request, response),
acceptCookies: () => {
request.session.acceptedCookies = true;
return true;
} }
}; };
};
// database setup // database setup
let pgPool = new pg.Pool({ let pgPool = globals.pgPool;
host: settings.postgres.host, await pgPool.query(fsx.readFileSync('./sql/init.sql', 'utf-8'));
port: settings.postgres.port, await bingoRouter.init();
user: settings.postgres.user,
password: settings.postgres.password,
database: settings.postgres.database
});
await pgPool.query(fsx.readFileSync('./sql/createSessionTable.sql', 'utf-8'));
let app = express(); let app = express();
@ -61,25 +58,26 @@ async function init() {
resave: false, resave: false,
saveUninitialized: true, saveUninitialized: true,
cookie: { cookie: {
maxAge: 30 * 24 * 60 * 60 * 1000 // maxAge 30 days maxAge: 7 * 24 * 60 * 60 * 1000 // maxAge 7 days
} }
})); }));
app.use('/sass', compileSass({ app.use('/sass', compileSass({
root: './public/stylesheets/sass', root: './public/stylesheets/sass',
sourceMap: true, sourceMap: true,
watchFiles: true, watchFiles: (process.env.NODE_ENV !== 'development'),
logToConsole: true logToConsole: true
})); }));
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
app.use('/', indexRouter); app.use('/', indexRouter);
app.use('/users', usersRouter); //app.use('/users', usersRouter);
app.use(/\/riddle(\/.*)?/, riddleRouter); //app.use(/\/riddle(\/.*)?/, riddleRouter);
app.use('/bingo', bingoRouter); app.use('/bingo', bingoRouter);
app.use('/graphql', graphqlHTTP((request, response) => { app.use('/changelog', changelogRouter);
return { app.use('/graphql', graphqlHTTP(async (request, response) => {
return await {
schema: buildSchema(importSchema('./graphql/schema.graphql')), schema: buildSchema(importSchema('./graphql/schema.graphql')),
rootValue: graphqlResolver(request, response), rootValue: await graphqlResolver(request, response),
context: {session: request.session}, context: {session: request.session},
graphiql: true graphiql: true
}; };
@ -91,7 +89,7 @@ async function init() {
}); });
// error handler // error handler
app.use(function(err, req, res, next) { app.use(function (err, req, res) {
// set locals, only providing error in development // set locals, only providing error in development
res.locals.message = err.message; res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {}; res.locals.error = req.app.get('env') === 'development' ? err : {};

@ -41,7 +41,7 @@ appInit().then((app) => {
*/ */
server.listen(port); server.listen(port);
server.on('error', (error) => onError(error, server)); server.on('error', (error) => onError(error));
server.on('listening', () => onListening(server)); server.on('listening', () => onListening(server));
/** /**
@ -55,15 +55,13 @@ appInit().then((app) => {
function normalizePort(val) { function normalizePort(val) {
let port = parseInt(val, 10); let port = parseInt(val, 10);
if (isNaN(port)) { if (isNaN(port))
// named pipe // named pipe
return val; return val;
}
if (port >= 0) { if (port >= 0)
// port number // port number
return port; return port;
}
return false; return false;
} }
@ -72,10 +70,9 @@ function normalizePort(val) {
* Event listener for HTTP server "error" event. * Event listener for HTTP server "error" event.
*/ */
function onError(error, server) { function onError(error) {
if (error.syscall !== 'listen') { if (error.syscall !== 'listen')
throw error; throw error;
}
let bind = typeof port === 'string' let bind = typeof port === 'string'
? 'Pipe ' + port ? 'Pipe ' + port

@ -1,167 +1,205 @@
type BingoMutation { type BingoMutation {
# creates a game of bingo and returns the game id "creates a lobby for a game and returns the lobby"
createGame(input: CreateGameInput!): BingoGame createLobby(gridSize: Int = 3): BingoLobby
# submit a bingo to the active game session "lobby mutations"
submitBingo: BingoGame mutateLobby(id: ID!): LobbyMutation
# toggle a word (heared or not) on the sessions grid "sets the username of a player"
toggleWord(input: WordInput!): BingoGrid setUsername(username: String): BingoPlayer
}
type LobbyMutation {
"joins the lobby"
join: BingoLobby
"leaves the lobby"
leave: Boolean
"kicks a player from the lobby"
kickPlayer(pid: ID!): BingoPlayer
"starts a round in a lobby if the user is the admin"
startRound: BingoRound
"sets the round status"
setRoundStatus(status: RoundStatus): BingoRound
# set the username of the current session "sets the new gridsize for the lobby"
setUsername(input: UsernameInput!): BingoUser setGridSize(gridSize: Int!): BingoLobby
# recreates the active game to a follow-up "sets the words of a lobby"
createFollowupGame: BingoGame setWords(words: [String]): BingoLobby
# sends a message to the current sessions chat "sends a message to the lobby"
sendChatMessage(input: MessageInput!): ChatMessage sendMessage(message: String): ChatMessage
"submits bingo"
submitBingo: BingoRound
"submits a click on a word and returns the field"
toggleGridField(location: GridCoordinates!): GridField
} }
type BingoQuery { type BingoQuery {
# Returns the currently active bingo game "returns information about a lobby with a specific id"
gameInfo(input: IdInput): BingoGame lobby(id: ID!): BingoLobby
# If there is a bingo in the fields.
checkBingo: Boolean
# Returns the grid of the active bingo game "returns information about a player (if no id is set, its the sessions player)"
activeGrid: BingoGrid player(id: ID): BingoPlayer
} }
type BingoGame { type BingoLobby {
# the id of the bingo game "the id of the lobby"
id: ID! id: ID!
# the words used in the bingo game "the grid size of the lobby"
words: [String]! gridSize: Int!
# the size of the square-grid "all players in the lobby"
gridSize: Int players: [BingoPlayer]
# an array of players active in the bingo game "the admin of the lobby"
players(input: IdInput): [BingoUser] admin: BingoPlayer
# the player-ids that scored a bingo "the active bingo round"
bingos: [String]! currentRound: BingoRound
# if the game has already finished "all rounds the game had"
finished: Boolean rounds: [BingoRound]
# the id of the followup game if it has been created "the messages send in the lobby"
followup: ID messages(limit: Int): [ChatMessage!]
# Returns the last n chat-messages "the words used in the lobby"
getMessages(input: MessageQueryInput): [ChatMessage!] words: [BingoWord]
} }
type BingoUser { type BingoPlayer {
# the id of the bingo user "the id of the player"
id: ID! id: ID!
# the id of the currently active bingo game "the username of the player"
game: ID
# the name of the user
username: String username: String
}
type BingoGrid { "the grid of the player with the given lobby-id"
grid(lobbyId: ID!): BingoGrid
# the grid represented as string matrix "the number of wins the user had in the lobby"
wordGrid: [[String]]! wins(lobbyId: ID!): Int
}
# the grid represented as bingo field matrix type BingoRound {
fieldGrid: [[BingoField]]! "the id of the bingo round"
id: ID!
# if there is a bingo "the winner of the round (if exists)"
bingo: Boolean winner: BingoPlayer
}
type BingoField { "start time of the round"
start: String!
# the word contained in the bingo field "finish time of the round"
word: String finish: String
# if the word was already heared "the status of the bingo round"
submitted: Boolean! status: RoundStatus
# the base64 encoded word "the lobby of the bingo round"
base64Word: String lobby: BingoLobby
} }
type ChatMessage { type BingoGrid {
# the id of the message "the id of the grid"
id: ID! id: ID!
# the content of the message "the grid represented as bingo field matrix"
content: String! fields: [GridField]!
# the content of the message rendered by markdown-it "if there is a bingo"
htmlContent: String bingo: Boolean
# the type of the message "the size of the grid"
type: MessageType! size: Int
}
# the username of the sender type GridField {
username: String
# the time the message was send (in milliseconds) "the word contained in the bingo field"
datetime: String! word: BingoWord
}
# # "if the word was already heared"
# input Types # submitted: Boolean!
# #
input CreateGameInput { "the row of the field"
row: Int!
# the words used to fill the bingo grid "the column of the field"
words: [String!]! column: Int!
# the size of the bingo grid "the grid the field belongs to"
size: Int! = 3 grid: BingoGrid
} }
input WordInput { type BingoWord {
# the normal word string "the id of the word"
word: String id: ID!
# the base64-encoded word "the word itself"
base64Word: String content: String!
}
"the number of players that heared this word"
heared: Int!
input UsernameInput { "the lobby where the word is used"
lobby: BingoLobby
# the username string "if the word was actually heared"
username: String! confirmed: Boolean
} }
input IdInput { type ChatMessage {
# the id "the id of the message"
id: ID! id: ID!
}
input MessageInput { "the content of the message"
content: String!
# the message "the content rendered by markdown-it"
message: String! htmlContent: String
"the type of the message"
type: MessageType!
"the username of the sender"
author: BingoPlayer
"the lobby where the message was send in"
lobby: BingoLobby
"the time the message was created"
created: String!
} }
input MessageQueryInput { # #
# input Types #
# #
# search for a specific id input GridCoordinates {
id: ID
# get the last n messages "the grid row"
last: Int = 10 row: Int!
"the grid column"
column: Int!
} }
# # # #
@ -173,3 +211,9 @@ enum MessageType {
ERROR ERROR
INFO INFO
} }
enum RoundStatus {
ACTIVE
FINISHED
PAUSED
}

@ -8,4 +8,5 @@ type Query {
type Mutation { type Mutation {
bingo: BingoMutation bingo: BingoMutation
acceptCookies: Boolean
} }

@ -0,0 +1,22 @@
const utils = require('./utils'),
pg = require('pg');
const settings = utils.readSettings('.');
Object.assign(exports, {
settings: settings,
pgPool: new pg.Pool({
host: settings.postgres.host,
port: settings.postgres.port,
user: settings.postgres.user,
password: settings.postgres.password,
database: settings.postgres.database
}),
cookieInfo: {
headline: 'This website uses cookies',
content: 'This website uses cookies to store your session data (like for bingo).',
onclick: 'acceptCookies()',
id: 'cookie-container',
button: 'All right!'
}
});

@ -0,0 +1,53 @@
const yaml = require('js-yaml'),
fsx = require('fs-extra');
String.prototype.replaceAll = function(search, replacement) {
let target = this;
return target.replace(new RegExp(search, 'g'), replacement);
};
/**
* Parses the `queries.yaml` file in the path. queries.yaml-format:
* exports: {List} - query keys to export
*
* queryKey:
* file: {String} name of sql-file if the sql is stored in a file.
* sql: {String} pure sql if it is not stored in a file. Will be replaced by file contents if a file was given.
* @param path {String} - the path where the queries.yaml file is stored
*/
function parseSqlYaml(path) {
let queries = yaml.safeLoad(fsx.readFileSync(`${path}/queries.yaml`));
for (let query of queries.exports)
if (queries[query].file)
queries[query].sql = fsx.readFileSync(`${path}/${queries[query].file}`, 'utf-8');
return queries;
}
/**
* Reads the default-config.yaml and config.yaml in the path directory.
* @param path {String} - the directory of the settings files.
*/
function readSettings(path) {
let settings = yaml.safeLoad(fsx.readFileSync(`${path}/default-config.yaml`));
if (fsx.existsSync('config.yaml'))
Object.assign(settings, yaml.safeLoad(fsx.readFileSync(`${path}/config.yaml`)));
return settings;
}
/**
* Returns all lines of a file as array
* @param fname {String} - the name of the file
* @returns {string[]}
*/
function getFileLines(fname) {
return fsx.readFileSync(fname).toString().replaceAll('\r\n', '\n').split('\n');
}
Object.assign(exports, {
parseSqlYaml: parseSqlYaml,
readSettings: readSettings,
getFileLines: getFileLines
});

@ -0,0 +1,17 @@
Sharkinator
Dry River
Cool Dude
Noobmaster69
TheLegend27
BeastMaster64
BitMaster
Angry Koala
Dragonslayer
Goblin Slayer
useless Aqua
theP0wner79
Pr0wn
Cool User 68
My name Jeff
Bingo Bingo Duolingo
Max Mustermann

1670
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -21,11 +21,72 @@
"markdown-it": "8.4.2", "markdown-it": "8.4.2",
"markdown-it-emoji": "1.4.0", "markdown-it-emoji": "1.4.0",
"markdown-it-mark": "2.0.0", "markdown-it-mark": "2.0.0",
"markdown-it-math": "4.1.1",
"markdown-it-smartarrows": "1.0.1", "markdown-it-smartarrows": "1.0.1",
"morgan": "1.9.1", "morgan": "1.9.1",
"node-sass": "4.12.0", "node-sass": "4.12.0",
"pg": "7.11.0", "pg": "7.11.0",
"pug": "2.0.3" "pug": "2.0.3"
},
"devDependencies": {
"eslint": "^5.16.0",
"eslint-plugin-graphql": "^3.0.3",
"eslint-plugin-promise": "^4.1.1",
"standard": "^12.0.1"
},
"eslintConfig": {
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"env": {
"node": true,
"browser": true,
"jquery": true,
"es6": true
},
"extends": [
"eslint:recommended",
"plugin:promise/recommended"
],
"rules": {
"semi": "error",
"semi-style": [
"error",
"last"
],
"no-await-in-loop": "off",
"curly": [
"warn",
"multi",
"consistent"
],
"block-spacing": [
"warn",
"always"
],
"array-bracket-newline": [
"warn",
"consistent"
],
"camelcase": "off",
"comma-spacing": [
"error",
{
"after": true
}
],
"brace-style": [
"error",
"1tbs"
],
"no-console": "off",
"promise/no-promise-in-callback": "off",
"promise/always-return": "off",
"promise/catch-or-return": "off"
},
"plugins": [
"eslint-plugin-graphql",
"eslint-plugin-promise"
]
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

File diff suppressed because it is too large Load Diff

@ -1,28 +1,53 @@
/* eslint-disable no-unused-vars, no-undef */
/**
* HTTP POST to an url with a post body
* @param url {String} - the url to post to
* @param postBody {JSON|Object} - the json-object to post
* @returns {Promise<any>}
*/
function postData(url, postBody) { function postData(url, postBody) {
let request = new XMLHttpRequest(); let request = new XMLHttpRequest();
return new Promise((res, rej) => { return new Promise((resolve, reject) => {
let start = new Date().getTime();
request.onload = () => { request.onload = () => {
res({ resolve({
status: request.status, status: request.status,
data: request.responseText data: request.responseText,
ping: (new Date().getTime() - start)
}); });
}; };
request.onerror = () => { request.onerror = () => {
rej(request.error); reject(request.error);
}; };
request.open('POST', url, true); request.open('POST', url, true);
request.setRequestHeader("Content-Type", "application/json;charset=UTF-8"); request.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
try {
request.send(JSON.stringify(postBody)); request.send(JSON.stringify(postBody));
} catch (err) {
return err;
}
}); });
} }
/**
* HTTP POST to the current url
* @param postBody {JSON|Object} - the json-object to post
* @returns {Promise<any>}
*/
async function postLocData(postBody) { async function postLocData(postBody) {
return await postData('#', postBody); return await postData('#', postBody);
} }
/**
* HTTP POST to a graphql url endpoint (default '/graphql')
* @param query {String} - the graphql query to post
* @param [variables] {JSON} - optional variables used in the graphql query
* @param [url] {String} - optional alternative graphql endpoint
* @returns {Promise<{data: *, status: *}|{data: *, requestBody: {variables: *, query: *}, errors: *, status: *}>}
*/
async function postGraphqlQuery(query, variables, url) { async function postGraphqlQuery(query, variables, url) {
let body = { let body = {
query: query, query: query,
@ -31,29 +56,33 @@ async function postGraphqlQuery(query, variables, url) {
let response = await postData(url || '/graphql', body); let response = await postData(url || '/graphql', body);
let resData = JSON.parse(response.data); let resData = JSON.parse(response.data);
if (response.status === 200) { if (response.status === 200)
return { return {
status: response.status, status: response.status,
data: resData.data, data: resData.data,
}; };
} else { else
return { return {
status: response.status, status: response.status,
data: resData.data, data: resData.data,
errors: resData.errors, errors: resData.errors,
requestBody: body requestBody: body
}; };
}
} }
/**
* Inserts an url parameter
* @param key {String} - the key of the url parameter
* @param value {String} - the value of the url parameter
*/
function insertParam(key, value) { function insertParam(key, value) {
key = encodeURI(key); key = encodeURI(key);
value = encodeURI(value); value = encodeURI(value);
let kvp = document.location.search.substr(1).split('&'); let kvp = document.location.search.substr(1).split('&');
let i = kvp.length; let i = kvp.length;
let x; let x;
while (i--) { while (i--) {
x = kvp[i].split('='); x = kvp[i].split('=');
@ -63,10 +92,72 @@ function insertParam(key, value) {
break; break;
} }
} }
if (i < 0)
if (i < 0) {
kvp[kvp.length] = [key, value].join('='); kvp[kvp.length] = [key, value].join('=');
document.location.search = kvp.join('&');
} }
document.location.search = kvp.join('&'); /**
* Executes the provided function if the key-event is an ENTER-key
* @param event {Event} - the generated key event
* @param func {function} - the function to execute on enter
*/
function submitOnEnter(event, func) {
if (event.which === 13)
func();
}
/**
* Wrapper around a function to use the status indicator
* @param func {function} - the function to execute
* @param indicatorSelector {String} - a selector for the status indicator
* @returns {Promise<void>}
*/
async function indicateStatus(func, indicatorSelector) {
let statusIndicator = document.querySelector(indicatorSelector);
statusIndicator.setAttribute('status', 'pending');
try {
let result = await func();
if (result)
statusIndicator.setAttribute('status', 'success');
else
statusIndicator.setAttribute('status', 'error');
} catch (err) {
console.error(err);
statusIndicator.setAttribute('status', 'error');
}
}
/**
* posts to accept cookies.
* @returns {Promise<void>}
*/
async function acceptCookies() {
await postGraphqlQuery(`
mutation {
acceptCookies
}`);
document.querySelector('#cookie-container').remove();
}
/**
* Gets the names for the windows hidden and visibility change events and properties
* @returns {{hidden: string, visibilityChange: string}}
*/
function getHiddenNames() {
let hidden, visibilityChange;
if (typeof document.hidden !== "undefined") { // Opera 12.10 and Firefox 18 and later support
hidden = "hidden";
visibilityChange = "visibilitychange";
} else if (typeof document.msHidden !== "undefined") {
hidden = "msHidden";
visibilityChange = "msvisibilitychange";
} else if (typeof document.webkitHidden !== "undefined") {
hidden = "webkitHidden";
visibilityChange = "webkitvisibilitychange";
}
return {
hidden: hidden,
visibilityChange: visibilityChange
};
} }

@ -1,3 +1,10 @@
/* eslint-disable no-unused-vars, no-undef */
/**
* start the download of a subreddit
* @param subredditName {String} - the name of the subreddit to download
* @returns {Promise<any>}
*/
async function startSubredditDownload(subredditName) { async function startSubredditDownload(subredditName) {
let data = await postLocData({ let data = await postLocData({
subreddit: subredditName subreddit: subredditName
@ -5,6 +12,11 @@ async function startSubredditDownload(subredditName) {
return JSON.parse(data.data); return JSON.parse(data.data);
} }
/**
* Get the status of a download
* @param downloadId {String} - the id of the download to get the status for
* @returns {Promise<any>}
*/
async function getDownloadStatus(downloadId) { async function getDownloadStatus(downloadId) {
let data = await postLocData({ let data = await postLocData({
id: downloadId id: downloadId
@ -12,6 +24,11 @@ async function getDownloadStatus(downloadId) {
return JSON.parse(data.data); return JSON.parse(data.data);
} }
/**
* refreshes information about a specific download
* @param downloadId {String} - the id of the download
* @returns {Promise<void>}
*/
async function refreshDownloadInfo(downloadId) { async function refreshDownloadInfo(downloadId) {
let response = await getDownloadStatus(downloadId); let response = await getDownloadStatus(downloadId);
@ -20,7 +37,7 @@ async function refreshDownloadInfo(downloadId) {
let subredditName = dlDiv.getAttribute('subreddit-name'); let subredditName = dlDiv.getAttribute('subreddit-name');
if (response.status === 'pending') { if (response.status === 'pending') {
setTimeout(() => refreshDownloadInfo(downloadId), 1000) setTimeout(() => refreshDownloadInfo(downloadId), 1000);
} else { } else {
let dlLink = document.createElement('a'); let dlLink = document.createElement('a');
dlLink.setAttribute('href', response.file); dlLink.setAttribute('href', response.file);
@ -34,6 +51,10 @@ async function refreshDownloadInfo(downloadId) {
} }
} }
/**
* Submit a subreddit to download (called by button)
* @returns {Promise<void>}
*/
async function submitDownload() { async function submitDownload() {
let subredditName = document.querySelector('#subreddit-input').value; let subredditName = document.querySelector('#subreddit-input').value;
let response = await startSubredditDownload(subredditName); let response = await startSubredditDownload(subredditName);

@ -0,0 +1,15 @@
@keyframes pulse-text
0%
font-size: 0.8em
50%
font-size: 1.2em
100%
font-size: 0.8em
@keyframes pulse-opacity
0%
opacity: 0.6
50%
opacity: 1
100%
opacity: 0.6

@ -1,299 +1,292 @@
@import ../mixins @import ../mixins
@import ../vars @import ../vars
textarea //@media(max-device-width: 641px)
//@media(min-device-width: 641px)
.popup
@include default-element @include default-element
display: block position: fixed
margin: 1rem display: grid
border-radius: 0 height: calc(50% - 1rem)
font-size: 0.8em width: calc(40% - 1rem)
background-color: lighten($primary, 15%) top: 25%
left: 30%
text-align: center
vertical-align: middle
padding: 1rem
z-index: 1000
grid-template: 60% 40% / 100%
h1
@include gridPosition(1, 2, 1, 1)
#word-count button
margin: 1rem margin: 1rem
font-size: 2rem
@include gridPosition(2, 3, 1, 1)
@media(max-device-width: 641px) .greyover
textarea
height: 80%
width: calc(100% - 2rem)
#words-container
width: 100% width: 100%
height: 80% height: 100%
#content-container position: fixed
grid-template-columns: 0 100% !important z-index: 99
grid-template-rows: 10% 40% 40% 10% !important top: 0
left: 0
background-color: rgba(0, 0, 0, 0.5)
#players-container, #chat-container .playerEntryContainer
display: none !important @include default-element
padding: 0 padding: 0.5rem
margin: 0 0 1rem
width: calc(100% - 1rem - 2px)
border-radius: 0
color: $primarySurface
border: 1px solid $inactive
position: relative
.errorDiv .playerWins
grid-column-start: 1 !important position: absolute
grid-column-end: 4 !important right: 0
#content-container.displayChat .kickPlayerButton
grid-template-columns: 100% 0 !important color: $inactive
grid-template-rows: 0 25% 65% 10% !important
#players-container, #chat-container .chatMessage
display: block !important display: block
padding: 0.2em
word-break: break-word
#words-container .INFO
display: none !important font-style: italic
color: $inactive
#username-form .ERROR
width: calc(100% - 2rem) !important font-weight: bold
left: 0 !important color: $error
#hide-player-container-button .chatUsername
display: none color: $inactive
.popup img
width: calc(100% - 2rem) !important max-width: 100%
left: 0 !important height: auto
border-radius: 0.2em
#button-container #container-chat
grid-column-start: 2 !important height: calc(100% - 2px)
grid-column-end: 3 !important #chat-content
height: calc(100% - 3rem)
width: calc(100% - 2px)
overflow-y: auto
overflow-x: hidden
border: 1px solid $inactive
box-shadow: inset 0 0 1rem $primary
#chat-input
width: 100%
height: 3rem
#chat-button-container #container-lobby-settings
display: inline-block height: 100%
grid-row-start: 4
grid-row-end: 4
grid-column-start: 1
grid-column-end: 4
overflow: hidden
margin: 0 0.5rem
button h1
width: 100% height: 3rem
margin: 0.5rem 0 margin: 0.5rem
text-align: center
@media(min-device-width: 641px) #input-bingo-words
textarea
height: 80%
width: 50%
#words-container
width: 100% width: 100%
height: 100% height: calc(100% - 10rem)
#chat-button-container margin: 0
display: none
.number-input #input-grid-size
height: 3rem
width: 4rem width: 4rem
margin: 1rem
#bingoheader #button-round-start, #button-leave
display: table height: 3rem
width: 100% width: 100%
div #bingo-words
display: table-cell padding: 1rem
text-align: start width: calc(100% - 2rem)
height: calc(100% - 9rem)
margin: 0
overflow-y: auto
box-shadow: inset 0 0 1rem $primary
.stretchDiv .bingoWord
text-align: end display: list-item
list-style: none
button #container-players
max-width: calc(100% - 2rem) height: 100%
padding: 0.7rem 2rem width: 100%
#words-container h1
display: table height: 2rem
margin: 0.5rem
text-align: center
.bingo-word-row #player-list
padding: 1rem
width: calc(100% - 2rem)
height: calc(100% - 5rem)
overflow-y: auto
.kickPlayerButton
background-color: #0000
border: none
padding: 0
margin: 0 0.5rem 0 0
font-size: 1em
#container-grid
height: calc(100% - 2em)
width: calc(100% - 2em)
padding: 1em
overflow: auto
#grid-table
display: table
height: 100%
width: 100%
.bingoWordRow
display: table-row display: table-row
.bingo-word-panel .bingoWordPanel
@include default-element @include default-element
display: table-cell display: table-cell
padding: 1rem
transition-duration: 0.3s
max-width: 15rem
border-radius: 0
border-collapse: collapse
text-align: center text-align: center
vertical-align: middle vertical-align: middle
user-select: none user-select: none
span
vertical-align: middle
display: inline-block
word-break: break-word
user-select: none
.bingo-word-panel:hover
background-color: darken($primary, 2%)
cursor: pointer cursor: pointer
.bingo-word-panel:active .bingoWordPanel[b-sub='true']
background-color: $success
.bingoWordPanel:hover
background-color: $primary background-color: $primary
.bingo-word-panel[b-sub="true"] .bingoWordPanel[b-sub='true']:hover
background-color: forestgreen background-color: mix($primary, $success)
#bingo-button .bingoWordPanel:active
transition-duration: 0.8s background-color: mix($primary, $secondary)
#username-form #container-bingo-button
@include default-element height: 100%
position: fixed
display: block
height: calc(50% - 1rem)
width: calc(40% - 1rem)
top: 25%
left: 30%
text-align: center
vertical-align: middle
padding: 1rem
z-index: 1000
button
cursor: pointer
width: 100%
margin: 1rem auto
input[type='text']
cursor: text
width: 100% width: 100%
#username-form * button
display: inline-block
vertical-align: middle
#content-container
display: grid
grid-template-columns: 25% 75%
grid-template-rows: 10% 40% 40% 10%
height: 100% height: 100%
width: 100% width: 100%
div #statusbar
overflow: auto
#button-container
grid-column-start: 1
grid-column-end: 1
grid-row-start: 1
grid-row-end: 1
display: grid display: grid
margin: 1rem grid-template: 100% 0 / 1rem calc(75% - 1rem) 25%
font-size: inherit background-color: darken($primary, 5%)
margin: 0.5rem 0 0 0
padding: 0.25rem
vertical-align: middle
font-size: 0.8em
text-align: start
position: absolute
height: 1rem
bottom: 0
left: 0
width: calc(100% - 0.5rem)
button #status-indicator
font-size: inherit height: 1rem
padding: 0 width: 1rem
border-radius: 100%
@include gridPosition(1, 2, 1,2)
#players-container #error-message
padding: 0 0.5rem @include gridPosition(1, 2, 2, 3)
transition-duration: 1s margin: auto 1em
grid-column-start: 1 text-align: start
grid-column-end: 1 color: $errorText
grid-row-start: 2
grid-row-end: 3
h1 #container-info
margin: 0 0 1rem 0 @include gridPosition(1, 2, 3, 4)
text-align: left
#words-container width: 100%
grid-column-start: 2
grid-column-end: 3
grid-row-start: 2
grid-row-end: 4
#chat-container
grid-column-start: 1
grid-column-end: 1
grid-row-start: 3
grid-row-end: 4
height: 100% height: 100%
border: 1px solid $inactive margin: auto
margin: 0 0.5rem color: $inactive
word-break: break-word
#chat-content /* main containers */
height: calc(100% - 2.5rem)
background-color: $primary
overflow: auto
font-size: 0.8em
.chatMessage #container-bingo-create
display: list-item display: grid
padding: 0.2rem grid-template: 5% 10% 10% 70% 5% /10% 80% 10%
height: 100%
width: 100%
.chatUsername #username-form
color: $inactive @include gridPosition(2, 3, 2, 3)
margin: auto
.ERROR .statusIndicator
color: $error height: 1em
width: 1em
display: inline-block
margin: auto 1em
.INFO #input-username
color: $inactive margin: 0 0 0 3em
font-style: italic
.chatMessageContent #lobby-form
img @include gridPosition(3, 5, 2, 3)
margin: 10% auto
button
width: 100% width: 100%
height: auto
transition-duration: 0.5s
border-radius: 0.5em
img:hover
border-radius: 0
#chat-input #container-bingo-lobby
@include fillWindow
overflow: hidden
display: grid
grid-template: 0 10% 85% 5% / 5% 30% 30% 30% 5%
height: 100%
width: 100% width: 100%
margin: 0 0 0 0
height: 2.5rem
border-radius: 0
.errorDiv #lobby-title
grid-column-start: 2 @include gridPosition(2, 3, 2, 5)
grid-column-end: 3 margin: auto
grid-row-start: 4
grid-row-end: 4
background-color: $error
text-align: center
margin: 0.75rem 0
border-radius: 1rem
height: calc(100% - 1.5rem)
display: table
span #container-players
display: table-cell @include gridPosition(3, 4, 2, 3)
font-size: 1.8rem background-color: lighten($primary, 5%)
vertical-align: middle
.player-container #container-lobby-settings
@include default-element @include gridPosition(3, 4, 3, 4)
padding: 0.5rem background-color: lighten($primary, 5%)
margin: 0 0 1rem 0
max-width: 14rem
border-radius: 0
color: $primarySurface
border: 1px solid $inactive
.popup #container-chat
@include default-element @include gridPosition(3, 4, 4, 5)
position: fixed background-color: lighten($primary, 5%)
#container-bingo-round
@include fillWindow
overflow: hidden
display: grid display: grid
height: calc(50% - 1rem) height: 100%
width: calc(40% - 1rem) width: 100%
top: 25% grid-template: 10% 30% 55% 5% / 25% 75%
left: 30%
text-align: center
vertical-align: middle
padding: 1rem
z-index: 1000
button #container-players
margin: 1rem @include gridPosition(2, 3, 1, 2)
font-size: 2rem
.greyover #container-chat
width: 100% @include gridPosition(3, 4, 1, 2)
height: 100% padding: 0 1rem
position: fixed
z-index: 99 #container-grid
top: 0 @include gridPosition(2, 4, 2, 3)
left: 0
background-color: rgba(0, 0, 0, 0.5) #container-bingo-button
@include gridPosition(1, 2, 1, 2)

@ -1,3 +1,6 @@
@import vars
@import animations
.tableRow .tableRow
display: table-row display: table-row
@ -17,3 +20,50 @@
.inline-grid .inline-grid
display: inline-grid display: inline-grid
.statusIndicator
min-height: 1em
min-width: 1em
border-radius: 1em
transition-duration: 1s
.statusIndicator[status='success']
background-color: $success
.statusIndicator[status='error']
background-color: $error
.statusIndicator[status='idle']
background-color: $inactive
animation-name: pulse-opacity
animation-duration: 5s
animation-iteration-count: infinite
.statusIndicator[status='pending']
background-color: $pending
animation-name: pulse-opacity
animation-duration: 5s
animation-iteration-count: infinite
.pending
background-color: $pending !important
animation-name: pulse-opacity
animation-duration: 2s
animation-iteration-count: infinite
.infoContainer
position: absolute
bottom: 0
left: 0
background: lighten($primary, 5%)
padding: 1rem
border: 1px solid $primarySurface
z-index: 9999
h1
margin: 0 0 1rem
button
display: block
margin: 1rem auto 0

@ -0,0 +1,31 @@
@import ../vars
@import ../mixins
#content
display: grid
grid-template: 25% 50% 25% / 25% 50% 25%
height: 100%
width: 100%
position: absolute
top: 0
left: 0
#info
@include gridPosition(1, 2, 2, 3)
margin: auto
text-align: center
h1, p, a
margin: auto
text-align: center
#bingo-button
background-color: $secondary
height: 100%
width: 50vh
border-radius: 25rem
margin: auto
@include gridPosition(2, 3, 2, 3)
#bingo-button:hover
background-color: mix($secondary, $primary, 75%)

@ -5,3 +5,14 @@
color: $primarySurface color: $primarySurface
border: 2px solid $primarySurface border: 2px solid $primarySurface
transition-duration: 0.2s transition-duration: 0.2s
@mixin fillWindow
position: absolute
top: 0
left: 0
@mixin gridPosition($rowStart, $rowEnd, $columnStart, $columnEnd)
grid-row-start: $rowStart
grid-row-end: $rowEnd
grid-column-start: $columnStart
grid-column-end: $columnEnd

@ -4,7 +4,7 @@
@media (min-device-width: 320px) @media (min-device-width: 320px)
html html
font-size: 4.5vw font-size: 4vw
@media (min-device-width: 481px) @media (min-device-width: 481px)
html html
@ -29,7 +29,8 @@
body body
background-color: $primary background-color: $primary
color: $primarySurface color: $primarySurface
font-family: Arial, sans-serif font-family: $fontRegular
scrollbar-color: $secondary lighten($primary, 5)
button button
@include default-element @include default-element
@ -46,16 +47,42 @@ button:active
background-color: lighten($secondary, 15%) background-color: lighten($secondary, 15%)
input input
@include default-element background-color: lighten($primary, 10%)
color: $primarySurface
border: 1px solid $inactive
transition-duration: 0.2s
font-size: 1.2rem font-size: 1.2rem
background-color: lighten($primary, 15%)
padding: 0.7rem padding: 0.7rem
font-family: $fontRegular
input:focus
background-color: lighten($primary, 15%)
border: 1px solid $primarySurface
input[type='number']
text-align: center
textarea textarea
background-color: lighten($primary, 15%) background-color: lighten($primary, 15%)
color: $primarySurface
resize: none
font-family: $fontRegular
a a
color: $secondary color: mix($secondary, $primarySurface, 75%)
mark
background-color: $secondary
color: $primarySurface
mark > a
color: white
code
background-color: transparentize(darken($primary, 10%), 0.5)
border-radius: 0.25em
font-family: $fontCode
padding: 0 0.25em
::-webkit-scrollbar ::-webkit-scrollbar
width: 12px width: 12px

@ -1,6 +1,13 @@
@import url('https://fonts.googleapis.com/css?family=Ubuntu|Ubuntu+Mono&display=swap')
$primary: #223 $primary: #223
$primarySurface: white $primarySurface: white
$secondary: teal $secondary: teal
$borderRadius: 20px $borderRadius: 20px
$inactive: #aaa $inactive: #aaa
$error: #a00 $error: #a00
$errorText: #f44
$success: #0a0
$pending: #aa0
$fontRegular: 'Ubuntu', Arial, sans-serif
$fontCode: 'Ubuntu Mono', monospace

@ -0,0 +1,12 @@
{
"extends": [
"config:base"
],
"baseBranches": [
"dependency-updates"
],
"automerge": true,
"major": {
"automerge": false
}
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,17 @@
const express = require('express'),
router = express.Router(),
globals = require('../lib/globals'),
fsx = require('fs-extra'),
mdEmoji = require('markdown-it-emoji'),
md = require('markdown-it')()
.use(mdEmoji);
let changelog = fsx.readFileSync('CHANGELOG.md', 'utf-8');
/* GET home page. */
router.get('/', (req, res) => {
let info = req.session.acceptedCookies? null: globals.cookieInfo;
res.render('changelog/changes', { changelog: md.render(changelog), info: info});
});
module.exports = router;

@ -1,9 +1,12 @@
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const globals = require('../lib/globals');
/* GET home page. */ /* GET home page. */
router.get('/', function(req, res, next) { router.get('/', function(req, res) {
res.render('index', { title: 'Trivernis.net' }); let info = req.session.acceptedCookies? null: globals.cookieInfo;
res.render('index', { title: 'Trivernis.net', info: info, contact: 'mailto:trivernis@gmail.com'});
}); });
module.exports = router; module.exports = router;

@ -18,10 +18,9 @@ class RedditDownload {
/** /**
* Generates an id for a subreddit download. * Generates an id for a subreddit download.
* @param subreddit
* @returns {string} * @returns {string}
*/ */
function generateDownloadId(subreddit) { function generateDownloadId() {
return Date.now().toString(16); return Date.now().toString(16);
} }
@ -32,7 +31,7 @@ function generateDownloadId(subreddit) {
*/ */
function startDownload(subreddit) { function startDownload(subreddit) {
if (rWordOnly.test(subreddit)) { if (rWordOnly.test(subreddit)) {
let downloadId = generateDownloadId(subreddit); let downloadId = generateDownloadId();
let dlFilePath = `./public/static/${downloadId}.zip`; let dlFilePath = `./public/static/${downloadId}.zip`;
let dlWebPath = `/static/${downloadId}.zip`; let dlWebPath = `/static/${downloadId}.zip`;
let dl = new RedditDownload(dlWebPath); let dl = new RedditDownload(dlWebPath);
@ -40,13 +39,11 @@ function startDownload(subreddit) {
dl.process = cproc.exec(`python3 -u riddle.py -o ../../public/static/${downloadId} -z --lzma ${subreddit}`, dl.process = cproc.exec(`python3 -u riddle.py -o ../../public/static/${downloadId} -z --lzma ${subreddit}`,
{cwd: './scripts/reddit-riddle', env: {PYTHONIOENCODING: 'utf-8', PYTHONUNBUFFERED: true}}, {cwd: './scripts/reddit-riddle', env: {PYTHONIOENCODING: 'utf-8', PYTHONUNBUFFERED: true}},
(err, stdout) => { (err, stdout) => {
if (err) { if (err)
console.error(err); console.error(err);
} else { else
console.log(`riddle.py: ${stdout}`); console.log(`riddle.py: ${stdout}`);
}
}); });
dl.process.on('exit', (code) => { dl.process.on('exit', (code) => {
if (code === 0) if (code === 0)
dl.status = 'finished'; dl.status = 'finished';
@ -57,20 +54,17 @@ function startDownload(subreddit) {
delete downloads[downloadId]; delete downloads[downloadId];
}, 300000); // delete the file after 5 minutes }, 300000); // delete the file after 5 minutes
}); });
dl.process.on('message', (msg) => { dl.process.on('message', (msg) => {
console.log(msg) console.log(msg);
}); });
downloads[downloadId] = dl; downloads[downloadId] = dl;
return downloadId; return downloadId;
} }
} }
router.use('/files', express.static('./tmp')); router.use('/files', express.static('./tmp'));
router.get('/', (req, res, next) => { router.get('/', (req, res) => {
res.render('riddle'); res.render('riddle');
}); });
@ -84,16 +78,15 @@ router.post('/', (req, res) => {
let id = req.body.id; let id = req.body.id;
let download = downloads[id]; let download = downloads[id];
if (download) { if (download)
res.send({ res.send({
id: id, id: id,
status: download.status, status: download.status,
file: download.file file: download.file
}); });
} else { else
res.send({error: 'Unknown download ID', id: id}); res.send({error: 'Unknown download ID', id: id});
} }
}
}); });
module.exports = router; module.exports = router;

@ -2,8 +2,8 @@ const express = require('express');
const router = express.Router(); const router = express.Router();
/* GET users listing. */ /* GET users listing. */
router.get('/', function(req, res, next) { router.get('/', function(req, res) {
res.send('respond with a resource'); res.send('There are no users :(');
}); });
module.exports = router; module.exports = router;

@ -0,0 +1,50 @@
/*-- remove grid-word connections for expired lobbys
DELETE FROM bingo.grid_words
WHERE EXISTS(
SELECT grids.lobby_id FROM bingo.grids
WHERE EXISTS (
SELECT lobbys.id FROM bingo.lobbys
WHERE lobbys.id = grids.lobby_id
AND NOW() > lobbys.expire
)
);
-- remove grids for expired lobbys
DELETE FROM bingo.grids
WHERE EXISTS (
SELECT lobbys.id FROM bingo.lobbys
WHERE lobbys.id = grids.lobby_id
AND NOW() > lobbys.expire
);
-- remove words for expired lobbys
DELETE FROM bingo.words
WHERE EXISTS (
SELECT lobbys.id FROM bingo.lobbys
WHERE lobbys.id = words.lobby_id
AND NOW() > lobbys.expire
);
-- remove lobby-player connections for expired lobbys or players
DELETE FROM bingo.lobby_players
WHERE EXISTS (
SELECT lobbys.id FROM bingo.lobbys
WHERE lobbys.id = lobby_players.lobby_id
AND NOW() > lobbys.expire
) OR EXISTS (
SELECT players.id FROM bingo.players
WHERE players.id = lobby_players.player_id
AND NOW() > players.expire
);
*/
-- remove expired lobbys
DELETE FROM bingo.lobbys
WHERE NOW() > lobbys.expire;
-- remove expired players
DELETE FROM bingo.players
WHERE NOW() > players.expire;
/*AND NOT EXISTS (
SELECT lobbys.admin_id FROM bingo.lobbys
WHERE lobbys.admin_id = players.id
);*/

@ -0,0 +1,74 @@
-- players table
CREATE TABLE IF NOT EXISTS bingo.players (
id serial UNIQUE PRIMARY KEY,
username varchar(32) NOT NULL,
expire timestamp DEFAULT (NOW() + interval '24 hours' )
);
-- lobbys table
CREATE TABLE IF NOT EXISTS bingo.lobbys (
id serial UNIQUE PRIMARY KEY,
admin_id serial references bingo.players(id) ON DELETE SET NULL,
grid_size integer DEFAULT 3 NOT NULL,
current_round integer,
expire timestamp DEFAULT (NOW() + interval '1 hour' )
);
-- lobbys-players table
CREATE TABLE IF NOT EXISTS bingo.lobby_players (
player_id serial references bingo.players(id) ON DELETE CASCADE,
lobby_id serial references bingo.lobbys(id) ON DELETE CASCADE,
score integer DEFAULT 0,
PRIMARY KEY (player_id, lobby_id)
);
-- words table
CREATE TABLE IF NOT EXISTS bingo.words (
id bigserial UNIQUE PRIMARY KEY,
lobby_id serial references bingo.lobbys(id) ON DELETE CASCADE,
heared integer DEFAULT 0 NOT NULL,
content varchar(254) NOT NULL
);
-- messages table
CREATE TABLE IF NOT EXISTS bingo.messages (
id bigserial UNIQUE PRIMARY KEY,
content varchar(255) NOT NULL,
player_id integer,
lobby_id serial references bingo.lobbys(id) ON DELETE CASCADE,
type varchar(8) DEFAULT 'USER' NOT NULL,
created timestamp DEFAULT NOW()
);
-- rounds table
CREATE TABLE IF NOT EXISTS bingo.rounds (
id serial UNIQUE PRIMARY KEY,
start timestamp DEFAULT NOW(),
finish timestamp,
status varchar(8) DEFAULT 'BUILDING',
lobby_id serial references bingo.lobbys(id) ON DELETE CASCADE,
winner integer
);
-- grids table
CREATE TABLE IF NOT EXISTS bingo.grids (
id serial UNIQUE PRIMARY KEY,
player_id serial references bingo.players(id) ON DELETE CASCADE,
lobby_id serial references bingo.lobbys(id) ON DELETE CASCADE,
round_id serial references bingo.rounds(id) ON DELETE CASCADE,
UNIQUE(player_id, lobby_id, round_id)
);
-- grids_words table
CREATE TABLE IF NOT EXISTS bingo.grid_words (
grid_id serial references bingo.grids(id) ON DELETE CASCADE,
word_id serial references bingo.words(id) ON DELETE RESTRICT,
grid_row integer NOT NULL,
grid_column integer NOT NULL,
submitted boolean DEFAULT false,
PRIMARY KEY (grid_id, grid_row, grid_column)
);
-- altering
ALTER TABLE bingo.messages ALTER COLUMN player_id DROP NOT NULL;

@ -0,0 +1,267 @@
# a file to list sql queries by names
exports: # loaded from file
- createTables
- cleanup
# create the needed bingo tables
createTables:
file: createBingoTables.sql
# clears expired values
cleanup:
file: clearExpired.sql
# Add a player to the database
# params:
# - {String} - the username of the player
addPlayer:
sql: INSERT INTO bingo.players (username) VALUES ($1) RETURNING *;
# Updates the username of a player
# params:
# - {String} - the new username of the player
# - {Number} - the id of the player
updatePlayerUsername:
sql: UPDATE bingo.players SET username = $1 WHERE id = $2 RETURNING *;
# Selects the row for a player id
# params:
# - {Number} - the id of the player
getPlayerInfo:
sql: SELECT * FROM bingo.players WHERE id = $1;
# updates the expiration timestamp of the player
# params:
# - {Number} - the id of the player
updatePlayerExpire:
sql: UPDATE bingo.players SET expire = (NOW() + interval '24 hours') WHERE id = $1;
# adds a lobby to the database
# params:
# - {Number} - the id of the admin player
# - {Number} - the size of the grid
addLobby:
sql: INSERT INTO bingo.lobbys (admin_id, grid_size) VALUES ($1, $2) RETURNING *;
# updates expiration timestamp of the lobby
# params:
# - {Number} - the id of the lobby
updateLobbyExpire:
sql: UPDATE bingo.lobbys SET expire = (NOW() + interval '1 hours') WHERE id = $1;
# inserts a player into a lobby
# params:
# - {Number} - the id of the player
# - {Number} - the id of the lobby
addPlayerToLobby:
sql: INSERT INTO bingo.lobby_players (player_id, lobby_id) VALUES ($1, $2) RETURNING *;
# removes a player from a lobby
# params:
# - {Number} - the id of the player
# - {Number} - the id of the lobby
removePlayerFromLobby:
sql: DELETE FROM bingo.lobby_players WHERE player_id = $1 AND lobby_id = $2;
# returns the entry of the player and lobby
# params:
# - {Number} - the id of the player
# - {Number} - the id of the lobby
getPlayerInLobby:
sql: SELECT * FROM bingo.lobby_players lp WHERE lp.player_id = $1 AND lp.lobby_id = $2;
# returns all players in a lobby
# params:
# - {Number} - the id of the lobby
getLobbyPlayers:
sql: SELECT * FROM bingo.lobby_players WHERE lobby_players.lobby_id = $1;
# returns all direct information about the lobby
# params:
# - {Number} - the id of the lobby
getLobbyInfo:
sql: SELECT * FROM bingo.lobbys WHERE lobbys.id = $1;
# returns the last $2 messages for a lobby
# params:
# - {Number} - the id of the lobby
# - {Number} - the limit of messages to fetch
getLobbyMessages:
sql: SELECT * FROM bingo.messages WHERE messages.lobby_id = $1 ORDER BY messages.created DESC LIMIT $2;
# returns the number of wins a user had in a lobby
# - {Number} - the id of the lobby
# - {Number} - the id of the player
getLobbyPlayerWins:
sql: SELECT COUNT(*) wins FROM bingo.rounds WHERE rounds.lobby_id = $1 AND rounds.winner = $2;
# returns all rounds of a lobby
# params:
# - {Number} - the id of the lobby
getLobbyRounds:
sql: SELECT * FROM bingo.rounds WHERE rounds.lobby_id = $1;
# creates a round entry
# params:
# - {Number} - the id of the lobby
addRound:
sql: INSERT INTO bingo.rounds (lobby_id) VALUES ($1) RETURNING *;
# updates the status of a round
# params:
# - {Number} - the id of the round
# - {Number} - the new status
updateRoundStatus:
sql: UPDATE bingo.rounds SET status = $2 WHERE id = $1 RETURNING *;
# updates the status of the round to finished
# params:
# - {Number} - the id of the round
setRoundFinished:
sql: UPDATE bingo.rounds SET status = 'FINISHED', finish = NOW() WHERE id = $1 RETURNING *;
# updates the winner of the round
# params:
# - {Number} - the id of the winner
setRoundWinner:
sql: UPDATE bingo.rounds SET winner = $2 WHERE id = $1 RETURNING *;
# sets the current round of a lobby
# params:
# - {Number} - the id of the lobby
# - {Number} - the id of the round
setLobbyCurrentRound:
sql: UPDATE bingo.lobbys SET current_round = $2 WHERE id = $1 RETURNING *;
# sets the grid size of a lobby
# params:
# - {Number} - the id of the lobby
# - {Number} - the new grid size
setLobbyGridSize:
sql: UPDATE bingo.lobbys SET grid_size = $2 WHERE id = $1 RETURNING *;
# returns information about a round
# params:
# - {Number} - the id of the round
getRoundInfo:
sql: SELECT * FROM bingo.rounds WHERE rounds.id = $1;
# adds a word to the database
# params:
# - {Number} - the id of the lobby where the word is used
# - {String} - the word itself
addWord:
sql: INSERT INTO bingo.words (lobby_id, content) VALUES ($1, $2) RETURNING *;
# deletes all words of a lobby
# params:
# - {Number} - the id of the lobby
clearLobbyWords:
sql: DELETE FROM bingo.words WHERE lobby_id = $1;
# deletes a word of a lobby
# params:
# - {Number} - the id of the lobby
# - {Number} - the id of the word
removeLobbyWord:
sql: DELETE FROM bingo.words WHERE lobby_id = $1 AND id = $2;
# returns all words for a bingo game (lobby)
# params:
# - {Number} - the id of the bingo lobby
getWordsForLobby:
sql: SELECT * FROM bingo.words WHERE words.lobby_id = $1;
# returns the word row for an id
# params:
# - {Number} - the id of the word
getWordInfo:
sql: SELECT * FROM bingo.words WHERE words.id = $1;
# adds a grid to the database
# params:
# - {Number} - the id of the player
# - {Number} - the id of the lobby
# - {Number} - the id of the round
addGrid:
sql: INSERT INTO bingo.grids (player_id, lobby_id, round_id) VALUES ($1, $2, $3) RETURNING *;
# deletes all grids of a lobby
# params:
# - {Number} - the id of the lobby
clearLobbyGrids:
sql: DELETE FROM bingo.grids WHERE lobby_id = $1;
# returns the grid entry for a player and lobby id
# params:
# - {Number} - the id of the player
# - {Number} - the id of the lobby
# - {Number} - the id of the round
getGridByPlayerLobbyRound:
sql: SELECT * FROM bingo.grids WHERE player_id = $1 AND lobby_id = $2 AND round_id = $3;
# returns the grid row
# params:
# - {Number} - the id of the grid
getGridInfo:
sql: >
SELECT grids.id, grids.player_id, grids.lobby_id, lobbys.grid_size FROM bingo.grids, bingo.lobbys
WHERE grids.id = $1 AND grids.lobby_id = lobbys.id;
# inserts grid-word connections into the database
# params:
# - {Number} - the id of the grid
# - {Number} - the id of the word
# - {Number} - the row of the word
# - {Number} - the column of the word
addWordToGrid:
sql: INSERT INTO bingo.grid_words (grid_id, word_id, grid_row, grid_column) VALUES ($1, $2, $3, $4) RETURNING *;
# inserts grid-word connections into the database
# params:
# ! need to be set in the sql
addWordToGridStrip:
sql: INSERT INTO bingo.grid_words (grid_id, word_id, grid_row, grid_column) VALUES
# sets a bingo field to submitted = not submitted
# params:
# - {Number} - the id of the grid
# - {Number} - the row of the field
# - {Number} - the column of the field
toggleGridFieldSubmitted:
sql: >
UPDATE bingo.grid_words gw SET submitted = not submitted
WHERE gw.grid_id = $1
AND gw.grid_row = $2
AND gw.grid_column = $3
RETURNING *;
# selects a single field from grid_words
# params:
# - {Number} - the id of the grid
# - {Number} - the row of the field
# - {Number} - the column of the field
getGriedField:
sql: SELECT * FROM bingo.grid_words WHERE grid_words.grid_id = $1 AND grid_words.row = $2 and grid_words.column = $3;
# returns all words for a players grid
# params:
# - {Number} - the id of the grid
getWordsForGridId:
sql: SELECT * FROM bingo.grid_words, bingo.words WHERE grid_words.grid_id = $1 AND words.id = grid_words.word_id;
# inserts a user message
# params:
# - {Number} - the id of the user
# - {Number} - the id of the lobby
# - {String} - the content of the message
addUserMessage:
sql: INSERT INTO bingo.messages (player_id, lobby_id, content) VALUES ($1, $2, $3) RETURNING *;
# inserts a info message
# params:
# - {Number} - the id of the lobby
# - {String} - the content of the message
addInfoMessage:
sql: INSERT INTO bingo.messages (type, lobby_id, content) VALUES ('INFO', $1, $2) RETURNING *;

@ -1,3 +1,10 @@
-- schemas
CREATE SCHEMA IF NOT EXISTS bingo;
-- public tables
-- creates the Session table
CREATE TABLE IF NOT EXISTS "user_sessions" ( CREATE TABLE IF NOT EXISTS "user_sessions" (
"sid" varchar NOT NULL COLLATE "default", "sid" varchar NOT NULL COLLATE "default",
"sess" json NOT NULL, "sess" json NOT NULL,

@ -0,0 +1,18 @@
extends includes/bingo-layout
block content
div(id='container-bingo-create')
div(id='username-form')
input(id='input-username'
type='text'
placeholder='Enter your name'
value=username
onkeydown='submitOnEnter(event, () => indicateStatus(submitUsername, "#username-status"))')
button(
id='submit-username'
onclick='indicateStatus(submitUsername, "#username-status")') Set Username
div(id='username-status' class='statusIndicator')
div(id='lobby-form')
button(id='join-lobby' onclick='joinLobby()') Join Lobby
button(id='create-lobby' onclick='createLobby()') Create Lobby
include includes/bingo-statusbar

@ -1,28 +0,0 @@
include bingo-layout
block content
if username === 'anonymous'
div(class='greyover')
div(id='username-form', onkeypress='submitOnEnter(event, submitUsername)')
input(type='text', id='username-input', placeholder=username, maxlength="30")
span Maximum is 30 characters.
button(onclick='submitUsername()') Set Username
div(id='content-container')
div(id='players-container')
h1 Players
each player in players
div(class='player-container', b-pid=`${player.id}`)
span(class='player-name-span')= player.username
div(id='chat-container')
div(id='chat-content')
input(id='chat-input' type='text', placeholder='chat', onkeypress='submitOnEnter(event, sendChatMessage)' maxlength="250")
div(id='words-container')
each val in grid
div(class='bingo-word-row')
each field in val
div(class='bingo-word-panel', onclick=`submitWord('${field.base64Word}')`, b-word=field.base64Word, b-sub=`${field.submitted}`)
span= field.word
div(id='button-container')
button(id='bingo-button', onclick='submitBingo()', class='hidden') Bingo!
div(id='chat-button-container')
button(id='chat-toggle-button', onclick='toggleChatView()') toggle Chat

@ -0,0 +1,22 @@
extends includes/bingo-layout
block content
div(id='container-bingo-lobby')
h1(id='lobby-title') Bingo Lobby
include includes/bingo-players
div(id='container-lobby-settings')
h1 Words
if isAdmin
span Grid Size:
input(id='input-grid-size' type='number' value=gridSize min='1' max='8')
textarea(id='input-bingo-words' placeholder='max. 10.000 phrases')= wordString
button(id='button-round-start' onclick='statusWrap(startRound)') Start Round
else
div(id='bingo-words')
for word in words
span(class='bingoWord')= word
button(id='button-leave' onclick='statusWrap(leaveLobby)') Leave
include includes/bingo-chat
include includes/bingo-statusbar
script(type='text/javascript') refreshLobby();

@ -0,0 +1,26 @@
include includes/bingo-layout
block content
div(id='container-bingo-round')
include includes/bingo-players
include includes/bingo-chat
include includes/bingo-statusbar
if grid.bingo
div(id='container-bingo-button')
button(id='bingo-button' onclick='statusWrap(submitBingo)') Bingo!
else
div(id='container-bingo-button' class='hidden')
button(id='bingo-button' onclick='statusWrap(submitBingo)') Bingo!
div(id='container-grid')
div(id='grid-table')
each val in grid.fields
div(class='bingoWordRow')
each field in val
div(
class='bingoWordPanel'
onclick=`statusWrap(() => submitFieldToggle(this))`
b-row=field.row
b-column=field.column
b-sub=`${field.submitted}`)
span= field.word
script(type='text/javascript') refreshRound();

@ -1,13 +0,0 @@
extends bingo-layout
block content
div(id='bingoform')
div(id='bingoheader')
div
input(type='number', id='bingo-grid-size', class='number-input', value=3, min=1, max=7, onkeypress='submitOnEnter(event, submitBingoWords)')
span x
span(id='bingo-grid-y', class='number-input') 3
div(class='stretchDiv')
button(onclick='submitBingoWords()') Submit
span(id='word-count') Please provide at least 9 phrases:
textarea(id='bingo-textarea', placeholder='Bingo Words (max 10,000)', maxlength=1000000)

@ -0,0 +1,15 @@
div(id='container-chat')
style(id='js-style')
div(id='chat-content')
for message in messages
span.chatMessage(type=message.type msg-id=message.id)
if message.type === 'USER'
span.chatUsername= `${message.username}: `
span(class=`chatMessageContent ${message.type}`)!= message.htmlContent
input(
id='chat-input'
type='text'
placeholder='send message'
onkeypress='submitOnEnter(event, () => statusWrap(sendChatMessage))'
maxlength="250"
autocomplete='off')

@ -1,9 +1,10 @@
html html
head head
include ../includes/head include ../../includes/head
title Bingo by Trivernis title Bingo by Trivernis
script(type='text/javascript', src='/javascripts/bingo-web.js') script(type='text/javascript', src='/javascripts/bingo-web.js')
link(rel='stylesheet', href='/sass/bingo/style.sass') link(rel='stylesheet', href='/sass/bingo/style.sass')
base(target='_blank') base(target='_blank')
body body
include ../../includes/info-container
block content block content

@ -0,0 +1,14 @@
div(id='container-players')
h1 Players
div(id='player-list')
each player in players
div(class='playerEntryContainer', b-pid=`${player.id}`)
if isAdmin && player.id !== adminId
button(class='kickPlayerButton' onclick=`statusWrap(() => kickPlayer(${player.id}))`)
if player.id === adminId
span(class='adminSpan') 👑
span(class='playerNameSpan')= player.username
if player.wins > 1
span(class='playerWins')= `${player.wins}x🌟`
else if player.wins > 0
span(class='playerWins') 🌟

@ -0,0 +1,11 @@
div(id='statusbar')
div(id='status-indicator' class='statusIndicator' status='idle')
span(id='error-message')
span(id='container-info')
a(href='https://github.com/Trivernis/whooshy/issues') Bug/Feature
|
|
span |
|
|
a(href='mailto:trivernis@gmail.com') Contact

@ -0,0 +1,6 @@
html
head
include ../includes/head
body
include ../includes/info-container
div(id='changelog')!= changelog

@ -0,0 +1,5 @@
if info
div(class='infoContainer' id=info.id)
h1=info.headline
span= info.content
button(onclick=info.onclick)= info.button

@ -1,6 +1,11 @@
extends layout extends layout
block content block content
div(id='content')
div(id='info')
h1= title h1= title
p Welcome to #{title} p Welcome to #{title}
button(onclick='window.location.href="/bingo"') Bingo a(href=contact) Contact
button(id='bingo-button' onclick='window.location.href="/bingo"') Bingo
include includes/info-container

@ -2,6 +2,8 @@ doctype html
html html
head head
title= title title= title
link(rel='stylesheet', href='/sass/style.sass') link(rel='stylesheet' href='/sass/style.sass')
link(rel='stylesheet' href='/sass/index/style.sass')
script(type='text/javascript' src='/javascripts/common.js')
body body
block content block content

Loading…
Cancel
Save