Merge pull request #228 from Markkos89/feat/rainbow-siwe

Feat: RainbowKit connect wallet button and more

Author: Markkos89

.env.example

@@ -11,7 +11,7 @@
 
 # Prisma
 # https://www.prisma.io/docs/reference/database-reference/connection-urls#env
-DATABASE_URL="file:./db.sqlite" # unnused now for postgres
+# DATABASE_URL="file:./db.sqlite" # unnused now for postgres
 
 # Next Auth
 # You can generate a new secret on the command line with:
@@ -20,10 +20,16 @@ DATABASE_URL="file:./db.sqlite" # unnused now for postgres
 # NEXTAUTH_SECRET=""
 NEXTAUTH_URL="http://localhost:3000"
 
+POSTGRES_HOST=127.0.0.1
+POSTGRES_PORT=6500
+POSTGRES_USER=admin
+POSTGRES_PASSWORD=password123
+POSTGRES_DATABASE=nextauth_prisma
+
+DATABASE_URL=postgresql://admin:password123@localhost:6500/nextauth_prisma?schema=public
+
 POSTGRES_URL=
-POSTGRES_PRISMA_URL=
-POSTGRES_URL_NON_POOLING=
-POSTGRES_USER=
-POSTGRES_HOST=
-POSTGRES_PASSWORD=
-POSTGRES_DATABASE=
+POSTGRES_PRISMA_URL=postgresql://admin:password123@localhost:6500/nextauth_prisma?schema=public
+POSTGRES_URL_NON_POOLING=postgresql://admin:password123@localhost:6500/nextauth_prisma?schema=public
+
+NEXT_PUBLIC_WALLET_CONNECT_ID=

.eslintrc.cjs

@@ -29,6 +29,10 @@ const config = {
       },
     ],
     "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
+    "@typescript-eslint/no-unsafe-assignment": "off", // or "off" if you want to disable it
+    "@typescript-eslint/no-unsafe-call": "off", // or "off" if you want to disable it
+    "@typescript-eslint/no-unsafe-return": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
   },
 };
 

README.md

@@ -81,7 +81,7 @@ run through the live site and make sure the code is performing as expected.
 
 **Prerequisites:**
 
-    node --version 16.x
+    node --version 18.x
 
 Refer to the `node` and `npm` installation with `nvm` guide in Lesson 2. A link
 to the guide can be found

docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3"
+services:
+  postgres:
+    image: postgres:latest
+    container_name: postgres
+    ports:
+      - "6500:5432"
+    volumes:
+      - progresDB:/var/lib/postgresql/data
+    env_file:
+      - ./.env
+volumes:
+  progresDB:

src/pages/index-old.tsx renamed to index-original-example.txt

@@ -42,6 +42,10 @@ const config = {
   },
   // Append the default value with md extensions
   pageExtensions: ["ts", "tsx", "js", "jsx", "md", "mdx"],
+  webpack: (config) => {
+    config.resolve.fallback = { fs: false, net: false, tls: false };
+    return config;
+  },
 };
 
 export default withMDX(config);

next.config.mjs

@@ -7,7 +7,11 @@
     "dev": "next dev",
     "postinstall": "prisma generate",
     "lint": "next lint",
