Compare commits

...

4 Commits

Author SHA1 Message Date
Robbie Antenesse 3dd370a375 Update create account text 2020-08-03 23:15:31 -06:00
Robbie Antenesse 34459b40a4 Comment out unused pagination code
- The unused code kept getting bundled, so this should prevent that.
2020-08-03 22:58:29 -06:00
Robbie Antenesse 4318f90263 Upgrade parcel-bundler version, I guess 2020-08-03 22:57:39 -06:00
Robbie Antenesse d98cf9a584 Remove expired ads 2020-08-03 22:48:44 -06:00
6 changed files with 41 additions and 59 deletions

View File

@ -43,23 +43,5 @@
"start": "January 24, 2020", "start": "January 24, 2020",
"end": "January 24, 2021", "end": "January 24, 2021",
"isPriority": false "isPriority": false
},
{
"header": "Like the GUTS+ System?",
"body": "Help contribute to the ongoing development of the GUTS+ System by buying the new, nicely-formatted PDF rule book! With imagery and some exclusive content, this is the best way to learn to play!",
"cta": "Buy Now",
"link": "https://alamantus.itch.io/guts-plus",
"start": "December 4, 2019",
"end": "July 1, 2020",
"isPriority": false
},
{
"header": "Like the GUTS+ System?",
"body": "Help contribute to the ongoing development of the GUTS+ System by buying the new, nicely-formatted PDF rule book! With imagery and some exclusive content, this is the best way to learn to play!",
"cta": "Buy Now",
"link": "https://www.drivethrurpg.com/product/273132/The-GUTS-System-Core-Rule-Book-PDF",
"start": "December 4, 2019",
"end": "July 1, 2020",
"isPriority": false
} }
] ]

View File

@ -24,7 +24,7 @@
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"concurrently": "^5.2.0", "concurrently": "^5.2.0",
"cpx": "^1.5.0", "cpx": "^1.5.0",
"parcel-bundler": "^1.12.3", "parcel-bundler": "^1.12.4",
"parcel-plugin-goodie-bag": "^2.0.0", "parcel-plugin-goodie-bag": "^2.0.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"sass": "^1.26.10", "sass": "^1.26.10",

View File

