From 7b60494d6dce04df4873b8fb605fabe2ef2a237c Mon Sep 17 00:00:00 2001 From: Michael Freno Date: Wed, 21 Jan 2026 12:57:58 -0500 Subject: [PATCH] fix: duplication error --- .gitignore | 2 +- ...essionDependantLike.tsx => AuthenticatedLike.tsx} | 4 ++-- src/routes/blog/[title]/index.tsx | 12 ++++++------ src/routes/test.tsx | 2 +- src/server/api/routers/auth.ts | 2 +- src/server/cairn-auth.ts | 1 - 6 files changed, 11 insertions(+), 12 deletions(-) rename src/components/blog/{SessionDependantLike.tsx => AuthenticatedLike.tsx} (96%) diff --git a/.gitignore b/.gitignore index f1280a4..7db022d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ app.config.timestamp_*.js .classpath *.launch .settings/ -#tasks +tasks # Temp gitignore diff --git a/src/components/blog/SessionDependantLike.tsx b/src/components/blog/AuthenticatedLike.tsx similarity index 96% rename from src/components/blog/SessionDependantLike.tsx rename to src/components/blog/AuthenticatedLike.tsx index 12c7e84..07ef846 100644 --- a/src/components/blog/SessionDependantLike.tsx +++ b/src/components/blog/AuthenticatedLike.tsx @@ -8,14 +8,14 @@ export interface PostLike { post_id: string; } -export interface SessionDependantLikeProps { +export interface AuthenticatedLikeProps { currentUserID: string | undefined | null; isAuthenticated: boolean; likes: PostLike[]; projectID: number; } -export default function SessionDependantLike(props: SessionDependantLikeProps) { +export default function AuthenticatedLike(props: AuthenticatedLikeProps) { const [hovering, setHovering] = createSignal(false); const [likes, setLikes] = createSignal(props.likes); const [instantOffset, setInstantOffset] = createSignal(0); diff --git a/src/routes/blog/[title]/index.tsx b/src/routes/blog/[title]/index.tsx index 4ab7047..415baea 100644 --- a/src/routes/blog/[title]/index.tsx +++ b/src/routes/blog/[title]/index.tsx @@ -9,7 +9,7 @@ import { import { PageHead } from "~/components/PageHead"; import { createAsync } from "@solidjs/router"; import { getRequestEvent } from "solid-js/web"; -import SessionDependantLike from "~/components/blog/SessionDependantLike"; +import AuthenticatedLike from "~/components/blog/AuthenticatedLike"; import CommentIcon from "~/components/icons/CommentIcon"; import { Fire } from "~/components/icons/Fire"; import CommentSectionWrapper from "~/components/blog/CommentSectionWrapper"; @@ -433,11 +433,11 @@ export default function PostPage() {
-
diff --git a/src/routes/test.tsx b/src/routes/test.tsx index e23d9cf..c889145 100644 --- a/src/routes/test.tsx +++ b/src/routes/test.tsx @@ -160,7 +160,7 @@ const routerSections: RouterSection[] = [ router: "auth", procedure: "signOut", method: "mutation", - description: "Clear auth cookies and sign out" + description: "Clear auth cookie and sign out" }, { name: "GitHub Callback", diff --git a/src/server/api/routers/auth.ts b/src/server/api/routers/auth.ts index 460cf7b..8a23e24 100644 --- a/src/server/api/routers/auth.ts +++ b/src/server/api/routers/auth.ts @@ -1188,7 +1188,7 @@ export const authRouter = createTRPCRouter({ const secret = new TextEncoder().encode(env.JWT_SECRET_KEY); const token = await new SignJWT({ email, - rememberMe: rememberMe ?? false, // Default to browser session cookie + rememberMe: rememberMe ?? false, // Default to browser cookie code: loginCode }) .setProtectedHeader({ alg: "HS256" }) diff --git a/src/server/cairn-auth.ts b/src/server/cairn-auth.ts index 1728016..08dc9d8 100644 --- a/src/server/cairn-auth.ts +++ b/src/server/cairn-auth.ts @@ -1,4 +1,3 @@ -import { jwtVerify } from "jose"; import { SignJWT, jwtVerify } from "jose"; import { env } from "~/env/server";