diff --git a/WORKLOG.md b/WORKLOG.md index 1f63906f..8514baf8 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -1,6 +1,15 @@ # WORK WORK ## NOW *PRODUCTION* +* ACP + * essential + * error log + * account lookup w/ pw reset + + * nice to have + +* bot game grind + * serde serialize privatise * stripe prod * mobile styles @@ -10,6 +19,11 @@ * graphs n shit * acp init * DO postgres +* make our own toasts / msg pane +* send account_instances on players update + +* only clear effects on post_resolve + electrify doesn't work if you ko the construct ## SOON *SERVER* diff --git a/acp/.babelrc b/acp/.babelrc new file mode 100644 index 00000000..56b2dd02 --- /dev/null +++ b/acp/.babelrc @@ -0,0 +1,9 @@ +{ + "presets": [ + "es2015", + "react" + ], + "plugins": [ + ["transform-react-jsx", { "pragma":"preact.h" }] + ] +} \ No newline at end of file diff --git a/acp/.eslintrc.js b/acp/.eslintrc.js new file mode 100644 index 00000000..2763e0b8 --- /dev/null +++ b/acp/.eslintrc.js @@ -0,0 +1,1501 @@ +module.exports = { + extends: [ + 'plugin:react/recommended', + ], + env: { + browser: true, + node: true + }, + parserOptions: { + ecmaVersion: 6, + sourceType: 'module', + }, + plugins: [ + 'import' + ], + settings: { + react: { + pragma: "preact", + version: "15.0", + }, + 'import/resolver': { + node: { + extensions: ['.mjs', '.js', '.jsx', '.json'] + } + }, + 'import/extensions': [ + '.js', + '.mjs', + '.jsx', + ], + 'import/core-modules': [], + 'import/ignore': [ + 'node_modules', + '\\.(coffee|scss|css|less|hbs|svg|json)$', + ], + }, + rules: { + // for preact + "react/react-in-jsx-scope": [0], + "react/jsx-indent": [2, 4], + "react/jsx-uses-react": 1, + "react/jsx-uses-vars": 1, + "react/prefer-stateless-function": 1, + "react/prop-types": 0, + "react/no-unknown-property": 0, + + // airbnb copypasta + // enforces getter/setter pairs in objects + 'accessor-pairs': 'off', + + // enforces return statements in callbacks of array's methods + // https://eslint.org/docs/rules/array-callback-return + 'array-callback-return': ['error', { allowImplicit: true }], + + // treat var statements as if they were block scoped + 'block-scoped-var': 'error', + + // specify the maximum cyclomatic complexity allowed in a program + complexity: ['off', 11], + + // enforce that class methods use "this" + // https://eslint.org/docs/rules/class-methods-use-this + 'class-methods-use-this': 0, + + // require return statements to either always or never specify values + 'consistent-return': 'error', + + // specify curly brace conventions for all control statements + curly: ['error', 'multi-line'], + + // require default case in switch statements + 'default-case': ['error', { commentPattern: '^no default$' }], + + // encourages use of dot notation whenever possible + 'dot-notation': ['error', { allowKeywords: true }], + + // enforces consistent newlines before or after dots + // https://eslint.org/docs/rules/dot-location + 'dot-location': ['error', 'property'], + + // require the use of === and !== + // https://eslint.org/docs/rules/eqeqeq + eqeqeq: ['error', 'always', { null: 'ignore' }], + + // make sure for-in loops have an if statement + 'guard-for-in': 'error', + + // enforce a maximum number of classes per file + // https://eslint.org/docs/rules/max-classes-per-file + // TODO: semver-major (eslint 5): enable + 'max-classes-per-file': ['off', 1], + + // disallow the use of alert, confirm, and prompt + 'no-alert': 'warn', + + // disallow use of arguments.caller or arguments.callee + 'no-caller': 'error', + + // disallow lexical declarations in case/default clauses + // https://eslint.org/docs/rules/no-case-declarations.html + 'no-case-declarations': 'error', + + // disallow division operators explicitly at beginning of regular expression + // https://eslint.org/docs/rules/no-div-regex + 'no-div-regex': 'off', + + // disallow else after a return in an if + // https://eslint.org/docs/rules/no-else-return + 'no-else-return': ['error', { allowElseIf: false }], + + // disallow empty functions, except for standalone funcs/arrows + // https://eslint.org/docs/rules/no-empty-function + 'no-empty-function': ['error', { + allow: [ + 'arrowFunctions', + 'functions', + 'methods', + ] + }], + + // disallow empty destructuring patterns + // https://eslint.org/docs/rules/no-empty-pattern + 'no-empty-pattern': 'error', + + // disallow comparisons to null without a type-checking operator + 'no-eq-null': 'off', + + // disallow use of eval() + 'no-eval': 'error', + + // disallow adding to native types + 'no-extend-native': 'error', + + // disallow unnecessary function binding + 'no-extra-bind': 'error', + + // disallow Unnecessary Labels + // https://eslint.org/docs/rules/no-extra-label + 'no-extra-label': 'error', + + // disallow fallthrough of case statements + 'no-fallthrough': 'error', + + // disallow the use of leading or trailing decimal points in numeric literals + 'no-floating-decimal': 'error', + + // disallow reassignments of native objects or read-only globals + // https://eslint.org/docs/rules/no-global-assign + 'no-global-assign': ['error', { exceptions: [] }], + // deprecated in favor of no-global-assign + 'no-native-reassign': 'off', + + // disallow implicit type conversions + // https://eslint.org/docs/rules/no-implicit-coercion + 'no-implicit-coercion': ['off', { + boolean: false, + number: true, + string: true, + allow: [], + }], + + // disallow var and named functions in global scope + // https://eslint.org/docs/rules/no-implicit-globals + 'no-implicit-globals': 'off', + + // disallow use of eval()-like methods + 'no-implied-eval': 'error', + + // disallow this keywords outside of classes or class-like objects + 'no-invalid-this': 'off', + + // disallow usage of __iterator__ property + 'no-iterator': 'error', + + // disallow use of labels for anything other then loops and switches + 'no-labels': ['error', { allowLoop: false, allowSwitch: false }], + + // disallow unnecessary nested blocks + 'no-lone-blocks': 'error', + + // disallow creation of functions within loops + 'no-loop-func': 'error', + + // disallow magic numbers + // https://eslint.org/docs/rules/no-magic-numbers + 'no-magic-numbers': ['off', { + ignore: [], + ignoreArrayIndexes: true, + enforceConst: true, + detectObjects: false, + }], + + // disallow use of multiple spaces + 'no-multi-spaces': ['error', { + ignoreEOLComments: false, + }], + + // disallow use of multiline strings + 'no-multi-str': 'error', + + // disallow use of new operator when not part of the assignment or comparison + 'no-new': 'error', + + // disallow use of new operator for Function object + 'no-new-func': 'error', + + // disallows creating new instances of String, Number, and Boolean + 'no-new-wrappers': 'error', + + // disallow use of (old style) octal literals + 'no-octal': 'error', + + // disallow use of octal escape sequences in string literals, such as + // var foo = 'Copyright \251'; + 'no-octal-escape': 'error', + + // disallow reassignment of function parameters + // disallow parameter object manipulation except for specific exclusions + // rule: https://eslint.org/docs/rules/no-param-reassign.html + 'no-param-reassign': ['error', { + props: true, + ignorePropertyModificationsFor: [ + 'acc', // for reduce accumulators + 'accumulator', // for reduce accumulators + 'e', // for e.returnvalue + 'ctx', // for Koa routing + 'req', // for Express requests + 'request', // for Express requests + 'res', // for Express responses + 'response', // for Express responses + '$scope', // for Angular 1 scopes + ] + }], + + // disallow usage of __proto__ property + 'no-proto': 'error', + + // disallow declaring the same variable more then once + 'no-redeclare': 'error', + + // disallow certain object properties + // https://eslint.org/docs/rules/no-restricted-properties + 'no-restricted-properties': ['error', { + object: 'arguments', + property: 'callee', + message: 'arguments.callee is deprecated', + }, { + object: 'global', + property: 'isFinite', + message: 'Please use Number.isFinite instead', + }, { + object: 'self', + property: 'isFinite', + message: 'Please use Number.isFinite instead', + }, { + object: 'window', + property: 'isFinite', + message: 'Please use Number.isFinite instead', + }, { + object: 'global', + property: 'isNaN', + message: 'Please use Number.isNaN instead', + }, { + object: 'self', + property: 'isNaN', + message: 'Please use Number.isNaN instead', + }, { + object: 'window', + property: 'isNaN', + message: 'Please use Number.isNaN instead', + }, { + property: '__defineGetter__', + message: 'Please use Object.defineProperty instead.', + }, { + property: '__defineSetter__', + message: 'Please use Object.defineProperty instead.', + }, { + object: 'Math', + property: 'pow', + message: 'Use the exponentiation operator (**) instead.', + }], + + // disallow use of assignment in return statement + 'no-return-assign': 0, + + // disallow redundant `return await` + 'no-return-await': 'error', + + // disallow use of `javascript:` urls. + 'no-script-url': 'error', + + // disallow self assignment + // https://eslint.org/docs/rules/no-self-assign + // TODO: semver-major: props -> true + 'no-self-assign': ['error', { + props: false, + }], + + // disallow comparisons where both sides are exactly the same + 'no-self-compare': 'error', + + // disallow use of comma operator + 'no-sequences': 'error', + + // disallow unmodified conditions of loops + // https://eslint.org/docs/rules/no-unmodified-loop-condition + 'no-unmodified-loop-condition': 'off', + + // disallow usage of expressions in statement position + 'no-unused-expressions': ['error', { + allowShortCircuit: false, + allowTernary: false, + allowTaggedTemplates: false, + }], + + // disallow unused labels + // https://eslint.org/docs/rules/no-unused-labels + 'no-unused-labels': 'error', + + // disallow unnecessary .call() and .apply() + 'no-useless-call': 'off', + + // disallow useless string concatenation + // https://eslint.org/docs/rules/no-useless-concat + 'no-useless-concat': 'error', + + // disallow unnecessary string escaping + // https://eslint.org/docs/rules/no-useless-escape + 'no-useless-escape': 'error', + + // disallow redundant return; keywords + // https://eslint.org/docs/rules/no-useless-return + 'no-useless-return': 'error', + + // disallow use of void operator + // https://eslint.org/docs/rules/no-void + 'no-void': 'error', + + // disallow usage of configurable warning terms in comments: e.g. todo + 'no-warning-comments': ['off', { terms: ['todo', 'fixme', 'xxx'], location: 'start' }], + + // disallow use of the with statement + 'no-with': 'error', + + // require using Error objects as Promise rejection reasons + // https://eslint.org/docs/rules/prefer-promise-reject-errors + 'prefer-promise-reject-errors': ['error', { allowEmptyReject: true }], + + // require use of the second argument for parseInt() + radix: 'error', + + // require `await` in `async function` (note: this is a horrible rule that should never be used) + // https://eslint.org/docs/rules/require-await + 'require-await': 'off', + + // Enforce the use of u flag on RegExp + // https://eslint.org/docs/rules/require-unicode-regexp + 'require-unicode-regexp': 'off', + + // requires to declare all vars on top of their containing scope + 'vars-on-top': 'error', + + // require immediate function invocation to be wrapped in parentheses + // https://eslint.org/docs/rules/wrap-iife.html + 'wrap-iife': ['error', 'outside', { functionPrototypeMethods: false }], + + // require or disallow Yoda conditions + yoda: 'error', + + // Enforce “for” loop update clause moving the counter in the right direction + // https://eslint.org/docs/rules/for-direction + 'for-direction': 'error', + + // Enforces that a return statement is present in property getters + // https://eslint.org/docs/rules/getter-return + 'getter-return': ['error', { allowImplicit: true }], + + // disallow using an async function as a Promise executor + // https://eslint.org/docs/rules/no-async-promise-executor + // TODO: enable, semver-major + 'no-async-promise-executor': 'off', + + // Disallow await inside of loops + // https://eslint.org/docs/rules/no-await-in-loop + 'no-await-in-loop': 'error', + + // Disallow comparisons to negative zero + // https://eslint.org/docs/rules/no-compare-neg-zero + 'no-compare-neg-zero': 'error', + + // disallow assignment in conditional expressions + 'no-cond-assign': ['error', 'always'], + + // disallow use of console + 'no-console': 'warn', + + // disallow use of constant expressions in conditions + 'no-constant-condition': 'warn', + + // disallow control characters in regular expressions + 'no-control-regex': 'error', + + // disallow use of debugger + 'no-debugger': 'error', + + // disallow duplicate arguments in functions + 'no-dupe-args': 'error', + + // disallow duplicate keys when creating object literals + 'no-dupe-keys': 'error', + + // disallow a duplicate case label. + 'no-duplicate-case': 'error', + + // disallow empty statements + 'no-empty': 'error', + + // disallow the use of empty character classes in regular expressions + 'no-empty-character-class': 'error', + + // disallow assigning to the exception in a catch block + 'no-ex-assign': 'error', + + // disallow double-negation boolean casts in a boolean context + // https://eslint.org/docs/rules/no-extra-boolean-cast + 'no-extra-boolean-cast': 'error', + + // disallow unnecessary parentheses + // https://eslint.org/docs/rules/no-extra-parens + 'no-extra-parens': ['off', 'all', { + conditionalAssign: true, + nestedBinaryExpressions: false, + returnAssign: false, + ignoreJSX: 'all', // delegate to eslint-plugin-react + enforceForArrowConditionals: false, + }], + + // disallow unnecessary semicolons + 'no-extra-semi': 'error', + + // disallow overwriting functions written as function declarations + 'no-func-assign': 'error', + + // disallow function or variable declarations in nested blocks + 'no-inner-declarations': 'error', + + // disallow invalid regular expression strings in the RegExp constructor + 'no-invalid-regexp': 'error', + + // disallow irregular whitespace outside of strings and comments + 'no-irregular-whitespace': 'error', + + // Disallow characters which are made with multiple code points in character class syntax + // https://eslint.org/docs/rules/no-misleading-character-class + // TODO: enable, semver-major + 'no-misleading-character-class': 'off', + + // disallow the use of object properties of the global object (Math and JSON) as functions + 'no-obj-calls': 'error', + + // disallow use of Object.prototypes builtins directly + // https://eslint.org/docs/rules/no-prototype-builtins + 'no-prototype-builtins': 'error', + + // disallow multiple spaces in a regular expression literal + 'no-regex-spaces': 'error', + + // disallow sparse arrays + 'no-sparse-arrays': 'error', + + // Disallow template literal placeholder syntax in regular strings + // https://eslint.org/docs/rules/no-template-curly-in-string + 'no-template-curly-in-string': 'error', + + // Avoid code that looks like two expressions but is actually one + // https://eslint.org/docs/rules/no-unexpected-multiline + 'no-unexpected-multiline': 'error', + + // disallow unreachable statements after a return, break, continue, or break statement + 'no-unreachable': 'error', + + // disallow return/break/break/continue inside finally blocks + // https://eslint.org/docs/rules/no-unsafe-finally + 'no-unsafe-finally': 'error', + + // disallow negating the left operand of relational operators + // https://eslint.org/docs/rules/no-unsafe-negation + 'no-unsafe-negation': 'error', + // disallow negation of the left operand of an in expression + // deprecated in favor of no-unsafe-negation + 'no-negated-in-lhs': 'off', + + // Disallow assignments that can lead to race conditions due to usage of await or yield + // https://eslint.org/docs/rules/require-atomic-updates + // TODO: enable, semver-major + 'require-atomic-updates': 'off', + + // disallow comparisons with the value NaN + 'use-isnan': 'error', + + // ensure JSDoc comments are valid + // https://eslint.org/docs/rules/valid-jsdoc + 'valid-jsdoc': 'off', + + // ensure that the results of typeof are compared against a valid string + // https://eslint.org/docs/rules/valid-typeof + 'valid-typeof': ['error', { requireStringLiterals: true }], + + // enforces no braces where they can be omitted + // https://eslint.org/docs/rules/arrow-body-style + // TODO: enable requireReturnForObjectLiteral? + 'arrow-body-style': ['error', 'as-needed', { + requireReturnForObjectLiteral: false, + }], + + // require parens in arrow function arguments + // https://eslint.org/docs/rules/arrow-parens + 'arrow-parens': ['error', 'as-needed', { + requireForBlockBody: false, + }], + + // require space before/after arrow function's arrow + // https://eslint.org/docs/rules/arrow-spacing + 'arrow-spacing': ['error', { before: true, after: true }], + + // verify super() callings in constructors + 'constructor-super': 'error', + + // enforce the spacing around the * in generator functions + // https://eslint.org/docs/rules/generator-star-spacing + 'generator-star-spacing': ['error', { before: false, after: true }], + + // disallow modifying variables of class declarations + // https://eslint.org/docs/rules/no-class-assign + 'no-class-assign': 'error', + + // disallow arrow functions where they could be confused with comparisons + // https://eslint.org/docs/rules/no-confusing-arrow + 'no-confusing-arrow': ['error', { + allowParens: true, + }], + + // disallow modifying variables that are declared using const + 'no-const-assign': 'error', + + // disallow duplicate class members + // https://eslint.org/docs/rules/no-dupe-class-members + 'no-dupe-class-members': 'error', + + // disallow importing from the same path more than once + // https://eslint.org/docs/rules/no-duplicate-imports + // replaced by https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-duplicates.md + 'no-duplicate-imports': 'off', + + // disallow symbol constructor + // https://eslint.org/docs/rules/no-new-symbol + 'no-new-symbol': 'error', + + // disallow specific imports + // https://eslint.org/docs/rules/no-restricted-imports + 'no-restricted-imports': ['off', { + paths: [], + patterns: [] + }], + + // disallow to use this/super before super() calling in constructors. + // https://eslint.org/docs/rules/no-this-before-super + 'no-this-before-super': 'error', + + // disallow useless computed property keys + // https://eslint.org/docs/rules/no-useless-computed-key + 'no-useless-computed-key': 'error', + + // disallow unnecessary constructor + // https://eslint.org/docs/rules/no-useless-constructor + 'no-useless-constructor': 'error', + + // disallow renaming import, export, and destructured assignments to the same name + // https://eslint.org/docs/rules/no-useless-rename + 'no-useless-rename': ['error', { + ignoreDestructuring: false, + ignoreImport: false, + ignoreExport: false, + }], + + // require let or const instead of var + 'no-var': 'error', + + // require method and property shorthand syntax for object literals + // https://eslint.org/docs/rules/object-shorthand + 'object-shorthand': ['error', 'always', { + ignoreConstructors: false, + avoidQuotes: true, + }], + + // // suggest using arrow functions as callbacks + // 'prefer-arrow-callback': ['error', { + // allowNamedFunctions: false, + // allowUnboundThis: true, + // }], + + // suggest using of const declaration for variables that are never modified after declared + 'prefer-const': ['error', { + destructuring: 'any', + ignoreReadBeforeAssign: true, + }], + + // Prefer destructuring from arrays and objects + // https://eslint.org/docs/rules/prefer-destructuring + 'prefer-destructuring': ['error', { + VariableDeclarator: { + array: false, + object: true, + }, + AssignmentExpression: { + array: true, + object: true, + }, + }, { + enforceForRenamedProperties: false, + }], + + // disallow parseInt() in favor of binary, octal, and hexadecimal literals + // https://eslint.org/docs/rules/prefer-numeric-literals + 'prefer-numeric-literals': 'error', + + // suggest using Reflect methods where applicable + // https://eslint.org/docs/rules/prefer-reflect + 'prefer-reflect': 'off', + + // use rest parameters instead of arguments + // https://eslint.org/docs/rules/prefer-rest-params + 'prefer-rest-params': 'error', + + // suggest using the spread operator instead of .apply() + // https://eslint.org/docs/rules/prefer-spread + 'prefer-spread': 'error', + + // suggest using template literals instead of string concatenation + // https://eslint.org/docs/rules/prefer-template + 'prefer-template': 'error', + + // disallow generator functions that do not have yield + // https://eslint.org/docs/rules/require-yield + 'require-yield': 'error', + + // enforce spacing between object rest-spread + // https://eslint.org/docs/rules/rest-spread-spacing + 'rest-spread-spacing': ['error', 'never'], + + // import sorting + // https://eslint.org/docs/rules/sort-imports + 'sort-imports': ['off', { + ignoreCase: false, + ignoreMemberSort: false, + memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'], + }], + + // require a Symbol description + // https://eslint.org/docs/rules/symbol-description + 'symbol-description': 'error', + + // enforce usage of spacing in template strings + // https://eslint.org/docs/rules/template-curly-spacing + 'template-curly-spacing': 'error', + + // enforce spacing around the * in yield* expressions + // https://eslint.org/docs/rules/yield-star-spacing + 'yield-star-spacing': ['error', 'after'], + + // VARIABLES // + // enforce or disallow variable initializations at definition + 'init-declarations': 'off', + + // disallow the catch clause parameter name being the same as a variable in the outer scope + 'no-catch-shadow': 'off', + + // disallow deletion of variables + 'no-delete-var': 'error', + + // disallow labels that share a name with a variable + // https://eslint.org/docs/rules/no-label-var + 'no-label-var': 'error', + + // disallow specific globals + 'no-restricted-globals': ['error', 'isFinite', 'isNaN'], + + // disallow declaration of variables already declared in the outer scope + 'no-shadow': 'error', + + // disallow shadowing of names such as arguments + 'no-shadow-restricted-names': 'error', + + // disallow use of undeclared variables unless mentioned in a /*global */ block + 'no-undef': 'error', + + // disallow use of undefined when initializing variables + 'no-undef-init': 'error', + + // disallow use of undefined variable + // https://eslint.org/docs/rules/no-undefined + // TODO: enable? + 'no-undefined': 'off', + + // disallow declaration of variables that are not used in the code + 'no-unused-vars': ['error', { vars: 'all', args: 'after-used', ignoreRestSiblings: true }], + + // disallow use of variables before they are defined + 'no-use-before-define': ['error', { functions: true, classes: true, variables: true }], + + // STYLE // + + // enforce line breaks after opening and before closing array brackets + // https://eslint.org/docs/rules/array-bracket-newline + // TODO: enable? semver-major + 'array-bracket-newline': ['off', 'consistent'], // object option alternative: { multiline: true, minItems: 3 } + + // enforce line breaks between array elements + // https://eslint.org/docs/rules/array-element-newline + // TODO: enable? semver-major + 'array-element-newline': ['off', { multiline: true, minItems: 3 }], + + // enforce spacing inside array brackets + 'array-bracket-spacing': ['error', 'never'], + + // enforce spacing inside single-line blocks + // https://eslint.org/docs/rules/block-spacing + 'block-spacing': ['error', 'always'], + + // enforce one true brace style + 'brace-style': ['error', '1tbs', { allowSingleLine: true }], + + // require camel case names + // TODO: semver-major (eslint 5): add ignoreDestructuring: false option + camelcase: ['error', { properties: 'never' }], + + // enforce or disallow capitalization of the first letter of a comment + // https://eslint.org/docs/rules/capitalized-comments + 'capitalized-comments': ['off', 'never', { + line: { + ignorePattern: '.*', + ignoreInlineComments: true, + ignoreConsecutiveComments: true, + }, + block: { + ignorePattern: '.*', + ignoreInlineComments: true, + ignoreConsecutiveComments: true, + }, + }], + + // require trailing commas in multiline object literals + 'comma-dangle': ['error', { + arrays: 'always-multiline', + objects: 'always-multiline', + imports: 'always-multiline', + exports: 'always-multiline', + // functions: 'always-multiline', + }], + + // enforce spacing before and after comma + 'comma-spacing': ['error', { before: false, after: true }], + + // enforce one true comma style + 'comma-style': ['error', 'last', { + exceptions: { + ArrayExpression: false, + ArrayPattern: false, + ArrowFunctionExpression: false, + CallExpression: false, + FunctionDeclaration: false, + FunctionExpression: false, + ImportDeclaration: false, + ObjectExpression: false, + ObjectPattern: false, + VariableDeclaration: false, + NewExpression: false, + } + }], + + // disallow padding inside computed properties + 'computed-property-spacing': ['error', 'never'], + + // enforces consistent naming when capturing the current execution context + 'consistent-this': 'off', + + // enforce newline at the end of file, with no multiple empty lines + 'eol-last': ['error', 'always'], + + // enforce spacing between functions and their invocations + // https://eslint.org/docs/rules/func-call-spacing + 'func-call-spacing': ['error', 'never'], + + // requires function names to match the name of the variable or property to which they are + // assigned + // https://eslint.org/docs/rules/func-name-matching + // TODO: semver-major (eslint 5): add considerPropertyDescriptor: true + 'func-name-matching': ['off', 'always', { + includeCommonJSModuleExports: false + }], + + // require function expressions to have a name + // https://eslint.org/docs/rules/func-names + 'func-names': 'warn', + + // enforces use of function declarations or expressions + // https://eslint.org/docs/rules/func-style + // TODO: enable + 'func-style': ['off', 'expression'], + + // enforce consistent line breaks inside function parentheses + // https://eslint.org/docs/rules/function-paren-newline + 'function-paren-newline': 'off', + + // Blacklist certain identifiers to prevent them being used + // https://eslint.org/docs/rules/id-blacklist + 'id-blacklist': 'off', + + // this option enforces minimum and maximum identifier lengths + // (variable names, property names etc.) + 'id-length': 'off', + + // require identifiers to match the provided regular expression + 'id-match': 'off', + + // Enforce the location of arrow function bodies with implicit returns + // https://eslint.org/docs/rules/implicit-arrow-linebreak + 'implicit-arrow-linebreak': 'off', + + // this option sets a specific tab width for your code + // https://eslint.org/docs/rules/indent + indent: ['error', 4, { + SwitchCase: 1, + VariableDeclarator: 1, + outerIIFEBody: 1, + // MemberExpression: null, + FunctionDeclaration: { + parameters: 1, + body: 1 + }, + FunctionExpression: { + parameters: 1, + body: 1 + }, + CallExpression: { + arguments: 1 + }, + ArrayExpression: 1, + ObjectExpression: 1, + ImportDeclaration: 1, + flatTernaryExpressions: false, + // list derived from https://github.com/benjamn/ast-types/blob/HEAD/def/jsx.js + ignoredNodes: ['JSXElement', 'JSXElement > *', 'JSXAttribute', 'JSXIdentifier', 'JSXNamespacedName', 'JSXMemberExpression', 'JSXSpreadAttribute', 'JSXExpressionContainer', 'JSXOpeningElement', 'JSXClosingElement', 'JSXText', 'JSXEmptyExpression', 'JSXSpreadChild'], + ignoreComments: false + }], + + // specify whether double or single quotes should be used in JSX attributes + // https://eslint.org/docs/rules/jsx-quotes + 'jsx-quotes': ['off', 'prefer-double'], + + // enforces spacing between keys and values in object literal properties + 'key-spacing': ['error', { beforeColon: false, afterColon: true }], + + // require a space before & after certain keywords + 'keyword-spacing': ['error', { + before: true, + after: true, + overrides: { + return: { after: true }, + break: { after: true }, + case: { after: true } + } + }], + + // enforce position of line comments + // https://eslint.org/docs/rules/line-comment-position + // TODO: enable? + 'line-comment-position': ['off', { + position: 'above', + ignorePattern: '', + applyDefaultPatterns: true, + }], + + // disallow mixed 'LF' and 'CRLF' as linebreaks + // https://eslint.org/docs/rules/linebreak-style + 'linebreak-style': ['error', 'unix'], + + // require or disallow an empty line between class members + // https://eslint.org/docs/rules/lines-between-class-members + 'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: false }], + + // enforces empty lines around comments + 'lines-around-comment': 'off', + + // require or disallow newlines around directives + // https://eslint.org/docs/rules/lines-around-directive + 'lines-around-directive': ['error', { + before: 'always', + after: 'always', + }], + + // specify the maximum depth that blocks can be nested + 'max-depth': ['off', 4], + + // specify the maximum length of a line in your program + // https://eslint.org/docs/rules/max-len + 'max-len': ['error', 100, 2, { + ignoreUrls: true, + ignoreComments: false, + ignoreRegExpLiterals: true, + ignoreStrings: true, + ignoreTemplateLiterals: true, + }], + + // specify the max number of lines in a file + // https://eslint.org/docs/rules/max-lines + 'max-lines': ['off', { + max: 300, + skipBlankLines: true, + skipComments: true + }], + + // enforce a maximum function length + // https://eslint.org/docs/rules/max-lines-per-function + 'max-lines-per-function': ['off', { + max: 50, + skipBlankLines: true, + skipComments: true, + IIFEs: true, + }], + + // specify the maximum depth callbacks can be nested + 'max-nested-callbacks': 'off', + + // limits the number of parameters that can be used in the function declaration. + 'max-params': ['off', 3], + + // specify the maximum number of statement allowed in a function + 'max-statements': ['off', 10], + + // restrict the number of statements per line + // https://eslint.org/docs/rules/max-statements-per-line + 'max-statements-per-line': ['off', { max: 1 }], + + // enforce a particular style for multiline comments + // https://eslint.org/docs/rules/multiline-comment-style + 'multiline-comment-style': ['off', 'starred-block'], + + // require multiline ternary + // https://eslint.org/docs/rules/multiline-ternary + // TODO: enable? + 'multiline-ternary': ['off', 'never'], + + // require a capital letter for constructors + 'new-cap': ['error', { + newIsCap: true, + newIsCapExceptions: [], + capIsNew: false, + capIsNewExceptions: ['Immutable.Map', 'Immutable.Set', 'Immutable.List'], + }], + + // disallow the omission of parentheses when invoking a constructor with no arguments + // https://eslint.org/docs/rules/new-parens + 'new-parens': 'error', + + // allow/disallow an empty newline after var statement + 'newline-after-var': 'off', + + // https://eslint.org/docs/rules/newline-before-return + 'newline-before-return': 'off', + + // enforces new line after each method call in the chain to make it + // more readable and easy to maintain + // https://eslint.org/docs/rules/newline-per-chained-call + 'newline-per-chained-call': ['error', { ignoreChainWithDepth: 4 }], + + // disallow use of the Array constructor + 'no-array-constructor': 'error', + + // disallow use of bitwise operators + // https://eslint.org/docs/rules/no-bitwise + 'no-bitwise': 'error', + + // disallow use of the continue statement + // https://eslint.org/docs/rules/no-continue + 'no-continue': 'error', + + // disallow comments inline after code + 'no-inline-comments': 'off', + + // disallow if as the only statement in an else block + // https://eslint.org/docs/rules/no-lonely-if + 'no-lonely-if': 'error', + + // disallow un-paren'd mixes of different operators + // https://eslint.org/docs/rules/no-mixed-operators + 'no-mixed-operators': ['error', { + // the list of arthmetic groups disallows mixing `%` and `**` + // with other arithmetic operators. + groups: [ + ['%', '**'], + ['%', '+'], + ['%', '-'], + ['%', '*'], + ['%', '/'], + ['**', '+'], + ['**', '-'], + ['**', '*'], + ['**', '/'], + ['&', '|', '^', '~', '<<', '>>', '>>>'], + ['==', '!=', '===', '!==', '>', '>=', '<', '<='], + ['&&', '||'], + ['in', 'instanceof'] + ], + allowSamePrecedence: false + }], + + // disallow mixed spaces and tabs for indentation + 'no-mixed-spaces-and-tabs': 'error', + + // disallow use of chained assignment expressions + // https://eslint.org/docs/rules/no-multi-assign + 'no-multi-assign': ['error'], + + // disallow multiple empty lines and only one newline at the end + 'no-multiple-empty-lines': ['error', { max: 2, maxEOF: 0 }], + + // disallow negated conditions + // https://eslint.org/docs/rules/no-negated-condition + 'no-negated-condition': 'off', + + // disallow nested ternary expressions + 'no-nested-ternary': 'error', + + // disallow use of the Object constructor + 'no-new-object': 'error', + + // disallow use of unary operators, ++ and -- + // https://eslint.org/docs/rules/no-plusplus + 'no-plusplus': 'error', + + // disallow certain syntax forms + // https://eslint.org/docs/rules/no-restricted-syntax + 'no-restricted-syntax': [ + 'error', + { + selector: 'ForInStatement', + message: 'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.', + }, + { + selector: 'ForOfStatement', + message: 'iterators/generators require regenerator-runtime, which is too heavyweight for this guide to allow them. Separately, loops should be avoided in favor of array iterations.', + }, + { + selector: 'LabeledStatement', + message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.', + }, + { + selector: 'WithStatement', + message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.', + }, + ], + + // disallow space between function identifier and application + 'no-spaced-func': 'error', + + // disallow tab characters entirely + 'no-tabs': 'error', + + // disallow the use of ternary operators + 'no-ternary': 'off', + + // disallow trailing whitespace at the end of lines + 'no-trailing-spaces': ['error', { + skipBlankLines: false, + ignoreComments: false, + }], + + // disallow dangling underscores in identifiers + // https://eslint.org/docs/rules/no-underscore-dangle + 'no-underscore-dangle': ['error', { + allow: [], + allowAfterThis: false, + allowAfterSuper: false, + enforceInMethodNames: true, + }], + + // disallow the use of Boolean literals in conditional expressions + // also, prefer `a || b` over `a ? a : b` + // https://eslint.org/docs/rules/no-unneeded-ternary + 'no-unneeded-ternary': ['error', { defaultAssignment: false }], + + // disallow whitespace before properties + // https://eslint.org/docs/rules/no-whitespace-before-property + 'no-whitespace-before-property': 'error', + + // enforce the location of single-line statements + // https://eslint.org/docs/rules/nonblock-statement-body-position + 'nonblock-statement-body-position': ['error', 'beside', { overrides: {} }], + + // require padding inside curly braces + 'object-curly-spacing': ['error', 'always'], + + // enforce line breaks between braces + // https://eslint.org/docs/rules/object-curly-newline + 'object-curly-newline': ['error', { + ObjectExpression: { minProperties: 4, multiline: true, consistent: true }, + ObjectPattern: { minProperties: 4, multiline: true, consistent: true }, + ImportDeclaration: { minProperties: 4, multiline: true, consistent: true }, + ExportDeclaration: { minProperties: 4, multiline: true, consistent: true }, + }], + + // enforce "same line" or "multiple line" on object properties. + // https://eslint.org/docs/rules/object-property-newline + 'object-property-newline': ['error', { + allowAllPropertiesOnSameLine: true, + }], + + // allow just one var statement per function + 'one-var': ['error', 'never'], + + // require a newline around variable declaration + // https://eslint.org/docs/rules/one-var-declaration-per-line + 'one-var-declaration-per-line': ['error', 'always'], + + // require assignment operator shorthand where possible or prohibit it entirely + // https://eslint.org/docs/rules/operator-assignment + 'operator-assignment': ['error', 'always'], + + // Requires operator at the beginning of the line in multiline statements + // https://eslint.org/docs/rules/operator-linebreak + 'operator-linebreak': ['error', 'before', { overrides: { '=': 'none' } }], + + // disallow padding within blocks + 'padded-blocks': ['error', { blocks: 'never', classes: 'never', switches: 'never' }], + + // Require or disallow padding lines between statements + // https://eslint.org/docs/rules/padding-line-between-statements + 'padding-line-between-statements': 'off', + + // Prefer use of an object spread over Object.assign + // https://eslint.org/docs/rules/prefer-object-spread + // TODO: semver-major (eslint 5): enable + 'prefer-object-spread': 'off', + + // require quotes around object literal property names + // https://eslint.org/docs/rules/quote-props.html + 'quote-props': ['error', 'as-needed', { keywords: false, unnecessary: true, numbers: false }], + + // specify whether double or single quotes should be used + quotes: ['error', 'single', { avoidEscape: true }], + + // do not require jsdoc + // https://eslint.org/docs/rules/require-jsdoc + 'require-jsdoc': 'off', + + // require or disallow use of semicolons instead of ASI + semi: ['error', 'always'], + + // enforce spacing before and after semicolons + 'semi-spacing': ['error', { before: false, after: true }], + + // Enforce location of semicolons + // https://eslint.org/docs/rules/semi-style + 'semi-style': ['error', 'last'], + + // requires object keys to be sorted + 'sort-keys': ['off', 'asc', { caseSensitive: false, natural: true }], + + // sort variables within the same declaration block + 'sort-vars': 'off', + + // require or disallow space before blocks + 'space-before-blocks': 'error', + + // require or disallow space before function opening parenthesis + // https://eslint.org/docs/rules/space-before-function-paren + 'space-before-function-paren': ['error', { + anonymous: 'always', + named: 'never', + asyncArrow: 'always' + }], + + // require or disallow spaces inside parentheses + 'space-in-parens': ['error', 'never'], + + // require spaces around operators + 'space-infix-ops': 'error', + + // Require or disallow spaces before/after unary operators + // https://eslint.org/docs/rules/space-unary-ops + 'space-unary-ops': ['error', { + words: true, + nonwords: false, + overrides: { + }, + }], + + // require or disallow a space immediately following the // or /* in a comment + // https://eslint.org/docs/rules/spaced-comment + 'spaced-comment': ['error', 'always', { + line: { + exceptions: ['-', '+'], + markers: ['=', '!'], // space here to support sprockets directives + }, + block: { + exceptions: ['-', '+'], + markers: ['=', '!'], // space here to support sprockets directives + balanced: true, + } + }], + + // Enforce spacing around colons of switch statements + // https://eslint.org/docs/rules/switch-colon-spacing + 'switch-colon-spacing': ['error', { after: true, before: false }], + + // Require or disallow spacing between template tags and their literals + // https://eslint.org/docs/rules/template-tag-spacing + 'template-tag-spacing': ['error', 'never'], + + // require or disallow the Unicode Byte Order Mark + // https://eslint.org/docs/rules/unicode-bom + 'unicode-bom': ['error', 'never'], + + // require regex literals to be wrapped in parentheses + 'wrap-regex': 'off', + + // NODE // + // enforce return after a callback + 'callback-return': 'off', + + // require all requires be top-level + // https://eslint.org/docs/rules/global-require + 'global-require': 'error', + + // enforces error handling in callbacks (node environment) + 'handle-callback-err': 'off', + + // disallow use of the Buffer() constructor + // https://eslint.org/docs/rules/no-buffer-constructor + 'no-buffer-constructor': 'error', + + // disallow mixing regular variable and require declarations + 'no-mixed-requires': ['off', false], + + // disallow use of new operator with the require function + 'no-new-require': 'error', + + // disallow string concatenation with __dirname and __filename + // https://eslint.org/docs/rules/no-path-concat + 'no-path-concat': 'error', + + // disallow use of process.env + 'no-process-env': 'off', + + // disallow process.exit() + 'no-process-exit': 'off', + + // restrict usage of specified node modules + 'no-restricted-modules': 'off', + + // disallow use of synchronous methods (off by default) + 'no-sync': 'off', + + // IMPORT // + // Static analysis: + + // ensure imports point to files/modules that can be resolved + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unresolved.md + 'import/no-unresolved': ['error', { commonjs: true, caseSensitive: true }], + + // ensure named imports coupled with named exports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/named.md#when-not-to-use-it + 'import/named': 'error', + + // ensure default import coupled with default export + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/default.md#when-not-to-use-it + 'import/default': 'off', + + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/namespace.md + 'import/namespace': 'off', + + // Helpful warnings: + + // disallow invalid exports, e.g. multiple defaults + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/export.md + 'import/export': 'error', + + // do not allow a default import name to match a named export + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-named-as-default.md + 'import/no-named-as-default': 'error', + + // warn on accessing default export property names that are also named exports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-named-as-default-member.md + 'import/no-named-as-default-member': 'error', + + // disallow use of jsdoc-marked-deprecated imports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-deprecated.md + 'import/no-deprecated': 'off', + + // Forbid the use of extraneous packages + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-extraneous-dependencies.md + // paths are treated both as absolute paths, and relative to process.cwd() + 'import/no-extraneous-dependencies': ['error', { + devDependencies: [ + 'test/**', // tape, common npm pattern + 'tests/**', // also common npm pattern + 'spec/**', // mocha, rspec-like pattern + '**/__tests__/**', // jest pattern + '**/__mocks__/**', // jest pattern + 'test.{js,jsx}', // repos with a single test file + 'test-*.{js,jsx}', // repos with multiple top-level test files + '**/*{.,_}{test,spec}.{js,jsx}', // tests where the extension or filename suffix denotes that it is a test + '**/jest.config.js', // jest config + '**/vue.config.js', // vue-cli config + '**/webpack.config.js', // webpack config + '**/webpack.config.*.js', // webpack config + '**/rollup.config.js', // rollup config + '**/rollup.config.*.js', // rollup config + '**/gulpfile.js', // gulp config + '**/gulpfile.*.js', // gulp config + '**/Gruntfile{,.js}', // grunt config + '**/protractor.conf.js', // protractor config + '**/protractor.conf.*.js', // protractor config + ], + optionalDependencies: false, + }], + + // Forbid mutable exports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-mutable-exports.md + 'import/no-mutable-exports': 'error', + + // Module systems: + + // disallow require() + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-commonjs.md + 'import/no-commonjs': 'off', + + // disallow AMD require/define + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-amd.md + 'import/no-amd': 'error', + + // No Node.js builtin modules + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-nodejs-modules.md + // TODO: enable? + 'import/no-nodejs-modules': 'off', + + // Style guide: + + // disallow non-import statements appearing before import statements + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/first.md + 'import/first': 'error', + + // disallow non-import statements appearing before import statements + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/imports-first.md + // deprecated: use `import/first` + 'import/imports-first': 'off', + + // disallow duplicate imports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-duplicates.md + 'import/no-duplicates': 'error', + + // disallow namespace imports + // TODO: enable? + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-namespace.md + 'import/no-namespace': 'off', + + // Ensure consistent use of file extension within the import path + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/extensions.md + 'import/extensions': ['error', 'ignorePackages', { + js: 'never', + mjs: 'never', + jsx: 'never', + }], + + // ensure absolute imports are above relative imports and that unassigned imports are ignored + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/order.md + // TODO: enforce a stricter convention in module import order? + 'import/order': ['error', { groups: [['builtin', 'external', 'internal']] }], + + // Require a newline after the last import/require in a group + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/newline-after-import.md + 'import/newline-after-import': 'error', + + // Require modules with a single export to use a default export + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/prefer-default-export.md + 'import/prefer-default-export': 'error', + + // Restrict which files can be imported in a given folder + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-restricted-paths.md + 'import/no-restricted-paths': 'off', + + // Forbid modules to have too many dependencies + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/max-dependencies.md + 'import/max-dependencies': ['off', { max: 10 }], + + // Forbid import of modules using absolute paths + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-absolute-path.md + 'import/no-absolute-path': 'error', + + // Forbid require() calls with expressions + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-dynamic-require.md + 'import/no-dynamic-require': 'error', + + // prevent importing the submodules of other modules + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-internal-modules.md + 'import/no-internal-modules': ['off', { + allow: [], + }], + + // Warn if a module could be mistakenly parsed as a script by a consumer + // leveraging Unambiguous JavaScript Grammar + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/unambiguous.md + // this should not be enabled until this proposal has at least been *presented* to TC39. + // At the moment, it's not a thing. + 'import/unambiguous': 'off', + + // Forbid Webpack loader syntax in imports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-webpack-loader-syntax.md + 'import/no-webpack-loader-syntax': 'error', + + // Prevent unassigned imports + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unassigned-import.md + // importing for side effects is perfectly acceptable, if you need side effects. + 'import/no-unassigned-import': 'off', + + // Prevent importing the default as if it were named + // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-named-default.md + 'import/no-named-default': 'error', + + // Reports if a module's default export is unnamed + // https://github.com/benmosher/eslint-plugin-import/blob/d9b712ac7fd1fddc391f7b234827925c160d956f/docs/rules/no-anonymous-default-export.md + 'import/no-anonymous-default-export': ['off', { + allowArray: false, + allowArrowFunction: false, + allowAnonymousClass: false, + allowAnonymousFunction: false, + allowLiteral: false, + allowObject: false, + }], + + // This rule enforces that all exports are declared at the bottom of the file. + // https://github.com/benmosher/eslint-plugin-import/blob/98acd6afd04dcb6920b81330114e146dc8532ea4/docs/rules/exports-last.md + // TODO: enable? + 'import/exports-last': 'off', + + // Reports when named exports are not grouped together in a single export declaration + // or when multiple assignments to CommonJS module.exports or exports object are present + // in a single file. + // https://github.com/benmosher/eslint-plugin-import/blob/44a038c06487964394b1e15b64f3bd34e5d40cde/docs/rules/group-exports.md + 'import/group-exports': 'off', + + // forbid default exports. this is a terrible rule, do not use it. + // https://github.com/benmosher/eslint-plugin-import/blob/44a038c06487964394b1e15b64f3bd34e5d40cde/docs/rules/no-default-export.md + 'import/no-default-export': 'off', + + // Forbid a module from importing itself + // https://github.com/benmosher/eslint-plugin-import/blob/44a038c06487964394b1e15b64f3bd34e5d40cde/docs/rules/no-self-import.md + 'import/no-self-import': 'error', + + // Forbid cyclical dependencies between modules + // https://github.com/benmosher/eslint-plugin-import/blob/d81f48a2506182738409805f5272eff4d77c9348/docs/rules/no-cycle.md + 'import/no-cycle': ['error', { maxDepth: Infinity }], + + // Ensures that there are no useless path segments + // https://github.com/benmosher/eslint-plugin-import/blob/ebafcbf59ec9f653b2ac2a0156ca3bcba0a7cf57/docs/rules/no-useless-path-segments.md + 'import/no-useless-path-segments': 'error', + + // dynamic imports require a leading comment with a webpackChunkName + // https://github.com/benmosher/eslint-plugin-import/blob/ebafcbf59ec9f653b2ac2a0156ca3bcba0a7cf57/docs/rules/dynamic-import-chunkname.md + 'import/dynamic-import-chunkname': ['off', { + importFunctions: [], + webpackChunknameFormat: '[0-9a-zA-Z-_/.]+', + }], + + // Use this rule to prevent imports to folders in relative parent paths. + // https://github.com/benmosher/eslint-plugin-import/blob/c34f14f67f077acd5a61b3da9c0b0de298d20059/docs/rules/no-relative-parent-imports.md + 'import/no-relative-parent-imports': 'off', + + + // prevents stupid complaints a la + // (req) { + // req.something = x; + // } + 'no-param-reassign': [2, { props: false }], + 'no-multi-spaces': [0], + 'max-len': ['error', 120], + 'import/no-extraneous-dependencies': [0], + 'prefer-arrow-callback': [0], + 'arrow-body-style': [0], + 'no-return-assign': 0, + 'no-console': [0], + // i like loops + 'no-plusplus': [0], + + 'no-await-in-loop': [0], + 'indent': ['error', 4], + 'keyword-spacing': ['error'], + 'key-spacing': ['error'], + }, +}; \ No newline at end of file diff --git a/acp/.gitignore b/acp/.gitignore new file mode 100644 index 00000000..2106e507 --- /dev/null +++ b/acp/.gitignore @@ -0,0 +1,5 @@ +package-lock.json +node_modules/ +dist/ +.cache/ +assets/molecules diff --git a/acp/acp.html b/acp/acp.html new file mode 100644 index 00000000..25f1133c --- /dev/null +++ b/acp/acp.html @@ -0,0 +1,19 @@ + + + + mnml - acp + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/acp/acp.js b/acp/acp.js new file mode 100644 index 00000000..0f4b8299 --- /dev/null +++ b/acp/acp.js @@ -0,0 +1,18 @@ +require('./../client/assets/styles/normalize.css'); +require('./../client/assets/styles/skeleton.css'); + +require('./../client/assets/styles/styles.less'); +require('./../client/assets/styles/menu.less'); +require('./../client/assets/styles/acp.less'); +require('./../client/assets/styles/nav.less'); +require('./../client/assets/styles/footer.less'); +require('./../client/assets/styles/account.less'); +require('./../client/assets/styles/controls.less'); +require('./../client/assets/styles/instance.less'); +require('./../client/assets/styles/vbox.less'); +require('./../client/assets/styles/game.less'); +require('./../client/assets/styles/styles.mobile.css'); +require('./../client/assets/styles/instance.mobile.css'); + +// kick it off +require('./src/acp'); diff --git a/acp/package.json b/acp/package.json new file mode 100644 index 00000000..a914b2e5 --- /dev/null +++ b/acp/package.json @@ -0,0 +1,49 @@ +{ + "name": "mnml-client", + "version": "0.2.0", + "description": "", + "main": "index.js", + "scripts": { + "start": "parcel watch acp.html --no-hmr --out-dir /var/lib/mnml/public/current", + "build": "parcel build acp.html", + "lint": "eslint --fix --ext .jsx src/", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "UNLICENSED", + "dependencies": { + "anime": "^0.1.2", + "animejs": "^3.0.1", + "async": "^2.6.2", + "borc": "^2.0.3", + "docco": "^0.7.0", + "izitoast": "^1.4.0", + "keymaster": "^1.6.2", + "linkstate": "^1.1.1", + "lodash": "^4.17.15", + "node-sass": "^4.12.0", + "parcel": "^1.12.3", + "preact": "^8.4.2", + "preact-compat": "^3.19.0", + "preact-context": "^1.1.3", + "preact-redux": "^2.1.0", + "react-stripe-elements": "^3.0.0", + "redux": "^4.0.0" + }, + "devDependencies": { + "babel-core": "^6.26.3", + "babel-plugin-module-resolver": "^3.2.0", + "babel-preset-es2015": "^6.24.1", + "babel-preset-react": "^6.24.1", + "eslint": "^5.6.0", + "eslint-config-airbnb-base": "^13.1.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-react": "^7.11.1", + "jest": "^18.0.0", + "less": "^3.9.0" + }, + "alias": { + "react": "preact-compat", + "react-dom": "preact-compat" + } +} diff --git a/acp/src/acp.game.list.jsx b/acp/src/acp.game.list.jsx new file mode 100644 index 00000000..744a6007 --- /dev/null +++ b/acp/src/acp.game.list.jsx @@ -0,0 +1,36 @@ +const preact = require('preact'); +const { Component } = require('preact'); +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const actions = require('./actions'); + +const addState = connect( + function receiveState(state) { + const { + games, + } = state; + + return { + games + }; + }, +); + +function AcpGameList(args) { + const { + games, + } = args; + + if (!games) return false; + + return ( + + + {games.map((g, i) => )} + +
{JSON.stringify(g)}
+ ) +} + +module.exports = addState(AcpGameList); diff --git a/acp/src/acp.jsx b/acp/src/acp.jsx new file mode 100644 index 00000000..320236c3 --- /dev/null +++ b/acp/src/acp.jsx @@ -0,0 +1,34 @@ +const preact = require('preact'); +// const logger = require('redux-diff-logger'); + +const { Provider, connect } = require('preact-redux'); +const { createStore, combineReducers } = require('redux'); + +const reducers = require('./reducers'); +const actions = require('./actions'); + +const Main = require('./acp.main'); + +// Redux Store +const store = createStore( + combineReducers(reducers), + window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(), +); + +document.fonts.load('16pt "Jura"').then(() => { + const Acp = () => ( + +
+ +
+ +
+
+ ); + + // eslint-disable-next-line + preact.render(, document.body); +}); diff --git a/acp/src/acp.main.jsx b/acp/src/acp.main.jsx new file mode 100644 index 00000000..32309ba4 --- /dev/null +++ b/acp/src/acp.main.jsx @@ -0,0 +1,173 @@ +const preact = require('preact'); +const { Component } = require('preact'); +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const actions = require('./actions'); +const { postData, errorToast } = require('./../../client/src/utils'); + +const AcpGameList = require('./acp.game.list'); +const AcpUser = require('./acp.user'); + +const addState = connect( + function receiveState(state) { + const { + account, + user, + msg, + } = state; + + return { + account, + user, + msg, + }; + }, + + function receiveDispatch(dispatch) { + function setUser(user) { + dispatch(actions.setUser(user)); + } + + function setGames(list) { + dispatch(actions.setGames(list)); + } + + function setMsg(msg) { + dispatch(actions.setMsg(msg)); + } + + return { + setUser, + setMsg, + setGames, + }; + } +); + + +class AcpMain extends Component { + constructor(props) { + super(props); + + this.state = { + id: null, + name: null, + }; + } + + render(args, state) { + const { + setGames, + setUser, + setMsg, + + msg, + } = args; + + const { + name, + id, + } = state; + + const reset = () => { + setMsg(null); + this.setState({ id: null, name: null }); + }; + + const getUser = () => { + reset(); + postData('/acp/user', { id, name }) + .then(res => res.json()) + .then(data => { + if (data.error) return setMsg(data.error); + setUser(data); + }) + .catch(error => errorToast(error)); + }; + + const gameList = () => { + reset(); + postData('/acp/game/list', { number: 20 }) + .then(res => res.json()) + .then(data => { + if (data.error) return setMsg(data.error); + console.log(data); + setGames(data.data); + }) + .catch(error => errorToast(error)); + }; + + const gameOpen = () => { + reset(); + postData('/acp/game/open') + .then(res => res.json()) + .then(data => { + if (data.error) return setMsg(data.error); + console.log(data); + setGames(data); + }) + .catch(error => errorToast(error)); + }; + + return ( +
+
+
{msg}
+ + +
+
+
+ + + + +
+
+ + + + + +
+
+
+ ); + } +} + +module.exports = addState(AcpMain); diff --git a/acp/src/acp.user.jsx b/acp/src/acp.user.jsx new file mode 100644 index 00000000..0b2e7072 --- /dev/null +++ b/acp/src/acp.user.jsx @@ -0,0 +1,97 @@ +const preact = require('preact'); +const { Component } = require('preact'); +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const { postData, errorToast } = require('./../../client/src/utils'); +const actions = require('./actions'); + +const addState = connect( + function receiveState(state) { + const { + user, + } = state; + + return { + user, + }; + }, + function receiveDispatch(dispatch) { + function setUser(user) { + dispatch(actions.setUser(user)); + } + + function setMsg(msg) { + dispatch(actions.setMsg(msg)); + } + + return { + setUser, + setMsg, + }; + } +); + +function AcpUser(args) { + const { + user, + setUser, + setMsg, + } = args; + + const { + credits, + } = this.state; + + if (!user) return false; + + const reset = () => { + setMsg(null); + this.setState({ credits: null }); + }; + + const addCredits = () => { + reset(); + postData('/acp/user/credits', { id: user.id, credits }) + .then(res => res.json()) + .then(data => { + if (data.error) return setMsg(data.error); + return setUser(data); + }) + .catch(error => setMsg(error)); + }; + + return ( +
+
+

{user.name}

+
Id
+
{user.id}
+
Credits
+
{user.balance}
+
Subscribed
+
{user.subscribed.toString()}
+
+
+ + + +
+
+

Constructs

+
+
+ ); +} + +module.exports = addState(AcpUser); diff --git a/acp/src/actions.jsx b/acp/src/actions.jsx new file mode 100644 index 00000000..3de2fb07 --- /dev/null +++ b/acp/src/actions.jsx @@ -0,0 +1,4 @@ +export const setAccount = value => ({ type: 'SET_ACCOUNT', value }); +export const setUser = value => ({ type: 'SET_USER', value }); +export const setMsg = value => ({ type: 'SET_MSG', value }); +export const setGames = value => ({ type: 'SET_GAMES', value }); diff --git a/acp/src/reducers.jsx b/acp/src/reducers.jsx new file mode 100644 index 00000000..b22d0b88 --- /dev/null +++ b/acp/src/reducers.jsx @@ -0,0 +1,18 @@ +function createReducer(defaultState, actionType) { + return function reducer(state = defaultState, action) { + switch (action.type) { + case actionType: + return action.value; + default: + return state; + } + }; +} + +/* eslint-disable key-spacing */ +module.exports = { + account: createReducer(null, 'SET_ACCOUNT'), + user: createReducer(null, 'SET_USER'), + msg: createReducer(null, 'SET_MSG'), + games: createReducer([], 'SET_GAMES'), +}; diff --git a/bin/client.sh b/bin/client.sh index 2faac662..a2407748 100755 --- a/bin/client.sh +++ b/bin/client.sh @@ -12,3 +12,9 @@ cd $MNML_PATH/client rm -rf dist npm i npm run build + +echo "Building acp version $VERSION" +cd $MNML_PATH/acp +rm -rf dist +npm i +npm run build diff --git a/bin/deploy.sh b/bin/deploy.sh index e29588e6..94a2bd26 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -6,8 +6,12 @@ MNML_PATH=$(realpath "$DIR/../") VERSION=$(<"$MNML_PATH/VERSION") SERVER_BIN_DIR="/usr/local/mnml/bin" + CLIENT_DIST_DIR="/var/lib/mnml/client" -CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current" +CLIENT_PUBLIC_DIR="/var/lib/mnml/public/client" + +ACP_DIST_DIR="/var/lib/mnml/acp" +ACP_PUBLIC_DIR="/var/lib/mnml/public/acp" # server updates echo "syncing server $VERSION " @@ -19,6 +23,11 @@ ssh -q mnml ls -lah "$SERVER_BIN_DIR" echo "syncing client $VERSION" rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" mnml:"$CLIENT_DIST_DIR/$VERSION/" ssh -q mnml ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" + +# acp updates +echo "syncing acp $VERSION" +rsync -a --delete --delete-excluded "$MNML_PATH/acp/dist/" mnml:"$ACP_DIST_DIR/$VERSION/" +ssh -q mnml ln -nfs "$ACP_DIST_DIR/$VERSION" "$ACP_PUBLIC_DIR" ssh -q mnml ls -lah "/var/lib/mnml/public" echo "restarting mnml service" diff --git a/client/assets/styles/account.less b/client/assets/styles/account.less new file mode 100644 index 00000000..a73faaae --- /dev/null +++ b/client/assets/styles/account.less @@ -0,0 +1,55 @@ +@import 'colours.less'; + +.account { + margin-top: 2em; + grid-area: bottom; + + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-gap: 0 1em; + + button { + display: block; + // height: 3em; + width: 75%; + } + + input { + width: 75%; + height: 3em; + display: block; + } + + + .list { + letter-spacing: 0.25em; + text-transform: uppercase; + + figure { + font-size: 125%; + display: flex; + flex-flow: column; + + button { + width: 100%; + } + } + } +} + +.stripe-btn { + background: @yellow; + color: black; + border-radius: 2px; + border-width: 0; + + &:active, &:focus, &:hover { + color: black; + } + + &[disabled] { + border: 1px solid @yellow; + color: @yellow; + background: black; + } +} diff --git a/client/assets/styles/acp.less b/client/assets/styles/acp.less new file mode 100644 index 00000000..e749bc27 --- /dev/null +++ b/client/assets/styles/acp.less @@ -0,0 +1,24 @@ +#mnml.acp { + user-select: text; + -moz-user-select: text; + -webkit-user-select: text; + -ms-user-select: text; + + .bottom { + display: grid; + grid-template-columns: repeat(4, 1fr); + } + + .top { + padding: 0; + } + + input { + display: block; + } + + .user { + display: grid; + grid-template-columns: repeat(3, 1fr); + } +} \ No newline at end of file diff --git a/client/assets/styles/colours.less b/client/assets/styles/colours.less index 8ffce257..cfed8007 100644 --- a/client/assets/styles/colours.less +++ b/client/assets/styles/colours.less @@ -4,6 +4,7 @@ @blue: #3050f8; @white: #f5f5f5; // whitesmoke @purple: #9355b5; // 6lack - that far cover +@yellow: #ffa100; @black: black; @gray: #222; @@ -30,3 +31,33 @@ svg { stroke: @blue; } } + +.green { + color: @green; + stroke: @green; +} + +.red { + color: @red; + stroke: @red; +} + +.red-fill { + fill: @red; +} + +.blue { + color: @blue; + stroke: @blue; + stroke-linecap: round; +} + +.gray { + color: #333; + stroke: #333; +} + +.white { + color: @white; + stroke: @white; +} diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less index 5e4dbaad..09713fc6 100644 --- a/client/assets/styles/controls.less +++ b/client/assets/styles/controls.less @@ -1,10 +1,22 @@ aside { grid-area: ctrl; display: grid; + + grid-template-areas: + "timer controls" + "timer controls" + "timer controls"; + + grid-template-columns: min-content 1fr; grid-template-rows: 1fr 1fr 1fr; grid-gap: 0.5em 0; - padding: 1em; + padding: 1em 1em 1em 0; + + // fix chrome being inconsistent + table { + height: 100%; + } div { text-align: right; @@ -28,6 +40,30 @@ aside { border-color: forestgreen; } } + + .timer-container { + grid-area: timer; + + display: flex; + flex: 1 1 100%; + + height: 100%; + min-height: 100%; + + width: 0.25em; + max-width: 0.25em; + + margin: 0 1em 0 0; + border: none; + } + + .timer { + background: whitesmoke; + transition-property: all; + transition-duration: 0.25s; + transition-delay: 0; + transition-timing-function: ease; + } } .ready-btn:hover, .ready-btn:focus, .ready-btn:active { diff --git a/client/assets/styles/footer.less b/client/assets/styles/footer.less new file mode 100644 index 00000000..8ab8873a --- /dev/null +++ b/client/assets/styles/footer.less @@ -0,0 +1,51 @@ +footer { + display: none; + flex-flow: row wrap; + grid-area: footer; + margin: 0; + + button { + margin: 0; + border: none; + background: #222; + font-size: 1.5em; + padding: 0.25em; + + &[disabled] { + color: #444; + } + + &:not(:last-child) { + background: #222; + border-right: 1px solid black; + } + + .ready { + background: forestgreen; + color: black; + } + } + + .timer-container { + display: flex; + flex: 1 1 100%; + width: 100%; + height: 0.25em; + max-height: 0.25em; + + border: none; + margin: 1em 0 0 0; + } + + .timer { + background: whitesmoke; + transition-property: all; + transition-duration: 0.25s; + transition-delay: 0; + transition-timing-function: ease; + } +} + +#nav-btn, #instance-nav { + display: none; +} diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index 29a71047..e51237bc 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -1,3 +1,4 @@ +@import 'colours.less'; /* GAME */ .game { @@ -322,15 +323,6 @@ pointer-events: none; } -/*@keyframes rotate { - 0% { - transform: rotateY(0deg); - } - 100% { - transform: rotateY(50deg); - } -} -*/ .resolving .skills button { opacity: 0; } @@ -338,80 +330,9 @@ .skill-animation { opacity: 0; stroke-width: 5px; + height: 5em; } -/* - COMBAT ANIMATIONS -*/ - -/* ---------------------------------------------- - * Generated by Animista on 2019-5-21 11:38:30 - * w: http://animista.net, t: @cssanimista - * ---------------------------------------------- */ - - -/*.attack-cast { - -webkit-animation: attack-cast 0.5s cubic-bezier(0.550, 0.085, 0.680, 0.530) both; - animation: attack-cast 0.5s cubic-bezier(0.550, 0.085, 0.680, 0.530) both; -} - -@-webkit-keyframes attack-cast { - 0% { - -webkit-transform: translateY(0); - transform: translateY(0); - opacity: 1; - } - 100% { - -webkit-transform: translateY(-5em); - transform: translateY(-5em); - opacity: 0; - } -} -@keyframes attack-cast { - 0% { - -webkit-transform: translateY(0); - transform: translateY(0); - opacity: 1; - } - 100% { - -webkit-transform: translateY(-5em); - transform: translateY(-5em); - opacity: 0; - } -} - -.attack-hit { - -webkit-animation: attack-hit 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; - animation: attack-hit 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both; -} - -@-webkit-keyframes attack-hit { - 0% { - -webkit-transform: translateY(-5em) translateX(5em); - transform: translateY(-5em) translateX(5em); - opacity: 0; - } - 100% { - -webkit-transform: translateY(0) translateX(0); - transform: translateY(0) translateX(0); - opacity: 1; - } -} -@keyframes attack-hit { - 0% { - -webkit-transform: translateY(-5em) translateX(5em); - transform: translateY(-5em) translateX(5em); - opacity: 0; - } - 100% { - -webkit-transform: translateY(0) translateX(0); - transform: translateY(0) translateX(0); - opacity: 1; - } -} -*/ - - @media (max-width: 1000px) { .game { grid-template-areas: diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index c7f2a36d..d9c5a195 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -426,6 +426,12 @@ margin-top: 1em; grid-area: playername; } + + .team { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(min-content, 33%)); + max-height: 100%; + } } /* Mobile Nav*/ diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less new file mode 100644 index 00000000..fb919124 --- /dev/null +++ b/client/assets/styles/menu.less @@ -0,0 +1,90 @@ +@import 'colours.less'; + +.menu { + height: 100%; + display: grid; + + grid-template-rows: minmax(min-content, 2fr) 1fr; + grid-template-columns: 1fr; + + grid-template-areas: + "top" + "bottom"; + + .top { + grid-area: top; + padding: 0 0 0.5em 2em; + border-bottom: 0.1em solid #222; + box-sizing: border-box; + } + + .bottom { + grid-area: bottom; + } + + .team { + display: grid; + grid-area: top; + grid-template-columns: repeat(auto-fill, minmax(min-content, 33%)); + max-height: 100%; + + .team-select:not(:nth-child(3n)) { + margin-right: 0.5em; + } + + .construct { + flex: 1 1 33%; + + display: flex; + flex-flow: column; + text-align: center; + justify-content: center; + + border: 1px solid black; + transition-property: border; + transition-duration: 0.25s; + transition-delay: 0; + transition-timing-function: ease; + + button:not(:last-child) { + margin-bottom: 1em; + } + + .avatar { + background-size: contain; + background-repeat: no-repeat; + background-position: center; + pointer-events: none; + height: 100%; + } + } + } + + .inventory { + margin-top: 2em; + grid-area: bottom; + + display: grid; + grid-template-columns: 1fr 1fr; + + h1 { + margin-bottom: 0.5em; + } + + .list { + letter-spacing: 0.25em; + text-transform: uppercase; + display: grid; + grid-template-columns: repeat(4, 1fr); + grid-gap: 1em; + flex-flow: row wrap; + align-items: flex-end; + } + + figure { + font-size: 125%; + display: flex; + flex-flow: column; + } + } +} diff --git a/client/assets/styles/nav.less b/client/assets/styles/nav.less new file mode 100644 index 00000000..b65f001c --- /dev/null +++ b/client/assets/styles/nav.less @@ -0,0 +1,99 @@ +nav { + grid-area: nav; + padding-left: 2em; + margin-right: 2em; + max-height: 100%; + + h1 { + margin-bottom: 0.5em; + letter-spacing: 0.05em; + } + + h2:first-child { + margin: 0; + } + + h2 { + margin-top: 2em; + } + + hr { + margin: 1em 0; + border-color: #444; + } + + button { + text-overflow: ellipsis; + display: block; + color: #888; + flex: 1 1 100%; + padding: 0; + margin: 0; + border-width: 0px; + } + + button.active { + color: whitesmoke; + } + + button[disabled], button[disabled]:hover { + color: #333; + text-decoration: none; + } + + button:hover { + color: whitesmoke; + text-decoration: underline; + } + + button:focus, button:active { + color: whitesmoke; + } + + .account-info { + display: flex; + } + + .account-header { + letter-spacing: 0.05em; + flex: 1; + display: inline; + } + + .account-info svg { + margin: 0.5em 0 0 1em; + height: 1em; + background-color: black; + stroke: whitesmoke; + } + + .ping-path { + fill: none; + stroke-width: 4px; + stroke-dasharray: 121, 242; + animation: saw 2s infinite linear; + + transition-property: stroke-color; + transition-duration: 0.25s; + transition-timing-function: ease; + } + + .ping-text { + margin-left: 1em; + min-width: 3em; + display: inline-block; + } + + .play-btn { + font-size: 150%; + } +} + +@keyframes saw { + 0% { + stroke-dashoffset: 363; + } + 100% { + stroke-dashoffset: 0; + } +} diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 3ba42538..76fe12bf 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -1,11 +1,6 @@ @import 'colours.less'; -/* - GLOBAL -*/ - html, body, #mnml { - /*width: 100%;*/ margin: 0; background-color: black; @@ -48,6 +43,9 @@ html { h1 { font-size: 2em; margin: 0; + margin-bottom: 0.5em; + letter-spacing: 0.05em; + } h2 { @@ -66,6 +64,7 @@ h4 { } hr { + color: #222; margin: 1.5em 0; width: 100%; } @@ -85,70 +84,11 @@ figure { "nav main ctrl"; } -nav { - grid-area: nav; - padding-left: 2em; - margin-right: 2em; - max-height: 100%; -} - -nav h2:first-child { - margin: 0; -} - -nav h2 { - margin-top: 2em; -} - -nav hr { - margin: 1em 0; - border-color: #444; -} - -nav button { - text-overflow: ellipsis; - display: block; - color: #888; - flex: 1 1 100%; - padding: 0; - margin: 0; - border-width: 0px; -} - -nav button.active { - color: whitesmoke; -} - -nav button[disabled], nav button[disabled]:hover { - color: #333; - text-decoration: none; -} - -nav button:hover { - color: whitesmoke; - text-decoration: underline; -} - -nav button:focus, nav button:active { - color: whitesmoke; -} - main { padding: 1em; grid-area: main; } -tr.right:focus, tr.right:hover { - box-shadow: inset -0.5em 0 0 0 whitesmoke; -} - -tr { - transition-property: color, background; - transition-duration: 0.25s; - transition-delay: 0; - transition-timing-function: ease; -} - button, input { font-family: 'Jura'; color: whitesmoke; @@ -166,22 +106,34 @@ button, input { transition-duration: 0.25s; transition-delay: 0; transition-timing-function: ease; -} -button:hover { - color: whitesmoke; - border-color: @gray-hover; -} + &:hover { + color: whitesmoke; + border-color: @gray-hover; + } -button:focus { - /*colour necesary to bash skellington*/ - color: @gray-focus; - border-color: @gray-focus; + &:focus { + /*colour necesary to bash skellington*/ + color: @gray-focus; + border-color: @gray-focus; + } } a { color: whitesmoke; - font-size: 150%; + text-decoration: none; + + &:hover { + color: whitesmoke; + border-color: @gray-hover; + } + + &:focus { + /*colour necesary to bash skellington*/ + color: @gray-focus; + border-color: @gray-focus; + } + } svg { @@ -191,19 +143,6 @@ svg { height: 2em; } -.skill-animation { - height: 5em; -} - -.team .avatar { - object-fit: contain; - max-width: 100%; - max-height: 100%; - width: auto; - height: auto; - pointer-events: none; -} - table { table-layout: fixed; width: 100%; @@ -246,64 +185,19 @@ button[disabled] { border-color: #222; } -/* - COLOURS -*/ - -.green { - color: #1FF01F; - stroke: #1FF01F; -} - -.red { - color: #a52a2a; - stroke: #a52a2a; -} - -.red-fill { - fill: #a52a2a; -} - -.blue { - color: #3050f8; - stroke: #3050f8; - stroke-linecap: round; -} - -.yellow { - color: #FFD123; - stroke: #FFD123; -} - -.purple { - color: #A25AC1; - stroke: #A25AC1; -} - -.cyan { - color: #6AD1BF; - stroke: #6AD1BF; -} - -.gray { - color: #333; - stroke: #333; -} - -.white { - color: whitesmoke; - stroke: whitesmoke; -} - - /* LOGIN */ .login { - width: 25%; + width: 50%; display: flex; flex-flow: column; + margin-bottom: 2em; + + h2 { + margin-bottom: 0.5em; + } } #mnml input, #mnml select { @@ -316,242 +210,6 @@ button[disabled] { border-color: #888; } -/* - account -*/ - -header { - display: flex; - flex-flow: row; - grid-area: hd; - margin-bottom: 1.5em; -} - -.account { - margin: 1em 0; -} - -.header-title { - flex: 1; - letter-spacing: 0.05em; -} - -.account-status { - display: flex; -} - -.account-header { - letter-spacing: 0.05em; - flex: 1; - display: inline; -} - -.account-status svg { - margin: 0.5em 0 0 1em; - height: 1em; - background-color: black; - stroke: whitesmoke; -} - -.ping-path { - fill: none; - stroke-width: 4px; - stroke-dasharray: 121, 242; - animation: saw 2s infinite linear; - - transition-property: stroke-color; - transition-duration: 0.25s; - transition-timing-function: ease; -} - -.ping-text { - margin-left: 1em; - min-width: 3em; - display: inline-block; -} - -@keyframes saw { - 0% { - stroke-dashoffset: 363; - } - 100% { - stroke-dashoffset: 0; - } -} - -/* - TEAM -*/ - -.team { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(min-content, 33%)); - max-height: 100%; -} - -.menu-construct { - margin: 0.5em; - flex: 1 1 auto; - - display: flex; - flex-flow: column; - text-align: center; - justify-content: center; - - border: 1px solid black; - transition-property: border; - transition-duration: 0.25s; - transition-delay: 0; - transition-timing-function: ease; - - button:not(:last-child) { - margin-bottom: 1em; - } - - .avatar { - background-size: contain; - background-repeat: no-repeat; - background-position: center; - pointer-events: none; - height: 100%; - } -} - -.spawn-btn.menu-construct { - border: 1px solid #333; - color: #333; - display: flex; - flex-flow: row wrap; - align-content: center; - justify-content: center; -} - -.spawn-btn.menu-construct.selected { - color: whitesmoke; -} - -.spawn-btn.menu-construct:hover { - border: 1px solid whitesmoke; -} - -.spawn-btn input { - flex: 1 1 100%; - width: 100%; - margin: 1em; -} - -.spawn-btn button { - flex: 1 1 100%; - margin: 0.5em 1em; - padding: 0 0.5em; -} - -.spawn-btn input[disabled], .spawn-btn button[disabled] { - opacity: 0 -} - -.play { - height: 100%; - display: grid; - - grid-template-rows: minmax(min-content, 2fr) 1fr; - grid-template-columns: 1fr; - - grid-template-areas: - "team" - "inventory"; - - .team { - grid-area: team; - - /* poor man's
*/ - padding: 0.5em 2em 0 0; - border-bottom: 0.1em solid #444; - - } - - .menu-construct { - flex: 1 0 33%; - } - - .inventory { - margin: 2em 2em 0 0; - grid-area: inventory; - - display: grid; - grid-template-columns: 1fr 1fr; - - .list { - letter-spacing: 0.25em; - text-transform: uppercase; - display: grid; - grid-template-columns: repeat(4, 1fr); - grid-gap: 1em; - flex-flow: row wrap; - align-items: flex-end; - } - - figure { - font-size: 125%; - display: flex; - flex-flow: column; - } - } -} - -.menu-instance-btn { - flex: 1 1 100%; - font-size: 1.2em; -} - -.stripe-btn { - width: 100%; - padding: 0 0.5em; - margin: 0.25em 0; - background: whitesmoke; - color: black; - border-radius: 2px; -} - -.stripe-btn:hover { - color: black; -} - -.play-btn { - font-size: 150%; -} - -.refresh-btn { - border: 1px solid #222; - float: right; - font-size: 1.5em; -} - -.create-form { - grid-area: create; - flex: 1; - - justify-self: flex-end; - - display: flex; - flex-flow: row wrap; - margin-bottom: 1.5em; -} - -.create-form button { - flex: 1; - font-size: 1.5em; -} - -.create-form button:first-child { - margin-right: 1em; -} - -.create-form button:hover, .create-form button:focus { - border-color: whitesmoke; - text-decoration: none; -} - figure.gray { color: #333; stroke-color: #333; @@ -562,56 +220,9 @@ figure.gray { fill: none; } -main .top button { - width: 100%; -} - -.timer-container { - display: flex; - flex: 1 1 100%; - width: 100%; - height: 0.25em; - max-height: 0.25em; - - border: none; - margin: 1em 0 0 0; -} - -.timer { - background: whitesmoke; - transition-property: all; - transition-duration: 0.25s; - transition-delay: 0; - transition-timing-function: ease; -} - -footer { - display: none; - flex-flow: row wrap; - grid-area: footer; - margin: 0; -} - -footer button { - margin: 0; - border: none; - background: #222; - font-size: 1.5em; - padding: 0.25em; -} - -footer button:disabled { - color: #444; -} - -footer button:not(:last-child) { - background: #222; - border-right: 1px solid black; -} - -footer button .ready { - background: forestgreen; - color: black; +.credits { + color: @yellow; + font-weight: 800; } @media (max-width: 1500px) { @@ -624,10 +235,6 @@ footer button .ready { } } -#nav-btn, #instance-nav { - display: none; -} - .mobile-title { display: none; -} +} \ No newline at end of file diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index fc6a30bf..263761ff 100644 --- a/client/assets/styles/styles.mobile.css +++ b/client/assets/styles/styles.mobile.css @@ -50,7 +50,7 @@ main { overflow-x: hidden; - padding: 0; + padding: 0 0.5em; } .login { diff --git a/client/index.html b/client/index.html index 2dc752d5..88515382 100644 --- a/client/index.html +++ b/client/index.html @@ -1,7 +1,7 @@ - mnml.gg + mnml - abstract strategy diff --git a/client/index.js b/client/index.js index a3db2940..8c76e1ff 100644 --- a/client/index.js +++ b/client/index.js @@ -1,8 +1,12 @@ require('./assets/styles/styles.less'); +require('./assets/styles/menu.less'); +require('./assets/styles/nav.less'); +require('./assets/styles/footer.less'); +require('./assets/styles/account.less'); +require('./assets/styles/controls.less'); require('./assets/styles/instance.less'); require('./assets/styles/vbox.less'); require('./assets/styles/game.less'); -require('./assets/styles/controls.less'); require('./assets/styles/styles.mobile.css'); require('./assets/styles/instance.mobile.css'); diff --git a/client/package.json b/client/package.json index b3a47aee..a0c13d05 100644 --- a/client/package.json +++ b/client/package.json @@ -21,6 +21,7 @@ "docco": "^0.7.0", "izitoast": "^1.4.0", "keymaster": "^1.6.2", + "linkstate": "^1.1.1", "lodash": "^4.17.15", "node-sass": "^4.12.0", "parcel": "^1.12.3", diff --git a/client/src/components/account.management.jsx b/client/src/components/account.management.jsx new file mode 100644 index 00000000..3561094e --- /dev/null +++ b/client/src/components/account.management.jsx @@ -0,0 +1,151 @@ +const preact = require('preact'); +const { Component } = require('preact') +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const SpawnButton = require('./spawn.button'); + +const { postData, errorToast, infoToast } = require('../utils'); +const actions = require('../actions'); + +const addState = connect( + function receiveState(state) { + const { + account, + ping, + ws, + } = state; + + + function setPassword(current, password) { + postData('/account/password', { current, password }) + .then(res => res.json()) + .then(data => { + if (!data.success) return errorToast(data.error_message); + infoToast('Password changed. Reloading...') + setTimeout(() => window.location.reload(), 5000); + }) + .catch(error => errorToast(error)); + } + + function logout() { + postData('/account/logout').then(() => window.location.reload(true)); + } + + + function sendConstructSpawn(name) { + return ws.sendMtxConstructSpawn(name); + } + + return { + account, + ping, + logout, + setPassword, + sendConstructSpawn, + }; + }, +); + + +class AccountStatus extends Component { + constructor(props) { + super(props); + + this.state = { + setPassword: { current: '', password: '', confirm: ''}, + }; + } + + render(args) { + const { + account, + ping, + logout, + setPassword, + sendConstructSpawn, + } = args; + + if (!account) return null; + + const passwordsEqual = () => + this.state.setPassword.password === this.state.setPassword.confirm; + + const setPasswordDisabled = () => { + const { current, password, confirm } = this.state.setPassword; + return !(passwordsEqual() && password && current && confirm); + } + + return ( +
+
+

