Skip to content

Commit

Permalink
Merge pull request #399 from no-chris/387/position-chords-over-lyrics
Browse files Browse the repository at this point in the history
Align chords with lyrics
  • Loading branch information
no-chris committed Aug 29, 2021
2 parents 8a04978 + 96e455b commit 12d7322
Show file tree
Hide file tree
Showing 91 changed files with 4,487 additions and 2,789 deletions.
88 changes: 45 additions & 43 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,65 @@
module.exports = {
'env': {
'browser': true,
'es6': true
env: {
browser: true,
es6: true,
},

'extends': [
'eslint:recommended'
],
extends: ['eslint:recommended'],

'plugins': [
'import',
'no-unsanitized'
],
plugins: ['import', 'no-unsanitized'],

'globals': {
'Atomics': 'readonly',
'SharedArrayBuffer': 'readonly'
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly',
},

'parserOptions': {
'ecmaVersion': 2018,
'sourceType': 'module'
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
},

'rules': {
'complexity': [ 'error', { max: 10 } ],
'indent': [ 'error', 'tab', { 'SwitchCase': 1 } ],
'linebreak-style': [ 'error', 'unix' ],
'max-depth': [ 'error', 4 ],
'max-len': [ 'error', {'code': 150 } ],
'max-lines': [ 'error', { max: 300, skipBlankLines: true, skipComments: true, } ],
'max-lines-per-function': [ 'warn', { max: 50, skipBlankLines: true, skipComments: true, }],
'max-params': [ 'warn', { max: 4 } ],
'no-shadow': [ 'error', { 'builtinGlobals': true } ],
'quotes': [ 'error', 'single' ],
'semi': [ 'error', 'always'],

'no-restricted-imports': [
rules: {
complexity: ['error', { max: 10 }],
indent: ['error', 'tab', { SwitchCase: 1 }],
'linebreak-style': ['error', 'unix'],
'max-depth': ['error', 4],
'max-len': ['error', { code: 150 }],
'max-lines': [
'error',
{ max: 300, skipBlankLines: true, skipComments: true },
],
'max-lines-per-function': [
'warn',
{ max: 50, skipBlankLines: true, skipComments: true },
],
'max-params': ['warn', { max: 4 }],
'no-shadow': ['error', { builtinGlobals: true }],
semi: ['error', 'always'],

'no-restricted-imports': [
'error',
{
paths: [
{
name: 'lodash',
message: 'Please do not import lodash as a whole: import individual lodash functions instead.'
}
]
}
message:
'Please do not import lodash as a whole: import individual lodash functions instead.',
},
],
},
],

'no-unsanitized/property': [ 'error', { escape: { methods: ['escapeHTML'] } } ],
'no-unsanitized/method': [ 'error' ],

'no-unsanitized/property': [
'error',
{ escape: { methods: ['escapeHTML'] } },
],
'no-unsanitized/method': ['error'],

'import/no-restricted-paths': [ 'error',
'import/no-restricted-paths': [
'error',
{
'zones': [
{ 'target': './src/parser', 'from': './src/renderer' },
]
}
zones: [{ target: './src/parser', from: './src/renderer' }],
},
],
}
},
};
7 changes: 7 additions & 0 deletions .idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
coverage
CHANGELOG.md
lib
package.json
package-lock.json
SLOC
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"endOfLine": "lf",
"semi": true,
"singleQuote": true,
"tabWidth": 4,
"trailingComma": "es5",
"useTabs": true
}
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
The best way to write chords charts

Finally chords charts that are:
- easy to write
- complete and accurate, with bar information

- easy to write
- complete and accurate, with bar information
36 changes: 18 additions & 18 deletions SLOC
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,53 @@ Source code:

---------- Result ------------

Physical : 1352
Source : 900
Comment : 235
Single-line comment : 15
Block comment : 220
Physical : 1556
Source : 1088
Comment : 253
Single-line comment : 16
Block comment : 237
Mixed : 14
Empty block comment : 0
Empty : 231
Empty : 229
To Do : 0

Number of files read : 49
Number of files read : 52

----------------------------

Tests:

---------- Result ------------

Physical : 3027
Source : 2554
Physical : 4261
Source : 3851
Comment : 13
Single-line comment : 13
Block comment : 0
Mixed : 12
Empty block comment : 0
Empty : 472
Empty : 409
To Do : 0

Number of files read : 37
Number of files read : 39

----------------------------

Total:

---------- Result ------------

Physical : 4379
Source : 3454
Comment : 248
Single-line comment : 28
Block comment : 220
Physical : 5817
Source : 4939
Comment : 266
Single-line comment : 29
Block comment : 237
Mixed : 26
Empty block comment : 0
Empty : 703
Empty : 638
To Do : 0

Number of files read : 86
Number of files read : 91

----------------------------

24 changes: 10 additions & 14 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
/* eslint-env node */
module.exports = {
testEnvironment: 'jsdom',

collectCoverage: true,
collectCoverageFrom: [
'src/**/*.js',
'!**/node_modules/**'
],
collectCoverageFrom: ['src/**/*.js', '!**/node_modules/**'],
coverageDirectory: '<rootDir>/coverage',
coveragePathIgnorePatterns: ['node_modules'],
coverageReporters: ['json', 'lcov', 'text', 'clover'],
coverageThreshold: {
'global': {
'branches': 99,
'functions': 100,
'lines': 100,
'statements': 0
}
global: {
branches: 99,
functions: 100,
lines: 100,
statements: 0,
},
},

transform: {
Expand All @@ -25,7 +22,6 @@ module.exports = {
},

moduleNameMapper: {
'\\.(css|scss)$': '<rootDir>/scss/__mocks__/styleMock.js'
}

'\\.(css|scss)$': '<rootDir>/scss/__mocks__/styleMock.js',
},
};

0 comments on commit 12d7322

Please sign in to comment.