Organize directory structure. Continue address code analysis comments

RickCarlino · Feb 25, 2024 · 855526e · 855526e
1 parent e446968
commit 855526e
Show file tree

Hide file tree

Showing 54 changed files with 74 additions and 76 deletions.
diff --git a/server/auth-helpers.ts → koala/auth-helpers.ts b/server/auth-helpers.ts → koala/auth-helpers.ts
@@ -1,4 +1,4 @@
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 import { prismaClient } from "./prisma-client";
 
 type UserID = number | string | undefined | null;

diff --git a/components/card-table.tsx → koala/card-table.tsx b/components/card-table.tsx → koala/card-table.tsx
diff --git a/utils/clean-string.ts → koala/clean-string.ts b/utils/clean-string.ts → koala/clean-string.ts
diff --git a/utils/counter.ts → koala/counter.ts b/utils/counter.ts → koala/counter.ts
diff --git a/utils/create-cards-from-text.ts → koala/create-cards-from-text.ts b/utils/create-cards-from-text.ts → koala/create-cards-from-text.ts
diff --git a/utils/error-report.ts → koala/error-report.ts b/utils/error-report.ts → koala/error-report.ts
diff --git a/utils/fetch-lesson.ts → koala/fetch-lesson.ts b/utils/fetch-lesson.ts → koala/fetch-lesson.ts
@@ -4,7 +4,7 @@ import { existsSync, mkdir, readFileSync, writeFileSync } from "fs";
 import path from "path";
 import { draw, map, template } from "radash";
 import { errorReport } from "./error-report";
-import { prismaClient } from "@/server/prisma-client";
+import { prismaClient } from "@/koala/prisma-client";
 import { Card } from "@prisma/client";
 
 type LessonType = "listening" | "speaking";

