Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fetch from upstream #10

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
165c3a8
Create fr.json
laventin85 Apr 21, 2020
826262e
Register french language
fewieden Jan 2, 2021
e3c25d9
Merge pull request #29 from laventin85/patch-1
fewieden Jan 2, 2021
76f73a3
Update CHANGELOG.md
fewieden Jan 2, 2021
b4e1c20
Bump version and removed script prefixes
fewieden Jan 2, 2021
6a1f1dc
Create FUNDING.yml
fewieden Jan 2, 2021
ecb2f11
Typo
fewieden Jan 2, 2021
692721c
Update README.md
fewieden Jan 2, 2021
6dae44a
Update CHANGELOG.md
fewieden Jan 2, 2021
2000153
Merge pull request #33 from fewieden/develop
fewieden Jan 2, 2021
b175665
moved template and fixed help modal content
fewieden Jan 2, 2021
2e0afc6
integrated MMM-Modal for help and staning custom modals
fewieden Jan 2, 2021
71d039c
remove custom modal logic
fewieden Jan 2, 2021
548b537
extract modal handling in separate functions
fewieden Jan 2, 2021
0627d83
fixed fade effect, switched back to remote logos
fewieden Jan 2, 2021
39cae2c
remove downloader, update preview
fewieden Jan 2, 2021
557f775
fix focus_on in modal, update readme
fewieden Jan 2, 2021
f269ad5
delete doclet and old preview pictures
fewieden Jan 2, 2021
7f6ea50
update readme, require version 2.14 of magic mirror
fewieden Jan 2, 2021
dae9326
Changelog and bump version
fewieden Jan 2, 2021
2a809a6
Merge pull request #34 from fewieden/develop
fewieden Jan 2, 2021
9f6e47f
updated config files
fewieden Jan 2, 2021
a094a58
fix linting issues
fewieden Jan 2, 2021
9a56a7d
fix linting issues
fewieden Jan 2, 2021
1079861
bump version, added jsdoc, updated changelog
fewieden Jan 2, 2021
f40cf12
update changelog
fewieden Jan 2, 2021
b60e3a9
Merge pull request #35 from fewieden/develop
fewieden Jan 2, 2021
a8a3e8a
added github actions
fewieden Jan 3, 2021
c485c04
replaced request with node-fetch
fewieden Jan 3, 2021
8141f02
updated CHANGELOG
fewieden Jan 3, 2021
b9f3f5e
added jest
fewieden Jan 3, 2021
3b6be66
added automated tests for the node_helper
fewieden Jan 3, 2021
59fd5be
fix eslint
fewieden Jan 3, 2021
35fbe4c
added globals for linting, added code coverage to github action
fewieden Jan 3, 2021
c46f52f
remove coverage requirement
fewieden Jan 3, 2021
6bd081f
upload coverage to codecov.io
fewieden Jan 3, 2021
62222c3
disable covergae diff temporarily
fewieden Jan 3, 2021
054bd66
override codecov path
fewieden Jan 3, 2021
0515674
separate coverage actions
fewieden Jan 3, 2021
4ff20fe
separate coverage actions
fewieden Jan 3, 2021
119c6ec
fix action job names
fewieden Jan 3, 2021
3211fa3
delete codecov.yml
fewieden Jan 3, 2021
17a0321
use codecov action
fewieden Jan 3, 2021
6306c2e
print files
fewieden Jan 3, 2021
938bf4c
fix coverage job
fewieden Jan 3, 2021
83d2287
added coverage badge and cleanud up workflow file
fewieden Jan 3, 2021
d84b3dc
added/updated magic mirror mocks, started on module tests
fewieden Jan 3, 2021
72f1ef0
more tests
fewieden Jan 3, 2021
04f4cfc
test voice commands
fewieden Jan 4, 2021
f1dfd1e
test team boundaries
fewieden Jan 4, 2021
f6b18cc
100% coverage
fewieden Jan 4, 2021
c40b876
linting and clean up mock
fewieden Jan 4, 2021
4e6a6d3
v2.2.0
fewieden Jan 4, 2021
c164e2f
Merge pull request #36 from fewieden/develop
fewieden Jan 4, 2021
69c5301
add github sponsor
fewieden Feb 13, 2021
c617714
fixed rendering of last team in list, prepared release
fewieden Feb 13, 2021
d255ec6
Merge pull request #40 from fewieden/develop
fewieden Feb 13, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .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 @@ -23,3 +23,4 @@ ratings:
- "**.md"
exclude_paths:
- "node_modules/**/*"
- "docs/**/*"
9 changes: 0 additions & 9 deletions .doclets.yml

