Merge branch 'main' into feature/stats-page

Author: Logannford

README.md

@@ -24,16 +24,19 @@ We love to be transparent with our users, so below are the next features we have
 - **Social**: Profiles, friends/coworkers
 - **Statistics**: A more in-depth statistics dashboard, giving you a greater insight on your current ability.
 - **Multi-language support**: Currently we only support JavaScript. However, we are looking into: Python, Typescript, and GoLang for our first wave of other languages to support.
+- **Searching**: Implement elastic search to easily find questions that you want to answer🚀
 
 ## 🛠 Tech Stack
 
-- **Frontend**: React + Next.js
+- **Frameworks**: React + Next.js (app router)
 - **Styling**: Tailwind CSS
 - **UI Components**: Shadcn/UI, aceternity, recharts
 - **Backend**: Supabase
 - **Payments**: Stripe
 - **Hosting**: Vercel
 - **ORM**: Prisma
+- **Data fetching**: Tanstack Query
+- **Short links**: Dub
 
 ### Installation
 

package-lock.json

@@ -19,6 +19,7 @@
     "@number-flow/react": "^0.4.2",
     "@prisma/client": "^5.19.1",
     "@radix-ui/react-accordion": "^1.2.1",
+    "@radix-ui/react-alert-dialog": "^1.1.2",
     "@radix-ui/react-avatar": "^1.1.1",
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-collapsible": "^1.1.1",
@@ -59,7 +60,7 @@
     "mini-svg-data-uri": "^1.4.4",
     "motion": "^11.12.0",
     "nanoid": "^5.0.8",
-    "next": "14.2.9",
+    "next": "14.2.10",
     "next-themes": "^0.3.0",
     "openai": "^4.73.0",
     "posthog-js": "^1.188.0",

package.json

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "DemoAnswers" (
+    "uid" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "questionUid" TEXT NOT NULL,
+    "correctAnswer" BOOLEAN NOT NULL DEFAULT false,
+    "userAnswer" TEXT NOT NULL,
+    "timeTaken" INTEGER,
+
+    CONSTRAINT "DemoAnswers_pkey" PRIMARY KEY ("uid")
+);
+
+-- AddForeignKey
+ALTER TABLE "DemoAnswers" ADD CONSTRAINT "DemoAnswers_questionUid_fkey" FOREIGN KEY ("questionUid") REFERENCES "Questions"("uid") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20241209191737_adds_demo_answer_model/migration.sql

@@ -111,6 +111,8 @@ model Questions {
   tags QuestionTags[]
 
   difficulty QuestionDifficulty @default(EASY)
+
+  DemoAnswers DemoAnswers[]
 }
 
 model Tag {
@@ -156,6 +158,17 @@ model Answers {
   timeTaken     Int?
 }
 
+model DemoAnswers {
+  uid      String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now())
+  questionUid String
+  question    Questions @relation(fields: [questionUid], references: [uid], onDelete: Cascade, onUpdate: Cascade)
+  correctAnswer Boolean @default(false)
+  userAnswer   String
+  timeTaken    Int?
+}
+
 model Streaks {
   uid       String   @id @default(cuid())
   createdAt DateTime @default(now())

prisma/schema.prisma

@@ -0,0 +1,41 @@
+'use server';
+import { prisma } from '@/utils/prisma';
+
+export const answerDailyQuestionDemo = async (opts: {
+  questionUid: string;
+  userAnswerUid: string;
+  timeTaken: number;
+}) => {
+  const { questionUid, userAnswerUid, timeTaken } = opts;
+
+  // get the question
+  const question = await prisma.questions.findUnique({
+    where: {
+      uid: questionUid
+    }
+  });
+
+  // if the question does not exist, return null
+  if (!question) {
+    return null;
+  }
+
+  // check if the user answer is correct
+  const isCorrect = question.correctAnswer === userAnswerUid;
+
+  // add the answer to the database
+  await prisma.demoAnswers.create({
+    data: {
+      questionUid,
+      userAnswer: userAnswerUid,
+      correctAnswer: isCorrect,
+      timeTaken
+    }
+  });
+
+  // if the answer is correct, return true
+  if (isCorrect) return true;
+
+  // if the answer is incorrect, return false
+  return false;
+};