Skip to content

Commit

Permalink
Merge pull request #8 from fewieden/develop
Browse files Browse the repository at this point in the history
v2
  • Loading branch information
fewieden authored Jan 1, 2021
2 parents 8dcea61 + 15c6e7d commit 78eea33
Show file tree
Hide file tree
Showing 24 changed files with 3,801 additions and 244 deletions.
18 changes: 8 additions & 10 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
engines:
stylelint:
enabled: true
duplication:
enabled: true
config:
languages:
- javascript
eslint:
enabled: true
channel: "eslint-3"
channel: "eslint-6"
checks:
import/no-unresolved:
enabled: false
fixme:
enabled: true
markdownlint:
enabled: true
enabled: true
ratings:
paths:
- "**.js"
- "**.css"
- "**.md"
exclude_paths: [
"node_modules/**/*"
]
- "**.js"
- "**.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/*
23 changes: 17 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"extends": "airbnb-base",
"rules": {
"comma-dangle": 0,
"indent": [2, 4],
"max-len": [2, 120, { "ignoreStrings": true }],
"radix": [2, "as-needed"]
"extends": ["esnext", "esnext/style-guide", "node", "node/style-guide"],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"settings": {
"import/core-modules": [ "node_helper" ]
Expand All @@ -13,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 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.
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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/
2 changes: 1 addition & 1 deletion .mdlrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
all
rules "~MD013", "~MD033"
rules "~MD013", "~MD024", "~MD026", "~MD033"
6 changes: 0 additions & 6 deletions .stylelintrc

This file was deleted.

10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: node_js
node_js:
- "stable"
- "7"
- "6"
- "5"
- "stable"
- "10"
- "12"
- "14"
script:
- npm run lint
- npm run lint
cache:
directories:
- node_modules
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# MMM-ip Changelog

## [2.0.0]

### Added

* Nunjuck templates
* Integrated MMM-Modal for modal handling
* Documentation

### Fixed

* MMM-voice mode in notificationReceived

### Changed

* Config files

### Removed

* Config options (voice, showFamily, showType and startHidden). Check out the readme for replacements.
* Internal modal handling (help, interfaces)
* Stylelint and css files

## [1.0.0]

Initial version
26 changes: 0 additions & 26 deletions MMM-ip.css

This file was deleted.

Loading

0 comments on commit 78eea33

Please sign in to comment.