This file was deleted.

50 changes: 34 additions & 16 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
{
"extends": "airbnb-base",
"rules": {
"comma-dangle": 0,
"indent": [2, 4],
"max-len": [2, 120, { "ignoreStrings": true }],
"radix": [2, "as-needed"],
"no-console": 0
},
"settings": {
"import/core-modules": [ "node_helper" ]
},
"env": {
"browser": true,
"node": true,
"es6": true
}
"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,
"jest": true
},
"globals": {
"Module": true,
"Log": true,
"waitForAsync": true,
"fetchMock": 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 }]
}
}
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ 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 fullfill the requirements.
To hold one code style and standard there are several linters and tools in this project set. Make sure you fullfil the requirements.
Also there will be automatically analysis performed once you created 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']
Binary file removed .github/example.jpg
Binary file not shown.
Binary file removed .github/example_focused.png
Binary file not shown.
Binary file removed .github/example_full.png
Binary file not shown.
Binary file added .github/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/regular.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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

test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 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 test
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
29 changes: 29 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: coverage

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

jobs:
upload-coverage-report:
strategy:
matrix:
node-version: [ 14.x ]
platform: [ ubuntu-latest ]
runs-on: ${{ matrix.platform }}
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 test:coverage
- uses: codecov/codecov-action@v1
with:
file: ./coverage/lcov.info
fail_ci_if_error: true
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: node_js
node_js:
- "8"
- "9"
- "stable"
- "10"
- "12"
- "14"
script:
- npm run lint
cache:
Expand Down
79 changes: 79 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,84 @@
# MMM-soccer Changelog

## [2.2.1]

### Fixed

* [Nunjuck template was rendering one team less than specified in config](https://github.com/fewieden/MMM-soccer/issues/39)

## [2.2.0]

**Update requires installation of dependencies refer to readme file!**

### Fixed

* Max teams showed in some occasions 1 team too much.

### Added

* Github actions (building and changelog)
* Dependency `node-fetch`
* Automated tests for node_helper and module
* Code coverage
* Codecov report

### Removed

* Travis integration
* Dependency `request`

## [2.1.1]

### Added

* JSDoc dependency
* package-lock.json

### Changed

* Travis config
* Updated eslint
* Updated config

### Fixed

* Linting issues

## [2.1.0]

**Requires version >= 2.14 of MagicMirror!**

### Added

* Integrated [MMM-Modal](https://github.com/fewieden/MMM-Modal)

### Changed

* Using remote logos
* Preview pictures

### Fixed

* Fade effect
* Focus_on in modal highlights correct team
* Help modal shows correct voice commands

### Removed

* Logo downloader
* Doclet integration

## [2.0.1]

### Added

* French translations (Thanks to [Laventin85](https://github.com/laventin85))

### Changed

* Readme config example
* Github config files

## [2.0.0]

### Added
Expand Down
24 changes: 5 additions & 19 deletions MMM-soccer.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,11 @@
vertical-align: middle;
}

.MMM-soccer .centered {
text-align: center;
.MMM-soccer .space-between {
display: flex;
justify-content: space-between;
}

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

.MMM-soccer .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-soccer .modal ul {
margin: 0;
.MMM-soccer .centered {
text-align: center;
}
Loading