Skip to content

Commit

Permalink
Merge pull request #12 from fewieden/develop
Browse files Browse the repository at this point in the history
v2
  • Loading branch information
fewieden authored Jan 25, 2021
2 parents 8ebab06 + 90a8dfa commit 3bda579
Show file tree
Hide file tree
Showing 59 changed files with 6,569 additions and 378 deletions.
16 changes: 8 additions & 8 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ engines:
enabled: true
config:
languages:
- javascript
- javascript
eslint:
enabled: true
channel: "eslint-3"
channel: "eslint-6"
checks:
import/no-unresolved:
enabled: false
Expand All @@ -18,9 +18,9 @@ engines:
enabled: true
ratings:
paths:
- "**.js"
- "**.css"
- "**.md"
exclude_paths: [
"node_modules/**/*"
]
- "**.js"
- "**.css"
- "**.md"
exclude_paths:
- "node_modules/**/*"
- "docs/**/*"
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs/*
32 changes: 24 additions & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
{
"extends": "airbnb-base",
"rules": {
"comma-dangle": 0,
"indent": [2, 4],
"max-len": [2, 120, { "ignoreStrings": true }],
"radix": [2, "as-needed"],
"no-console": 0
"extends": ["esnext", "esnext/style-guide", "node", "node/style-guide"],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"settings": {
"import/core-modules": [ "node_helper" ]
},
"env": {
"browser": true,
"node": true,
"es6": true
"es6": true,
"jest": true
},
"globals": {
"Module": true,
"Log": true
},
"rules": {
"import/no-commonjs": 0,
"import/no-nodejs-modules": 0,
"semi": 0,
"comma-dangle": 0,
"indent": ["error", 4],
"template-curly-spacing": 0,
"no-console": 0,
"curly": ["error", "all"],
"array-bracket-spacing": 0,
"space-before-function-paren": 0,
"object-curly-spacing": ["error", "never"],
"object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }]
}
}
8 changes: 8 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Contribution Guidelines

Thanks for contributing to this module!

Please create pull requests to the branch `develop`.

To hold one code style and standard there are several linters and tools in this project set. Make sure you fulfill the requirements.
Also, there will be automatically analysis performed once you created the pull request.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
custom: ['https://paypal.me/fewieden']
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Platform (Hardware/OS):

Node version:

MagicMirror version:

Module version:

Description of the issue:
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Please create pull requests to the branch `develop`.

* Does the pull request solve an issue (add a reference)?
* What are the features of this pr?
* Add screenshots for visual changes.
Binary file added .github/example_nhl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/example_nhl_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/example_nhl_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/global.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: build

on:
push:
branches: [ master, develop ]
pull_request:
branches: [ master, develop ]

jobs:
lint:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 14.x ]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run lint
15 changes: 15 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: changelog

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]

jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: dangoslen/changelog-enforcer@v1.6.1
with:
changeLogPath: CHANGELOG.md
skipLabels: Skip Changelog
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/node_modules/**/*
docs/
2 changes: 1 addition & 1 deletion .mdlrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
all
rules "~MD013", "~MD026", "~MD033"
rules "~MD013", "~MD024", "~MD026", "~MD033"
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# MMM-NHL Changelog

## [2.0.0]

### Added

* Nunjuck templates
* French translations thanks to [matlem037](https://github.com/matlem037)
* Dependency `node-fetch`
* Config option `daysInPast`
* Config option `daysAhead`
* Config option `liveReloadInterval` thanks to [dannoh](https://github.com/dannoh).
* Config option `showNames` thanks to [dannoh](https://github.com/dannoh).
* Config option `showLogos` thanks to [dannoh](https://github.com/dannoh).
* Support for game status `postponed` thanks to [dannoh](https://github.com/dannoh).
* Github actions (linting and changelog enforcer)
* JSDoc documentation

### Changed

* Switched API for data feed.
* Display logos from remote.
* Retrieve team list from API.
* ESLint recommended instead of airbnb ruleset.

### Removed

* Config option `format`, instead rendering information based on locale.
* Travis integration
* Dependency `moment-timezone`
* Dependency `request`
* Local team logos

## [1.0.1]

### Added
Expand Down
5 changes: 5 additions & 0 deletions MMM-NHL.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
}

.MMM-NHL .icon {
width: 37px;
height: 25px;
}

.MMM-NHL .no-color {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
Expand Down
Loading

0 comments on commit 3bda579

Please sign in to comment.