Move files around and run ESLint (#115)

byronwall · Oct 2, 2023 · 6c9acdc · 6c9acdc
1 parent c0f7e4d
commit 6c9acdc
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 64 deletions.
diff --git a/src/app/admin/awards/page.tsx b/src/app/admin/awards/page.tsx
@@ -11,7 +11,7 @@ import {
   CardHeader,
   CardTitle,
 } from "~/components/ui/card";
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import { Textarea } from "~/components/ui/textarea";
 import { useQuerySsr } from "~/hooks/useQuerySsr";
 

diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
@@ -3,7 +3,7 @@
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { cn } from "~/lib/utils";
 
 type DashLink = {

diff --git a/src/app/admin/sentences/page.tsx b/src/app/admin/sentences/page.tsx
@@ -1,13 +1,12 @@
 "use client";
 
 import { Button } from "~/components/ui/button";
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { trpc } from "~/lib/trpc/client";
 import { Dialog, DialogContent, DialogTrigger } from "~/components/ui/dialog";
-
-import { AddSentenceForm } from "../../../components/sentences/AddSentenceForm";
-import { EditSentenceForm } from "../../../components/sentences/EditSentenceForm";
-import { useSentenceAdder } from "../../../hooks/useSentenceAdder";
+import { AddSentenceForm } from "~/components/sentences/AddSentenceForm";
+import { EditSentenceForm } from "~/components/sentences/EditSentenceForm";
+import { useSentenceAdder } from "~/hooks/useSentenceAdder";
 
 export default function AdminSentences() {
   const utils = trpc.useContext();

diff --git a/src/app/admin/words/page.tsx b/src/app/admin/words/page.tsx
@@ -5,7 +5,7 @@ import { useState } from "react";
 import { Label } from "~/components/ui/label";
 import { Textarea } from "~/components/ui/textarea";
 import { Button } from "~/components/ui/button";
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { trpc } from "~/lib/trpc/client";
 
 export default function AdminWords() {

diff --git a/src/app/awards/layout.tsx b/src/app/awards/layout.tsx
@@ -1,7 +1,6 @@
 import { callQuerySsrServer } from "~/hooks/useQuerySsrServer";
 import { appRouter } from "~/server/api/root";
-
-import { SsrContextServer } from "../../lib/trpc/SsrContextServer";
+import { SsrContextServer } from "~/lib/trpc/SsrContextServer";
 
 export default async function RootLayout({
   children,

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -4,12 +4,12 @@ import { type Metadata } from "next";
 import { Analytics } from "@vercel/analytics/react";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
-import { MainNav } from "~/components/main-nav";
+import { MainNav } from "~/components/nav/main-nav";
 import { marketingConfig } from "~/config/marketing";
 import { getServerAuthSession } from "~/server/auth";
 import { callQuerySsrServer } from "~/hooks/useQuerySsrServer";
 import { appRouter } from "~/server/api/root";
-import { UserMenuOrLogin } from "~/components/UserMenuOrLogin";
+import { UserMenuOrLogin } from "~/components/user/UserMenuOrLogin";
 import { SentenceCreatorDialog } from "~/components/sentences/SentenceCreatorDialog";
 import { SsrContextServer } from "~/lib/trpc/SsrContextServer";
 import Provider from "~/lib/trpc/Provider";
@@ -34,6 +34,7 @@ export default async function RootLayout({
   const session = await getServerAuthSession();
 
   await callQuerySsrServer(appRouter.awardRouter.getAllAwardsForProfile);
+  await callQuerySsrServer(appRouter.questionRouter.getFocusedWords);
 
   return (
     <html>

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,9 +1,8 @@
 import { getServerAuthSession } from "~/server/auth";
-import { QuestionPractice } from "~/components/QuestionPractice";
+import { QuestionPractice } from "~/components/questions/QuestionPractice";
 import { callQuerySsrServer } from "~/hooks/useQuerySsrServer";
 import { appRouter } from "~/server/api/root";
-
-import { SsrContextServer } from "../lib/trpc/SsrContextServer";
+import { SsrContextServer } from "~/lib/trpc/SsrContextServer";
 
 export default async function Home() {
   const session = await getServerAuthSession();

diff --git a/src/app/plan/[planNameSlugged]/layout.tsx b/src/app/plan/[planNameSlugged]/layout.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 
 import { trpc } from "~/lib/trpc/client";
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { useQuerySsr } from "~/hooks/useQuerySsr";
 import { cn } from "~/lib/utils";
 import { slugify } from "~/lib/utils";

diff --git a/src/app/plan/[planNameSlugged]/page.tsx b/src/app/plan/[planNameSlugged]/page.tsx
@@ -2,8 +2,7 @@ import { deslugify } from "~/lib/utils";
 import { callQuerySsrServer } from "~/hooks/useQuerySsrServer";
 import { appRouter } from "~/server/api/root";
 import { SsrContextServer } from "~/lib/trpc/SsrContextServer";
-
-import { LearningPlanSingle } from "../../../components/plans/LessonPlanSingle";
+import { LearningPlanSingle } from "~/components/plans/LessonPlanSingle";
 
 type PageProps = {
   params: {

diff --git a/src/app/plan/layout.tsx b/src/app/plan/layout.tsx
@@ -1,7 +1,6 @@
 import { callQuerySsrServer } from "~/hooks/useQuerySsrServer";
 import { appRouter } from "~/server/api/root";
-
-import { SsrContextServer } from "../../lib/trpc/SsrContextServer";
+import { SsrContextServer } from "~/lib/trpc/SsrContextServer";
 
 export default async function RootLayout({
   children,

diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 
-import { RegisterNewUser } from "~/components/RegisterNewUser";
+import { RegisterNewUser } from "~/components/user/RegisterNewUser";
 import { getServerAuthSession } from "~/server/auth";
 
 export default async function RegisterPage() {

diff --git a/src/components/awards/AwardImageChoice.tsx b/src/components/awards/AwardImageChoice.tsx
@@ -4,7 +4,7 @@ import Image from "next/image";
 
 import { trpc } from "~/lib/trpc/client";
 import { type AwardImage } from "~/app/awards/page";
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 
 export function AwardImageChoice({
   image,

diff --git a/src/components/ButtonLoading.tsx → src/components/common/ButtonLoading.tsx b/src/components/ButtonLoading.tsx → src/components/common/ButtonLoading.tsx
@@ -1,6 +1,8 @@
-import { Button } from "./ui/button";
+import { Button } from "~/components/ui/button";
+
 import { Icons } from "./icons";
 
+
 type ButtonProps = Parameters<typeof Button>[0];
 
 export function ButtonLoading(props: ButtonProps & { isLoading?: boolean }) {

diff --git a/src/components/icons.tsx → src/components/common/icons.tsx b/src/components/icons.tsx → src/components/common/icons.tsx
diff --git a/src/components/UserAccountNav.tsx → src/components/nav/UserAccountNav.tsx b/src/components/UserAccountNav.tsx → src/components/nav/UserAccountNav.tsx
@@ -7,15 +7,14 @@ import { signOut } from "next-auth/react";
 import { trpc } from "~/lib/trpc/client";
 import { useActiveProfile } from "~/hooks/useActiveProfile";
 import { cn } from "~/lib/utils";
-
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
-} from "./ui/dropdown-menu";
-import { Icons } from "./icons";
+} from "~/components/ui/dropdown-menu";
+import { Icons } from "~/components/common/icons";
 
 interface UserAccountNavProps extends React.HTMLAttributes<HTMLDivElement> {
   user: Pick<User, "name" | "image" | "email">;

diff --git a/src/components/main-nav.tsx → src/components/nav/main-nav.tsx b/src/components/main-nav.tsx → src/components/nav/main-nav.tsx
@@ -3,12 +3,13 @@
 import Link from "next/link";
 import * as React from "react";
 
-import { Icons } from "~/components/icons";
-import { MobileNav } from "~/components/mobile-nav";
+import { Icons } from "~/components/common/icons";
 import { siteConfig } from "~/config/site";
 import { cn } from "~/lib/utils";
 import { type MainNavItem } from "~/types";
 
+import { MobileNav } from "./mobile-nav";
+
 interface MainNavProps {
   items?: MainNavItem[];
   children?: React.ReactNode;

diff --git a/src/components/mobile-nav.tsx → src/components/nav/mobile-nav.tsx b/src/components/mobile-nav.tsx → src/components/nav/mobile-nav.tsx
@@ -3,7 +3,7 @@
 import Link from "next/link";
 import * as React from "react";
 
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { siteConfig } from "~/config/site";
 import { useLockBody } from "~/hooks/use-lock-body";
 import { cn } from "~/lib/utils";

diff --git a/src/components/plans/LearningPlanInputForm.tsx b/src/components/plans/LearningPlanInputForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/plans/LessonBulkImportForm.tsx b/src/components/plans/LessonBulkImportForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/plans/LessonDetail.tsx b/src/components/plans/LessonDetail.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
-import { Icons } from "~/components/icons";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
+import { Icons } from "~/components/common/icons";
 import { cn } from "~/lib/utils";
 import { useLessonActions } from "~/hooks/useLessonActions";
 import { type DetailedLesson } from "~/types/models";

diff --git a/src/components/plans/LessonEditWordsForm.tsx b/src/components/plans/LessonEditWordsForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/plans/LessonInputForm.tsx b/src/components/plans/LessonInputForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/plans/LessonPlanSingle.tsx b/src/components/plans/LessonPlanSingle.tsx
@@ -9,7 +9,7 @@ import {
   CardTitle,
 } from "~/components/ui/card";
 import { useQuerySsr } from "~/hooks/useQuerySsr";
-import { findWordsNotInSentences } from "~/app/plan/[planNameSlugged]/findWordsNotInSentences";
+import { findWordsNotInSentences } from "~/lib/findWordsNotInSentences";
 
 import { LessonDetail } from "./LessonDetail";
 import { LessonBulkImportWordsForm } from "./LessonBulkImportForm";

diff --git a/src/components/QuestionPractice.tsx → ...components/questions/QuestionPractice.tsx b/src/components/QuestionPractice.tsx → ...components/questions/QuestionPractice.tsx
@@ -1,7 +1,9 @@
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "./ui/tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
+
 import { WordQuestionPractice } from "./WordQuestionPractice";
 import { SentenceQuestionPractice } from "./SentenceQuestionPractice";
 
+
 export function QuestionPractice() {
   return (
     <div>

diff --git a/src/components/SentenceQuestionPractice.tsx → ...ts/questions/SentenceQuestionPractice.tsx b/src/components/SentenceQuestionPractice.tsx → ...ts/questions/SentenceQuestionPractice.tsx
@@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from "react";
 
 import { trpc } from "~/lib/trpc/client";
 import { type RouterOutputs } from "~/utils/api";
+import { useQuerySsr } from "~/hooks/useQuerySsr";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -13,13 +14,12 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
-import { useQuerySsr } from "~/hooks/useQuerySsr";
+import { Card, CardContent } from "~/components/ui/card";
+import { Button } from "~/components/ui/button";
+import { Icons } from "~/components/common/icons";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 
-import { Card, CardContent } from "./ui/card";
-import { Button } from "./ui/button";
-import { Icons } from "./icons";
 import { WordInSentence } from "./WordInSentence";
-import { ButtonLoading } from "./ButtonLoading";
 
 type WordWithSentence =
   RouterOutputs["questionRouter"]["getPossibleSentences"][0];
@@ -247,8 +247,6 @@ export function SentenceQuestionPractice() {
                   />
                 ))}
               </div>
-
-              <div>font size {fontSize}rem</div>
             </div>
           </CardContent>
         </Card>

diff --git a/src/components/WordInSentence.tsx → src/components/questions/WordInSentence.tsx b/src/components/WordInSentence.tsx → src/components/questions/WordInSentence.tsx
@@ -2,10 +2,15 @@
 
 import { trpc } from "~/lib/trpc/client";
 import { cn } from "~/lib/utils";
+import { useQuerySsr } from "~/hooks/useQuerySsr";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "~/components/ui/popover";
+import { Button } from "~/components/ui/button";
+import { Icons } from "~/components/common/icons";
 
-import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
-import { Button } from "./ui/button";
-import { Icons } from "./icons";
 import { type WordToRender } from "./SentenceQuestionPractice";
 
 export function WordInSentence(props: {
@@ -14,7 +19,9 @@ export function WordInSentence(props: {
 }) {
   const { wordToRender, onUpdateScore } = props;
 
-  const { data: focusedWords } = trpc.questionRouter.getFocusedWords.useQuery();
+  const { data: focusedWords } = useQuerySsr(
+    trpc.questionRouter.getFocusedWords
+  );
 
   // color map
   // score = undefined = blue; black  = 100; red = 0

diff --git a/src/components/WordQuestionPractice.tsx → ...onents/questions/WordQuestionPractice.tsx b/src/components/WordQuestionPractice.tsx → ...onents/questions/WordQuestionPractice.tsx
@@ -3,10 +3,9 @@
 import { useLocalStorage } from "usehooks-ts";
 
 import { trpc } from "~/lib/trpc/client";
-
-import { Card, CardHeader, CardTitle, CardContent } from "./ui/card";
-import { Button } from "./ui/button";
-import { Icons } from "./icons";
+import { Card, CardHeader, CardTitle, CardContent } from "~/components/ui/card";
+import { Button } from "~/components/ui/button";
+import { Icons } from "~/components/common/icons";
 
 export function WordQuestionPractice() {
   const utils = trpc.useContext();

diff --git a/src/components/sentences/AddSentenceForm.tsx b/src/components/sentences/AddSentenceForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/sentences/EditSentenceForm.tsx b/src/components/sentences/EditSentenceForm.tsx
@@ -3,7 +3,7 @@
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,

diff --git a/src/components/sentences/SentenceCreatorForm.tsx b/src/components/sentences/SentenceCreatorForm.tsx
@@ -11,7 +11,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import { ButtonLoading } from "~/components/ButtonLoading";
+import { ButtonLoading } from "~/components/common/ButtonLoading";
 import {
   Form,
   FormControl,
@@ -24,7 +24,7 @@ import {
 import { GptSentenceSchema } from "~/server/api/routers/inputSchemas";
 import { trpc } from "~/lib/trpc/client";
 import { Checkbox } from "~/components/ui/checkbox";
-import { Icons } from "~/components/icons";
+import { Icons } from "~/components/common/icons";
 import { Textarea } from "~/components/ui/textarea";
 import { Input } from "~/components/ui/input";
 import { useSentenceAdder } from "~/hooks/useSentenceAdder";

diff --git a/src/components/RegisterNewUser.tsx → src/components/user/RegisterNewUser.tsx b/src/components/RegisterNewUser.tsx → src/components/user/RegisterNewUser.tsx
@@ -4,8 +4,7 @@ import { signIn } from "next-auth/react";
 import { useState } from "react";
 
 import { trpc } from "~/lib/trpc/client";
-
-import { Button } from "./ui/button";
+import { Button } from "~/components/ui/button";
 
 export function RegisterNewUser() {
   const [email, setEmail] = useState("");

diff --git a/src/components/UserMenuOrLogin.tsx → src/components/user/UserMenuOrLogin.tsx b/src/components/UserMenuOrLogin.tsx → src/components/user/UserMenuOrLogin.tsx
@@ -5,8 +5,7 @@ import Link from "next/link";
 
 import { Button, buttonVariants } from "~/components/ui/button";
 import { cn } from "~/lib/utils";
-
-import { UserAccountNav } from "./UserAccountNav";
+import { UserAccountNav } from "~/components/nav/UserAccountNav";
 
 export function UserMenuOrLogin() {
   const { data: session } = useSession();

diff --git a/...nNameSlugged]/findWordsNotInSentences.tsx → src/lib/findWordsNotInSentences.tsx b/...nNameSlugged]/findWordsNotInSentences.tsx → src/lib/findWordsNotInSentences.tsx
diff --git a/src/server/api/root.ts b/src/server/api/root.ts
@@ -1,6 +1,5 @@
-import { authRouter } from "~/server/api/routers/auth";
-import { createTRPCRouter } from "~/server/api/trpc";
-
+import { authRouter } from "./routers/auth";
+import { createTRPCRouter } from "./trpc";
 import { wordRouter } from "./routers/wordRouter";
 import { userRouter } from "./routers/userRouter";
 import { questionRouter } from "./routers/questionRouter";