Merge pull request #81 from comorebi-notes/develop

[リリース] v1.1.3

.babelrc

@@ -23,5 +23,17 @@
         "spec": true
       }
     ]
-  ]
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        [
+          "env",
+          {
+            "modules": "commonjs"
+          }
+        ]
+      ]
+    }
+  }
 }

.eslintrc

@@ -22,10 +22,12 @@
     "jsx-a11y/anchor-has-content": 0,
     "jsx-a11y/anchor-is-valid": 0,
     "jsx-a11y/click-events-have-key-events": 0,
+    "jsx-a11y/label-has-associated-control": 0,
     "jsx-a11y/label-has-for": 0,
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-quotes": 0,
     "key-spacing": 0,
+    "lines-between-class-members": 0,
     "max-len": ["error", { "code": 140, "comments": 140 }],
     "no-class-assign": 0,
     "no-else-return": 0,
@@ -36,14 +38,17 @@
     "object-curly-newline": 0,
     "prefer-destructuring": ["error", { "object": true, "array": false }],
     "quotes": 0,
+    "react/destructuring-assignment": 0,
     "react/jsx-filename-extension": 0,
+    "react/jsx-one-expression-per-line": 0,
+    "react/jsx-props-no-multi-spaces": 0,
     "react/no-array-index-key": 0,
     "react/no-multi-comp": 0,
     "react/prefer-stateless-function": 0,
     "react/prop-types": 0,
     "react/self-closing-comp": 0,
     "semi": 0,
-    "space-before-function-paren": 0,
+    "space-before-function-paren": 0
   },
   "globals": {
     "window": true,

Gemfile

@@ -13,7 +13,7 @@ gem 'pg', '>= 0.18', '< 2.0'
 gem 'puma', '~> 3.11'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
-gem 'webpacker'
+gem 'webpacker', '~> 3.5.5'
 gem 'therubyracer', platforms: :ruby
 gem 'jbuilder', '~> 2.5'
 # gem 'capistrano-rails', group: :development
@@ -87,6 +87,10 @@ group :development do
   gem 'capistrano-bundler', require: false
   gem 'capistrano3-puma',   require: false
   gem 'capistrano-rbenv',   require: false
+
+  gem 'bcrypt', '~> 3.1.7'
+  gem 'bcrypt_pbkdf'
+  gem 'ed25519'
 end
 
 # for Heroku

Gemfile.lock

@@ -74,15 +74,18 @@ GEM
     bcrypt (3.1.12-java)
     bcrypt (3.1.12-x64-mingw32)
     bcrypt (3.1.12-x86-mingw32)
+    bcrypt_pbkdf (1.0.0)
+    bcrypt_pbkdf (1.0.0-x64-mingw32)
+    bcrypt_pbkdf (1.0.0-x86-mingw32)
     bindex (0.5.0)
-    bootsnap (1.3.2)
+    bootsnap (1.4.1)
       msgpack (~> 1.0)
-    bootsnap (1.3.2-java)
+    bootsnap (1.4.1-java)
       msgpack (~> 1.0)
     builder (3.2.3)
-    bulma-rails (0.7.2)
-      sass (~> 3.2)
-    byebug (10.0.2)
+    bulma-rails (0.7.4)
+      sass (~> 3.5)
+    byebug (11.0.0)
     cancancan (2.3.0)
     capistrano (3.11.0)
       airbrussh (>= 1.0.0)
@@ -131,29 +134,31 @@ GEM
     crass (1.0.4)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    devise (4.5.0)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.6.0)
-    dotenv-rails (2.6.0)
-      dotenv (= 2.6.0)
-      railties (>= 3.2, < 6.0)
-    dropbox_api (0.1.15)
-      faraday (>= 0.8, <= 0.15.2)
-      oauth2 (>= 1.1, <= 1.4)
+    dotenv (2.7.1)
+    dotenv-rails (2.7.1)
+      dotenv (= 2.7.1)
+      railties (>= 3.2, < 6.1)
+    dropbox_api (0.1.16)
+      faraday (>= 0.8, <= 0.15.4)
+      oauth2 (~> 1.1)
     dry-inflector (0.1.2)
+    ed25519 (1.2.4)
+    ed25519 (1.2.4-java)
     erubi (1.8.0)
     exception_notification (4.3.0)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
     excon (0.62.0)
     execjs (2.7.0)
-    faraday (0.12.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.10.0)
     ffi (1.10.0-java)
@@ -196,7 +201,7 @@ GEM
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       json (~> 2.0)
-    fog-aliyun (0.3.2)
+    fog-aliyun (0.3.3)
       fog-core
       fog-json
       ipaddress (~> 0.8)
@@ -259,7 +264,7 @@ GEM
       fog-core (>= 1.45, <= 2.1.0)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
-    fog-ovirt (1.1.5)
+    fog-ovirt (1.1.6)
       fog-core
       fog-json
       fog-xml
@@ -345,7 +350,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     impressionist (1.6.1)
       nokogiri (~> 1)
@@ -359,9 +364,9 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.1.0)
-    json (2.1.0-java)
-    jwt (1.5.6)
+    json (2.2.0)
+    json (2.2.0-java)
+    jwt (2.1.0)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.1.1)
@@ -396,10 +401,10 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    msgpack (1.2.6)
-    msgpack (1.2.6-java)
-    msgpack (1.2.6-x64-mingw32)
-    msgpack (1.2.6-x86-mingw32)
+    msgpack (1.2.7)
+    msgpack (1.2.7-java)
+    msgpack (1.2.7-x64-mingw32)
+    msgpack (1.2.7-x86-mingw32)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -408,7 +413,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (5.1.0)
     netrc (0.11.0)
