Skip to content

Commit

Permalink
Merge pull request #284 from Kenny-Gin1/bug/formatting-errors
Browse files Browse the repository at this point in the history
Bug/formatting errors
  • Loading branch information
dcrescimbeni authored Mar 10, 2023
2 parents 7eb9b00 + 2b46445 commit 8fbc0ce
Show file tree
Hide file tree
Showing 21 changed files with 362 additions and 379 deletions.
4 changes: 2 additions & 2 deletions apps/davi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"build": "./scripts/build.sh",
"build-analyze": "pnpm cra-bundle-analyzer",
"lint": "eslint src/",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,md}\" \"scripts/*.{js,jsx,ts,tsx,json,md}\"",
"format-check": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,md}\" \"scripts/*.{js,jsx,ts,tsx,json,md}\"",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,md,graphql}\" \"scripts/*.{js,jsx,ts,tsx,json,md}\"",
"format-check": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,md,graphql}\" \"scripts/*.{js,jsx,ts,tsx,json,md}\"",
"cy:run": "./scripts/integration.sh",
"test:light": "react-app-rewired test --watch --detectOpenHandles",
"test:e2e": "ETHERNAL_CONTRACTS=false start-server-and-test 'pnpm dev --no-browser' 3000 cy:run",
Expand Down
166 changes: 83 additions & 83 deletions apps/davi/src/components/ActionsBuilder/DiffView/syntax.css
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
pre code.hljs {
display: block;
overflow-x: auto;
padding: 1em;
}

code.hljs {
padding: 3px 5px;
}

.hljs-comment,
.hljs-meta {
color: #565f89;
}
.hljs-deletion,
.hljs-doctag,
.hljs-regexp,
.hljs-selector-attr,
.hljs-selector-class,
.hljs-selector-id,
.hljs-selector-pseudo,
.hljs-tag,
.hljs-template-tag,
.hljs-variable.language_ {
color: #f7768e;
}
.hljs-link,
.hljs-literal,
.hljs-number,
.hljs-params,
.hljs-template-variable,
.hljs-type,
.hljs-variable {
color: #ff9e64;
}
.hljs-attribute,
.hljs-built_in {
color: #e0af68;
}
.hljs-keyword,
.hljs-property,
.hljs-subst,
.hljs-title,
.hljs-title.class_,
.hljs-title.class_.inherited__,
.hljs-title.function_ {
color: #7dcfff;
}
.hljs-selector-tag {
color: #73daca;
}
.hljs-addition,
.hljs-bullet,
.hljs-quote,
.hljs-string,
.hljs-symbol {
color: #00B0FF;
}
.hljs-code,
.hljs-formula,
.hljs-section {
color: #7aa2f7;
}
.hljs-attr,
.hljs-char.escape_,
.hljs-keyword,
.hljs-name,
.hljs-operator {
color: #69F0AE !important;
}
.hljs-punctuation {
color: #c0caf5;
}
.hljs {
background: #1a1b26;
color: #9aa5ce;
}
.hljs-emphasis {
font-style: italic;
}
.hljs-strong {
font-weight: 700;
}
pre code.hljs {
display: block;
overflow-x: auto;
padding: 1em;
}

code.hljs {
padding: 3px 5px;
}

