Skip to content

Commit

Permalink
Merge pull request #52 from fewieden/feature/version-2
Browse files Browse the repository at this point in the history
1.3.0
  • Loading branch information
fewieden committed Jan 30, 2022
2 parents 5df4482 + 4ddaa21 commit 28e9fae
Show file tree
Hide file tree
Showing 103 changed files with 4,225 additions and 3,332 deletions.
13 changes: 6 additions & 7 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ engines:
- javascript
eslint:
enabled: true
channel: "eslint-3"
channel: "eslint-6"
checks:
import/no-unresolved:
enabled: false
Expand All @@ -18,9 +18,8 @@ engines:
enabled: true
ratings:
paths:
- "**.js"
- "**.css"
- "**.md"
exclude_paths: [
"node_modules/**/*"
]
- "**.js"
- "**.css"
- "**.md"
exclude_paths:
- "node_modules/**/*"
24 changes: 17 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"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" ]
Expand All @@ -14,5 +11,18 @@
"browser": true,
"node": true,
"es6": 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-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 towards the branch `develop`.

To hold one code style and standard there are several linters and tools in this project configured. Make sure you fulfill the requirements.
Also, there will be an automatic analysis performed once you create the pull request.
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: fewieden
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 towards 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 removed .github/example.jpg
Binary file not shown.
Binary file removed .github/example2.jpg
Binary file not shown.
Binary file removed .github/example_bye_week.png
Binary file not shown.
Binary file removed .github/example_focus.jpg
Binary file not shown.
Binary file removed .github/example_help.jpg
Binary file not shown.
Binary file removed .github/example_statistic.jpg
Binary file not shown.
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.
Binary file added .github/help-modal.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/post-season.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/regular-season.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/statistic-modal.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: [ 16.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/[email protected]
with:
changeLogPath: CHANGELOG.md
skipLabels: Skip Changelog
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

docs/
debug.js
.vscode/launch.json
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"
6 changes: 5 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"extends": "stylelint-config-standard",
"rules": {
"indentation": 4
"indentation": 4,
"selector-class-pattern": [
"^([a-z][a-z0-9]*|MMM-NFL|MMM-Modal)(-[a-z0-9]+)*$",
{"message": "Expected class selector to be kebab-case"}
]
}
}
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# MMM-NFL Changelog

## 1.3.0

MagicMirror² version >= 2.15.0 required.

### Added

* Nunjuck templates
* Remote team logos
* Readded live game fetching
* More statistic types
* Integrated MagicMirror logger on server side
* Integrated [MMM-Modal](https://github.com/fewieden/MMM-Modal)
* Implemented suspend, resume and stop behavior
* Added instructions for global config options
* Github actions: `changelog` and `build`
* Github config files

### Changed

* Data structure
* Dimmed bye week
* Project config files
* Dependency updates
* Preview pictures

### Removed

* API provider: NFL XML API
* Local team logos
* Config option: `helmets`

## [1.2.1]

### Added
Expand Down
45 changes: 13 additions & 32 deletions MMM-NFL.css
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
@-webkit-keyframes MMM-NFL-pulse {
@keyframes mmm-nfl-pulse {
0% { opacity: 1; }
50% { opacity: 0; }
100% { opacity: 1; }
}

.MMM-NFL .table {
.MMM-NFL .table,
.MMM-Modal .MMM-NFL.statistics.table {
border-spacing: 10px 0;
border-collapse: separate;
text-align: center;
}

.MMM-NFL .icon {
-webkit-filter: grayscale(100%);
.MMM-NFL .logo,
.MMM-Modal .MMM-NFL.statistics .logo {
margin-top: 3px;
height: 25px;
}

.MMM-NFL .row {
vertical-align: middle;
.MMM-NFL .gray,
.MMM-Modal .MMM-NFL.statistics .gray {
filter: grayscale(100%);
}

.MMM-NFL .away {
-webkit-transform: scaleX(-1);
-moz-transform: scaleX(-1);
-o-transform: scaleX(-1);
transform: scaleX(-1);
.MMM-NFL .row {
vertical-align: middle;
}

.MMM-NFL .redzone {
-webkit-animation: MMM-NFL-pulse 2s infinite;
animation: mmm-nfl-pulse 2s infinite;
}

.MMM-NFL .live {
Expand All @@ -42,23 +43,3 @@
.MMM-NFL .ball-away {
margin-left: 10px;
}

.MMM-NFL-blur {
-webkit-filter: blur(2px) brightness(50%);
filter: blur(2px) brightness(50%);
}

.MMM-NFL .modal {
position: fixed;
text-align: left;
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%);
-o-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}

.MMM-NFL .modal ul {
margin: 0;
}
Loading

0 comments on commit 28e9fae

Please sign in to comment.