-    newrelic_rpm (5.7.0.350)
+    newrelic_rpm (6.1.0.352)
     nio4r (2.3.1)
     nio4r (2.3.1-java)
     nokogiri (1.10.1)
@@ -419,9 +424,9 @@ GEM
     nokogiri (1.10.1-x86-mingw32)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -433,8 +438,8 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.5.4)
-      jwt (>= 1.5)
+    omniauth-google-oauth2 (0.6.0)
+      jwt (>= 2.0)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)
     omniauth-oauth (1.1.0)
@@ -463,8 +468,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
       spoon (~> 0.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     pry-doc (1.0.0)
       pry (~> 0.11)
@@ -500,7 +505,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.2)
+    rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     rails_admin-i18n (1.11.3)
@@ -574,7 +579,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rmagick (2.16.0)
+    rmagick (3.0.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     sass (3.7.3)
@@ -618,10 +623,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.18.1)
+    sshkit (1.18.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    temple (0.8.0)
+    temple (0.8.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -643,7 +648,7 @@ GEM
     unf_ext (0.0.7.2)
     unf_ext (0.0.7.2-x64-mingw32)
     unf_ext (0.0.7.2-x86-mingw32)
-    unicorn (5.4.1)
+    unicorn (5.5.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     warden (1.2.8)
@@ -678,6 +683,8 @@ PLATFORMS
   x86-mswin32
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  bcrypt_pbkdf
   bootsnap (>= 1.1.0)
   bulma-rails
   byebug
@@ -693,6 +700,7 @@ DEPENDENCIES
   devise
   dotenv-rails
   dropbox_api
+  ed25519
   exception_notification
   fog
   font-awesome-rails
@@ -732,7 +740,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   unicorn
   web-console (>= 3.3.0)
-  webpacker
+  webpacker (~> 3.5.5)
   whenever
 
 RUBY VERSION

app/frontend/components/CardsList/index.js

@@ -47,7 +47,7 @@ export default class CardsList extends Component {
   }
 
   updateQuery = (params) => {
-    this.setState({ query: Object.assign({}, this.state.query, params) })
+    this.setState(prevState => ({ query: Object.assign({}, prevState.query, params) }))
   }
   handleInputWord = (e) => this.updateQuery({ word: e.target.value })
   handleChangeOption = (key, value) => {

app/frontend/components/Routes/About/index.js

@@ -11,7 +11,7 @@ export default class About extends PureComponent {
     this.state = { modal: false }
   }
   componentDidMount = () => utils.setMeta("About", "", this.props.history)
-  handleToggleModal = () => this.setState({ modal: !this.state.modal })
+  handleToggleModal = () => this.setState(prevState => ({ modal: !prevState.modal }))
   render() {
     const { modal } = this.state
     return (

app/frontend/components/Routes/EditScore/UpdateControl/index.js

@@ -50,6 +50,7 @@ class UpdateControl extends Component {
           </div>
           <div className="control">
             <button
+              type="button"
               className="button is-primary is-medium animate-button"
               onClick={this.handleClick}
               disabled={loading || !isValid}

app/frontend/components/Routes/NewScore/CreateControl/index.js

@@ -57,6 +57,7 @@ class CreateControl extends Component {
             {userId && <br />}
             <div className="save-control">
               <button
+                type="button"
                 className="button is-primary is-medium animate-button"
                 onClick={this.handleClick}
                 disabled={loading || !isValid}

app/frontend/components/Routes/ShowScore/ScoreFooter/index.js

@@ -20,7 +20,7 @@ export default class ScoreFooter extends Component {
             </Link>
           </p>
           <p className="control">
-            <button className="button is-danger is-medium" onClick={handleToggleDestroyModal}>
+            <button type="button" className="button is-danger is-medium" onClick={handleToggleDestroyModal}>
               <span className="icon">
                 <i className="fa fa-ban" />
               </span>

app/frontend/components/Routes/ShowScore/ScoreHeader/index.js

@@ -35,7 +35,7 @@ export default class ScoreHeader extends Component {
     }
     return true
   }
-  handleToggleModal = () => this.setState({ modal: !this.state.modal })
+  handleToggleModal = () => this.setState(prevState => ({ modal: !prevState.modal }))
   render() {
     const { author, title, token, status, user, viewsCount, createdAt, updatedAt } = this.props
     const { modal, favsCount, myFavId } = this.state
@@ -76,7 +76,7 @@ export default class ScoreHeader extends Component {
             </div>
 
             <span className="separator">|</span>
-            <button className="button has-text-link" onClick={this.handleToggleModal} disabled={isClosed}>
+            <button type="button" className="button has-text-link" onClick={this.handleToggleModal} disabled={isClosed}>
               <span className="icon has-text-link">
                 <i className="fa fa-share-alt" />
               </span>

app/frontend/components/Routes/ShowScore/index.js

@@ -79,7 +79,7 @@ export default class ShowScore extends Component {
   }
 
   handleSetState = (newState) => this.setState(newState)
-  handleToggleDestroyModal = () => this.setState({ destroyModal: !this.state.destroyModal })
+  handleToggleDestroyModal = () => this.setState(prevState => ({ destroyModal: !prevState.destroyModal }))
 
   render() {
     const {