From 28918fb46498bf70e2bdc8abbfbad0ef4bf75932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Thu, 2 Nov 2017 13:33:43 +0000 Subject: [PATCH] style: lint and format --- packages/cloudapi-gql/package.json | 7 +++---- packages/cloudapi-gql/src/schema/resolvers.js | 20 ++++++++++--------- .../src/components/instances/firewall-rule.js | 18 +++++++++-------- .../src/components/instances/list.js | 9 +++++---- .../src/components/instances/network.js | 5 +---- .../src/components/instances/snapshots.js | 4 +++- .../my-joy-beta/src/graphql/get-instance.gql | 2 +- packages/my-joy-beta/src/graphql/list-dns.gql | 4 ++-- packages/ui-toolkit/src/card/demo.md | 10 ++-------- packages/ui-toolkit/src/header/index.js | 1 - packages/ui-toolkit/src/header/item.js | 1 - packages/ui-toolkit/src/header/nav.js | 4 ---- packages/ui-toolkit/src/header/usage.md | 18 ++++++++--------- packages/ui-toolkit/src/icons/index.js | 2 +- packages/ui-toolkit/src/icons/triton-beta.js | 2 -- packages/ui-toolkit/src/message/Readme.md | 6 +++--- packages/ui-toolkit/src/table/usage.md | 12 +++++++---- packages/ui-toolkit/src/tooltip/Readme.md | 3 +++ 18 files changed, 62 insertions(+), 66 deletions(-) diff --git a/packages/cloudapi-gql/package.json b/packages/cloudapi-gql/package.json index 642c2b2d..fb5e78ea 100644 --- a/packages/cloudapi-gql/package.json +++ b/packages/cloudapi-gql/package.json @@ -6,7 +6,8 @@ "main": "src/schema/index.js", "scripts": { "lint": "eslint . --fix --ext .js --ext .graphql", - "fmt": "prettier --write --single-quote src/**/*.js src/*.js src/**/*.graphql", + "fmt": + "prettier --write --single-quote src/**/*.js src/*.js src/**/*.graphql", "test": "echo 0", "test-ci": "echo 0", "start": "PORT=4000 node src/server.js", @@ -50,8 +51,6 @@ "prettier": "^1.7.4" }, "nodemonConfig": { - "ignore": [ - "doc/*" - ] + "ignore": ["doc/*"] } } diff --git a/packages/cloudapi-gql/src/schema/resolvers.js b/packages/cloudapi-gql/src/schema/resolvers.js index c4f1a72c..c719a723 100644 --- a/packages/cloudapi-gql/src/schema/resolvers.js +++ b/packages/cloudapi-gql/src/schema/resolvers.js @@ -60,15 +60,17 @@ const resolvers = { package: (root, { id, name }) => api.packages.get({ id, name }), machines: (root, { id, brand, state, tags, ...rest }, _, ctx) => - id ? api.machines.get({ id }).then(machine => [machine]) - : api.machines.list( - Object.assign(rest, { - brand: brand ? brand.toLowerCase() : brand, - state: state ? state.toLowerCase() : state, - tags: fromKeyValue(tags) - }) - ) - .then(machines => { + id + ? api.machines.get({ id }).then(machine => [machine]) + : api.machines + .list( + Object.assign(rest, { + brand: brand ? brand.toLowerCase() : brand, + state: state ? state.toLowerCase() : state, + tags: fromKeyValue(tags) + }) + ) + .then(machines => { const field = forceArray(ctx.fieldNodes) .filter(({ name }) => name.value === 'machines') .shift(); diff --git a/packages/my-joy-beta/src/components/instances/firewall-rule.js b/packages/my-joy-beta/src/components/instances/firewall-rule.js index 168246d7..b218f0d4 100644 --- a/packages/my-joy-beta/src/components/instances/firewall-rule.js +++ b/packages/my-joy-beta/src/components/instances/firewall-rule.js @@ -1,15 +1,17 @@ import React from 'react'; -import forceArray from 'force-array'; -import { - TableTr, - TableTd -} from 'joyent-ui-toolkit'; +import { TableTr, TableTd } from 'joyent-ui-toolkit'; export default ({ rule = '', global = false, enabled = false }) => ( - {rule} - {JSON.stringify(global)} - {JSON.stringify(enabled)} + + {rule} + + + {JSON.stringify(global)} + + + {JSON.stringify(enabled)} + ); diff --git a/packages/my-joy-beta/src/components/instances/list.js b/packages/my-joy-beta/src/components/instances/list.js index 0cb45fd1..e461cd39 100644 --- a/packages/my-joy-beta/src/components/instances/list.js +++ b/packages/my-joy-beta/src/components/instances/list.js @@ -2,7 +2,6 @@ import React from 'react'; import { Row, Col } from 'react-styled-flexboxgrid'; import forceArray from 'force-array'; import find from 'lodash.find'; -import remcalc from 'remcalc'; import titleCase from 'title-case'; import { @@ -35,7 +34,7 @@ import { Anchor } from 'joyent-ui-toolkit'; -const { SmallOnly, Small, Medium } = QueryBreakpoints; +const { SmallOnly, Medium } = QueryBreakpoints; const stateColor = { PROVISIONING: 'primary', @@ -156,7 +155,7 @@ export default ({ const items = forceArray(instances).map(instance => { // eslint-disable-next-line camelcase - const { id, name, state, firewall_enabled, snapshots, brand } = instance; + const { id, state, firewall_enabled, snapshots, brand } = instance; const isSelected = Boolean(find(selected, ['id', id])); const isSubmitting = isSelected && submitting; @@ -221,7 +220,9 @@ export default ({ - {items.map(instance => )} + + {items.map(instance => )} + ); diff --git a/packages/my-joy-beta/src/components/instances/network.js b/packages/my-joy-beta/src/components/instances/network.js index ab88e88d..37ac073b 100644 --- a/packages/my-joy-beta/src/components/instances/network.js +++ b/packages/my-joy-beta/src/components/instances/network.js @@ -1,10 +1,7 @@ import React from 'react'; import forceArray from 'force-array'; -import { - TableTr, - TableTd -} from 'joyent-ui-toolkit'; +import { TableTr, TableTd } from 'joyent-ui-toolkit'; export default ({ name, gateway, subnet, resolvers = [] }) => ( diff --git a/packages/my-joy-beta/src/components/instances/snapshots.js b/packages/my-joy-beta/src/components/instances/snapshots.js index 2a226ce7..633b1ec8 100644 --- a/packages/my-joy-beta/src/components/instances/snapshots.js +++ b/packages/my-joy-beta/src/components/instances/snapshots.js @@ -109,7 +109,9 @@ export default ({ - {items.map(snapshot => )} + + {items.map(snapshot => )} + ); diff --git a/packages/my-joy-beta/src/graphql/get-instance.gql b/packages/my-joy-beta/src/graphql/get-instance.gql index 6494ba9a..6a9a2613 100644 --- a/packages/my-joy-beta/src/graphql/get-instance.gql +++ b/packages/my-joy-beta/src/graphql/get-instance.gql @@ -1,6 +1,6 @@ query instance($name: String) { machines(name: $name) { - id, + id dns_names } } diff --git a/packages/my-joy-beta/src/graphql/list-dns.gql b/packages/my-joy-beta/src/graphql/list-dns.gql index 7f18139b..f5298935 100644 --- a/packages/my-joy-beta/src/graphql/list-dns.gql +++ b/packages/my-joy-beta/src/graphql/list-dns.gql @@ -1,7 +1,7 @@ query instance($name: String!) { machines(name: $name) { - id, - name, + id + name dns_names } } diff --git a/packages/ui-toolkit/src/card/demo.md b/packages/ui-toolkit/src/card/demo.md index 7b6d4adb..2c277856 100644 --- a/packages/ui-toolkit/src/card/demo.md +++ b/packages/ui-toolkit/src/card/demo.md @@ -22,10 +22,7 @@ const { default: Card, Header, HeaderBox, HeaderMeta } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P } = require('../text'); -const { - InstancesIconLight, - IconActionsLight -} = require('../icons'); +const { InstancesIconLight, IconActionsLight } = require('../icons');
@@ -108,10 +105,7 @@ const { default: Card, Header, HeaderBox, HeaderMeta, Outlet } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P, Small } = require('../text'); -const { - InstancesIconLight, - IconActionsLight -} = require('../icons'); +const { InstancesIconLight, IconActionsLight } = require('../icons');
diff --git a/packages/ui-toolkit/src/header/index.js b/packages/ui-toolkit/src/header/index.js index c096e1b7..362c6324 100644 --- a/packages/ui-toolkit/src/header/index.js +++ b/packages/ui-toolkit/src/header/index.js @@ -1,7 +1,6 @@ import React from 'react'; import styled from 'styled-components'; import remcalc from 'remcalc'; -import is from 'styled-is'; const Header = styled.div` display: flex; diff --git a/packages/ui-toolkit/src/header/item.js b/packages/ui-toolkit/src/header/item.js index cf07eba0..dcff658b 100644 --- a/packages/ui-toolkit/src/header/item.js +++ b/packages/ui-toolkit/src/header/item.js @@ -3,7 +3,6 @@ import styled from 'styled-components'; import remcalc from 'remcalc'; import P from '../text/p'; -import typography from '../typography'; const Text = P.extend` text-align: center; diff --git a/packages/ui-toolkit/src/header/nav.js b/packages/ui-toolkit/src/header/nav.js index 81548ee5..7b81c2f7 100644 --- a/packages/ui-toolkit/src/header/nav.js +++ b/packages/ui-toolkit/src/header/nav.js @@ -1,11 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import is from 'styled-components'; import remcalc from 'remcalc'; -import P from '../text/p'; -import typography from '../typography'; - const UL = styled.ul` padding: 0; margin: 0; diff --git a/packages/ui-toolkit/src/header/usage.md b/packages/ui-toolkit/src/header/usage.md index 0396797c..e36dc07e 100644 --- a/packages/ui-toolkit/src/header/usage.md +++ b/packages/ui-toolkit/src/header/usage.md @@ -4,15 +4,15 @@ const { default: HeaderBrand } = require('./brand.js'); const { default: HeaderItem } = require('./item.js');
- - - -
  • Compute
    • -
  • Network
    • -     - Return to existing portal - eu-east-1 - Nicola + + + +
  • Compute
    • +
  • Network
    • +     + Return to existing portal + eu-east-1 + Nicola
    ``` diff --git a/packages/ui-toolkit/src/icons/index.js b/packages/ui-toolkit/src/icons/index.js index 0f683781..cc898540 100644 --- a/packages/ui-toolkit/src/icons/index.js +++ b/packages/ui-toolkit/src/icons/index.js @@ -18,7 +18,7 @@ export { default as DataCenterIconLight } from './data-center-light'; export { default as DotIcon } from './dot'; export { default as ChevronIcon } from './chevron'; export { default as TritonIcon } from './triton'; -export { default as TritonBetaIcon } from './triton-beta' +export { default as TritonBetaIcon } from './triton-beta'; export { default as CompletedIcon } from './completed'; export { default as PartCompletedIcon } from './part-complete'; export { default as IncompleteIcon } from './incomplete'; diff --git a/packages/ui-toolkit/src/icons/triton-beta.js b/packages/ui-toolkit/src/icons/triton-beta.js index cb841e0e..8a6098dc 100644 --- a/packages/ui-toolkit/src/icons/triton-beta.js +++ b/packages/ui-toolkit/src/icons/triton-beta.js @@ -1,5 +1,3 @@ -import React from 'react'; - import TritonBetaIcon from './svg/triton_beta.svg'; export default TritonBetaIcon; diff --git a/packages/ui-toolkit/src/message/Readme.md b/packages/ui-toolkit/src/message/Readme.md index 434d0156..7b511421 100644 --- a/packages/ui-toolkit/src/message/Readme.md +++ b/packages/ui-toolkit/src/message/Readme.md @@ -11,7 +11,7 @@ const { Message, MessageTitle, MessageDescription } = require('.'); sure that you choose the data center that suits your requirements. Learn more - +; ``` #### Error @@ -23,7 +23,7 @@ const { Message, MessageTitle, MessageDescription } = require('.'); Choosing deployment data center Oh no - +; ``` #### Warning @@ -35,5 +35,5 @@ const { Message, MessageTitle, MessageDescription } = require('.'); Choosing deployment data center There were some issues - +; ``` diff --git a/packages/ui-toolkit/src/table/usage.md b/packages/ui-toolkit/src/table/usage.md index f090e0be..0e66a796 100644 --- a/packages/ui-toolkit/src/table/usage.md +++ b/packages/ui-toolkit/src/table/usage.md @@ -1,7 +1,7 @@ ```jsx const React = require('react'); const { default: Table, Thead, Tr, Th, Tbody, Td } = require('./'); -const { H4, P } = require('../text'); +const { H4 } = require('../text'); @@ -15,8 +15,12 @@ const { H4, P } = require('../text'); - - + + @@ -36,5 +40,5 @@ const { H4, P } = require('../text'); -
    HB

    percona_high-ram-32_1

    		 + HB + +

    percona_high-ram-32_1

    +     		Provisioning 2252839a HBHB
    +; ``` diff --git a/packages/ui-toolkit/src/tooltip/Readme.md b/packages/ui-toolkit/src/tooltip/Readme.md index e7b4e66c..58ee9e2b 100644 --- a/packages/ui-toolkit/src/tooltip/Readme.md +++ b/packages/ui-toolkit/src/tooltip/Readme.md @@ -1,4 +1,5 @@ ```jsx +const React = require('react'); const { default: Tooltip, Container, Target } = require('./'); const { Row, Col } = require('react-styled-flexboxgrid'); @@ -41,6 +42,7 @@ const { Row, Col } = require('react-styled-flexboxgrid'); #### Tooltip > hover ```jsx +const React = require('react'); const { default: Tooltip, Container, Target } = require('./'); const { Row, Col } = require('react-styled-flexboxgrid'); @@ -59,6 +61,7 @@ const { Row, Col } = require('react-styled-flexboxgrid'); #### Tooltip > click ```jsx +const React = require('react'); const { default: Tooltip, Container, Target } = require('./'); const { Row, Col } = require('react-styled-flexboxgrid');