{account.name}

+
+
Subscription
+
{account.subscribed ? 'some date' : 'unsubscribed'}
+
+ + +
+
+ +
+
Current Email
+
{account.email ? account.email : 'No email set'}
+
Status
+
{account.email_confirmed ? 'Confirmed' : 'Unconfirmed'}
+
+ + +
+
+ + + + + +
+
+
+
spawn new construct
+ +
+
+
+ ); + } +} + +module.exports = addState(AccountStatus); diff --git a/client/src/components/account.page.jsx b/client/src/components/account.page.jsx new file mode 100644 index 00000000..021bb58b --- /dev/null +++ b/client/src/components/account.page.jsx @@ -0,0 +1,33 @@ +const { connect } = require('preact-redux'); +const preact = require('preact'); + +const Team = require('./team'); +const AccountManagement = require('./account.management'); + +const addState = connect( + function receiveState(state) { + const { + ws, + account, + } = state; + + return { + account, + }; + }, +); + +function Account(args) { + const { + account, + } = args; + + return ( +
+ + +
+ ); +} + +module.exports = addState(Account); diff --git a/client/src/components/account.status.jsx b/client/src/components/account.status.jsx index 025022b9..fce012cf 100644 --- a/client/src/components/account.status.jsx +++ b/client/src/components/account.status.jsx @@ -1,9 +1,7 @@ const { connect } = require('preact-redux'); const preact = require('preact'); -const { Elements, injectStripe } = require('react-stripe-elements'); const { saw } = require('./shapes'); -const { postData } = require('./../utils'); const actions = require('../actions'); function pingColour(ping) { @@ -12,55 +10,6 @@ function pingColour(ping) { return 'red'; } -function BitsBtn(args) { - const { - stripe, - account, - } = args; - function subscribeClick(e) { - stripe.redirectToCheckout({ - items: [{plan: 'plan_FGmRwawcOJJ7Nv', quantity: 1}], - successUrl: 'http://localhost/api/payments/success', - cancelUrl: 'http://localhost/api/payments/cancel', - clientReferenceId: account.id - }); - } - - function bitsClick(e) { - stripe.redirectToCheckout({ - items: [{sku: 'sku_FHUfNEhWQaVDaT', quantity: 1}], - successUrl: 'http://localhost/payments/success', - cancelUrl: 'http://localhost/payments/cancel', - clientReferenceId: account.id - }); - } - - const subscription = account.subscribed - ?

Subscribed

- : ; - - return ( -
-
- {subscription} - - -
- ); -} - -const StripeBitsBtn = injectStripe(BitsBtn); - const addState = connect( function receiveState(state) { const { @@ -68,23 +17,28 @@ const addState = connect( ping, } = state; - - function logout() { - postData('/logout').then(() => window.location.reload(true)); - } - return { account, ping, - logout, }; }, function receiveDispatch(dispatch) { - function selectConstructs() { - return dispatch(actions.setNav('team')); + function accountPage() { + dispatch(actions.setGame(null)); + dispatch(actions.setInstance(null)); + dispatch(actions.setCombiner([])); + dispatch(actions.setReclaiming(false)); + dispatch(actions.setActiveSkill(null)); + dispatch(actions.setActiveConstruct(null)); + dispatch(actions.setInfo(null)); + dispatch(actions.setItemEquip(null)); + dispatch(actions.setItemUnequip([])); + dispatch(actions.setVboxHighlight([])); + return dispatch(actions.setNav('account')); } + return { - selectConstructs, + accountPage, }; } ); @@ -94,25 +48,20 @@ function AccountStatus(args) { const { account, ping, - logout, - selectConstructs, + accountPage, } = args; if (!account) return null; return ( -
-