@ -25,7 +25,6 @@ export function renderLoginForm() {
<div> <div>
<h2>Create a New Account</h2> <h2>Create a New Account</h2>
<p>Creating an account allows you to save and switch between as many dictionaries as you need and access them from any device for free! If you have a dictionary you've been working on loaded already, it will automatically be uploaded to your account when you log in for the first time.</p> <p>Creating an account allows you to save and switch between as many dictionaries as you need and access them from any device for free! If you have a dictionary you've been working on loaded already, it will automatically be uploaded to your account when you log in for the first time.</p>
<p>Plus if you allow us to send you emails, we'll make sure that you're the first to hear about any new features that get added or if any of our policies change for any reason. We'll never spam you or sell your information.</p>
<p>By creating an account, you are indicating that you agree to the Terms of Service and that you understand Lexiconga's Privacy Policy.</p> <p>By creating an account, you are indicating that you agree to the Terms of Service and that you understand Lexiconga's Privacy Policy.</p>
<label>Email<br> <label>Email<br>
<input type="email" id="createNewEmail" maxlength="100"> <input type="email" id="createNewEmail" maxlength="100">
@ -40,9 +39,10 @@ export function renderLoginForm() {
<input type="text" id="createNewPublicName" maxlength="50"> <input type="text" id="createNewPublicName" maxlength="50">
</label> </label>
<label>Allow Emails <label>Allow Emails
<input type="checkbox" id="createNewAllowEmails"> <input type="checkbox" id="createNewAllowEmails">
</label> </label>
<p>Creating an account is <em>not</em> required to use Lexiconga's core features. Click "Help" in the site footer to learn what accounts provide.</p> <p><small>If you allow emails, you'll be informed if any of our policies change for any reason. We'll <em>never</em> spam you or sell your information.</small></p>
<p><strong>Remember:</strong> Creating an account is <em>not</em> required to use Lexiconga's core features. Click "Help" in the site footer to learn what accounts provide.</p>
<section id="createAccountErrorMessages"></section> <section id="createAccountErrorMessages"></section>
<button id="createAccountSubmit" class="button">Create Account</button> <button id="createAccountSubmit" class="button">Create Account</button>
</div> </div>

View File

@ -4,11 +4,11 @@ import { getHomonymnNumber, hasToken } from '../utilities';
import { getMatchingSearchWords, highlightSearchTerm, getSearchFilters, getSearchTerm } from '../search'; import { getMatchingSearchWords, highlightSearchTerm, getSearchFilters, getSearchTerm } from '../search';
import { import {
setupWordOptionButtons, setupWordOptionButtons,
setupPagination, // setupPagination,
setupWordOptionSelections, setupWordOptionSelections,
setupWordEditFormButtons, setupWordEditFormButtons,
} from '../setupListeners/words'; } from '../setupListeners/words';
import { getPaginationData } from '../pagination'; // import { getPaginationData } from '../pagination';
import { getOpenEditForms, translateOrthography, parseReferences, getWordReferenceMarkdown } from '../wordManagement'; import { getOpenEditForms, translateOrthography, parseReferences, getWordReferenceMarkdown } from '../wordManagement';
import { renderAd } from '../ads'; import { renderAd } from '../ads';
import { getPublicLink } from '../account/utilities'; import { getPublicLink } from '../account/utilities';
@ -136,25 +136,25 @@ export function renderWords() {
// renderPagination(words); // renderPagination(words);
} }
export function renderPagination(filteredWords) { // export function renderPagination(filteredWords) {
const paginationData = getPaginationData(filteredWords); // const paginationData = getPaginationData(filteredWords);
if (paginationData.pages > 0) { // if (paginationData.pages > 0) {
let paginationHTML = (paginationData.currentPage > 0 ? '<span class="button prev-button">&laquo; Previous</span>' : '') // let paginationHTML = (paginationData.currentPage > 0 ? '<span class="button prev-button">&laquo; Previous</span>' : '')
+ '<select class="page-selector">'; // + '<select class="page-selector">';
for (let i = 0; i < paginationData.pages; i++) { // for (let i = 0; i < paginationData.pages; i++) {
paginationHTML += `<option value="${i}"${paginationData.currentPage === i ? ' selected' : ''}>Page ${i + 1}</option>`; // paginationHTML += `<option value="${i}"${paginationData.currentPage === i ? ' selected' : ''}>Page ${i + 1}</option>`;
} // }
paginationHTML += '</select>' // paginationHTML += '</select>'
+ (paginationData.currentPage < paginationData.pages - 1 ? '<span class="button next-button">Next &raquo;</span>' : ''); // + (paginationData.currentPage < paginationData.pages - 1 ? '<span class="button next-button">Next &raquo;</span>' : '');
Array.from(document.getElementsByClassName('pagination')).forEach(pagination => { // Array.from(document.getElementsByClassName('pagination')).forEach(pagination => {
pagination.innerHTML = paginationHTML; // pagination.innerHTML = paginationHTML;
}); // });
setupPagination(); // setupPagination();
} // }
} // }
export function renderEditForm(wordId = false) { export function renderEditForm(wordId = false) {
wordId = typeof wordId.target === 'undefined' ? wordId : parseInt(this.id.replace('edit_', '')); wordId = typeof wordId.target === 'undefined' ? wordId : parseInt(this.id.replace('edit_', ''));

View File

@ -1,6 +1,6 @@
import { renderEditForm } from '../render/words'; import { renderEditForm } from '../render/words';
import { confirmEditWord, cancelEditWord, confirmDeleteWord, expandAdvancedForm, submitWordForm } from '../wordManagement'; import { confirmEditWord, cancelEditWord, confirmDeleteWord, expandAdvancedForm, submitWordForm } from '../wordManagement';
import { goToNextPage, goToPreviousPage, goToPage } from '../pagination'; // import { goToNextPage, goToPreviousPage, goToPage } from '../pagination';
import { setupMaximizeButtons } from './buttons'; import { setupMaximizeButtons } from './buttons';
import { setupIPAFields } from '.'; import { setupIPAFields } from '.';
@ -98,22 +98,22 @@ export function setupMobileWordFormButton() {
}); });
} }
export function setupPagination() { // export function setupPagination() {
const nextButtons = document.getElementsByClassName('next-button'), // const nextButtons = document.getElementsByClassName('next-button'),
prevButtons = document.getElementsByClassName('prev-button'), // prevButtons = document.getElementsByClassName('prev-button'),
pageSelectors = document.getElementsByClassName('page-selector'); // pageSelectors = document.getElementsByClassName('page-selector');
Array.from(nextButtons).forEach(nextButton => { // Array.from(nextButtons).forEach(nextButton => {
nextButton.removeEventListener('click', goToNextPage); // nextButton.removeEventListener('click', goToNextPage);
nextButton.addEventListener('click', goToNextPage); // nextButton.addEventListener('click', goToNextPage);
}); // });
Array.from(prevButtons).forEach(prevButton => { // Array.from(prevButtons).forEach(prevButton => {
prevButton.removeEventListener('click', goToPreviousPage); // prevButton.removeEventListener('click', goToPreviousPage);
prevButton.addEventListener('click', goToPreviousPage); // prevButton.addEventListener('click', goToPreviousPage);
}); // });
Array.from(pageSelectors).forEach(pageSelector => { // Array.from(pageSelectors).forEach(pageSelector => {
pageSelector.removeEventListener('change', goToPage); // pageSelector.removeEventListener('change', goToPage);
pageSelector.addEventListener('change', goToPage); // pageSelector.addEventListener('change', goToPage);
}); // });
} // }

View File

@ -4203,7 +4203,7 @@ papaparse@^5.1.1:
resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.2.0.tgz#97976a1b135c46612773029153dc64995caa3b7b" resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.2.0.tgz#97976a1b135c46612773029153dc64995caa3b7b"
integrity sha512-ylq1wgUSnagU+MKQtNeVqrPhZuMYBvOSL00DHycFTCxownF95gpLAk1HiHdUW77N8yxRq1qHXLdlIPyBSG9NSA== integrity sha512-ylq1wgUSnagU+MKQtNeVqrPhZuMYBvOSL00DHycFTCxownF95gpLAk1HiHdUW77N8yxRq1qHXLdlIPyBSG9NSA==
parcel-bundler@^1.12.3: parcel-bundler@^1.12.4:
version "1.12.4" version "1.12.4"
resolved "https://registry.yarnpkg.com/parcel-bundler/-/parcel-bundler-1.12.4.tgz#31223f4ab4d00323a109fce28d5e46775409a9ee" resolved "https://registry.yarnpkg.com/parcel-bundler/-/parcel-bundler-1.12.4.tgz#31223f4ab4d00323a109fce28d5e46775409a9ee"
integrity sha512-G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ== integrity sha512-G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ==