Chore/repo cleanup (#266)

Looking over this repo there are areas where I feel its a bit messy.

Trying to clean this up, @jakemackie how would you clean this up?

Author: Logannford

src/actions/roadmap/ai/generate.ts renamed to src/actions/ai/generate.ts

@@ -3,7 +3,7 @@ import { prisma } from '@/utils/prisma';
 import { generateDataForAi } from './get-question-data-for-gen';
 import { addUidsToResponse } from './utils/add-uids-to-response';
 import { addOrderToResponseQuestions } from './utils/add-order-to-response-questions';
-import { fetchRoadmapQuestions } from '../questions/fetch-roadmap-questiosn';
+import { fetchRoadmapQuestions } from '@/actions/roadmap/questions/fetch-roadmap-questions';
 import { generateRoadmapResponse } from './utils/generate-question';
 import { revalidateTag } from 'next/cache';
 

src/actions/roadmap/ai/get-question-data-for-gen.ts renamed to src/actions/ai/get-question-data-for-gen.ts

@@ -1,5 +1,5 @@
 'use server';
-import { userAuth } from '@/actions/utils/user-auth';
+import { userAuth } from '@/actions/questions/admin/utils/user-auth';
 import { prisma } from '@/utils/prisma';
 
 export const clearQuestionsForAdmin = async (uid: string) => {
@@ -13,8 +13,8 @@ export const clearQuestionsForAdmin = async (uid: string) => {
   // clear all questions that relate to the uid that was passed in
   await prisma.answers.deleteMany({
     where: {
-      questionUid: uid,
-    },
+      questionUid: uid
+    }
   });
 
   return { success: true };

src/actions/roadmap/ai/test.ts renamed to src/actions/ai/test.ts

@@ -1,7 +1,7 @@
 'use server';
 import { prisma } from '@/utils/prisma';
 import { revalidateTag } from 'next/cache';
-import { userAuth } from '@/actions/utils/user-auth';
+import { userAuth } from '@/actions/questions/admin/utils/user-auth';
 
 type GetQuestionsOpts = { from: number; to: number };
 
@@ -20,11 +20,11 @@ export const getQuestions = async (opts: GetQuestionsOpts) => {
       skip: from,
       take: to,
       orderBy: {
-        questionDate: 'asc',
+        questionDate: 'asc'
       },
       include: {
-        answers: true,
-      },
+        answers: true
+      }
     });
 
     // revalidate the 'questions' tag
@@ -37,7 +37,7 @@ export const getQuestions = async (opts: GetQuestionsOpts) => {
     const {
       today: todayQuestions,
       future: futureQuestions,
-      past: pastQuestions,
+      past: pastQuestions
     } = res.reduce(
       (acc, question) => {
         const questionDate = new Date(question.questionDate);
@@ -60,7 +60,7 @@ export const getQuestions = async (opts: GetQuestionsOpts) => {
     return {
       today: todayQuestions,
       future: futureQuestions,
-      past: pastQuestions,
+      past: pastQuestions
     };
   } catch (error) {
     console.error('Failed to get questions:', error);

src/actions/roadmap/ai/utils/add-order-to-response-questions.ts renamed to src/actions/ai/utils/add-order-to-response-questions.ts

@@ -3,11 +3,11 @@
 import { prisma } from '@/utils/prisma';
 import {
   extractTagIds,
-  getTagsFromQuestion,
-} from '../utils/get-tags-from-question';
+  getTagsFromQuestion
+} from './utils/get-tags-from-question';
 import type {
   QuestionWithoutAnswers,
-  QuestionWithTags,
+  QuestionWithTags
 } from '@/types/Questions';
 import { cache } from 'react';
 
@@ -31,15 +31,15 @@ export const getSuggestions = cache(
             include: {
               tags: {
                 include: {
-                  tag: true,
-                },
-              },
-            },
-          },
+                  tag: true
+                }
+              }
+            }
+          }
         },
         orderBy: {
-          createdAt: 'desc',
-        },
+          createdAt: 'desc'
+        }
       });
 
       if (!userAnswers.length) {
@@ -87,28 +87,28 @@ export const getSuggestions = cache(
                 some: {
                   tag: {
                     uid: {
-                      in: tagIds,
-                    },
-                  },
-                },
-              },
+                      in: tagIds
+                    }
+                  }
+                }
+              }
             },
             {
-              dailyQuestion: true,
-            },
-          ],
+              dailyQuestion: true
+            }
+          ]
         },
         include: {
           tags: {
             include: {
-              tag: true,
-            },
-          },
+              tag: true
+            }
+          }
         },
         orderBy: {
-          createdAt: 'desc',
+          createdAt: 'desc'
         },
