Skip to content

Commit

Permalink
prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
hhatto committed Jan 16, 2022
1 parent 7c7d882 commit 91015f8
Show file tree
Hide file tree
Showing 18 changed files with 80 additions and 47 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dev": "yarn --cwd packages/web start:dev",
"build": "lerna run build --include-dependencies",
"lint": "eslint --fix -c ./.eslintrc.json './packages/**/*.{ts,tsx}'",
"format": "prettier --write ./packages/web/public/locales/en/PossessionOutline.json",
"format": "prettier --write .",
"test": "lerna run test",
"clean": "lerna run clean && lerna clean --y",
"prepare": "husky install"
Expand Down
10 changes: 5 additions & 5 deletions packages/graphql/codegen.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
overwrite: true
schema: "./src/scheme.graphql"
documents: ["src/queries/**.graphql", "src/fragments/**.graphql"]
schema: './src/scheme.graphql'
documents: ['src/queries/**.graphql', 'src/fragments/**.graphql']
generates:
src/react-apollo/generated.tsx:
plugins:
- "typescript"
- "typescript-operations"
- "typescript-react-apollo"
- 'typescript'
- 'typescript-operations'
- 'typescript-react-apollo'
config:
withComponent: false
withHooks: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query getMarketFactoryCreate {
market_factory_create(limit: 1, order_by: {block_number: asc}) {
market_factory_create(limit: 1, order_by: { block_number: asc }) {
market
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query getPortofolioPoolsAccount($accountAddress: String!) {
property_lockup(where: { account_address: {_eq: $accountAddress }}) {
property_address
property_lockup(where: { account_address: { _eq: $accountAddress } }) {
property_address
}
}
}
2 changes: 1 addition & 1 deletion packages/graphql/src/queries/getPropertyAggregate.graphql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query getPropertyAggregate($authorAddress: String) {
property_meta_aggregate (where: { author: { _eq: $authorAddress } }) {
property_meta_aggregate(where: { author: { _eq: $authorAddress } }) {
aggregate {
count
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
query getPropertyBalance($account_address: String!, $property_address: String!) {
property_balance(where: { account_address: { _eq: $account_address }, property_address: { _eq: $property_address } }) {
property_balance(
where: { account_address: { _eq: $account_address }, property_address: { _eq: $property_address } }
) {
account_address
balance
block_number
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/src/queries/getTotalStakedByAccount.graphql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query totalStakedAccount($account_address: String!) {
account_lockup_sum_values(where: { account_address: { _eq: $account_address }}) {
account_lockup_sum_values(where: { account_address: { _eq: $account_address } }) {
sum_values
}
}
}
7 changes: 6 additions & 1 deletion packages/graphql/src/queries/listAccountLockup.graphql
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
query listAccountLockup($account_address: String!, $offset: Int, $limit: Int!) {
account_lockup(where: { account_address: { _eq: $account_address } }, order_by: { value: desc }, offset: $offset, limit: $limit) {
account_lockup(
where: { account_address: { _eq: $account_address } }
order_by: { value: desc }
offset: $offset
limit: $limit
) {
property_address
}
account_lockup_aggregate(where: { account_address: { _eq: $account_address } }) {
Expand Down
9 changes: 7 additions & 2 deletions packages/graphql/src/queries/listOwnedPropertyMeta.graphql
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
query listOwnedPropertyMeta($account_address: String!, $offset: Int, $limit: Int) {
property_meta(where: { author: { _eq: $account_address } }, order_by: {lockup_aggregate: {sum: {value: desc}}}, offset: $offset, limit: $limit) {
property_meta(
where: { author: { _eq: $account_address } }
order_by: { lockup_aggregate: { sum: { value: desc } } }
offset: $offset
limit: $limit
) {
property
name
}
}
}
33 changes: 23 additions & 10 deletions packages/graphql/src/queries/listPropertyCreateFactory.graphql
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
query ListProperty($limit: Int, $offset: Int, $ilike: String, $from: String, $market: String, $marketOther: [String!]) {
property_factory_create(limit: $limit, offset: $offset, order_by: {
current_lockup: {
sum_values: desc_nulls_last
}
},
property_factory_create(
limit: $limit
offset: $offset
order_by: { current_lockup: { sum_values: desc_nulls_last } }
where: {
authentication: {
authentication_id: { _ilike: $ilike }
Expand All @@ -18,18 +17,32 @@ query ListProperty($limit: Int, $offset: Int, $ilike: String, $from: String, $ma
...propertyFactoryCreate
}
property_factory_create_aggregate(
where: { authentication: { authentication_id: { _ilike: $ilike } property_meta: { author: { _eq: $from } } market: { _eq: $market, _nin: $marketOther } } }
where: {
authentication: {
authentication_id: { _ilike: $ilike }
property_meta: { author: { _eq: $from } }
market: { _eq: $market, _nin: $marketOther }
}
}
) {
aggregate {
count
}
}
}

query ListPropertyOrderByMostRecent($limit: Int, $offset: Int, $ilike: String, $from: String, $market: String, $marketOther: [String!]) {
property_factory_create(limit: $limit, offset: $offset, order_by: {
block_number: desc
},
query ListPropertyOrderByMostRecent(
$limit: Int
$offset: Int
$ilike: String
$from: String
$market: String
$marketOther: [String!]
) {
property_factory_create(
limit: $limit
offset: $offset
order_by: { block_number: desc }
where: {
authentication: {
authentication_id: { _ilike: $ilike }
Expand Down
9 changes: 7 additions & 2 deletions packages/graphql/src/queries/listPropertyMeta.graphql
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
query listPropertyMeta($author: String!, $offset: Int, $limit: Int, $ilike: String) {
property_meta(where: { author: { _eq: $author }, property: { _ilike: $ilike } }, offset: $offset, limit: $limit, order_by: { lockup_aggregate: { sum: { value: desc_nulls_last } }}) {
property_meta(
where: { author: { _eq: $author }, property: { _ilike: $ilike } }
offset: $offset
limit: $limit
order_by: { lockup_aggregate: { sum: { value: desc_nulls_last } } }
) {
property
name
lockup_aggregate {
aggregate {
count
count
sum {
block_number
value
Expand Down
10 changes: 7 additions & 3 deletions packages/graphql/src/queries/listTopStakersAccount.graphql
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
query listTopStakersAccount($author_address: String!, $limit: Int){
account_lockup(where: { property_meta: {author: {_eq: $author_address }}}, limit: $limit, order_by: { value: desc }) {
query listTopStakersAccount($author_address: String!, $limit: Int) {
account_lockup(
where: { property_meta: { author: { _eq: $author_address } } }
limit: $limit
order_by: { value: desc }
) {
account_address
value
property_address
}
}
}
4 changes: 2 additions & 2 deletions packages/graphql/src/queries/listTopSupportingAccount.graphql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query listTopSupportingAccount($account_address: String!, $limit: Int){
account_lockup(where: { account_address: { _eq: $account_address} }, order_by: { value: desc }, limit: $limit) {
query listTopSupportingAccount($account_address: String!, $limit: Int) {
account_lockup(where: { account_address: { _eq: $account_address } }, order_by: { value: desc }, limit: $limit) {
property_address
value
}
Expand Down
1 change: 0 additions & 1 deletion packages/graphql/src/scheme.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -7747,4 +7747,3 @@ input withdraw_property_transfer_variance_order_by {
log_index: order_by
transaction_index: order_by
}

8 changes: 4 additions & 4 deletions packages/web/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
presets: ["next/babel"],
presets: ['next/babel'],
plugins: [
["styled-components", { displayName: false }],
['styled-components', { displayName: false }],
[
"import",
'import',
{
libraryName: "antd",
libraryName: 'antd',
style: true
// "style": "css"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/jest.setup.regenerator-runtime.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require('regenerator-runtime/runtime')
require('regenerator-runtime/runtime')
12 changes: 6 additions & 6 deletions packages/web/public/fonts/style.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
@font-face {
font-family: "Whyte";
src: url("https://devstaticasset.azureedge.net/font/ABCWhyte-Regular.woff2") format('woff2');
font-family: 'Whyte';
src: url('https://devstaticasset.azureedge.net/font/ABCWhyte-Regular.woff2') format('woff2');
font-style: normal;
font-weight: 400;
font-display: swap;
}

@font-face {
font-family: "WhyteInktrap";
src: url("https://devstaticasset.azureedge.net/font/ABCWhyteInktrap-Bold.woff2") format("woff2");
font-family: 'WhyteInktrap';
src: url('https://devstaticasset.azureedge.net/font/ABCWhyteInktrap-Bold.woff2') format('woff2');
font-style: bold;
font-weight: 900;
font-display: swap;
}

@font-face {
font-family: "WhyteInktrap";
src: url("https://devstaticasset.azureedge.net/font/ABCWhyteInktrap-Regular.woff2") format("woff2");
font-family: 'WhyteInktrap';
src: url('https://devstaticasset.azureedge.net/font/ABCWhyteInktrap-Regular.woff2') format('woff2');
font-style: normal;
font-weight: 400;
font-display: swap;
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/fixtures/ipfs/cache-path.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const SWRCachePath = {
getIPFS: (cid?: string) => `IPFS/${cid}/getIPFS`,
getIPFS: (cid?: string) => `IPFS/${cid}/getIPFS`
} as const

0 comments on commit 91015f8

Please sign in to comment.