diff --git a/utils/get-card-or-fail.ts → koala/get-card-or-fail.ts b/utils/get-card-or-fail.ts → koala/get-card-or-fail.ts
@@ -1,4 +1,4 @@
-import { prismaClient } from "@/server/prisma-client";
+import { prismaClient } from "@/koala/prisma-client";
 import { errorReport } from "./error-report";
 
 export async function getCardOrFail(id: number, userId?: string) {

diff --git a/utils/is-approved-user.ts → koala/is-approved-user.ts b/utils/is-approved-user.ts → koala/is-approved-user.ts
@@ -1,4 +1,4 @@
-import { prismaClient } from "@/server/prisma-client";
+import { prismaClient } from "@/koala/prisma-client";
 
 // Users that are allowed to use GPT-4, etc..
 export const superUsers = (process.env.AUTHORIZED_EMAILS || "")

diff --git a/components/microphone-permissions.tsx → koala/microphone-permissions.tsx b/components/microphone-permissions.tsx → koala/microphone-permissions.tsx
diff --git a/utils/openai.ts → koala/openai.ts b/utils/openai.ts → koala/openai.ts
diff --git a/components/play-audio.tsx → koala/play-audio.tsx b/components/play-audio.tsx → koala/play-audio.tsx
diff --git a/server/prisma-client.ts → koala/prisma-client.ts b/server/prisma-client.ts → koala/prisma-client.ts
diff --git a/server/quiz-evaluators/index.ts → koala/quiz-evaluators/index.ts b/server/quiz-evaluators/index.ts → koala/quiz-evaluators/index.ts
@@ -1,4 +1,4 @@
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 import { listening } from "./listening";
 import { speaking } from "./speaking";
 import { QuizEvaluator } from "./types";

diff --git a/server/quiz-evaluators/listening.ts → koala/quiz-evaluators/listening.ts b/server/quiz-evaluators/listening.ts → koala/quiz-evaluators/listening.ts
@@ -1,6 +1,6 @@
 import { template } from "radash";
 import { QuizEvaluator } from "./types";
-import { yesOrNo } from "@/utils/openai";
+import { yesOrNo } from "@/koala/openai";
 
 const PROMPT = `
 Sentence B: "{{term}}" ({{langCode}})

diff --git a/server/quiz-evaluators/speaking.ts → koala/quiz-evaluators/speaking.ts b/server/quiz-evaluators/speaking.ts → koala/quiz-evaluators/speaking.ts
@@ -1,4 +1,4 @@
-import { YesOrNo, yesOrNo } from "@/utils/openai";
+import { YesOrNo, yesOrNo } from "@/koala/openai";
 import { QuizEvaluator } from "./types";
 import { template } from "radash";
 

diff --git a/server/quiz-evaluators/types.ts → koala/quiz-evaluators/types.ts b/server/quiz-evaluators/types.ts → koala/quiz-evaluators/types.ts
diff --git a/components/quiz-failure.tsx → koala/quiz-failure.tsx b/components/quiz-failure.tsx → koala/quiz-failure.tsx
diff --git a/components/record-button.tsx → koala/record-button.tsx b/components/record-button.tsx → koala/record-button.tsx
diff --git a/server/routers/bulk-create-cards.ts → koala/routers/bulk-create-cards.ts b/server/routers/bulk-create-cards.ts → koala/routers/bulk-create-cards.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 
 export const bulkCreateCards = procedure
   .input(

diff --git a/server/routers/delete-card.ts → koala/routers/delete-card.ts b/server/routers/delete-card.ts → koala/routers/delete-card.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings } from "../auth-helpers";
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 
 export const deleteCard = procedure
   .input(

diff --git a/server/routers/delete-flagged-card.ts → koala/routers/delete-flagged-card.ts b/server/routers/delete-flagged-card.ts → koala/routers/delete-flagged-card.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings } from "../auth-helpers";
 import { prismaClient } from "../prisma-client";
 

diff --git a/server/routers/edit-card.ts → koala/routers/edit-card.ts b/server/routers/edit-card.ts → koala/routers/edit-card.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings } from "../auth-helpers";
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 
 export const editCard = procedure
   .input(

diff --git a/server/routers/edit-user-settings.ts → koala/routers/edit-user-settings.ts b/server/routers/edit-user-settings.ts → koala/routers/edit-user-settings.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings } from "../auth-helpers";
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 
 export const editUserSettings = procedure
   .input(

diff --git a/server/routers/export-cards.ts → koala/routers/export-cards.ts b/server/routers/export-cards.ts → koala/routers/export-cards.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { BACKUP_SCHEMA } from "@/pages/cards";
 
 export const exportCards = procedure

diff --git a/server/routers/faucet.ts → koala/routers/faucet.ts b/server/routers/faucet.ts → koala/routers/faucet.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings } from "../auth-helpers";
 
 /** The `faucet` route is a mutation that returns a "Hello, world" string

diff --git a/server/routers/flag-card.ts → koala/routers/flag-card.ts b/server/routers/flag-card.ts → koala/routers/flag-card.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
-import { getCardOrFail } from "@/utils/get-card-or-fail";
+import { procedure } from "../trpc-procedure";
+import { getCardOrFail } from "@/koala/get-card-or-fail";
 
 export const flagCard = procedure
   .input(

diff --git a/server/routers/get-all-cards.ts → koala/routers/get-all-cards.ts b/server/routers/get-all-cards.ts → koala/routers/get-all-cards.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 
 export const getAllCards = procedure
   .input(z.object({}))

diff --git a/server/routers/get-next-quizzes.ts → koala/routers/get-next-quizzes.ts b/server/routers/get-next-quizzes.ts → koala/routers/get-next-quizzes.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
-import getLessons from "@/utils/fetch-lesson";
+import { procedure } from "../trpc-procedure";
+import getLessons from "@/koala/fetch-lesson";
 import { getUserSettings } from "../auth-helpers";
 import { prismaClient } from "../prisma-client";
 

diff --git a/server/routers/get-one-card.ts → koala/routers/get-one-card.ts b/server/routers/get-one-card.ts → koala/routers/get-one-card.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
-import { getCardOrFail } from "@/utils/get-card-or-fail";
+import { procedure } from "../trpc-procedure";
+import { getCardOrFail } from "@/koala/get-card-or-fail";
 
 export const getOneCard = procedure
   .input(

diff --git a/server/routers/get-user-settings.ts → koala/routers/get-user-settings.ts b/server/routers/get-user-settings.ts → koala/routers/get-user-settings.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { getUserSettings as gus } from "../auth-helpers";
 
 export const getUserSettings = procedure

diff --git a/server/routers/grade-quiz.ts → koala/routers/grade-quiz.ts b/server/routers/grade-quiz.ts → koala/routers/grade-quiz.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { prismaClient } from "../prisma-client";
 import { getQuizEvaluator } from "../quiz-evaluators";
-import { transcribeB64 } from "@/utils/transcribe";
+import { transcribeB64 } from "@/koala/transcribe";
 import { QuizEvaluatorOutput } from "../quiz-evaluators/types";
 import { Grade } from "femto-fsrs";
 import { calculateSchedulingData, setGrade } from "./import-cards";

diff --git a/server/routers/import-cards.ts → koala/routers/import-cards.ts b/server/routers/import-cards.ts → koala/routers/import-cards.ts
@@ -1,11 +1,11 @@
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { OLD_BACKUP_SCHEMA } from "@/pages/cards";
 import { Grade, createDeck } from "femto-fsrs";
 import { prismaClient } from "../prisma-client";
 import { getUserSettings } from "../auth-helpers";
 import { Quiz } from "@prisma/client";
-import { timeUntil } from "@/utils/time-until";
+import { timeUntil } from "@/koala/time-until";
 
 type QuizGradingFields =
   | "difficulty"

diff --git a/server/routers/main.ts → koala/routers/main.ts b/server/routers/main.ts → koala/routers/main.ts
@@ -1,4 +1,4 @@
-import { router } from "../trpc";
+import { router } from "../trpc-procedure";
 import { bulkCreateCards } from "./bulk-create-cards";
 import { deleteCard } from "./delete-card";
 import { deleteFlaggedCards } from "./delete-flagged-card";

diff --git a/server/routers/manually-grade.ts → koala/routers/manually-grade.ts b/server/routers/manually-grade.ts → koala/routers/manually-grade.ts
@@ -1,8 +1,8 @@
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 import { z } from "zod";
 import { getUserSettings } from "../auth-helpers";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 import { setGrade } from "./import-cards";
 
 export const manuallyGrade = procedure

diff --git a/server/routers/parse-cards.ts → koala/routers/parse-cards.ts b/server/routers/parse-cards.ts → koala/routers/parse-cards.ts
@@ -1,6 +1,6 @@
-import { createCardsFromText } from "@/utils/create-cards-from-text";
+import { createCardsFromText } from "@/koala/create-cards-from-text";
 import { z } from "zod";
-import { procedure } from "../trpc";
+import { procedure } from "../trpc-procedure";
 
 export const parseCards = procedure
   .input(

diff --git a/server/routers/rollback-grade.ts → koala/routers/rollback-grade.ts b/server/routers/rollback-grade.ts → koala/routers/rollback-grade.ts
@@ -1,9 +1,9 @@
-import { errorReport } from "@/utils/error-report";
+import { errorReport } from "@/koala/error-report";
 import { z } from "zod";
 import { getUserSettings } from "../auth-helpers";
 import { prismaClient } from "../prisma-client";
-import { procedure } from "../trpc";
-import { timeUntil } from "@/utils/time-until";
+import { procedure } from "../trpc-procedure";
+import { timeUntil } from "@/koala/time-until";
 
 export const rollbackGrade = procedure
   .input(

diff --git a/components/settings-provider.tsx → koala/settings-provider.tsx b/components/settings-provider.tsx → koala/settings-provider.tsx
@@ -1,4 +1,4 @@
-import { trpc } from "@/utils/trpc";
+import { trpc } from "@/koala/trpc-config";
 import { Container, Grid, Center, Button } from "@mantine/core";
 import { notifications } from "@mantine/notifications";
 import { UserSettings } from "@prisma/client";

diff --git a/utils/study_reducer.ts → koala/study_reducer.ts b/utils/study_reducer.ts → koala/study_reducer.ts
diff --git a/utils/time-until.ts → koala/time-until.ts b/utils/time-until.ts → koala/time-until.ts
diff --git a/utils/transcribe.ts → koala/transcribe.ts b/utils/transcribe.ts → koala/transcribe.ts
diff --git a/utils/trpc.ts → koala/trpc-config.ts b/utils/trpc.ts → koala/trpc-config.ts
@@ -1,6 +1,6 @@
 import { httpBatchLink } from "@trpc/client";
 import { createTRPCNext } from "@trpc/next";
-import type { AppRouter } from "../server/routers/main";
+import type { AppRouter } from "./routers/main";
 import superjson from "superjson";
 
 function getBaseUrl() {

diff --git a/server/trpc.ts → koala/trpc-procedure.ts b/server/trpc.ts → koala/trpc-procedure.ts
diff --git a/utils/use-recorder.ts → koala/use-recorder.ts b/utils/use-recorder.ts → koala/use-recorder.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -2,11 +2,11 @@ import "@mantine/core/styles.css";
 import { AppProps } from "next/app";
 import Head from "next/head";
 import { MantineProvider } from "@mantine/core";
-import { trpc } from "@/utils/trpc";
+import { trpc } from "@/koala/trpc-config";
 import { SessionProvider } from "next-auth/react";
 import Navbar from "./_nav";
 import { Notifications } from "@mantine/notifications";
-import { UserSettingsProvider } from "@/components/settings-provider";
+import { UserSettingsProvider } from "@/koala/settings-provider";
 
 function App(props: AppProps) {
   const { Component, pageProps } = props;

diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts
@@ -1,4 +1,4 @@
-import { prismaClient } from "@/server/prisma-client";
+import { prismaClient } from "@/koala/prisma-client";
 import { PrismaAdapter } from "@next-auth/prisma-adapter";
 import NextAuth, { AuthOptions } from "next-auth";
 import EmailProvider from "next-auth/providers/email";

diff --git a/pages/api/trpc/[trpc].ts b/pages/api/trpc/[trpc].ts
@@ -1,8 +1,8 @@
 import * as trpcNext from "@trpc/server/adapters/next";
-import { appRouter } from "../../../server/routers/main";
+import { appRouter } from "../../../koala/routers/main";
 import { getServerSession } from "next-auth";
 import { authOptions } from "../auth/[...nextauth]";
-import { prismaClient } from "@/server/prisma-client";
+import { prismaClient } from "@/koala/prisma-client";
 
 export default trpcNext.createNextApiHandler({
   router: appRouter,

diff --git a/pages/cards.tsx b/pages/cards.tsx
@@ -1,5 +1,5 @@
-import { CardTable } from "@/components/card-table";
-import { trpc } from "@/utils/trpc";
+import { CardTable } from "@/koala/card-table";
+import { trpc } from "@/koala/trpc-config";
 import { Button, Container, FileButton } from "@mantine/core";
 import { z } from "zod";
 

diff --git a/pages/cards/[card_id].tsx b/pages/cards/[card_id].tsx
@@ -1,4 +1,4 @@
-import { trpc } from "@/utils/trpc";
+import { trpc } from "@/koala/trpc-config";
 import { Button, Checkbox, Container, Paper, TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useRouter } from "next/router";

diff --git a/pages/create.tsx b/pages/create.tsx
@@ -7,7 +7,7 @@ import {
   Group,
   TextInput,
 } from "@mantine/core";
-import { trpc } from "@/utils/trpc";
+import { trpc } from "@/koala/trpc-config";
 type ProcessedCard = {
   term: string;
   definition: string;

diff --git a/pages/faucet.tsx b/pages/faucet.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { trpc } from "@/utils/trpc";
+import { trpc } from "@/koala/trpc-config";
 
 /** The faucet component has a button that when clicked
  * calls the "faucet" trpc mutation:

diff --git a/pages/study.tsx b/pages/study.tsx
@@ -1,18 +1,18 @@
-import MicrophonePermissions from "@/components/microphone-permissions";
-import { playAudio } from "@/components/play-audio";
-import { QuizFailure, linkToEditPage } from "@/components/quiz-failure";
-import { blobToBase64, convertBlobToWav } from "@/components/record-button";
-import { useUserSettings } from "@/components/settings-provider";
+import MicrophonePermissions from "@/koala/microphone-permissions";
+import { playAudio } from "@/koala/play-audio";
+import { QuizFailure, linkToEditPage } from "@/koala/quiz-failure";
+import { blobToBase64, convertBlobToWav } from "@/koala/record-button";
+import { useUserSettings } from "@/koala/settings-provider";
 import {
   Action,
   Quiz,
   State,
   gotoNextQuiz,
   newQuizState,
   quizReducer,
-} from "@/utils/study_reducer";
-import { trpc } from "@/utils/trpc";
-import { useVoiceRecorder } from "@/utils/use-recorder";
+} from "@/koala/study_reducer";
+import { trpc } from "@/koala/trpc-config";
+import { useVoiceRecorder } from "@/koala/use-recorder";
 import { Button, Container, Grid } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
 import { Grade } from "femto-fsrs";
@@ -35,6 +35,16 @@ type QuizViewProps = {
   startRecording(grade: Grade): Promise<void>;
   stopRecording: () => Promise<void>;
 };
+type StudyHeaderProps = {
+  lessonType: keyof typeof HEADER;
+  langCode: string;
+};
+type QuizAssertion = (q: Quiz | undefined) => asserts q is Quiz;
+type HotkeyButtonProps = {
+  hotkey: string;
+  label: string;
+  onClick: () => void;
+};
 
 const HEADER_STYLES = {
   display: "flex",
@@ -60,10 +70,7 @@ export const HOTKEYS: Record<string, string> = {
   CONTINUE: "c",
 };
 
-type StudyHeaderProps = {
-  lessonType: keyof typeof HEADER;
-  langCode: string;
-};
+const GRID_SIZE = 2;
 
 function StudyHeader({ lessonType, langCode }: StudyHeaderProps) {
   const isSpeaking = lessonType === "speaking";
@@ -84,7 +91,6 @@ const currentQuiz = (state: State) => {
   return curr.value;
 };
 
-type QuizAssertion = (q: Quiz | undefined) => asserts q is Quiz;
 const assertQuiz: QuizAssertion = (q) => {
   if (!q) {
     throw new Error("No quiz found");
@@ -276,14 +282,6 @@ function NoQuizDue(_: {}) {
   );
 }
 
-const GRID_SIZE = 2;
-
-type HotkeyButtonProps = {
-  hotkey: string;
-  label: string;
-  onClick: () => void;
-};
-
 function HotkeyButton(props: HotkeyButtonProps) {
   return (
     <Grid.Col span={GRID_SIZE}>