-        take: limit,
+        take: limit
       });
 
       // console.log('Found suggestions:', suggestions.length);

src/actions/roadmap/ai/utils/add-uids-to-response.ts renamed to src/actions/ai/utils/add-uids-to-response.ts

@@ -1,7 +1,7 @@
 'use server';
 import { Question } from '@/types/Questions';
 import { prisma } from '@/utils/prisma';
-import { getTagsFromQuestion } from '../utils/get-tags-from-question';
+import { getTagsFromQuestion } from './utils/get-tags-from-question';
 
 export const getTodaysQuestion = async (): Promise<Question | null> => {
   try {
@@ -11,16 +11,16 @@ export const getTodaysQuestion = async (): Promise<Question | null> => {
     // Find a question where `questionDate` is today
     const res = await prisma.questions.findFirst({
       where: {
-        questionDate: todayStart,
+        questionDate: todayStart
       },
       include: {
         answers: true,
         tags: {
           include: {
-            tag: true,
-          },
-        },
-      },
+            tag: true
+          }
+        }
+      }
     });
 
     if (!res) {

src/actions/roadmap/ai/utils/generate-question.ts renamed to src/actions/ai/utils/generate-question.ts

@@ -1,7 +1,7 @@
 'use server';
 import { Question } from '@/types/Questions';
 import { prisma } from '@/utils/prisma';
-import { getTagsFromQuestion } from '../utils/get-tags-from-question';
+import { getTagsFromQuestion } from './utils/get-tags-from-question';
 
 export const getYesterdaysQuestion = async (): Promise<Question | null> => {
   try {
@@ -14,20 +14,20 @@ export const getYesterdaysQuestion = async (): Promise<Question | null> => {
     // Find a question where `questionDate` is yesterday
     const res = await prisma.questions.findFirst({
       where: {
-        questionDate: yesterdayISOString,
+        questionDate: yesterdayISOString
       },
       include: {
         answers: true,
         tags: {
           include: {
-            tag: true,
-          },
-        },
-      },
+            tag: true
+          }
+        }
+      }
     });
 
     console.log({
-      res,
+      res
     });
 
     if (!res) {

src/actions/questions/admin/clear.ts

@@ -1,6 +1,6 @@
 'use server';
 import { prisma } from '@/utils/prisma';
-import { getTagsFromQuestion } from '../utils/get-tags-from-question';
+import { getTagsFromQuestion } from './utils/get-tags-from-question';
 import { Question } from '@/types/Questions';
 
 export const getQuestion = async (uid: string) => {
@@ -12,16 +12,16 @@ export const getQuestion = async (uid: string) => {
   try {
     const res = await prisma.questions.findUnique({
       where: {
-        uid,
+        uid
       },
       include: {
         answers: true,
         tags: {
           include: {
-            tag: true,
-          },
-        },
-      },
+            tag: true
+          }
+        }
+      }
     });
 
     if (!res) {

src/actions/questions/admin/list.ts

@@ -2,9 +2,9 @@
 import { prisma } from '@/utils/prisma';
 import type {
   QuestionDifficulty,
-  QuestionWithoutAnswers,
+  QuestionWithoutAnswers
 } from '@/types/Questions';
-import { getTagsFromQuestion } from '../utils/get-tags-from-question';
+import { getTagsFromQuestion } from './utils/get-tags-from-question';
 import { QuestionFilters } from '@/types/Filters';
 
 type ListQuestionsReturnType = {
@@ -35,27 +35,26 @@ export const listQuestions = async (
       AND: [
         filters?.difficulty
           ? {
-              difficulty:
-                filters.difficulty.toUpperCase() as QuestionDifficulty,
+              difficulty: filters.difficulty.toUpperCase() as QuestionDifficulty
             }
           : {},
         filters?.completed === true
           ? {
               userAnswers: {
                 some: {
                   // Check if there are answers by the current user
-                  userUid,
-                },
-              },
+                  userUid
+                }
+              }
             }
           : filters?.completed === false
           ? {
               userAnswers: {
                 none: {
                   // Exclude questions answered by the current user
-                  userUid,
-                },
-              },
+                  userUid
+                }
+              }
             }
           : {},
         filters?.tags?.length
@@ -64,32 +63,32 @@ export const listQuestions = async (
                 some: {
                   tag: {
                     name: {
-                      in: filters.tags,
-                    },
-                  },
-                },
-              },
+                      in: filters.tags
+                    }
+                  }
+                }
+              }
             }
