Skip to content

Commit

Permalink
Merge branch 'master' into new-entity-display
Browse files Browse the repository at this point in the history
  • Loading branch information
LordSputnik committed Jun 18, 2017
2 parents e8d3937 + 899de72 commit d71e360
Show file tree
Hide file tree
Showing 32 changed files with 7,152 additions and 133 deletions.
14 changes: 5 additions & 9 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"env": {
"cov": {
"plugins": ["istanbul"]
}
},
"plugins": [
"transform-es2015-modules-commonjs",
"transform-object-rest-spread",
Expand All @@ -16,9 +11,10 @@
]
],
"presets": [
"es2015",
"es2016",
"es2017",
"react"
"flow",
"es2015",
"es2016",
"es2017",
"react"
]
}
5 changes: 5 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
parser: babel-eslint
parserOptions:
ecmaVersion: 8
sourceType: module
Expand All @@ -10,6 +11,9 @@ parserOptions:
plugins:
- react
- import
- flowtype
extends:
- plugin:flowtype/recommended
env:
node: true
es6: true
Expand Down Expand Up @@ -447,6 +451,7 @@ rules:
-
allow:
- "**/src/**"
- "**/lib/**"
- "**/data/**"
- "**/config/**"
- "react-dom/server"
Expand Down
7 changes: 7 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[ignore]

[include]

[libs]

[options]
95 changes: 32 additions & 63 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,92 +12,61 @@

### Node ###
# Logs
/logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
/pids
pids
*.pid
*.seed
*.pid.lock

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

# Coverage directory used by tools like istanbul
/coverage
coverage

# nyc test coverage
.nyc_output

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

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

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

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
/node_modules

# Debug log from npm
npm-debug.log


### Linux ###
*~

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*


### OSX ###
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

build/Release

# Thumbnails
._*
# Dependency directories
node_modules/
jspm_packages/

# Files that might appear on external disk
.Spotlight-V100
.Trashes
# Typescript v1 declaration files
typings/

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Optional npm cache directory
.npm

### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db
# Optional eslint cache
.eslintcache

# Folder config file
Desktop.ini
# Optional REPL history
.node_repl_history

# Recycle Bin used on file shares
$RECYCLE.BIN/
# Output of 'npm pack'
*.tgz

# Windows Installer files
*.cab
*.msi
*.msm
*.msp
# Yarn Integrity file
.yarn-integrity

# Windows shortcuts
*.lnk
# dotenv environment variables file
.env

### IntelliJ ###
# IntelliJ project files
.idea
out
gen
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ addons:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
code_climate:
repo_token:
- secure: >-
iodugg1i+wqxRqF3+kRVdL+yTnyNnWTbPI+OZ7AccLeKVgM8yEcJrgJD55EJ/q6HhTUBF439Y0QxRyFwXyqUHQcndm4Y/erRqHsniw/w4CdJgq9At7aXc7RyaSS5644LciTpq/Ml6E34wkYG0+udhJkVfTgW1OiawHunl01vcvw=

before_script:
- git clone https://github.com/bookbrainz/bookbrainz-sql.git
Expand All @@ -34,10 +30,10 @@ before_script:
- psql -f bookbrainz-sql/schemas/musicbrainz.sql -d bookbrainz_test -U postgres
- psql -f bookbrainz-sql/schemas/bookbrainz.sql -d bookbrainz_test -U postgres
- psql -f bookbrainz-sql/scripts/create_triggers.sql -d bookbrainz_test -U postgres
- cp ./config/testing.json.example ./config/testing.json
- cp ./config/test.json.example ./config/test.json

script:
- npm run-script test-ci

after_script:
- npm install -g codeclimate-test-reporter && codeclimate-test-reporter < coverage/lcov.info
- npm install -g coveralls && coveralls < coverage/lcov.info
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

If you're reading this, you're probably creating a Pull Request or planning to do so and that's great!

In order to keep that process as pleasant as possible for all parties and to maintain a nice repository,
In order to keep that process as pleasant as possible for all parties and to maintain a nice repository,
please follow the steps below.

## Commits

We try to keep our commit messages readable and concise, this is especially important as they can't be rewritten—unlike
We try to keep our commit messages readable and concise, this is especially important as they can't be rewritten—unlike
code.

Thus please follow [this guide](http://chris.beams.io/posts/git-commit/) when writing commit messages.
While not recommended, you can always force-push to your fork to fix bad commit messages; it is however not possible to
Thus please follow [this guide](http://chris.beams.io/posts/git-commit/) when writing commit messages.
While not recommended, you can always force-push to your fork to fix bad commit messages; it is however not possible to
force-push to this repo.

## Code
Expand All @@ -26,9 +26,9 @@ can do this by first installing the node module jscs globally:
And finally creating a symbolic link from .githooks/pre-commit to .git/hooks/pre-commit:

ln -s ../../.githooks/pre-commit .git/hooks/pre-commit

On Windows run the following command from an administrative cmd as creating a shortcut will *not* work:

mklink .git\hooks\pre-commit ..\..\.githooks\pre-commit

This will check that your code is formatted correctly for contribution to the
Expand Down
4 changes: 2 additions & 2 deletions config/testing.json.example → config/test.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"clientID": "f8accd51-33d2-4d9b-a2c1-c01a76a4f096"
},
"musicbrainz": {
"clientID": "",
"clientSecret": "",
"clientID": "y0dHLdQC2CAXbGvZa4IbZm",
"clientSecret": "M0PFECp7vPYW9Vn4kB4L2B",
"callbackURL": "http://localhost:9099/cb"
},
"session": {
Expand Down
17 changes: 17 additions & 0 deletions flow-typed/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright (C) 2017 Daniel Hsing
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
Loading

0 comments on commit d71e360

Please sign in to comment.