Fix header#top suddenly having a margin

Downgrade parcel-bundler to 1.9.7; minor fixes
Newer versions incorrectly link html files: https://github.com/parcel-bundler/parcel/issues/2791
2019-06-03 14:36:01 -06:00 · 2019-06-03 14:36:00 -06:00 · 2019-06-03 14:35:44 -06:00 · 2019-06-03 11:50:39 -06:00
9 changed files with 1838 additions and 1361 deletions
--- a/advertising.html
+++ b/advertising.html
@ -0,0 +1,109 @@
 <!DOCTYPE html>
 <html>
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Advertising on Lexiconga</title>
  <meta property="og:url" content="https://lexicon.ga/advertising.html" />
  <meta property="og:type" content="article" />
  <meta property="og:title" content="Advertising on Lexiconga" />
  <meta property="og:description" content="Buy advertisement space on Lexiconga" />
  <!--meta property="og:image" content="http://lexicon.ga/images/logo.svg" /-->
  <link rel="stylesheet" href="src/main.scss" />
 </head>
 <body id="defaultTheme">
  <header id="top">
    <a href="./">
      <h1 id="title">Lexiconga</h1>
    </a>
  </header>
  <main>
    <section id="mainColumn">
      <section id="detailsSection">
        <h2 id="dictionaryName">Advertising on Lexiconga</h2>
        <article id="detailsPanel" style="max-height:unset;">
          <h3>About</h3>
          <p>
            Advertisements are shown in-line with dictionary entries as plain text with a link to your advertised
            content.
            You get up to 50 characters for your headline, up to 200 characters for your body text, and 20 characters
            for the
            text in a button that links wherever you would like it to go.
          </p>
          <p>
            At Lexiconga, we only want to display advertisements that will appeal to our users, so we work directly with
            our
            advertisers to maintain a manually curated selection of ads. As an advertiser, you will be creating a
            professional
            relationship with Lexiconga to ensure that your advertisements are up to par with what we want our users to
            see.
            All this means is that as long as your advertisement is relevant and your product is not predatory, you're
            good to go.
          </p>
          <p>
            "Relevant" advertisements include but are not limited to:
          </p>
          <ul>
            <li>Books and Authors</li>
            <li>Conlanging tools</li>
            <li>Writing resoruces</li>
            <li>Video and tabletop games</li>
            <li>Blogs and vlogs</li>
            <li>Cool and interesting products</li>
            <li>Kickstarters related to the above</li>
          </ul>
          <p>
            We want to help you get the word out about your project or product to Lexiconga users in a way that doesn't
            interfere with their work while also allowing them to find your cool, interesting, and helpful things.
          </p>
          <h3>Pricing</h3>
          <p>
            As with the advertisements themselves, the pricing structure is fairly simple, too:
          </p>
          <ul>
            <li>
              <strong>Monthly:</strong> $5.00 per ad
              <ul>
                <li>With Priority: $20.00 per ad</li>
              </ul>
            </li>
            <li>
              <strong>Yearly:</strong> $50.00 per ad
              <ul>
                <li>With Priority: $200.00 per ad</li>
              </ul>
            </li>
          </ul>
          <h3>What's Priority?</h3>
          <p>
            All current advertisements are shuffled and then displayed to Lexiconga users once every 10 words. If you
            rent your ad space with Priority, then your ads will be shuffled among any other Priority ads and shown
            <em>before</em> any other ads that were not rented with priority.
          </p>
          <h3>Get in Touch</h3>
          <p>
            If you would like to advertise on Lexiconga or if you have any questions, please contact us at
            <a href="mailto:ads@lexicon.ga?subject=Advertising%20on%20Lexiconga">ads@lexicon.ga</a> to get
            started!
          </p>
        </article>
      </section>
    </section>
  </main>
  <footer id="bottom">
    <a href="https://buymeacoff.ee/robbieantenesse" target="_blank" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" class="small button">Blog</a>
    <a href="./" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" class="small button">Updates</a>
    <span class="separator">|</span>
    <a class="button" id="helpInfoButton">Help</a>
    <a class="button" id="termsInfoButton">Terms</a>
    <a class="button" id="privacyInfoButton">Privacy</a>
  </footer>
 </body>
 </html>