-          : {},
-      ],
-    },
+          : {}
+      ]
+    }
   };
 
   // fetch the paginated questions
   const questions = await prisma.questions.findMany({
     skip,
     take: pageSize,
     orderBy: {
-      questionDate: filters?.ascending ? 'asc' : 'desc',
+      questionDate: filters?.ascending ? 'asc' : 'desc'
     },
     ...whereClause,
     include: {
       tags: {
         include: {
-          tag: true,
-        },
-      },
-    },
+          tag: true
+        }
+      }
+    }
   });
 
   // transform the questions to match the expected format
@@ -99,14 +98,14 @@ export const listQuestions = async (
 
   // fetch the total number of matching questions (without pagination)
   const total = await prisma.questions.count({
-    where: whereClause.where,
+    where: whereClause.where
   });
 
   return {
     questions: transformedQuestions,
     total,
     page,
     pageSize,
-    totalPages: Math.ceil(total / pageSize),
+    totalPages: Math.ceil(total / pageSize)
   };
 };

src/actions/utils/user-auth.ts renamed to src/actions/questions/admin/utils/user-auth.ts

@@ -1,6 +1,6 @@
-import BackToDashboard from '@/components/global/back-to-dashboard';
-import CurrentStreak from '@/components/global/current-streak';
-import Feedback from '@/components/global/feedback-button';
+import BackToDashboard from '@/components/ui/back-to-dashboard';
+import CurrentStreak from '@/components/ui/current-streak';
+import Feedback from '@/components/ui/feedback-button';
 import { Separator } from '@/components/ui/separator';
 
 export default function StatisticsLayout({

src/actions/questions/get-suggestions.ts

@@ -1,14 +1,14 @@
 import { getQuestion } from '@/actions/questions/get';
 import { getRandomQuestion } from '@/actions/questions/get-next-question';
-import BackToDashboard from '@/components/global/back-to-dashboard';
-import CurrentStreak from '@/components/global/current-streak';
+import BackToDashboard from '@/components/ui/back-to-dashboard';
+import CurrentStreak from '@/components/ui/current-streak';
 import QuestionNavigation from '@/components/global/navigation/question-navigation';
 import { Separator } from '@/components/ui/separator';
 import { useUserServer } from '@/hooks/useUserServer';
 
 export default async function QuestionUidLayout({
   children,
-  params,
+  params
 }: Readonly<{ children: React.ReactNode; params: { uid: string } }>) {
   const { uid } = params;
 
@@ -18,7 +18,7 @@ export default async function QuestionUidLayout({
 
   const nextQuestion = await getRandomQuestion({
     currentQuestionId: uid,
-    userUid: user.uid,
+    userUid: user.uid
   });
 
   return (