Skip to content

Commit

Permalink
merge main into branch multiplayer-teams
Browse files Browse the repository at this point in the history
  • Loading branch information
@geoffrey-wu
geoffrey-wu committed Sep 20, 2024
1 parent 9740411 commit efee0dd
Show file tree
Hide file tree
Showing 116 changed files with 5,119 additions and 4,419 deletions.
10 changes: 9 additions & 1 deletion .babelrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"presets": ["@babel/preset-react"]
"presets": [
"@babel/preset-react",
[
"minify",
{
"builtIns": false
}
]
]
}
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ Feel free to contribute to the answer checking code located at [this repository]
qbreader.org uses:

- Heroku to host its backend
- MongoDB to store the question data and geoword audio[^1]
- MongoDB to store the question data[^1]
- [Bucketeer](https://elements.heroku.com/addons/bucketeer) to store geoword audio files (see [#213](https://github.com/qbreader/website/issues/213))
- [Sendgrid](https://sendgrid.com/en-us) to send emails
- [Namecheap](https://www.namecheap.com/) to manage the domain
- [BetterStack/Logtail](https://elements.heroku.com/addons/logtail) for logging integration with Heroku
- [Heroku Scheduler](https://elements.heroku.com/addons/scheduler) to control when restarts happen
- 8:00 AM UTC (3 AM EST / 4 AM EDT) every day
- Based on [protobowl always restarting at 4 am](https://github.com/neotenic/protobowl?tab=readme-ov-file), since supposedly that's when it's the least busy
- See https://stackoverflow.com/questions/43926740/schedule-heroku-to-restart-dynos-every-10-or-so-minutes for more information

[^1]: This may change; see [this Github issue](https://github.com/qbreader/website/issues/213).
Binary file removed bun.lockb
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions client/about.html → client/about/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
If you have a feature you want to see in qbreader, you can
<a href="https://github.com/qbreader/website/issues">open a new issue</a>.
</p>
<h4>Legal:</h4>
<ul>
<li>Privacy policy: <a href="/about/privacy-policy">click here</a></li>
<li>Terms of service: <a href="/about/terms-of-service">click here</a></li>
</ul>
<h4>Why QB Reader?</h4>
<ul>
<li>
Expand Down
129 changes: 129 additions & 0 deletions client/about/privacy-policy.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!doctype html>
<html lang="en">

<head>
<title>QB Reader</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The QB Reader privacy policy.">

<link href="/apple-touch-icon.png" rel="apple-touch-icon">
<link href="/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed">
<link type="image/x-icon" href="/favicon.ico" rel="icon">

<link href="/bootstrap/light.css" rel="stylesheet">
<link href="/bootstrap/dark.css" rel="stylesheet" id="custom-css">
<script type="module" src="/scripts/apply-theme.js"></script>
</head>

<body>
<nav class="navbar navbar-light navbar-expand-lg bg-custom" id="navbar" style="z-index: 10">
<div class="container-fluid">
<a class="navbar-brand ms-1 py-0" id="logo" href="/">
<span class="logo-prefix">QB</span><span class="logo-suffix">Reader</span>
</a>
<button class="navbar-toggler" data-bs-target="#navbarSupportedContent" data-bs-toggle="collapse" type="button"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/singleplayer">Singleplayer</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/multiplayer">Multiplayer</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/db">Database</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/frequency-list">Frequency List</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/geoword">Geoword</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/api-docs">API</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/about" aria-current="page">About</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/settings">Settings</a>
</li>
</ul>
<div class="d-flex">
<ul class="navbar-nav mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/user/login" id="login-link">Log in</a>
</li>
</ul>
</div>
</div>
</div>
</nav>

<div class="container-xl mt-3 mb-5 pb-5">
<h1>Privacy Policy</h1>
<p>Last updated: September 18th, 2024</p>
<h2 id='1-introduction'>1. Introduction</h2>
<p>
Welcome to qbreader.org. We are committed to protecting your personal information and your right to privacy. This Privacy
Policy explains how we collect, use, disclose, and safeguard your information when you visit our website qbreader.org,
including any other media form, media channel, mobile website, or mobile application related or connected thereto
(collectively, the &quot;Site&quot;). </p>
<h2 id='2-information-we-collect'>2. Information We Collect</h2>
<p>We collect information that you provide directly to us when you:</p>
<ul>
<li>Register for an account</li>
<li>Participate in competitions, such as <a href="/geoword">geoword</a></li>
<li>Contact us with inquiries</li>
</ul>
<p>The types of data we may collect include:</p>
<ul>
<li>Email address</li>
<li>Username</li>
<li>Usage data, such as (but not limited to) buzzpoints</li>
</ul>
<h2 id='3-how-we-use-your-information'>3. How We Use Your Information</h2>
<p>We use your information to:</p>
<ul>
<li>Provide, maintain, and improve our services</li>
<li>Process and complete transactions</li>
<li>Send you technical notices, updates, and support messages</li>
<li>Respond to your comments, questions, and requests</li>
<li>Monitor and analyze trends, usage, and activities in connection with our services</li>

</ul>
<h2 id='4-how-we-share-your-information'>4. How We Share Your Information</h2>
<p>We do not sell, trade, or otherwise transfer your personally identifiable information to outside parties. This does not
include
trusted third parties who assist us in operating our website, conducting our business, or servicing you, as long as those
parties agree to keep this information confidential.</p>
<h2 id='5-data-security'>5. Data Security</h2>
<p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or
access your personal information. However, no method of transmission over the Internet or method of electronic storage is
100%
secure.</p>
<h2 id='6-your-rights'>6. Your Rights</h2>
<p>You have the right to access, update, or delete your personal information at any time. You can do this by logging into your
account settings or by contacting us directly.</p>
<h2 id='7-childrens-privacy'>7. Children&#39;s Privacy</h2>
<p>Our Site is not intended for children under 13 years of age. We do not knowingly collect personal information from children
under 13. If you are under 13, please do not provide any information on this Site.</p>
<h2 id='8-changes-to-this-privacy-policy'>8. Changes to This Privacy Policy</h2>
<p>We may update our Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on
this
page and updating the &quot;Last updated&quot; date at the top of this Privacy Policy.</p>
<h2 id='9-contact-us'>9. Contact Us</h2>
<p>
If you have any questions about this Privacy Policy, please contact us at: <code>geoffreywu1000 [at] gmail [dot] com</code>
</p>
</div>

<script type="module" src="/bootstrap/bootstrap.bundle.min.js"></script>
<script type="module" src="/script.js"></script>
</body>

</html>
170 changes: 170 additions & 0 deletions client/about/terms-of-service.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<!doctype html>
<html lang="en">

<head>
<title>QB Reader</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The QB Reader privacy policy.">

<link href="/apple-touch-icon.png" rel="apple-touch-icon">
<link href="/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed">
<link type="image/x-icon" href="/favicon.ico" rel="icon">

<link href="/bootstrap/light.css" rel="stylesheet">
<link href="/bootstrap/dark.css" rel="stylesheet" id="custom-css">
<script type="module" src="/scripts/apply-theme.js"></script>
</head>

<body>
<nav class="navbar navbar-light navbar-expand-lg bg-custom" id="navbar" style="z-index: 10">
<div class="container-fluid">
<a class="navbar-brand ms-1 py-0" id="logo" href="/">
<span class="logo-prefix">QB</span><span class="logo-suffix">Reader</span>
</a>
<button class="navbar-toggler" data-bs-target="#navbarSupportedContent" data-bs-toggle="collapse" type="button"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/singleplayer">Singleplayer</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/multiplayer">Multiplayer</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/db">Database</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/frequency-list">Frequency List</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/geoword">Geoword</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/api-docs">API</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/about" aria-current="page">About</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/settings">Settings</a>
</li>
</ul>
<div class="d-flex">
<ul class="navbar-nav mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/user/login" id="login-link">Log in</a>
</li>
</ul>
</div>
</div>
</div>
</nav>

<div class="container-xl mt-3 mb-5 pb-5">
<h1 id='terms-of-service-for-qbreaderorg'>Terms of Service for qbreader.org</h1>
<p>Last updated: September 18th, 2024</p>
<p>Please read these Terms of Service (&quot;Terms&quot;, &quot;Terms of Service&quot;) carefully before using the qbreader.org
website (the &quot;Service&quot;) operated by qbreader (&quot;us&quot;, &quot;we&quot;, or &quot;our&quot;).</p>
<h2 id='1-acceptance-of-terms'>1. Acceptance of Terms</h2>
<p>By accessing or using the Service, you agree to be bound by these Terms. If you disagree with any part of the terms, then
you
may not access the Service.</p>
<h2 id='2-description-of-service'>2. Description of Service</h2>
<p>qbreader.org is a quizbowl website that provides users a text-based quizbowl packet reader and database.</p>
<h2 id='3-user-accounts'>3. User Accounts</h2>
<ol type="a">
<li>
You may be required to create an account to use certain features of the Service. You are responsible for maintaining
the confidentiality of your account and password.
</li>
<li>
You agree to provide accurate, current, and complete information during the registration process and to update such
information to keep it accurate, current, and complete.
</li>
</ol>
<h2 id='4-user-content'>4. User Content</h2>
<ol type="a">
<li>
Users may have the ability to post, upload, or contribute content to the Service (&quot;User Content&quot;). You
retain
all
rights to your User Content.
</li>
<li>
By posting User Content, you grant us a non-exclusive, worldwide, royalty-free license to use, modify, publicly
perform,
publicly display, reproduce, and distribute such User Content on and through the Service.
</li>
<li>
You agree not to post User Content that is illegal, offensive, threatening, libelous, defamatory, pornographic,
obscene,
or
otherwise objectionable.
</li>
</ol>
<h2 id='5-intellectual-property-and-mit-license'>5. Intellectual Property and MIT License</h2>
<p>
The Service and its original content, features, and functionality are released under the MIT License, the terms of which
are as follows:
</p>
<code>
<p>MIT License</p>
<p>Copyright (c) [year] [Your Company Name]</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</p>
</code>
<h2 id='6-links-to-other-websites'>6. Links to Other Websites</h2>
<p>
Our Service may contain links to third-party websites or services that are not owned or controlled by qbreader.
We
have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party
websites
or services.
</p>
<h2 id='7-termination'>7. Termination</h2>
<p>We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever,
including without limitation if you breach the Terms.</p>
<h2 id='8-limitation-of-liability'>8. Limitation of Liability</h2>
<p>
In no event shall qbreader, nor its directors, employees, partners, agents, suppliers, or affiliates, be liable for any
indirect, incidental, special, consequential or punitive damages, including without limitation, loss of profits, data, use,
goodwill, or other intangible losses, resulting from your access to or use of or inability to access or use the Service.
</p>
<h2 id='9-governing-law'>9. Governing Law</h2>
<p>
These Terms shall be governed and construed in accordance with the laws of the United States of America, without regard to
its conflict of law provisions.
</p>
<h2 id='10-changes-to-terms'>10. Changes to Terms</h2>
<p>We reserve the right, at our sole discretion, to modify or replace these Terms at any time. We will provide notice of any
significant changes by posting the new Terms on this page.</p>
<h2 id='11-contact-us'>11. Contact Us</h2>
<p>
If you have any questions about these Terms, please contact us at <code>geoffreywu1000 [at] gmail [dot] com</code>. By
using qbreader.org, you acknowledge that you have read and understood these Terms of Service and agree to be bound by
them.
</p>
</div>

<script type="module" src="/bootstrap/bootstrap.bundle.min.js"></script>
<script type="module" src="/script.js"></script>
</body>

</html>
Loading

0 comments on commit efee0dd

Please sign in to comment.