Skip to content

Commit 679315b

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-wallet-flow-and-glass-morphism
2 parents 9dc4959 + 4f20b7f commit 679315b

File tree

29 files changed

+1325
-291
lines changed

29 files changed

+1325
-291
lines changed

package-lock.json

Lines changed: 184 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,18 @@
5454
"busboy": "^1.6.0",
5555
"class-variance-authority": "^0.7.0",
5656
"clsx": "^2.1.1",
57+
"cors": "^2.8.5",
5758
"dexie": "^4.0.11",
5859
"formidable": "^3.5.2",
5960
"framer-motion": "^11.11.9",
6061
"geist": "^1.3.0",
6162
"idb-keyval": "^6.2.1",
6263
"jsonld": "^8.3.3",
64+
"jsonwebtoken": "^9.0.2",
6365
"lucide-react": "^0.439.0",
6466
"next": "^14.2.4",
6567
"next-auth": "^4.24.7",
68+
"papaparse": "^5.5.3",
6669
"react": "^18.3.1",
6770
"react-dom": "^18.3.1",
6871
"react-dropzone": "^14.3.5",
@@ -81,10 +84,13 @@
8184
},
8285
"devDependencies": {
8386
"@types/busboy": "^1.5.4",
87+
"@types/cors": "^2.8.18",
8488
"@types/eslint": "^8.56.10",
8589
"@types/formidable": "^3.4.5",
8690
"@types/jsonld": "^1.5.15",
91+
"@types/jsonwebtoken": "^9.0.9",
8792
"@types/node": "^20.14.10",
93+
"@types/papaparse": "^5.3.16",
8894
"@types/react": "^18.3.3",
8995
"@types/react-dom": "^18.3.0",
9096
"@types/swagger-jsdoc": "^6.0.4",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- CreateTable
2+
CREATE TABLE "Nonce" (
3+
"id" TEXT NOT NULL,
4+
"address" TEXT NOT NULL,
5+
"value" TEXT NOT NULL,
6+
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
7+
8+
CONSTRAINT "Nonce_pkey" PRIMARY KEY ("id")
9+
);
10+
11+
-- CreateIndex
12+
CREATE UNIQUE INDEX "Nonce_address_key" ON "Nonce"("address");
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- AlterTable
2+
ALTER TABLE "Signable" ADD COLUMN "callbackUrl" TEXT,
3+
ADD COLUMN "remoteOrigin" TEXT;

prisma/schema.prisma

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ model Signable {
6060
state Int
6161
createdAt DateTime @default(now())
6262
updatedAt DateTime @updatedAt
63+
callbackUrl String?
64+
remoteOrigin String?
6365
}
6466

6567
model NewWallet {
@@ -72,3 +74,10 @@ model NewWallet {
7274
numRequiredSigners Int?
7375
ownerAddress String
7476
}
77+
78+
model Nonce {
79+
id String @id @default(cuid())
80+
address String @unique
81+
value String
82+
createdAt DateTime @default(now())
83+
}

src/components/SessionProvider.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"use Client"
2+
import { SessionProvider } from "next-auth/react"
3+
export default SessionProvider;

src/components/common/overall-layout/layout.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import useUser from "@/hooks/useUser";
99
import { useUserStore } from "@/lib/zustand/user";
1010
import useAppWallet from "@/hooks/useAppWallet";
1111

12+
import SessionProvider from "@/components/SessionProvider"
13+
import { getServerSession } from "next-auth";
14+
1215
import MenuWallets from "@/components/common/overall-layout/menus/wallets";
1316
import MenuWallet from "@/components/common/overall-layout/menus/multisig-wallet";
1417
import WalletDropDown from "@/components/common/overall-layout/wallet-drop-down";

0 commit comments

Comments
 (0)