Merge pull request #34 from fewieden/develop

V1.1.0
fewieden · Sep 16, 2020 · d273e6b · d273e6b
2 parents 2c043ab + 5948bc8
commit d273e6b
Show file tree

Hide file tree

Showing 11 changed files with 3,809 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,29 @@
+# MMM-NFL Changelog
+
+## [1.1.0]
+
+### Fixed
+
+* Data source
+* Installation instructions
+
+### Added
+
+* Config option `tableSize` to specify font size of table.
+* Config option `reverseTeams` to invert the display order of home and away team.
+* Display of week in header.
+* package-lock.json
+* Pro bowl mode
+
+### Changed
+
+* Updated icons
+* Start in regular mode
+
+### Removed
+
+* team renaming
+
+## [1.0.0]
+
+Initial version
diff --git a/MMM-NFL.js b/MMM-NFL.js
@@ -8,16 +8,16 @@
  */
 
 Module.register('MMM-NFL', {
-
     modes: {
         P: 'Pre-Season',
         R: 'Regular-Season',
-        POST: 'Post-Season'
+        POST: 'Post-Season',
+        PRO: 'Pro-Bowl'
     },
 
     details: {
         y: (new Date()).getFullYear(),
-        t: 'P'
+        t: 'R'
     },
 
     states: {
@@ -38,7 +38,9 @@ Module.register('MMM-NFL', {
         helmets: false,
         focus_on: false,
         format: 'ddd h:mm',
-        reloadInterval: 30 * 60 * 1000       // every 30 minutes
+        reloadInterval: 30 * 60 * 1000, // every 30 minutes
+        reverseTeams: false,
+        tableSize: 'small'
     },
 
     statistics: false,
@@ -150,7 +152,8 @@ Module.register('MMM-NFL', {
         const wrapper = document.createElement('div');
         const scores = document.createElement('div');
         const header = document.createElement('header');
-        header.innerHTML = `NFL ${this.modes[this.details.t] || this.details.t} ${this.details.y}`;
+        header.innerHTML = `NFL ${this.modes[this.details.t] || this.details.t} ${this.details.y}
+            Week ${this.details.w}`;
         scores.appendChild(header);
 
         if (!this.scores) {
@@ -160,7 +163,7 @@ Module.register('MMM-NFL', {
             scores.appendChild(text);
         } else {
             const table = document.createElement('table');
-            table.classList.add('small', 'table');
+            table.classList.add(this.config.tableSize, 'table');
 
             table.appendChild(this.createLabelRow());
 
@@ -224,19 +227,19 @@ Module.register('MMM-NFL', {
         dateLabel.appendChild(dateIcon);
         labelRow.appendChild(dateLabel);
 
-        const homeLabel = document.createElement('th');
-        homeLabel.innerHTML = this.translate('HOME');
-        homeLabel.setAttribute('colspan', 3);
-        labelRow.appendChild(homeLabel);
+        const firstLabel = document.createElement('th');
+        firstLabel.innerHTML = this.translate(this.config.reverseTeams ? 'AWAY' : 'HOME');
+        firstLabel.setAttribute('colspan', 3);
+        labelRow.appendChild(firstLabel);
 
         const vsLabel = document.createElement('th');
         vsLabel.innerHTML = '';
         labelRow.appendChild(vsLabel);
 
-        const awayLabel = document.createElement('th');
-        awayLabel.innerHTML = this.translate('AWAY');
-        awayLabel.setAttribute('colspan', 3);
-        labelRow.appendChild(awayLabel);
+        const secondLabel = document.createElement('th');
+        secondLabel.innerHTML = this.translate(this.config.reverseTeams ? 'HOME' : 'AWAY');
+        secondLabel.setAttribute('colspan', 3);
+        labelRow.appendChild(secondLabel);
 
         return labelRow;
     },
@@ -269,57 +272,56 @@ Module.register('MMM-NFL', {
             }
             row.appendChild(date);
 
-            const homeTeam = document.createElement('td');
-            homeTeam.classList.add('align-right');
-            this.appendBallPossession(data, true, homeTeam);
-            const homeTeamSpan = document.createElement('span');
-            homeTeamSpan.innerHTML = data.h;
-            homeTeam.appendChild(homeTeamSpan);
-            row.appendChild(homeTeam);
+            const firstTeam = document.createElement('td');
+            firstTeam.classList.add('align-right');
+            this.appendBallPossession(data, false, firstTeam);
+            const firstTeamSpan = document.createElement('span');
+            firstTeamSpan.innerHTML = data[this.config.reverseTeams ? 'v' : 'h'];
+            firstTeam.appendChild(firstTeamSpan);
+            row.appendChild(firstTeam);
 
-            const homeLogo = document.createElement('td');
-            homeLogo.appendChild(this.createIcon(data.h));
-            row.appendChild(homeLogo);
+            const firstLogo = document.createElement('td');
+            firstLogo.appendChild(this.createIcon(data[this.config.reverseTeams ? 'v' : 'h']));
+            row.appendChild(firstLogo);
 
-            const homeScore = document.createElement('td');
-            homeScore.innerHTML = data.hs;
-            row.appendChild(homeScore);
+            const firstScore = document.createElement('td');
+            firstScore.innerHTML = data[this.config.reverseTeams ? 'vs' : 'hs'];
+            row.appendChild(firstScore);
 
             const vs = document.createElement('td');
             vs.innerHTML = ':';
             row.appendChild(vs);
 
-            const awayScore = document.createElement('td');
-            awayScore.innerHTML = data.vs;
-            row.appendChild(awayScore);
+            const secondScore = document.createElement('td');
+            secondScore.innerHTML = data[this.config.reverseTeams ? 'hs' : 'vs'];
+            row.appendChild(secondScore);
 
-            const awayLogo = document.createElement('td');
-            awayLogo.appendChild(this.createIcon(data.v, true));
-            row.appendChild(awayLogo);
+            const secondLogo = document.createElement('td');
+            secondLogo.appendChild(this.createIcon(data[this.config.reverseTeams ? 'h' : 'v'], true));
+            row.appendChild(secondLogo);
 
-            const awayTeam = document.createElement('td');
-            awayTeam.classList.add('align-left');
-            const awayTeamSpan = document.createElement('span');
-            awayTeamSpan.innerHTML = data.v;
-            awayTeam.appendChild(awayTeamSpan);
-            this.appendBallPossession(data, false, awayTeam);
-            row.appendChild(awayTeam);
+            const secondTeam = document.createElement('td');
+            secondTeam.classList.add('align-left');
+            const secondTeamSpan = document.createElement('span');
+            secondTeamSpan.innerHTML = data[this.config.reverseTeams ? 'h' : 'v'];
+            secondTeam.appendChild(secondTeamSpan);
+            this.appendBallPossession(data, true, secondTeam);
+            row.appendChild(secondTeam);
 
             appendTo.appendChild(row);
         }
     },
 
-    appendBallPossession(data, homeTeam, appendTo) {
-        const team = homeTeam ? data.h : data.v;
+    appendBallPossession(data, firstTeam, appendTo) {
+        const team = firstTeam ? data.h : data.v;
         if (data.p === team) {
             const ballIcon = document.createElement('img');
             ballIcon.src = this.file('icons/football.png');
-            if (homeTeam) {
+            if (firstTeam) {
                 ballIcon.classList.add('ball-home');
             } else {
                 ballIcon.classList.add('ball-away');
-            }
-            if (data.rz === '1') {
+            } if (data.rz === '1') {
                 ballIcon.classList.add('redzone');
             }
             appendTo.appendChild(ballIcon);

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ National Football League Module for MagicMirror<sup>2</sup>
     }
     ```
 
-1. Run command `npm install --productive` in `~/MagicMirror/modules/MMM-NFL` directory.
+1. Run command `npm install --production` in `~/MagicMirror/modules/MMM-NFL` directory.
 
 ## Config Options
 
@@ -41,7 +41,9 @@ National Football League Module for MagicMirror<sup>2</sup>
 | `helmets` | `false` | Show helmets instead of logo. |
 | `focus_on` | `false` | Display only matches with teams of this array e.g. `['NYG', 'DAL', 'NE']`. |
 | `format` | `'ddd h:mm'` | In which format the date should be displayed. [All Options](http://momentjs.com/docs/#/displaying/format/) |
-| `reloadInterval` | `1800000` (30 mins) | How often should the data be fetched |
+| `reloadInterval` | `1800000` (30 mins) | How often should the data be fetched. |
+| `reverseTeams` | `false` | Flag to switch order of home and away team. |
+| `tableSize` | `'small'` | Font size of table. Possible values: `'xsmall'`, `'small'`, `'medium'`, `'large'` and `'xlarge'` |
 
 ## OPTIONAL: Voice Control
 

diff --git a/icons/LA.png b/icons/LA.png
diff --git a/icons/OAK.png → icons/LV.png b/icons/OAK.png → icons/LV.png
diff --git a/icons/OAK_helmet.png → icons/LV_helmet.png b/icons/OAK_helmet.png → icons/LV_helmet.png
diff --git a/icons/WAS.png b/icons/WAS.png
diff --git a/icons/WAS_helmet.png b/icons/WAS_helmet.png
diff --git a/node_helper.js b/node_helper.js
@@ -16,8 +16,8 @@ const StatisticsAPI = require('./StatisticsAPI.js');
 module.exports = NodeHelper.create({
 
     urls: {
-        regular: 'http://www.nfl.com/liveupdate/scorestrip/ss.xml',
-        post: 'http://www.nfl.com/liveupdate/scorestrip/postseason/ss.xml'
+        regular: 'http://static.nfl.com/liveupdate/scorestrip/ss.xml',
+        post: 'http://static.nfl.com/liveupdate/scorestrip/postseason/ss.xml'
     },
     mode: 'regular',
     scores: [],