Merge pull request #14 from thedemonsid/update/forms

Update/forms Merge all three forms into one big form

prisma/migrations/20240712121739_forms_changed_to_single/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `filledForms` on the `users` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "users" DROP COLUMN "filledForms",
+ADD COLUMN     "flagfilled" BOOLEAN DEFAULT false;

prisma/schema.prisma

@@ -35,7 +35,7 @@ model User {
   dietPlans        DietPlan[]
   aiWorkout        String? // AI generated workout but temporary need to change
   aiDiet           String? // AI generated diet but temporary need to change 
-  filledForms      Json?           @default("{\"onboarding\": false, \"workout\": false, \"diet\": false}")
+  flagfilled       Boolean?        @default(false)
 
   @@map(name: "users")
 }

src/app/Diet/your-meal/page.jsx

@@ -18,13 +18,13 @@ function PersonalDietPage() {
   useEffect(() => {
     // Fetching meal data by user ID
     if (session) {
-      if (session?.user?.filledForms.diet) {
-        fetchGeminiResponse(session?.user?.id,"meal").then((data) => {
+      if (session?.user?.flagfilled) {
+        fetchGeminiResponse(session?.user?.id, "meal").then((data) => {
           //console.log(data);
           setContent(data); // Setting the fetched data to state
         });
       } else {
-        redirect("/Diet/diet-info-form");
+        redirect("/OnBoardForm");
       }
     }
   }, [session?.user?.id]);

src/app/Gym/GymPokedex/page.jsx

@@ -0,0 +1,12 @@
+import MealPokedex from "@/components/MealPokedexComponent";
+import React from "react";
+
+const page = () => {
+  return (
+    <div>
+      <MealPokedex></MealPokedex>
+    </div>
+  );
+};
+
+export default page;

src/app/Gym/your-workout/page.jsx

@@ -19,13 +19,13 @@ function PersonalWorkoutPage() {
   useEffect(() => {
     // Fetching Exercise data by user ID
     if (session) {
-      if (session?.user?.filledForms.workout) {
-        fetchGeminiResponse(session?.user?.id,"exercise").then((data) => {
+      if (session?.user?.flagfilled) {
+        fetchGeminiResponse(session?.user?.id, "exercise").then((data) => {
           //console.log(data);
           setContent(data); // Setting the fetched data to state
         });
       } else {
-        redirect("/Gym/workout-info-form");
+        redirect("/OnBoardForm");
       }
     }
   }, [session?.user?.id]);

src/app/OnBoardForm/page.jsx

@@ -1,10 +1,10 @@
-import GymQuestionnaireCarousel from "@/components/forms/OnboardForm";
+import AllInOneForm from "@/components/forms/AllInOneForm";
 import React from "react";
 
 const page = () => {
   return (
     <div>
-      <GymQuestionnaireCarousel></GymQuestionnaireCarousel>
+      <AllInOneForm></AllInOneForm>
     </div>
   );
 };

src/app/api/auth/[...nextauth]/options.js

@@ -47,7 +47,7 @@ export const options = {
         });
         if (sessionUser) {
           session.user.id = sessionUser.id;
-          session.user.filledForms = sessionUser.filledForms;
+          session.user.flagfilled = sessionUser.flagfilled;
         }
       }
       return session;

src/components/forms/DietInfoForm.jsx → src/components/forms/AllInOneForm.jsx

@@ -12,66 +12,36 @@ import {
 import { Button } from "@/components/ui/button";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import UpdateUser from "@/utils/updateUser";
-
-const questions = [
-  {
-    id: "fitnessGoal",
-    question: "What is your primary fitness goal?",
-    type: "select",
-    options: [
-      "Weight Loss",
-      "Weight Gain",
-      "Maintain Weight",
-      "Improve Health",
-    ],
-    description: "Choose the primary goal for your fitness journey",
-  },
-  {
-    id: "dietPreference",
-    question: "Do you have any dietary Preferences?",
-    type: "select",
-    options: [
-      "None",
-      "Vegetarian",
-      "Vegan",
-      "Gluten-free",
-      "Lactose-free",
-      "Other",
-    ],
-    description: "Select your dietary restrictions if any, or select 'None'",
-  },
-  {
-    id: "region",
-    question: "What is your preferred cuisine?",
-    type: "select",
-    options: [
-      "INDIAN",
-      "AMERICAN",
-      "CHINESE",
-      "ITALIAN",
-      "MEXICAN",
-      "CONTINENTAL",
-      "OTHER",
-    ],
-  },
-];
+import questions from "@/lib/FormQuestions";
 import { useSession } from "next-auth/react";
 import FitnessLoader from "@/app/loading";
-const DietQuestionnaireCarousel = () => {
+const AllInOneForm = () => {
   const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
   const router = useRouter();
   const { data: session } = useSession();
   useEffect(() => {
     if (session) {
-      if (session?.user?.filledForms.diet) {
-        router.push("/Gym/workout-info-form");
+      if (session?.user?.flagfilled) {
+        router.push("/Dashboard");
       }
     }
   }, [session]);
   const [answers, setAnswers] = useState({
+    name: "",
+    age: "",
+    height: "",
+    weight: "",
     fitnessGoal: "",
+    frequency: "",
+    healthConditions: "",
     dietPreference: "",
     region: "",
+    fitnessGoal: "",
+    frequency: "",
+    ExerciseType: "",
+    fitnessLevel: "",
+    intensityLevel: "",
+    equipmentAccess: "",
   });
 
   const handleInputChange = (id, value) => {
@@ -97,9 +67,9 @@ const DietQuestionnaireCarousel = () => {
       console.error("Failed to update user");
     }
     console.log("User updated successfully");
-    session.user.filledForms.diet = true;
+    session.user.flagfilled = true;
     // console.log(session);
-    router.push("/Diet/your-meal");
+    router.push("/Dashboard");
   };
 
   const currentQuestion = questions[currentQuestionIndex];
@@ -150,6 +120,7 @@ const DietQuestionnaireCarousel = () => {
               ) : (
                 <Input
                   type={currentQuestion.type}
+                  autoFocus
                   placeholder={
                     currentQuestion.placeholder || "Enter your answer"
                   }
@@ -203,4 +174,4 @@ const DietQuestionnaireCarousel = () => {
   );
 };
 
-export default DietQuestionnaireCarousel;
+export default AllInOneForm;