Merge pull request #141 from epam/develop

Release 2.0.0

.eslintrc

@@ -1,62 +1,72 @@
 {
-    "plugins": ["react"],
-    "parser": "babel-eslint",
-    "settings": {
-      "react": {
-        "createClass": "createReactClass",
-        "pragma": "React",
-        "version": "detect",
-        "flowVersion": "0.53"
-      }	
-    },
-    "env": {
-        "browser": true,
-        "node": true,
-        "jest": true
-    },
-    "globals": {
-      "shallow": true
-    },
-    "rules": {
-        "react/jsx-uses-react": "error",
-        "react/jsx-uses-vars": "error",
-        "react/prefer-es6-class" : [2],
-        "linebreak-style": "off",
-        "no-unused-vars": ["error"],
-        "no-alert": "off",
-        "no-underscore-dangle": "off",
-        "vars-on-top": "off",
-        "space-before-function-paren": ["warn", "never"],
-        "no-mixed-operators": "off",
-        "key-spacing": "off",
-        "spaced-comment": "off",
-        "func-names": "off",
-        "function-paren-newline": ["error", "never"],
-        "padded-blocks": "off",
-        "quote-props": "off",
-        "one-var-declaration-per-line": "off",
-        "max-len": [1, 200, 2, {"ignoreComments": true}],
-        "object-curly-spacing": ["error", "always"],
-        "no-param-reassign": "off",
-        "one-var": "off",
-        "no-undef": "off",
-        "no-console": "off",
-        "comma-dangle": "off",
-        "no-multi-spaces": "off",
-        "no-prototype-builtins": "off",
-        "wrap-iife": ["error", "any"],
-        "no-use-before-define": ["error", "nofunc"],
-        "object-property-newline": "off",
-        "no-restricted-syntax": "off",
-        "no-else-return": "off",
-        "no-cond-assign": ["error", "except-parens"],
-        "space-infix-ops": ["warn", {"int32Hint": true}],
-        "no-nested-ternary": "off",
-        "global-require": "off",
-        "no-continue": "off",
-        "no-bitwise": "off",
-        "no-plusplus": "off",
-        "no-multi-assign": "off",
-        "lines-between-class-members": ["error", "always"]
+  "env": {
+    "browser": true,
+    "node": true,
+    "jest": true,
+    "es6": true
+  },
+  "root": true,
+  "parser": "babel-eslint",
+  "plugins": ["react", "prettier"],
+  "extends": ["eslint:recommended", "plugin:react/recommended", "prettier"],
+  "settings": {
+    "react": {
+      "createClass": "createReactClass",
+      "pragma": "React",
+      "version": "detect",
+      "flowVersion": "0.53"
     }
+  },
+  "globals": {
+    "shallow": true
+  },
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "react/prefer-es6-class": [2],
+    "react/prop-types": "off",
+    "react/no-string-refs": "off",
+    "react/jsx-no-undef": "off",
+    "react/jsx-key": "off",
+    "no-case-declarations": "off",
+    "react/no-unescaped-entities": "off",
+    "linebreak-style": "off",
+    "no-unused-vars": ["error"],
+    "no-alert": "off",
+    "no-underscore-dangle": "off",
+    "vars-on-top": "off",
+    "space-before-function-paren": ["warn", "never"],
+    "no-mixed-operators": "off",
+    "key-spacing": "off",
+    "spaced-comment": "off",
+    "func-names": "off",
+    "padded-blocks": "off",
+    "quote-props": "off",
+    "one-var-declaration-per-line": "off",
+    "max-len": [1, 200, 2, { "ignoreComments": true }],
+    "object-curly-spacing": ["error", "always"],
+    "no-param-reassign": "off",
+    "one-var": "off",
+    "no-undef": "off",
+    "no-console": "off",
+    "comma-dangle": "off",
+    "no-multi-spaces": "off",
+    "no-prototype-builtins": "off",
+    "wrap-iife": ["error", "any"],
+    "no-use-before-define": ["error", "nofunc"],
+    "object-property-newline": "off",
+    "no-restricted-syntax": "off",
+    "no-else-return": "off",
+    "no-cond-assign": ["error", "except-parens"],
+    "space-infix-ops": ["warn", { "int32Hint": true }],
+    "no-nested-ternary": "off",
+    "global-require": "off",
+    "no-continue": "off",
+    "no-bitwise": "off",
+    "no-plusplus": "off",
+    "no-multi-assign": "off",
+    "lines-between-class-members": ["error", "always"],
+    "no-debugger": "warn",
+    "prettier/prettier": ["error"]
+  }
 }

.gitignore

@@ -29,3 +29,5 @@ yarn-error.log*
 
 /.idea
 /.vscode
+/mriviewer.sln
+/.vs

.husky/pre-commit → .husky/pre-push

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged
+npm run format && npm run lint

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "trailingComma": "es5",
+  "printWidth": 140,
+  "bracketSpacing": true,
+  "endOfLine": "auto",
+  "singleQuote": true,
+  "semi": true,
+  "tabWidth": 2
+}

CONTRIBUTING.md

@@ -10,6 +10,10 @@ $ npm i
 $ npm start
 ```
 
+## IDE Configuration
+
+https://stackoverflow.com/questions/41920324/adding-spaces-between-imports-and-braces-in-webstorm
+
 ## Submitting changes
 
 We are following [GitHub's Collaborating with Issues and Pull Requests Guide](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests)

docker/Dockerfile

@@ -3,6 +3,6 @@ RUN apk update && apk upgrade && \
     apk add --no-cache curl
 WORKDIR /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
-COPY build .
+COPY build /usr/share/nginx/html
 HEALTHCHECK --interval=10s --timeout=3s \
-  CMD curl -f http://localhost:4010/user-count/metrics || exit 1
+  CMD curl -f http://localhost:4010/user-count/metrics || exit 1