From 89d2b398231a47ccc0de44035f770f89c8a701ce Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 9 Aug 2019 22:48:58 +1000 Subject: [PATCH 01/17] account wip --- client/assets/styles/account.less | 58 ++++++++++++ client/assets/styles/colours.less | 1 + client/assets/styles/game.less | 1 + client/assets/styles/styles.less | 52 +++++------ client/index.js | 1 + client/src/components/account.management.jsx | 90 +++++++++++++++++++ client/src/components/account.page.jsx | 33 +++++++ client/src/components/account.status.jsx | 79 ++-------------- client/src/components/controls.jsx | 2 +- client/src/components/inventory.jsx | 14 ++- client/src/components/main.jsx | 2 + client/src/components/stripe.buttons.jsx | 54 +++++++++++ client/src/components/team.jsx | 4 +- .../mnml.gg.STAGING.SAMPLE.nginx.conf | 56 ++++++++---- server/src/names.rs | 12 ++- 15 files changed, 336 insertions(+), 123 deletions(-) create mode 100644 client/assets/styles/account.less create mode 100644 client/src/components/account.management.jsx create mode 100644 client/src/components/account.page.jsx create mode 100644 client/src/components/stripe.buttons.jsx diff --git a/client/assets/styles/account.less b/client/assets/styles/account.less new file mode 100644 index 00000000..a5e763c3 --- /dev/null +++ b/client/assets/styles/account.less @@ -0,0 +1,58 @@ +@import 'colours.less'; + +.account-page { + height: 100%; + display: grid; + + grid-template-rows: minmax(min-content, 2fr) 1fr; + grid-template-columns: 1fr; + + grid-template-areas: + "team" + "account"; + + button { + display: block; + height: 3em; + width: 75%; + } + + input { + width: 75%; + height: 3em; + display: block; + } + + .team { + grid-area: team; + + /* poor man's
*/ + border-bottom: 0.1em solid #444; + } + + .account { + margin: 2em 2em 0 0; + grid-area: account; + + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-gap: 0 1em; + } +} + +.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/colours.less b/client/assets/styles/colours.less index 8ffce257..d7e0fc49 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; diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index 29a71047..a2949889 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -1,3 +1,4 @@ +@import 'colours.less'; /* GAME */ .game { diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 3ba42538..12bde5a2 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -90,6 +90,10 @@ nav { padding-left: 2em; margin-right: 2em; max-height: 100%; + + h1 { + margin-bottom: 0.5em; + } } nav h2:first-child { @@ -166,17 +170,17 @@ 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 { @@ -327,16 +331,12 @@ header { margin-bottom: 1.5em; } -.account { - margin: 1em 0; -} - .header-title { flex: 1; letter-spacing: 0.05em; } -.account-status { +.account-info { display: flex; } @@ -346,7 +346,7 @@ header { display: inline; } -.account-status svg { +.account-info svg { margin: 0.5em 0 0 1em; height: 1em; background-color: black; @@ -481,6 +481,10 @@ header { display: grid; grid-template-columns: 1fr 1fr; + h1 { + margin-bottom: 0.5em; + } + .list { letter-spacing: 0.25em; text-transform: uppercase; @@ -504,19 +508,6 @@ header { 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%; } @@ -566,6 +557,11 @@ main .top button { width: 100%; } +.credits { + color: @yellow; + font-weight: 800; +} + .timer-container { display: flex; flex: 1 1 100%; diff --git a/client/index.js b/client/index.js index a3db2940..da09b74d 100644 --- a/client/index.js +++ b/client/index.js @@ -3,6 +3,7 @@ require('./assets/styles/instance.less'); require('./assets/styles/vbox.less'); require('./assets/styles/game.less'); require('./assets/styles/controls.less'); +require('./assets/styles/account.less'); require('./assets/styles/styles.mobile.css'); require('./assets/styles/instance.mobile.css'); diff --git a/client/src/components/account.management.jsx b/client/src/components/account.management.jsx new file mode 100644 index 00000000..102b846b --- /dev/null +++ b/client/src/components/account.management.jsx @@ -0,0 +1,90 @@ +const { connect } = require('preact-redux'); +const preact = require('preact'); + +const { postData } = require('./../utils'); +const actions = require('../actions'); + +const addState = connect( + function receiveState(state) { + const { + account, + ping, + } = state; + + + function logout() { + postData('/logout').then(() => window.location.reload(true)); + } + + return { + account, + ping, + logout, + }; + }, +); + + +function AccountStatus(args) { + const { + account, + ping, + logout, + } = args; + + if (!account) return null; + + return ( +
+
+

{account.name}

+
+
Subscription
+
{account.subscribed ? 'some date' : 'unsubscribed'}
+
+ +
+
+ + + + +
+
+ + + + + +
+
+ ); +} + +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..17474fe8 --- /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..6b5826c4 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,18 @@ 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() { + return dispatch(actions.setNav('account')); } + return { - selectConstructs, + accountPage, }; } ); @@ -94,25 +38,20 @@ function AccountStatus(args) { const { account, ping, - logout, - selectConstructs, + accountPage, } = args; if (!account) return null; return ( -
- +
+
+
spawn new construct
+ +
+
+ + ); + } } module.exports = addState(AccountStatus); diff --git a/client/src/utils.jsx b/client/src/utils.jsx index 1aa57056..a50ba095 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -213,6 +213,15 @@ function errorToast(message) { }); } +function infoToast(message) { + toast.info({ + position: 'topRight', + drag: false, + close: false, + message, + }); +} + function convertItem(v) { if (['Red', 'Green', 'Blue'].includes(v)) { return ( @@ -233,6 +242,7 @@ module.exports = { postData, convertItem, errorToast, + infoToast, NULL_UUID, STATS, COLOURS, diff --git a/server/src/account.rs b/server/src/account.rs index 16833c3a..06c62e3f 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -117,7 +117,7 @@ pub fn login(tx: &mut Transaction, name: &String, password: &String) -> Result Result { +pub fn new_token(tx: &mut Transaction, id: Uuid) -> Result { let mut rng = thread_rng(); let token: String = iter::repeat(()) .map(|()| rng.sample(Alphanumeric)) @@ -136,11 +136,73 @@ pub fn new_token(tx: &mut Transaction, id: Uuid) -> Result { .query(query, &[&token, &id])?; result.iter().next() - .ok_or(format_err!("account not updated {:?}", id))?; + .ok_or(MnmlHttpError::Unauthorized)?; Ok(token) } +pub fn set_password(tx: &mut Transaction, id: Uuid, current: &String, password: &String) -> Result { + if password.len() < PASSWORD_MIN_LEN { + return Err(MnmlHttpError::PasswordUnacceptable); + } + + let query = " + SELECT id, password + FROM accounts + WHERE id = $1 + "; + + let result = tx + .query(query, &[&id])?; + + let row = match result.iter().next() { + Some(row) => row, + None => { + let mut rng = thread_rng(); + let garbage: String = iter::repeat(()) + .map(|()| rng.sample(Alphanumeric)) + .take(64) + .collect(); + + // verify garbage to prevent timing attacks + verify(garbage.clone(), &garbage).ok(); + return Err(MnmlHttpError::AccountNotFound); + }, + }; + + let id: Uuid = row.get(0); + let db_pw: String = row.get(1); + + if !verify(current, &db_pw)? { + return Err(MnmlHttpError::PasswordNotMatch); + } + + let rounds = 8; + let password = hash(&password, rounds)?; + + let query = " + UPDATE accounts + SET password = $1, updated_at = now() + WHERE id = $2 + RETURNING id, name; + "; + + let result = tx + .query(query, &[&password, &id])?; + + let row = match result.iter().next() { + Some(row) => row, + None => return Err(MnmlHttpError::DbError), + }; + + let name: String = row.get(1); + + info!("password updated name={:?} id={:?}", name, id); + + new_token(tx, id) +} + + pub fn credit(tx: &mut Transaction, id: Uuid, credits: i64) -> Result { let query = " UPDATE accounts diff --git a/server/src/net.rs b/server/src/net.rs index 0e818e16..31f0e4c8 100644 --- a/server/src/net.rs +++ b/server/src/net.rs @@ -221,7 +221,7 @@ fn login(req: &mut Request) -> IronResult { match account::login(&mut tx, ¶ms.name, ¶ms.password) { Ok(a) => { - let token = account::new_token(&mut tx, a.id).or(Err(MnmlHttpError::ServerError))?; + let token = account::new_token(&mut tx, a.id)?; tx.commit().or(Err(MnmlHttpError::ServerError))?; Ok(token_res(token)) }, @@ -239,7 +239,7 @@ fn logout(req: &mut Request) -> IronResult { let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; let mut tx = db.transaction().or(Err(MnmlHttpError::DbError))?; - account::new_token(&mut tx, a.id).or(Err(MnmlHttpError::Unauthorized))?; + account::new_token(&mut tx, a.id)?; tx.commit().or(Err(MnmlHttpError::ServerError))?; @@ -252,6 +252,33 @@ fn logout(req: &mut Request) -> IronResult { } } +#[derive(Debug,Clone,Deserialize)] +struct SetPassword { + current: String, + password: String, +} + +fn set_password(req: &mut Request) -> IronResult { + let state = req.get::>().unwrap(); + let params = match req.get::>() { + Ok(Some(b)) => b, + _ => return Err(IronError::from(MnmlHttpError::BadRequest)), + }; + + match req.extensions.get::() { + Some(a) => { + let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; + let mut tx = db.transaction().or(Err(MnmlHttpError::DbError))?; + + let token = account::set_password(&mut tx, a.id, ¶ms.current, ¶ms.password)?; + + tx.commit().or(Err(MnmlHttpError::ServerError))?; + + Ok(token_res(token)) + }, + None => Err(IronError::from(MnmlHttpError::Unauthorized)), + } +} const MAX_BODY_LENGTH: usize = 1024 * 1024 * 10; @@ -269,6 +296,8 @@ pub fn start(pool: PgPool) { router.post("/api/account/login", login, "login"); router.post("/api/account/logout", logout, "logout"); router.post("/api/account/register", register, "register"); + router.post("/api/account/password", set_password, "set_password"); + router.post("/api/account/email", logout, "email"); // payments router.post("/api/payments/stripe", stripe, "stripe"); From 143b0e92cb13dd538d22629ff0f7aea2c4d85b7f Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 13 Aug 2019 14:44:44 +1000 Subject: [PATCH 07/17] support email --- WORKLOG.md | 9 +++++++++ client/assets/styles/styles.less | 14 +++++++++++++- client/src/components/account.management.jsx | 18 +++++++++--------- server/src/net.rs | 14 +++++++------- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/WORKLOG.md b/WORKLOG.md index 1967a507..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 diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 690731a1..76fe12bf 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -121,7 +121,19 @@ button, input { 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 { diff --git a/client/src/components/account.management.jsx b/client/src/components/account.management.jsx index fe058f6f..3561094e 100644 --- a/client/src/components/account.management.jsx +++ b/client/src/components/account.management.jsx @@ -84,17 +84,17 @@ class AccountStatus extends Component {
Subscription
{account.subscribed ? 'some date' : 'unsubscribed'}
+
- - + +
+
Current Email
+
{account.email ? account.email : 'No email set'}
+
Status
+
{account.email_confirmed ? 'Confirmed' : 'Unconfirmed'}
+
Update
- + Self { - JsonResponse { response: Some(response), success: true, error_message: None } - } + fn success(response: String) -> Self { + JsonResponse { response: Some(response), success: true, error_message: None } + } - fn error(msg: String) -> Self { - JsonResponse { response: None, success: false, error_message: Some(msg) } - } + fn error(msg: String) -> Self { + JsonResponse { response: None, success: false, error_message: Some(msg) } + } } -fn iron_response (status: status::Status, message: String) -> Response { +fn iron_response(status: status::Status, message: String) -> Response { let content_type = "application/json".parse::().unwrap(); let msg = match status { status::Ok => JsonResponse::success(message), From 99c575ac690d804892c46ab6d89e03fca88ccfed Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 13 Aug 2019 15:44:17 +1000 Subject: [PATCH 08/17] acp init --- acp/.babelrc | 9 + acp/.eslintrc.js | 1501 +++++++++++++++++++++++++++++++++++++++++ acp/.gitignore | 5 + acp/acp.html | 21 + acp/acp.js | 14 + acp/package.json | 50 ++ acp/src/acp.jsx | 35 + acp/src/acp.users.jsx | 91 +++ acp/src/actions.jsx | 2 + acp/src/reducers.jsx | 16 + client/src/utils.jsx | 17 + 11 files changed, 1761 insertions(+) create mode 100644 acp/.babelrc create mode 100644 acp/.eslintrc.js create mode 100644 acp/.gitignore create mode 100644 acp/acp.html create mode 100644 acp/acp.js create mode 100644 acp/package.json create mode 100644 acp/src/acp.jsx create mode 100644 acp/src/acp.users.jsx create mode 100644 acp/src/actions.jsx create mode 100644 acp/src/reducers.jsx 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..8760e330 --- /dev/null +++ b/acp/acp.html @@ -0,0 +1,21 @@ + + + + mnml - acp + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/acp/acp.js b/acp/acp.js new file mode 100644 index 00000000..6ad73d17 --- /dev/null +++ b/acp/acp.js @@ -0,0 +1,14 @@ +require('./../client/assets/styles/styles.less'); +require('./../client/assets/styles/menu.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..6222922b --- /dev/null +++ b/acp/package.json @@ -0,0 +1,50 @@ +{ + "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", + "axios": "^0.19.0", + "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.jsx b/acp/src/acp.jsx new file mode 100644 index 00000000..30bf049d --- /dev/null +++ b/acp/src/acp.jsx @@ -0,0 +1,35 @@ +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 Users = require('./acp.users'); + +// 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.users.jsx b/acp/src/acp.users.jsx new file mode 100644 index 00000000..319e3ead --- /dev/null +++ b/acp/src/acp.users.jsx @@ -0,0 +1,91 @@ +const preact = require('preact'); +const { Component } = require('preact'); +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const axios = require('axios'); + +const actions = require('./actions'); + +const addState = connect( + function receiveState(state) { + const { + account, + user, + } = state; + + return { + account, user, + }; + }, + + function receiveDispatch(dispatch) { + function setUser(user) { + dispatch(actions.setUser(user)); + } + + return { setUser }; + } +); + + +class AccountStatus extends Component { + constructor(props) { + super(props); + + this.state = { + account: {}, + search: '', + msg: '-', + }; + } + + render(args, state) { + const { + user, + } = args; + + const { + msg, + search, + } = state; + + const getUser = () => + axios.get(`/api/acp/user/${search}`) + .then(response => { + this.setState({ msg: response }); + }) + .catch(error => { + this.setState({ msg: error }); + }); + + if (!user) { + return ( +
+
{msg.message}
+ + + +
+ ); + } + + return ( +
+ {JSON.stringify(user)} +
+ ); + } +} + +module.exports = addState(AccountStatus); diff --git a/acp/src/actions.jsx b/acp/src/actions.jsx new file mode 100644 index 00000000..4c7d20ff --- /dev/null +++ b/acp/src/actions.jsx @@ -0,0 +1,2 @@ +export const setAccount = value => ({ type: 'SET_ACCOUNT', value }); +export const setUser = value => ({ type: 'SET_USER', value }); diff --git a/acp/src/reducers.jsx b/acp/src/reducers.jsx new file mode 100644 index 00000000..6bc56021 --- /dev/null +++ b/acp/src/reducers.jsx @@ -0,0 +1,16 @@ +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'), +}; diff --git a/client/src/utils.jsx b/client/src/utils.jsx index a50ba095..3816da45 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -204,6 +204,23 @@ function postData(url = '/', data = {}) { }); } +function getData(url = '/', data = {}) { + // Default options are marked with * + return fetch(`/api${url}`, { + method: 'GET', // *GET, POST, PUT, DELETE, etc. + // mode: 'no-cors', // no-cors, cors, *same-origin + cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached + credentials: 'include', // include, same-origin, *omit + headers: { + Accept: 'application/json', + 'content-type': 'application/json', + }, + redirect: 'error', // manual, *follow, error + // referrer: ', // no-referrer, *client + body: JSON.stringify(data), // body data type must match "Content-Type" header + }); +} + function errorToast(message) { toast.error({ position: 'topRight', From f68a12eab84d50d2704c1dc398abf168e3f8a326 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 11:31:12 +1000 Subject: [PATCH 09/17] acp routing --- acp/src/acp.jsx | 2 +- acp/src/acp.users.jsx | 94 ++++++++++++++++++++++------------ client/assets/styles/menu.less | 16 ++++++ server/Cargo.toml | 1 + server/src/account.rs | 25 ++++++++- server/src/{net.rs => http.rs} | 93 +++++++++++++++++++++++++++++---- server/src/main.rs | 5 +- server/src/payments.rs | 4 +- server/src/rpc.rs | 2 +- 9 files changed, 193 insertions(+), 49 deletions(-) rename server/src/{net.rs => http.rs} (79%) diff --git a/acp/src/acp.jsx b/acp/src/acp.jsx index 30bf049d..63b4f0d7 100644 --- a/acp/src/acp.jsx +++ b/acp/src/acp.jsx @@ -18,7 +18,7 @@ const store = createStore( document.fonts.load('16pt "Jura"').then(() => { const Acp = () => ( -
+
diff --git a/acp/src/acp.main.jsx b/acp/src/acp.main.jsx new file mode 100644 index 00000000..e078c2a2 --- /dev/null +++ b/acp/src/acp.main.jsx @@ -0,0 +1,162 @@ +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, + } = state; + + return { + account, user, + }; + }, + + function receiveDispatch(dispatch) { + function setUser(user) { + dispatch(actions.setUser(user)); + } + + function setGames(list) { + dispatch(actions.setGames(list)); + } + + return { + setUser, + setGames, + }; + } +); + + +class AcpMain extends Component { + constructor(props) { + super(props); + + this.state = { + account: {}, + name: null, + id: null, + msg: '', + user: null, + games: [], + }; + } + + render(args, state) { + const { + setGames, + setUser, + } = args; + + const { + msg, + name, + id, + } = state; + + const getUser = () => { + this.setState({ msg: null }); + postData('/acp/user', { id, name }) + .then(res => res.json()) + .then(data => { + if (data.error) return this.setState({ msg: data.error }); + setUser(data); + }) + .catch(error => errorToast(error)); + }; + + const gameList = () => { + this.setState({ msg: null }); + postData('/acp/game/list', { number: 20 }) + .then(res => res.json()) + .then(data => { + if (data.error) return this.setState({ msg: data.error }); + console.log(data); + setGames(data.data); + }) + .catch(error => errorToast(error)); + }; + + const gameOpen = () => { + this.setState({ msg: null }); + postData('/acp/game/open') + .then(res => res.json()) + .then(data => { + if (data.error) return this.setState({ msg: 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..0f5b2a3b --- /dev/null +++ b/acp/src/acp.user.jsx @@ -0,0 +1,44 @@ +const preact = require('preact'); +const { Component } = require('preact'); +const { connect } = require('preact-redux'); +const linkState = require('linkstate').default; + +const axios = require('axios'); + +const actions = require('./actions'); + +const addState = connect( + function receiveState(state) { + const { + user, + } = state; + + return { + user + }; + }, +); + +function AcpGameList(args) { + const { + user, + } = args; + + if (!user) return false; + + return ( +
+

{user.name}

+
+
Id
+
{user.id}
+
Credits
+
{user.balance}
+
Subscribed
+
{user.subscribed.toString()}
+
+
+ ) +} + +module.exports = addState(AcpGameList); diff --git a/acp/src/acp.users.jsx b/acp/src/acp.users.jsx deleted file mode 100644 index 1c8c84b5..00000000 --- a/acp/src/acp.users.jsx +++ /dev/null @@ -1,119 +0,0 @@ -const preact = require('preact'); -const { Component } = require('preact'); -const { connect } = require('preact-redux'); -const linkState = require('linkstate').default; - -const axios = require('axios'); - -const actions = require('./actions'); - -const addState = connect( - function receiveState(state) { - const { - account, - user, - } = state; - - return { - account, user, - }; - }, - - function receiveDispatch(dispatch) { - function setUser(user) { - dispatch(actions.setUser(user)); - } - - return { setUser }; - } -); - - -class AccountStatus extends Component { - constructor(props) { - super(props); - - this.state = { - account: {}, - name: null, - id: null, - msg: '', - user: null, - }; - } - - render(args, state) { - const { - msg, - name, - id, - user, - } = state; - - console.log(user); - - const getUser = () => { - this.setState({ msg: null }); - axios.post('/api/acp/user', { id, name }) - .then(response => { - console.log(response); - this.setState({ user: JSON.parse(response.data.response) }); - }) - .catch(error => { - console.error(error); - this.setState({ msg: error.message }); - }); - }; - - const userEl = user - ? ( -
-

{user.name}

-
-
Id
-
{user.id}
-
Credits
-
{user.balance}
-
Subscribed
-
{user.subscribed.toString()}
-
-
- ) : null; - - return ( -
-
-
{msg}
- {userEl} -
-
-
- - - - -
-
-
- ); - } -} - -module.exports = addState(AccountStatus); diff --git a/acp/src/actions.jsx b/acp/src/actions.jsx index 4c7d20ff..bf8155be 100644 --- a/acp/src/actions.jsx +++ b/acp/src/actions.jsx @@ -1,2 +1,3 @@ export const setAccount = value => ({ type: 'SET_ACCOUNT', value }); export const setUser = value => ({ type: 'SET_USER', value }); +export const setGames = value => ({ type: 'SET_GAMES', value }); diff --git a/acp/src/reducers.jsx b/acp/src/reducers.jsx index 6bc56021..7522236e 100644 --- a/acp/src/reducers.jsx +++ b/acp/src/reducers.jsx @@ -13,4 +13,5 @@ function createReducer(defaultState, actionType) { module.exports = { account: createReducer(null, 'SET_ACCOUNT'), user: createReducer(null, 'SET_USER'), + games: createReducer([], 'SET_GAMES'), }; diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less index f3f5248a..30e74a2a 100644 --- a/client/assets/styles/menu.less +++ b/client/assets/styles/menu.less @@ -89,12 +89,17 @@ } } -#mnml.acp, .acp { +#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); + } + input { display: block; } diff --git a/client/src/utils.jsx b/client/src/utils.jsx index 3816da45..a50ba095 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -204,23 +204,6 @@ function postData(url = '/', data = {}) { }); } -function getData(url = '/', data = {}) { - // Default options are marked with * - return fetch(`/api${url}`, { - method: 'GET', // *GET, POST, PUT, DELETE, etc. - // mode: 'no-cors', // no-cors, cors, *same-origin - cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached - credentials: 'include', // include, same-origin, *omit - headers: { - Accept: 'application/json', - 'content-type': 'application/json', - }, - redirect: 'error', // manual, *follow, error - // referrer: ', // no-referrer, *client - body: JSON.stringify(data), // body data type must match "Content-Type" header - }); -} - function errorToast(message) { toast.error({ position: 'topRight', diff --git a/server/src/account.rs b/server/src/account.rs index 350aae84..562cae11 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -29,6 +29,23 @@ pub struct Account { pub subscribed: bool, } +impl<'a> TryFrom> for Account { + type Error = Error; + + fn try_from(row: postgres::rows::Row) -> Result { + let id: Uuid = row.get("id"); + + let db_balance: i64 = row.get("balance"); + let balance = u32::try_from(db_balance) + .or(Err(format_err!("user {:?} has unparsable balance {:?}", id, db_balance)))?; + + let subscribed: bool = row.get("subscribed"); + let name: String = row.get("name"); + + Ok(Account { id, name, balance, subscribed }) + } +} + pub fn select(db: &Db, id: Uuid) -> Result { let query = " SELECT id, name, balance, subscribed @@ -42,13 +59,7 @@ pub fn select(db: &Db, id: Uuid) -> Result { let row = result.iter().next() .ok_or(format_err!("account not found {:?}", id))?; - let db_balance: i64 = row.get(2); - let balance = u32::try_from(db_balance) - .or(Err(format_err!("user {:?} has unparsable balance {:?}", id, db_balance)))?; - - let subscribed: bool = row.get(3); - - Ok(Account { id, name: row.get(1), balance, subscribed }) + Account::try_from(row) } pub fn select_name(db: &Db, name: &String) -> Result { @@ -64,14 +75,7 @@ pub fn select_name(db: &Db, name: &String) -> Result { let row = result.iter().next() .ok_or(format_err!("account not found name={:?}", name))?; - let id: Uuid = row.get(0); - let db_balance: i64 = row.get(2); - let balance = u32::try_from(db_balance) - .or(Err(format_err!("user {:?} has unparsable balance {:?}", name, db_balance)))?; - - let subscribed: bool = row.get(3); - - Ok(Account { id, name: row.get(1), balance, subscribed }) + Account::try_from(row) } pub fn from_token(db: &Db, token: String) -> Result { @@ -88,15 +92,7 @@ pub fn from_token(db: &Db, token: String) -> Result { let row = result.iter().next() .ok_or(err_msg("invalid token"))?; - let id: Uuid = row.get(0); - let name: String = row.get(1); - let subscribed: bool = row.get(2); - let db_balance: i64 = row.get(3); - - let balance = u32::try_from(db_balance) - .or(Err(format_err!("user {:?} has unparsable balance {:?}", id, db_balance)))?; - - Ok(Account { id, name, balance, subscribed }) + Account::try_from(row) } pub fn login(tx: &mut Transaction, name: &String, password: &String) -> Result { @@ -124,20 +120,13 @@ pub fn login(tx: &mut Transaction, name: &String, password: &String) -> Result Result { diff --git a/server/src/acp.rs b/server/src/acp.rs new file mode 100644 index 00000000..c428ed47 --- /dev/null +++ b/server/src/acp.rs @@ -0,0 +1,125 @@ +use iron::prelude::*; +use iron::status; + +use iron::{BeforeMiddleware}; +use persistent::Read; +use router::Router; + +use serde::{Deserialize}; +use uuid::Uuid; + +use account; +use game; + +use http::{State, MnmlHttpError, json_object}; + +struct AcpMiddleware; +impl BeforeMiddleware for AcpMiddleware { + fn before(&self, req: &mut Request) -> IronResult<()> { + match req.extensions.get::() { + Some(a) => { + if ["ntr", "mashy"].contains(&a.name.to_ascii_lowercase().as_ref()) { + return Ok(()); + } + + return Err(MnmlHttpError::Unauthorized.into()); + }, + None => Err(MnmlHttpError::Unauthorized.into()), + } + } +} + +#[derive(Debug,Clone,Deserialize)] +struct GetUser { + name: Option, + id: Option, +} + +fn acp_user(req: &mut Request) -> IronResult { + let state = req.get::>().unwrap(); + let params = match req.get::>() { + Ok(Some(b)) => b, + _ => return Err(MnmlHttpError::BadRequest.into()), + }; + + let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; + + let user = match params.id { + Some(id) => account::select(&db, id) + .or(Err(MnmlHttpError::NotFound))?, + + None => match params.name { + Some(n) => account::select_name(&db, &n) + .or(Err(MnmlHttpError::NotFound))?, + None => return Err(MnmlHttpError::BadRequest.into()), + } + }; + + Ok(json_object(status::Ok, serde_json::to_string(&user).unwrap())) +} + +#[derive(Debug,Clone,Deserialize)] +struct GetGame { + id: Uuid, +} + +fn acp_game(req: &mut Request) -> IronResult { + let state = req.get::>().unwrap(); + let params = match req.get::>() { + Ok(Some(b)) => b, + _ => return Err(MnmlHttpError::BadRequest.into()), + }; + + let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; + + let game = game::select(&db, params.id) + .or(Err(MnmlHttpError::NotFound))?; + + Ok(json_object(status::Ok, serde_json::to_string(&game).unwrap())) +} + +#[derive(Debug,Clone,Deserialize)] +struct GameList { + number: u32, +} + +fn game_list(req: &mut Request) -> IronResult { + let state = req.get::>().unwrap(); + let params = match req.get::>() { + Ok(Some(b)) => b, + _ => return Err(MnmlHttpError::BadRequest.into()), + }; + + let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; + + let list = game::list(&db, params.number) + .or(Err(MnmlHttpError::ServerError))?; + + Ok(json_object(status::Ok, serde_json::to_string(&list).unwrap())) +} + +fn game_open(req: &mut Request) -> IronResult { + let state = req.get::>().unwrap(); + let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; + let mut tx = db.transaction().or(Err(MnmlHttpError::DbError))?; + + let list = game::games_need_upkeep(&mut tx) + .or(Err(MnmlHttpError::ServerError))?; + + tx.commit() + .or(Err(MnmlHttpError::ServerError))?; + + Ok(json_object(status::Ok, serde_json::to_string(&list).unwrap())) +} + +pub fn acp_mount() -> Chain { + let mut router = Router::new(); + router.post("user", acp_user, "acp_user"); + router.post("game", acp_game, "acp_game"); + router.post("game/list", game_list, "acp_game_list"); + router.post("game/open", game_open, "acp_game_open"); + + let mut chain = Chain::new(router); + chain.link_before(AcpMiddleware); + chain +} diff --git a/server/src/game.rs b/server/src/game.rs index 8cfdaf77..6cdeda4c 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -12,6 +12,7 @@ use failure::Error; use failure::err_msg; use account::Account; +use pg::Db; use construct::{Construct}; use skill::{Skill, Cast, Resolution, Event, resolution_steps}; @@ -655,6 +656,55 @@ pub fn game_get(tx: &mut Transaction, id: Uuid) -> Result { return Ok(game); } +pub fn select(db: &Db, id: Uuid) -> Result { + let query = " + SELECT * + FROM games + WHERE id = $1; + "; + + let result = db + .query(query, &[&id])?; + + let returned = match result.iter().next() { + Some(row) => row, + None => return Err(err_msg("game not found")), + }; + + // tells from_slice to cast into a construct + let game_bytes: Vec = returned.get("data"); + let game = from_slice::(&game_bytes)?; + + return Ok(game); +} + +pub fn list(db: &Db, number: u32) -> Result, Error> { + let query = " + SELECT data + FROM games + ORDER BY created_at + LIMIT $1; + "; + + let result = db + .query(query, &[&number])?; + + let mut list = vec![]; + + for row in result.into_iter() { + let bytes: Vec = row.get(0); + + match from_slice::(&bytes) { + Ok(i) => list.push(i), + Err(e) => { + warn!("{:?}", e); + } + }; + } + + return Ok(list); +} + pub fn games_need_upkeep(tx: &mut Transaction) -> Result, Error> { let query = " SELECT data, id diff --git a/server/src/http.rs b/server/src/http.rs index c05906fd..cc6f3d0a 100644 --- a/server/src/http.rs +++ b/server/src/http.rs @@ -11,8 +11,8 @@ use persistent::Read; use router::Router; use mount::{Mount}; use serde::{Serialize, Deserialize}; -use uuid::Uuid; +use acp; use account; use pg::PgPool; use payments::{stripe}; @@ -62,42 +62,40 @@ impl From for MnmlHttpError { } } +impl From for MnmlHttpError { + fn from(_err: r2d2::Error) -> Self { + MnmlHttpError::DbError + } +} + impl From for MnmlHttpError { - fn from(_err: failure::Error) -> Self { + fn from(err: failure::Error) -> Self { + warn!("{:?}", err); MnmlHttpError::ServerError } } #[derive(Serialize, Deserialize)] -struct JsonResponse { - response: Option, - success: bool, - error_message: Option +#[serde(rename_all(serialize = "lowercase"))] +pub enum Json { + Error(String), + Message(String), } -impl JsonResponse { - fn success(response: String) -> Self { - JsonResponse { response: Some(response), success: true, error_message: None } - } - - fn error(msg: String) -> Self { - JsonResponse { response: None, success: false, error_message: Some(msg) } - } -} - -fn iron_response(status: status::Status, message: String) -> Response { +pub fn json_response(status: status::Status, response: Json) -> Response { let content_type = "application/json".parse::().unwrap(); - let msg = match status { - status::Ok => JsonResponse::success(message), - _ => JsonResponse::error(message) - }; - let msg_out = serde_json::to_string(&msg).unwrap(); - return Response::with((content_type, status, msg_out)); + let json = serde_json::to_string(&response).unwrap(); + return Response::with((content_type, status, json)); +} + +pub fn json_object(status: status::Status, object: String) -> Response { + let content_type = "application/json".parse::().unwrap(); + return Response::with((content_type, status, object)); } impl From for IronError { fn from(m_err: MnmlHttpError) -> Self { - let (err, res) = match m_err { + let (err, status) = match m_err { MnmlHttpError::ServerError | MnmlHttpError::DbError => (m_err.compat(), status::InternalServerError), @@ -114,7 +112,9 @@ impl From for IronError { MnmlHttpError::NotFound => (m_err.compat(), status::NotFound), }; - IronError { error: Box::new(err), response: iron_response(res, m_err.to_string()) } + + let response = json_response(status, Json::Error(m_err.to_string())); + IronError { error: Box::new(err), response } } } @@ -173,7 +173,11 @@ fn token_res(token: String) -> Response { .max_age(Duration::weeks(1)) // 1 week aligns with db set .finish(); - let mut res = iron_response(status::Ok, "token_res".to_string()); + let mut res = json_response( + status::Ok, + Json::Message("authenticated".to_string()) + ); + res.headers.set(SetCookie(vec![v.to_string()])); return res; @@ -249,7 +253,7 @@ fn logout(req: &mut Request) -> IronResult { tx.commit().or(Err(MnmlHttpError::ServerError))?; - let mut res = iron_response(status::Ok, "logout".to_string()); + let mut res = json_response(status::Ok, Json::Message("logged out".to_string())); res.headers.set(SetCookie(vec![AUTH_CLEAR.to_string()])); Ok(res) @@ -314,68 +318,12 @@ fn payment_mount() -> Router { router } -struct AcpMiddleware; -impl BeforeMiddleware for AcpMiddleware { - fn before(&self, req: &mut Request) -> IronResult<()> { - match req.extensions.get::() { - Some(a) => { - if ["ntr", "mashy"].contains(&a.name.to_ascii_lowercase().as_ref()) { - return Ok(()); - } - - return Err(IronError::from(MnmlHttpError::Unauthorized)); - }, - None => Err(IronError::from(MnmlHttpError::Unauthorized)), - } - } -} - -#[derive(Debug,Clone,Deserialize)] -struct GetUser { - name: Option, - id: Option, -} - -fn acp_user(req: &mut Request) -> IronResult { - let state = req.get::>().unwrap(); - let params = match req.get::>() { - Ok(Some(b)) => b, - _ => return Err(IronError::from(MnmlHttpError::BadRequest)), - }; - - let db = state.pool.get().or(Err(MnmlHttpError::DbError))?; - - println!("{:?}", params); - - let user = match params.id { - Some(id) => account::select(&db, id) - .or(Err(MnmlHttpError::NotFound))?, - - None => match params.name { - Some(n) => account::select_name(&db, &n) - .or(Err(MnmlHttpError::NotFound))?, - None => return Err(IronError::from(MnmlHttpError::BadRequest)), - } - }; - - Ok(iron_response(status::Ok, serde_json::to_string(&user).unwrap())) -} - -fn acp_mount() -> Chain { - let mut router = Router::new(); - router.post("user", acp_user, "acp_user"); - - let mut chain = Chain::new(router); - chain.link_before(AcpMiddleware); - chain -} - pub fn start(pool: PgPool) { let mut mounts = Mount::new(); mounts.mount("/api/account/", account_mount()); mounts.mount("/api/payments/", payment_mount()); - mounts.mount("/api/acp/", acp_mount()); + mounts.mount("/api/acp/", acp::acp_mount()); let mut chain = Chain::new(mounts); chain.link(Read::::both(State { pool })); diff --git a/server/src/main.rs b/server/src/main.rs index 731ca154..44102168 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -30,6 +30,7 @@ extern crate ws; extern crate crossbeam_channel; mod account; +mod acp; mod construct; mod effect; mod game; From 8684f32db2fc9de03eb56f2dc7e1ca76450177d3 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 17:40:01 +1000 Subject: [PATCH 11/17] nginx acp stuff --- acp/acp.js | 1 + acp/src/acp.main.jsx | 39 +++++++---- acp/src/acp.user.jsx | 69 ++++++++++++++++--- acp/src/actions.jsx | 1 + acp/src/reducers.jsx | 1 + bin/client.sh | 6 ++ bin/deploy.sh | 11 ++- client/assets/styles/acp.less | 24 +++++++ client/assets/styles/menu.less | 16 ----- .../mnml.gg.STAGING.SAMPLE.nginx.conf | 34 ++------- server/src/instance.rs | 4 +- 11 files changed, 139 insertions(+), 67 deletions(-) create mode 100644 client/assets/styles/acp.less diff --git a/acp/acp.js b/acp/acp.js index 825f39d8..0f4b8299 100644 --- a/acp/acp.js +++ b/acp/acp.js @@ -3,6 +3,7 @@ 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'); diff --git a/acp/src/acp.main.jsx b/acp/src/acp.main.jsx index e078c2a2..32309ba4 100644 --- a/acp/src/acp.main.jsx +++ b/acp/src/acp.main.jsx @@ -14,10 +14,13 @@ const addState = connect( const { account, user, + msg, } = state; return { - account, user, + account, + user, + msg, }; }, @@ -30,8 +33,13 @@ const addState = connect( dispatch(actions.setGames(list)); } + function setMsg(msg) { + dispatch(actions.setMsg(msg)); + } + return { setUser, + setMsg, setGames, }; } @@ -43,12 +51,8 @@ class AcpMain extends Component { super(props); this.state = { - account: {}, - name: null, id: null, - msg: '', - user: null, - games: [], + name: null, }; } @@ -56,31 +60,38 @@ class AcpMain extends Component { const { setGames, setUser, + setMsg, + + msg, } = args; const { - msg, name, id, } = state; + const reset = () => { + setMsg(null); + this.setState({ id: null, name: null }); + }; + const getUser = () => { - this.setState({ msg: null }); + reset(); postData('/acp/user', { id, name }) .then(res => res.json()) .then(data => { - if (data.error) return this.setState({ msg: data.error }); + if (data.error) return setMsg(data.error); setUser(data); }) .catch(error => errorToast(error)); }; const gameList = () => { - this.setState({ msg: null }); + reset(); postData('/acp/game/list', { number: 20 }) .then(res => res.json()) .then(data => { - if (data.error) return this.setState({ msg: data.error }); + if (data.error) return setMsg(data.error); console.log(data); setGames(data.data); }) @@ -88,11 +99,11 @@ class AcpMain extends Component { }; const gameOpen = () => { - this.setState({ msg: null }); + reset(); postData('/acp/game/open') .then(res => res.json()) .then(data => { - if (data.error) return this.setState({ msg: data.error }); + if (data.error) return setMsg(data.error); console.log(data); setGames(data); }) @@ -102,7 +113,7 @@ class AcpMain extends Component { return (
-
{msg}
+
{msg}
diff --git a/acp/src/acp.user.jsx b/acp/src/acp.user.jsx index 0f5b2a3b..0b2e7072 100644 --- a/acp/src/acp.user.jsx +++ b/acp/src/acp.user.jsx @@ -3,8 +3,7 @@ const { Component } = require('preact'); const { connect } = require('preact-redux'); const linkState = require('linkstate').default; -const axios = require('axios'); - +const { postData, errorToast } = require('./../../client/src/utils'); const actions = require('./actions'); const addState = connect( @@ -14,22 +13,58 @@ const addState = connect( } = state; return { - user + user, }; }, + function receiveDispatch(dispatch) { + function setUser(user) { + dispatch(actions.setUser(user)); + } + + function setMsg(msg) { + dispatch(actions.setMsg(msg)); + } + + return { + setUser, + setMsg, + }; + } ); -function AcpGameList(args) { +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}

+
+

{user.name}

Id
{user.id}
Credits
@@ -37,8 +72,26 @@ function AcpGameList(args) {
Subscribed
{user.subscribed.toString()}
+
+ + + +
+
+

Constructs

+
- ) + ); } -module.exports = addState(AcpGameList); +module.exports = addState(AcpUser); diff --git a/acp/src/actions.jsx b/acp/src/actions.jsx index bf8155be..3de2fb07 100644 --- a/acp/src/actions.jsx +++ b/acp/src/actions.jsx @@ -1,3 +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 index 7522236e..b22d0b88 100644 --- a/acp/src/reducers.jsx +++ b/acp/src/reducers.jsx @@ -13,5 +13,6 @@ function createReducer(defaultState, actionType) { 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/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/menu.less b/client/assets/styles/menu.less index 30e74a2a..fb919124 100644 --- a/client/assets/styles/menu.less +++ b/client/assets/styles/menu.less @@ -88,19 +88,3 @@ } } } - -#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); - } - - input { - display: block; - } -} \ No newline at end of file diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 1d1d2bbf..446c2878 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -1,7 +1,3 @@ -upstream mnml_dev { - server 0.0.0.0:41337; -} - error_log /var/log/mnml/nginx.log; upstream mnml_http { @@ -21,11 +17,17 @@ map $http_upgrade $connection_upgrade { # DEV server { location / { - root /var/lib/mnml/public/current; + root /var/lib/mnml/public/client; index index.html; try_files $uri $uri/ index.html; } + location /acp { + root /var/lib/mnml/public/acp; + index acp.html; + try_files $uri $uri/ acp.html; + } + location /imgs/ { root /var/lib/mnml/public/; try_files $uri $uri/ =404; @@ -51,25 +53,3 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot } - -# http -> https -server { - server_name mnml.gg; - return 301 https://$host$request_uri; -} - -server { - server_name minimal.gg; - return 301 https://mnml.gg$request_uri; -} - -server { - server_name cryps.gg; - return 301 https://mnml.gg$request_uri; -} - -server { - server_name dev.mnml.gg; - return 301 https://$host$request_uri; -} - diff --git a/server/src/instance.rs b/server/src/instance.rs index bfe6420b..eb2c35d7 100644 --- a/server/src/instance.rs +++ b/server/src/instance.rs @@ -396,9 +396,11 @@ impl Instance { // if you don't win, you lose // ties can happen if both players forfeit + // in this case we just finish the game and + // dock them 10k mmr let winner_id = match game.winner() { Some(w) => w.id, - None => Uuid::nil(), + None => return Ok(self.finish()), }; for player in game.players.iter() { From f84f458ebe52423b7aa6a9f6c633ce95f432396a Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 18:29:52 +1000 Subject: [PATCH 12/17] nginx stuff for acp --- acp/src/acp.game.list.jsx | 2 -- bin/client.sh | 1 + bin/deploy.sh | 13 ++----------- .../mnml.gg.STAGING.SAMPLE.nginx.conf | 13 ++++--------- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/acp/src/acp.game.list.jsx b/acp/src/acp.game.list.jsx index e180aeca..744a6007 100644 --- a/acp/src/acp.game.list.jsx +++ b/acp/src/acp.game.list.jsx @@ -3,8 +3,6 @@ const { Component } = require('preact'); const { connect } = require('preact-redux'); const linkState = require('linkstate').default; -const axios = require('axios'); - const actions = require('./actions'); const addState = connect( diff --git a/bin/client.sh b/bin/client.sh index a2407748..922b77d3 100755 --- a/bin/client.sh +++ b/bin/client.sh @@ -18,3 +18,4 @@ cd $MNML_PATH/acp rm -rf dist npm i npm run build +mv dist/* $MNML_PATH/client/dist/ diff --git a/bin/deploy.sh b/bin/deploy.sh index 94a2bd26..fd95857d 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -6,12 +6,8 @@ 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/client" - -ACP_DIST_DIR="/var/lib/mnml/acp" -ACP_PUBLIC_DIR="/var/lib/mnml/public/acp" +CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current" # server updates echo "syncing server $VERSION " @@ -20,14 +16,9 @@ ssh -q mnml ln -nfs "$SERVER_BIN_DIR/$VERSION" "$SERVER_BIN_DIR/mnml" ssh -q mnml ls -lah "$SERVER_BIN_DIR" # client updates -echo "syncing client $VERSION" +echo "syncing client and acp $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/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 446c2878..7b5ecbfd 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -1,4 +1,4 @@ -error_log /var/log/mnml/nginx.log; +error_log /var/log/mnml/nginx.log debug; upstream mnml_http { server 127.0.0.1:40000; @@ -8,7 +8,6 @@ upstream mnml_ws { server 127.0.0.1:40055; } - map $http_upgrade $connection_upgrade { default upgrade; '' close; @@ -16,18 +15,14 @@ map $http_upgrade $connection_upgrade { # DEV server { + server_name mnml.gg; + location / { - root /var/lib/mnml/public/client; + root /var/lib/mnml/public/client/; index index.html; try_files $uri $uri/ index.html; } - location /acp { - root /var/lib/mnml/public/acp; - index acp.html; - try_files $uri $uri/ acp.html; - } - location /imgs/ { root /var/lib/mnml/public/; try_files $uri $uri/ =404; From bd51820279b3e06635c44b3c9933223eb8bc6137 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 18:39:38 +1000 Subject: [PATCH 13/17] client data toast --- client/src/components/login.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/login.jsx b/client/src/components/login.jsx index 2c9db016..6b7eefd3 100644 --- a/client/src/components/login.jsx +++ b/client/src/components/login.jsx @@ -15,7 +15,7 @@ const addState = connect( postData('/account/login', { name, password }) .then(res => res.json()) .then(data => { - if (!data.success) return errorToast(data.error_message); + if (data.error) return errorToast(data.error); console.log(data.response); ws.connect(); }) @@ -26,7 +26,7 @@ const addState = connect( postData('/account/register', { name, password, code }) .then(res => res.json()) .then(data => { - if (!data.success) return errorToast(data.error_message); + if (data.error) return errorToast(data.error); console.log(data.response); ws.connect(); }) From c11dac617dac2f4e3b762858a681cfbf28fdc55e Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 18:39:58 +1000 Subject: [PATCH 14/17] Revert "nginx stuff for acp" This reverts commit f84f458ebe52423b7aa6a9f6c633ce95f432396a. --- acp/src/acp.game.list.jsx | 2 ++ bin/client.sh | 1 - bin/deploy.sh | 13 +++++++++++-- .../mnml.gg.STAGING.SAMPLE.nginx.conf | 13 +++++++++---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/acp/src/acp.game.list.jsx b/acp/src/acp.game.list.jsx index 744a6007..e180aeca 100644 --- a/acp/src/acp.game.list.jsx +++ b/acp/src/acp.game.list.jsx @@ -3,6 +3,8 @@ const { Component } = require('preact'); const { connect } = require('preact-redux'); const linkState = require('linkstate').default; +const axios = require('axios'); + const actions = require('./actions'); const addState = connect( diff --git a/bin/client.sh b/bin/client.sh index 922b77d3..a2407748 100755 --- a/bin/client.sh +++ b/bin/client.sh @@ -18,4 +18,3 @@ cd $MNML_PATH/acp rm -rf dist npm i npm run build -mv dist/* $MNML_PATH/client/dist/ diff --git a/bin/deploy.sh b/bin/deploy.sh index fd95857d..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 " @@ -16,9 +20,14 @@ ssh -q mnml ln -nfs "$SERVER_BIN_DIR/$VERSION" "$SERVER_BIN_DIR/mnml" ssh -q mnml ls -lah "$SERVER_BIN_DIR" # client updates -echo "syncing client and acp $VERSION" +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/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 7b5ecbfd..446c2878 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -1,4 +1,4 @@ -error_log /var/log/mnml/nginx.log debug; +error_log /var/log/mnml/nginx.log; upstream mnml_http { server 127.0.0.1:40000; @@ -8,6 +8,7 @@ upstream mnml_ws { server 127.0.0.1:40055; } + map $http_upgrade $connection_upgrade { default upgrade; '' close; @@ -15,14 +16,18 @@ map $http_upgrade $connection_upgrade { # DEV server { - server_name mnml.gg; - location / { - root /var/lib/mnml/public/client/; + root /var/lib/mnml/public/client; index index.html; try_files $uri $uri/ index.html; } + location /acp { + root /var/lib/mnml/public/acp; + index acp.html; + try_files $uri $uri/ acp.html; + } + location /imgs/ { root /var/lib/mnml/public/; try_files $uri $uri/ =404; From bd467f6c14665d74b9ee4b6d86f57d1eeae7ba78 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 18:40:21 +1000 Subject: [PATCH 15/17] axios rm --- acp/src/acp.game.list.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/acp/src/acp.game.list.jsx b/acp/src/acp.game.list.jsx index e180aeca..744a6007 100644 --- a/acp/src/acp.game.list.jsx +++ b/acp/src/acp.game.list.jsx @@ -3,8 +3,6 @@ const { Component } = require('preact'); const { connect } = require('preact-redux'); const linkState = require('linkstate').default; -const axios = require('axios'); - const actions = require('./actions'); const addState = connect( From 16322fdaa10ab82f252a7aeae69145037aa9bc98 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 14 Aug 2019 18:40:46 +1000 Subject: [PATCH 16/17] comment for 2moz --- etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 446c2878..5f8e05ac 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -22,6 +22,7 @@ server { try_files $uri $uri/ index.html; } + # this will be handled by a separate domain location /acp { root /var/lib/mnml/public/acp; index acp.html; From f664dc6ebcfb74f703bd119e79a6005458687e63 Mon Sep 17 00:00:00 2001 From: ntr Date: Sat, 17 Aug 2019 17:51:55 +1000 Subject: [PATCH 17/17] nginx stuff --- .../mnml.gg.PRODUCTION.nginx.conf | 2 -- .../mnml.gg.STAGING.SAMPLE.nginx.conf | 32 +++++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf index 113a2b3c..875a10d7 100644 --- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf @@ -1,5 +1,3 @@ -error_log /var/log/mnml/nginx.log; - upstream mnml_http { server 127.0.0.1:40000; } diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf index 5f8e05ac..5e3fab85 100644 --- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf @@ -1,5 +1,3 @@ -error_log /var/log/mnml/nginx.log; - upstream mnml_http { server 127.0.0.1:40000; } @@ -17,18 +15,11 @@ map $http_upgrade $connection_upgrade { # DEV server { location / { - root /var/lib/mnml/public/client; + root /var/lib/mnml/public/current; index index.html; try_files $uri $uri/ index.html; } - # this will be handled by a separate domain - location /acp { - root /var/lib/mnml/public/acp; - index acp.html; - try_files $uri $uri/ acp.html; - } - location /imgs/ { root /var/lib/mnml/public/; try_files $uri $uri/ =404; @@ -54,3 +45,24 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot } + +server { + server_name grep.live; + + location / { + root /var/lib/mnml/public/current/; + index acp.html; + try_files $uri $uri/ acp.html; + } + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/grep.live/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/grep.live/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} + +# http -> https +server { + return 301 https://$host$request_uri; +}