.hljs-comment,
.hljs-meta {
color: #565f89;
}
.hljs-deletion,
.hljs-doctag,
.hljs-regexp,
.hljs-selector-attr,
.hljs-selector-class,
.hljs-selector-id,
.hljs-selector-pseudo,
.hljs-tag,
.hljs-template-tag,
.hljs-variable.language_ {
color: #f7768e;
}
.hljs-link,
.hljs-literal,
.hljs-number,
.hljs-params,
.hljs-template-variable,
.hljs-type,
.hljs-variable {
color: #ff9e64;
}
.hljs-attribute,
.hljs-built_in {
color: #e0af68;
}
.hljs-keyword,
.hljs-property,
.hljs-subst,
.hljs-title,
.hljs-title.class_,
.hljs-title.class_.inherited__,
.hljs-title.function_ {
color: #7dcfff;
}
.hljs-selector-tag {
color: #73daca;
}
.hljs-addition,
.hljs-bullet,
.hljs-quote,
.hljs-string,
.hljs-symbol {
color: #00b0ff;
}
.hljs-code,
.hljs-formula,
.hljs-section {
color: #7aa2f7;
}
.hljs-attr,
.hljs-char.escape_,
.hljs-keyword,
.hljs-name,
.hljs-operator {
color: #69f0ae !important;
}
.hljs-punctuation {
color: #c0caf5;
}
.hljs {
background: #1a1b26;
color: #9aa5ce;
}
.hljs-emphasis {
font-style: italic;
}
.hljs-strong {
font-weight: 700;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.GenericCallMatcher {
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
}
.GenericCallMatcher {
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const ProposalDescriptionWrapper = styled.div`
color: ${({ theme }) => theme.colors.active};
}
a:visited {
color: ${({ theme }) => shade(0.3, theme.colors.active)};
color: ${({ theme }) => shade(0.3, theme.colors.active)};
}
`;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
query getDaoPermissions($id: String!) {
permissions(where: { from: $id }) {
id
to
valueAllowed
from
fromTime
functionSignature
allowed
}
}

query getDaoPermissions($id: String!) {
permissions(where: { from: $id }) {
id
to
valueAllowed
from
fromTime
functionSignature
allowed
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
query getMemberList1_5($id: ID!) {
dao(id: $id) {
reputationToken {
id
members {
id
address
reputationTokenAmount
}
}
}
}

query getMemberList1_5($id: ID!) {
dao(id: $id) {
reputationToken {
id
members {
id
address
reputationTokenAmount
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
query getDaoNumberOfActiveProposals($id: ID!) {
dao(id: $id) {
schemes {
proposals(where: { state: Submitted }) {
id
}
}
}
}

query getDaoNumberOfActiveProposals($id: ID!) {
dao(id: $id) {
schemes {
proposals(where: { state: Submitted }) {
id
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
query getGuildConfig1_5($id: ID!) {
dao(id: $id) {
id
reputationToken {
id
address
name
}
}
}

query getGuildConfig1_5($id: ID!) {
dao(id: $id) {
id
reputationToken {
id
address
name
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
query getDaoProposalIds($id: ID!) {
dao(id: $id) {
schemes {
proposals {
id
}
}
}
}

query getDaoProposalIds($id: ID!) {
dao(id: $id) {
schemes {
proposals {
id
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
query getDaoProposal($id: ID!, $proposalId: ID!) {
dao(id: $id) {
schemes {
proposals(where: { id: $proposalId }) {
boostedPhaseTime
callData
callbacks
currentBoostedVotePeriodLimit
daoBounty
id
paramsHash
descriptionHash
preBoostedPhaseTime
proposer
schemeId
secondsFromTimeOutTillExecuteBoosted
state
submittedTime
title
to
totalOptions
totalStakes
value
votingMachineExecutionState
votingMachineProposalState
winningVote
totalVotes
}
}
}
}

query getDaoProposal($id: ID!, $proposalId: ID!) {
dao(id: $id) {
schemes {
proposals(where: { id: $proposalId }) {
boostedPhaseTime
callData
callbacks
currentBoostedVotePeriodLimit
daoBounty
id
paramsHash
descriptionHash
preBoostedPhaseTime
proposer
schemeId
secondsFromTimeOutTillExecuteBoosted
state
submittedTime
title
to
totalOptions
totalStakes
value
votingMachineExecutionState
votingMachineProposalState
winningVote
totalVotes
}
}
}
}
Loading

1 comment on commit 8fbc0ce

@vercel
Copy link

@vercel vercel bot commented on 8fbc0ce Mar 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.