Version 0.0.49

ubyssey · Sep 21, 2018 · 250da6c · 250da6c
1 parent 9047f33
commit 250da6c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/phoenix/static/.eslintrc.js b/phoenix/static/.eslintrc.js
@@ -5,7 +5,15 @@ module.exports = {
     "es6": true,
     "node": true,
   },
-  "extends": ["eslint:recommended",],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+  ],
+  "settings": {
+    "react": {
+      "version": "16.3.1",
+    },
+  },
   "parserOptions": {
     "sourceType": "module",
     "ecmaFeatures": {
@@ -18,5 +26,6 @@ module.exports = {
     "quotes": ["error", "single"],
     "no-unused-vars": ["warn", {"args": "after-used"}],
     "no-console": ["warn"],
+    "react/prop-types": 0,
   }
 };
diff --git a/phoenix/static/package.json b/phoenix/static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phoenix-news",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "The frontend code for The Phoenix News website.",
   "author": "Peter Siemens <[email protected]>",
   "homepage": "https://www.thephoenixnews.com",
@@ -15,6 +15,7 @@
     "css-loader": "^0.28.10",
     "eslint": "^4.18.2",
     "eslint-loader": "^2.0.0",
+    "eslint-plugin-react": "^7.11.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "hammerjs": "^2.0.8",

diff --git a/phoenix/templates/base.html b/phoenix/templates/base.html
@@ -13,7 +13,7 @@
 
     <meta property="og:site_name" content="The Phoenix News">
 
-    <link rel="stylesheet" href="{% static 'main-0.0.48.css' %}" type="text/css"/>
+    <link rel="stylesheet" href="{% static 'main-0.0.49.css' %}" type="text/css"/>
 
     <link rel="shortcut icon" href="{% static 'favicon.ico' %}" />
     <link rel="icon" type="image/png" sizes="32x32" href="{% static 'favicon-32x32.png' %}" />
@@ -35,7 +35,7 @@
 
     <script>
       googletag.cmd.push(function() {
-        googletag.defineSlot('/21704376897/Leaderboard', [728, 90], 'div-gpt-ad-1524205003572-0').addService(googletag.pubads());
+        googletag.defineSlot('/21704376897/Leaderboard', [[970, 90], [728, 90]], 'div-gpt-ad-1524205003572-0').addService(googletag.pubads());
         googletag.defineSlot('/21704376897/Mobile_Leaderboard', [320, 50], 'div-gpt-ad-1530722739897-0').addService(googletag.pubads());
         googletag.defineSlot('/21704376897/SidebarA', [[300, 600], [300, 250]], 'div-gpt-ad-1524205003572-1').addService(googletag.pubads());
         googletag.defineSlot('/21704376897/SidebarB', [[300, 600], [300, 250]], 'div-gpt-ad-1524205003572-2').addService(googletag.pubads());
@@ -49,7 +49,7 @@
   <body>
     {% block body %}{% endblock %}
     <div id="js-galleries"></div>
-    <script type="text/javascript" src="{% static 'index-0.0.48.js' %}"></script>
+    <script type="text/javascript" src="{% static 'index-0.0.49.js' %}"></script>
     {% block scripts %}{% endblock %}
   </body>
 </html>
diff --git a/phoenix/templates/issue.html b/phoenix/templates/issue.html
@@ -5,7 +5,7 @@
 
 {% block body %}
 
-<link rel="stylesheet" href="{% static 'main-0.0.48.css' %}" type="text/css"/>
+<link rel="stylesheet" href="{% static 'main-0.0.49.css' %}" type="text/css"/>
 
 <div class="c-issue">
   <div class="c-issue__header">
@@ -19,7 +19,7 @@ <h2 class="c-issue__subtitle">{{ issue.date|date:"F j, Y" }}</h2>
     <div class="c-issue__header__right"></div>
   </div>
   <div class="c-issue__viewer">
-    <div id="js-pdf" data-url='{% get_media_prefix %}{{ issue.file }}' data-worker='{% static 'pdf.worker-0.0.48.js' %}'></div>
+    <div id="js-pdf" data-url='{% get_media_prefix %}{{ issue.file }}' data-worker='{% static 'pdf.worker-0.0.49.js' %}'></div>
   </div>
 </div>
 
@@ -35,5 +35,5 @@ <h2 class="c-issue__subtitle">{{ issue.date|date:"F j, Y" }}</h2>
 {% endblock %}
 
 {% block scripts %}
-<script src="{% static 'pdf-0.0.48.js' %}" type="text/javascript"></script>
+<script src="{% static 'pdf-0.0.49.js' %}" type="text/javascript"></script>
 {% endblock %}