Skip to content

Commit 8cde86c

Browse files
committed
merge conflict
2 parents 4d58b95 + 8753537 commit 8cde86c

153 files changed

Lines changed: 14615 additions & 5201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

atproto-slurper/slurper/server.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ app.post(
654654
rkey
655655
);
656656

657+
console.log("Result of createEventBluesky:", result);
658+
657659
const { error: contactError } = await supabase
658660
.from("atproto_records_contacts")
659661
.upsert(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.39.2
1+
v2.45.5
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-- Change primary key from id to email for devconnect_app_user table
2+
3+
-- First, drop the existing primary key constraint on id
4+
ALTER TABLE devconnect_app_user DROP CONSTRAINT devconnect_app_user_pkey;
5+
6+
-- Add primary key constraint on email
7+
ALTER TABLE devconnect_app_user ADD PRIMARY KEY (email);
8+
9+
-- Drop the id column since it's no longer needed
10+
ALTER TABLE devconnect_app_user DROP COLUMN id;
11+
12+
-- Drop the now-redundant email index since primary keys automatically create an index
13+
DROP INDEX IF EXISTS idx_devconnect_app_user_email;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DROP INDEX IF EXISTS idx_atproto_records_needs_review;
2+
DROP INDEX IF EXISTS idx_atproto_records_calendar;

devconnect-app/package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"format": "prettier --write .",
1111
"format:check": "prettier --check .",
1212
"typecheck": "tsc --noEmit",
13-
"fetch-data": "npx tsx scripts/fetch-data.ts",
14-
"fetch-quests": "npx tsx scripts/fetch-quests.ts"
13+
"d": "npx tsx scripts/fetch-data.ts",
14+
"q": "npx tsx scripts/fetch-quests.ts"
1515
},
1616
"dependencies": {
1717
"@base-org/account": "^2.2.0",
@@ -24,9 +24,9 @@
2424
"@farcaster/mini-app-solana": "^1.0.7",
2525
"@farcaster/miniapp-sdk": "^0.1.8",
2626
"@farcaster/miniapp-wagmi-connector": "^1.0.0",
27-
"@getpara/graz": "2.0.0-alpha.12",
28-
"@getpara/react-sdk": "2.0.0-alpha.47",
29-
"@getpara/wagmi-v2-integration": "2.0.0-alpha.47",
27+
"@getpara/graz": "2.0.0-alpha.19",
28+
"@getpara/react-sdk": "2.0.0-alpha.63",
29+
"@getpara/wagmi-v2-integration": "2.0.0-alpha.63",
3030
"@leapwallet/cosmos-social-login-capsule-provider": "^0.0.44",
3131
"@netlify/plugin-nextjs": "^5.11.6",
3232
"@notionhq/client": "^4.0.1",
@@ -44,6 +44,7 @@
4444
"@solana/wallet-adapter-react": "^0.15.39",
4545
"@solana/wallet-adapter-walletconnect": "^0.1.21",
4646
"@solana/web3.js": "^1.98.4",
47+
"@supabase/ssr": "^0.7.0",
4748
"@supabase/supabase-js": "^2.52.0",
4849
"@tanstack/react-query": "^5.83.0",
4950
"@types/moment": "^2.13.0",
@@ -60,6 +61,7 @@
6061
"next": "15.4.4",
6162
"next-themes": "^0.4.6",
6263
"panzoom": "^9.4.3",
64+
"pino-pretty": "^13.1.1",
6365
"qrcode": "^1.5.4",
6466
"qrcode.react": "^4.2.0",
6567
"react": "^19.0.0",
@@ -71,8 +73,8 @@
7173
"starknet": "^7.6.4",
7274
"tailwind-merge": "^3.3.1",
7375
"usehooks-ts": "^3.1.1",
74-
"viem": "^2.36.0",
75-
"wagmi": "^2.16.8",
76+
"viem": "^2.37.11",
77+
"wagmi": "^2.17.5",
7678
"zustand": "^5.0.7"
7779
},
7880
"devDependencies": {
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
14.9 KB
Loading
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)