Skip to content

Commit

Permalink
Merge branch 'develop' into feat/endorsement-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
martines3000 committed Jul 3, 2024
2 parents a20a4c6 + 86c9faf commit 8158319
Show file tree
Hide file tree
Showing 66 changed files with 8,928 additions and 5,340 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ jobs:
# run: forge snapshot
# - name: Check gas snapshots
# run: forge snapshot --check
- name: Start CI run
run: 'pnpx nx-cloud start-ci-run --distribute-on="8 linux-medium-js"'
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Lint
run: pnpm lint
- name: Build
run: pnpm build
- name: Test
run: pnpm test
- name: Build and test
run: pnpm nx run-many --target=build,test
2 changes: 1 addition & 1 deletion .infisical.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"workspaceId": "431a4159-5e0e-435c-8841-5a155fe473c6",
"defaultEnvironment": "",
"defaultEnvironment": "dev",
"gitBranchToEnvironmentMapping": null
}
2 changes: 1 addition & 1 deletion apps/farcaster-bot/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const config: CodegenConfig = {
config: {
documentMode: 'string',
},
schema: 'https://api.studio.thegraph.com/query/77003/ees-base/v0.0.3',
schema: 'https://api.studio.thegraph.com/query/77003/ees-base/v0.0.4',
preset: 'client',
plugins: [],
presetConfig: {
Expand Down
1 change: 1 addition & 0 deletions apps/farcaster-bot/makeCast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ async function main() {
mentions,
mentionsPositions,
type: CastType.CAST,
parentUrl: 'https://warpcast.com/~/channel/endorse',
},
dataOptions,
ed25519Signer
Expand Down
13 changes: 12 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"**/artifacts/**",
"**/contracts/lib/**",
"**/__generated__/**",
"**/ignition/deployments/**"
"**/ignition/deployments/**",
"**/subgraphs/tests/.latest.json"
]
},
"organizeImports": {
Expand Down Expand Up @@ -99,6 +100,16 @@
}
}
}
},
{
"include": ["**/dapp/src/app/api/frame/**"],
"linter": {
"rules": {
"correctness": {
"useJsxKeyInIterable": "off"
}
}
}
}
]
}
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"outputs": ["{projectRoot}/packages/contracts/coverage"]
},
"test": {
"inputs": ["default"],
"cache": true
},
"test:hardhat": {
Expand All @@ -56,6 +57,6 @@
"cache": true
}
},
"nxCloudAccessToken": "",
"nxCloudAccessToken": "MzgxYTJiOTEtNzE0ZC00MTAyLWEzYzItZmVjYTYxY2NhMDNifHJlYWQ=",
"defaultBase": "develop"
}
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,10 @@
"packageManager": "pnpm@9.1.1",
"engines": {
"node": ">=20.12.2"
},
"pnpm": {
"patchedDependencies": {
"next@14.2.4": "patches/next@14.2.4.patch"
}
}
}
19 changes: 19 additions & 0 deletions packages/dapp/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,22 @@ NEXT_PUBLIC_APP_STAGING_URL=

# Development URL
NEXT_PUBLIC_APP_DEVELOPMENT_URL=

# Farcaster frame env variables
# Secret to encrypt the frame state
FROG_SECRET=

# Farcaster frame hub URL if not using pinata
HUB_URL=

# Chain ID to use in frame
CHAIN_ID=

# EES contract address
EES_CONTRACT_ADDRESS=

# RPC provider URL
RPC_PROVIDER_URL=

# Etherscan/Basescan URL (end with /tx/)
BASESCAN_URL=
2 changes: 1 addition & 1 deletion packages/dapp/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const config: CodegenConfig = {
config: {
documentMode: 'string',
},
schema: 'https://api.studio.thegraph.com/query/77003/ees-base/v0.0.3',
schema: 'https://api.studio.thegraph.com/query/77003/ees-base/v0.0.4',
preset: 'client',
plugins: [],
presetConfig: {
Expand Down
15 changes: 11 additions & 4 deletions packages/dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"version": "0.0.0",
"scripts": {
"dev": "infisical run --env=dev --path=/dapp -- next dev",
"dev:local": "next dev",
"export:secrets": "infisical export --path=/dapp > .env.local",
"build": "rimraf .next && next build",
"start": "next start",
"lint": "biome check .",
Expand All @@ -23,9 +25,11 @@
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-tooltip": "^1.1.2",
"@rainbow-me/rainbowkit": "^2.1.2",
"@tanstack/react-query": "5.40.0",
"@tanstack/react-query-devtools": "^5.40.0",
"@uidotdev/usehooks": "^2.4.1",
"@vercel/analytics": "^1.3.1",
"@vercel/speed-insights": "^1.0.11",
"@wagmi/core": "^2.10.5",
Expand All @@ -34,20 +38,23 @@
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"dayjs": "^1.11.11",
"framer-motion": "^11.2.10",
"frog": "^0.12.1",
"framer-motion": "11.2.12",
"jsonwebtoken": "^9.0.2",
"lucide-react": "^0.381.0",
"next": "14.3.0-canary.87",
"next": "14.2.4",
"next-themes": "^0.3.0",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-force-graph": "^1.44.4",
"react-inlinesvg": "^4.1.3",
"react-share": "^5.1.0",
"react-use": "^17.5.0",
"sharp": "^0.33.4",
"sonner": "^1.4.41",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.1",
"viem": "^2.13.2",
"wagmi": "^2.9.8",
"zustand": "^4.5.2"
Expand Down
Binary file added packages/dapp/public/frame/ees_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dapp/public/frame/endorse_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dapp/public/frame/frame_bg1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dapp/public/frame/frame_bg2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dapp/public/frame/intro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dapp/public/frame/legend_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions packages/dapp/src/__generated__/eas/gql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion packages/dapp/src/__generated__/eas/graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions packages/dapp/src/__generated__/ees/gql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 61 additions & 1 deletion packages/dapp/src/__generated__/ees/graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import type { NextRequest } from 'next/server';
import { validateOrGetDefaultNetwork } from '@/utils';
import { getEndorsementsAndDonationsServer } from '@/lib/ees';

export const revalidate = 15; // revalidate at most every 15 seconds

export async function GET(request: NextRequest) {
try {
// Get url parameters
const searchParams = request.nextUrl.searchParams;

const network = searchParams.get('network') as string;

if (!network) {
return Response.json(
{ error: 'Missing network parameter' },
{ status: 400 }
);
}

const chainId = validateOrGetDefaultNetwork(network);

const data = await getEndorsementsAndDonationsServer(chainId);

return Response.json(data);
} catch (error) {
console.error(error);
return Response.json(
{ error: 'Failed to fetch recent data.' },
{ status: 500 }
);
}
}
Loading

0 comments on commit 8158319

Please sign in to comment.