--- a/index.html
+++ b/index.html
@ -5,6 +5,7 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Lexiconga</title>
  <link rel="stylesheet" href="src/main.scss" />
  <script src="src/index.js"></script>
 </head>
 <body id="defaultTheme">
@ -134,6 +135,7 @@
  <footer id="bottom">
    <a href="https://buymeacoff.ee/robbieantenesse" target="_blank" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" class="small button">Blog</a>
    <a href="./advertising.html" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" class="small button">Updates</a>
    <span class="separator">|</span>
--- a/package.json
+++ b/package.json
@ -20,7 +20,8 @@
    "autoprefixer": "^9.5.1",
    "concurrently": "^4.1.0",
    "cpx": "^1.5.0",
-    "parcel-bundler": "^1.12.3",
+    "node-sass": "^4.12.0",
    "parcel-bundler": "1.9.7",
    "rimraf": "^2.6.3",
    "sass": "^1.19.0"
  },
--- a/src/index.js
+++ b/src/index.js
@ -1,5 +1,3 @@
 import './main.scss';
 import setupListeners from './js/setupListeners';
 import { renderAll } from './js/render';
 import { hasToken } from './js/utilities';
--- a/src/js/account/sync.js
+++ b/src/js/account/sync.js
@ -192,7 +192,7 @@ export function syncWords(remoteWords, deletedWords) {
  }
  remoteWords.forEach(remoteWord => {
-    const localWord = words.find(word => word.wordId === remoteWord.wordId);
+    let localWord = words.find(word => word.wordId === remoteWord.wordId);
    if (localWord) {
      if (localWord.lastUpdated < remoteWord.lastUpdated) {
        localWord = remoteWord;
--- a/src/js/view/index.js
+++ b/src/js/view/index.js
@ -1,4 +1,3 @@
 import '../../main.scss';
 import { renderAll } from './render';
 import setupListeners from './setupListeners';
--- a/src/main.scss
+++ b/src/main.scss
@ -21,6 +21,7 @@
@import 'scss/themes/grape';
 html, body {
  margin: 0;
  font-family: $font;
  * {
--- a/view.html
+++ b/view.html
@ -11,6 +11,7 @@
  <meta property="og:description" content="A Lexiconga dictionary by {{public_name}}" />
  <!--meta property="og:image" content="http://lexicon.ga/images/logo.svg" /-->
  <script>window.currentDictionary = JSON.parse('{{dict_json}}');</script>
  <link rel="stylesheet" href="src/main.scss" />
  <script src="src/js/view/index.js"></script>
 </head>
 <body id="defaultTheme">
@ -142,9 +143,10 @@
  <footer id="bottom">
    <a href="https://buymeacoff.ee/robbieantenesse" target="_blank" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" class="small button">Blog</a>
    <a href="./advertising.html" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" class="small button">Updates</a>
-    |
+    <span class="separator">|</span>
    <a class="button" id="helpInfoButton">Help</a>
    <a class="button" id="termsInfoButton">Terms</a>
    <a class="button" id="privacyInfoButton">Privacy</a>
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Robbie Antenesse	5c38f2f53a	Fix header#top suddenly having a margin	2019-06-03 14:36:01 -06:00
Robbie Antenesse	441dfb4d6e	Downgrade parcel-bundler to 1.9.7; minor fixes Newer versions incorrectly link html files: https://github.com/parcel-bundler/parcel/issues/2791	2019-06-03 14:36:00 -06:00
Robbie Antenesse	e9c6cd7824	Create an Advertising information page	2019-06-03 14:35:44 -06:00
Robbie Antenesse	cf2ab82b12	Process main.scss in html so parcel shares the output	2019-06-03 11:50:39 -06:00