diff --git a/frontend/.eslintrc b/frontend/.eslintrc deleted file mode 100644 index 21ef60f75..000000000 --- a/frontend/.eslintrc +++ /dev/null @@ -1,293 +0,0 @@ -{ - "parser": "babel-eslint", - - "env": { - "browser": true, - "commonjs": true, - "node": true, - "es6": true - }, - - "globals": { - "expect": false, - "chai": false, - "sinon": false - }, - - "parserOptions": { - "ecmaVersion": 6, - "sourceType": "module", - "ecmaFeatures": { - "modules": true, - "impliedStrict": true - } - }, - - "plugins": [ - "filenames", - "react" - ], - - "settings": { - "react": { - "version": "detect" - } - }, - - "rules": { - "filenames/match-exported": ["error"], - - # ECMAScript 6 - - "arrow-body-style": [0], - "arrow-parens": ["error", "always"], - "arrow-spacing": ["error", { "before": true, "after": true }], - "constructor-super": "error", - "generator-star-spacing": "off", - "no-class-assign": "error", - "no-confusing-arrow": "error", - "no-const-assign": "error", - "no-dupe-class-members": "error", - "no-duplicate-imports": "error", - "no-new-symbol": "error", - "no-this-before-super": "error", - "no-useless-escape": "error", - "no-useless-computed-key": "error", - "no-useless-constructor": "error", - "no-var": "warn", - "object-shorthand": ["error", "properties"], - "prefer-arrow-callback": "error", - "prefer-const": "warn", - "prefer-reflect": "off", - "prefer-rest-params": "off", - "prefer-spread": "warn", - "prefer-template": "error", - "require-yield": "off", - "template-curly-spacing": ["error", "never"], - "yield-star-spacing": "off", - - # Possible Errors - - "comma-dangle": "error", - "no-cond-assign": "error", - "no-console": "off", - "no-constant-condition": "warn", - "no-control-regex": "error", - "no-debugger": "off", - "no-dupe-args": "error", - "no-dupe-keys": "error", - "no-duplicate-case": "error", - "no-empty": "warn", - "no-empty-character-class": "error", - "no-ex-assign": "error", - "no-extra-boolean-cast": "error", - "no-extra-parens": ["error", "functions"], - "no-extra-semi": "error", - "no-func-assign": "error", - "no-inner-declarations": "error", - "no-invalid-regexp": "error", - "no-irregular-whitespace": "error", - "no-negated-in-lhs": "error", - "no-obj-calls": "error", - "no-regex-spaces": "error", - "no-sparse-arrays": "error", - "no-unexpected-multiline": "error", - "no-unreachable": "warn", - "no-unsafe-finally": "error", - "use-isnan": "error", - "valid-jsdoc": "off", - "valid-typeof": "error", - - # Best Practices - - "accessor-pairs": "off", - "array-callback-return": "warn", - "block-scoped-var": "warn", - "consistent-return": "off", - "curly": "error", - "default-case": "error", - "dot-location": ["error", "property"], - "dot-notation": "error", - "eqeqeq": ["error", "smart"], - "guard-for-in": "error", - "no-alert": "warn", - "no-caller": "error", - "no-case-declarations": "error", - "no-div-regex": "error", - "no-else-return": "error", - "no-empty-function": ["error", {"allow": ["arrowFunctions"]}], - "no-empty-pattern": "error", - "no-eval": "error", - "no-extend-native": "error", - "no-extra-bind": "error", - "no-fallthrough": "error", - "no-floating-decimal": "error", - "no-implicit-coercion": ["error", { - "boolean": false, - "number": true, - "string": true, - "allow": [/* "!!", "~", "*", "+" */] - }], - "no-implicit-globals": "error", - "no-implied-eval": "error", - "no-invalid-this": "off", - "no-iterator": "error", - "no-labels": "error", - "no-lone-blocks": "error", - "no-loop-func": "error", - "no-magic-numbers": ["off", {"ignoreArrayIndexes": true, "ignore": [0, 1] }], - "no-multi-spaces": "error", - "no-multi-str": "error", - "no-native-reassign": ["error", {"exceptions": ["console"]}], - "no-new": "off", - "no-new-func": "error", - "no-new-wrappers": "error", - "no-octal": "error", - "no-octal-escape": "error", - "no-param-reassign": "off", - "no-process-env": "off", - "no-proto": "error", - "no-redeclare": "error", - "no-return-assign": "warn", - "no-script-url": "error", - "no-self-assign": "error", - "no-self-compare": "error", - "no-sequences": "error", - "no-throw-literal": "error", - "no-unmodified-loop-condition": "error", - "no-unused-expressions": "error", - "no-unused-labels": "error", - "no-useless-call": "error", - "no-useless-concat": "error", - "no-void": "error", - "no-warning-comments": "off", - "no-with": "error", - "radix": ["error", "as-needed"], - "vars-on-top": "off", - "wrap-iife": ["error", "inside"], - "yoda": "error", - - # Strict Mode - - "strict": ["error", "never"], - - # Variables - - "init-declarations": ["error", "always"], - "no-catch-shadow": "error", - "no-delete-var": "error", - "no-label-var": "error", - "no-restricted-globals": "off", - "no-shadow": "error", - "no-shadow-restricted-names": "error", - "no-undef": "error", - "no-undef-init": "off", - "no-undefined": "off", - "no-unused-vars": ["error", { "args": "none", "ignoreRestSiblings": true }], - "no-use-before-define": "error", - - # Node.js and CommonJS - - "callback-return": "warn", - "global-require": "error", - "handle-callback-err": "warn", - "no-mixed-requires": "error", - "no-new-require": "error", - "no-path-concat": "error", - "no-process-exit": "error", - - # Stylistic Issues - - "array-bracket-spacing": ["error", "never"], - "block-spacing": ["error", "always"], - "brace-style": ["error", "1tbs", { "allowSingleLine": false }], - "camelcase": "off", - "comma-spacing": ["error", {"before": false, "after": true}], - "comma-style": ["error", "last"], - "computed-property-spacing": ["error", "never"], - "consistent-this": ["error", "self"], - "eol-last": "error", - "func-names": "off", - "func-style": ["error", "declaration"], - "indent": ["error", 2, {"SwitchCase": 1}], - "key-spacing": ["error", {"beforeColon": false, "afterColon": true}], - "keyword-spacing": ["error", { "before": true, "after": true}], - "lines-around-comment": ["error", { "beforeBlockComment": true, "afterBlockComment": false }], - "max-depth": ["error", {"maximum": 5}], - "max-nested-callbacks": ["error", 4], - "max-statements": "off", - "max-statements-per-line": ["error", { "max": 1 }], - "new-cap": ["error", {"capIsNewExceptions": ["$.Deferred", "DragDropContext", "DragLayer", "DragSource", "DropTarget"]}], - "new-parens": "error", - "newline-after-var": "off", - "newline-before-return": "off", - "newline-per-chained-call": "off", - "no-array-constructor": "error", - "no-bitwise": "error", - "no-continue": "error", - "no-inline-comments": "off", - "no-lonely-if": "warn", - "no-mixed-spaces-and-tabs": "error", - "no-multiple-empty-lines": ["error", { "max": 1 }], - "no-negated-condition": "warn", - "no-nested-ternary": "error", - "no-new-object": "error", - "no-plusplus": "off", - "no-restricted-syntax": "off", - "no-spaced-func": "error", - "no-ternary": "off", - "no-trailing-spaces": "error", - "no-underscore-dangle": ["error", { "allowAfterThis": true }], - "no-unneeded-ternary": "error", - "no-whitespace-before-property": "error", - "object-curly-spacing": ["error", "always"], - "one-var": ["error", "never"], - "one-var-declaration-per-line": ["error", "always"], - "operator-assignment": ["off", "never"], - "operator-linebreak": ["error", "after"], - "quote-props": ["error", "as-needed"], - "quotes": ["error", "single"], - "require-jsdoc": "off", - "semi": "error", - "semi-spacing": ["error", { "before": false, "after": true }], - "sort-vars": "off", - "space-before-blocks": ["error", "always"], - "space-before-function-paren": ["error", "never"], - "space-in-parens": "off", - "space-infix-ops": "off", - "space-unary-ops": "off", - "spaced-comment": "error", - "wrap-regex": "error", - - # React - - "react/jsx-boolean-value": [2, "always"], - "react/jsx-uses-vars": 2, - "react/jsx-closing-bracket-location": 2, - "react/jsx-tag-spacing": ["error"], - "react/jsx-curly-spacing": [2, "never"], - "react/jsx-equals-spacing": [2, "never"], - "react/jsx-indent-props": [2, 2], - "react/jsx-indent": [2, 2, { "indentLogicalExpressions": true }], - "react/jsx-key": 2, - "react/jsx-no-bind": [2, { "allowArrowFunctions": true }], - "react/jsx-no-duplicate-props": [2, { "ignoreCase": true }], - "react/jsx-max-props-per-line": [2, { "maximum": 2 }], - "react/jsx-handler-names": [2, { "eventHandlerPrefix": "(on|dispatch)", "eventHandlerPropPrefix": "on" }], - "react/jsx-no-undef": 2, - "react/jsx-pascal-case": 2, - "react/jsx-uses-react": 2, - // Explicitly disabled in case we want to enable them again - "react/no-did-mount-set-state": 0, - "react/no-did-update-set-state": 0, - "react/no-direct-mutation-state": 2, - "react/no-multi-comp": [2, { "ignoreStateless": true }], - "react/no-unknown-property": 2, - "react/prefer-es6-class": 2, - "react/prop-types": 2, - "react/react-in-jsx-scope": 2, - "react/self-closing-comp": 2, - "react/sort-comp": 2, - "react/jsx-wrap-multilines": 2 - } -} diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js new file mode 100644 index 000000000..028dd1061 --- /dev/null +++ b/frontend/.eslintrc.js @@ -0,0 +1,327 @@ +const fs = require('fs'); + +const dirs = fs + .readdirSync('frontend/src', { withFileTypes: true }) + .filter((dirent) => dirent.isDirectory()) + .map((dirent) => dirent.name) + .join('|'); + +module.exports = { + parser: 'babel-eslint', + + env: { + browser: true, + commonjs: true, + node: true, + es6: true + }, + + globals: { + expect: false, + chai: false, + sinon: false + }, + + parserOptions: { + ecmaVersion: 6, + sourceType: 'module', + ecmaFeatures: { + modules: true, + impliedStrict: true + } + }, + + plugins: [ + 'filenames', + 'react', + 'simple-import-sort', + 'import' + ], + + settings: { + react: { + version: 'detect' + } + }, + + rules: { + 'filenames/match-exported': ['error'], + + // ECMAScript 6 + + 'arrow-body-style': [0], + 'arrow-parens': ['error', 'always'], + 'arrow-spacing': ['error', { before: true, after: true }], + 'constructor-super': 'error', + 'generator-star-spacing': 'off', + 'no-class-assign': 'error', + 'no-confusing-arrow': 'error', + 'no-const-assign': 'error', + 'no-dupe-class-members': 'error', + 'no-duplicate-imports': 'error', + 'no-new-symbol': 'error', + 'no-this-before-super': 'error', + 'no-useless-escape': 'error', + 'no-useless-computed-key': 'error', + 'no-useless-constructor': 'error', + 'no-var': 'warn', + 'object-shorthand': ['error', 'properties'], + 'prefer-arrow-callback': 'error', + 'prefer-const': 'warn', + 'prefer-reflect': 'off', + 'prefer-rest-params': 'off', + 'prefer-spread': 'warn', + 'prefer-template': 'error', + 'require-yield': 'off', + 'template-curly-spacing': ['error', 'never'], + 'yield-star-spacing': 'off', + + // Possible Errors + + 'comma-dangle': 'error', + 'no-cond-assign': 'error', + 'no-console': 'off', + 'no-constant-condition': 'warn', + 'no-control-regex': 'error', + 'no-debugger': 'off', + 'no-dupe-args': 'error', + 'no-dupe-keys': 'error', + 'no-duplicate-case': 'error', + 'no-empty': 'warn', + 'no-empty-character-class': 'error', + 'no-ex-assign': 'error', + 'no-extra-boolean-cast': 'error', + 'no-extra-parens': ['error', 'functions'], + 'no-extra-semi': 'error', + 'no-func-assign': 'error', + 'no-inner-declarations': 'error', + 'no-invalid-regexp': 'error', + 'no-irregular-whitespace': 'error', + 'no-negated-in-lhs': 'error', + 'no-obj-calls': 'error', + 'no-regex-spaces': 'error', + 'no-sparse-arrays': 'error', + 'no-unexpected-multiline': 'error', + 'no-unreachable': 'warn', + 'no-unsafe-finally': 'error', + 'use-isnan': 'error', + 'valid-jsdoc': 'off', + 'valid-typeof': 'error', + + // Best Practices + + 'accessor-pairs': 'off', + 'array-callback-return': 'warn', + 'block-scoped-var': 'warn', + 'consistent-return': 'off', + curly: 'error', + 'default-case': 'error', + 'dot-location': ['error', 'property'], + 'dot-notation': 'error', + eqeqeq: ['error', 'smart'], + 'guard-for-in': 'error', + 'no-alert': 'warn', + 'no-caller': 'error', + 'no-case-declarations': 'error', + 'no-div-regex': 'error', + 'no-else-return': 'error', + 'no-empty-function': ['error', { allow: ['arrowFunctions'] }], + 'no-empty-pattern': 'error', + 'no-eval': 'error', + 'no-extend-native': 'error', + 'no-extra-bind': 'error', + 'no-fallthrough': 'error', + 'no-floating-decimal': 'error', + 'no-implicit-coercion': ['error', { + boolean: false, + number: true, + string: true, + allow: [/* "!!", "~", "*", "+" */] + }], + 'no-implicit-globals': 'error', + 'no-implied-eval': 'error', + 'no-invalid-this': 'off', + 'no-iterator': 'error', + 'no-labels': 'error', + 'no-lone-blocks': 'error', + 'no-loop-func': 'error', + 'no-magic-numbers': ['off', { ignoreArrayIndexes: true, ignore: [0, 1] }], + 'no-multi-spaces': 'error', + 'no-multi-str': 'error', + 'no-native-reassign': ['error', { exceptions: ['console'] }], + 'no-new': 'off', + 'no-new-func': 'error', + 'no-new-wrappers': 'error', + 'no-octal': 'error', + 'no-octal-escape': 'error', + 'no-param-reassign': 'off', + 'no-process-env': 'off', + 'no-proto': 'error', + 'no-redeclare': 'error', + 'no-return-assign': 'warn', + 'no-script-url': 'error', + 'no-self-assign': 'error', + 'no-self-compare': 'error', + 'no-sequences': 'error', + 'no-throw-literal': 'error', + 'no-unmodified-loop-condition': 'error', + 'no-unused-expressions': 'error', + 'no-unused-labels': 'error', + 'no-useless-call': 'error', + 'no-useless-concat': 'error', + 'no-void': 'error', + 'no-warning-comments': 'off', + 'no-with': 'error', + radix: ['error', 'as-needed'], + 'vars-on-top': 'off', + 'wrap-iife': ['error', 'inside'], + yoda: 'error', + + // Strict Mode + + strict: ['error', 'never'], + + // Variables + + 'init-declarations': ['error', 'always'], + 'no-catch-shadow': 'error', + 'no-delete-var': 'error', + 'no-label-var': 'error', + 'no-restricted-globals': 'off', + 'no-shadow': 'error', + 'no-shadow-restricted-names': 'error', + 'no-undef': 'error', + 'no-undef-init': 'off', + 'no-undefined': 'off', + 'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }], + 'no-use-before-define': 'error', + + // Node.js and CommonJS + + 'callback-return': 'warn', + 'global-require': 'error', + 'handle-callback-err': 'warn', + 'no-mixed-requires': 'error', + 'no-new-require': 'error', + 'no-path-concat': 'error', + 'no-process-exit': 'error', + + // Stylistic Issues + + 'array-bracket-spacing': ['error', 'never'], + 'block-spacing': ['error', 'always'], + 'brace-style': ['error', '1tbs', { allowSingleLine: false }], + camelcase: 'off', + 'comma-spacing': ['error', { before: false, after: true }], + 'comma-style': ['error', 'last'], + 'computed-property-spacing': ['error', 'never'], + 'consistent-this': ['error', 'self'], + 'eol-last': 'error', + 'func-names': 'off', + 'func-style': ['error', 'declaration'], + indent: ['error', 2, { SwitchCase: 1 }], + 'key-spacing': ['error', { beforeColon: false, afterColon: true }], + 'keyword-spacing': ['error', { before: true, after: true }], + 'lines-around-comment': ['error', { beforeBlockComment: true, afterBlockComment: false }], + 'max-depth': ['error', { maximum: 5 }], + 'max-nested-callbacks': ['error', 4], + 'max-statements': 'off', + 'max-statements-per-line': ['error', { max: 1 }], + 'new-cap': ['error', { capIsNewExceptions: ['$.Deferred', 'DragDropContext', 'DragLayer', 'DragSource', 'DropTarget'] }], + 'new-parens': 'error', + 'newline-after-var': 'off', + 'newline-before-return': 'off', + 'newline-per-chained-call': 'off', + 'no-array-constructor': 'error', + 'no-bitwise': 'error', + 'no-continue': 'error', + 'no-inline-comments': 'off', + 'no-lonely-if': 'warn', + 'no-mixed-spaces-and-tabs': 'error', + 'no-multiple-empty-lines': ['error', { max: 1 }], + 'no-negated-condition': 'warn', + 'no-nested-ternary': 'error', + 'no-new-object': 'error', + 'no-plusplus': 'off', + 'no-restricted-syntax': 'off', + 'no-spaced-func': 'error', + 'no-ternary': 'off', + 'no-trailing-spaces': 'error', + 'no-underscore-dangle': ['error', { allowAfterThis: true }], + 'no-unneeded-ternary': 'error', + 'no-whitespace-before-property': 'error', + 'object-curly-spacing': ['error', 'always'], + 'one-var': ['error', 'never'], + 'one-var-declaration-per-line': ['error', 'always'], + 'operator-assignment': ['off', 'never'], + 'operator-linebreak': ['error', 'after'], + 'quote-props': ['error', 'as-needed'], + quotes: ['error', 'single'], + 'require-jsdoc': 'off', + semi: 'error', + 'semi-spacing': ['error', { before: false, after: true }], + 'sort-vars': 'off', + 'space-before-blocks': ['error', 'always'], + 'space-before-function-paren': ['error', 'never'], + 'space-in-parens': 'off', + 'space-infix-ops': 'off', + 'space-unary-ops': 'off', + 'spaced-comment': 'error', + 'wrap-regex': 'error', + + // ImportSort + + 'simple-import-sort/sort': 'error', + 'import/newline-after-import': 'error', + + // React + + 'react/jsx-boolean-value': [2, 'always'], + 'react/jsx-uses-vars': 2, + 'react/jsx-closing-bracket-location': 2, + 'react/jsx-tag-spacing': ['error'], + 'react/jsx-curly-spacing': [2, 'never'], + 'react/jsx-equals-spacing': [2, 'never'], + 'react/jsx-indent-props': [2, 2], + 'react/jsx-indent': [2, 2, { indentLogicalExpressions: true }], + 'react/jsx-key': 2, + 'react/jsx-no-bind': [2, { allowArrowFunctions: true }], + 'react/jsx-no-duplicate-props': [2, { ignoreCase: true }], + 'react/jsx-max-props-per-line': [2, { maximum: 2 }], + 'react/jsx-handler-names': [2, { eventHandlerPrefix: '(on|dispatch)', eventHandlerPropPrefix: 'on' }], + 'react/jsx-no-undef': 2, + 'react/jsx-pascal-case': 2, + 'react/jsx-uses-react': 2, + // Explicitly disabled in case we want to enable them again + 'react/no-did-mount-set-state': 0, + 'react/no-did-update-set-state': 0, + 'react/no-direct-mutation-state': 2, + 'react/no-multi-comp': [2, { ignoreStateless: true }], + 'react/no-unknown-property': 2, + 'react/prefer-es6-class': 2, + 'react/prop-types': 2, + 'react/react-in-jsx-scope': 2, + 'react/self-closing-comp': 2, + 'react/sort-comp': 2, + 'react/jsx-wrap-multilines': 2 + }, + overrides: [ + { + files: ['*.js'], + rules: { + 'simple-import-sort/sort': [ + 'error', + { + groups: [ + // Packages + // Absolute Paths + // Relative Paths + // Css + ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$'] + ] + } + ] + } + } + ] +}; diff --git a/frontend/src/Activity/Blacklist/Blacklist.js b/frontend/src/Activity/Blacklist/Blacklist.js index a9a0dae46..a371d926f 100644 --- a/frontend/src/Activity/Blacklist/Blacklist.js +++ b/frontend/src/Activity/Blacklist/Blacklist.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { align, icons } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; -import TableBody from 'Components/Table/TableBody'; -import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; -import TablePager from 'Components/Table/TablePager'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import BlacklistRowConnector from './BlacklistRowConnector'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import Table from 'Components/Table/Table'; +import TableBody from 'Components/Table/TableBody'; +import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import TablePager from 'Components/Table/TablePager'; +import { align, icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import BlacklistRowConnector from './BlacklistRowConnector'; class Blacklist extends Component { diff --git a/frontend/src/Activity/Blacklist/BlacklistConnector.js b/frontend/src/Activity/Blacklist/BlacklistConnector.js index b182e7bb2..0c673f8e4 100644 --- a/frontend/src/Activity/Blacklist/BlacklistConnector.js +++ b/frontend/src/Activity/Blacklist/BlacklistConnector.js @@ -2,12 +2,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; +import * as commandNames from 'Commands/commandNames'; import withCurrentPage from 'Components/withCurrentPage'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import * as blacklistActions from 'Store/Actions/blacklistActions'; import { executeCommand } from 'Store/Actions/commandActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import Blacklist from './Blacklist'; function createMapStateToProps() { diff --git a/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js b/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js index 356512a9d..75b963955 100644 --- a/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js +++ b/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import Button from 'Components/Link/Button'; import DescriptionList from 'Components/DescriptionList/DescriptionList'; import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem'; +import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; class BlacklistDetailsModal extends Component { diff --git a/frontend/src/Activity/Blacklist/BlacklistRow.js b/frontend/src/Activity/Blacklist/BlacklistRow.js index 3f715f2a7..d73252ab4 100644 --- a/frontend/src/Activity/Blacklist/BlacklistRow.js +++ b/frontend/src/Activity/Blacklist/BlacklistRow.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; -import MovieQuality from 'Movie/MovieQuality'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; +import MovieQuality from 'Movie/MovieQuality'; import MovieTitleLink from 'Movie/MovieTitleLink'; import BlacklistDetailsModal from './BlacklistDetailsModal'; import styles from './BlacklistRow.css'; diff --git a/frontend/src/Activity/History/Details/HistoryDetails.js b/frontend/src/Activity/History/Details/HistoryDetails.js index fcdd3db16..f51454e29 100644 --- a/frontend/src/Activity/History/Details/HistoryDetails.js +++ b/frontend/src/Activity/History/Details/HistoryDetails.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import formatDateTime from 'Utilities/Date/formatDateTime'; -import formatAge from 'Utilities/Number/formatAge'; -import Link from 'Components/Link/Link'; import DescriptionList from 'Components/DescriptionList/DescriptionList'; import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem'; -import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle'; import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription'; +import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle'; +import Link from 'Components/Link/Link'; +import formatDateTime from 'Utilities/Date/formatDateTime'; +import formatAge from 'Utilities/Number/formatAge'; import styles from './HistoryDetails.css'; function HistoryDetails(props) { diff --git a/frontend/src/Activity/History/Details/HistoryDetailsModal.js b/frontend/src/Activity/History/Details/HistoryDetailsModal.js index 371b5ce06..68f49dedf 100644 --- a/frontend/src/Activity/History/Details/HistoryDetailsModal.js +++ b/frontend/src/Activity/History/Details/HistoryDetailsModal.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import HistoryDetails from './HistoryDetails'; import styles from './HistoryDetailsModal.css'; diff --git a/frontend/src/Activity/History/History.js b/frontend/src/Activity/History/History.js index 78b742520..aca845c95 100644 --- a/frontend/src/Activity/History/History.js +++ b/frontend/src/Activity/History/History.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { align, icons } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; -import TableBody from 'Components/Table/TableBody'; -import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; -import TablePager from 'Components/Table/TablePager'; +import FilterMenu from 'Components/Menu/FilterMenu'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import FilterMenu from 'Components/Menu/FilterMenu'; -import HistoryRowConnector from './HistoryRowConnector'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import Table from 'Components/Table/Table'; +import TableBody from 'Components/Table/TableBody'; +import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import TablePager from 'Components/Table/TablePager'; +import { align, icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import HistoryRowConnector from './HistoryRowConnector'; class History extends Component { diff --git a/frontend/src/Activity/History/HistoryConnector.js b/frontend/src/Activity/History/HistoryConnector.js index 9b6301973..4cda67a5f 100644 --- a/frontend/src/Activity/History/HistoryConnector.js +++ b/frontend/src/Activity/History/HistoryConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import withCurrentPage from 'Components/withCurrentPage'; import * as historyActions from 'Store/Actions/historyActions'; +import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import History from './History'; function createMapStateToProps() { diff --git a/frontend/src/Activity/History/HistoryEventTypeCell.js b/frontend/src/Activity/History/HistoryEventTypeCell.js index 73f5c1d53..c2dfc2885 100644 --- a/frontend/src/Activity/History/HistoryEventTypeCell.js +++ b/frontend/src/Activity/History/HistoryEventTypeCell.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import { icons, kinds } from 'Helpers/Props'; import styles from './HistoryEventTypeCell.css'; function getIconName(eventType) { diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js index 46af6c6c3..a605e1435 100644 --- a/frontend/src/Activity/History/HistoryRow.js +++ b/frontend/src/Activity/History/HistoryRow.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; -import MovieQuality from 'Movie/MovieQuality'; +import TableRow from 'Components/Table/TableRow'; +import { icons } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; +import MovieQuality from 'Movie/MovieQuality'; import MovieTitleLink from 'Movie/MovieTitleLink'; -import HistoryEventTypeCell from './HistoryEventTypeCell'; import HistoryDetailsModal from './Details/HistoryDetailsModal'; +import HistoryEventTypeCell from './HistoryEventTypeCell'; import styles from './HistoryRow.css'; class HistoryRow extends Component { diff --git a/frontend/src/Activity/Queue/Queue.js b/frontend/src/Activity/Queue/Queue.js index c4003c90e..fa3123419 100644 --- a/frontend/src/Activity/Queue/Queue.js +++ b/frontend/src/Activity/Queue/Queue.js @@ -1,28 +1,28 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getRemovedItems from 'Utilities/Object/getRemovedItems'; -import hasDifferentItems from 'Utilities/Object/hasDifferentItems'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { align, icons } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; -import TableBody from 'Components/Table/TableBody'; -import TablePager from 'Components/Table/TablePager'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import Table from 'Components/Table/Table'; +import TableBody from 'Components/Table/TableBody'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; -import RemoveQueueItemsModal from './RemoveQueueItemsModal'; +import TablePager from 'Components/Table/TablePager'; +import { align, icons } from 'Helpers/Props'; +import getRemovedItems from 'Utilities/Object/getRemovedItems'; +import hasDifferentItems from 'Utilities/Object/hasDifferentItems'; +import translate from 'Utilities/String/translate'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; import QueueOptionsConnector from './QueueOptionsConnector'; import QueueRowConnector from './QueueRowConnector'; -import translate from 'Utilities/String/translate'; +import RemoveQueueItemsModal from './RemoveQueueItemsModal'; class Queue extends Component { diff --git a/frontend/src/Activity/Queue/QueueConnector.js b/frontend/src/Activity/Queue/QueueConnector.js index 2535293c4..d892a25fd 100644 --- a/frontend/src/Activity/Queue/QueueConnector.js +++ b/frontend/src/Activity/Queue/QueueConnector.js @@ -2,12 +2,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; +import * as commandNames from 'Commands/commandNames'; import withCurrentPage from 'Components/withCurrentPage'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import { executeCommand } from 'Store/Actions/commandActions'; import * as queueActions from 'Store/Actions/queueActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import Queue from './Queue'; function createMapStateToProps() { diff --git a/frontend/src/Activity/Queue/QueueDetails.js b/frontend/src/Activity/Queue/QueueDetails.js index f41756520..d68c3ad50 100644 --- a/frontend/src/Activity/Queue/QueueDetails.js +++ b/frontend/src/Activity/Queue/QueueDetails.js @@ -1,8 +1,8 @@ import moment from 'moment'; import PropTypes from 'prop-types'; import React from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons, kinds } from 'Helpers/Props'; function QueueDetails(props) { const { diff --git a/frontend/src/Activity/Queue/QueueOptions.js b/frontend/src/Activity/Queue/QueueOptions.js index 774d17060..81dcb446b 100644 --- a/frontend/src/Activity/Queue/QueueOptions.js +++ b/frontend/src/Activity/Queue/QueueOptions.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import { inputTypes } from 'Helpers/Props'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes } from 'Helpers/Props'; class QueueOptions extends Component { diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js index 31957be71..8dd0aef33 100644 --- a/frontend/src/Activity/Queue/QueueRow.js +++ b/frontend/src/Activity/Queue/QueueRow.js @@ -1,23 +1,23 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons, kinds } from 'Helpers/Props'; +import ProtocolLabel from 'Activity/Queue/ProtocolLabel'; import IconButton from 'Components/Link/IconButton'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; import ProgressBar from 'Components/ProgressBar'; -import TableRow from 'Components/Table/TableRow'; // import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableSelectCell from 'Components/Table/Cells/TableSelectCell'; -import ProtocolLabel from 'Activity/Queue/ProtocolLabel'; -import MovieQuality from 'Movie/MovieQuality'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; +import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; -import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; +import MovieQuality from 'Movie/MovieQuality'; import MovieTitleLink from 'Movie/MovieTitleLink'; +import formatBytes from 'Utilities/Number/formatBytes'; import QueueStatusCell from './QueueStatusCell'; -import TimeleftCell from './TimeleftCell'; import RemoveQueueItemModal from './RemoveQueueItemModal'; +import TimeleftCell from './TimeleftCell'; import styles from './QueueRow.css'; class QueueRow extends Component { diff --git a/frontend/src/Activity/Queue/QueueStatusCell.js b/frontend/src/Activity/Queue/QueueStatusCell.js index d86d1e4ad..563a75cb9 100644 --- a/frontend/src/Activity/Queue/QueueStatusCell.js +++ b/frontend/src/Activity/Queue/QueueStatusCell.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import Icon from 'Components/Icon'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import Popover from 'Components/Tooltip/Popover'; +import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import styles from './QueueStatusCell.css'; function getDetailedPopoverBody(statusMessages) { diff --git a/frontend/src/Activity/Queue/RemoveQueueItemModal.js b/frontend/src/Activity/Queue/RemoveQueueItemModal.js index 3de9372d1..ed6c12bb4 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.js @@ -1,15 +1,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import Modal from 'Components/Modal/Modal'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; +import Modal from 'Components/Modal/Modal'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds, sizes } from 'Helpers/Props'; class RemoveQueueItemModal extends Component { diff --git a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js index a41692bd5..1111713bf 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js @@ -1,15 +1,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import Modal from 'Components/Modal/Modal'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; +import Modal from 'Components/Modal/Modal'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds, sizes } from 'Helpers/Props'; import styles from './RemoveQueueItemsModal.css'; class RemoveQueueItemsModal extends Component { diff --git a/frontend/src/Activity/Queue/Status/QueueStatusConnector.js b/frontend/src/Activity/Queue/Status/QueueStatusConnector.js index 096dd26f4..9e3662de6 100644 --- a/frontend/src/Activity/Queue/Status/QueueStatusConnector.js +++ b/frontend/src/Activity/Queue/Status/QueueStatusConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchQueueStatus } from 'Store/Actions/queueActions'; import PageSidebarStatus from 'Components/Page/Sidebar/PageSidebarStatus'; +import { fetchQueueStatus } from 'Store/Actions/queueActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/Activity/Queue/TimeleftCell.js b/frontend/src/Activity/Queue/TimeleftCell.js index f4356224b..cfb1af743 100644 --- a/frontend/src/Activity/Queue/TimeleftCell.js +++ b/frontend/src/Activity/Queue/TimeleftCell.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; import formatTime from 'Utilities/Date/formatTime'; import formatTimeSpan from 'Utilities/Date/formatTimeSpan'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import formatBytes from 'Utilities/Number/formatBytes'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; import styles from './TimeleftCell.css'; function TimeleftCell(props) { diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js index d32312622..dfc3b956b 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getErrorMessage from 'Utilities/Object/getErrorMessage'; -import { icons, kinds } from 'Helpers/Props'; +import TextInput from 'Components/Form/TextInput'; +import Icon from 'Components/Icon'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; -import Icon from 'Components/Icon'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import TextInput from 'Components/Form/TextInput'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import AddNewMovieSearchResultConnector from './AddNewMovieSearchResultConnector'; +import { icons, kinds } from 'Helpers/Props'; +import getErrorMessage from 'Utilities/Object/getErrorMessage'; import translate from 'Utilities/String/translate'; +import AddNewMovieSearchResultConnector from './AddNewMovieSearchResultConnector'; import styles from './AddNewMovie.css'; class AddNewMovie extends Component { diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js index c44674ebc..a4afccdba 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import parseUrl from 'Utilities/String/parseUrl'; -import { lookupMovie, clearAddMovie } from 'Store/Actions/addMovieActions'; +import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions'; import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; import { fetchNetImportExclusions } from 'Store/Actions/Settings/netImportExclusions'; +import parseUrl from 'Utilities/String/parseUrl'; import AddNewMovie from './AddNewMovie'; function createMapStateToProps() { diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js index 74ef61bbc..e179d10d4 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds, inputTypes } from 'Helpers/Props'; -import SpinnerButton from 'Components/Link/SpinnerButton'; +import CheckInput from 'Components/Form/CheckInput'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import CheckInput from 'Components/Form/CheckInput'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import SpinnerButton from 'Components/Link/SpinnerButton'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import MoviePoster from 'Movie/MoviePoster'; import styles from './AddNewMovieModalContent.css'; diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js index b3253d880..166bbaecf 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setAddMovieDefault, addMovie } from 'Store/Actions/addMovieActions'; +import { addMovie, setAddMovieDefault } from 'Store/Actions/addMovieActions'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; import selectSettings from 'Store/Selectors/selectSettings'; diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js index ac48aa225..ae31de0dc 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; import HeartRating from 'Components/HeartRating'; import Icon from 'Components/Icon'; import Label from 'Components/Label'; import Link from 'Components/Link/Link'; +import { icons, kinds, sizes } from 'Helpers/Props'; import MoviePoster from 'Movie/MoviePoster'; import AddNewMovieModal from './AddNewMovieModal'; import styles from './AddNewMovieSearchResult.css'; diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js index 54bc03881..fb843d67f 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js @@ -1,8 +1,8 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createExistingMovieSelector from 'Store/Selectors/createExistingMovieSelector'; -import createExclusionMovieSelector from 'Store/Selectors/createExclusionMovieSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createExclusionMovieSelector from 'Store/Selectors/createExclusionMovieSelector'; +import createExistingMovieSelector from 'Store/Selectors/createExistingMovieSelector'; import AddNewMovieSearchResult from './AddNewMovieSearchResult'; function createMapStateToProps() { diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovie.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovie.js index 2d788eef7..d4cfd36b9 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovie.js +++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovie.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import ImportMovieTableConnector from './ImportMovieTableConnector'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; import ImportMovieFooterConnector from './ImportMovieFooterConnector'; +import ImportMovieTableConnector from './ImportMovieTableConnector'; class ImportMovie extends Component { diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js index 963fd776a..f6f92aea4 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js +++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setImportMovieValue, importMovie, clearImportMovie } from 'Store/Actions/importMovieActions'; -import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; -import { setAddMovieDefault } from 'Store/Actions/addMovieActions'; import createRouteMatchShape from 'Helpers/Props/Shapes/createRouteMatchShape'; +import { setAddMovieDefault } from 'Store/Actions/addMovieActions'; +import { clearImportMovie, importMovie, setImportMovieValue } from 'Store/Actions/importMovieActions'; +import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; import ImportMovie from './ImportMovie'; function createMapStateToProps() { diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js index 8b0d3142c..f3c211a9a 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js +++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +// import CheckInput from 'Components/Form/CheckInput'; +import FormInputGroup from 'Components/Form/FormInputGroup'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -// import CheckInput from 'Components/Form/CheckInput'; -import FormInputGroup from 'Components/Form/FormInputGroup'; import PageContentFooter from 'Components/Page/PageContentFooter'; +import { inputTypes, kinds } from 'Helpers/Props'; import styles from './ImportMovieFooter.css'; const MIXED = 'mixed'; diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js index 7b32e3d7a..96ea739e4 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js +++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; import FormInputGroup from 'Components/Form/FormInputGroup'; import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell'; +import { inputTypes } from 'Helpers/Props'; import ImportMovieSelectMovieConnector from './SelectMovie/ImportMovieSelectMovieConnector'; import styles from './ImportMovieRow.css'; diff --git a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js index b812c2d08..b8de44157 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js +++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Manager, Popper, Reference } from 'react-popper'; -import getUniqueElememtId from 'Utilities/getUniqueElementId'; -import { icons, kinds } from 'Helpers/Props'; -import Icon from 'Components/Icon'; -import Portal from 'Components/Portal'; import FormInputButton from 'Components/Form/FormInputButton'; +import TextInput from 'Components/Form/TextInput'; +import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import TextInput from 'Components/Form/TextInput'; +import Portal from 'Components/Portal'; +import { icons, kinds } from 'Helpers/Props'; +import getUniqueElememtId from 'Utilities/getUniqueElementId'; import ImportMovieSearchResultConnector from './ImportMovieSearchResultConnector'; import ImportMovieTitle from './ImportMovieTitle'; import styles from './ImportMovieSelectMovie.css'; diff --git a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js index fc5ba5b75..8b2624d5e 100644 --- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js +++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; import styles from './ImportMovieTitle.css'; function ImportMovieTitle(props) { diff --git a/frontend/src/AddMovie/ImportMovie/ImportMovies.js b/frontend/src/AddMovie/ImportMovie/ImportMovies.js index b8d1a923f..c6ae6f9d7 100644 --- a/frontend/src/AddMovie/ImportMovie/ImportMovies.js +++ b/frontend/src/AddMovie/ImportMovie/ImportMovies.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import { Route } from 'react-router-dom'; -import Switch from 'Components/Router/Switch'; -import ImportMovieSelectFolderConnector from 'AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector'; import ImportMovieConnector from 'AddMovie/ImportMovie/Import/ImportMovieConnector'; +import ImportMovieSelectFolderConnector from 'AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector'; +import Switch from 'Components/Router/Switch'; class ImportMovies extends Component { diff --git a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieRootFolderRow.js b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieRootFolderRow.js index 7730e3b43..36bed6058 100644 --- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieRootFolderRow.js +++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieRootFolderRow.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; +import { icons } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; import styles from './ImportMovieRootFolderRow.css'; function ImportMovieRootFolderRow(props) { diff --git a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js index 208b7c757..f7d0df1e6 100644 --- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js +++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import FieldSet from 'Components/FieldSet'; +import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal'; import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import ImportMovieRootFolderRowConnector from './ImportMovieRootFolderRowConnector'; +import { icons, kinds, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import ImportMovieRootFolderRowConnector from './ImportMovieRootFolderRowConnector'; import styles from './ImportMovieSelectFolder.css'; const rootFolderColumns = [ diff --git a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js index 29c7421a0..373af76fb 100644 --- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js +++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js @@ -1,11 +1,11 @@ +import { push } from 'connected-react-router'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { push } from 'connected-react-router'; +import { addRootFolder, deleteRootFolder, fetchRootFolders } from 'Store/Actions/rootFolderActions'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; -import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions'; import ImportMovieSelectFolder from './ImportMovieSelectFolder'; function createMapStateToProps() { diff --git a/frontend/src/App/App.js b/frontend/src/App/App.js index 5f1ed15e3..80ecbcbd4 100644 --- a/frontend/src/App/App.js +++ b/frontend/src/App/App.js @@ -1,8 +1,8 @@ +import { ConnectedRouter } from 'connected-react-router'; import PropTypes from 'prop-types'; import React from 'react'; import DocumentTitle from 'react-document-title'; import { Provider } from 'react-redux'; -import { ConnectedRouter } from 'connected-react-router'; import PageConnector from 'Components/Page/PageConnector'; import AppRoutes from './AppRoutes'; diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js index 2f1202af1..ab899d491 100644 --- a/frontend/src/App/AppRoutes.js +++ b/frontend/src/App/AppRoutes.js @@ -1,37 +1,37 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { Route, Redirect } from 'react-router-dom'; -import getPathWithUrlBase from 'Utilities/getPathWithUrlBase'; +import { Redirect, Route } from 'react-router-dom'; +import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector'; +import HistoryConnector from 'Activity/History/HistoryConnector'; +import QueueConnector from 'Activity/Queue/QueueConnector'; +import AddNewMovieConnector from 'AddMovie/AddNewMovie/AddNewMovieConnector'; +import ImportMovies from 'AddMovie/ImportMovie/ImportMovies'; +import CalendarPageConnector from 'Calendar/CalendarPageConnector'; import NotFound from 'Components/NotFound'; import Switch from 'Components/Router/Switch'; -import MovieIndexConnector from 'Movie/Index/MovieIndexConnector'; -import AddNewMovieConnector from 'AddMovie/AddNewMovie/AddNewMovieConnector'; import DiscoverMovieConnector from 'DiscoverMovie/DiscoverMovieConnector'; -import ImportMovies from 'AddMovie/ImportMovie/ImportMovies'; import MovieDetailsPageConnector from 'Movie/Details/MovieDetailsPageConnector'; -import CalendarPageConnector from 'Calendar/CalendarPageConnector'; -import HistoryConnector from 'Activity/History/HistoryConnector'; -import QueueConnector from 'Activity/Queue/QueueConnector'; -import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector'; -import Settings from 'Settings/Settings'; -import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementConnector'; -import Profiles from 'Settings/Profiles/Profiles'; -import Quality from 'Settings/Quality/Quality'; +import MovieIndexConnector from 'Movie/Index/MovieIndexConnector'; import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector'; -import IndexerSettingsConnector from 'Settings/Indexers/IndexerSettingsConnector'; import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector'; +import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector'; +import IndexerSettingsConnector from 'Settings/Indexers/IndexerSettingsConnector'; +import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementConnector'; +import MetadataSettings from 'Settings/Metadata/MetadataSettings'; import NetImportSettingsConnector from 'Settings/NetImport/NetImportSettingsConnector'; import NotificationSettings from 'Settings/Notifications/NotificationSettings'; -import MetadataSettings from 'Settings/Metadata/MetadataSettings'; +import Profiles from 'Settings/Profiles/Profiles'; +import Quality from 'Settings/Quality/Quality'; +import Settings from 'Settings/Settings'; import TagSettings from 'Settings/Tags/TagSettings'; -import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector'; import UISettingsConnector from 'Settings/UI/UISettingsConnector'; -import Status from 'System/Status/Status'; -import Tasks from 'System/Tasks/Tasks'; import BackupsConnector from 'System/Backup/BackupsConnector'; -import UpdatesConnector from 'System/Updates/UpdatesConnector'; import LogsTableConnector from 'System/Events/LogsTableConnector'; import Logs from 'System/Logs/Logs'; +import Status from 'System/Status/Status'; +import Tasks from 'System/Tasks/Tasks'; +import UpdatesConnector from 'System/Updates/UpdatesConnector'; +import getPathWithUrlBase from 'Utilities/getPathWithUrlBase'; function AppRoutes(props) { const { diff --git a/frontend/src/App/AppUpdatedModalContent.js b/frontend/src/App/AppUpdatedModalContent.js index d22eb98b5..4efd07800 100644 --- a/frontend/src/App/AppUpdatedModalContent.js +++ b/frontend/src/App/AppUpdatedModalContent.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import UpdateChanges from 'System/Updates/UpdateChanges'; import styles from './AppUpdatedModalContent.css'; diff --git a/frontend/src/App/ConnectionLostModal.js b/frontend/src/App/ConnectionLostModal.js index 063b3f47f..94f079238 100644 --- a/frontend/src/App/ConnectionLostModal.js +++ b/frontend/src/App/ConnectionLostModal.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import styles from './ConnectionLostModal.css'; function ConnectionLostModal(props) { diff --git a/frontend/src/Calendar/Agenda/AgendaEvent.js b/frontend/src/Calendar/Agenda/AgendaEvent.js index ce6cf9298..f93032efb 100644 --- a/frontend/src/Calendar/Agenda/AgendaEvent.js +++ b/frontend/src/Calendar/Agenda/AgendaEvent.js @@ -1,12 +1,12 @@ +import classNames from 'classnames'; import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons, kinds } from 'Helpers/Props'; +import CalendarEventQueueDetails from 'Calendar/Events/CalendarEventQueueDetails'; import getStatusStyle from 'Calendar/getStatusStyle'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; -import CalendarEventQueueDetails from 'Calendar/Events/CalendarEventQueueDetails'; +import { icons, kinds } from 'Helpers/Props'; import MovieTitleLink from 'Movie/MovieTitleLink'; import styles from './AgendaEvent.css'; diff --git a/frontend/src/Calendar/Calendar.js b/frontend/src/Calendar/Calendar.js index 6ceb1f3bb..734de3121 100644 --- a/frontend/src/Calendar/Calendar.js +++ b/frontend/src/Calendar/Calendar.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import AgendaConnector from './Agenda/AgendaConnector'; import * as calendarViews from './calendarViews'; -import CalendarHeaderConnector from './Header/CalendarHeaderConnector'; -import DaysOfWeekConnector from './Day/DaysOfWeekConnector'; import CalendarDaysConnector from './Day/CalendarDaysConnector'; -import AgendaConnector from './Agenda/AgendaConnector'; +import DaysOfWeekConnector from './Day/DaysOfWeekConnector'; +import CalendarHeaderConnector from './Header/CalendarHeaderConnector'; import styles from './Calendar.css'; class Calendar extends Component { diff --git a/frontend/src/Calendar/CalendarConnector.js b/frontend/src/Calendar/CalendarConnector.js index ce121c593..b297ee51f 100644 --- a/frontend/src/Calendar/CalendarConnector.js +++ b/frontend/src/Calendar/CalendarConnector.js @@ -2,14 +2,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; -import hasDifferentItems from 'Utilities/Object/hasDifferentItems'; -import selectUniqueIds from 'Utilities/Object/selectUniqueIds'; +import * as commandNames from 'Commands/commandNames'; import * as calendarActions from 'Store/Actions/calendarActions'; -import { fetchMovieFiles, clearMovieFiles } from 'Store/Actions/movieFileActions'; -import { fetchQueueDetails, clearQueueDetails } from 'Store/Actions/queueActions'; +import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions'; +import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions'; import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; -import * as commandNames from 'Commands/commandNames'; +import hasDifferentItems from 'Utilities/Object/hasDifferentItems'; +import selectUniqueIds from 'Utilities/Object/selectUniqueIds'; +import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import Calendar from './Calendar'; const UPDATE_DELAY = 3600000; // 1 hour diff --git a/frontend/src/Calendar/CalendarPage.js b/frontend/src/Calendar/CalendarPage.js index 9953d1bc8..33a9e2230 100644 --- a/frontend/src/Calendar/CalendarPage.js +++ b/frontend/src/Calendar/CalendarPage.js @@ -1,22 +1,22 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getErrorMessage from 'Utilities/Object/getErrorMessage'; -import { align, icons } from 'Helpers/Props'; -import PageContent from 'Components/Page/PageContent'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Measure from 'Components/Measure'; +import FilterMenu from 'Components/Menu/FilterMenu'; +import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; +import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; -import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import FilterMenu from 'Components/Menu/FilterMenu'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { align, icons } from 'Helpers/Props'; import NoMovie from 'Movie/NoMovie'; +import getErrorMessage from 'Utilities/Object/getErrorMessage'; +import translate from 'Utilities/String/translate'; +import CalendarConnector from './CalendarConnector'; import CalendarLinkModal from './iCal/CalendarLinkModal'; -import CalendarOptionsModal from './Options/CalendarOptionsModal'; import LegendConnector from './Legend/LegendConnector'; -import CalendarConnector from './CalendarConnector'; -import translate from 'Utilities/String/translate'; +import CalendarOptionsModal from './Options/CalendarOptionsModal'; import styles from './CalendarPage.css'; const MINIMUM_DAY_WIDTH = 120; diff --git a/frontend/src/Calendar/CalendarPageConnector.js b/frontend/src/Calendar/CalendarPageConnector.js index e91e7c85e..d9ea208d2 100644 --- a/frontend/src/Calendar/CalendarPageConnector.js +++ b/frontend/src/Calendar/CalendarPageConnector.js @@ -1,16 +1,16 @@ +import moment from 'moment'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import moment from 'moment'; -import { isCommandExecuting } from 'Utilities/Command'; -import isBefore from 'Utilities/Date/isBefore'; import * as commandNames from 'Commands/commandNames'; import withCurrentPage from 'Components/withCurrentPage'; -import { executeCommand } from 'Store/Actions/commandActions'; import { searchMissing, setCalendarDaysCount, setCalendarFilter } from 'Store/Actions/calendarActions'; +import { executeCommand } from 'Store/Actions/commandActions'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import createCommandsSelector from 'Store/Selectors/createCommandsSelector'; import createMovieCountSelector from 'Store/Selectors/createMovieCountSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; -import createCommandsSelector from 'Store/Selectors/createCommandsSelector'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import { isCommandExecuting } from 'Utilities/Command'; +import isBefore from 'Utilities/Date/isBefore'; import CalendarPage from './CalendarPage'; function createMissingMovieIdsSelector() { diff --git a/frontend/src/Calendar/Day/CalendarDay.js b/frontend/src/Calendar/Day/CalendarDay.js index a714f94d4..685846766 100644 --- a/frontend/src/Calendar/Day/CalendarDay.js +++ b/frontend/src/Calendar/Day/CalendarDay.js @@ -1,7 +1,7 @@ +import classNames from 'classnames'; import moment from 'moment'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import * as calendarViews from 'Calendar/calendarViews'; import CalendarEventConnector from 'Calendar/Events/CalendarEventConnector'; import styles from './CalendarDay.css'; diff --git a/frontend/src/Calendar/Day/CalendarDays.js b/frontend/src/Calendar/Day/CalendarDays.js index 0a1a36172..0f2fc1fc5 100644 --- a/frontend/src/Calendar/Day/CalendarDays.js +++ b/frontend/src/Calendar/Day/CalendarDays.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import isToday from 'Utilities/Date/isToday'; import * as calendarViews from 'Calendar/calendarViews'; +import isToday from 'Utilities/Date/isToday'; import CalendarDayConnector from './CalendarDayConnector'; import styles from './CalendarDays.css'; diff --git a/frontend/src/Calendar/Day/CalendarDaysConnector.js b/frontend/src/Calendar/Day/CalendarDaysConnector.js index 3dea906a7..0acce70b9 100644 --- a/frontend/src/Calendar/Day/CalendarDaysConnector.js +++ b/frontend/src/Calendar/Day/CalendarDaysConnector.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { gotoCalendarPreviousRange, gotoCalendarNextRange } from 'Store/Actions/calendarActions'; +import { gotoCalendarNextRange, gotoCalendarPreviousRange } from 'Store/Actions/calendarActions'; import CalendarDays from './CalendarDays'; function createMapStateToProps() { diff --git a/frontend/src/Calendar/Day/DayOfWeek.js b/frontend/src/Calendar/Day/DayOfWeek.js index d97671522..39e40fce8 100644 --- a/frontend/src/Calendar/Day/DayOfWeek.js +++ b/frontend/src/Calendar/Day/DayOfWeek.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import getRelativeDate from 'Utilities/Date/getRelativeDate'; import * as calendarViews from 'Calendar/calendarViews'; +import getRelativeDate from 'Utilities/Date/getRelativeDate'; import styles from './DayOfWeek.css'; class DayOfWeek extends Component { diff --git a/frontend/src/Calendar/Day/DaysOfWeek.js b/frontend/src/Calendar/Day/DaysOfWeek.js index a67777f7c..add392730 100644 --- a/frontend/src/Calendar/Day/DaysOfWeek.js +++ b/frontend/src/Calendar/Day/DaysOfWeek.js @@ -1,8 +1,8 @@ import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import DayOfWeek from './DayOfWeek'; import * as calendarViews from 'Calendar/calendarViews'; +import DayOfWeek from './DayOfWeek'; import styles from './DaysOfWeek.css'; class DaysOfWeek extends Component { diff --git a/frontend/src/Calendar/Events/CalendarEvent.js b/frontend/src/Calendar/Events/CalendarEvent.js index b2edf4469..bc7e5b63f 100644 --- a/frontend/src/Calendar/Events/CalendarEvent.js +++ b/frontend/src/Calendar/Events/CalendarEvent.js @@ -1,11 +1,11 @@ +import classNames from 'classnames'; import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons, kinds } from 'Helpers/Props'; import getStatusStyle from 'Calendar/getStatusStyle'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { icons, kinds } from 'Helpers/Props'; import CalendarEventQueueDetails from './CalendarEventQueueDetails'; import styles from './CalendarEvent.css'; diff --git a/frontend/src/Calendar/Events/CalendarEventQueueDetails.js b/frontend/src/Calendar/Events/CalendarEventQueueDetails.js index 95144adae..8485a6c15 100644 --- a/frontend/src/Calendar/Events/CalendarEventQueueDetails.js +++ b/frontend/src/Calendar/Events/CalendarEventQueueDetails.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import colors from 'Styles/Variables/colors'; -import CircularProgressBar from 'Components/CircularProgressBar'; import QueueDetails from 'Activity/Queue/QueueDetails'; +import CircularProgressBar from 'Components/CircularProgressBar'; +import colors from 'Styles/Variables/colors'; function CalendarEventQueueDetails(props) { const { diff --git a/frontend/src/Calendar/Header/CalendarHeader.js b/frontend/src/Calendar/Header/CalendarHeader.js index cb6a8a892..683105627 100644 --- a/frontend/src/Calendar/Header/CalendarHeader.js +++ b/frontend/src/Calendar/Header/CalendarHeader.js @@ -1,17 +1,17 @@ import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { align, icons } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; +import * as calendarViews from 'Calendar/calendarViews'; import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Menu from 'Components/Menu/Menu'; import MenuButton from 'Components/Menu/MenuButton'; import MenuContent from 'Components/Menu/MenuContent'; import ViewMenuItem from 'Components/Menu/ViewMenuItem'; -import * as calendarViews from 'Calendar/calendarViews'; -import CalendarHeaderViewButton from './CalendarHeaderViewButton'; +import { align, icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import CalendarHeaderViewButton from './CalendarHeaderViewButton'; import styles from './CalendarHeader.css'; function getTitle(time, start, end, view, longDateFormat) { diff --git a/frontend/src/Calendar/Header/CalendarHeaderConnector.js b/frontend/src/Calendar/Header/CalendarHeaderConnector.js index b73730ed9..aec2d8e55 100644 --- a/frontend/src/Calendar/Header/CalendarHeaderConnector.js +++ b/frontend/src/Calendar/Header/CalendarHeaderConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { gotoCalendarNextRange, gotoCalendarPreviousRange, gotoCalendarToday, setCalendarView } from 'Store/Actions/calendarActions'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; -import { setCalendarView, gotoCalendarToday, gotoCalendarPreviousRange, gotoCalendarNextRange } from 'Store/Actions/calendarActions'; import CalendarHeader from './CalendarHeader'; function createMapStateToProps() { diff --git a/frontend/src/Calendar/Header/CalendarHeaderViewButton.js b/frontend/src/Calendar/Header/CalendarHeaderViewButton.js index 8dd5ae9f0..808518efd 100644 --- a/frontend/src/Calendar/Header/CalendarHeaderViewButton.js +++ b/frontend/src/Calendar/Header/CalendarHeaderViewButton.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import Button from 'Components/Link/Button'; import * as calendarViews from 'Calendar/calendarViews'; +import Button from 'Components/Link/Button'; +import titleCase from 'Utilities/String/titleCase'; // import styles from './CalendarHeaderViewButton.css'; class CalendarHeaderViewButton extends Component { diff --git a/frontend/src/Calendar/Legend/Legend.js b/frontend/src/Calendar/Legend/Legend.js index e5bf0c6b8..34eff9e59 100644 --- a/frontend/src/Calendar/Legend/Legend.js +++ b/frontend/src/Calendar/Legend/Legend.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; import { icons, kinds } from 'Helpers/Props'; -import LegendItem from './LegendItem'; import LegendIconItem from './LegendIconItem'; +import LegendItem from './LegendItem'; import styles from './Legend.css'; function Legend(props) { diff --git a/frontend/src/Calendar/Legend/LegendItem.js b/frontend/src/Calendar/Legend/LegendItem.js index 961f48b86..5da15baba 100644 --- a/frontend/src/Calendar/Legend/LegendItem.js +++ b/frontend/src/Calendar/Legend/LegendItem.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import titleCase from 'Utilities/String/titleCase'; import styles from './LegendItem.css'; diff --git a/frontend/src/Calendar/Options/CalendarOptionsModalContent.js b/frontend/src/Calendar/Options/CalendarOptionsModalContent.js index b137865d7..363709c58 100644 --- a/frontend/src/Calendar/Options/CalendarOptionsModalContent.js +++ b/frontend/src/Calendar/Options/CalendarOptionsModalContent.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import { firstDayOfWeekOptions, weekColumnOptions, timeFormatOptions } from 'Settings/UI/UISettings'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; +import { firstDayOfWeekOptions, timeFormatOptions, weekColumnOptions } from 'Settings/UI/UISettings'; class CalendarOptionsModalContent extends Component { diff --git a/frontend/src/Calendar/Options/CalendarOptionsModalContentConnector.js b/frontend/src/Calendar/Options/CalendarOptionsModalContentConnector.js index eb979f74e..1f517b698 100644 --- a/frontend/src/Calendar/Options/CalendarOptionsModalContentConnector.js +++ b/frontend/src/Calendar/Options/CalendarOptionsModalContentConnector.js @@ -1,8 +1,8 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { setCalendarOption } from 'Store/Actions/calendarActions'; -import CalendarOptionsModalContent from './CalendarOptionsModalContent'; import { saveUISettings } from 'Store/Actions/settingsActions'; +import CalendarOptionsModalContent from './CalendarOptionsModalContent'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/Calendar/iCal/CalendarLinkModalContent.js b/frontend/src/Calendar/iCal/CalendarLinkModalContent.js index ea51f37cf..9b9e767af 100644 --- a/frontend/src/Calendar/iCal/CalendarLinkModalContent.js +++ b/frontend/src/Calendar/iCal/CalendarLinkModalContent.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, inputTypes, kinds, sizes } from 'Helpers/Props'; -import Icon from 'Components/Icon'; -import Button from 'Components/Link/Button'; -import ClipboardButton from 'Components/Link/ClipboardButton'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; import FormInputButton from 'Components/Form/FormInputButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; +import ClipboardButton from 'Components/Link/ClipboardButton'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { icons, inputTypes, kinds, sizes } from 'Helpers/Props'; function getUrls(state) { const { diff --git a/frontend/src/Components/Alert.js b/frontend/src/Components/Alert.js index dc19a418c..10f124c78 100644 --- a/frontend/src/Components/Alert.js +++ b/frontend/src/Components/Alert.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import { kinds } from 'Helpers/Props'; import styles from './Alert.css'; diff --git a/frontend/src/Components/DescriptionList/DescriptionListItem.js b/frontend/src/Components/DescriptionList/DescriptionListItem.js index 4ba70bf33..39f634cc9 100644 --- a/frontend/src/Components/DescriptionList/DescriptionListItem.js +++ b/frontend/src/Components/DescriptionList/DescriptionListItem.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import DescriptionListItemTitle from './DescriptionListItemTitle'; import DescriptionListItemDescription from './DescriptionListItemDescription'; +import DescriptionListItemTitle from './DescriptionListItemTitle'; class DescriptionListItem extends Component { diff --git a/frontend/src/Components/Error/ErrorBoundary.js b/frontend/src/Components/Error/ErrorBoundary.js index 87fb2498a..88412ad19 100644 --- a/frontend/src/Components/Error/ErrorBoundary.js +++ b/frontend/src/Components/Error/ErrorBoundary.js @@ -1,6 +1,6 @@ +import * as sentry from '@sentry/browser'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import * as sentry from '@sentry/browser'; class ErrorBoundary extends Component { diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js index 591dada49..da0657e8e 100644 --- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js +++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import ReactDOM from 'react-dom'; -import { kinds, scrollDirections } from 'Helpers/Props'; import Alert from 'Components/Alert'; +import PathInput from 'Components/Form/PathInput'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import Scroller from 'Components/Scroller/Scroller'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import PathInput from 'Components/Form/PathInput'; +import { kinds, scrollDirections } from 'Helpers/Props'; import FileBrowserRow from './FileBrowserRow'; import styles from './FileBrowserModalContent.css'; diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js b/frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js index da5ae2ab8..1cff6cbc0 100644 --- a/frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js +++ b/frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchPaths, clearPaths } from 'Store/Actions/pathActions'; +import { clearPaths, fetchPaths } from 'Store/Actions/pathActions'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; import FileBrowserModalContent from './FileBrowserModalContent'; diff --git a/frontend/src/Components/FileBrowser/FileBrowserRow.js b/frontend/src/Components/FileBrowser/FileBrowserRow.js index 42ac30405..067e9a1e7 100644 --- a/frontend/src/Components/FileBrowser/FileBrowserRow.js +++ b/frontend/src/Components/FileBrowser/FileBrowserRow.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; -import TableRowButton from 'Components/Table/TableRowButton'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRowButton from 'Components/Table/TableRowButton'; +import { icons } from 'Helpers/Props'; import styles from './FileBrowserRow.css'; function getIconName(type) { diff --git a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js index f0c2d3626..5e813fd11 100644 --- a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js +++ b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import isString from 'Utilities/String/isString'; -import { IN_LAST, IN_NEXT } from 'Helpers/Props/filterTypes'; import NumberInput from 'Components/Form/NumberInput'; import SelectInput from 'Components/Form/SelectInput'; import TextInput from 'Components/Form/TextInput'; +import { IN_LAST, IN_NEXT } from 'Helpers/Props/filterTypes'; +import isString from 'Utilities/String/isString'; import { NAME } from './FilterBuilderRowValue'; import styles from './DateFilterBuilderRowValue.css'; diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js index 165457cde..b1fa35d09 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; import FormInputGroup from 'Components/Form/FormInputGroup'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; import FilterBuilderRow from './FilterBuilderRow'; import styles from './FilterBuilderModalContent.css'; diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js b/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js index c94db9925..17633172b 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { saveCustomFilter, deleteCustomFilter } from 'Store/Actions/customFilterActions'; +import { deleteCustomFilter, saveCustomFilter } from 'Store/Actions/customFilterActions'; import FilterBuilderModalContent from './FilterBuilderModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js index e7f6da3fb..9cc6d0360 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Props'; import SelectInput from 'Components/Form/SelectInput'; import IconButton from 'Components/Link/IconButton'; +import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Props'; import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue'; import DateFilterBuilderRowValue from './DateFilterBuilderRowValue'; import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector'; import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector'; +import MovieStatusFilterBuilderRowValue from './MovieStatusFilterBuilderRowValue'; import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue'; import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector'; import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector'; -import MovieStatusFilterBuilderRowValue from './MovieStatusFilterBuilderRowValue'; import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector'; import styles from './FilterBuilderRow.css'; diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js index d53c07607..0c36e1810 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; +import TagInput from 'Components/Form/TagInput'; +import { filterBuilderTypes, filterBuilderValueTypes, kinds } from 'Helpers/Props'; +import tagShape from 'Helpers/Props/Shapes/tagShape'; import convertToBytes from 'Utilities/Number/convertToBytes'; import formatBytes from 'Utilities/Number/formatBytes'; -import { kinds, filterBuilderTypes, filterBuilderValueTypes } from 'Helpers/Props'; -import tagShape from 'Helpers/Props/Shapes/tagShape'; -import TagInput from 'Components/Form/TagInput'; import FilterBuilderRowValueTag from './FilterBuilderRowValueTag'; export const NAME = 'value'; diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js index c8813284e..9fb05e25e 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; import { filterBuilderTypes } from 'Helpers/Props'; import * as filterTypes from 'Helpers/Props/filterTypes'; +import sortByName from 'Utilities/Array/sortByName'; import FilterBuilderRowValue from './FilterBuilderRowValue'; function createTagListSelector() { diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js index 573e05759..4408c87b3 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import TagInputTag from 'Components/Form/TagInputTag'; +import { kinds } from 'Helpers/Props'; import styles from './FilterBuilderRowValueTag.css'; function FilterBuilderRowValueTag(props) { diff --git a/frontend/src/Components/Filter/Builder/QualityFilterBuilderRowValueConnector.js b/frontend/src/Components/Filter/Builder/QualityFilterBuilderRowValueConnector.js index d0443bf19..bc868cfb0 100644 --- a/frontend/src/Components/Filter/Builder/QualityFilterBuilderRowValueConnector.js +++ b/frontend/src/Components/Filter/Builder/QualityFilterBuilderRowValueConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import getQualities from 'Utilities/Quality/getQualities'; import tagShape from 'Helpers/Props/Shapes/tagShape'; import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; +import getQualities from 'Utilities/Quality/getQualities'; import FilterBuilderRowValue from './FilterBuilderRowValue'; function createMapStateToProps() { diff --git a/frontend/src/Components/Filter/CustomFilters/CustomFilter.js b/frontend/src/Components/Filter/CustomFilters/CustomFilter.js index c9c326d78..66f654026 100644 --- a/frontend/src/Components/Filter/CustomFilters/CustomFilter.js +++ b/frontend/src/Components/Filter/CustomFilters/CustomFilter.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; +import { icons } from 'Helpers/Props'; import styles from './CustomFilter.css'; class CustomFilter extends Component { diff --git a/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js b/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js index ab7c41edd..116bd3e8b 100644 --- a/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js +++ b/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import CustomFilter from './CustomFilter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import translate from 'Utilities/String/translate'; +import CustomFilter from './CustomFilter'; import styles from './CustomFiltersModalContent.css'; function CustomFiltersModalContent(props) { diff --git a/frontend/src/Components/Form/AutoCompleteInput.js b/frontend/src/Components/Form/AutoCompleteInput.js index e19700d08..b12017f8a 100644 --- a/frontend/src/Components/Form/AutoCompleteInput.js +++ b/frontend/src/Components/Form/AutoCompleteInput.js @@ -1,6 +1,6 @@ +import jdu from 'jdu'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import jdu from 'jdu'; import AutoSuggestInput from './AutoSuggestInput'; class AutoCompleteInput extends Component { diff --git a/frontend/src/Components/Form/AutoSuggestInput.js b/frontend/src/Components/Form/AutoSuggestInput.js index dd5833ee0..f6e6c28fd 100644 --- a/frontend/src/Components/Form/AutoSuggestInput.js +++ b/frontend/src/Components/Form/AutoSuggestInput.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import Autosuggest from 'react-autosuggest'; import { Manager, Popper, Reference } from 'react-popper'; -import classNames from 'classnames'; import Portal from 'Components/Portal'; import styles from './AutoSuggestInput.css'; diff --git a/frontend/src/Components/Form/CaptchaInput.js b/frontend/src/Components/Form/CaptchaInput.js index e1a5df458..b422198b5 100644 --- a/frontend/src/Components/Form/CaptchaInput.js +++ b/frontend/src/Components/Form/CaptchaInput.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import ReCAPTCHA from 'react-google-recaptcha'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import FormInputButton from './FormInputButton'; import TextInput from './TextInput'; import styles from './CaptchaInput.css'; diff --git a/frontend/src/Components/Form/CaptchaInputConnector.js b/frontend/src/Components/Form/CaptchaInputConnector.js index 17b875c88..d29c33757 100644 --- a/frontend/src/Components/Form/CaptchaInputConnector.js +++ b/frontend/src/Components/Form/CaptchaInputConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { refreshCaptcha, getCaptchaCookie, resetCaptcha } from 'Store/Actions/captchaActions'; +import { getCaptchaCookie, refreshCaptcha, resetCaptcha } from 'Store/Actions/captchaActions'; import CaptchaInput from './CaptchaInput'; function createMapStateToProps() { diff --git a/frontend/src/Components/Form/CheckInput.js b/frontend/src/Components/Form/CheckInput.js index 134290111..f3769a420 100644 --- a/frontend/src/Components/Form/CheckInput.js +++ b/frontend/src/Components/Form/CheckInput.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons, kinds } from 'Helpers/Props'; import FormInputHelpText from './FormInputHelpText'; import styles from './CheckInput.css'; diff --git a/frontend/src/Components/Form/DeviceInput.js b/frontend/src/Components/Form/DeviceInput.js index f77c7cf29..cb250c3d1 100644 --- a/frontend/src/Components/Form/DeviceInput.js +++ b/frontend/src/Components/Form/DeviceInput.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; +import Icon from 'Components/Icon'; import { icons } from 'Helpers/Props'; import tagShape from 'Helpers/Props/Shapes/tagShape'; -import Icon from 'Components/Icon'; import FormInputButton from './FormInputButton'; import TagInput from './TagInput'; import styles from './DeviceInput.css'; diff --git a/frontend/src/Components/Form/DeviceInputConnector.js b/frontend/src/Components/Form/DeviceInputConnector.js index 43e313826..8fa9d41c3 100644 --- a/frontend/src/Components/Form/DeviceInputConnector.js +++ b/frontend/src/Components/Form/DeviceInputConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchOptions, clearOptions } from 'Store/Actions/providerOptionActions'; +import { clearOptions, fetchOptions } from 'Store/Actions/providerOptionActions'; import DeviceInput from './DeviceInput'; function createMapStateToProps() { diff --git a/frontend/src/Components/Form/EnhancedSelectInput.js b/frontend/src/Components/Form/EnhancedSelectInput.js index 6c50c1c82..0c5a866f6 100644 --- a/frontend/src/Components/Form/EnhancedSelectInput.js +++ b/frontend/src/Components/Form/EnhancedSelectInput.js @@ -1,21 +1,21 @@ +import classNames from 'classnames'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Manager, Popper, Reference } from 'react-popper'; -import classNames from 'classnames'; -import getUniqueElememtId from 'Utilities/getUniqueElementId'; -import { isMobile as isMobileUtil } from 'Utilities/mobile'; -import * as keyCodes from 'Utilities/Constants/keyCodes'; -import { icons, sizes, scrollDirections } from 'Helpers/Props'; import Icon from 'Components/Icon'; -import Portal from 'Components/Portal'; import Link from 'Components/Link/Link'; import Measure from 'Components/Measure'; import Modal from 'Components/Modal/Modal'; import ModalBody from 'Components/Modal/ModalBody'; +import Portal from 'Components/Portal'; import Scroller from 'Components/Scroller/Scroller'; -import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue'; +import { icons, scrollDirections, sizes } from 'Helpers/Props'; +import * as keyCodes from 'Utilities/Constants/keyCodes'; +import getUniqueElememtId from 'Utilities/getUniqueElementId'; +import { isMobile as isMobileUtil } from 'Utilities/mobile'; import HintedSelectInputOption from './HintedSelectInputOption'; +import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue'; import styles from './EnhancedSelectInput.css'; function isArrowKey(keyCode) { diff --git a/frontend/src/Components/Form/EnhancedSelectInputOption.js b/frontend/src/Components/Form/EnhancedSelectInputOption.js index aa2911f85..ea725fba6 100644 --- a/frontend/src/Components/Form/EnhancedSelectInputOption.js +++ b/frontend/src/Components/Form/EnhancedSelectInputOption.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; import styles from './EnhancedSelectInputOption.css'; class EnhancedSelectInputOption extends Component { diff --git a/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.js b/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.js index c40ee93c1..21ddebb02 100644 --- a/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.js +++ b/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import styles from './EnhancedSelectInputSelectedValue.css'; function EnhancedSelectInputSelectedValue(props) { diff --git a/frontend/src/Components/Form/Form.js b/frontend/src/Components/Form/Form.js index c2c67eddf..859911a8b 100644 --- a/frontend/src/Components/Form/Form.js +++ b/frontend/src/Components/Form/Form.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; +import { kinds } from 'Helpers/Props'; import styles from './Form.css'; function Form({ children, validationErrors, validationWarnings, ...otherProps }) { diff --git a/frontend/src/Components/Form/FormGroup.js b/frontend/src/Components/Form/FormGroup.js index d2e04c350..f538daa2f 100644 --- a/frontend/src/Components/Form/FormGroup.js +++ b/frontend/src/Components/Form/FormGroup.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import { map } from 'Helpers/elementChildren'; import { sizes } from 'Helpers/Props'; import styles from './FormGroup.css'; diff --git a/frontend/src/Components/Form/FormInputButton.js b/frontend/src/Components/Form/FormInputButton.js index 4b6491663..a7145363a 100644 --- a/frontend/src/Components/Form/FormInputButton.js +++ b/frontend/src/Components/Form/FormInputButton.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; import { kinds } from 'Helpers/Props'; diff --git a/frontend/src/Components/Form/FormInputGroup.js b/frontend/src/Components/Form/FormInputGroup.js index 4c8f8190d..838278709 100644 --- a/frontend/src/Components/Form/FormInputGroup.js +++ b/frontend/src/Components/Form/FormInputGroup.js @@ -1,27 +1,27 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; import Link from 'Components/Link/Link'; +import { inputTypes } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AutoCompleteInput from './AutoCompleteInput'; import AvailabilitySelectInput from './AvailabilitySelectInput'; import CaptchaInputConnector from './CaptchaInputConnector'; import CheckInput from './CheckInput'; import DeviceInputConnector from './DeviceInputConnector'; +import EnhancedSelectInput from './EnhancedSelectInput'; +import FormInputHelpText from './FormInputHelpText'; import KeyValueListInput from './KeyValueListInput'; +import MovieMonitoredSelectInput from './MovieMonitoredSelectInput'; import NumberInput from './NumberInput'; import OAuthInputConnector from './OAuthInputConnector'; import PasswordInput from './PasswordInput'; import PathInputConnector from './PathInputConnector'; import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector'; import RootFolderSelectInputConnector from './RootFolderSelectInputConnector'; -import MovieMonitoredSelectInput from './MovieMonitoredSelectInput'; -import EnhancedSelectInput from './EnhancedSelectInput'; import TagInputConnector from './TagInputConnector'; import TagSelectInputConnector from './TagSelectInputConnector'; -import TextTagInputConnector from './TextTagInputConnector'; import TextInput from './TextInput'; -import FormInputHelpText from './FormInputHelpText'; -import translate from 'Utilities/String/translate'; +import TextTagInputConnector from './TextTagInputConnector'; import styles from './FormInputGroup.css'; function getComponent(type) { diff --git a/frontend/src/Components/Form/FormInputHelpText.js b/frontend/src/Components/Form/FormInputHelpText.js index d9195568b..f562af8ee 100644 --- a/frontend/src/Components/Form/FormInputHelpText.js +++ b/frontend/src/Components/Form/FormInputHelpText.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; import styles from './FormInputHelpText.css'; function FormInputHelpText(props) { diff --git a/frontend/src/Components/Form/FormLabel.js b/frontend/src/Components/Form/FormLabel.js index da7a443e3..d419039b3 100644 --- a/frontend/src/Components/Form/FormLabel.js +++ b/frontend/src/Components/Form/FormLabel.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import { sizes } from 'Helpers/Props'; import styles from './FormLabel.css'; diff --git a/frontend/src/Components/Form/HintedSelectInputOption.js b/frontend/src/Components/Form/HintedSelectInputOption.js index 5ccc48a13..73ac50a60 100644 --- a/frontend/src/Components/Form/HintedSelectInputOption.js +++ b/frontend/src/Components/Form/HintedSelectInputOption.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import EnhancedSelectInputOption from './EnhancedSelectInputOption'; import styles from './HintedSelectInputOption.css'; diff --git a/frontend/src/Components/Form/KeyValueListInput.js b/frontend/src/Components/Form/KeyValueListInput.js index a52c76f70..1b7f06049 100644 --- a/frontend/src/Components/Form/KeyValueListInput.js +++ b/frontend/src/Components/Form/KeyValueListInput.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import KeyValueListInputItem from './KeyValueListInputItem'; import styles from './KeyValueListInput.css'; diff --git a/frontend/src/Components/Form/KeyValueListInputItem.js b/frontend/src/Components/Form/KeyValueListInputItem.js index f6b82ed0f..cf20bb547 100644 --- a/frontend/src/Components/Form/KeyValueListInputItem.js +++ b/frontend/src/Components/Form/KeyValueListInputItem.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; +import { icons } from 'Helpers/Props'; import TextInput from './TextInput'; import styles from './KeyValueListInputItem.css'; diff --git a/frontend/src/Components/Form/OAuthInput.js b/frontend/src/Components/Form/OAuthInput.js index 00825b6ba..4ecd625bc 100644 --- a/frontend/src/Components/Form/OAuthInput.js +++ b/frontend/src/Components/Form/OAuthInput.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; +import { kinds } from 'Helpers/Props'; function OAuthInput(props) { const { diff --git a/frontend/src/Components/Form/OAuthInputConnector.js b/frontend/src/Components/Form/OAuthInputConnector.js index 7568aae7a..ff9edfa7d 100644 --- a/frontend/src/Components/Form/OAuthInputConnector.js +++ b/frontend/src/Components/Form/OAuthInputConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { startOAuth, resetOAuth } from 'Store/Actions/oAuthActions'; +import { resetOAuth, startOAuth } from 'Store/Actions/oAuthActions'; import OAuthInput from './OAuthInput'; function createMapStateToProps() { diff --git a/frontend/src/Components/Form/PathInput.js b/frontend/src/Components/Form/PathInput.js index 40c4840ba..5e4e61879 100644 --- a/frontend/src/Components/Form/PathInput.js +++ b/frontend/src/Components/Form/PathInput.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import Icon from 'Components/Icon'; import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal'; +import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import AutoSuggestInput from './AutoSuggestInput'; import FormInputButton from './FormInputButton'; import styles from './PathInput.css'; diff --git a/frontend/src/Components/Form/PathInputConnector.js b/frontend/src/Components/Form/PathInputConnector.js index 38ea37065..9e72f5c70 100644 --- a/frontend/src/Components/Form/PathInputConnector.js +++ b/frontend/src/Components/Form/PathInputConnector.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchPaths, clearPaths } from 'Store/Actions/pathActions'; +import { clearPaths, fetchPaths } from 'Store/Actions/pathActions'; import PathInput from './PathInput'; function createMapStateToProps() { diff --git a/frontend/src/Components/Form/ProviderFieldFormGroup.js b/frontend/src/Components/Form/ProviderFieldFormGroup.js index 9cdbe69f9..d0ea9916e 100644 --- a/frontend/src/Components/Form/ProviderFieldFormGroup.js +++ b/frontend/src/Components/Form/ProviderFieldFormGroup.js @@ -1,10 +1,10 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes } from 'Helpers/Props'; function getType(type) { switch (type) { diff --git a/frontend/src/Components/Form/QualityProfileSelectInputConnector.js b/frontend/src/Components/Form/QualityProfileSelectInputConnector.js index 7499b178a..ec0d9ba50 100644 --- a/frontend/src/Components/Form/QualityProfileSelectInputConnector.js +++ b/frontend/src/Components/Form/QualityProfileSelectInputConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; +import sortByName from 'Utilities/Array/sortByName'; import SelectInput from './SelectInput'; function createMapStateToProps() { diff --git a/frontend/src/Components/Form/RootFolderSelectInputOption.js b/frontend/src/Components/Form/RootFolderSelectInputOption.js index 40608d9de..58d0c0a28 100644 --- a/frontend/src/Components/Form/RootFolderSelectInputOption.js +++ b/frontend/src/Components/Form/RootFolderSelectInputOption.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import formatBytes from 'Utilities/Number/formatBytes'; import EnhancedSelectInputOption from './EnhancedSelectInputOption'; import styles from './RootFolderSelectInputOption.css'; diff --git a/frontend/src/Components/Form/SelectInput.js b/frontend/src/Components/Form/SelectInput.js index 113d50a09..8cd0fcee3 100644 --- a/frontend/src/Components/Form/SelectInput.js +++ b/frontend/src/Components/Form/SelectInput.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import styles from './SelectInput.css'; class SelectInput extends Component { diff --git a/frontend/src/Components/Form/TagInput.js b/frontend/src/Components/Form/TagInput.js index 84cf7ef00..7c0e9ae73 100644 --- a/frontend/src/Components/Form/TagInput.js +++ b/frontend/src/Components/Form/TagInput.js @@ -1,7 +1,7 @@ +import classNames from 'classnames'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import { kinds } from 'Helpers/Props'; import tagShape from 'Helpers/Props/Shapes/tagShape'; import AutoSuggestInput from './AutoSuggestInput'; diff --git a/frontend/src/Components/Form/TagInputTag.js b/frontend/src/Components/Form/TagInputTag.js index f5935ad7b..d7b906ce3 100644 --- a/frontend/src/Components/Form/TagInputTag.js +++ b/frontend/src/Components/Form/TagInputTag.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; -import tagShape from 'Helpers/Props/Shapes/tagShape'; import Label from 'Components/Label'; import Link from 'Components/Link/Link'; +import { kinds } from 'Helpers/Props'; +import tagShape from 'Helpers/Props/Shapes/tagShape'; import styles from './TagInputTag.css'; class TagInputTag extends Component { diff --git a/frontend/src/Components/Form/TextInput.js b/frontend/src/Components/Form/TextInput.js index cc0cbca02..a6a2dcb04 100644 --- a/frontend/src/Components/Form/TextInput.js +++ b/frontend/src/Components/Form/TextInput.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import styles from './TextInput.css'; class TextInput extends Component { diff --git a/frontend/src/Components/HeartRating.js b/frontend/src/Components/HeartRating.js index 98c3f817e..c1a4f14ff 100644 --- a/frontend/src/Components/HeartRating.js +++ b/frontend/src/Components/HeartRating.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import styles from './HeartRating.css'; function HeartRating({ rating, iconSize }) { diff --git a/frontend/src/Components/Icon.js b/frontend/src/Components/Icon.js index d7748d2e7..e8c7c5178 100644 --- a/frontend/src/Components/Icon.js +++ b/frontend/src/Components/Icon.js @@ -1,8 +1,8 @@ +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { PureComponent } from 'react'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { kinds } from 'Helpers/Props'; -import classNames from 'classnames'; import styles from './Icon.css'; class Icon extends PureComponent { diff --git a/frontend/src/Components/InfoLabel.js b/frontend/src/Components/InfoLabel.js index 0ded28d84..c2d0bbf9c 100644 --- a/frontend/src/Components/InfoLabel.js +++ b/frontend/src/Components/InfoLabel.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import { kinds, sizes } from 'Helpers/Props'; import styles from './InfoLabel.css'; diff --git a/frontend/src/Components/Label.js b/frontend/src/Components/Label.js index 528974204..6f662ec7d 100644 --- a/frontend/src/Components/Label.js +++ b/frontend/src/Components/Label.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import { kinds, sizes } from 'Helpers/Props'; import styles from './Label.css'; diff --git a/frontend/src/Components/Link/Button.js b/frontend/src/Components/Link/Button.js index 87d9fff78..cbe4691d4 100644 --- a/frontend/src/Components/Link/Button.js +++ b/frontend/src/Components/Link/Button.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import { align, kinds, sizes } from 'Helpers/Props'; import Link from './Link'; import styles from './Button.css'; diff --git a/frontend/src/Components/Link/ClipboardButton.js b/frontend/src/Components/Link/ClipboardButton.js index 54789de52..b85ab8af1 100644 --- a/frontend/src/Components/Link/ClipboardButton.js +++ b/frontend/src/Components/Link/ClipboardButton.js @@ -1,10 +1,10 @@ +import Clipboard from 'clipboard'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import Clipboard from 'clipboard'; +import FormInputButton from 'Components/Form/FormInputButton'; +import Icon from 'Components/Icon'; import { icons, kinds } from 'Helpers/Props'; import getUniqueElememtId from 'Utilities/getUniqueElementId'; -import Icon from 'Components/Icon'; -import FormInputButton from 'Components/Form/FormInputButton'; import styles from './ClipboardButton.css'; class ClipboardButton extends Component { diff --git a/frontend/src/Components/Link/IconButton.js b/frontend/src/Components/Link/IconButton.js index 26aacb0bf..1e49e0057 100644 --- a/frontend/src/Components/Link/IconButton.js +++ b/frontend/src/Components/Link/IconButton.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; import Icon from 'Components/Icon'; import Link from './Link'; import styles from './IconButton.css'; diff --git a/frontend/src/Components/Link/Link.js b/frontend/src/Components/Link/Link.js index 0236d2f64..86f8b17a6 100644 --- a/frontend/src/Components/Link/Link.js +++ b/frontend/src/Components/Link/Link.js @@ -1,7 +1,7 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Link as RouterLink } from 'react-router-dom'; -import classNames from 'classnames'; import styles from './Link.css'; class Link extends Component { diff --git a/frontend/src/Components/Link/SpinnerButton.js b/frontend/src/Components/Link/SpinnerButton.js index 1507220d6..a55455172 100644 --- a/frontend/src/Components/Link/SpinnerButton.js +++ b/frontend/src/Components/Link/SpinnerButton.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import Button from './Button'; import styles from './SpinnerButton.css'; diff --git a/frontend/src/Components/Link/SpinnerErrorButton.js b/frontend/src/Components/Link/SpinnerErrorButton.js index 0575db094..b83210c76 100644 --- a/frontend/src/Components/Link/SpinnerErrorButton.js +++ b/frontend/src/Components/Link/SpinnerErrorButton.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import SpinnerButton from 'Components/Link/SpinnerButton'; +import { icons, kinds } from 'Helpers/Props'; import styles from './SpinnerErrorButton.css'; function getTestResult(error) { diff --git a/frontend/src/Components/Marquee.js b/frontend/src/Components/Marquee.js index 25e72ba9e..ffe4da48a 100644 --- a/frontend/src/Components/Marquee.js +++ b/frontend/src/Components/Marquee.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; import PropTypes from 'prop-types'; +import React, { Component } from 'react'; const FPS = 20; const STEP = 1; diff --git a/frontend/src/Components/Menu/FilterMenu.js b/frontend/src/Components/Menu/FilterMenu.js index 550d48468..5238fd6c6 100644 --- a/frontend/src/Components/Menu/FilterMenu.js +++ b/frontend/src/Components/Menu/FilterMenu.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import FilterMenuContent from './FilterMenuContent'; import Menu from './Menu'; import ToolbarMenuButton from './ToolbarMenuButton'; -import translate from 'Utilities/String/translate'; import styles from './FilterMenu.css'; class FilterMenu extends Component { diff --git a/frontend/src/Components/Menu/FilterMenuContent.js b/frontend/src/Components/Menu/FilterMenuContent.js index 71107c5e4..1fdb2476f 100644 --- a/frontend/src/Components/Menu/FilterMenuContent.js +++ b/frontend/src/Components/Menu/FilterMenuContent.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import MenuContent from './MenuContent'; +import translate from 'Utilities/String/translate'; import FilterMenuItem from './FilterMenuItem'; +import MenuContent from './MenuContent'; import MenuItem from './MenuItem'; import MenuItemSeparator from './MenuItemSeparator'; -import translate from 'Utilities/String/translate'; class FilterMenuContent extends Component { diff --git a/frontend/src/Components/Menu/Menu.js b/frontend/src/Components/Menu/Menu.js index fadbcc69e..4cf21f0d9 100644 --- a/frontend/src/Components/Menu/Menu.js +++ b/frontend/src/Components/Menu/Menu.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Manager, Popper, Reference } from 'react-popper'; -import getUniqueElememtId from 'Utilities/getUniqueElementId'; -import { align } from 'Helpers/Props'; import Portal from 'Components/Portal'; +import { align } from 'Helpers/Props'; +import getUniqueElememtId from 'Utilities/getUniqueElementId'; import styles from './Menu.css'; const sharedPopperOptions = { diff --git a/frontend/src/Components/Menu/MenuButton.js b/frontend/src/Components/Menu/MenuButton.js index 477334a1d..fb091eca1 100644 --- a/frontend/src/Components/Menu/MenuButton.js +++ b/frontend/src/Components/Menu/MenuButton.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import Link from 'Components/Link/Link'; import styles from './MenuButton.css'; diff --git a/frontend/src/Components/Menu/MenuContent.js b/frontend/src/Components/Menu/MenuContent.js index 875bc0257..82d52f379 100644 --- a/frontend/src/Components/Menu/MenuContent.js +++ b/frontend/src/Components/Menu/MenuContent.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getUniqueElementId from 'Utilities/getUniqueElementId'; import Scroller from 'Components/Scroller/Scroller'; +import getUniqueElementId from 'Utilities/getUniqueElementId'; import styles from './MenuContent.css'; class MenuContent extends Component { diff --git a/frontend/src/Components/Menu/MenuItem.js b/frontend/src/Components/Menu/MenuItem.js index fb1c1d4ec..15a4dd145 100644 --- a/frontend/src/Components/Menu/MenuItem.js +++ b/frontend/src/Components/Menu/MenuItem.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import Link from 'Components/Link/Link'; import styles from './MenuItem.css'; diff --git a/frontend/src/Components/Menu/SelectedMenuItem.js b/frontend/src/Components/Menu/SelectedMenuItem.js index 8b0805c57..325b4a134 100644 --- a/frontend/src/Components/Menu/SelectedMenuItem.js +++ b/frontend/src/Components/Menu/SelectedMenuItem.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import MenuItem from './MenuItem'; import styles from './SelectedMenuItem.css'; diff --git a/frontend/src/Components/Menu/SortMenu.js b/frontend/src/Components/Menu/SortMenu.js index d40b796fd..96d3e7507 100644 --- a/frontend/src/Components/Menu/SortMenu.js +++ b/frontend/src/Components/Menu/SortMenu.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Menu from 'Components/Menu/Menu'; import ToolbarMenuButton from 'Components/Menu/ToolbarMenuButton'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function SortMenu(props) { diff --git a/frontend/src/Components/Menu/ToolbarMenuButton.js b/frontend/src/Components/Menu/ToolbarMenuButton.js index e67196ac7..4bd4d6e33 100644 --- a/frontend/src/Components/Menu/ToolbarMenuButton.js +++ b/frontend/src/Components/Menu/ToolbarMenuButton.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import MenuButton from 'Components/Menu/MenuButton'; +import { icons } from 'Helpers/Props'; import styles from './ToolbarMenuButton.css'; function ToolbarMenuButton(props) { diff --git a/frontend/src/Components/Menu/ViewMenu.js b/frontend/src/Components/Menu/ViewMenu.js index 608d88061..989ebb170 100644 --- a/frontend/src/Components/Menu/ViewMenu.js +++ b/frontend/src/Components/Menu/ViewMenu.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Menu from 'Components/Menu/Menu'; import ToolbarMenuButton from 'Components/Menu/ToolbarMenuButton'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function ViewMenu(props) { diff --git a/frontend/src/Components/Modal/ConfirmModal.js b/frontend/src/Components/Modal/ConfirmModal.js index bd80ce7b8..86d002b55 100644 --- a/frontend/src/Components/Modal/ConfirmModal.js +++ b/frontend/src/Components/Modal/ConfirmModal.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { useEffect } from 'react'; -import { kinds, sizes } from 'Helpers/Props'; import keyboardShortcuts from 'Components/keyboardShortcuts'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds, sizes } from 'Helpers/Props'; function ConfirmModal(props) { const { diff --git a/frontend/src/Components/Modal/Modal.js b/frontend/src/Components/Modal/Modal.js index bb0f6c199..0ba1690ff 100644 --- a/frontend/src/Components/Modal/Modal.js +++ b/frontend/src/Components/Modal/Modal.js @@ -1,15 +1,15 @@ +import classNames from 'classnames'; +import elementClass from 'element-class'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import ReactDOM from 'react-dom'; import FocusLock from 'react-focus-lock'; -import classNames from 'classnames'; -import elementClass from 'element-class'; +import ErrorBoundary from 'Components/Error/ErrorBoundary'; +import { sizes } from 'Helpers/Props'; +import * as keyCodes from 'Utilities/Constants/keyCodes'; import getUniqueElememtId from 'Utilities/getUniqueElementId'; import { isIOS } from 'Utilities/mobile'; import { setScrollLock } from 'Utilities/scrollLock'; -import * as keyCodes from 'Utilities/Constants/keyCodes'; -import { sizes } from 'Helpers/Props'; -import ErrorBoundary from 'Components/Error/ErrorBoundary'; import ModalError from './ModalError'; import styles from './Modal.css'; diff --git a/frontend/src/Components/Modal/ModalBody.js b/frontend/src/Components/Modal/ModalBody.js index 6edde4790..268f16cbe 100644 --- a/frontend/src/Components/Modal/ModalBody.js +++ b/frontend/src/Components/Modal/ModalBody.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { scrollDirections } from 'Helpers/Props'; import Scroller from 'Components/Scroller/Scroller'; +import { scrollDirections } from 'Helpers/Props'; import styles from './ModalBody.css'; class ModalBody extends Component { diff --git a/frontend/src/Components/Modal/ModalContent.js b/frontend/src/Components/Modal/ModalContent.js index 655046fe4..8883bf2b9 100644 --- a/frontend/src/Components/Modal/ModalContent.js +++ b/frontend/src/Components/Modal/ModalContent.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; -import Link from 'Components/Link/Link'; import Icon from 'Components/Icon'; +import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; import styles from './ModalContent.css'; function ModalContent(props) { diff --git a/frontend/src/Components/Modal/ModalError.js b/frontend/src/Components/Modal/ModalError.js index df99a5b32..af8ea1a87 100644 --- a/frontend/src/Components/Modal/ModalError.js +++ b/frontend/src/Components/Modal/ModalError.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React from 'react'; import ErrorBoundaryError from 'Components/Error/ErrorBoundaryError'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import styles from './ModalError.css'; function ModalError(props) { diff --git a/frontend/src/Components/MonitorToggleButton.js b/frontend/src/Components/MonitorToggleButton.js index 37756e3bc..001603937 100644 --- a/frontend/src/Components/MonitorToggleButton.js +++ b/frontend/src/Components/MonitorToggleButton.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; +import { icons } from 'Helpers/Props'; import styles from './MonitorToggleButton.css'; function getTooltip(monitored, isDisabled) { diff --git a/frontend/src/Components/Page/Header/KeyboardShortcutsModal.js b/frontend/src/Components/Page/Header/KeyboardShortcutsModal.js index a1d106b58..2e2e7331a 100644 --- a/frontend/src/Components/Page/Header/KeyboardShortcutsModal.js +++ b/frontend/src/Components/Page/Header/KeyboardShortcutsModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import KeyboardShortcutsModalContentConnector from './KeyboardShortcutsModalContentConnector'; function KeyboardShortcutsModal(props) { diff --git a/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.js b/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.js index 9c07e047c..e1a0e19e7 100644 --- a/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.js +++ b/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React from 'react'; import { shortcuts } from 'Components/keyboardShortcuts'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import styles from './KeyboardShortcutsModalContent.css'; function getShortcuts() { diff --git a/frontend/src/Components/Page/Header/MovieSearchInput.js b/frontend/src/Components/Page/Header/MovieSearchInput.js index 2a9f91f43..a304d3a28 100644 --- a/frontend/src/Components/Page/Header/MovieSearchInput.js +++ b/frontend/src/Components/Page/Header/MovieSearchInput.js @@ -2,13 +2,13 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import Autosuggest from 'react-autosuggest'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import keyboardShortcuts, { shortcuts } from 'Components/keyboardShortcuts'; -import MovieSearchResult from './MovieSearchResult'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import FuseWorker from './fuse.worker'; +import MovieSearchResult from './MovieSearchResult'; import styles from './MovieSearchInput.css'; const LOADING_TYPE = 'suggestionsLoading'; diff --git a/frontend/src/Components/Page/Header/MovieSearchInputConnector.js b/frontend/src/Components/Page/Header/MovieSearchInputConnector.js index 569e91ed9..f470394c4 100644 --- a/frontend/src/Components/Page/Header/MovieSearchInputConnector.js +++ b/frontend/src/Components/Page/Header/MovieSearchInputConnector.js @@ -1,5 +1,5 @@ -import { connect } from 'react-redux'; import { push } from 'connected-react-router'; +import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import createDeepEqualSelector from 'Store/Selectors/createDeepEqualSelector'; diff --git a/frontend/src/Components/Page/Header/MovieSearchResult.js b/frontend/src/Components/Page/Header/MovieSearchResult.js index b8d7dbcaa..099a0a69e 100644 --- a/frontend/src/Components/Page/Header/MovieSearchResult.js +++ b/frontend/src/Components/Page/Header/MovieSearchResult.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; import MoviePoster from 'Movie/MoviePoster'; import styles from './MovieSearchResult.css'; diff --git a/frontend/src/Components/Page/Header/PageHeader.js b/frontend/src/Components/Page/Header/PageHeader.js index 9c0a50d83..756c50f0a 100644 --- a/frontend/src/Components/Page/Header/PageHeader.js +++ b/frontend/src/Components/Page/Header/PageHeader.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import keyboardShortcuts, { shortcuts } from 'Components/keyboardShortcuts'; import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; +import KeyboardShortcutsModal from './KeyboardShortcutsModal'; import MovieSearchInputConnector from './MovieSearchInputConnector'; import PageHeaderActionsMenuConnector from './PageHeaderActionsMenuConnector'; -import KeyboardShortcutsModal from './KeyboardShortcutsModal'; import styles from './PageHeader.css'; class PageHeader extends Component { diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js index 8ad7c8409..d03fb8d79 100644 --- a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js +++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align, icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Menu from 'Components/Menu/Menu'; import MenuButton from 'Components/Menu/MenuButton'; import MenuContent from 'Components/Menu/MenuContent'; import MenuItem from 'Components/Menu/MenuItem'; import MenuItemSeparator from 'Components/Menu/MenuItemSeparator'; +import { align, icons, kinds } from 'Helpers/Props'; import styles from './PageHeaderActionsMenu.css'; function PageHeaderActionsMenu(props) { diff --git a/frontend/src/Components/Page/Page.js b/frontend/src/Components/Page/Page.js index 2bb59c532..e0ad15203 100644 --- a/frontend/src/Components/Page/Page.js +++ b/frontend/src/Components/Page/Page.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import locationShape from 'Helpers/Props/Shapes/locationShape'; -import SignalRConnector from 'Components/SignalRConnector'; +import AppUpdatedModalConnector from 'App/AppUpdatedModalConnector'; import ColorImpairedContext from 'App/ColorImpairedContext'; import ConnectionLostModalConnector from 'App/ConnectionLostModalConnector'; -import AppUpdatedModalConnector from 'App/AppUpdatedModalConnector'; +import SignalRConnector from 'Components/SignalRConnector'; +import locationShape from 'Helpers/Props/Shapes/locationShape'; import PageHeader from './Header/PageHeader'; import PageSidebar from './Sidebar/PageSidebar'; import styles from './Page.css'; diff --git a/frontend/src/Components/Page/PageConnector.js b/frontend/src/Components/Page/PageConnector.js index a75370d12..67c4a9053 100644 --- a/frontend/src/Components/Page/PageConnector.js +++ b/frontend/src/Components/Page/PageConnector.js @@ -3,13 +3,13 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; import { createSelector } from 'reselect'; -import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions'; import { fetchCustomFilters } from 'Store/Actions/customFilterActions'; import { fetchMovies } from 'Store/Actions/movieActions'; -import { fetchTags } from 'Store/Actions/tagActions'; -import { fetchQualityProfiles, fetchUISettings, fetchLanguages, fetchNetImports } from 'Store/Actions/settingsActions'; +import { fetchLanguages, fetchNetImports, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions'; import { fetchStatus } from 'Store/Actions/systemActions'; +import { fetchTags } from 'Store/Actions/tagActions'; +import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import ErrorPage from './ErrorPage'; import LoadingPage from './LoadingPage'; import Page from './Page'; diff --git a/frontend/src/Components/Page/PageContentBody.js b/frontend/src/Components/Page/PageContentBody.js index 7f4b3a171..5e238ae79 100644 --- a/frontend/src/Components/Page/PageContentBody.js +++ b/frontend/src/Components/Page/PageContentBody.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { isMobile as isMobileUtil } from 'Utilities/mobile'; -import { isLocked } from 'Utilities/scrollLock'; -import { scrollDirections } from 'Helpers/Props'; import OverlayScroller from 'Components/Scroller/OverlayScroller'; import Scroller from 'Components/Scroller/Scroller'; +import { scrollDirections } from 'Helpers/Props'; +import { isMobile as isMobileUtil } from 'Utilities/mobile'; +import { isLocked } from 'Utilities/scrollLock'; import styles from './PageContentBody.css'; class PageContentBody extends Component { diff --git a/frontend/src/Components/Page/PageJumpBar.js b/frontend/src/Components/Page/PageJumpBar.js index 4b73ad4cb..bdf7dc28f 100644 --- a/frontend/src/Components/Page/PageJumpBar.js +++ b/frontend/src/Components/Page/PageJumpBar.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; +import dimensions from 'Styles/Variables/dimensions'; import PageJumpBarItem from './PageJumpBarItem'; import styles from './PageJumpBar.css'; diff --git a/frontend/src/Components/Page/Sidebar/Messages/Message.js b/frontend/src/Components/Page/Sidebar/Messages/Message.js index a28a28019..be626c582 100644 --- a/frontend/src/Components/Page/Sidebar/Messages/Message.js +++ b/frontend/src/Components/Page/Sidebar/Messages/Message.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import styles from './Message.css'; function getIconName(name) { diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js index 0ccad1420..4762e2828 100644 --- a/frontend/src/Components/Page/Sidebar/PageSidebar.js +++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js @@ -1,16 +1,16 @@ +import classNames from 'classnames'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import ReactDOM from 'react-dom'; -import classNames from 'classnames'; +import QueueStatusConnector from 'Activity/Queue/Status/QueueStatusConnector'; +import OverlayScroller from 'Components/Scroller/OverlayScroller'; +import Scroller from 'Components/Scroller/Scroller'; import { icons } from 'Helpers/Props'; import locationShape from 'Helpers/Props/Shapes/locationShape'; import dimensions from 'Styles/Variables/dimensions'; -import OverlayScroller from 'Components/Scroller/OverlayScroller'; -import Scroller from 'Components/Scroller/Scroller'; -import translate from 'Utilities/String/translate'; -import QueueStatusConnector from 'Activity/Queue/Status/QueueStatusConnector'; import HealthStatusConnector from 'System/Status/Health/HealthStatusConnector'; +import translate from 'Utilities/String/translate'; import MessagesConnector from './Messages/MessagesConnector'; import PageSidebarItem from './PageSidebarItem'; import styles from './PageSidebar.css'; diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarItem.js b/frontend/src/Components/Page/Sidebar/PageSidebarItem.js index 0bcc28cde..59b95e524 100644 --- a/frontend/src/Components/Page/Sidebar/PageSidebarItem.js +++ b/frontend/src/Components/Page/Sidebar/PageSidebarItem.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { map } from 'Helpers/elementChildren'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { map } from 'Helpers/elementChildren'; import styles from './PageSidebarItem.css'; class PageSidebarItem extends Component { diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarStatus.js b/frontend/src/Components/Page/Sidebar/PageSidebarStatus.js index c1ea615ed..14ece5127 100644 --- a/frontend/src/Components/Page/Sidebar/PageSidebarStatus.js +++ b/frontend/src/Components/Page/Sidebar/PageSidebarStatus.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds, sizes } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds, sizes } from 'Helpers/Props'; function PageSidebarStatus({ count, errors, warnings }) { if (!count) { diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarButton.js b/frontend/src/Components/Page/Toolbar/PageToolbarButton.js index 381046bf5..2d179396a 100644 --- a/frontend/src/Components/Page/Toolbar/PageToolbarButton.js +++ b/frontend/src/Components/Page/Toolbar/PageToolbarButton.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; import styles from './PageToolbarButton.css'; function PageToolbarButton(props) { diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarSection.js b/frontend/src/Components/Page/Toolbar/PageToolbarSection.js index 2e3d291fe..c35383c9d 100644 --- a/frontend/src/Components/Page/Toolbar/PageToolbarSection.js +++ b/frontend/src/Components/Page/Toolbar/PageToolbarSection.js @@ -1,15 +1,15 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { forEach } from 'Helpers/elementChildren'; -import { align, icons } from 'Helpers/Props'; -import dimensions from 'Styles/Variables/dimensions'; -import SpinnerIcon from 'Components/SpinnerIcon'; import Measure from 'Components/Measure'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; import MenuItem from 'Components/Menu/MenuItem'; import ToolbarMenuButton from 'Components/Menu/ToolbarMenuButton'; +import SpinnerIcon from 'Components/SpinnerIcon'; +import { forEach } from 'Helpers/elementChildren'; +import { align, icons } from 'Helpers/Props'; +import dimensions from 'Styles/Variables/dimensions'; import styles from './PageToolbarSection.css'; const BUTTON_WIDTH = parseInt(dimensions.toolbarButtonWidth); diff --git a/frontend/src/Components/ProgressBar.js b/frontend/src/Components/ProgressBar.js index 3c16792fa..b97d8d577 100644 --- a/frontend/src/Components/ProgressBar.js +++ b/frontend/src/Components/ProgressBar.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { kinds, sizes } from 'Helpers/Props'; import { ColorImpairedConsumer } from 'App/ColorImpairedContext'; +import { kinds, sizes } from 'Helpers/Props'; import styles from './ProgressBar.css'; function ProgressBar(props) { diff --git a/frontend/src/Components/Router/Switch.js b/frontend/src/Components/Router/Switch.js index 0c0004a50..6479d5291 100644 --- a/frontend/src/Components/Router/Switch.js +++ b/frontend/src/Components/Router/Switch.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Switch as RouterSwitch } from 'react-router-dom'; -import getPathWithUrlBase from 'Utilities/getPathWithUrlBase'; import { map } from 'Helpers/elementChildren'; +import getPathWithUrlBase from 'Utilities/getPathWithUrlBase'; class Switch extends Component { diff --git a/frontend/src/Components/Scroller/Scroller.js b/frontend/src/Components/Scroller/Scroller.js index 603e27cc6..454163b7e 100644 --- a/frontend/src/Components/Scroller/Scroller.js +++ b/frontend/src/Components/Scroller/Scroller.js @@ -1,6 +1,6 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; import { scrollDirections } from 'Helpers/Props'; import styles from './Scroller.css'; diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js index c2909be73..90be9795e 100644 --- a/frontend/src/Components/SignalRConnector.js +++ b/frontend/src/Components/SignalRConnector.js @@ -3,16 +3,16 @@ import PropTypes from 'prop-types'; import { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { repopulatePage } from 'Utilities/pagePopulator'; -import titleCase from 'Utilities/String/titleCase'; -import { fetchCommands, updateCommand, finishCommand } from 'Store/Actions/commandActions'; import { setAppValue, setVersion } from 'Store/Actions/appActions'; -import { update, updateItem, removeItem } from 'Store/Actions/baseActions'; +import { removeItem, update, updateItem } from 'Store/Actions/baseActions'; +import { fetchCommands, finishCommand, updateCommand } from 'Store/Actions/commandActions'; import { fetchMovies } from 'Store/Actions/movieActions'; -import { fetchHealth } from 'Store/Actions/systemActions'; import { fetchQueue, fetchQueueDetails } from 'Store/Actions/queueActions'; import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; -import { fetchTags, fetchTagDetails } from 'Store/Actions/tagActions'; +import { fetchHealth } from 'Store/Actions/systemActions'; +import { fetchTagDetails, fetchTags } from 'Store/Actions/tagActions'; +import { repopulatePage } from 'Utilities/pagePopulator'; +import titleCase from 'Utilities/String/titleCase'; function getHandlerName(name) { name = titleCase(name); diff --git a/frontend/src/Components/Table/Table.js b/frontend/src/Components/Table/Table.js index dbd60bf5f..c2cd716c5 100644 --- a/frontend/src/Components/Table/Table.js +++ b/frontend/src/Components/Table/Table.js @@ -1,11 +1,11 @@ +import classNames from 'classnames'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons, scrollDirections } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import Scroller from 'Components/Scroller/Scroller'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import { icons, scrollDirections } from 'Helpers/Props'; import TableHeader from './TableHeader'; import TableHeaderCell from './TableHeaderCell'; import TableSelectAllHeaderCell from './TableSelectAllHeaderCell'; diff --git a/frontend/src/Components/Table/TableHeaderCell.js b/frontend/src/Components/Table/TableHeaderCell.js index e4739e63f..78c9535e3 100644 --- a/frontend/src/Components/Table/TableHeaderCell.js +++ b/frontend/src/Components/Table/TableHeaderCell.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, sortDirections } from 'Helpers/Props'; -import Link from 'Components/Link/Link'; import Icon from 'Components/Icon'; +import Link from 'Components/Link/Link'; +import { icons, sortDirections } from 'Helpers/Props'; import styles from './TableHeaderCell.css'; class TableHeaderCell extends Component { diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js index a986be615..2d91c7c63 100644 --- a/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js +++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; -import Icon from 'Components/Icon'; import CheckInput from 'Components/Form/CheckInput'; +import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import styles from './TableOptionsColumn.css'; function TableOptionsColumn(props) { diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js index b1d016529..f30822022 100644 --- a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js +++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { DragLayer } from 'react-dnd'; -import dimensions from 'Styles/Variables/dimensions.js'; -import { TABLE_COLUMN } from 'Helpers/dragTypes'; import DragPreviewLayer from 'Components/DragPreviewLayer'; +import { TABLE_COLUMN } from 'Helpers/dragTypes'; +import dimensions from 'Styles/Variables/dimensions.js'; import TableOptionsColumn from './TableOptionsColumn'; import styles from './TableOptionsColumnDragPreview.css'; diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js index 80f03e430..100559660 100644 --- a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js +++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { findDOMNode } from 'react-dom'; import { DragSource, DropTarget } from 'react-dnd'; -import classNames from 'classnames'; +import { findDOMNode } from 'react-dom'; import { TABLE_COLUMN } from 'Helpers/dragTypes'; import TableOptionsColumn from './TableOptionsColumn'; import styles from './TableOptionsColumnDragSource.css'; diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js index 64b2dcb6a..29de7502b 100644 --- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js +++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js @@ -3,21 +3,21 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { DndProvider } from 'react-dnd'; import HTML5Backend from 'react-dnd-html5-backend'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputHelpText from 'Components/Form/FormInputHelpText'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormInputHelpText from 'Components/Form/FormInputHelpText'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; import TableOptionsColumn from './TableOptionsColumn'; -import TableOptionsColumnDragSource from './TableOptionsColumnDragSource'; import TableOptionsColumnDragPreview from './TableOptionsColumnDragPreview'; +import TableOptionsColumnDragSource from './TableOptionsColumnDragSource'; import styles from './TableOptionsModal.css'; class TableOptionsModal extends Component { diff --git a/frontend/src/Components/Table/TablePager.js b/frontend/src/Components/Table/TablePager.js index 3c7c5a8f1..df1090b0e 100644 --- a/frontend/src/Components/Table/TablePager.js +++ b/frontend/src/Components/Table/TablePager.js @@ -1,11 +1,11 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; +import SelectInput from 'Components/Form/SelectInput'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import SelectInput from 'Components/Form/SelectInput'; +import { icons } from 'Helpers/Props'; import styles from './TablePager.css'; class TablePager extends Component { diff --git a/frontend/src/Components/Table/VirtualTable.js b/frontend/src/Components/Table/VirtualTable.js index fa947ec9e..7b70179c7 100644 --- a/frontend/src/Components/Table/VirtualTable.js +++ b/frontend/src/Components/Table/VirtualTable.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { scrollDirections } from 'Helpers/Props'; +import { Grid, WindowScroller } from 'react-virtualized'; import Measure from 'Components/Measure'; import Scroller from 'Components/Scroller/Scroller'; -import { WindowScroller, Grid } from 'react-virtualized'; +import { scrollDirections } from 'Helpers/Props'; import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import styles from './VirtualTable.css'; diff --git a/frontend/src/Components/Table/VirtualTableHeaderCell.js b/frontend/src/Components/Table/VirtualTableHeaderCell.js index bf51062e9..727d6469d 100644 --- a/frontend/src/Components/Table/VirtualTableHeaderCell.js +++ b/frontend/src/Components/Table/VirtualTableHeaderCell.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, sortDirections } from 'Helpers/Props'; -import Link from 'Components/Link/Link'; import Icon from 'Components/Icon'; +import Link from 'Components/Link/Link'; +import { icons, sortDirections } from 'Helpers/Props'; import styles from './VirtualTableHeaderCell.css'; export function headerRenderer(headerProps) { diff --git a/frontend/src/Components/Tooltip/Tooltip.js b/frontend/src/Components/Tooltip/Tooltip.js index 8faf97414..b692e7d68 100644 --- a/frontend/src/Components/Tooltip/Tooltip.js +++ b/frontend/src/Components/Tooltip/Tooltip.js @@ -1,10 +1,10 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Manager, Popper, Reference } from 'react-popper'; -import classNames from 'classnames'; -import { isMobile as isMobileUtil } from 'Utilities/mobile'; -import { kinds, tooltipPositions } from 'Helpers/Props'; import Portal from 'Components/Portal'; +import { kinds, tooltipPositions } from 'Helpers/Props'; +import { isMobile as isMobileUtil } from 'Utilities/mobile'; import styles from './Tooltip.css'; class Tooltip extends Component { diff --git a/frontend/src/Components/keyboardShortcuts.js b/frontend/src/Components/keyboardShortcuts.js index 481b092a4..d2609aa58 100644 --- a/frontend/src/Components/keyboardShortcuts.js +++ b/frontend/src/Components/keyboardShortcuts.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; import Mousetrap from 'mousetrap'; +import React, { Component } from 'react'; import getDisplayName from 'Helpers/getDisplayName'; export const shortcuts = { diff --git a/frontend/src/DiscoverMovie/AddListMovieFilterModalConnector.js b/frontend/src/DiscoverMovie/AddListMovieFilterModalConnector.js index 68fdcc300..bfac00b84 100644 --- a/frontend/src/DiscoverMovie/AddListMovieFilterModalConnector.js +++ b/frontend/src/DiscoverMovie/AddListMovieFilterModalConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setListMovieFilter } from 'Store/Actions/discoverMovieActions'; import FilterModal from 'Components/Filter/FilterModal'; +import { setListMovieFilter } from 'Store/Actions/discoverMovieActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js b/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js index d50307c03..dd3987aec 100644 --- a/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js +++ b/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setAddMovieDefault, addMovie } from 'Store/Actions/discoverMovieActions'; +import AddNewMovieModalContent from 'AddMovie/AddNewMovie/AddNewMovieModalContent'; +import { addMovie, setAddMovieDefault } from 'Store/Actions/discoverMovieActions'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; import selectSettings from 'Store/Selectors/selectSettings'; -import AddNewMovieModalContent from 'AddMovie/AddNewMovie/AddNewMovieModalContent'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/DiscoverMovie/DiscoverMovie.js b/frontend/src/DiscoverMovie/DiscoverMovie.js index c50acf78b..c6553ec14 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovie.js +++ b/frontend/src/DiscoverMovie/DiscoverMovie.js @@ -1,32 +1,32 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { align, icons, sortDirections } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageJumpBar from 'Components/Page/PageJumpBar'; -import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import AddListMovieTableConnector from './Table/AddListMovieTableConnector'; -import AddListMoviePosterOptionsModal from './Posters/Options/AddListMoviePosterOptionsModal'; -import AddListMoviePostersConnector from './Posters/AddListMoviePostersConnector'; -import AddListMovieOverviewOptionsModal from './Overview/Options/AddListMovieOverviewOptionsModal'; -import AddListMovieOverviewsConnector from './Overview/AddListMovieOverviewsConnector'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import { align, icons, sortDirections } from 'Helpers/Props'; +import styles from 'Movie/Index/MovieIndex.css'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; +import translate from 'Utilities/String/translate'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; +import DiscoverMovieFooterConnector from './DiscoverMovieFooterConnector'; import AddListMovieFilterMenu from './Menus/AddListMovieFilterMenu'; import AddListMovieSortMenu from './Menus/AddListMovieSortMenu'; import AddListMovieViewMenu from './Menus/AddListMovieViewMenu'; import NoDiscoverMovie from './NoDiscoverMovie'; -import DiscoverMovieFooterConnector from './DiscoverMovieFooterConnector'; -import translate from 'Utilities/String/translate'; -import styles from 'Movie/Index/MovieIndex.css'; +import AddListMovieOverviewsConnector from './Overview/AddListMovieOverviewsConnector'; +import AddListMovieOverviewOptionsModal from './Overview/Options/AddListMovieOverviewOptionsModal'; +import AddListMoviePostersConnector from './Posters/AddListMoviePostersConnector'; +import AddListMoviePosterOptionsModal from './Posters/Options/AddListMoviePosterOptionsModal'; +import AddListMovieTableConnector from './Table/AddListMovieTableConnector'; function getViewComponent(view) { if (view === 'posters') { diff --git a/frontend/src/DiscoverMovie/DiscoverMovieConnector.js b/frontend/src/DiscoverMovie/DiscoverMovieConnector.js index a35b9a57f..21a4e5e65 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovieConnector.js +++ b/frontend/src/DiscoverMovie/DiscoverMovieConnector.js @@ -2,14 +2,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createDiscoverMovieClientSideCollectionItemsSelector from 'Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector'; -import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import withScrollPosition from 'Components/withScrollPosition'; +import { addMovies, addNetImportExclusions, clearAddMovie, fetchDiscoverMovies, setListMovieFilter, setListMovieSort, setListMovieTableOption, setListMovieView } from 'Store/Actions/discoverMovieActions'; import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; -import { fetchDiscoverMovies, addMovies, clearAddMovie, addNetImportExclusions, setListMovieSort, setListMovieFilter, setListMovieView, setListMovieTableOption } from 'Store/Actions/discoverMovieActions'; import { fetchNetImportExclusions } from 'Store/Actions/Settings/netImportExclusions'; import scrollPositions from 'Store/scrollPositions'; +import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createDiscoverMovieClientSideCollectionItemsSelector from 'Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector'; import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; -import withScrollPosition from 'Components/withScrollPosition'; import DiscoverMovie from './DiscoverMovie'; function createMapStateToProps() { diff --git a/frontend/src/DiscoverMovie/DiscoverMovieFooter.js b/frontend/src/DiscoverMovie/DiscoverMovieFooter.js index 76dbb01ed..cc75157df 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovieFooter.js +++ b/frontend/src/DiscoverMovie/DiscoverMovieFooter.js @@ -1,16 +1,16 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; -import SelectInput from 'Components/Form/SelectInput'; import AvailabilitySelectInput from 'Components/Form/AvailabilitySelectInput'; import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector'; import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector'; +import SelectInput from 'Components/Form/SelectInput'; import SpinnerButton from 'Components/Link/SpinnerButton'; import PageContentFooter from 'Components/Page/PageContentFooter'; -import ExcludeMovieModal from './Exclusion/ExcludeMovieModal'; -import DiscoverMovieFooterLabel from './DiscoverMovieFooterLabel'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import DiscoverMovieFooterLabel from './DiscoverMovieFooterLabel'; +import ExcludeMovieModal from './Exclusion/ExcludeMovieModal'; import styles from './DiscoverMovieFooter.css'; class DiscoverMovieFooter extends Component { diff --git a/frontend/src/DiscoverMovie/DiscoverMovieFooterLabel.js b/frontend/src/DiscoverMovie/DiscoverMovieFooterLabel.js index 854037f77..c03d2cafc 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovieFooterLabel.js +++ b/frontend/src/DiscoverMovie/DiscoverMovieFooterLabel.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import SpinnerIcon from 'Components/SpinnerIcon'; +import { icons } from 'Helpers/Props'; import styles from './DiscoverMovieFooterLabel.css'; function DiscoverMovieFooterLabel(props) { diff --git a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModal.js b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModal.js index 8535c4001..02ab50972 100644 --- a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModal.js +++ b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import ExcludeMovieModalContentConnector from './ExcludeMovieModalContentConnector'; function ExcludeMovieModal(props) { diff --git a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContent.js b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContent.js index 28b0123d6..b065c3d02 100644 --- a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContent.js +++ b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContent.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import styles from './ExcludeMovieModalContent.css'; class ExcludeMovieModalContent extends Component { diff --git a/frontend/src/DiscoverMovie/Menus/AddListMovieFilterMenu.js b/frontend/src/DiscoverMovie/Menus/AddListMovieFilterMenu.js index 31702eacc..6d848e80b 100644 --- a/frontend/src/DiscoverMovie/Menus/AddListMovieFilterMenu.js +++ b/frontend/src/DiscoverMovie/Menus/AddListMovieFilterMenu.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align } from 'Helpers/Props'; import FilterMenu from 'Components/Menu/FilterMenu'; import AddListMovieFilterModalConnector from 'DiscoverMovie/AddListMovieFilterModalConnector'; +import { align } from 'Helpers/Props'; function AddListMovieFilterMenu(props) { const { diff --git a/frontend/src/DiscoverMovie/Menus/AddListMovieSortMenu.js b/frontend/src/DiscoverMovie/Menus/AddListMovieSortMenu.js index 81996dea8..aea5c39b0 100644 --- a/frontend/src/DiscoverMovie/Menus/AddListMovieSortMenu.js +++ b/frontend/src/DiscoverMovie/Menus/AddListMovieSortMenu.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align, sortDirections } from 'Helpers/Props'; -import SortMenu from 'Components/Menu/SortMenu'; import MenuContent from 'Components/Menu/MenuContent'; +import SortMenu from 'Components/Menu/SortMenu'; import SortMenuItem from 'Components/Menu/SortMenuItem'; +import { align, sortDirections } from 'Helpers/Props'; function AddListMovieSortMenu(props) { const { diff --git a/frontend/src/DiscoverMovie/Menus/AddListMovieViewMenu.js b/frontend/src/DiscoverMovie/Menus/AddListMovieViewMenu.js index 5987a4e15..9b15a42c1 100644 --- a/frontend/src/DiscoverMovie/Menus/AddListMovieViewMenu.js +++ b/frontend/src/DiscoverMovie/Menus/AddListMovieViewMenu.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align } from 'Helpers/Props'; -import ViewMenu from 'Components/Menu/ViewMenu'; import MenuContent from 'Components/Menu/MenuContent'; +import ViewMenu from 'Components/Menu/ViewMenu'; import ViewMenuItem from 'Components/Menu/ViewMenuItem'; +import { align } from 'Helpers/Props'; function AddListMovieViewMenu(props) { const { diff --git a/frontend/src/DiscoverMovie/NoDiscoverMovie.js b/frontend/src/DiscoverMovie/NoDiscoverMovie.js index 8a0d230cb..13644a585 100644 --- a/frontend/src/DiscoverMovie/NoDiscoverMovie.js +++ b/frontend/src/DiscoverMovie/NoDiscoverMovie.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Button from 'Components/Link/Button'; +import { kinds } from 'Helpers/Props'; import styles from './NoDiscoverMovie.css'; function NoDiscoverMovie(props) { diff --git a/frontend/src/DiscoverMovie/Overview/AddListMovieOverview.js b/frontend/src/DiscoverMovie/Overview/AddListMovieOverview.js index aa81a04fe..bc34cbc09 100644 --- a/frontend/src/DiscoverMovie/Overview/AddListMovieOverview.js +++ b/frontend/src/DiscoverMovie/Overview/AddListMovieOverview.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import TextTruncate from 'react-text-truncate'; -import { icons } from 'Helpers/Props'; +import CheckInput from 'Components/Form/CheckInput'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; -import dimensions from 'Styles/Variables/dimensions'; -import fonts from 'Styles/Variables/fonts'; -import CheckInput from 'Components/Form/CheckInput'; -import MoviePoster from 'Movie/MoviePoster'; import Link from 'Components/Link/Link'; +import Popover from 'Components/Tooltip/Popover'; import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal'; import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal'; -import styles from './AddListMovieOverview.css'; -import Popover from 'Components/Tooltip/Popover'; +import { icons } from 'Helpers/Props'; import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import MoviePoster from 'Movie/MoviePoster'; +import dimensions from 'Styles/Variables/dimensions'; +import fonts from 'Styles/Variables/fonts'; +import styles from './AddListMovieOverview.css'; const columnPadding = parseInt(dimensions.movieIndexColumnPadding); const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen); diff --git a/frontend/src/DiscoverMovie/Overview/AddListMovieOverviews.js b/frontend/src/DiscoverMovie/Overview/AddListMovieOverviews.js index 88c94e72c..d3d61d5b5 100644 --- a/frontend/src/DiscoverMovie/Overview/AddListMovieOverviews.js +++ b/frontend/src/DiscoverMovie/Overview/AddListMovieOverviews.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Grid, WindowScroller } from 'react-virtualized'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; import AddListMovieItemConnector from 'DiscoverMovie/AddListMovieItemConnector'; +import dimensions from 'Styles/Variables/dimensions'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import AddListMovieOverviewConnector from './AddListMovieOverviewConnector'; import styles from './AddListMovieOverviews.css'; diff --git a/frontend/src/DiscoverMovie/Overview/AddListMovieOverviewsConnector.js b/frontend/src/DiscoverMovie/Overview/AddListMovieOverviewsConnector.js index 39a49dadc..50689547a 100644 --- a/frontend/src/DiscoverMovie/Overview/AddListMovieOverviewsConnector.js +++ b/frontend/src/DiscoverMovie/Overview/AddListMovieOverviewsConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import AddListMovieOverviews from './AddListMovieOverviews'; function createMapStateToProps() { diff --git a/frontend/src/DiscoverMovie/Overview/Options/AddListMovieOverviewOptionsModalContent.js b/frontend/src/DiscoverMovie/Overview/Options/AddListMovieOverviewOptionsModalContent.js index a5673f8c8..d02cf9c4e 100644 --- a/frontend/src/DiscoverMovie/Overview/Options/AddListMovieOverviewOptionsModalContent.js +++ b/frontend/src/DiscoverMovie/Overview/Options/AddListMovieOverviewOptionsModalContent.js @@ -1,16 +1,16 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; const posterSizeOptions = [ { key: 'small', value: 'Small' }, diff --git a/frontend/src/DiscoverMovie/Posters/AddListMoviePoster.js b/frontend/src/DiscoverMovie/Posters/AddListMoviePoster.js index b4dd779c3..1102afe1d 100644 --- a/frontend/src/DiscoverMovie/Posters/AddListMoviePoster.js +++ b/frontend/src/DiscoverMovie/Posters/AddListMoviePoster.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import IconButton from 'Components/Link/IconButton'; import CheckInput from 'Components/Form/CheckInput'; +import Icon from 'Components/Icon'; import Label from 'Components/Label'; +import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; -import MoviePoster from 'Movie/MoviePoster'; +import Popover from 'Components/Tooltip/Popover'; import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal'; import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal'; -import styles from './AddListMoviePoster.css'; -import Icon from 'Components/Icon'; -import Popover from 'Components/Tooltip/Popover'; +import { icons } from 'Helpers/Props'; import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import MoviePoster from 'Movie/MoviePoster'; +import styles from './AddListMoviePoster.css'; class AddListMoviePoster extends Component { diff --git a/frontend/src/DiscoverMovie/Posters/AddListMoviePosters.js b/frontend/src/DiscoverMovie/Posters/AddListMoviePosters.js index ca0073fc4..0efd6f7ba 100644 --- a/frontend/src/DiscoverMovie/Posters/AddListMoviePosters.js +++ b/frontend/src/DiscoverMovie/Posters/AddListMoviePosters.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Grid, WindowScroller } from 'react-virtualized'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; import AddListMovieItemConnector from 'DiscoverMovie/AddListMovieItemConnector'; +import dimensions from 'Styles/Variables/dimensions'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import AddListMoviePosterConnector from './AddListMoviePosterConnector'; import styles from './AddListMoviePosters.css'; diff --git a/frontend/src/DiscoverMovie/Posters/AddListMoviePostersConnector.js b/frontend/src/DiscoverMovie/Posters/AddListMoviePostersConnector.js index 3d83be7c4..361db733b 100644 --- a/frontend/src/DiscoverMovie/Posters/AddListMoviePostersConnector.js +++ b/frontend/src/DiscoverMovie/Posters/AddListMoviePostersConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import AddListMoviePosters from './AddListMoviePosters'; function createMapStateToProps() { diff --git a/frontend/src/DiscoverMovie/Posters/Options/AddListMoviePosterOptionsModalContent.js b/frontend/src/DiscoverMovie/Posters/Options/AddListMoviePosterOptionsModalContent.js index c26314c24..7e0ebb0e5 100644 --- a/frontend/src/DiscoverMovie/Posters/Options/AddListMoviePosterOptionsModalContent.js +++ b/frontend/src/DiscoverMovie/Posters/Options/AddListMoviePosterOptionsModalContent.js @@ -1,16 +1,16 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; const posterSizeOptions = [ { key: 'small', value: 'Small' }, diff --git a/frontend/src/DiscoverMovie/Table/AddListMovieHeader.js b/frontend/src/DiscoverMovie/Table/AddListMovieHeader.js index f189915ae..79756ddd0 100644 --- a/frontend/src/DiscoverMovie/Table/AddListMovieHeader.js +++ b/frontend/src/DiscoverMovie/Table/AddListMovieHeader.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; +import TableOptionsModal from 'Components/Table/TableOptions/TableOptionsModal'; import VirtualTableHeader from 'Components/Table/VirtualTableHeader'; import VirtualTableHeaderCell from 'Components/Table/VirtualTableHeaderCell'; import VirtualTableSelectAllHeaderCell from 'Components/Table/VirtualTableSelectAllHeaderCell'; -import TableOptionsModal from 'Components/Table/TableOptions/TableOptionsModal'; +import { icons } from 'Helpers/Props'; import styles from './AddListMovieHeader.css'; class AddListMovieHeader extends Component { diff --git a/frontend/src/DiscoverMovie/Table/AddListMovieRow.js b/frontend/src/DiscoverMovie/Table/AddListMovieRow.js index 1561df6d1..9b00c55ba 100644 --- a/frontend/src/DiscoverMovie/Table/AddListMovieRow.js +++ b/frontend/src/DiscoverMovie/Table/AddListMovieRow.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import HeartRating from 'Components/HeartRating'; +import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; -import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; -import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import ListMovieStatusCell from './ListMovieStatusCell'; import Link from 'Components/Link/Link'; -import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal'; -import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal'; +import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; +import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell'; -import styles from './AddListMovieRow.css'; -import Icon from 'Components/Icon'; import Popover from 'Components/Tooltip/Popover'; +import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal'; +import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal'; +import { icons } from 'Helpers/Props'; import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import ListMovieStatusCell from './ListMovieStatusCell'; +import styles from './AddListMovieRow.css'; class AddListMovieRow extends Component { diff --git a/frontend/src/DiscoverMovie/Table/AddListMovieTable.js b/frontend/src/DiscoverMovie/Table/AddListMovieTable.js index 5278ec69a..295d6a1ba 100644 --- a/frontend/src/DiscoverMovie/Table/AddListMovieTable.js +++ b/frontend/src/DiscoverMovie/Table/AddListMovieTable.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import { sortDirections } from 'Helpers/Props'; import VirtualTable from 'Components/Table/VirtualTable'; import VirtualTableRow from 'Components/Table/VirtualTableRow'; import AddListMovieItemConnector from 'DiscoverMovie/AddListMovieItemConnector'; +import { sortDirections } from 'Helpers/Props'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; import AddListMovieHeaderConnector from './AddListMovieHeaderConnector'; import AddListMovieRowConnector from './AddListMovieRowConnector'; import styles from './AddListMovieTable.css'; diff --git a/frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js b/frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js index f161b7424..12c9a116c 100644 --- a/frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js +++ b/frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell'; +import { icons } from 'Helpers/Props'; import { getMovieStatusDetails } from 'Movie/MovieStatus'; import styles from './ListMovieStatusCell.css'; diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js index 4a1df97a8..b4abcb00a 100644 --- a/frontend/src/Helpers/Props/icons.js +++ b/frontend/src/Helpers/Props/icons.js @@ -12,15 +12,13 @@ import { faFileArchive as farFileArchive, faFileVideo as farFileVideo, faFolder as farFolder, - faObjectGroup as farObjectGroup, faHdd as farHdd, faKeyboard as farKeyboard, + faObjectGroup as farObjectGroup, faObjectUngroup as farObjectUngroup } from '@fortawesome/free-regular-svg-icons'; - // // Solid - import { faArrowCircleLeft as fasArrowCircleLeft, faArrowCircleRight as fasArrowCircleRight, @@ -29,20 +27,20 @@ import { faBolt as fasBolt, faBookmark as fasBookmark, faBookReader as fasBookReader, + faBroadcastTower as fasBroadcastTower, faBug as fasBug, faBullhorn as fasBullhorn, - faBroadcastTower as fasBroadcastTower, faCalendarAlt as fasCalendarAlt, faCaretDown as fasCaretDown, faCheck as fasCheck, + faCheckCircle as fasCheckCircle, faCheckSquare as fasCheckSquare, faChevronCircleDown as fasChevronCircleDown, faChevronCircleRight as fasChevronCircleRight, faChevronCircleUp as fasChevronCircleUp, - faCheckCircle as fasCheckCircle, faCircle as fasCircle, - faCloudDownloadAlt as fasCloudDownloadAlt, faCloud as fasCloud, + faCloudDownloadAlt as fasCloudDownloadAlt, faCog as fasCog, faCogs as fasCogs, faCompactDisc as fasCompactDisc, @@ -79,26 +77,26 @@ import { faQuestionCircle as fasQuestionCircle, faRedoAlt as fasRedoAlt, faRetweet as fasRetweet, - faRss as fasRss, faRocket as fasRocket, + faRss as fasRss, faSave as fasSave, faSearch as fasSearch, faSignOutAlt as fasSignOutAlt, faSitemap as fasSitemap, - faSpinner as fasSpinner, faSort as fasSort, faSortDown as fasSortDown, faSortUp as fasSortUp, + faSpinner as fasSpinner, faStop as fasStop, faSync as fasSync, - faTags as fasTags, faTable as fasTable, + faTags as fasTags, faTh as fasTh, faThList as fasThList, faTicketAlt as fasTicketAlt, - faTrashAlt as fasTrashAlt, faTimes as fasTimes, faTimesCircle as fasTimesCircle, + faTrashAlt as fasTrashAlt, faUser as fasUser, faUserPlus as fasUserPlus, faVial as fasVial, diff --git a/frontend/src/Helpers/Props/index.js b/frontend/src/Helpers/Props/index.js index 3f4f94f6f..a9cb5651e 100644 --- a/frontend/src/Helpers/Props/index.js +++ b/frontend/src/Helpers/Props/index.js @@ -1,14 +1,14 @@ import * as align from './align'; -import * as inputTypes from './inputTypes'; import * as filterBuilderTypes from './filterBuilderTypes'; import * as filterBuilderValueTypes from './filterBuilderValueTypes'; import filterTypePredicates from './filterTypePredicates'; import * as filterTypes from './filterTypes'; import * as icons from './icons'; +import * as inputTypes from './inputTypes'; import * as kinds from './kinds'; import * as messageTypes from './messageTypes'; -import * as sizes from './sizes'; import * as scrollDirections from './scrollDirections'; +import * as sizes from './sizes'; import * as sortDirections from './sortDirections'; import * as tooltipPositions from './tooltipPositions'; diff --git a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js index 27d85329f..882af7610 100644 --- a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js +++ b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js @@ -1,15 +1,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import Icon from 'Components/Icon'; import PathInputConnector from 'Components/Form/PathInputConnector'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { icons, kinds, sizes } from 'Helpers/Props'; import RecentFolderRow from './RecentFolderRow'; import styles from './InteractiveImportSelectFolderModalContent.css'; diff --git a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContentConnector.js b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContentConnector.js index c5080e601..b0aced65c 100644 --- a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContentConnector.js +++ b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContentConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { addRecentFolder, removeRecentFolder } from 'Store/Actions/interactiveImportActions'; -import { executeCommand } from 'Store/Actions/commandActions'; import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; +import { addRecentFolder, removeRecentFolder } from 'Store/Actions/interactiveImportActions'; import InteractiveImportSelectFolderModalContent from './InteractiveImportSelectFolderModalContent'; function createMapStateToProps() { diff --git a/frontend/src/InteractiveImport/Folder/RecentFolderRow.js b/frontend/src/InteractiveImport/Folder/RecentFolderRow.js index 403bce33d..87c574aa6 100644 --- a/frontend/src/InteractiveImport/Folder/RecentFolderRow.js +++ b/frontend/src/InteractiveImport/Folder/RecentFolderRow.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; -import TableRowButton from 'Components/Table/TableRowButton'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRowButton from 'Components/Table/TableRowButton'; +import { icons } from 'Helpers/Props'; import styles from './RecentFolderRow.css'; class RecentFolderRow extends Component { diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js index 279853ee5..f0385f2b9 100644 --- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js +++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js @@ -1,28 +1,28 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getErrorMessage from 'Utilities/Object/getErrorMessage'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { align, icons, kinds, scrollDirections } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; +import SelectInput from 'Components/Form/SelectInput'; import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import SelectInput from 'Components/Form/SelectInput'; import Menu from 'Components/Menu/Menu'; import MenuButton from 'Components/Menu/MenuButton'; import MenuContent from 'Components/Menu/MenuContent'; import SelectedMenuItem from 'Components/Menu/SelectedMenuItem'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { align, icons, kinds, scrollDirections } from 'Helpers/Props'; import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal'; -import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal'; import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal'; +import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal'; +import getErrorMessage from 'Utilities/Object/getErrorMessage'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; import InteractiveImportRow from './InteractiveImportRow'; import styles from './InteractiveImportModalContent.css'; diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js index 4259657f8..d1544c79c 100644 --- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js +++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchInteractiveImportItems, setInteractiveImportSort, clearInteractiveImport, setInteractiveImportMode } from 'Store/Actions/interactiveImportActions'; -import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector'; -import { executeCommand } from 'Store/Actions/commandActions'; import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; +import { clearInteractiveImport, fetchInteractiveImportItems, setInteractiveImportMode, setInteractiveImportSort } from 'Store/Actions/interactiveImportActions'; +import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector'; import InteractiveImportModalContent from './InteractiveImportModalContent'; function createMapStateToProps() { diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js index 29489b4c6..a74c67a60 100644 --- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js +++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import Icon from 'Components/Icon'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton'; import TableSelectCell from 'Components/Table/Cells/TableSelectCell'; +import TableRow from 'Components/Table/TableRow'; import Popover from 'Components/Tooltip/Popover'; -import MovieQuality from 'Movie/MovieQuality'; -import MovieLanguage from 'Movie/MovieLanguage'; +import { icons, kinds, tooltipPositions } from 'Helpers/Props'; +import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal'; import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal'; import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal'; -import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal'; +import MovieLanguage from 'Movie/MovieLanguage'; +import MovieQuality from 'Movie/MovieQuality'; +import formatBytes from 'Utilities/Number/formatBytes'; import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder'; import styles from './InteractiveImportRow.css'; diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModal.js b/frontend/src/InteractiveImport/Language/SelectLanguageModal.js index 01eb401ee..f0164358e 100644 --- a/frontend/src/InteractiveImport/Language/SelectLanguageModal.js +++ b/frontend/src/InteractiveImport/Language/SelectLanguageModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import SelectLanguageModalContentConnector from './SelectLanguageModalContentConnector'; class SelectLanguageModal extends Component { diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js index 1dc68ccb9..f63bb40a3 100644 --- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js +++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds, sizes } from 'Helpers/Props'; import styles from './SelectLanguageModalContent.css'; class SelectLanguageModalContent extends Component { diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js b/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js index bef73d0e4..d638e91e4 100644 --- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js +++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchLanguages } from 'Store/Actions/settingsActions'; import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions'; +import { fetchLanguages } from 'Store/Actions/settingsActions'; import SelectLanguageModalContent from './SelectLanguageModalContent'; function createMapStateToProps() { diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.js b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.js index 619f3bffc..affadcbd5 100644 --- a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.js +++ b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.js @@ -1,19 +1,19 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { scrollDirections } from 'Helpers/Props'; -import VirtualTable from 'Components/Table/VirtualTable'; -import VirtualTableRow from 'Components/Table/VirtualTableRow'; -import Button from 'Components/Link/Button'; -import Scroller from 'Components/Scroller/Scroller'; import TextInput from 'Components/Form/TextInput'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import Button from 'Components/Link/Button'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import SelectMovieRow from './SelectMovieRow'; +import ModalHeader from 'Components/Modal/ModalHeader'; import FuseWorker from 'Components/Page/Header/fuse.worker'; +import Scroller from 'Components/Scroller/Scroller'; +import VirtualTable from 'Components/Table/VirtualTable'; +import VirtualTableRow from 'Components/Table/VirtualTableRow'; +import { scrollDirections } from 'Helpers/Props'; +import SelectMovieRow from './SelectMovieRow'; import styles from './SelectMovieModalContent.css'; const workerInstance = new FuseWorker(); diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js index 642e0433e..2ca5ca3e9 100644 --- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js +++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; class SelectQualityModalContent extends Component { diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js b/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js index 1cf55cde6..149d2536a 100644 --- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js +++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import getQualities from 'Utilities/Quality/getQualities'; -import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions'; +import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; +import getQualities from 'Utilities/Quality/getQualities'; import SelectQualityModalContent from './SelectQualityModalContent'; function createMapStateToProps() { diff --git a/frontend/src/InteractiveSearch/InteractiveSearchContent.js b/frontend/src/InteractiveSearch/InteractiveSearchContent.js index 1944075df..545a52479 100644 --- a/frontend/src/InteractiveSearch/InteractiveSearchContent.js +++ b/frontend/src/InteractiveSearch/InteractiveSearchContent.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons, sortDirections } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Icon from 'Components/Icon'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { icons, sortDirections } from 'Helpers/Props'; import InteractiveSearchRow from './InteractiveSearchRow'; import styles from './InteractiveSearchContent.css'; diff --git a/frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js b/frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js index fecad5d63..10fc32c93 100644 --- a/frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js +++ b/frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align } from 'Helpers/Props'; import FilterMenu from 'Components/Menu/FilterMenu'; import PageMenuButton from 'Components/Menu/PageMenuButton'; +import { align } from 'Helpers/Props'; import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector'; import styles from './InteractiveSearchContent.css'; diff --git a/frontend/src/InteractiveSearch/InteractiveSearchFilterModalConnector.js b/frontend/src/InteractiveSearch/InteractiveSearchFilterModalConnector.js index f52db8bbd..c42fb30d1 100644 --- a/frontend/src/InteractiveSearch/InteractiveSearchFilterModalConnector.js +++ b/frontend/src/InteractiveSearch/InteractiveSearchFilterModalConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setReleasesFilter } from 'Store/Actions/releaseActions'; import FilterModal from 'Components/Filter/FilterModal'; +import { setReleasesFilter } from 'Store/Actions/releaseActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.js b/frontend/src/InteractiveSearch/InteractiveSearchRow.js index 6e2dfd0fc..28ffff566 100644 --- a/frontend/src/InteractiveSearch/InteractiveSearchRow.js +++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.js @@ -1,22 +1,22 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import formatDateTime from 'Utilities/Date/formatDateTime'; -import formatAge from 'Utilities/Number/formatAge'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons, kinds, tooltipPositions } from 'Helpers/Props'; +import ProtocolLabel from 'Activity/Queue/ProtocolLabel'; import Icon from 'Components/Icon'; -import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; import Link from 'Components/Link/Link'; +import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; import Popover from 'Components/Tooltip/Popover'; -import ProtocolLabel from 'Activity/Queue/ProtocolLabel'; -import Peers from './Peers'; -import styles from './InteractiveSearchRow.css'; -import MovieQuality from 'Movie/MovieQuality'; +import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; +import MovieQuality from 'Movie/MovieQuality'; +import formatDateTime from 'Utilities/Date/formatDateTime'; +import formatAge from 'Utilities/Number/formatAge'; +import formatBytes from 'Utilities/Number/formatBytes'; +import Peers from './Peers'; +import styles from './InteractiveSearchRow.css'; function getDownloadIcon(isGrabbing, isGrabbed, grabError) { if (isGrabbing) { diff --git a/frontend/src/InteractiveSearch/Peers.js b/frontend/src/InteractiveSearch/Peers.js index 26654f63c..a55e75c09 100644 --- a/frontend/src/InteractiveSearch/Peers.js +++ b/frontend/src/InteractiveSearch/Peers.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; function getKind(seeders) { if (seeders > 50) { diff --git a/frontend/src/Movie/Delete/DeleteMovieModal.js b/frontend/src/Movie/Delete/DeleteMovieModal.js index 621b3d8f7..51dd5bb53 100644 --- a/frontend/src/Movie/Delete/DeleteMovieModal.js +++ b/frontend/src/Movie/Delete/DeleteMovieModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import DeleteMovieModalContentConnector from './DeleteMovieModalContentConnector'; function DeleteMovieModal(props) { diff --git a/frontend/src/Movie/Delete/DeleteMovieModalContent.js b/frontend/src/Movie/Delete/DeleteMovieModalContent.js index 48935bda2..e7132c44c 100644 --- a/frontend/src/Movie/Delete/DeleteMovieModalContent.js +++ b/frontend/src/Movie/Delete/DeleteMovieModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons, inputTypes, kinds } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import Icon from 'Components/Icon'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { icons, inputTypes, kinds } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; import translate from 'Utilities/String/translate'; import styles from './DeleteMovieModalContent.css'; diff --git a/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js b/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js index 2f2df1489..dcb68be20 100644 --- a/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js +++ b/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createMovieSelector from 'Store/Selectors/createMovieSelector'; import { deleteMovie } from 'Store/Actions/movieActions'; +import createMovieSelector from 'Store/Selectors/createMovieSelector'; import DeleteMovieModalContent from './DeleteMovieModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js b/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js index d31da7e9b..5c0c15702 100644 --- a/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js +++ b/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import IconButton from 'Components/Link/IconButton'; import Label from 'Components/Label'; +import IconButton from 'Components/Link/IconButton'; +import { icons } from 'Helpers/Props'; import MovieHeadshot from 'Movie/MovieHeadshot'; import EditNetImportModalConnector from 'Settings/NetImport/NetImport/EditNetImportModalConnector'; import styles from '../MovieCreditPoster.css'; diff --git a/frontend/src/Movie/Details/Credits/Cast/MovieCastPostersConnector.js b/frontend/src/Movie/Details/Credits/Cast/MovieCastPostersConnector.js index c1cf623ca..091d1fad8 100644 --- a/frontend/src/Movie/Details/Credits/Cast/MovieCastPostersConnector.js +++ b/frontend/src/Movie/Details/Credits/Cast/MovieCastPostersConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; import MovieCreditPosters from '../MovieCreditPosters'; import MovieCastPoster from './MovieCastPoster'; -import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js index 23a5c3e5a..137d98b1b 100644 --- a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js +++ b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import IconButton from 'Components/Link/IconButton'; import Label from 'Components/Label'; +import IconButton from 'Components/Link/IconButton'; +import { icons } from 'Helpers/Props'; import MovieHeadshot from 'Movie/MovieHeadshot'; import EditNetImportModalConnector from 'Settings/NetImport/NetImport/EditNetImportModalConnector'; import styles from '../MovieCreditPoster.css'; diff --git a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPostersConnector.js b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPostersConnector.js index 99ac4ec35..419fe6835 100644 --- a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPostersConnector.js +++ b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPostersConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; import MovieCreditPosters from '../MovieCreditPosters'; import MovieCrewPoster from './MovieCrewPoster'; -import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/Movie/Details/Credits/MovieCreditPosterConnector.js b/frontend/src/Movie/Details/Credits/MovieCreditPosterConnector.js index e22db44fa..4a280dd70 100644 --- a/frontend/src/Movie/Details/Credits/MovieCreditPosterConnector.js +++ b/frontend/src/Movie/Details/Credits/MovieCreditPosterConnector.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; +import { selectNetImportSchema, setNetImportFieldValue, setNetImportValue } from 'Store/Actions/settingsActions'; import createMovieCreditListSelector from 'Store/Selectors/createMovieCreditListSelector'; -import { selectNetImportSchema, setNetImportValue, setNetImportFieldValue } from 'Store/Actions/settingsActions'; function createMapStateToProps() { return createMovieCreditListSelector(); diff --git a/frontend/src/Movie/Details/Credits/MovieCreditPosters.js b/frontend/src/Movie/Details/Credits/MovieCreditPosters.js index 4031c78ed..cd2f40735 100644 --- a/frontend/src/Movie/Details/Credits/MovieCreditPosters.js +++ b/frontend/src/Movie/Details/Credits/MovieCreditPosters.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Grid, WindowScroller } from 'react-virtualized'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; +import dimensions from 'Styles/Variables/dimensions'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import MovieCreditPosterConnector from './MovieCreditPosterConnector'; import styles from './MovieCreditPosters.css'; diff --git a/frontend/src/Movie/Details/MovieDetails.js b/frontend/src/Movie/Details/MovieDetails.js index ff70a1d72..6d321a1a7 100644 --- a/frontend/src/Movie/Details/MovieDetails.js +++ b/frontend/src/Movie/Details/MovieDetails.js @@ -1,48 +1,48 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'; +import { Tab, TabList, TabPanel, Tabs } from 'react-tabs'; import TextTruncate from 'react-text-truncate'; -import formatBytes from 'Utilities/Number/formatBytes'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props'; -import fonts from 'Styles/Variables/fonts'; import HeartRating from 'Components/HeartRating'; import Icon from 'Components/Icon'; -import IconButton from 'Components/Link/IconButton'; import InfoLabel from 'Components/InfoLabel'; +import IconButton from 'Components/Link/IconButton'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Marquee from 'Components/Marquee'; -import MovieStatusLabel from './MovieStatusLabel'; import Measure from 'Components/Measure'; import MonitorToggleButton from 'Components/MonitorToggleButton'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; +import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; -import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import Popover from 'Components/Tooltip/Popover'; +import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props'; import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; +import InteractiveSearchFilterMenuConnector from 'InteractiveSearch/InteractiveSearchFilterMenuConnector'; +import InteractiveSearchTable from 'InteractiveSearch/InteractiveSearchTable'; +import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; +import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; +import MovieHistoryTable from 'Movie/History/MovieHistoryTable'; +import MoviePoster from 'Movie/MoviePoster'; import MovieFileEditorTable from 'MovieFile/Editor/MovieFileEditorTable'; import ExtraFileTable from 'MovieFile/Extras/ExtraFileTable'; import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector'; import QualityProfileNameConnector from 'Settings/Profiles/Quality/QualityProfileNameConnector'; -import MoviePoster from 'Movie/MoviePoster'; -import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; -import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; -import MovieHistoryTable from 'Movie/History/MovieHistoryTable'; -import MovieTitlesTable from './Titles/MovieTitlesTable'; +import fonts from 'Styles/Variables/fonts'; +import formatBytes from 'Utilities/Number/formatBytes'; +import translate from 'Utilities/String/translate'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; +import MovieCollectionConnector from './../MovieCollectionConnector'; import MovieCastPostersConnector from './Credits/Cast/MovieCastPostersConnector'; import MovieCrewPostersConnector from './Credits/Crew/MovieCrewPostersConnector'; -import MovieCollectionConnector from './../MovieCollectionConnector'; import MovieDetailsLinks from './MovieDetailsLinks'; -import InteractiveSearchTable from 'InteractiveSearch/InteractiveSearchTable'; -import InteractiveSearchFilterMenuConnector from 'InteractiveSearch/InteractiveSearchFilterMenuConnector'; -import MovieTagsConnector from './MovieTagsConnector'; import MovieReleaseDatesConnector from './MovieReleaseDatesConnector'; -import translate from 'Utilities/String/translate'; +import MovieStatusLabel from './MovieStatusLabel'; +import MovieTagsConnector from './MovieTagsConnector'; +import MovieTitlesTable from './Titles/MovieTitlesTable'; import styles from './MovieDetails.css'; const defaultFontSize = parseInt(fonts.defaultFontSize); diff --git a/frontend/src/Movie/Details/MovieDetailsConnector.js b/frontend/src/Movie/Details/MovieDetailsConnector.js index 56da94e7e..e5679f8ae 100644 --- a/frontend/src/Movie/Details/MovieDetailsConnector.js +++ b/frontend/src/Movie/Details/MovieDetailsConnector.js @@ -1,23 +1,23 @@ +import { push } from 'connected-react-router'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { push } from 'connected-react-router'; import { createSelector } from 'reselect'; -import { findCommand, isCommandExecuting } from 'Utilities/Command'; -import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; +import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; +import { clearExtraFiles, fetchExtraFiles } from 'Store/Actions/extraFileActions'; +import { toggleMovieMonitored } from 'Store/Actions/movieActions'; +import { clearMovieCredits, fetchMovieCredits } from 'Store/Actions/movieCreditsActions'; +import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions'; +import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions'; +import { cancelFetchReleases, clearReleases } from 'Store/Actions/releaseActions'; +import { fetchNetImportSchema } from 'Store/Actions/settingsActions'; import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import createCommandsSelector from 'Store/Selectors/createCommandsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; -import { fetchMovieFiles, clearMovieFiles } from 'Store/Actions/movieFileActions'; -import { fetchExtraFiles, clearExtraFiles } from 'Store/Actions/extraFileActions'; -import { fetchMovieCredits, clearMovieCredits } from 'Store/Actions/movieCreditsActions'; -import { toggleMovieMonitored } from 'Store/Actions/movieActions'; -import { fetchQueueDetails, clearQueueDetails } from 'Store/Actions/queueActions'; -import { clearReleases, cancelFetchReleases } from 'Store/Actions/releaseActions'; -import { fetchNetImportSchema } from 'Store/Actions/settingsActions'; -import { executeCommand } from 'Store/Actions/commandActions'; -import * as commandNames from 'Commands/commandNames'; +import { findCommand, isCommandExecuting } from 'Utilities/Command'; +import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import MovieDetails from './MovieDetails'; const selectMovieFiles = createSelector( diff --git a/frontend/src/Movie/Details/MovieDetailsLinks.js b/frontend/src/Movie/Details/MovieDetailsLinks.js index 0048abb94..cdeab6eec 100644 --- a/frontend/src/Movie/Details/MovieDetailsLinks.js +++ b/frontend/src/Movie/Details/MovieDetailsLinks.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds, sizes } from 'Helpers/Props'; import Label from 'Components/Label'; import Link from 'Components/Link/Link'; +import { kinds, sizes } from 'Helpers/Props'; import styles from './MovieDetailsLinks.css'; function MovieDetailsLinks(props) { diff --git a/frontend/src/Movie/Details/MovieDetailsPageConnector.js b/frontend/src/Movie/Details/MovieDetailsPageConnector.js index 26a5564ad..e66505178 100644 --- a/frontend/src/Movie/Details/MovieDetailsPageConnector.js +++ b/frontend/src/Movie/Details/MovieDetailsPageConnector.js @@ -1,14 +1,14 @@ +import { push } from 'connected-react-router'; import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { push } from 'connected-react-router'; -import getErrorMessage from 'Utilities/Object/getErrorMessage'; -import PageContent from 'Components/Page/PageContent'; -import PageContentBody from 'Components/Page/PageContentBody'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import NotFound from 'Components/NotFound'; +import PageContent from 'Components/Page/PageContent'; +import PageContentBody from 'Components/Page/PageContentBody'; +import getErrorMessage from 'Utilities/Object/getErrorMessage'; import MovieDetailsConnector from './MovieDetailsConnector'; import styles from './MovieDetails.css'; diff --git a/frontend/src/Movie/Details/MovieReleaseDates.js b/frontend/src/Movie/Details/MovieReleaseDates.js index ace6fe4be..4679faf56 100644 --- a/frontend/src/Movie/Details/MovieReleaseDates.js +++ b/frontend/src/Movie/Details/MovieReleaseDates.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; +import { icons } from 'Helpers/Props'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import styles from './MovieReleaseDates.css'; diff --git a/frontend/src/Movie/Details/MovieTags.js b/frontend/src/Movie/Details/MovieTags.js index 93bb00ae0..0b3e994a1 100644 --- a/frontend/src/Movie/Details/MovieTags.js +++ b/frontend/src/Movie/Details/MovieTags.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds, sizes } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds, sizes } from 'Helpers/Props'; function MovieTags({ tags }) { return ( diff --git a/frontend/src/Movie/Details/Titles/MovieTitlesRow.js b/frontend/src/Movie/Details/Titles/MovieTitlesRow.js index 6b4efb775..ea12bbd97 100644 --- a/frontend/src/Movie/Details/Titles/MovieTitlesRow.js +++ b/frontend/src/Movie/Details/Titles/MovieTitlesRow.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; import MovieLanguage from 'Movie/MovieLanguage'; +import titleCase from 'Utilities/String/titleCase'; class MovieTitlesRow extends Component { diff --git a/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js b/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js index ac2bfe966..b105327cf 100644 --- a/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js +++ b/frontend/src/Movie/Details/Titles/MovieTitlesTableContent.js @@ -3,8 +3,8 @@ import React, { Component } from 'react'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import styles from './MovieTitlesTableContent.css'; import MovieTitlesRow from './MovieTitlesRow'; +import styles from './MovieTitlesTableContent.css'; const columns = [ { diff --git a/frontend/src/Movie/Edit/EditMovieModalContent.js b/frontend/src/Movie/Edit/EditMovieModalContent.js index 4e5e4770e..9e59387a7 100644 --- a/frontend/src/Movie/Edit/EditMovieModalContent.js +++ b/frontend/src/Movie/Edit/EditMovieModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import MoveMovieModal from 'Movie/MoveMovie/MoveMovieModal'; import translate from 'Utilities/String/translate'; import styles from './EditMovieModalContent.css'; diff --git a/frontend/src/Movie/Edit/EditMovieModalContentConnector.js b/frontend/src/Movie/Edit/EditMovieModalContentConnector.js index 11971a69e..298f934ad 100644 --- a/frontend/src/Movie/Edit/EditMovieModalContentConnector.js +++ b/frontend/src/Movie/Edit/EditMovieModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import selectSettings from 'Store/Selectors/selectSettings'; +import { saveMovie, setMovieValue } from 'Store/Actions/movieActions'; import createMovieSelector from 'Store/Selectors/createMovieSelector'; -import { setMovieValue, saveMovie } from 'Store/Actions/movieActions'; +import selectSettings from 'Store/Selectors/selectSettings'; import EditMovieModalContent from './EditMovieModalContent'; function createIsPathChangingSelector() { diff --git a/frontend/src/Movie/Editor/Delete/DeleteMovieModalContent.js b/frontend/src/Movie/Editor/Delete/DeleteMovieModalContent.js index 25bb792d0..cd9f6c4f0 100644 --- a/frontend/src/Movie/Editor/Delete/DeleteMovieModalContent.js +++ b/frontend/src/Movie/Editor/Delete/DeleteMovieModalContent.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './DeleteMovieModalContent.css'; diff --git a/frontend/src/Movie/Editor/Delete/DeleteMovieModalContentConnector.js b/frontend/src/Movie/Editor/Delete/DeleteMovieModalContentConnector.js index c7f005cb4..493f158c8 100644 --- a/frontend/src/Movie/Editor/Delete/DeleteMovieModalContentConnector.js +++ b/frontend/src/Movie/Editor/Delete/DeleteMovieModalContentConnector.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import { bulkDeleteMovie } from 'Store/Actions/movieIndexActions'; +import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import DeleteMovieModalContent from './DeleteMovieModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Editor/MovieEditorFooter.js b/frontend/src/Movie/Editor/MovieEditorFooter.js index d62acd996..311e7ffc9 100644 --- a/frontend/src/Movie/Editor/MovieEditorFooter.js +++ b/frontend/src/Movie/Editor/MovieEditorFooter.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; -import SelectInput from 'Components/Form/SelectInput'; import AvailabilitySelectInput from 'Components/Form/AvailabilitySelectInput'; import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector'; import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector'; +import SelectInput from 'Components/Form/SelectInput'; import SpinnerButton from 'Components/Link/SpinnerButton'; import PageContentFooter from 'Components/Page/PageContentFooter'; +import { kinds } from 'Helpers/Props'; import MoveMovieModal from 'Movie/MoveMovie/MoveMovieModal'; -import TagsModal from './Tags/TagsModal'; +import translate from 'Utilities/String/translate'; import DeleteMovieModal from './Delete/DeleteMovieModal'; import MovieEditorFooterLabel from './MovieEditorFooterLabel'; -import translate from 'Utilities/String/translate'; +import TagsModal from './Tags/TagsModal'; import styles from './MovieEditorFooter.css'; const NO_CHANGE = 'noChange'; diff --git a/frontend/src/Movie/Editor/MovieEditorFooterLabel.js b/frontend/src/Movie/Editor/MovieEditorFooterLabel.js index df3775f65..805ecd39e 100644 --- a/frontend/src/Movie/Editor/MovieEditorFooterLabel.js +++ b/frontend/src/Movie/Editor/MovieEditorFooterLabel.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import SpinnerIcon from 'Components/SpinnerIcon'; +import { icons } from 'Helpers/Props'; import styles from './MovieEditorFooterLabel.css'; function MovieEditorFooterLabel(props) { diff --git a/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContent.js b/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContent.js index 3f5c0601a..1b226e7b9 100644 --- a/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContent.js +++ b/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContent.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Button from 'Components/Link/Button'; import Icon from 'Components/Icon'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { icons, kinds } from 'Helpers/Props'; import styles from './OrganizeMovieModalContent.css'; function OrganizeMovieModalContent(props) { diff --git a/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContentConnector.js b/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContentConnector.js index 43dc877b6..de10d9a97 100644 --- a/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContentConnector.js +++ b/frontend/src/Movie/Editor/Organize/OrganizeMovieModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; -import { executeCommand } from 'Store/Actions/commandActions'; import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; +import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import OrganizeMovieModalContent from './OrganizeMovieModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Editor/Tags/TagsModalContent.js b/frontend/src/Movie/Editor/Tags/TagsModalContent.js index e03ef4a28..41e1ccb45 100644 --- a/frontend/src/Movie/Editor/Tags/TagsModalContent.js +++ b/frontend/src/Movie/Editor/Tags/TagsModalContent.js @@ -1,17 +1,17 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds, sizes } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Label from 'Components/Label'; import Button from 'Components/Link/Button'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds, sizes } from 'Helpers/Props'; import styles from './TagsModalContent.css'; class TagsModalContent extends Component { diff --git a/frontend/src/Movie/History/MovieHistoryRow.js b/frontend/src/Movie/History/MovieHistoryRow.js index af676e02b..894cf7203 100644 --- a/frontend/src/Movie/History/MovieHistoryRow.js +++ b/frontend/src/Movie/History/MovieHistoryRow.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; +import HistoryDetailsModal from 'Activity/History/Details/HistoryDetailsModal'; +import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; -import MovieQuality from 'Movie/MovieQuality'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; -import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell'; -import HistoryDetailsModal from 'Activity/History/Details/HistoryDetailsModal'; +import MovieQuality from 'Movie/MovieQuality'; import styles from './MovieHistoryRow.css'; class MovieHistoryRow extends Component { diff --git a/frontend/src/Movie/History/MovieHistoryTableContent.js b/frontend/src/Movie/History/MovieHistoryTableContent.js index 3f4d2bb18..4b1c50ab2 100644 --- a/frontend/src/Movie/History/MovieHistoryTableContent.js +++ b/frontend/src/Movie/History/MovieHistoryTableContent.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import MovieHistoryRowConnector from './MovieHistoryRowConnector'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import MovieHistoryRowConnector from './MovieHistoryRowConnector'; import styles from './MovieHistoryTableContent.css'; const columns = [ diff --git a/frontend/src/Movie/History/MovieHistoryTableContentConnector.js b/frontend/src/Movie/History/MovieHistoryTableContentConnector.js index dc50c01c4..96b0ac520 100644 --- a/frontend/src/Movie/History/MovieHistoryTableContentConnector.js +++ b/frontend/src/Movie/History/MovieHistoryTableContentConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchMovieHistory, clearMovieHistory, movieHistoryMarkAsFailed } from 'Store/Actions/movieHistoryActions'; +import { clearMovieHistory, fetchMovieHistory, movieHistoryMarkAsFailed } from 'Store/Actions/movieHistoryActions'; import MovieHistoryTableContent from './MovieHistoryTableContent'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.js b/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.js index 605cfd3f7..a34f310a9 100644 --- a/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.js +++ b/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align } from 'Helpers/Props'; import FilterMenu from 'Components/Menu/FilterMenu'; +import { align } from 'Helpers/Props'; import MovieIndexFilterModalConnector from 'Movie/Index/MovieIndexFilterModalConnector'; function MovieIndexFilterMenu(props) { diff --git a/frontend/src/Movie/Index/Menus/MovieIndexSearchMenu.js b/frontend/src/Movie/Index/Menus/MovieIndexSearchMenu.js index c3cee3a04..91c147a47 100644 --- a/frontend/src/Movie/Index/Menus/MovieIndexSearchMenu.js +++ b/frontend/src/Movie/Index/Menus/MovieIndexSearchMenu.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { align, icons } from 'Helpers/Props'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; -import ToolbarMenuButton from 'Components/Menu/ToolbarMenuButton'; import SearchMenuItem from 'Components/Menu/SearchMenuItem'; +import ToolbarMenuButton from 'Components/Menu/ToolbarMenuButton'; +import { align, icons } from 'Helpers/Props'; class MovieIndexSearchMenu extends Component { diff --git a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js index e87519cfd..6b30d38ca 100644 --- a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js +++ b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align, sortDirections } from 'Helpers/Props'; -import SortMenu from 'Components/Menu/SortMenu'; import MenuContent from 'Components/Menu/MenuContent'; +import SortMenu from 'Components/Menu/SortMenu'; import SortMenuItem from 'Components/Menu/SortMenuItem'; +import { align, sortDirections } from 'Helpers/Props'; function MovieIndexSortMenu(props) { const { diff --git a/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.js b/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.js index 30cb6bd66..107ae0ba2 100644 --- a/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.js +++ b/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align } from 'Helpers/Props'; -import ViewMenu from 'Components/Menu/ViewMenu'; import MenuContent from 'Components/Menu/MenuContent'; +import ViewMenu from 'Components/Menu/ViewMenu'; import ViewMenuItem from 'Components/Menu/ViewMenuItem'; +import { align } from 'Helpers/Props'; function MovieIndexViewMenu(props) { const { diff --git a/frontend/src/Movie/Index/MovieIndex.js b/frontend/src/Movie/Index/MovieIndex.js index de4ef858f..91e747ff2 100644 --- a/frontend/src/Movie/Index/MovieIndex.js +++ b/frontend/src/Movie/Index/MovieIndex.js @@ -1,37 +1,37 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import getErrorMessage from 'Utilities/Object/getErrorMessage'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { align, icons, kinds, sortDirections } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import ConfirmModal from 'Components/Modal/ConfirmModal'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageJumpBar from 'Components/Page/PageJumpBar'; -import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import ConfirmModal from 'Components/Modal/ConfirmModal'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import { align, icons, kinds, sortDirections } from 'Helpers/Props'; +import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; +import MovieEditorFooter from 'Movie/Editor/MovieEditorFooter.js'; +import OrganizeMovieModal from 'Movie/Editor/Organize/OrganizeMovieModal'; import NoMovie from 'Movie/NoMovie'; -import MovieIndexTableConnector from './Table/MovieIndexTableConnector'; -import MovieIndexTableOptionsConnector from './Table/MovieIndexTableOptionsConnector'; -import MovieIndexPosterOptionsModal from './Posters/Options/MovieIndexPosterOptionsModal'; -import MovieIndexPostersConnector from './Posters/MovieIndexPostersConnector'; -import MovieIndexOverviewOptionsModal from './Overview/Options/MovieIndexOverviewOptionsModal'; -import MovieIndexOverviewsConnector from './Overview/MovieIndexOverviewsConnector'; +import getErrorMessage from 'Utilities/Object/getErrorMessage'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; +import translate from 'Utilities/String/translate'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; import MovieIndexFilterMenu from './Menus/MovieIndexFilterMenu'; import MovieIndexSortMenu from './Menus/MovieIndexSortMenu'; import MovieIndexViewMenu from './Menus/MovieIndexViewMenu'; import MovieIndexFooterConnector from './MovieIndexFooterConnector'; -import MovieEditorFooter from 'Movie/Editor/MovieEditorFooter.js'; -import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; -import OrganizeMovieModal from 'Movie/Editor/Organize/OrganizeMovieModal'; -import translate from 'Utilities/String/translate'; +import MovieIndexOverviewsConnector from './Overview/MovieIndexOverviewsConnector'; +import MovieIndexOverviewOptionsModal from './Overview/Options/MovieIndexOverviewOptionsModal'; +import MovieIndexPostersConnector from './Posters/MovieIndexPostersConnector'; +import MovieIndexPosterOptionsModal from './Posters/Options/MovieIndexPosterOptionsModal'; +import MovieIndexTableConnector from './Table/MovieIndexTableConnector'; +import MovieIndexTableOptionsConnector from './Table/MovieIndexTableOptionsConnector'; import styles from './MovieIndex.css'; function getViewComponent(view) { diff --git a/frontend/src/Movie/Index/MovieIndexConnector.js b/frontend/src/Movie/Index/MovieIndexConnector.js index a3f11770a..3051d7aad 100644 --- a/frontend/src/Movie/Index/MovieIndexConnector.js +++ b/frontend/src/Movie/Index/MovieIndexConnector.js @@ -2,15 +2,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; -import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; -import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; -import scrollPositions from 'Store/scrollPositions'; -import { setMovieSort, setMovieFilter, setMovieView, setMovieTableOption, saveMovieEditor } from 'Store/Actions/movieIndexActions'; -import { executeCommand } from 'Store/Actions/commandActions'; import * as commandNames from 'Commands/commandNames'; import withScrollPosition from 'Components/withScrollPosition'; +import { executeCommand } from 'Store/Actions/commandActions'; +import { saveMovieEditor, setMovieFilter, setMovieSort, setMovieTableOption, setMovieView } from 'Store/Actions/movieIndexActions'; +import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; +import scrollPositions from 'Store/scrollPositions'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector'; import MovieIndex from './MovieIndex'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Index/MovieIndexFilterModalConnector.js b/frontend/src/Movie/Index/MovieIndexFilterModalConnector.js index c3994ba60..ff95111d6 100644 --- a/frontend/src/Movie/Index/MovieIndexFilterModalConnector.js +++ b/frontend/src/Movie/Index/MovieIndexFilterModalConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { setMovieFilter } from 'Store/Actions/movieIndexActions'; import FilterModal from 'Components/Filter/FilterModal'; +import { setMovieFilter } from 'Store/Actions/movieIndexActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/Movie/Index/MovieIndexFooter.js b/frontend/src/Movie/Index/MovieIndexFooter.js index 62104df1b..5e87a4cbe 100644 --- a/frontend/src/Movie/Index/MovieIndexFooter.js +++ b/frontend/src/Movie/Index/MovieIndexFooter.js @@ -1,10 +1,10 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { PureComponent } from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; import DescriptionList from 'Components/DescriptionList/DescriptionList'; import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem'; +import formatBytes from 'Utilities/Number/formatBytes'; import styles from './MovieIndexFooter.css'; -import classNames from 'classnames'; class MovieIndexFooter extends PureComponent { diff --git a/frontend/src/Movie/Index/MovieIndexFooterConnector.js b/frontend/src/Movie/Index/MovieIndexFooterConnector.js index a905f1543..ac017036f 100644 --- a/frontend/src/Movie/Index/MovieIndexFooterConnector.js +++ b/frontend/src/Movie/Index/MovieIndexFooterConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createDeepEqualSelector from 'Store/Selectors/createDeepEqualSelector'; import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector'; +import createDeepEqualSelector from 'Store/Selectors/createDeepEqualSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import MovieIndexFooter from './MovieIndexFooter'; diff --git a/frontend/src/Movie/Index/MovieIndexItemConnector.js b/frontend/src/Movie/Index/MovieIndexItemConnector.js index aa0b803c6..6a898cce0 100644 --- a/frontend/src/Movie/Index/MovieIndexItemConnector.js +++ b/frontend/src/Movie/Index/MovieIndexItemConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createMovieSelector from 'Store/Selectors/createMovieSelector'; +import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; import createExecutingCommandsSelector from 'Store/Selectors/createExecutingCommandsSelector'; import createMovieQualityProfileSelector from 'Store/Selectors/createMovieQualityProfileSelector'; -import { executeCommand } from 'Store/Actions/commandActions'; -import * as commandNames from 'Commands/commandNames'; +import createMovieSelector from 'Store/Selectors/createMovieSelector'; function selectShowSearchAction() { return createSelector( diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverview.js b/frontend/src/Movie/Index/Overview/MovieIndexOverview.js index 38cc56999..0ed3f4279 100644 --- a/frontend/src/Movie/Index/Overview/MovieIndexOverview.js +++ b/frontend/src/Movie/Index/Overview/MovieIndexOverview.js @@ -1,22 +1,22 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import TextTruncate from 'react-text-truncate'; -import { icons } from 'Helpers/Props'; -import dimensions from 'Styles/Variables/dimensions'; -import fonts from 'Styles/Variables/fonts'; +import CheckInput from 'Components/Form/CheckInput'; +import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; -import CheckInput from 'Components/Form/CheckInput'; -import MoviePoster from 'Movie/MoviePoster'; -import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; +import Popover from 'Components/Tooltip/Popover'; +import { icons } from 'Helpers/Props'; import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; +import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar'; +import MoviePoster from 'Movie/MoviePoster'; +import dimensions from 'Styles/Variables/dimensions'; +import fonts from 'Styles/Variables/fonts'; import MovieIndexOverviewInfo from './MovieIndexOverviewInfo'; import styles from './MovieIndexOverview.css'; -import Icon from 'Components/Icon'; -import Popover from 'Components/Tooltip/Popover'; -import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; const columnPadding = parseInt(dimensions.movieIndexColumnPadding); const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen); diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.js b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.js index f69c928ee..1135a1f69 100644 --- a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.js +++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; +import { icons } from 'Helpers/Props'; +import dimensions from 'Styles/Variables/dimensions'; import formatDateTime from 'Utilities/Date/formatDateTime'; import getRelativeDate from 'Utilities/Date/getRelativeDate'; import formatBytes from 'Utilities/Number/formatBytes'; -import { icons } from 'Helpers/Props'; -import dimensions from 'Styles/Variables/dimensions'; import MovieIndexOverviewInfoRow from './MovieIndexOverviewInfoRow'; import styles from './MovieIndexOverviewInfo.css'; diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js b/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js index 227e75112..10fc3e724 100644 --- a/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js +++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Grid, WindowScroller } from 'react-virtualized'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; import MovieIndexItemConnector from 'Movie/Index/MovieIndexItemConnector'; +import dimensions from 'Styles/Variables/dimensions'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import MovieIndexOverview from './MovieIndexOverview'; import styles from './MovieIndexOverviews.css'; diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviewsConnector.js b/frontend/src/Movie/Index/Overview/MovieIndexOverviewsConnector.js index bd9f5217d..4a46dc1c1 100644 --- a/frontend/src/Movie/Index/Overview/MovieIndexOverviewsConnector.js +++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviewsConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import MovieIndexOverviews from './MovieIndexOverviews'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModalContent.js b/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModalContent.js index 01a682892..ddab3f4e5 100644 --- a/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModalContent.js +++ b/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModalContent.js @@ -1,16 +1,16 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; const posterSizeOptions = [ { key: 'small', value: 'Small' }, diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js index f4fd68c4f..9f6a618d1 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js @@ -1,20 +1,20 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import IconButton from 'Components/Link/IconButton'; import CheckInput from 'Components/Form/CheckInput'; -import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; +import Icon from 'Components/Icon'; import Label from 'Components/Label'; +import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; -import MoviePoster from 'Movie/MoviePoster'; -import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; +import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; +import Popover from 'Components/Tooltip/Popover'; +import { icons } from 'Helpers/Props'; import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; +import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar'; +import MoviePoster from 'Movie/MoviePoster'; import MovieIndexPosterInfo from './MovieIndexPosterInfo'; import styles from './MovieIndexPoster.css'; -import Icon from 'Components/Icon'; -import Popover from 'Components/Tooltip/Popover'; -import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; class MovieIndexPoster extends Component { diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosters.js b/frontend/src/Movie/Index/Posters/MovieIndexPosters.js index 606a298f1..68463b39c 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPosters.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPosters.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Grid, WindowScroller } from 'react-virtualized'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; -import dimensions from 'Styles/Variables/dimensions'; import Measure from 'Components/Measure'; import MovieIndexItemConnector from 'Movie/Index/MovieIndexItemConnector'; +import dimensions from 'Styles/Variables/dimensions'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; +import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; import MovieIndexPoster from './MovieIndexPoster'; import styles from './MovieIndexPosters.css'; diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPostersConnector.js b/frontend/src/Movie/Index/Posters/MovieIndexPostersConnector.js index 7279ff0d9..c54804957 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPostersConnector.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPostersConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; +import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import MovieIndexPosters from './MovieIndexPosters'; function createMapStateToProps() { diff --git a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js index c1531b04d..b75bc606a 100644 --- a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js +++ b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js @@ -1,16 +1,16 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; const posterSizeOptions = [ { key: 'small', value: 'Small' }, diff --git a/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.js b/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.js index 73e00bb29..0b6ccadb8 100644 --- a/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.js +++ b/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import getProgressBarKind from 'Utilities/Movie/getProgressBarKind'; -import { sizes } from 'Helpers/Props'; import ProgressBar from 'Components/ProgressBar'; +import { sizes } from 'Helpers/Props'; +import getProgressBarKind from 'Utilities/Movie/getProgressBarKind'; import styles from './MovieIndexProgressBar.css'; function MovieIndexProgressBar(props) { diff --git a/frontend/src/Movie/Index/Table/MovieIndexActionsCell.js b/frontend/src/Movie/Index/Table/MovieIndexActionsCell.js index 92cead8a0..afccd7c73 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexActionsCell.js +++ b/frontend/src/Movie/Index/Table/MovieIndexActionsCell.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; -import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; +import { icons } from 'Helpers/Props'; import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; +import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; class MovieIndexActionsCell extends Component { diff --git a/frontend/src/Movie/Index/Table/MovieIndexHeader.js b/frontend/src/Movie/Index/Table/MovieIndexHeader.js index 20546de14..e961e094f 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexHeader.js +++ b/frontend/src/Movie/Index/Table/MovieIndexHeader.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; +import TableOptionsModal from 'Components/Table/TableOptions/TableOptionsModal'; import VirtualTableHeader from 'Components/Table/VirtualTableHeader'; import VirtualTableHeaderCell from 'Components/Table/VirtualTableHeaderCell'; import VirtualTableSelectAllHeaderCell from 'Components/Table/VirtualTableSelectAllHeaderCell'; -import TableOptionsModal from 'Components/Table/TableOptions/TableOptionsModal'; +import { icons } from 'Helpers/Props'; import MovieIndexTableOptionsConnector from './MovieIndexTableOptionsConnector'; import styles from './MovieIndexHeader.css'; diff --git a/frontend/src/Movie/Index/Table/MovieIndexRow.js b/frontend/src/Movie/Index/Table/MovieIndexRow.js index 4db68797d..085711f7d 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexRow.js +++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js @@ -1,24 +1,24 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons } from 'Helpers/Props'; import HeartRating from 'Components/HeartRating'; +import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; -import TagListConnector from 'Components/TagListConnector'; -import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import MovieTitleLink from 'Movie/MovieTitleLink'; -import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; -import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; -import MovieStatusCell from './MovieStatusCell'; -import MovieFileStatusConnector from 'Movie/MovieFileStatusConnector'; +import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell'; import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell'; -import styles from './MovieIndexRow.css'; -import Icon from 'Components/Icon'; +import TagListConnector from 'Components/TagListConnector'; import Popover from 'Components/Tooltip/Popover'; +import { icons } from 'Helpers/Props'; +import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal'; import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks'; +import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector'; +import MovieFileStatusConnector from 'Movie/MovieFileStatusConnector'; +import MovieTitleLink from 'Movie/MovieTitleLink'; +import formatBytes from 'Utilities/Number/formatBytes'; +import titleCase from 'Utilities/String/titleCase'; +import MovieStatusCell from './MovieStatusCell'; +import styles from './MovieIndexRow.css'; class MovieIndexRow extends Component { diff --git a/frontend/src/Movie/Index/Table/MovieIndexTable.js b/frontend/src/Movie/Index/Table/MovieIndexTable.js index d3180e9e0..a8b409bff 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexTable.js +++ b/frontend/src/Movie/Index/Table/MovieIndexTable.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; -import { sortDirections } from 'Helpers/Props'; import VirtualTable from 'Components/Table/VirtualTable'; import VirtualTableRow from 'Components/Table/VirtualTableRow'; +import { sortDirections } from 'Helpers/Props'; import MovieIndexItemConnector from 'Movie/Index/MovieIndexItemConnector'; +import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter'; import MovieIndexHeaderConnector from './MovieIndexHeaderConnector'; import MovieIndexRow from './MovieIndexRow'; import styles from './MovieIndexTable.css'; diff --git a/frontend/src/Movie/Index/Table/MovieIndexTableOptions.js b/frontend/src/Movie/Index/Table/MovieIndexTableOptions.js index 169d390f3..8e0ef1706 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexTableOptions.js +++ b/frontend/src/Movie/Index/Table/MovieIndexTableOptions.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes } from 'Helpers/Props'; class MovieIndexTableOptions extends Component { diff --git a/frontend/src/Movie/Index/Table/MovieStatusCell.js b/frontend/src/Movie/Index/Table/MovieStatusCell.js index ee5a2b9b0..68af14721 100644 --- a/frontend/src/Movie/Index/Table/MovieStatusCell.js +++ b/frontend/src/Movie/Index/Table/MovieStatusCell.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell'; +import { icons } from 'Helpers/Props'; import { getMovieStatusDetails } from 'Movie/MovieStatus'; import styles from './MovieStatusCell.css'; diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.js b/frontend/src/Movie/MoveMovie/MoveMovieModal.js index 04bb45e37..c1117fa10 100644 --- a/frontend/src/Movie/MoveMovie/MoveMovieModal.js +++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds, sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds, sizes } from 'Helpers/Props'; import styles from './MoveMovieModal.css'; function MoveMovieModal(props) { diff --git a/frontend/src/Movie/MovieCollectionConnector.js b/frontend/src/Movie/MovieCollectionConnector.js index 43a6718d0..2cc5ec7a3 100644 --- a/frontend/src/Movie/MovieCollectionConnector.js +++ b/frontend/src/Movie/MovieCollectionConnector.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { createSelector } from 'reselect'; import { connect } from 'react-redux'; -import createMovieSelector from 'Store/Selectors/createMovieSelector'; +import { createSelector } from 'reselect'; +import { saveNetImport, selectNetImportSchema, setNetImportFieldValue, setNetImportValue } from 'Store/Actions/settingsActions'; import createMovieCollectionListSelector from 'Store/Selectors/createMovieCollectionListSelector'; -import { selectNetImportSchema, setNetImportValue, setNetImportFieldValue, saveNetImport } from 'Store/Actions/settingsActions'; +import createMovieSelector from 'Store/Selectors/createMovieSelector'; import MovieCollection from './MovieCollection'; function createMapStateToProps() { diff --git a/frontend/src/Movie/MovieFileStatus.js b/frontend/src/Movie/MovieFileStatus.js index f357ee242..1d6438af1 100644 --- a/frontend/src/Movie/MovieFileStatus.js +++ b/frontend/src/Movie/MovieFileStatus.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; +import QueueDetails from 'Activity/Queue/QueueDetails'; import Icon from 'Components/Icon'; +import Label from 'Components/Label'; import ProgressBar from 'Components/ProgressBar'; -import QueueDetails from 'Activity/Queue/QueueDetails'; +import { icons, kinds, sizes } from 'Helpers/Props'; import MovieQuality from 'Movie/MovieQuality'; -import Label from 'Components/Label'; import styles from './MovieFileStatus.css'; function MovieFileStatus(props) { diff --git a/frontend/src/Movie/MovieFormats.js b/frontend/src/Movie/MovieFormats.js index f2bd194b0..9e8051be3 100644 --- a/frontend/src/Movie/MovieFormats.js +++ b/frontend/src/Movie/MovieFormats.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; function MovieFormats({ formats }) { return ( diff --git a/frontend/src/Movie/MovieLanguage.js b/frontend/src/Movie/MovieLanguage.js index 0527c38bd..63c58e764 100644 --- a/frontend/src/Movie/MovieLanguage.js +++ b/frontend/src/Movie/MovieLanguage.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; import Label from 'Components/Label'; -import { kinds, tooltipPositions } from 'Helpers/Props'; import Popover from 'Components/Tooltip/Popover'; +import { kinds, tooltipPositions } from 'Helpers/Props'; function MovieLanguage(props) { const { diff --git a/frontend/src/Movie/MovieQuality.js b/frontend/src/Movie/MovieQuality.js index 818bbfc5a..ba4d4cc09 100644 --- a/frontend/src/Movie/MovieQuality.js +++ b/frontend/src/Movie/MovieQuality.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { kinds } from 'Helpers/Props'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) { const revision = quality.revision; diff --git a/frontend/src/Movie/NoMovie.js b/frontend/src/Movie/NoMovie.js index 6780dd5e0..580417955 100644 --- a/frontend/src/Movie/NoMovie.js +++ b/frontend/src/Movie/NoMovie.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { kinds } from 'Helpers/Props'; import Button from 'Components/Link/Button'; +import { kinds } from 'Helpers/Props'; import styles from './NoMovie.css'; function NoMovie(props) { diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorRow.js b/frontend/src/MovieFile/Editor/MovieFileEditorRow.js index 7a494cfa0..3284bb6a8 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorRow.js +++ b/frontend/src/MovieFile/Editor/MovieFileEditorRow.js @@ -1,22 +1,22 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; import IconButton from 'Components/Link/IconButton'; -import { icons, kinds } from 'Helpers/Props'; -import TableRow from 'Components/Table/TableRow'; +import ConfirmModal from 'Components/Modal/ConfirmModal'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton'; -import MovieQuality from 'Movie/MovieQuality'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; -import ConfirmModal from 'Components/Modal/ConfirmModal'; -import SelectQualityModal from 'MovieFile/Quality/SelectQualityModal'; +import MovieQuality from 'Movie/MovieQuality'; import SelectLanguageModal from 'MovieFile/Language/SelectLanguageModal'; -import * as mediaInfoTypes from 'MovieFile/mediaInfoTypes'; import MediaInfoConnector from 'MovieFile/MediaInfoConnector'; -import MovieFileRowCellPlaceholder from './MovieFileRowCellPlaceholder'; -import FileDetailsModal from '../FileDetailsModal'; +import * as mediaInfoTypes from 'MovieFile/mediaInfoTypes'; +import SelectQualityModal from 'MovieFile/Quality/SelectQualityModal'; +import formatBytes from 'Utilities/Number/formatBytes'; import translate from 'Utilities/String/translate'; +import FileDetailsModal from '../FileDetailsModal'; +import MovieFileRowCellPlaceholder from './MovieFileRowCellPlaceholder'; import styles from './MovieFileEditorRow.css'; class MovieFileEditorRow extends Component { diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js b/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js index 3938a9678..3b0d85813 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js +++ b/frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { icons } from 'Helpers/Props'; import MovieFileEditorRow from './MovieFileEditorRow'; import styles from './MovieFileEditorTableContent.css'; diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js b/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js index c5da66d51..6b69480ea 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js +++ b/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import getQualities from 'Utilities/Quality/getQualities'; -import createMovieSelector from 'Store/Selectors/createMovieSelector'; import { deleteMovieFile, updateMovieFiles } from 'Store/Actions/movieFileActions'; -import { fetchQualityProfileSchema, fetchLanguages } from 'Store/Actions/settingsActions'; +import { fetchLanguages, fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; +import createMovieSelector from 'Store/Selectors/createMovieSelector'; +import getQualities from 'Utilities/Quality/getQualities'; import MovieFileEditorTableContent from './MovieFileEditorTableContent'; function createMapStateToProps() { diff --git a/frontend/src/MovieFile/Extras/ExtraFileRow.js b/frontend/src/MovieFile/Extras/ExtraFileRow.js index cc626b3e7..d0888db2c 100644 --- a/frontend/src/MovieFile/Extras/ExtraFileRow.js +++ b/frontend/src/MovieFile/Extras/ExtraFileRow.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import IconButton from 'Components/Link/IconButton'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; import { icons } from 'Helpers/Props'; import titleCase from 'Utilities/String/titleCase'; -import TableRow from 'Components/Table/TableRow'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; import styles from './ExtraFileRow.css'; class ExtraFileRow extends Component { diff --git a/frontend/src/MovieFile/Extras/ExtraFileTableContent.js b/frontend/src/MovieFile/Extras/ExtraFileTableContent.js index ddfc81e6a..d9a3a345e 100644 --- a/frontend/src/MovieFile/Extras/ExtraFileTableContent.js +++ b/frontend/src/MovieFile/Extras/ExtraFileTableContent.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import IconButton from 'Components/Link/IconButton'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { icons } from 'Helpers/Props'; import ExtraFileRow from './ExtraFileRow'; import styles from './ExtraFileTableContent.css'; diff --git a/frontend/src/MovieFile/FileDetailsModal.js b/frontend/src/MovieFile/FileDetailsModal.js index 376765817..5c729b346 100644 --- a/frontend/src/MovieFile/FileDetailsModal.js +++ b/frontend/src/MovieFile/FileDetailsModal.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { sizes } from 'Helpers/Props'; import MediaInfoPopover from './Editor/MediaInfoPopover'; function FileDetailsModal(props) { diff --git a/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js b/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js index c7dcf75ac..65adc999e 100644 --- a/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js +++ b/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchLanguages } from 'Store/Actions/settingsActions'; -import { updateMovieFiles } from 'Store/Actions/movieFileActions'; import SelectLanguageModalContent from 'InteractiveImport/Language/SelectLanguageModalContent'; +import { updateMovieFiles } from 'Store/Actions/movieFileActions'; +import { fetchLanguages } from 'Store/Actions/settingsActions'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/MovieFile/MovieFileLanguageConnector.js b/frontend/src/MovieFile/MovieFileLanguageConnector.js index 466b458da..5b541326f 100644 --- a/frontend/src/MovieFile/MovieFileLanguageConnector.js +++ b/frontend/src/MovieFile/MovieFileLanguageConnector.js @@ -1,7 +1,7 @@ +import EpisodeLanguage from 'Episode/EpisodeLanguage'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import createMovieFileSelector from 'Store/Selectors/createMovieFileSelector'; -import EpisodeLanguage from 'Episode/EpisodeLanguage'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/MovieFile/Quality/SelectQualityModalContent.js b/frontend/src/MovieFile/Quality/SelectQualityModalContent.js index 642e0433e..2ca5ca3e9 100644 --- a/frontend/src/MovieFile/Quality/SelectQualityModalContent.js +++ b/frontend/src/MovieFile/Quality/SelectQualityModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import FormLabel from 'Components/Form/FormLabel'; +import Button from 'Components/Link/Button'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; class SelectQualityModalContent extends Component { diff --git a/frontend/src/MovieFile/Quality/SelectQualityModalContentConnector.js b/frontend/src/MovieFile/Quality/SelectQualityModalContentConnector.js index 7ead7d8ee..629ed8043 100644 --- a/frontend/src/MovieFile/Quality/SelectQualityModalContentConnector.js +++ b/frontend/src/MovieFile/Quality/SelectQualityModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import getQualities from 'Utilities/Quality/getQualities'; -import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; import { updateMovieFiles } from 'Store/Actions/movieFileActions'; +import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions'; +import getQualities from 'Utilities/Quality/getQualities'; import SelectQualityModalContent from './SelectQualityModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Organize/OrganizePreviewModalContent.js b/frontend/src/Organize/OrganizePreviewModalContent.js index f562f243c..f89644c8d 100644 --- a/frontend/src/Organize/OrganizePreviewModalContent.js +++ b/frontend/src/Organize/OrganizePreviewModalContent.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; -import selectAll from 'Utilities/Table/selectAll'; -import toggleSelected from 'Utilities/Table/toggleSelected'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; +import CheckInput from 'Components/Form/CheckInput'; import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import CheckInput from 'Components/Form/CheckInput'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; +import getSelectedIds from 'Utilities/Table/getSelectedIds'; +import selectAll from 'Utilities/Table/selectAll'; +import toggleSelected from 'Utilities/Table/toggleSelected'; import OrganizePreviewRow from './OrganizePreviewRow'; import styles from './OrganizePreviewModalContent.css'; diff --git a/frontend/src/Organize/OrganizePreviewModalContentConnector.js b/frontend/src/Organize/OrganizePreviewModalContentConnector.js index d9634e8c0..6a384f4b1 100644 --- a/frontend/src/Organize/OrganizePreviewModalContentConnector.js +++ b/frontend/src/Organize/OrganizePreviewModalContentConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createMovieSelector from 'Store/Selectors/createMovieSelector'; +import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; import { fetchOrganizePreview } from 'Store/Actions/organizePreviewActions'; import { fetchNamingSettings } from 'Store/Actions/settingsActions'; -import { executeCommand } from 'Store/Actions/commandActions'; -import * as commandNames from 'Commands/commandNames'; +import createMovieSelector from 'Store/Selectors/createMovieSelector'; import OrganizePreviewModalContent from './OrganizePreviewModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Organize/OrganizePreviewRow.js b/frontend/src/Organize/OrganizePreviewRow.js index 340232a98..7cad23a5b 100644 --- a/frontend/src/Organize/OrganizePreviewRow.js +++ b/frontend/src/Organize/OrganizePreviewRow.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; -import Icon from 'Components/Icon'; import CheckInput from 'Components/Form/CheckInput'; +import Icon from 'Components/Icon'; +import { icons, kinds } from 'Helpers/Props'; import styles from './OrganizePreviewRow.css'; class OrganizePreviewRow extends Component { diff --git a/frontend/src/RootFolder/RootFolderRow.js b/frontend/src/RootFolder/RootFolderRow.js index 155419bf1..f3550b12e 100644 --- a/frontend/src/RootFolder/RootFolderRow.js +++ b/frontend/src/RootFolder/RootFolderRow.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import formatBytes from 'Utilities/Number/formatBytes'; -import { icons, kinds } from 'Helpers/Props'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; import styles from './RootFolderRow.css'; function RootFolderRow(props) { diff --git a/frontend/src/Settings/AdvancedSettingsButton.js b/frontend/src/Settings/AdvancedSettingsButton.js index 48d9a07f1..92753047a 100644 --- a/frontend/src/Settings/AdvancedSettingsButton.js +++ b/frontend/src/Settings/AdvancedSettingsButton.js @@ -1,9 +1,9 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './AdvancedSettingsButton.css'; diff --git a/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js b/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js index b2968a686..2aa545f92 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js +++ b/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js @@ -3,8 +3,8 @@ import { DndProvider } from 'react-dnd'; import HTML5Backend from 'react-dnd-html5-backend'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; +import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector'; class CustomFormatSettingsConnector extends Component { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js index 21ca174bb..21e5866b8 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditCustomFormatModalConnector from './EditCustomFormatModalConnector'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditCustomFormatModalConnector from './EditCustomFormatModalConnector'; import styles from './CustomFormat.css'; class CustomFormat extends Component { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js index 2c0ad5009..b89d84c73 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import CustomFormat from './CustomFormat'; import EditCustomFormatModalConnector from './EditCustomFormatModalConnector'; -import translate from 'Utilities/String/translate'; import styles from './CustomFormats.css'; class CustomFormats extends Component { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js index bbbb57661..62b0942a9 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormatsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; +import { cloneCustomFormat, deleteCustomFormat, fetchCustomFormats } from 'Store/Actions/settingsActions'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchCustomFormats, deleteCustomFormat, cloneCustomFormat } from 'Store/Actions/settingsActions'; +import sortByName from 'Utilities/Array/sortByName'; import CustomFormats from './CustomFormats'; function createMapStateToProps() { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js index 33455cff2..59b302030 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditCustomFormatModalContentConnector from './EditCustomFormatModalContentConnector'; class EditCustomFormatModal extends Component { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js index 9322edeea..cdba50029 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js @@ -1,24 +1,24 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, inputTypes, kinds } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Icon from 'Components/Icon'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import Specification from './Specifications/Specification'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { icons, inputTypes, kinds } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AddSpecificationModal from './Specifications/AddSpecificationModal'; import EditSpecificationModalConnector from './Specifications/EditSpecificationModalConnector'; -import translate from 'Utilities/String/translate'; +import Specification from './Specifications/Specification'; import styles from './EditCustomFormatModalContent.css'; class EditCustomFormatModalContent extends Component { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js index b3de4d440..1168c7b2b 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { cloneCustomFormatSpecification, deleteCustomFormatSpecification, fetchCustomFormatSpecifications, saveCustomFormat, setCustomFormatValue } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setCustomFormatValue, saveCustomFormat, fetchCustomFormatSpecifications, cloneCustomFormatSpecification, deleteCustomFormatSpecification } from 'Store/Actions/settingsActions'; import EditCustomFormatModalContent from './EditCustomFormatModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js index 0e5c351bc..dc5d428c6 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationItem.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; +import { sizes } from 'Helpers/Props'; import AddSpecificationPresetMenuItem from './AddSpecificationPresetMenuItem'; import styles from './AddSpecificationItem.css'; diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js index fbec16ef9..68911699e 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Link from 'Components/Link/Link'; import Button from 'Components/Link/Button'; +import Link from 'Components/Link/Link'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import AddSpecificationItem from './AddSpecificationItem'; import styles from './AddSpecificationModalContent.css'; diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js index 5b312ecfc..b5c287c35 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditSpecificationModalContentConnector from './EditSpecificationModalContentConnector'; function EditSpecificationModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js index c6946b043..e8d7804b2 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Link from 'Components/Link/Link'; -import Button from 'Components/Link/Button'; -import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; -import ModalBody from 'Components/Modal/ModalBody'; -import ModalFooter from 'Components/Modal/ModalFooter'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import Button from 'Components/Link/Button'; +import Link from 'Components/Link/Link'; +import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; +import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; +import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditSpecificationModalContent.css'; diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js index 3aea8fc01..786245a54 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { clearCustomFormatSpecificationPending, saveCustomFormatSpecification, setCustomFormatSpecificationFieldValue, setCustomFormatSpecificationValue } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setCustomFormatSpecificationValue, setCustomFormatSpecificationFieldValue, saveCustomFormatSpecification, clearCustomFormatSpecificationPending } from 'Store/Actions/settingsActions'; import EditSpecificationModalContent from './EditSpecificationModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js index 110c1852f..8e61758df 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/Specification.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditSpecificationModalConnector from './EditSpecificationModal'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditSpecificationModalConnector from './EditSpecificationModal'; import styles from './Specification.css'; class Specification extends Component { diff --git a/frontend/src/Settings/DownloadClients/DownloadClientSettings.js b/frontend/src/Settings/DownloadClients/DownloadClientSettings.js index a9124db41..fc255502c 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClientSettings.js +++ b/frontend/src/Settings/DownloadClients/DownloadClientSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import { icons } from 'Helpers/Props'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import { icons } from 'Helpers/Props'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import DownloadClientsConnector from './DownloadClients/DownloadClientsConnector'; import DownloadClientOptionsConnector from './Options/DownloadClientOptionsConnector'; diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientItem.js b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientItem.js index 3a2265d28..2ab7b01ac 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientItem.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientItem.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; +import { sizes } from 'Helpers/Props'; import AddDownloadClientPresetMenuItem from './AddDownloadClientPresetMenuItem'; import styles from './AddDownloadClientItem.css'; diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js index a441f4327..d3069369a 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Button from 'Components/Link/Button'; import FieldSet from 'Components/FieldSet'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import AddDownloadClientItem from './AddDownloadClientItem'; import styles from './AddDownloadClientModalContent.css'; diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js index b8baca3ad..5c01b88ac 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditDownloadClientModalConnector from './EditDownloadClientModalConnector'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditDownloadClientModalConnector from './EditDownloadClientModalConnector'; import styles from './DownloadClient.css'; class DownloadClient extends Component { diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js index 6c673472a..6cc33d54f 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import DownloadClient from './DownloadClient'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AddDownloadClientModal from './AddDownloadClientModal'; +import DownloadClient from './DownloadClient'; import EditDownloadClientModalConnector from './EditDownloadClientModalConnector'; -import translate from 'Utilities/String/translate'; import styles from './DownloadClients.css'; class DownloadClients extends Component { diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js index f0328154b..ed8ddffc9 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; +import { deleteDownloadClient, fetchDownloadClients } from 'Store/Actions/settingsActions'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchDownloadClients, deleteDownloadClient } from 'Store/Actions/settingsActions'; +import sortByName from 'Utilities/Array/sortByName'; import DownloadClients from './DownloadClients'; function createMapStateToProps() { diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModal.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModal.js index f6b07599c..4fd6b607d 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModal.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditDownloadClientModalContentConnector from './EditDownloadClientModalContentConnector'; function EditDownloadClientModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalConnector.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalConnector.js index b5e5520fb..e6b06974d 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalConnector.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { clearPendingChanges } from 'Store/Actions/baseActions'; -import { cancelTestDownloadClient, cancelSaveDownloadClient } from 'Store/Actions/settingsActions'; +import { cancelSaveDownloadClient, cancelTestDownloadClient } from 'Store/Actions/settingsActions'; import EditDownloadClientModal from './EditDownloadClientModal'; function createMapDispatchToProps(dispatch, props) { diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js index 3f24a6eac..6039e75dc 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditDownloadClientModalContent.css'; diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js index 75f6f0bc3..864d83cfe 100644 --- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js +++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveDownloadClient, setDownloadClientFieldValue, setDownloadClientValue, testDownloadClient } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setDownloadClientValue, setDownloadClientFieldValue, saveDownloadClient, testDownloadClient } from 'Store/Actions/settingsActions'; import EditDownloadClientModalContent from './EditDownloadClientModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js index 9d02c96cc..a52b351ac 100644 --- a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js +++ b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { inputTypes, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function DownloadClientOptions(props) { diff --git a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js index f6cd7eb4f..34ec88253 100644 --- a/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js +++ b/frontend/src/Settings/DownloadClients/Options/DownloadClientOptionsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { fetchDownloadClientOptions, setDownloadClientOptionsValue, saveDownloadClientOptions } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchDownloadClientOptions, saveDownloadClientOptions, setDownloadClientOptionsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import DownloadClientOptions from './DownloadClientOptions'; const SECTION = 'downloadClientOptions'; diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModal.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModal.js index f66113619..9016f14e7 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModal.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditRemotePathMappingModalContentConnector from './EditRemotePathMappingModalContentConnector'; function EditRemotePathMappingModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js index 8ffc116f0..01f86736d 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; -import { stringSettingShape } from 'Helpers/Props/Shapes/settingShape'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; +import { stringSettingShape } from 'Helpers/Props/Shapes/settingShape'; import translate from 'Utilities/String/translate'; import styles from './EditRemotePathMappingModalContent.css'; diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContentConnector.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContentConnector.js index df7f59f52..5854f17b9 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContentConnector.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveRemotePathMapping, setRemotePathMappingValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import { setRemotePathMappingValue, saveRemotePathMapping } from 'Store/Actions/settingsActions'; import EditRemotePathMappingModalContent from './EditRemotePathMappingModalContent'; const newRemotePathMapping = { diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.js index 594082a81..79a18f423 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.js @@ -1,12 +1,12 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditRemotePathMappingModalConnector from './EditRemotePathMappingModalConnector'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditRemotePathMappingModalConnector from './EditRemotePathMappingModalConnector'; import styles from './RemotePathMapping.css'; class RemotePathMapping extends Component { diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js index d895de650..6189edbe1 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import RemotePathMapping from './RemotePathMapping'; -import EditRemotePathMappingModalConnector from './EditRemotePathMappingModalConnector'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditRemotePathMappingModalConnector from './EditRemotePathMappingModalConnector'; +import RemotePathMapping from './RemotePathMapping'; import styles from './RemotePathMappings.css'; class RemotePathMappings extends Component { diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappingsConnector.js b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappingsConnector.js index 4900119a3..eabdae228 100644 --- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappingsConnector.js +++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappingsConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchRemotePathMappings, deleteRemotePathMapping } from 'Store/Actions/settingsActions'; +import { deleteRemotePathMapping, fetchRemotePathMappings } from 'Store/Actions/settingsActions'; import RemotePathMappings from './RemotePathMappings'; function createMapStateToProps() { diff --git a/frontend/src/Settings/General/AnalyticSettings.js b/frontend/src/Settings/General/AnalyticSettings.js index b1fa5e48b..e1992bc7f 100644 --- a/frontend/src/Settings/General/AnalyticSettings.js +++ b/frontend/src/Settings/General/AnalyticSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function AnalyticSettings(props) { diff --git a/frontend/src/Settings/General/BackupSettings.js b/frontend/src/Settings/General/BackupSettings.js index c03ed9c6c..746f66887 100644 --- a/frontend/src/Settings/General/BackupSettings.js +++ b/frontend/src/Settings/General/BackupSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes } from 'Helpers/Props'; function BackupSettings(props) { const { diff --git a/frontend/src/Settings/General/GeneralSettings.js b/frontend/src/Settings/General/GeneralSettings.js index 235316129..3bc494c36 100644 --- a/frontend/src/Settings/General/GeneralSettings.js +++ b/frontend/src/Settings/General/GeneralSettings.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import ConfirmModal from 'Components/Modal/ConfirmModal'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; +import { kinds } from 'Helpers/Props'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; -import Form from 'Components/Form/Form'; -import ConfirmModal from 'Components/Modal/ConfirmModal'; import AnalyticSettings from './AnalyticSettings'; import BackupSettings from './BackupSettings'; import HostSettings from './HostSettings'; diff --git a/frontend/src/Settings/General/GeneralSettingsConnector.js b/frontend/src/Settings/General/GeneralSettingsConnector.js index 9dd1411c7..f1a688175 100644 --- a/frontend/src/Settings/General/GeneralSettingsConnector.js +++ b/frontend/src/Settings/General/GeneralSettingsConnector.js @@ -2,14 +2,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; -import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; -import { setGeneralSettingsValue, saveGeneralSettings, fetchGeneralSettings } from 'Store/Actions/settingsActions'; +import * as commandNames from 'Commands/commandNames'; import { clearPendingChanges } from 'Store/Actions/baseActions'; import { executeCommand } from 'Store/Actions/commandActions'; +import { fetchGeneralSettings, saveGeneralSettings, setGeneralSettingsValue } from 'Store/Actions/settingsActions'; import { restart } from 'Store/Actions/systemActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; +import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; import GeneralSettings from './GeneralSettings'; const SECTION = 'general'; diff --git a/frontend/src/Settings/General/HostSettings.js b/frontend/src/Settings/General/HostSettings.js index 1779ec45c..69a43a195 100644 --- a/frontend/src/Settings/General/HostSettings.js +++ b/frontend/src/Settings/General/HostSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function HostSettings(props) { diff --git a/frontend/src/Settings/General/LoggingSettings.js b/frontend/src/Settings/General/LoggingSettings.js index 94629b364..a11981248 100644 --- a/frontend/src/Settings/General/LoggingSettings.js +++ b/frontend/src/Settings/General/LoggingSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; const logLevelOptions = [ diff --git a/frontend/src/Settings/General/ProxySettings.js b/frontend/src/Settings/General/ProxySettings.js index b4adfea5e..a99938a32 100644 --- a/frontend/src/Settings/General/ProxySettings.js +++ b/frontend/src/Settings/General/ProxySettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function ProxySettings(props) { diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js index ac5de6b26..56551fe71 100644 --- a/frontend/src/Settings/General/SecuritySettings.js +++ b/frontend/src/Settings/General/SecuritySettings.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, inputTypes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; -import Icon from 'Components/Icon'; -import ClipboardButton from 'Components/Link/ClipboardButton'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; import FormInputButton from 'Components/Form/FormInputButton'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import Icon from 'Components/Icon'; +import ClipboardButton from 'Components/Link/ClipboardButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; +import { icons, inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; const authenticationMethodOptions = [ diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js index a2da81c9a..557699abf 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import { inputTypes, sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import { inputTypes, sizes } from 'Helpers/Props'; +import titleCase from 'Utilities/String/titleCase'; import translate from 'Utilities/String/translate'; function UpdateSettings(props) { diff --git a/frontend/src/Settings/Indexers/IndexerSettings.js b/frontend/src/Settings/Indexers/IndexerSettings.js index c4076253a..1f8ec7cf2 100644 --- a/frontend/src/Settings/Indexers/IndexerSettings.js +++ b/frontend/src/Settings/Indexers/IndexerSettings.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import { icons } from 'Helpers/Props'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import { icons } from 'Helpers/Props'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import IndexersConnector from './Indexers/IndexersConnector'; import IndexerOptionsConnector from './Options/IndexerOptionsConnector'; diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.js b/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.js index 21db4ecf1..ad3c0003f 100644 --- a/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.js +++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; +import { sizes } from 'Helpers/Props'; import AddIndexerPresetMenuItem from './AddIndexerPresetMenuItem'; import styles from './AddIndexerItem.css'; diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js index a726a7806..d0ab36164 100644 --- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js +++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Button from 'Components/Link/Button'; import FieldSet from 'Components/FieldSet'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import AddIndexerItem from './AddIndexerItem'; import styles from './AddIndexerModalContent.css'; diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.js b/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.js index d7401b95f..0f57c3bdf 100644 --- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.js +++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditIndexerModalContentConnector from './EditIndexerModalContentConnector'; function EditIndexerModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalConnector.js b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalConnector.js index ec0b7586e..e1d524f31 100644 --- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalConnector.js +++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { clearPendingChanges } from 'Store/Actions/baseActions'; -import { cancelTestIndexer, cancelSaveIndexer } from 'Store/Actions/settingsActions'; +import { cancelSaveIndexer, cancelTestIndexer } from 'Store/Actions/settingsActions'; import EditIndexerModal from './EditIndexerModal'; function createMapDispatchToProps(dispatch, props) { diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js index 46aabcf8b..9dc977c5b 100644 --- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js +++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditIndexerModalContent.css'; diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContentConnector.js b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContentConnector.js index f993d2796..38e091d19 100644 --- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContentConnector.js +++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveIndexer, setIndexerFieldValue, setIndexerValue, testIndexer } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setIndexerValue, setIndexerFieldValue, saveIndexer, testIndexer } from 'Store/Actions/settingsActions'; import EditIndexerModalContent from './EditIndexerModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Indexers/Indexers/Indexer.js b/frontend/src/Settings/Indexers/Indexers/Indexer.js index 3cce54f7b..916dfa823 100644 --- a/frontend/src/Settings/Indexers/Indexers/Indexer.js +++ b/frontend/src/Settings/Indexers/Indexers/Indexer.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditIndexerModalConnector from './EditIndexerModalConnector'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditIndexerModalConnector from './EditIndexerModalConnector'; import styles from './Indexer.css'; class Indexer extends Component { diff --git a/frontend/src/Settings/Indexers/Indexers/Indexers.js b/frontend/src/Settings/Indexers/Indexers/Indexers.js index 410fc3384..8f8c57e68 100644 --- a/frontend/src/Settings/Indexers/Indexers/Indexers.js +++ b/frontend/src/Settings/Indexers/Indexers/Indexers.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import Indexer from './Indexer'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AddIndexerModal from './AddIndexerModal'; import EditIndexerModalConnector from './EditIndexerModalConnector'; -import translate from 'Utilities/String/translate'; +import Indexer from './Indexer'; import styles from './Indexers.css'; class Indexers extends Component { diff --git a/frontend/src/Settings/Indexers/Indexers/IndexersConnector.js b/frontend/src/Settings/Indexers/Indexers/IndexersConnector.js index 7a7a6abb3..9acb86f22 100644 --- a/frontend/src/Settings/Indexers/Indexers/IndexersConnector.js +++ b/frontend/src/Settings/Indexers/Indexers/IndexersConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; +import { cloneIndexer, deleteIndexer, fetchIndexers } from 'Store/Actions/settingsActions'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchIndexers, deleteIndexer, cloneIndexer } from 'Store/Actions/settingsActions'; +import sortByName from 'Utilities/Array/sortByName'; import Indexers from './Indexers'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptions.js b/frontend/src/Settings/Indexers/Options/IndexerOptions.js index 09b129e91..917f0c4cd 100644 --- a/frontend/src/Settings/Indexers/Options/IndexerOptions.js +++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { inputTypes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function IndexerOptions(props) { diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js b/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js index 545ee871a..4882d4927 100644 --- a/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js +++ b/frontend/src/Settings/Indexers/Options/IndexerOptionsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { fetchIndexerOptions, setIndexerOptionsValue, saveIndexerOptions } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchIndexerOptions, saveIndexerOptions, setIndexerOptionsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import IndexerOptions from './IndexerOptions'; const SECTION = 'indexerOptions'; diff --git a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModal.js b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModal.js index 31c36ea6a..2b1448d8e 100644 --- a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModal.js +++ b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditRestrictionModalContentConnector from './EditRestrictionModalContentConnector'; function EditRestrictionModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js index 28abfcacf..9eecc79d7 100644 --- a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js +++ b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditRestrictionModalContent.css'; diff --git a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js index 322b0a8d9..5737826e6 100644 --- a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js +++ b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveRestriction, setRestrictionValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import { setRestrictionValue, saveRestriction } from 'Store/Actions/settingsActions'; import EditRestrictionModalContent from './EditRestrictionModalContent'; const newRestriction = { diff --git a/frontend/src/Settings/Indexers/Restrictions/Restriction.js b/frontend/src/Settings/Indexers/Restrictions/Restriction.js index c8e6f8fed..c3e6f8d1a 100644 --- a/frontend/src/Settings/Indexers/Restrictions/Restriction.js +++ b/frontend/src/Settings/Indexers/Restrictions/Restriction.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import split from 'Utilities/String/split'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; -import TagList from 'Components/TagList'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditRestrictionModalConnector from './EditRestrictionModalConnector'; +import TagList from 'Components/TagList'; +import { kinds } from 'Helpers/Props'; +import split from 'Utilities/String/split'; import translate from 'Utilities/String/translate'; +import EditRestrictionModalConnector from './EditRestrictionModalConnector'; import styles from './Restriction.css'; class Restriction extends Component { diff --git a/frontend/src/Settings/Indexers/Restrictions/Restrictions.js b/frontend/src/Settings/Indexers/Restrictions/Restrictions.js index 4e78aac77..106142f4a 100644 --- a/frontend/src/Settings/Indexers/Restrictions/Restrictions.js +++ b/frontend/src/Settings/Indexers/Restrictions/Restrictions.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import Restriction from './Restriction'; -import EditRestrictionModalConnector from './EditRestrictionModalConnector'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditRestrictionModalConnector from './EditRestrictionModalConnector'; +import Restriction from './Restriction'; import styles from './Restrictions.css'; class Restrictions extends Component { diff --git a/frontend/src/Settings/Indexers/Restrictions/RestrictionsConnector.js b/frontend/src/Settings/Indexers/Restrictions/RestrictionsConnector.js index c53c05de2..4cb644230 100644 --- a/frontend/src/Settings/Indexers/Restrictions/RestrictionsConnector.js +++ b/frontend/src/Settings/Indexers/Restrictions/RestrictionsConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchRestrictions, deleteRestriction } from 'Store/Actions/settingsActions'; +import { deleteRestriction, fetchRestrictions } from 'Store/Actions/settingsActions'; import createTagsSelector from 'Store/Selectors/createTagsSelector'; import Restrictions from './Restrictions'; diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js index 0aea19606..c95cd6785 100644 --- a/frontend/src/Settings/MediaManagement/MediaManagement.js +++ b/frontend/src/Settings/MediaManagement/MediaManagement.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; -import PageContent from 'Components/Page/PageContent'; -import PageContentBody from 'Components/Page/PageContentBody'; -import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import PageContent from 'Components/Page/PageContent'; +import PageContentBody from 'Components/Page/PageContentBody'; +import { inputTypes, sizes } from 'Helpers/Props'; import RootFoldersConnector from 'RootFolder/RootFoldersConnector'; +import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; +import translate from 'Utilities/String/translate'; import NamingConnector from './Naming/NamingConnector'; import AddRootFolderConnector from './RootFolder/AddRootFolderConnector'; -import translate from 'Utilities/String/translate'; const rescanAfterRefreshOptions = [ { key: 'always', value: 'Always' }, diff --git a/frontend/src/Settings/MediaManagement/MediaManagementConnector.js b/frontend/src/Settings/MediaManagement/MediaManagementConnector.js index 797cfef10..253f5a96c 100644 --- a/frontend/src/Settings/MediaManagement/MediaManagementConnector.js +++ b/frontend/src/Settings/MediaManagement/MediaManagementConnector.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchMediaManagementSettings, saveMediaManagementSettings, saveNamingSettings, setMediaManagementSettingsValue } from 'Store/Actions/settingsActions'; import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; -import { fetchMediaManagementSettings, setMediaManagementSettingsValue, saveMediaManagementSettings, saveNamingSettings } from 'Store/Actions/settingsActions'; -import { clearPendingChanges } from 'Store/Actions/baseActions'; import MediaManagement from './MediaManagement'; const SECTION = 'mediaManagement'; diff --git a/frontend/src/Settings/MediaManagement/Naming/Naming.js b/frontend/src/Settings/MediaManagement/Naming/Naming.js index 283f6a604..b8c6aa927 100644 --- a/frontend/src/Settings/MediaManagement/Naming/Naming.js +++ b/frontend/src/Settings/MediaManagement/Naming/Naming.js @@ -1,15 +1,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, sizes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import FormInputButton from 'Components/Form/FormInputButton'; import FieldSet from 'Components/FieldSet'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; +import FormInputButton from 'Components/Form/FormInputButton'; import FormInputGroup from 'Components/Form/FormInputGroup'; -import NamingModal from './NamingModal'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { inputTypes, sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import NamingModal from './NamingModal'; import styles from './Naming.css'; const colonReplacementOptions = [ diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js b/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js index 2c1b00958..b08cac699 100644 --- a/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js +++ b/frontend/src/Settings/MediaManagement/Naming/NamingConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { fetchNamingSettings, setNamingSettingsValue, fetchNamingExamples } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchNamingExamples, fetchNamingSettings, setNamingSettingsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import Naming from './Naming'; const SECTION = 'naming'; diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js index c51c74601..1909104f0 100644 --- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js +++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; -import Button from 'Components/Link/Button'; import SelectInput from 'Components/Form/SelectInput'; import TextInput from 'Components/Form/TextInput'; +import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import NamingOption from './NamingOption'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import NamingOption from './NamingOption'; import styles from './NamingModal.css'; class NamingModal extends Component { diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingOption.js b/frontend/src/Settings/MediaManagement/Naming/NamingOption.js index 269266a5f..0eb9456ef 100644 --- a/frontend/src/Settings/MediaManagement/Naming/NamingOption.js +++ b/frontend/src/Settings/MediaManagement/Naming/NamingOption.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { sizes } from 'Helpers/Props'; import Link from 'Components/Link/Link'; +import { sizes } from 'Helpers/Props'; import styles from './NamingOption.css'; class NamingOption extends Component { diff --git a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js index 3da2a55b9..91278b6f5 100644 --- a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js +++ b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import Icon from 'Components/Icon'; import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal'; +import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; +import { icons, kinds, sizes } from 'Helpers/Props'; import styles from './AddRootFolder.css'; class AddRootFolder extends Component { diff --git a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js index cd5f4c50d..f32a1aec0 100644 --- a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js +++ b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; -import AddRootFolder from './AddRootFolder'; import { addRootFolder } from 'Store/Actions/rootFolderActions'; +import AddRootFolder from './AddRootFolder'; function createMapDispatchToProps(dispatch) { return { diff --git a/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.js b/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.js index 24c0237cd..4b33df528 100644 --- a/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.js +++ b/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditMetadataModalContentConnector from './EditMetadataModalContentConnector'; function EditMetadataModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.js b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.js index 96bbb4b83..f548bc4d5 100644 --- a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.js +++ b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; -import Button from 'Components/Link/Button'; -import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; -import ModalBody from 'Components/Modal/ModalBody'; -import ModalFooter from 'Components/Modal/ModalFooter'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import Button from 'Components/Link/Button'; +import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; +import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; +import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes } from 'Helpers/Props'; function EditMetadataModalContent(props) { const { diff --git a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js index 2cd7636a0..42930ad40 100644 --- a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js +++ b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveMetadata, setMetadataFieldValue, setMetadataValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import { setMetadataValue, setMetadataFieldValue, saveMetadata } from 'Store/Actions/settingsActions'; import EditMetadataModalContent from './EditMetadataModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Metadata/Metadata/Metadata.js b/frontend/src/Settings/Metadata/Metadata/Metadata.js index eba01463c..a004912d1 100644 --- a/frontend/src/Settings/Metadata/Metadata/Metadata.js +++ b/frontend/src/Settings/Metadata/Metadata/Metadata.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; +import { kinds } from 'Helpers/Props'; import EditMetadataModalConnector from './EditMetadataModalConnector'; import styles from './Metadata.css'; diff --git a/frontend/src/Settings/Metadata/Metadata/Metadatas.js b/frontend/src/Settings/Metadata/Metadata/Metadatas.js index c4dd1b169..b8dbf354e 100644 --- a/frontend/src/Settings/Metadata/Metadata/Metadatas.js +++ b/frontend/src/Settings/Metadata/Metadata/Metadatas.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React from 'react'; import FieldSet from 'Components/FieldSet'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import Metadata from './Metadata'; import translate from 'Utilities/String/translate'; +import Metadata from './Metadata'; import styles from './Metadatas.css'; function Metadatas(props) { diff --git a/frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js b/frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js index ab7de599d..fb52ac33b 100644 --- a/frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js +++ b/frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; -import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; import { fetchMetadata } from 'Store/Actions/settingsActions'; +import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; +import sortByName from 'Utilities/Array/sortByName'; import Metadatas from './Metadatas'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Metadata/Options/MetadataOptions.js b/frontend/src/Settings/Metadata/Options/MetadataOptions.js index 215516b97..1b04e123f 100644 --- a/frontend/src/Settings/Metadata/Options/MetadataOptions.js +++ b/frontend/src/Settings/Metadata/Options/MetadataOptions.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { inputTypes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; export const certificationCountryOptions = [ diff --git a/frontend/src/Settings/Metadata/Options/MetadataOptionsConnector.js b/frontend/src/Settings/Metadata/Options/MetadataOptionsConnector.js index 31d8e2573..23fa9ae5f 100644 --- a/frontend/src/Settings/Metadata/Options/MetadataOptionsConnector.js +++ b/frontend/src/Settings/Metadata/Options/MetadataOptionsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { fetchMetadataOptions, setMetadataOptionsValue, saveMetadataOptions } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchMetadataOptions, saveMetadataOptions, setMetadataOptionsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import MetadataOptions from './MetadataOptions'; const SECTION = 'metadataOptions'; diff --git a/frontend/src/Settings/NetImport/NetImport/AddNetImportItem.js b/frontend/src/Settings/NetImport/NetImport/AddNetImportItem.js index ea05a136b..de354a57c 100644 --- a/frontend/src/Settings/NetImport/NetImport/AddNetImportItem.js +++ b/frontend/src/Settings/NetImport/NetImport/AddNetImportItem.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; +import { sizes } from 'Helpers/Props'; import AddNetImportPresetMenuItem from './AddNetImportPresetMenuItem'; import styles from './AddNetImportItem.css'; diff --git a/frontend/src/Settings/NetImport/NetImport/AddNetImportModalContent.js b/frontend/src/Settings/NetImport/NetImport/AddNetImportModalContent.js index 2b89eff7b..f614dcc65 100644 --- a/frontend/src/Settings/NetImport/NetImport/AddNetImportModalContent.js +++ b/frontend/src/Settings/NetImport/NetImport/AddNetImportModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; -import Button from 'Components/Link/Button'; import FieldSet from 'Components/FieldSet'; +import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import AddNetImportItem from './AddNetImportItem'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; import titleCase from 'Utilities/String/titleCase'; +import AddNetImportItem from './AddNetImportItem'; import styles from './AddNetImportModalContent.css'; class AddNetImportModalContent extends Component { diff --git a/frontend/src/Settings/NetImport/NetImport/EditNetImportModal.js b/frontend/src/Settings/NetImport/NetImport/EditNetImportModal.js index 0fd411c5f..55badaa55 100644 --- a/frontend/src/Settings/NetImport/NetImport/EditNetImportModal.js +++ b/frontend/src/Settings/NetImport/NetImport/EditNetImportModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditNetImportModalContentConnector from './EditNetImportModalContentConnector'; function EditNetImportModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalConnector.js b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalConnector.js index 18c567af3..c96311c2e 100644 --- a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalConnector.js +++ b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { clearPendingChanges } from 'Store/Actions/baseActions'; -import { cancelTestNetImport, cancelSaveNetImport } from 'Store/Actions/settingsActions'; +import { cancelSaveNetImport, cancelTestNetImport } from 'Store/Actions/settingsActions'; import EditNetImportModal from './EditNetImportModal'; function createMapDispatchToProps(dispatch, props) { diff --git a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContent.js b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContent.js index 44b9cf5ad..370f7996d 100644 --- a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContent.js +++ b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContent.js @@ -1,18 +1,18 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditNetImportModalContent.css'; diff --git a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContentConnector.js b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContentConnector.js index 374d9f216..aaadf989c 100644 --- a/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContentConnector.js +++ b/frontend/src/Settings/NetImport/NetImport/EditNetImportModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveNetImport, setNetImportFieldValue, setNetImportValue, testNetImport } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setNetImportValue, setNetImportFieldValue, saveNetImport, testNetImport } from 'Store/Actions/settingsActions'; import EditNetImportModalContent from './EditNetImportModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/NetImport/NetImport/NetImport.js b/frontend/src/Settings/NetImport/NetImport/NetImport.js index 3151c92c9..71a3d89c1 100644 --- a/frontend/src/Settings/NetImport/NetImport/NetImport.js +++ b/frontend/src/Settings/NetImport/NetImport/NetImport.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditNetImportModalConnector from './EditNetImportModalConnector'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditNetImportModalConnector from './EditNetImportModalConnector'; import styles from './NetImport.css'; class NetImport extends Component { diff --git a/frontend/src/Settings/NetImport/NetImport/NetImports.js b/frontend/src/Settings/NetImport/NetImport/NetImports.js index ec8223591..9b3c69fdd 100644 --- a/frontend/src/Settings/NetImport/NetImport/NetImports.js +++ b/frontend/src/Settings/NetImport/NetImport/NetImports.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import NetImport from './NetImport'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AddNetImportModal from './AddNetImportModal'; import EditNetImportModalConnector from './EditNetImportModalConnector'; -import translate from 'Utilities/String/translate'; +import NetImport from './NetImport'; import styles from './NetImports.css'; class NetImports extends Component { diff --git a/frontend/src/Settings/NetImport/NetImport/NetImportsConnector.js b/frontend/src/Settings/NetImport/NetImport/NetImportsConnector.js index e703c403a..24fd3f62d 100644 --- a/frontend/src/Settings/NetImport/NetImport/NetImportsConnector.js +++ b/frontend/src/Settings/NetImport/NetImport/NetImportsConnector.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; -import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchNetImports, deleteNetImport } from 'Store/Actions/settingsActions'; import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; +import { deleteNetImport, fetchNetImports } from 'Store/Actions/settingsActions'; +import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; +import sortByName from 'Utilities/Array/sortByName'; import NetImports from './NetImports'; function createMapStateToProps() { diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModal.js b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModal.js index 0a9601cf9..3a8d8bd94 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModal.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditNetImportExclusionModalContentConnector from './EditNetImportExclusionModalContentConnector'; function EditNetImportExclusionModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContent.js b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContent.js index 724506e39..e7943946b 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContent.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContent.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditNetImportExclusionModalContent.css'; diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContentConnector.js b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContentConnector.js index 02f48f4d2..3a515e20f 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContentConnector.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/EditNetImportExclusionModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveNetImportExclusion, setNetImportExclusionValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import { setNetImportExclusionValue, saveNetImportExclusion } from 'Store/Actions/settingsActions'; import EditNetImportExclusionModalContent from './EditNetImportExclusionModalContent'; const newNetImportExclusion = { diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusion.js b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusion.js index 95ca93354..d762812fa 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusion.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusion.js @@ -1,12 +1,12 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditNetImportExclusionModalConnector from './EditNetImportExclusionModalConnector'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditNetImportExclusionModalConnector from './EditNetImportExclusionModalConnector'; import styles from './NetImportExclusion.css'; class NetImportExclusion extends Component { diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusions.js b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusions.js index 638a4aacf..5bbb1c9d6 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusions.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusions.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import NetImportExclusion from './NetImportExclusion'; -import EditNetImportExclusionModalConnector from './EditNetImportExclusionModalConnector'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditNetImportExclusionModalConnector from './EditNetImportExclusionModalConnector'; +import NetImportExclusion from './NetImportExclusion'; import styles from './NetImportExclusions.css'; class NetImportExclusions extends Component { diff --git a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusionsConnector.js b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusionsConnector.js index 5d561d431..199282665 100644 --- a/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusionsConnector.js +++ b/frontend/src/Settings/NetImport/NetImportExclusions/NetImportExclusionsConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchNetImportExclusions, deleteNetImportExclusion } from 'Store/Actions/settingsActions'; +import { deleteNetImportExclusion, fetchNetImportExclusions } from 'Store/Actions/settingsActions'; import NetImportExclusions from './NetImportExclusions'; function createMapStateToProps() { diff --git a/frontend/src/Settings/NetImport/NetImportSettings.js b/frontend/src/Settings/NetImport/NetImportSettings.js index 86f20f6f4..8fbbbb9c1 100644 --- a/frontend/src/Settings/NetImport/NetImportSettings.js +++ b/frontend/src/Settings/NetImport/NetImportSettings.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import { icons } from 'Helpers/Props'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; +import { icons } from 'Helpers/Props'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import NetImportsConnector from './NetImport/NetImportsConnector'; -import NetImportOptionsConnector from './Options/NetImportOptionsConnector'; import NetImportExclusionsConnector from './NetImportExclusions/NetImportExclusionsConnector'; +import NetImportOptionsConnector from './Options/NetImportOptionsConnector'; class NetImportSettings extends Component { diff --git a/frontend/src/Settings/NetImport/Options/NetImportOptions.js b/frontend/src/Settings/NetImport/Options/NetImportOptions.js index c00f96ff1..1a9535ef4 100644 --- a/frontend/src/Settings/NetImport/Options/NetImportOptions.js +++ b/frontend/src/Settings/NetImport/Options/NetImportOptions.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import { inputTypes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; function NetImportOptions(props) { diff --git a/frontend/src/Settings/NetImport/Options/NetImportOptionsConnector.js b/frontend/src/Settings/NetImport/Options/NetImportOptionsConnector.js index eb2d94913..b7d934286 100644 --- a/frontend/src/Settings/NetImport/Options/NetImportOptionsConnector.js +++ b/frontend/src/Settings/NetImport/Options/NetImportOptionsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { fetchNetImportOptions, setNetImportOptionsValue, saveNetImportOptions } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchNetImportOptions, saveNetImportOptions, setNetImportOptionsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import NetImportOptions from './NetImportOptions'; const SECTION = 'netImportOptions'; diff --git a/frontend/src/Settings/Notifications/Notifications/AddNotificationItem.js b/frontend/src/Settings/Notifications/Notifications/AddNotificationItem.js index 6d90961b0..88586b293 100644 --- a/frontend/src/Settings/Notifications/Notifications/AddNotificationItem.js +++ b/frontend/src/Settings/Notifications/Notifications/AddNotificationItem.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Button from 'Components/Link/Button'; import Link from 'Components/Link/Link'; import Menu from 'Components/Menu/Menu'; import MenuContent from 'Components/Menu/MenuContent'; +import { sizes } from 'Helpers/Props'; import AddNotificationPresetMenuItem from './AddNotificationPresetMenuItem'; import styles from './AddNotificationItem.css'; diff --git a/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js index e09342b98..ae1d5de7d 100644 --- a/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js +++ b/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; import AddNotificationItem from './AddNotificationItem'; import styles from './AddNotificationModalContent.css'; diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModal.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModal.js index 27e41d062..bc7f4ab18 100644 --- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModal.js +++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditNotificationModalContentConnector from './EditNotificationModalContentConnector'; function EditNotificationModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalConnector.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalConnector.js index e1452d142..7a9042946 100644 --- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalConnector.js +++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { clearPendingChanges } from 'Store/Actions/baseActions'; -import { cancelTestNotification, cancelSaveNotification } from 'Store/Actions/settingsActions'; +import { cancelSaveNotification, cancelTestNotification } from 'Store/Actions/settingsActions'; import EditNotificationModal from './EditNotificationModal'; function createMapDispatchToProps(dispatch, props) { diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js index 957990945..6fd131387 100644 --- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js +++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; import Alert from 'Components/Alert'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import styles from './EditNotificationModalContent.css'; diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js index 104f1897a..504f18663 100644 --- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js +++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveNotification, setNotificationFieldValue, setNotificationValue, testNotification } from 'Store/Actions/settingsActions'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { setNotificationValue, setNotificationFieldValue, saveNotification, testNotification } from 'Store/Actions/settingsActions'; import EditNotificationModalContent from './EditNotificationModalContent'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js index e35dba606..b4caf2838 100644 --- a/frontend/src/Settings/Notifications/Notifications/Notification.js +++ b/frontend/src/Settings/Notifications/Notifications/Notification.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditNotificationModalConnector from './EditNotificationModalConnector'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditNotificationModalConnector from './EditNotificationModalConnector'; import styles from './Notification.css'; class Notification extends Component { diff --git a/frontend/src/Settings/Notifications/Notifications/Notifications.js b/frontend/src/Settings/Notifications/Notifications/Notifications.js index 2e350de6b..5e2418412 100644 --- a/frontend/src/Settings/Notifications/Notifications/Notifications.js +++ b/frontend/src/Settings/Notifications/Notifications/Notifications.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import Notification from './Notification'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import AddNotificationModal from './AddNotificationModal'; import EditNotificationModalConnector from './EditNotificationModalConnector'; -import translate from 'Utilities/String/translate'; +import Notification from './Notification'; import styles from './Notifications.css'; class Notifications extends Component { diff --git a/frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js b/frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js index 6f4138627..6191d76f8 100644 --- a/frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js +++ b/frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; +import { deleteNotification, fetchNotifications } from 'Store/Actions/settingsActions'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchNotifications, deleteNotification } from 'Store/Actions/settingsActions'; +import sortByName from 'Utilities/Array/sortByName'; import Notifications from './Notifications'; function createMapStateToProps() { diff --git a/frontend/src/Settings/PendingChangesModal.js b/frontend/src/Settings/PendingChangesModal.js index b23d86418..93b5e0870 100644 --- a/frontend/src/Settings/PendingChangesModal.js +++ b/frontend/src/Settings/PendingChangesModal.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { useEffect } from 'react'; -import { kinds } from 'Helpers/Props'; import keyboardShortcuts from 'Components/keyboardShortcuts'; import Button from 'Components/Link/Button'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; function PendingChangesModal(props) { const { diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfile.js b/frontend/src/Settings/Profiles/Delay/DelayProfile.js index b42e90334..aacc9cc1d 100644 --- a/frontend/src/Settings/Profiles/Delay/DelayProfile.js +++ b/frontend/src/Settings/Profiles/Delay/DelayProfile.js @@ -1,14 +1,14 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import titleCase from 'Utilities/String/titleCase'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; -import TagList from 'Components/TagList'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import EditDelayProfileModalConnector from './EditDelayProfileModalConnector'; +import TagList from 'Components/TagList'; +import { icons, kinds } from 'Helpers/Props'; +import titleCase from 'Utilities/String/titleCase'; import translate from 'Utilities/String/translate'; +import EditDelayProfileModalConnector from './EditDelayProfileModalConnector'; import styles from './DelayProfile.css'; function getDelay(enabled, delay) { diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js b/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js index 402ddcc13..1ebb32a95 100644 --- a/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js +++ b/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { DragLayer } from 'react-dnd'; -import dimensions from 'Styles/Variables/dimensions.js'; -import { DELAY_PROFILE } from 'Helpers/dragTypes'; import DragPreviewLayer from 'Components/DragPreviewLayer'; +import { DELAY_PROFILE } from 'Helpers/dragTypes'; +import dimensions from 'Styles/Variables/dimensions.js'; import DelayProfile from './DelayProfile'; import styles from './DelayProfileDragPreview.css'; diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfileDragSource.js b/frontend/src/Settings/Profiles/Delay/DelayProfileDragSource.js index 5c1c565e0..8bf739ceb 100644 --- a/frontend/src/Settings/Profiles/Delay/DelayProfileDragSource.js +++ b/frontend/src/Settings/Profiles/Delay/DelayProfileDragSource.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { findDOMNode } from 'react-dom'; import { DragSource, DropTarget } from 'react-dnd'; -import classNames from 'classnames'; +import { findDOMNode } from 'react-dom'; import { DELAY_PROFILE } from 'Helpers/dragTypes'; import DelayProfile from './DelayProfile'; import styles from './DelayProfileDragSource.css'; diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js index daa758add..10fa7d26a 100644 --- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js +++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import Link from 'Components/Link/Link'; import Measure from 'Components/Measure'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import DelayProfileDragSource from './DelayProfileDragSource'; -import DelayProfileDragPreview from './DelayProfileDragPreview'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import DelayProfile from './DelayProfile'; +import DelayProfileDragPreview from './DelayProfileDragPreview'; +import DelayProfileDragSource from './DelayProfileDragSource'; import EditDelayProfileModalConnector from './EditDelayProfileModalConnector'; -import translate from 'Utilities/String/translate'; import styles from './DelayProfiles.css'; class DelayProfiles extends Component { diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfilesConnector.js b/frontend/src/Settings/Profiles/Delay/DelayProfilesConnector.js index 16fe5718c..f8621d4a0 100644 --- a/frontend/src/Settings/Profiles/Delay/DelayProfilesConnector.js +++ b/frontend/src/Settings/Profiles/Delay/DelayProfilesConnector.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { fetchDelayProfiles, deleteDelayProfile, reorderDelayProfile } from 'Store/Actions/settingsActions'; +import { deleteDelayProfile, fetchDelayProfiles, reorderDelayProfile } from 'Store/Actions/settingsActions'; import createTagsSelector from 'Store/Selectors/createTagsSelector'; import DelayProfiles from './DelayProfiles'; diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModal.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModal.js index 9444fd65e..ddcd8cf7f 100644 --- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModal.js +++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditDelayProfileModalContentConnector from './EditDelayProfileModalContentConnector'; function EditDelayProfileModal({ isOpen, onModalClose, ...otherProps }) { diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js index 44b3b5a3c..b0d227b34 100644 --- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js +++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { inputTypes, kinds } from 'Helpers/Props'; -import { boolSettingShape, numberSettingShape, tagSettingShape } from 'Helpers/Props/Shapes/settingShape'; +import Alert from 'Components/Alert'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Alert from 'Components/Alert'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds } from 'Helpers/Props'; +import { boolSettingShape, numberSettingShape, tagSettingShape } from 'Helpers/Props/Shapes/settingShape'; import translate from 'Utilities/String/translate'; import styles from './EditDelayProfileModalContent.css'; diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js index 5b7e036f5..370966cb7 100644 --- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js +++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { saveDelayProfile, setDelayProfileValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import { setDelayProfileValue, saveDelayProfile } from 'Store/Actions/settingsActions'; import EditDelayProfileModalContent from './EditDelayProfileModalContent'; const newDelayProfile = { diff --git a/frontend/src/Settings/Profiles/Profiles.js b/frontend/src/Settings/Profiles/Profiles.js index 41cd465f7..2965e1c9e 100644 --- a/frontend/src/Settings/Profiles/Profiles.js +++ b/frontend/src/Settings/Profiles/Profiles.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; import { DndProvider } from 'react-dnd'; import HTML5Backend from 'react-dnd-html5-backend'; +import Link from 'Components/Link/Link'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import Link from 'Components/Link/Link'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; -import QualityProfilesConnector from './Quality/QualityProfilesConnector'; import DelayProfilesConnector from './Delay/DelayProfilesConnector'; +import QualityProfilesConnector from './Quality/QualityProfilesConnector'; import styles from './Profiles.css'; // Only a single DragDrop Context can exist so it's done here to allow editing // quality profiles and reordering delay profiles to work. diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js index 9ecbd1ca8..261e03262 100644 --- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js +++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import EditQualityProfileModalContentConnector from './EditQualityProfileModalContentConnector'; class EditQualityProfileModal extends Component { diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js index 8374ea507..c5ba912f3 100644 --- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js +++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js @@ -1,22 +1,22 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes, kinds, sizes } from 'Helpers/Props'; -import dimensions from 'Styles/Variables/dimensions'; +import Form from 'Components/Form/Form'; +import FormGroup from 'Components/Form/FormGroup'; +import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; import Button from 'Components/Link/Button'; import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Measure from 'Components/Measure'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import Form from 'Components/Form/Form'; -import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; -import FormInputGroup from 'Components/Form/FormInputGroup'; -import QualityProfileItems from './QualityProfileItems'; -import QualityProfileFormatItems from './QualityProfileFormatItems'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { inputTypes, kinds, sizes } from 'Helpers/Props'; +import dimensions from 'Styles/Variables/dimensions'; import translate from 'Utilities/String/translate'; +import QualityProfileFormatItems from './QualityProfileFormatItems'; +import QualityProfileItems from './QualityProfileItems'; import styles from './EditQualityProfileModalContent.css'; const MODAL_BODY_PADDING = parseInt(dimensions.modalBodyPadding); diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js index a879a3b40..8dbf83fa6 100644 --- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js +++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { fetchQualityProfileSchema, saveQualityProfile, setQualityProfileValue } from 'Store/Actions/settingsActions'; import createProfileInUseSelector from 'Store/Selectors/createProfileInUseSelector'; import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector'; -import { fetchQualityProfileSchema, setQualityProfileValue, saveQualityProfile } from 'Store/Actions/settingsActions'; import EditQualityProfileModalContent from './EditQualityProfileModalContent'; function getQualityItemGroupId(qualityProfile) { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfile.js b/frontend/src/Settings/Profiles/Quality/QualityProfile.js index c51aa3ec0..750d22240 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfile.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfile.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import Card from 'Components/Card'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; import Tooltip from 'Components/Tooltip/Tooltip'; -import EditQualityProfileModalConnector from './EditQualityProfileModalConnector'; +import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditQualityProfileModalConnector from './EditQualityProfileModalConnector'; import styles from './QualityProfile.css'; class QualityProfile extends Component { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js index 132b60c08..960372346 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { sizes } from 'Helpers/Props'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputHelpText from 'Components/Form/FormInputHelpText'; +import FormLabel from 'Components/Form/FormLabel'; import Link from 'Components/Link/Link'; -import QualityProfileFormatItem from './QualityProfileFormatItem'; +import { sizes } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import QualityProfileFormatItem from './QualityProfileFormatItem'; import styles from './QualityProfileFormatItems.css'; function calcOrder(profileFormatItems) { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js index 8161e7061..c508444a8 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItem.js @@ -1,10 +1,10 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; +import CheckInput from 'Components/Form/CheckInput'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; -import CheckInput from 'Components/Form/CheckInput'; +import { icons } from 'Helpers/Props'; import styles from './QualityProfileItem.css'; class QualityProfileItem extends Component { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js index e0c6e8e8c..31290baa9 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js @@ -1,9 +1,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { DragLayer } from 'react-dnd'; -import dimensions from 'Styles/Variables/dimensions.js'; -import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes'; import DragPreviewLayer from 'Components/DragPreviewLayer'; +import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes'; +import dimensions from 'Styles/Variables/dimensions.js'; import QualityProfileItem from './QualityProfileItem'; import styles from './QualityProfileItemDragPreview.css'; diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js index 0e1838eb3..b47470171 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js @@ -1,8 +1,8 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { findDOMNode } from 'react-dom'; import { DragSource, DropTarget } from 'react-dnd'; -import classNames from 'classnames'; +import { findDOMNode } from 'react-dom'; import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes'; import QualityProfileItem from './QualityProfileItem'; import QualityProfileItemGroup from './QualityProfileItemGroup'; diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js index c5bfba23d..8dcf75913 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js @@ -1,12 +1,12 @@ +import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import classNames from 'classnames'; -import { icons } from 'Helpers/Props'; +import CheckInput from 'Components/Form/CheckInput'; +import TextInput from 'Components/Form/TextInput'; import Icon from 'Components/Icon'; import Label from 'Components/Label'; import IconButton from 'Components/Link/IconButton'; -import CheckInput from 'Components/Form/CheckInput'; -import TextInput from 'Components/Form/TextInput'; +import { icons } from 'Helpers/Props'; import QualityProfileItemDragSource from './QualityProfileItemDragSource'; import styles from './QualityProfileItemGroup.css'; diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js index 4c11894e2..2dc40cf4b 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItems.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds, sizes } from 'Helpers/Props'; -import Icon from 'Components/Icon'; -import Button from 'Components/Link/Button'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputHelpText from 'Components/Form/FormInputHelpText'; +import FormLabel from 'Components/Form/FormLabel'; +import Icon from 'Components/Icon'; +import Button from 'Components/Link/Button'; import Measure from 'Components/Measure'; -import QualityProfileItemDragSource from './QualityProfileItemDragSource'; +import { icons, kinds, sizes } from 'Helpers/Props'; import QualityProfileItemDragPreview from './QualityProfileItemDragPreview'; +import QualityProfileItemDragSource from './QualityProfileItemDragSource'; import styles from './QualityProfileItems.css'; class QualityProfileItems extends Component { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfiles.js b/frontend/src/Settings/Profiles/Quality/QualityProfiles.js index f9cb5209c..b851762c1 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfiles.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfiles.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; -import FieldSet from 'Components/FieldSet'; import Card from 'Components/Card'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import QualityProfile from './QualityProfile'; -import EditQualityProfileModalConnector from './EditQualityProfileModalConnector'; +import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import EditQualityProfileModalConnector from './EditQualityProfileModalConnector'; +import QualityProfile from './QualityProfile'; import styles from './QualityProfiles.css'; class QualityProfiles extends Component { diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js b/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js index f7fd9832a..cc6295e4c 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js +++ b/frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import sortByName from 'Utilities/Array/sortByName'; +import { cloneQualityProfile, deleteQualityProfile, fetchQualityProfiles } from 'Store/Actions/settingsActions'; import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector'; -import { fetchQualityProfiles, deleteQualityProfile, cloneQualityProfile } from 'Store/Actions/settingsActions'; +import sortByName from 'Utilities/Array/sortByName'; import QualityProfiles from './QualityProfiles'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Quality/Definition/QualityDefinition.js b/frontend/src/Settings/Quality/Definition/QualityDefinition.js index 172804947..3f5caf7af 100644 --- a/frontend/src/Settings/Quality/Definition/QualityDefinition.js +++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import ReactSlider from 'react-slider'; -import formatBytes from 'Utilities/Number/formatBytes'; -import roundNumber from 'Utilities/Number/roundNumber'; -import { kinds, tooltipPositions } from 'Helpers/Props'; -import Label from 'Components/Label'; import NumberInput from 'Components/Form/NumberInput'; import TextInput from 'Components/Form/TextInput'; +import Label from 'Components/Label'; import Popover from 'Components/Tooltip/Popover'; +import { kinds, tooltipPositions } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; +import roundNumber from 'Utilities/Number/roundNumber'; import QualityDefinitionLimits from './QualityDefinitionLimits'; import styles from './QualityDefinition.css'; diff --git a/frontend/src/Settings/Quality/Definition/QualityDefinitionConnector.js b/frontend/src/Settings/Quality/Definition/QualityDefinitionConnector.js index 5f23d2765..09e5b5525 100644 --- a/frontend/src/Settings/Quality/Definition/QualityDefinitionConnector.js +++ b/frontend/src/Settings/Quality/Definition/QualityDefinitionConnector.js @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { setQualityDefinitionValue } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { setQualityDefinitionValue } from 'Store/Actions/settingsActions'; import QualityDefinition from './QualityDefinition'; const mapDispatchToProps = { diff --git a/frontend/src/Settings/Quality/Definition/QualityDefinitions.js b/frontend/src/Settings/Quality/Definition/QualityDefinitions.js index d465fe2db..709328044 100644 --- a/frontend/src/Settings/Quality/Definition/QualityDefinitions.js +++ b/frontend/src/Settings/Quality/Definition/QualityDefinitions.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import FieldSet from 'Components/FieldSet'; import PageSectionContent from 'Components/Page/PageSectionContent'; -import QualityDefinitionConnector from './QualityDefinitionConnector'; import translate from 'Utilities/String/translate'; +import QualityDefinitionConnector from './QualityDefinitionConnector'; import styles from './QualityDefinitions.css'; class QualityDefinitions extends Component { diff --git a/frontend/src/Settings/Settings.js b/frontend/src/Settings/Settings.js index 56665ae68..8e67e4c17 100644 --- a/frontend/src/Settings/Settings.js +++ b/frontend/src/Settings/Settings.js @@ -2,8 +2,8 @@ import React from 'react'; import Link from 'Components/Link/Link'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import SettingsToolbarConnector from './SettingsToolbarConnector'; import translate from 'Utilities/String/translate'; +import SettingsToolbarConnector from './SettingsToolbarConnector'; import styles from './Settings.css'; function Settings() { diff --git a/frontend/src/Settings/SettingsToolbar.js b/frontend/src/Settings/SettingsToolbar.js index 8b70857d9..a7934f5fa 100644 --- a/frontend/src/Settings/SettingsToolbar.js +++ b/frontend/src/Settings/SettingsToolbar.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import keyboardShortcuts, { shortcuts } from 'Components/keyboardShortcuts'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import PendingChangesModal from './PendingChangesModal'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import { icons } from 'Helpers/Props'; import AdvancedSettingsButton from './AdvancedSettingsButton'; +import PendingChangesModal from './PendingChangesModal'; class SettingsToolbar extends Component { diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModal.js b/frontend/src/Settings/Tags/Details/TagDetailsModal.js index 0fe1ec5d3..4195c64db 100644 --- a/frontend/src/Settings/Tags/Details/TagDetailsModal.js +++ b/frontend/src/Settings/Tags/Details/TagDetailsModal.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { sizes } from 'Helpers/Props'; import Modal from 'Components/Modal/Modal'; +import { sizes } from 'Helpers/Props'; import TagDetailsModalContentConnector from './TagDetailsModalContentConnector'; function TagDetailsModal(props) { diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js index 79a8ff024..9e0181026 100644 --- a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js +++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React from 'react'; -import split from 'Utilities/String/split'; -import { kinds } from 'Helpers/Props'; import FieldSet from 'Components/FieldSet'; -import Button from 'Components/Link/Button'; import Label from 'Components/Label'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; +import Button from 'Components/Link/Button'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; -import TagDetailsDelayProfile from './TagDetailsDelayProfile'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { kinds } from 'Helpers/Props'; +import split from 'Utilities/String/split'; import translate from 'Utilities/String/translate'; +import TagDetailsDelayProfile from './TagDetailsDelayProfile'; import styles from './TagDetailsModalContent.css'; function TagDetailsModalContent(props) { diff --git a/frontend/src/Settings/Tags/Tag.js b/frontend/src/Settings/Tags/Tag.js index 1d031fb3d..dba448f77 100644 --- a/frontend/src/Settings/Tags/Tag.js +++ b/frontend/src/Settings/Tags/Tag.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds } from 'Helpers/Props'; import Card from 'Components/Card'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import TagDetailsModal from './Details/TagDetailsModal'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import TagDetailsModal from './Details/TagDetailsModal'; import styles from './Tag.css'; class Tag extends Component { diff --git a/frontend/src/Settings/Tags/TagConnector.js b/frontend/src/Settings/Tags/TagConnector.js index 50f610153..986acc8e8 100644 --- a/frontend/src/Settings/Tags/TagConnector.js +++ b/frontend/src/Settings/Tags/TagConnector.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createTagDetailsSelector from 'Store/Selectors/createTagDetailsSelector'; import { deleteTag } from 'Store/Actions/tagActions'; +import createTagDetailsSelector from 'Store/Selectors/createTagDetailsSelector'; import Tag from './Tag'; function createMapStateToProps() { diff --git a/frontend/src/Settings/Tags/TagsConnector.js b/frontend/src/Settings/Tags/TagsConnector.js index 5784df4ec..a981eed2a 100644 --- a/frontend/src/Settings/Tags/TagsConnector.js +++ b/frontend/src/Settings/Tags/TagsConnector.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import { fetchDelayProfiles, fetchNetImports, fetchNotifications, fetchRestrictions } from 'Store/Actions/settingsActions'; import { fetchTagDetails } from 'Store/Actions/tagActions'; -import { fetchDelayProfiles, fetchNotifications, fetchRestrictions, fetchNetImports } from 'Store/Actions/settingsActions'; import Tags from './Tags'; function createMapStateToProps() { diff --git a/frontend/src/Settings/UI/UISettings.js b/frontend/src/Settings/UI/UISettings.js index 428df8761..c66493b5d 100644 --- a/frontend/src/Settings/UI/UISettings.js +++ b/frontend/src/Settings/UI/UISettings.js @@ -1,15 +1,15 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { inputTypes } from 'Helpers/Props'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; -import PageContent from 'Components/Page/PageContent'; -import PageContentBody from 'Components/Page/PageContentBody'; -import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import Form from 'Components/Form/Form'; import FormGroup from 'Components/Form/FormGroup'; -import FormLabel from 'Components/Form/FormLabel'; import FormInputGroup from 'Components/Form/FormInputGroup'; +import FormLabel from 'Components/Form/FormLabel'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import PageContent from 'Components/Page/PageContent'; +import PageContentBody from 'Components/Page/PageContentBody'; +import { inputTypes } from 'Helpers/Props'; +import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import translate from 'Utilities/String/translate'; export const firstDayOfWeekOptions = [ diff --git a/frontend/src/Settings/UI/UISettingsConnector.js b/frontend/src/Settings/UI/UISettingsConnector.js index 01310cd5e..31d41f9e0 100644 --- a/frontend/src/Settings/UI/UISettingsConnector.js +++ b/frontend/src/Settings/UI/UISettingsConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; -import { setUISettingsValue, saveUISettings, fetchUISettings } from 'Store/Actions/settingsActions'; import { clearPendingChanges } from 'Store/Actions/baseActions'; +import { fetchUISettings, saveUISettings, setUISettingsValue } from 'Store/Actions/settingsActions'; +import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector'; import UISettings from './UISettings'; const SECTION = 'ui'; diff --git a/frontend/src/Store/Actions/Creators/createHandleActions.js b/frontend/src/Store/Actions/Creators/createHandleActions.js index afa0943ad..2f1954559 100644 --- a/frontend/src/Store/Actions/Creators/createHandleActions.js +++ b/frontend/src/Store/Actions/Creators/createHandleActions.js @@ -1,15 +1,14 @@ import _ from 'lodash'; import { handleActions } from 'redux-actions'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; import { + CLEAR_PENDING_CHANGES, + REMOVE_ITEM, SET, UPDATE, UPDATE_ITEM, - UPDATE_SERVER_SIDE_COLLECTION, - CLEAR_PENDING_CHANGES, - REMOVE_ITEM -} from 'Store/Actions/baseActions'; + UPDATE_SERVER_SIDE_COLLECTION } from 'Store/Actions/baseActions'; +import getSectionState from 'Utilities/State/getSectionState'; +import updateSectionState from 'Utilities/State/updateSectionState'; const blacklistedProperties = [ 'section', diff --git a/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js b/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js index 5e4a2b386..dfe29ace8 100644 --- a/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js +++ b/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { batchActions } from 'redux-batched-actions'; import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { set, removeItem } from '../baseActions'; +import { removeItem, set } from '../baseActions'; function createRemoveItemHandler(section, url) { return function(getState, payload, dispatch) { diff --git a/frontend/src/Store/Actions/Creators/createServerSideCollectionHandlers.js b/frontend/src/Store/Actions/Creators/createServerSideCollectionHandlers.js index f81723769..8b4697377 100644 --- a/frontend/src/Store/Actions/Creators/createServerSideCollectionHandlers.js +++ b/frontend/src/Store/Actions/Creators/createServerSideCollectionHandlers.js @@ -1,9 +1,9 @@ -import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; import pages from 'Utilities/pages'; +import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; import createFetchServerSideCollectionHandler from './createFetchServerSideCollectionHandler'; +import createSetServerSideCollectionFilterHandler from './createSetServerSideCollectionFilterHandler'; import createSetServerSideCollectionPageHandler from './createSetServerSideCollectionPageHandler'; import createSetServerSideCollectionSortHandler from './createSetServerSideCollectionSortHandler'; -import createSetServerSideCollectionFilterHandler from './createSetServerSideCollectionFilterHandler'; function createServerSideCollectionHandlers(section, url, fetchThunk, handlers, fetchDataAugmenter) { const actionHandlers = {}; diff --git a/frontend/src/Store/Actions/Creators/createSetServerSideCollectionSortHandler.js b/frontend/src/Store/Actions/Creators/createSetServerSideCollectionSortHandler.js index fbd66e83e..9bddfc2b7 100644 --- a/frontend/src/Store/Actions/Creators/createSetServerSideCollectionSortHandler.js +++ b/frontend/src/Store/Actions/Creators/createSetServerSideCollectionSortHandler.js @@ -1,5 +1,5 @@ -import getSectionState from 'Utilities/State/getSectionState'; import { sortDirections } from 'Helpers/Props'; +import getSectionState from 'Utilities/State/getSectionState'; import { set } from '../baseActions'; function createSetServerSideCollectionSortHandler(section, fetchHandler) { diff --git a/frontend/src/Store/Actions/Settings/customFormatSpecifications.js b/frontend/src/Store/Actions/Settings/customFormatSpecifications.js index e78c8d493..5f2675e7f 100644 --- a/frontend/src/Store/Actions/Settings/customFormatSpecifications.js +++ b/frontend/src/Store/Actions/Settings/customFormatSpecifications.js @@ -1,16 +1,16 @@ import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; +import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; +import createClearReducer from 'Store/Actions/Creators/Reducers/createClearReducer'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import { createThunk } from 'Store/thunks'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; import getNextId from 'Utilities/State/getNextId'; -import selectProviderSchema from 'Utilities/State/selectProviderSchema'; import getProviderState from 'Utilities/State/getProviderState'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; -import createClearReducer from 'Store/Actions/Creators/Reducers/createClearReducer'; -import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; -import { set, update, updateItem, removeItem } from '../baseActions'; +import getSectionState from 'Utilities/State/getSectionState'; +import selectProviderSchema from 'Utilities/State/selectProviderSchema'; +import updateSectionState from 'Utilities/State/updateSectionState'; +import { removeItem, set, update, updateItem } from '../baseActions'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/customFormats.js b/frontend/src/Store/Actions/Settings/customFormats.js index e8b007c3f..4a175abea 100644 --- a/frontend/src/Store/Actions/Settings/customFormats.js +++ b/frontend/src/Store/Actions/Settings/customFormats.js @@ -1,11 +1,11 @@ import { createAction } from 'redux-actions'; +import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; +import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import { createThunk } from 'Store/thunks'; import getSectionState from 'Utilities/State/getSectionState'; import updateSectionState from 'Utilities/State/updateSectionState'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; -import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; import { set } from '../baseActions'; // diff --git a/frontend/src/Store/Actions/Settings/delayProfiles.js b/frontend/src/Store/Actions/Settings/delayProfiles.js index fcb0ad0bd..38abc5841 100644 --- a/frontend/src/Store/Actions/Settings/delayProfiles.js +++ b/frontend/src/Store/Actions/Settings/delayProfiles.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { update } from 'Store/Actions/baseActions'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; -import { update } from 'Store/Actions/baseActions'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/downloadClientOptions.js b/frontend/src/Store/Actions/Settings/downloadClientOptions.js index 6d4a3954d..0cd7b285e 100644 --- a/frontend/src/Store/Actions/Settings/downloadClientOptions.js +++ b/frontend/src/Store/Actions/Settings/downloadClientOptions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/downloadClients.js b/frontend/src/Store/Actions/Settings/downloadClients.js index a268053f7..c18b4db76 100644 --- a/frontend/src/Store/Actions/Settings/downloadClients.js +++ b/frontend/src/Store/Actions/Settings/downloadClients.js @@ -1,14 +1,14 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import selectProviderSchema from 'Utilities/State/selectProviderSchema'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; +import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler'; -import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler'; -import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import selectProviderSchema from 'Utilities/State/selectProviderSchema'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/general.js b/frontend/src/Store/Actions/Settings/general.js index f5e8c277e..98bb2703d 100644 --- a/frontend/src/Store/Actions/Settings/general.js +++ b/frontend/src/Store/Actions/Settings/general.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/indexerOptions.js b/frontend/src/Store/Actions/Settings/indexerOptions.js index 53fb21651..bafc2735d 100644 --- a/frontend/src/Store/Actions/Settings/indexerOptions.js +++ b/frontend/src/Store/Actions/Settings/indexerOptions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/indexers.js b/frontend/src/Store/Actions/Settings/indexers.js index a65b41f3c..e2e85cbb5 100644 --- a/frontend/src/Store/Actions/Settings/indexers.js +++ b/frontend/src/Store/Actions/Settings/indexers.js @@ -1,16 +1,16 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; -import selectProviderSchema from 'Utilities/State/selectProviderSchema'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; +import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler'; -import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler'; -import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import getSectionState from 'Utilities/State/getSectionState'; +import selectProviderSchema from 'Utilities/State/selectProviderSchema'; +import updateSectionState from 'Utilities/State/updateSectionState'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/languages.js b/frontend/src/Store/Actions/Settings/languages.js index d0a1f91f2..a0b62fc49 100644 --- a/frontend/src/Store/Actions/Settings/languages.js +++ b/frontend/src/Store/Actions/Settings/languages.js @@ -1,5 +1,5 @@ -import { createThunk } from 'Store/thunks'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/mediaManagement.js b/frontend/src/Store/Actions/Settings/mediaManagement.js index 4ae9eba0c..b1ace08b0 100644 --- a/frontend/src/Store/Actions/Settings/mediaManagement.js +++ b/frontend/src/Store/Actions/Settings/mediaManagement.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/metadata.js b/frontend/src/Store/Actions/Settings/metadata.js index ed5e0aa86..e3a661f6d 100644 --- a/frontend/src/Store/Actions/Settings/metadata.js +++ b/frontend/src/Store/Actions/Settings/metadata.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/metadataOptions.js b/frontend/src/Store/Actions/Settings/metadataOptions.js index 3500371f4..395924edf 100644 --- a/frontend/src/Store/Actions/Settings/metadataOptions.js +++ b/frontend/src/Store/Actions/Settings/metadataOptions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/naming.js b/frontend/src/Store/Actions/Settings/naming.js index 27add8309..cf5a6818a 100644 --- a/frontend/src/Store/Actions/Settings/naming.js +++ b/frontend/src/Store/Actions/Settings/naming.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/namingExamples.js b/frontend/src/Store/Actions/Settings/namingExamples.js index d937b8f2e..0fef90ce2 100644 --- a/frontend/src/Store/Actions/Settings/namingExamples.js +++ b/frontend/src/Store/Actions/Settings/namingExamples.js @@ -1,7 +1,7 @@ import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { createThunk } from 'Store/thunks'; import { set, update } from 'Store/Actions/baseActions'; +import { createThunk } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/netImportExclusions.js b/frontend/src/Store/Actions/Settings/netImportExclusions.js index 5cf13eaa2..7823a23a8 100644 --- a/frontend/src/Store/Actions/Settings/netImportExclusions.js +++ b/frontend/src/Store/Actions/Settings/netImportExclusions.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/netImportOptions.js b/frontend/src/Store/Actions/Settings/netImportOptions.js index 06a6a13d9..425f8f4e4 100644 --- a/frontend/src/Store/Actions/Settings/netImportOptions.js +++ b/frontend/src/Store/Actions/Settings/netImportOptions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/netImports.js b/frontend/src/Store/Actions/Settings/netImports.js index 37125af2b..300f1f7f9 100644 --- a/frontend/src/Store/Actions/Settings/netImports.js +++ b/frontend/src/Store/Actions/Settings/netImports.js @@ -1,14 +1,14 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import selectProviderSchema from 'Utilities/State/selectProviderSchema'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; +import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler'; -import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler'; -import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import selectProviderSchema from 'Utilities/State/selectProviderSchema'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/notifications.js b/frontend/src/Store/Actions/Settings/notifications.js index b2c28dac9..062fe4d9e 100644 --- a/frontend/src/Store/Actions/Settings/notifications.js +++ b/frontend/src/Store/Actions/Settings/notifications.js @@ -1,13 +1,13 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import selectProviderSchema from 'Utilities/State/selectProviderSchema'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; -import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; +import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler'; import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler'; -import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import selectProviderSchema from 'Utilities/State/selectProviderSchema'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/qualityDefinitions.js b/frontend/src/Store/Actions/Settings/qualityDefinitions.js index ef5d0a757..b17ec01de 100644 --- a/frontend/src/Store/Actions/Settings/qualityDefinitions.js +++ b/frontend/src/Store/Actions/Settings/qualityDefinitions.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; +import { clearPendingChanges, set, update } from 'Store/Actions/baseActions'; +import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; +import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import { createThunk } from 'Store/thunks'; import createAjaxRequest from 'Utilities/createAjaxRequest'; import getSectionState from 'Utilities/State/getSectionState'; import updateSectionState from 'Utilities/State/updateSectionState'; -import { createThunk } from 'Store/thunks'; -import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; -import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; -import { clearPendingChanges, set, update } from 'Store/Actions/baseActions'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/qualityProfiles.js b/frontend/src/Store/Actions/Settings/qualityProfiles.js index 6fdc204a0..8e6036073 100644 --- a/frontend/src/Store/Actions/Settings/qualityProfiles.js +++ b/frontend/src/Store/Actions/Settings/qualityProfiles.js @@ -1,12 +1,12 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; +import getSectionState from 'Utilities/State/getSectionState'; +import updateSectionState from 'Utilities/State/updateSectionState'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/remotePathMappings.js b/frontend/src/Store/Actions/Settings/remotePathMappings.js index 3cfcc7f1f..ca7955754 100644 --- a/frontend/src/Store/Actions/Settings/remotePathMappings.js +++ b/frontend/src/Store/Actions/Settings/remotePathMappings.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/restrictions.js b/frontend/src/Store/Actions/Settings/restrictions.js index 190b5124e..7e0838593 100644 --- a/frontend/src/Store/Actions/Settings/restrictions.js +++ b/frontend/src/Store/Actions/Settings/restrictions.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; -import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler'; +import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/Settings/ui.js b/frontend/src/Store/Actions/Settings/ui.js index 97d7223fd..7a57add6d 100644 --- a/frontend/src/Store/Actions/Settings/ui.js +++ b/frontend/src/Store/Actions/Settings/ui.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import { createThunk } from 'Store/thunks'; -import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; import createFetchHandler from 'Store/Actions/Creators/createFetchHandler'; import createSaveHandler from 'Store/Actions/Creators/createSaveHandler'; +import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer'; +import { createThunk } from 'Store/thunks'; // // Variables diff --git a/frontend/src/Store/Actions/addMovieActions.js b/frontend/src/Store/Actions/addMovieActions.js index 05e0b8d98..4d624df86 100644 --- a/frontend/src/Store/Actions/addMovieActions.js +++ b/frontend/src/Store/Actions/addMovieActions.js @@ -1,14 +1,14 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; +import { createThunk, handleThunks } from 'Store/thunks'; import createAjaxRequest from 'Utilities/createAjaxRequest'; import getNewMovie from 'Utilities/Movie/getNewMovie'; -import { createThunk, handleThunks } from 'Store/thunks'; -import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; -import createHandleActions from './Creators/createHandleActions'; +import getSectionState from 'Utilities/State/getSectionState'; +import updateSectionState from 'Utilities/State/updateSectionState'; import { set, update, updateItem } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; +import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; // // Variables diff --git a/frontend/src/Store/Actions/blacklistActions.js b/frontend/src/Store/Actions/blacklistActions.js index 5ac825c54..7443f35af 100644 --- a/frontend/src/Store/Actions/blacklistActions.js +++ b/frontend/src/Store/Actions/blacklistActions.js @@ -1,13 +1,13 @@ import { createAction } from 'redux-actions'; -import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; -import { createThunk, handleThunks } from 'Store/thunks'; import { sortDirections } from 'Helpers/Props'; -import createClearReducer from './Creators/Reducers/createClearReducer'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; +import { createThunk, handleThunks } from 'Store/thunks'; +import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; +import translate from 'Utilities/String/translate'; import createHandleActions from './Creators/createHandleActions'; import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createServerSideCollectionHandlers from './Creators/createServerSideCollectionHandlers'; -import translate from 'Utilities/String/translate'; +import createClearReducer from './Creators/Reducers/createClearReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; // // Variables diff --git a/frontend/src/Store/Actions/calendarActions.js b/frontend/src/Store/Actions/calendarActions.js index c032b4399..08168ab93 100644 --- a/frontend/src/Store/Actions/calendarActions.js +++ b/frontend/src/Store/Actions/calendarActions.js @@ -1,17 +1,17 @@ import _ from 'lodash'; +import moment from 'moment'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import moment from 'moment'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { filterTypes } from 'Helpers/Props'; -import { createThunk, handleThunks } from 'Store/thunks'; import * as calendarViews from 'Calendar/calendarViews'; import * as commandNames from 'Commands/commandNames'; -import createClearReducer from './Creators/Reducers/createClearReducer'; -import createHandleActions from './Creators/createHandleActions'; +import { filterTypes } from 'Helpers/Props'; +import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import translate from 'Utilities/String/translate'; import { set, update } from './baseActions'; import { executeCommandHelper } from './commandActions'; -import translate from 'Utilities/String/translate'; +import createHandleActions from './Creators/createHandleActions'; +import createClearReducer from './Creators/Reducers/createClearReducer'; // // Variables diff --git a/frontend/src/Store/Actions/captchaActions.js b/frontend/src/Store/Actions/captchaActions.js index d506566f7..c83d231b7 100644 --- a/frontend/src/Store/Actions/captchaActions.js +++ b/frontend/src/Store/Actions/captchaActions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; +import { createThunk, handleThunks } from 'Store/thunks'; import requestAction from 'Utilities/requestAction'; import getSectionState from 'Utilities/State/getSectionState'; import updateSectionState from 'Utilities/State/updateSectionState'; -import { createThunk, handleThunks } from 'Store/thunks'; import createHandleActions from './Creators/createHandleActions'; // diff --git a/frontend/src/Store/Actions/commandActions.js b/frontend/src/Store/Actions/commandActions.js index fc3b907f7..27583c299 100644 --- a/frontend/src/Store/Actions/commandActions.js +++ b/frontend/src/Store/Actions/commandActions.js @@ -1,15 +1,15 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { isSameCommand } from 'Utilities/Command'; import { messageTypes } from 'Helpers/Props'; import { createThunk, handleThunks } from 'Store/thunks'; +import { isSameCommand } from 'Utilities/Command'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import { hideMessage, showMessage } from './appActions'; +import { updateItem } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; import createHandleActions from './Creators/createHandleActions'; import createRemoveItemHandler from './Creators/createRemoveItemHandler'; -import { showMessage, hideMessage } from './appActions'; -import { updateItem } from './baseActions'; // // Variables diff --git a/frontend/src/Store/Actions/createReducers.js b/frontend/src/Store/Actions/createReducers.js index 11928e4d2..28c06b9c3 100644 --- a/frontend/src/Store/Actions/createReducers.js +++ b/frontend/src/Store/Actions/createReducers.js @@ -1,7 +1,7 @@ +import { connectRouter } from 'connected-react-router'; import { combineReducers } from 'redux'; import { enableBatching } from 'redux-batched-actions'; import actions from 'Store/Actions'; -import { connectRouter } from 'connected-react-router'; const defaultState = {}; const reducers = {}; diff --git a/frontend/src/Store/Actions/customFilterActions.js b/frontend/src/Store/Actions/customFilterActions.js index 750c3ef6f..d644afbf9 100644 --- a/frontend/src/Store/Actions/customFilterActions.js +++ b/frontend/src/Store/Actions/customFilterActions.js @@ -1,8 +1,8 @@ import { createThunk, handleThunks } from 'Store/thunks'; import createFetchHandler from './Creators/createFetchHandler'; +import createHandleActions from './Creators/createHandleActions'; import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createSaveProviderHandler from './Creators/createSaveProviderHandler'; -import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/discoverMovieActions.js b/frontend/src/Store/Actions/discoverMovieActions.js index dfd14c6d1..8ca78965b 100644 --- a/frontend/src/Store/Actions/discoverMovieActions.js +++ b/frontend/src/Store/Actions/discoverMovieActions.js @@ -1,22 +1,22 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import getSectionState from 'Utilities/State/getSectionState'; -import updateSectionState from 'Utilities/State/updateSectionState'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import getNewMovie from 'Utilities/Movie/getNewMovie'; import { filterBuilderTypes, filterBuilderValueTypes, filterTypes, sortDirections } from 'Helpers/Props'; -import sortByName from 'Utilities/Array/sortByName'; import { createThunk, handleThunks } from 'Store/thunks'; -import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; +import sortByName from 'Utilities/Array/sortByName'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import getNewMovie from 'Utilities/Movie/getNewMovie'; +import getSectionState from 'Utilities/State/getSectionState'; +import updateSectionState from 'Utilities/State/updateSectionState'; +import translate from 'Utilities/String/translate'; +import { removeItem, set, updateItem } from './baseActions'; import createHandleActions from './Creators/createHandleActions'; -import { set, updateItem, removeItem } from './baseActions'; -import { filterPredicates } from './movieActions'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; -import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; -import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; import createClearReducer from './Creators/Reducers/createClearReducer'; -import translate from 'Utilities/String/translate'; +import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; +import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; +import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; +import { filterPredicates } from './movieActions'; // // Variables diff --git a/frontend/src/Store/Actions/historyActions.js b/frontend/src/Store/Actions/historyActions.js index e8c5df5a0..f9f54fb4f 100644 --- a/frontend/src/Store/Actions/historyActions.js +++ b/frontend/src/Store/Actions/historyActions.js @@ -1,14 +1,14 @@ import { createAction } from 'redux-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; import { filterTypes, sortDirections } from 'Helpers/Props'; import { createThunk, handleThunks } from 'Store/thunks'; -import createClearReducer from './Creators/Reducers/createClearReducer'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; +import translate from 'Utilities/String/translate'; +import { updateItem } from './baseActions'; import createHandleActions from './Creators/createHandleActions'; import createServerSideCollectionHandlers from './Creators/createServerSideCollectionHandlers'; -import { updateItem } from './baseActions'; -import translate from 'Utilities/String/translate'; +import createClearReducer from './Creators/Reducers/createClearReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; // // Variables diff --git a/frontend/src/Store/Actions/importMovieActions.js b/frontend/src/Store/Actions/importMovieActions.js index fae4f2094..20d172f6d 100644 --- a/frontend/src/Store/Actions/importMovieActions.js +++ b/frontend/src/Store/Actions/importMovieActions.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; +import { createThunk, handleThunks } from 'Store/thunks'; import createAjaxRequest from 'Utilities/createAjaxRequest'; +import getNewMovie from 'Utilities/Movie/getNewMovie'; import getSectionState from 'Utilities/State/getSectionState'; import updateSectionState from 'Utilities/State/updateSectionState'; -import getNewMovie from 'Utilities/Movie/getNewMovie'; -import { createThunk, handleThunks } from 'Store/thunks'; +import { removeItem, set, updateItem } from './baseActions'; import createHandleActions from './Creators/createHandleActions'; -import { set, removeItem, updateItem } from './baseActions'; import { fetchRootFolders } from './rootFolderActions'; // diff --git a/frontend/src/Store/Actions/index.js b/frontend/src/Store/Actions/index.js index 281739940..ab70482d8 100644 --- a/frontend/src/Store/Actions/index.js +++ b/frontend/src/Store/Actions/index.js @@ -3,14 +3,18 @@ import * as app from './appActions'; import * as blacklist from './blacklistActions'; import * as calendar from './calendarActions'; import * as captcha from './captchaActions'; -import * as customFilters from './customFilterActions'; import * as commands from './commandActions'; +import * as customFilters from './customFilterActions'; import * as discoverMovie from './discoverMovieActions'; -import * as movieFiles from './movieFileActions'; import * as extraFiles from './extraFileActions'; import * as history from './historyActions'; import * as importMovie from './importMovieActions'; import * as interactiveImportActions from './interactiveImportActions'; +import * as movies from './movieActions'; +import * as movieCredits from './movieCreditsActions'; +import * as movieFiles from './movieFileActions'; +import * as movieHistory from './movieHistoryActions'; +import * as movieIndex from './movieIndexActions'; import * as oAuth from './oAuthActions'; import * as organizePreview from './organizePreviewActions'; import * as paths from './pathActions'; @@ -18,10 +22,6 @@ import * as providerOptions from './providerOptionActions'; import * as queue from './queueActions'; import * as releases from './releaseActions'; import * as rootFolders from './rootFolderActions'; -import * as movies from './movieActions'; -import * as movieHistory from './movieHistoryActions'; -import * as movieIndex from './movieIndexActions'; -import * as movieCredits from './movieCreditsActions'; import * as settings from './settingsActions'; import * as system from './systemActions'; import * as tags from './tagActions'; diff --git a/frontend/src/Store/Actions/interactiveImportActions.js b/frontend/src/Store/Actions/interactiveImportActions.js index 2c1b271fb..061077b85 100644 --- a/frontend/src/Store/Actions/interactiveImportActions.js +++ b/frontend/src/Store/Actions/interactiveImportActions.js @@ -1,12 +1,12 @@ import moment from 'moment'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { createThunk, handleThunks } from 'Store/thunks'; import { sortDirections } from 'Helpers/Props'; -import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; -import createHandleActions from './Creators/createHandleActions'; +import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import { set, update } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; +import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; // // Variables diff --git a/frontend/src/Store/Actions/movieActions.js b/frontend/src/Store/Actions/movieActions.js index de3d1ceca..4aa7d55fc 100644 --- a/frontend/src/Store/Actions/movieActions.js +++ b/frontend/src/Store/Actions/movieActions.js @@ -1,18 +1,18 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; +import { filterTypePredicates, filterTypes, sortDirections } from 'Helpers/Props'; +import { createThunk, handleThunks } from 'Store/thunks'; // import { batchActions } from 'redux-batched-actions'; import createAjaxRequest from 'Utilities/createAjaxRequest'; import dateFilterPredicate from 'Utilities/Date/dateFilterPredicate'; import padNumber from 'Utilities/Number/padNumber'; -import { filterTypePredicates, filterTypes, sortDirections } from 'Helpers/Props'; -import { createThunk, handleThunks } from 'Store/thunks'; -import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; +import translate from 'Utilities/String/translate'; +import { updateItem } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; -import createSaveProviderHandler from './Creators/createSaveProviderHandler'; -import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createHandleActions from './Creators/createHandleActions'; -import { updateItem } from './baseActions'; -import translate from 'Utilities/String/translate'; +import createRemoveItemHandler from './Creators/createRemoveItemHandler'; +import createSaveProviderHandler from './Creators/createSaveProviderHandler'; +import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer'; // // Variables diff --git a/frontend/src/Store/Actions/movieCreditsActions.js b/frontend/src/Store/Actions/movieCreditsActions.js index 004571fd8..49f978554 100644 --- a/frontend/src/Store/Actions/movieCreditsActions.js +++ b/frontend/src/Store/Actions/movieCreditsActions.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import { set, update } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/movieFileActions.js b/frontend/src/Store/Actions/movieFileActions.js index 3c495969b..2a7203f57 100644 --- a/frontend/src/Store/Actions/movieFileActions.js +++ b/frontend/src/Store/Actions/movieFileActions.js @@ -1,13 +1,13 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import { createThunk, handleThunks } from 'Store/thunks'; import movieEntities from 'Movie/movieEntities'; +import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import { removeItem, set, updateItem } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; import createHandleActions from './Creators/createHandleActions'; import createRemoveItemHandler from './Creators/createRemoveItemHandler'; -import { set, removeItem, updateItem } from './baseActions'; // // Variables diff --git a/frontend/src/Store/Actions/movieHistoryActions.js b/frontend/src/Store/Actions/movieHistoryActions.js index f323854e6..02c1d7428 100644 --- a/frontend/src/Store/Actions/movieHistoryActions.js +++ b/frontend/src/Store/Actions/movieHistoryActions.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import { set, update } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js index 81c8d1d9f..76afd6745 100644 --- a/frontend/src/Store/Actions/movieIndexActions.js +++ b/frontend/src/Store/Actions/movieIndexActions.js @@ -1,16 +1,17 @@ import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import sortByName from 'Utilities/Array/sortByName'; import { filterBuilderTypes, filterBuilderValueTypes, sortDirections } from 'Helpers/Props'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; -import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; -import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; -import { set, updateItem } from './baseActions'; -import { filters, filterPredicates, sortPredicates } from './movieActions'; +import sortByName from 'Utilities/Array/sortByName'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import translate from 'Utilities/String/translate'; +import { set, updateItem } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; +import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; +import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; +import { filterPredicates, filters, sortPredicates } from './movieActions'; + // // Variables diff --git a/frontend/src/Store/Actions/movieTitlesActions.js b/frontend/src/Store/Actions/movieTitlesActions.js index 66b435bf3..8a53ae87b 100644 --- a/frontend/src/Store/Actions/movieTitlesActions.js +++ b/frontend/src/Store/Actions/movieTitlesActions.js @@ -1,8 +1,8 @@ import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import { set, update } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/oAuthActions.js b/frontend/src/Store/Actions/oAuthActions.js index 7ebf5180d..76721ebf8 100644 --- a/frontend/src/Store/Actions/oAuthActions.js +++ b/frontend/src/Store/Actions/oAuthActions.js @@ -1,12 +1,12 @@ import $ from 'jquery'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; +import { set } from 'Store/Actions/baseActions'; +import { createThunk, handleThunks } from 'Store/thunks'; import createAjaxRequest from 'Utilities/createAjaxRequest'; import requestAction from 'Utilities/requestAction'; import getSectionState from 'Utilities/State/getSectionState'; import updateSectionState from 'Utilities/State/updateSectionState'; -import { createThunk, handleThunks } from 'Store/thunks'; -import { set } from 'Store/Actions/baseActions'; import createHandleActions from './Creators/createHandleActions'; // diff --git a/frontend/src/Store/Actions/pathActions.js b/frontend/src/Store/Actions/pathActions.js index 139ab9e23..1cb7a15a2 100644 --- a/frontend/src/Store/Actions/pathActions.js +++ b/frontend/src/Store/Actions/pathActions.js @@ -1,8 +1,8 @@ import { createAction } from 'redux-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; import { set } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/providerOptionActions.js b/frontend/src/Store/Actions/providerOptionActions.js index c8d05e7e1..4a8956117 100644 --- a/frontend/src/Store/Actions/providerOptionActions.js +++ b/frontend/src/Store/Actions/providerOptionActions.js @@ -1,9 +1,9 @@ import { createAction } from 'redux-actions'; +import { createThunk, handleThunks } from 'Store/thunks'; import requestAction from 'Utilities/requestAction'; import updateSectionState from 'Utilities/State/updateSectionState'; -import { createThunk, handleThunks } from 'Store/thunks'; -import createHandleActions from './Creators/createHandleActions'; import { set } from './baseActions'; +import createHandleActions from './Creators/createHandleActions'; // // Variables diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js index 2d4f2df82..bac6fb358 100644 --- a/frontend/src/Store/Actions/queueActions.js +++ b/frontend/src/Store/Actions/queueActions.js @@ -1,17 +1,17 @@ import _ from 'lodash'; import { createAction } from 'redux-actions'; import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; import { sortDirections } from 'Helpers/Props'; import { createThunk, handleThunks } from 'Store/thunks'; -import createClearReducer from './Creators/Reducers/createClearReducer'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; +import translate from 'Utilities/String/translate'; +import { set, updateItem } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; import createHandleActions from './Creators/createHandleActions'; import createServerSideCollectionHandlers from './Creators/createServerSideCollectionHandlers'; -import { set, updateItem } from './baseActions'; -import translate from 'Utilities/String/translate'; +import createClearReducer from './Creators/Reducers/createClearReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; // // Variables diff --git a/frontend/src/Store/Actions/releaseActions.js b/frontend/src/Store/Actions/releaseActions.js index d6b2fd45a..ac98f4fd7 100644 --- a/frontend/src/Store/Actions/releaseActions.js +++ b/frontend/src/Store/Actions/releaseActions.js @@ -1,12 +1,12 @@ import { createAction } from 'redux-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { filterBuilderTypes, filterBuilderValueTypes, filterTypes, sortDirections } from 'Helpers/Props'; import { createThunk, handleThunks } from 'Store/thunks'; -import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; -import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import translate from 'Utilities/String/translate'; import createFetchHandler from './Creators/createFetchHandler'; import createHandleActions from './Creators/createHandleActions'; -import translate from 'Utilities/String/translate'; +import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer'; +import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer'; // // Variables diff --git a/frontend/src/Store/Actions/rootFolderActions.js b/frontend/src/Store/Actions/rootFolderActions.js index 3e3c7de8a..5c7cd79ae 100644 --- a/frontend/src/Store/Actions/rootFolderActions.js +++ b/frontend/src/Store/Actions/rootFolderActions.js @@ -1,10 +1,10 @@ import { batchActions } from 'redux-batched-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import { set, updateItem } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; import createHandleActions from './Creators/createHandleActions'; import createRemoveItemHandler from './Creators/createRemoveItemHandler'; -import { set, updateItem } from './baseActions'; // // Variables diff --git a/frontend/src/Store/Actions/settingsActions.js b/frontend/src/Store/Actions/settingsActions.js index 7c022bbe9..eb0fe46b6 100644 --- a/frontend/src/Store/Actions/settingsActions.js +++ b/frontend/src/Store/Actions/settingsActions.js @@ -1,23 +1,23 @@ import { createAction } from 'redux-actions'; import { handleThunks } from 'Store/thunks'; import createHandleActions from './Creators/createHandleActions'; -import customFormatSpecifications from './Settings/customFormatSpecifications'; import customFormats from './Settings/customFormats'; +import customFormatSpecifications from './Settings/customFormatSpecifications'; import delayProfiles from './Settings/delayProfiles'; -import downloadClients from './Settings/downloadClients'; import downloadClientOptions from './Settings/downloadClientOptions'; +import downloadClients from './Settings/downloadClients'; import general from './Settings/general'; import indexerOptions from './Settings/indexerOptions'; import indexers from './Settings/indexers'; import languages from './Settings/languages'; -import netImportExclusions from './Settings/netImportExclusions'; -import netImportOptions from './Settings/netImportOptions'; -import netImports from './Settings/netImports'; import mediaManagement from './Settings/mediaManagement'; import metadata from './Settings/metadata'; import metadataOptions from './Settings/metadataOptions'; import naming from './Settings/naming'; import namingExamples from './Settings/namingExamples'; +import netImportExclusions from './Settings/netImportExclusions'; +import netImportOptions from './Settings/netImportOptions'; +import netImports from './Settings/netImports'; import notifications from './Settings/notifications'; import qualityDefinitions from './Settings/qualityDefinitions'; import qualityProfiles from './Settings/qualityProfiles'; diff --git a/frontend/src/Store/Actions/systemActions.js b/frontend/src/Store/Actions/systemActions.js index ac6ed24fd..96e2d8966 100644 --- a/frontend/src/Store/Actions/systemActions.js +++ b/frontend/src/Store/Actions/systemActions.js @@ -1,17 +1,17 @@ import { createAction } from 'redux-actions'; -import createAjaxRequest from 'Utilities/createAjaxRequest'; -import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; import { filterTypes, sortDirections } from 'Helpers/Props'; -import { createThunk, handleThunks } from 'Store/thunks'; import { setAppValue } from 'Store/Actions/appActions'; -import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; -import createClearReducer from './Creators/Reducers/createClearReducer'; +import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers'; +import translate from 'Utilities/String/translate'; +import { set } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; -import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createHandleActions from './Creators/createHandleActions'; +import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createServerSideCollectionHandlers from './Creators/createServerSideCollectionHandlers'; -import { set } from './baseActions'; -import translate from 'Utilities/String/translate'; +import createClearReducer from './Creators/Reducers/createClearReducer'; +import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptionReducer'; // // Variables diff --git a/frontend/src/Store/Actions/tagActions.js b/frontend/src/Store/Actions/tagActions.js index 5389b1a6b..3b92eb8a4 100644 --- a/frontend/src/Store/Actions/tagActions.js +++ b/frontend/src/Store/Actions/tagActions.js @@ -1,9 +1,9 @@ -import createAjaxRequest from 'Utilities/createAjaxRequest'; import { createThunk, handleThunks } from 'Store/thunks'; +import createAjaxRequest from 'Utilities/createAjaxRequest'; +import { update } from './baseActions'; import createFetchHandler from './Creators/createFetchHandler'; -import createRemoveItemHandler from './Creators/createRemoveItemHandler'; import createHandleActions from './Creators/createHandleActions'; -import { update } from './baseActions'; +import createRemoveItemHandler from './Creators/createRemoveItemHandler'; // // Variables diff --git a/frontend/src/Store/Middleware/createSentryMiddleware.js b/frontend/src/Store/Middleware/createSentryMiddleware.js index 12e1fbbd0..6358a9d8e 100644 --- a/frontend/src/Store/Middleware/createSentryMiddleware.js +++ b/frontend/src/Store/Middleware/createSentryMiddleware.js @@ -1,6 +1,6 @@ -import _ from 'lodash'; import * as sentry from '@sentry/browser'; import * as Integrations from '@sentry/integrations'; +import _ from 'lodash'; import parseUrl from 'Utilities/String/parseUrl'; function cleanseUrl(url) { diff --git a/frontend/src/Store/Middleware/middlewares.js b/frontend/src/Store/Middleware/middlewares.js index 119743b23..c4e4ce26f 100644 --- a/frontend/src/Store/Middleware/middlewares.js +++ b/frontend/src/Store/Middleware/middlewares.js @@ -1,8 +1,8 @@ +import { routerMiddleware } from 'connected-react-router'; import { applyMiddleware, compose } from 'redux'; import thunk from 'redux-thunk'; -import { routerMiddleware } from 'connected-react-router'; -import createSentryMiddleware from './createSentryMiddleware'; import createPersistState from './createPersistState'; +import createSentryMiddleware from './createSentryMiddleware'; export default function(history) { const middlewares = []; diff --git a/frontend/src/Store/Selectors/createClientSideCollectionSelector.js b/frontend/src/Store/Selectors/createClientSideCollectionSelector.js index 36f9d4a56..a42ec9bb2 100644 --- a/frontend/src/Store/Selectors/createClientSideCollectionSelector.js +++ b/frontend/src/Store/Selectors/createClientSideCollectionSelector.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import { createSelector } from 'reselect'; -import findSelectedFilters from 'Utilities/Filter/findSelectedFilters'; import { filterTypePredicates, filterTypes, sortDirections } from 'Helpers/Props'; +import findSelectedFilters from 'Utilities/Filter/findSelectedFilters'; function getSortClause(sortKey, sortDirection, sortPredicates) { if (sortPredicates && sortPredicates.hasOwnProperty(sortKey)) { diff --git a/frontend/src/Store/Selectors/createDeepEqualSelector.js b/frontend/src/Store/Selectors/createDeepEqualSelector.js index c01d23875..85562f28b 100644 --- a/frontend/src/Store/Selectors/createDeepEqualSelector.js +++ b/frontend/src/Store/Selectors/createDeepEqualSelector.js @@ -1,5 +1,5 @@ -import { createSelectorCreator, defaultMemoize } from 'reselect'; import _ from 'lodash'; +import { createSelectorCreator, defaultMemoize } from 'reselect'; const createDeepEqualSelector = createSelectorCreator( defaultMemoize, diff --git a/frontend/src/Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector.js b/frontend/src/Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector.js index 04fcd4f03..6ebd7fa1f 100644 --- a/frontend/src/Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector.js +++ b/frontend/src/Store/Selectors/createDiscoverMovieClientSideCollectionItemsSelector.js @@ -1,6 +1,6 @@ import { createSelector } from 'reselect'; -import createDeepEqualSelector from './createDeepEqualSelector'; import createClientSideCollectionSelector from './createClientSideCollectionSelector'; +import createDeepEqualSelector from './createDeepEqualSelector'; function createUnoptimizedSelector(uiSection) { return createSelector( diff --git a/frontend/src/Store/Selectors/createMovieClientSideCollectionItemsSelector.js b/frontend/src/Store/Selectors/createMovieClientSideCollectionItemsSelector.js index aab2a7ca5..755816c9d 100644 --- a/frontend/src/Store/Selectors/createMovieClientSideCollectionItemsSelector.js +++ b/frontend/src/Store/Selectors/createMovieClientSideCollectionItemsSelector.js @@ -1,6 +1,6 @@ import { createSelector, createSelectorCreator, defaultMemoize } from 'reselect'; -import createClientSideCollectionSelector from './createClientSideCollectionSelector'; import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder'; +import createClientSideCollectionSelector from './createClientSideCollectionSelector'; function createUnoptimizedSelector(uiSection) { return createSelector( diff --git a/frontend/src/Store/Selectors/createSortedSectionSelector.js b/frontend/src/Store/Selectors/createSortedSectionSelector.js index 716737ca6..331d890c9 100644 --- a/frontend/src/Store/Selectors/createSortedSectionSelector.js +++ b/frontend/src/Store/Selectors/createSortedSectionSelector.js @@ -1,5 +1,6 @@ import { createSelector } from 'reselect'; import getSectionState from 'Utilities/State/getSectionState'; + function createSortedSectionSelector(section, comparer) { return createSelector( (state) => state, diff --git a/frontend/src/System/Backup/BackupRow.js b/frontend/src/System/Backup/BackupRow.js index 451cbd214..b6e324dec 100644 --- a/frontend/src/System/Backup/BackupRow.js +++ b/frontend/src/System/Backup/BackupRow.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; import Link from 'Components/Link/Link'; import ConfirmModal from 'Components/Modal/ConfirmModal'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; import RestoreBackupModalConnector from './RestoreBackupModalConnector'; import styles from './BackupRow.css'; diff --git a/frontend/src/System/Backup/Backups.js b/frontend/src/System/Backup/Backups.js index cf96b670c..a4d72fef0 100644 --- a/frontend/src/System/Backup/Backups.js +++ b/frontend/src/System/Backup/Backups.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; -import TableBody from 'Components/Table/TableBody'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import Table from 'Components/Table/Table'; +import TableBody from 'Components/Table/TableBody'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import BackupRow from './BackupRow'; import RestoreBackupModalConnector from './RestoreBackupModalConnector'; -import translate from 'Utilities/String/translate'; const columns = [ { diff --git a/frontend/src/System/Backup/BackupsConnector.js b/frontend/src/System/Backup/BackupsConnector.js index 434354f5b..1353b6196 100644 --- a/frontend/src/System/Backup/BackupsConnector.js +++ b/frontend/src/System/Backup/BackupsConnector.js @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; -import { fetchBackups, deleteBackup } from 'Store/Actions/systemActions'; -import { executeCommand } from 'Store/Actions/commandActions'; import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; +import { deleteBackup, fetchBackups } from 'Store/Actions/systemActions'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import Backups from './Backups'; function createMapStateToProps() { diff --git a/frontend/src/System/Backup/RestoreBackupModalContent.js b/frontend/src/System/Backup/RestoreBackupModalContent.js index dfc99e3e2..fe36ebfc6 100644 --- a/frontend/src/System/Backup/RestoreBackupModalContent.js +++ b/frontend/src/System/Backup/RestoreBackupModalContent.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons, kinds } from 'Helpers/Props'; -import Icon from 'Components/Icon'; import TextInput from 'Components/Form/TextInput'; +import Icon from 'Components/Icon'; import Button from 'Components/Link/Button'; import SpinnerButton from 'Components/Link/SpinnerButton'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import { icons, kinds } from 'Helpers/Props'; import styles from './RestoreBackupModalContent.css'; function getErrorMessage(error) { diff --git a/frontend/src/System/Backup/RestoreBackupModalContentConnector.js b/frontend/src/System/Backup/RestoreBackupModalContentConnector.js index 7f2b7a6e8..d408d0f50 100644 --- a/frontend/src/System/Backup/RestoreBackupModalContentConnector.js +++ b/frontend/src/System/Backup/RestoreBackupModalContentConnector.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { restoreBackup, restart } from 'Store/Actions/systemActions'; +import { restart, restoreBackup } from 'Store/Actions/systemActions'; import RestoreBackupModalContent from './RestoreBackupModalContent'; function createMapStateToProps() { diff --git a/frontend/src/System/Events/LogsTable.js b/frontend/src/System/Events/LogsTable.js index 964bfc2d8..d2c9b2197 100644 --- a/frontend/src/System/Events/LogsTable.js +++ b/frontend/src/System/Events/LogsTable.js @@ -1,19 +1,19 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { align, icons } from 'Helpers/Props'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; -import TableBody from 'Components/Table/TableBody'; -import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; -import TablePager from 'Components/Table/TablePager'; +import FilterMenu from 'Components/Menu/FilterMenu'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; -import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; -import FilterMenu from 'Components/Menu/FilterMenu'; -import LogsTableRow from './LogsTableRow'; +import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; +import Table from 'Components/Table/Table'; +import TableBody from 'Components/Table/TableBody'; +import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; +import TablePager from 'Components/Table/TablePager'; +import { align, icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; +import LogsTableRow from './LogsTableRow'; function LogsTable(props) { const { diff --git a/frontend/src/System/Events/LogsTableConnector.js b/frontend/src/System/Events/LogsTableConnector.js index d2cb6caf8..957e2a5e1 100644 --- a/frontend/src/System/Events/LogsTableConnector.js +++ b/frontend/src/System/Events/LogsTableConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import * as commandNames from 'Commands/commandNames'; import withCurrentPage from 'Components/withCurrentPage'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import { executeCommand } from 'Store/Actions/commandActions'; import * as systemActions from 'Store/Actions/systemActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import LogsTable from './LogsTable'; function createMapStateToProps() { diff --git a/frontend/src/System/Events/LogsTableDetailsModal.js b/frontend/src/System/Events/LogsTableDetailsModal.js index de6a881df..c3681220d 100644 --- a/frontend/src/System/Events/LogsTableDetailsModal.js +++ b/frontend/src/System/Events/LogsTableDetailsModal.js @@ -1,13 +1,13 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { scrollDirections } from 'Helpers/Props'; import Button from 'Components/Link/Button'; -import Scroller from 'Components/Scroller/Scroller'; import Modal from 'Components/Modal/Modal'; -import ModalContent from 'Components/Modal/ModalContent'; -import ModalHeader from 'Components/Modal/ModalHeader'; import ModalBody from 'Components/Modal/ModalBody'; +import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; +import ModalHeader from 'Components/Modal/ModalHeader'; +import Scroller from 'Components/Scroller/Scroller'; +import { scrollDirections } from 'Helpers/Props'; import styles from './LogsTableDetailsModal.css'; function LogsTableDetailsModal(props) { diff --git a/frontend/src/System/Events/LogsTableRow.js b/frontend/src/System/Events/LogsTableRow.js index 390769727..ab7bf8606 100644 --- a/frontend/src/System/Events/LogsTableRow.js +++ b/frontend/src/System/Events/LogsTableRow.js @@ -1,10 +1,10 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import Icon from 'Components/Icon'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRowButton from 'Components/Table/TableRowButton'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRowButton from 'Components/Table/TableRowButton'; +import { icons } from 'Helpers/Props'; import LogsTableDetailsModal from './LogsTableDetailsModal'; import styles from './LogsTableRow.css'; diff --git a/frontend/src/System/Logs/Files/LogFiles.js b/frontend/src/System/Logs/Files/LogFiles.js index ad786d4d4..ee6221813 100644 --- a/frontend/src/System/Logs/Files/LogFiles.js +++ b/frontend/src/System/Logs/Files/LogFiles.js @@ -1,20 +1,20 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { icons } from 'Helpers/Props'; import Alert from 'Components/Alert'; import Link from 'Components/Link/Link'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import Table from 'Components/Table/Table'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; +import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; -import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; +import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; +import { icons } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import LogsNavMenu from '../LogsNavMenu'; import LogFilesTableRow from './LogFilesTableRow'; -import translate from 'Utilities/String/translate'; const columns = [ { diff --git a/frontend/src/System/Logs/Files/LogFilesConnector.js b/frontend/src/System/Logs/Files/LogFilesConnector.js index 628bb571c..b6d443f6a 100644 --- a/frontend/src/System/Logs/Files/LogFilesConnector.js +++ b/frontend/src/System/Logs/Files/LogFilesConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import combinePath from 'Utilities/String/combinePath'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import * as commandNames from 'Commands/commandNames'; import { executeCommand } from 'Store/Actions/commandActions'; import { fetchLogFiles } from 'Store/Actions/systemActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import combinePath from 'Utilities/String/combinePath'; import LogFiles from './LogFiles'; function createMapStateToProps() { diff --git a/frontend/src/System/Logs/Files/LogFilesTableRow.js b/frontend/src/System/Logs/Files/LogFilesTableRow.js index 7ae61a531..ef08ada4e 100644 --- a/frontend/src/System/Logs/Files/LogFilesTableRow.js +++ b/frontend/src/System/Logs/Files/LogFilesTableRow.js @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import Link from 'Components/Link/Link'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; import styles from './LogFilesTableRow.css'; class LogFilesTableRow extends Component { diff --git a/frontend/src/System/Logs/Updates/UpdateLogFilesConnector.js b/frontend/src/System/Logs/Updates/UpdateLogFilesConnector.js index 3030c12ce..3563d58d8 100644 --- a/frontend/src/System/Logs/Updates/UpdateLogFilesConnector.js +++ b/frontend/src/System/Logs/Updates/UpdateLogFilesConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import combinePath from 'Utilities/String/combinePath'; -import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import * as commandNames from 'Commands/commandNames'; import { executeCommand } from 'Store/Actions/commandActions'; import { fetchUpdateLogFiles } from 'Store/Actions/systemActions'; -import * as commandNames from 'Commands/commandNames'; +import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; +import combinePath from 'Utilities/String/combinePath'; import LogFiles from '../Files/LogFiles'; function createMapStateToProps() { diff --git a/frontend/src/System/Status/About/About.js b/frontend/src/System/Status/About/About.js index 5d7e58304..e1adfee85 100644 --- a/frontend/src/System/Status/About/About.js +++ b/frontend/src/System/Status/About/About.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import FieldSet from 'Components/FieldSet'; -import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; import DescriptionList from 'Components/DescriptionList/DescriptionList'; import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem'; -import StartTime from './StartTime'; +import FieldSet from 'Components/FieldSet'; +import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; +import titleCase from 'Utilities/String/titleCase'; import translate from 'Utilities/String/translate'; +import StartTime from './StartTime'; import styles from './About.css'; class About extends Component { diff --git a/frontend/src/System/Status/DiskSpace/DiskSpace.js b/frontend/src/System/Status/DiskSpace/DiskSpace.js index a8a036690..20081a119 100644 --- a/frontend/src/System/Status/DiskSpace/DiskSpace.js +++ b/frontend/src/System/Status/DiskSpace/DiskSpace.js @@ -1,14 +1,14 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { kinds, sizes } from 'Helpers/Props'; -import formatBytes from 'Utilities/Number/formatBytes'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FieldSet from 'Components/FieldSet'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import ProgressBar from 'Components/ProgressBar'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; import TableRow from 'Components/Table/TableRow'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; -import ProgressBar from 'Components/ProgressBar'; +import { kinds, sizes } from 'Helpers/Props'; +import formatBytes from 'Utilities/Number/formatBytes'; import translate from 'Utilities/String/translate'; import styles from './DiskSpace.css'; diff --git a/frontend/src/System/Status/Health/Health.js b/frontend/src/System/Status/Health/Health.js index c985b0c01..32bda1089 100644 --- a/frontend/src/System/Status/Health/Health.js +++ b/frontend/src/System/Status/Health/Health.js @@ -1,16 +1,16 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import { icons, kinds } from 'Helpers/Props'; +import FieldSet from 'Components/FieldSet'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import FieldSet from 'Components/FieldSet'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; import TableRow from 'Components/Table/TableRow'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import { icons, kinds } from 'Helpers/Props'; +import titleCase from 'Utilities/String/titleCase'; import translate from 'Utilities/String/translate'; import styles from './Health.css'; diff --git a/frontend/src/System/Status/Health/HealthConnector.js b/frontend/src/System/Status/Health/HealthConnector.js index 082c5ed2c..dd13b0a9c 100644 --- a/frontend/src/System/Status/Health/HealthConnector.js +++ b/frontend/src/System/Status/Health/HealthConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createHealthCheckSelector from 'Store/Selectors/createHealthCheckSelector'; -import { fetchHealth } from 'Store/Actions/systemActions'; import { testAllDownloadClients, testAllIndexers } from 'Store/Actions/settingsActions'; +import { fetchHealth } from 'Store/Actions/systemActions'; +import createHealthCheckSelector from 'Store/Selectors/createHealthCheckSelector'; import Health from './Health'; function createMapStateToProps() { diff --git a/frontend/src/System/Status/Health/HealthStatusConnector.js b/frontend/src/System/Status/Health/HealthStatusConnector.js index d04db7e62..e609dd712 100644 --- a/frontend/src/System/Status/Health/HealthStatusConnector.js +++ b/frontend/src/System/Status/Health/HealthStatusConnector.js @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import createHealthCheckSelector from 'Store/Selectors/createHealthCheckSelector'; -import { fetchHealth } from 'Store/Actions/systemActions'; import PageSidebarStatus from 'Components/Page/Sidebar/PageSidebarStatus'; +import { fetchHealth } from 'Store/Actions/systemActions'; +import createHealthCheckSelector from 'Store/Selectors/createHealthCheckSelector'; function createMapStateToProps() { return createSelector( diff --git a/frontend/src/System/Status/MoreInfo/MoreInfo.js b/frontend/src/System/Status/MoreInfo/MoreInfo.js index 77714398b..be30e85e4 100644 --- a/frontend/src/System/Status/MoreInfo/MoreInfo.js +++ b/frontend/src/System/Status/MoreInfo/MoreInfo.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import Link from 'Components/Link/Link'; -import FieldSet from 'Components/FieldSet'; import DescriptionList from 'Components/DescriptionList/DescriptionList'; -import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle'; import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription'; +import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle'; +import FieldSet from 'Components/FieldSet'; +import Link from 'Components/Link/Link'; import translate from 'Utilities/String/translate'; class MoreInfo extends Component { diff --git a/frontend/src/System/Status/Status.js b/frontend/src/System/Status/Status.js index 807a7abd5..a325495e5 100644 --- a/frontend/src/System/Status/Status.js +++ b/frontend/src/System/Status/Status.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import HealthConnector from './Health/HealthConnector'; -import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector'; import AboutConnector from './About/AboutConnector'; +import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector'; +import HealthConnector from './Health/HealthConnector'; import MoreInfo from './MoreInfo/MoreInfo'; class Status extends Component { diff --git a/frontend/src/System/Tasks/Queued/QueuedTaskRow.js b/frontend/src/System/Tasks/Queued/QueuedTaskRow.js index 1a64e6f84..df3fd4a93 100644 --- a/frontend/src/System/Tasks/Queued/QueuedTaskRow.js +++ b/frontend/src/System/Tasks/Queued/QueuedTaskRow.js @@ -1,16 +1,16 @@ import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import titleCase from 'Utilities/String/titleCase'; -import formatDate from 'Utilities/Date/formatDate'; -import formatDateTime from 'Utilities/Date/formatDateTime'; -import formatTimeSpan from 'Utilities/Date/formatTimeSpan'; -import { icons, kinds } from 'Helpers/Props'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; import ConfirmModal from 'Components/Modal/ConfirmModal'; -import TableRow from 'Components/Table/TableRow'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; +import { icons, kinds } from 'Helpers/Props'; +import formatDate from 'Utilities/Date/formatDate'; +import formatDateTime from 'Utilities/Date/formatDateTime'; +import formatTimeSpan from 'Utilities/Date/formatTimeSpan'; +import titleCase from 'Utilities/String/titleCase'; import styles from './QueuedTaskRow.css'; function getStatusIconProps(status, message) { diff --git a/frontend/src/System/Tasks/Queued/QueuedTasks.js b/frontend/src/System/Tasks/Queued/QueuedTasks.js index 7c7dd6b07..13e566698 100644 --- a/frontend/src/System/Tasks/Queued/QueuedTasks.js +++ b/frontend/src/System/Tasks/Queued/QueuedTasks.js @@ -4,8 +4,8 @@ import FieldSet from 'Components/FieldSet'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import QueuedTaskRowConnector from './QueuedTaskRowConnector'; import translate from 'Utilities/String/translate'; +import QueuedTaskRowConnector from './QueuedTaskRowConnector'; const columns = [ { diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.js b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.js index deeb161bc..acb8c8d36 100644 --- a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.js +++ b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.js @@ -1,13 +1,13 @@ import moment from 'moment'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; +import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; +import TableRowCell from 'Components/Table/Cells/TableRowCell'; +import TableRow from 'Components/Table/TableRow'; +import { icons } from 'Helpers/Props'; import formatDate from 'Utilities/Date/formatDate'; import formatDateTime from 'Utilities/Date/formatDateTime'; import formatTimeSpan from 'Utilities/Date/formatTimeSpan'; -import { icons } from 'Helpers/Props'; -import SpinnerIconButton from 'Components/Link/SpinnerIconButton'; -import TableRow from 'Components/Table/TableRow'; -import TableRowCell from 'Components/Table/Cells/TableRowCell'; import styles from './ScheduledTaskRow.css'; function getFormattedDates(props) { diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRowConnector.js b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRowConnector.js index 79a0c6c87..dae790d68 100644 --- a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRowConnector.js +++ b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRowConnector.js @@ -2,11 +2,11 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; -import { findCommand, isCommandExecuting } from 'Utilities/Command'; import { executeCommand } from 'Store/Actions/commandActions'; import { fetchTask } from 'Store/Actions/systemActions'; import createCommandsSelector from 'Store/Selectors/createCommandsSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; +import { findCommand, isCommandExecuting } from 'Utilities/Command'; import ScheduledTaskRow from './ScheduledTaskRow'; function createMapStateToProps() { diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js index 69bd0804f..8bde6f5f5 100644 --- a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js +++ b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js @@ -4,8 +4,8 @@ import FieldSet from 'Components/FieldSet'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import ScheduledTaskRowConnector from './ScheduledTaskRowConnector'; import translate from 'Utilities/String/translate'; +import ScheduledTaskRowConnector from './ScheduledTaskRowConnector'; const columns = [ { diff --git a/frontend/src/System/Tasks/Tasks.js b/frontend/src/System/Tasks/Tasks.js index 4245615ca..e08792145 100644 --- a/frontend/src/System/Tasks/Tasks.js +++ b/frontend/src/System/Tasks/Tasks.js @@ -1,8 +1,8 @@ import React from 'react'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector'; import QueuedTasksConnector from './Queued/QueuedTasksConnector'; +import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector'; function Tasks() { return ( diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js index 3d09b8508..a4c7b49f7 100644 --- a/frontend/src/System/Updates/Updates.js +++ b/frontend/src/System/Updates/Updates.js @@ -1,15 +1,15 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import { icons, kinds } from 'Helpers/Props'; -import formatDate from 'Utilities/Date/formatDate'; -import LoadingIndicator from 'Components/Loading/LoadingIndicator'; -import SpinnerButton from 'Components/Link/SpinnerButton'; -import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; import Icon from 'Components/Icon'; import Label from 'Components/Label'; +import SpinnerButton from 'Components/Link/SpinnerButton'; +import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; +import { icons, kinds } from 'Helpers/Props'; +import formatDate from 'Utilities/Date/formatDate'; import UpdateChanges from './UpdateChanges'; import styles from './Updates.css'; diff --git a/frontend/src/System/Updates/UpdatesConnector.js b/frontend/src/System/Updates/UpdatesConnector.js index f0d93f10b..7b5318991 100644 --- a/frontend/src/System/Updates/UpdatesConnector.js +++ b/frontend/src/System/Updates/UpdatesConnector.js @@ -2,13 +2,13 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; +import * as commandNames from 'Commands/commandNames'; +import { executeCommand } from 'Store/Actions/commandActions'; import { fetchGeneralSettings } from 'Store/Actions/settingsActions'; import { fetchUpdates } from 'Store/Actions/systemActions'; -import { executeCommand } from 'Store/Actions/commandActions'; import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; -import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; -import * as commandNames from 'Commands/commandNames'; +import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import Updates from './Updates'; function createMapStateToProps() { diff --git a/frontend/src/Utilities/Date/dateFilterPredicate.js b/frontend/src/Utilities/Date/dateFilterPredicate.js index 2c74f435a..cb860ebfc 100644 --- a/frontend/src/Utilities/Date/dateFilterPredicate.js +++ b/frontend/src/Utilities/Date/dateFilterPredicate.js @@ -1,7 +1,7 @@ import moment from 'moment'; +import * as filterTypes from 'Helpers/Props/filterTypes'; import isAfter from 'Utilities/Date/isAfter'; import isBefore from 'Utilities/Date/isBefore'; -import * as filterTypes from 'Helpers/Props/filterTypes'; export default function(itemValue, filterValue, type) { if (!itemValue) { diff --git a/frontend/src/index.js b/frontend/src/index.js index d92a4c646..59911154e 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,11 +1,11 @@ -import './preload'; -import './polyfills'; - +import { createBrowserHistory } from 'history'; import React from 'react'; import { render } from 'react-dom'; -import { createBrowserHistory } from 'history'; import createAppStore from 'Store/createAppStore'; import App from './App/App'; + +import './preload'; +import './polyfills'; import 'Styles/globals.css'; import './index.css'; diff --git a/package.json b/package.json index f1862b0e7..5c58dfa2d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,9 @@ "element-class": "0.2.2", "eslint": "7.1.0", "eslint-plugin-filenames": "1.3.2", + "eslint-plugin-import": "2.22.0", "eslint-plugin-react": "7.20.0", + "eslint-plugin-simple-import-sort": "5.0.3", "esprint": "0.7.0", "file-loader": "6.0.0", "filesize": "6.1.0", diff --git a/yarn.lock b/yarn.lock index b58aa47ec..af5bd1371 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1202,6 +1202,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1720,6 +1725,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -2712,6 +2725,11 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= +contains-path@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" + integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= + continuable-cache@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f" @@ -3107,7 +3125,7 @@ debug@3.X, debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^2.2.0, debug@^2.3.3: +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -3295,6 +3313,14 @@ dnode-weak-napi@1.2.2: optionalDependencies: weak-napi "^1.0.3" +doctrine@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" + integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -3585,6 +3611,29 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +eslint-config-prettier@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1" + integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA== + dependencies: + get-stdin "^6.0.0" + +eslint-import-resolver-node@^0.3.3: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + dependencies: + debug "^2.6.9" + resolve "^1.13.1" + +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== + dependencies: + debug "^2.6.9" + pkg-dir "^2.0.0" + eslint-plugin-filenames@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/eslint-plugin-filenames/-/eslint-plugin-filenames-1.3.2.tgz#7094f00d7aefdd6999e3ac19f72cea058e590cf7" @@ -3595,6 +3644,32 @@ eslint-plugin-filenames@1.3.2: lodash.snakecase "4.1.1" lodash.upperfirst "4.3.1" +eslint-plugin-import@2.22.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e" + integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg== + dependencies: + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" + contains-path "^0.1.0" + debug "^2.6.9" + doctrine "1.5.0" + eslint-import-resolver-node "^0.3.3" + eslint-module-utils "^2.6.0" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.1" + read-pkg-up "^2.0.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" + +eslint-plugin-prettier@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2" + integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg== + dependencies: + prettier-linter-helpers "^1.0.0" + eslint-plugin-react@7.20.0: version "7.20.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3" @@ -3612,6 +3687,11 @@ eslint-plugin-react@7.20.0: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" +eslint-plugin-simple-import-sort@5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.3.tgz#9ae258ddada6efffc55e47a134afbd279eb31fc6" + integrity sha512-1rf3AWiHeWNCQdAq0iXNnlccnH1UDnelGgrPbjBBHE8d2hXVtOudcmy0vTF4hri3iJ0MKz8jBhmH6lJ0ZWZLHQ== + eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -3922,6 +4002,11 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + fast-glob@^2.0.2: version "2.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" @@ -4077,6 +4162,13 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -4288,6 +4380,11 @@ get-node-dimensions@^1.2.0: resolved "https://registry.yarnpkg.com/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz#fb7b4bb57060fb4247dd51c9d690dfbec56b0823" integrity sha512-2MSPMu7S1iOTL+BOa6K1S62hB2zUAYNF/lV0gSVlOaacd087lc6nR1H1r0e3B1CerTo+RceOmi1iJW+vp21xcQ== +get-stdin@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" + integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== + get-stdin@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" @@ -5736,6 +5833,16 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + strip-bom "^3.0.0" + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -5769,6 +5876,14 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -6658,6 +6773,13 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -6665,6 +6787,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -6686,6 +6815,11 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -6877,6 +7011,13 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +path-type@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= + dependencies: + pify "^2.0.0" + path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -6937,6 +7078,13 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -7468,6 +7616,18 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" + integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== + pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" @@ -7923,6 +8083,14 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" +read-pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= + dependencies: + find-up "^2.0.0" + read-pkg "^2.0.0" + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -7941,6 +8109,15 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +read-pkg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= + dependencies: + load-json-file "^2.0.0" + normalize-package-data "^2.3.2" + path-type "^2.0.0" + read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -8359,7 +8536,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.4.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -9045,6 +9222,11 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -9473,6 +9655,16 @@ tryit@^1.0.1: resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" integrity sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics= +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"