Merge pull request #1 from justinsilvestre/curator

Curator

.gitignore

@@ -9,5 +9,6 @@ node_modules
 /postgres-data
 
 *.log
+*.log.json
 
 .DS_Store

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll": true
+    "source.fixAll": "explicit"
   },
   "eslint.validate": ["javascript"]
 }

app/components/AppLink.tsx

@@ -4,19 +4,26 @@ import { useEffect, type ReactNode, useRef } from "react";
 type LinkProps<T = object> = T & {
   children: ReactNode;
   className?: string;
+  newWindow?: boolean;
 };
 
 function AppLink({
   to,
   children,
   className = "underline hover:text-orange-600",
   linkRef,
+  newWindow,
 }: LinkProps<{
   to: string;
   linkRef?: React.Ref<HTMLAnchorElement>;
 }>) {
   return (
-    <Link to={to} className={className} ref={linkRef}>
+    <Link
+      to={to}
+      className={className}
+      ref={linkRef}
+      {...(newWindow ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+    >
       {children}
     </Link>
   );
@@ -27,11 +34,13 @@ export function DictLink({
   figureId,
   focusOnLoad,
   className,
+  newWindow,
 }: {
   children?: ReactNode;
   className?: string;
 } & Omit<
   LinkProps<{
+    newWindow?: boolean;
     figureId: string;
     focusOnLoad?: boolean;
   }>,
@@ -44,7 +53,12 @@ export function DictLink({
     }
   }, [figureId, focusOnLoad]);
   return (
-    <AppLink to={`/dict/${figureId}`} linkRef={linkRef} className={className}>
+    <AppLink
+      to={`/dict/${figureId}`}
+      linkRef={linkRef}
+      className={className}
+      newWindow={newWindow}
+    >
       {children || figureId}
     </AppLink>
   );

app/components/FigureBadgeLink.tsx

@@ -0,0 +1,21 @@
+import { DictLink } from "~/components/AppLink";
+import { FigureBadge } from "~/components/FigureBadge";
+import { BadgeProps } from "~/features/dictionary/badgeFigure";
+
+export function FigureBadgeLink({
+  id: figureId,
+  badgeProps,
+  width,
+  newWindow,
+}: {
+  id: string;
+  badgeProps: BadgeProps;
+  width?: number;
+  newWindow?: boolean;
+}) {
+  return (
+    <DictLink figureId={figureId} newWindow={newWindow}>
+      <FigureBadge badgeProps={badgeProps} width={width} />
+    </DictLink>
+  );
+}