-    "start": "next start"
+    "start": "next start",
+    "prisma:seed": "npx prisma db seed"
+  },
+  "prisma": {
+    "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
   },
   "dependencies": {
     "@chakra-ui/icons": "^2.0.19",
@@ -16,13 +20,17 @@
     "@emotion/styled": "^11.11.0",
     "@fontsource/inter": "^5.0.3",
     "@next-auth/prisma-adapter": "^1.0.7",
-    "@prisma/client": "^5.0.0",
+    "@prisma/client": "^5.1.1",
+    "@rainbow-me/rainbowkit": "^1.0.8",
+    "@rainbow-me/rainbowkit-siwe-next-auth": "^0.3.0",
     "@tanstack/react-query": "^4.29.19",
+    "@tanstack/react-query-devtools": "^4.32.5",
     "@trpc/client": "^10.33.0",
     "@trpc/next": "^10.33.0",
     "@trpc/react-query": "^10.33.0",
     "@trpc/server": "^10.33.0",
     "@vercel/postgres": "^0.4.0",
+    "bcryptjs": "^2.4.3",
     "ethers": "^6",
     "framer-motion": "^10.12.17",
     "next": "^13.4.7",
@@ -42,6 +50,7 @@
     "@mdx-js/loader": "^2.3.0",
     "@mdx-js/react": "^2.3.0",
     "@next/mdx": "^13.4.8",
+    "@types/bcryptjs": "^2.4.2",
     "@types/eslint": "^8.40.2",
     "@types/mdx": "^2.0.5",
     "@types/node": "^20.3.2",
@@ -59,11 +68,12 @@
     "lint-staged": "^13.2.3",
     "postcss": "^8.4.24",
     "prettier": "^2.8.8",
-    "prettier-plugin-tailwindcss": "^0.3.0",
-    "prisma": "^5.0.0",
+    "prettier-plugin-tailwindcss": "0.2.1",
+    "prisma": "^5.1.1",
     "react-syntax-highlighter": "^15.5.0",
     "remark-frontmatter": "^4.0.1",
     "tailwindcss": "^3.3.2",
+    "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },
   "ct3aMetadata": {

package.json

@@ -1,15 +1,3 @@
--- CreateTable
-CREATE TABLE "Todo" (
-    "id" TEXT NOT NULL,
-    "task" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
-    "completed" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "Todo_pkey" PRIMARY KEY ("id")
-);
-
 -- CreateTable
 CREATE TABLE "Account" (
     "id" TEXT NOT NULL,
@@ -31,6 +19,7 @@ CREATE TABLE "Account" (
 -- CreateTable
 CREATE TABLE "User" (
     "id" TEXT NOT NULL,
+    "password" TEXT,
     "name" TEXT,
     "address" TEXT,
     "email" TEXT,
@@ -41,6 +30,26 @@ CREATE TABLE "User" (
     CONSTRAINT "User_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "CompletedQuizzes" (
+    "id" TEXT NOT NULL,
+    "lesson" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "completed" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "CompletedQuizzes_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Lessons" (
+    "id" TEXT NOT NULL,
+    "quizFileName" TEXT NOT NULL,
+
+    CONSTRAINT "Lessons_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateIndex
 CREATE UNIQUE INDEX "Account_provider_providerAccountId_key" ON "Account"("provider", "providerAccountId");
 
@@ -50,9 +59,12 @@ CREATE UNIQUE INDEX "User_address_key" ON "User"("address");
 -- CreateIndex
 CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
 
--- AddForeignKey
-ALTER TABLE "Todo" ADD CONSTRAINT "Todo_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+-- CreateIndex
+CREATE UNIQUE INDEX "Lessons_quizFileName_key" ON "Lessons"("quizFileName");
 
 -- AddForeignKey
 ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "CompletedQuizzes" ADD CONSTRAINT "CompletedQuizzes_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+

prisma/migrations/0_init/migration.sql

@@ -9,16 +9,6 @@ datasource db {
   shadowDatabaseUrl = env("POSTGRES_URL_NON_POOLING")
 }
 
-model Todo {
-  id        String   @id @default(cuid())
-  task      String
-  userId    String
-  completed Boolean  @default(false)
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
-}
-
 model Account {
   id                String  @id @default(cuid())
   userId            String
@@ -46,7 +36,6 @@ model User {
   image            String?
   createdAt        DateTime           @default(now())
   accounts         Account[]
-  Todo             Todo[]
   CompletedQuizzes CompletedQuizzes[]
 }
 
@@ -59,3 +48,9 @@ model CompletedQuizzes {
   updatedAt DateTime @updatedAt
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
+
+model Lessons {
+  id        String   @id @default(cuid())
+  lessonNumber Int   @unique @default(autoincrement())
+  quizFileName      String
+}

prisma/schema.prisma

@@ -0,0 +1,33 @@
+import { PrismaClient } from "@prisma/client";
+// import { hash } from "bcryptjs";
+
+const prisma = new PrismaClient();
+
+async function main() {
+  // const password = await hash("password123", 12);
+  // const user = await prisma.user.upsert({
+  //   where: { email: "admin@admin.com" },
+  //   update: {},
+  //   create: {
+  //     email: "[email protected]",
+  //     name: "Admin",
+  //     password,
+  //   },
+  // });
+  // console.log({ user });
+
+  const lesson1 = await prisma.lessons.create({
+    data: {
+      quizFileName: "quiz-lesson-1.json",
+    },
+  });
+  console.log({ lesson1 });
+}
+
+main()
+  .then(() => prisma.$disconnect())
+  .catch(async (e) => {
+    console.error(e);
+    await prisma.$disconnect();
+    process.exit(1);
+  });