DRY

visnup · Jan 24, 2024 · 2032798 · 2032798 · vercel · Jan 24, 2024
1 parent f9ceef6
commit 2032798
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/convex/deals.ts b/convex/deals.ts
@@ -4,7 +4,7 @@ import { mutation, query } from "./_generated/server.js";
 
 const suits = [..."♣♦♥♠"];
 const ranks = [..."23456789", "10", ..."JQKA"];
-const deck = cross(ranks, suits, (r, s) => r + s);
+export const deck = cross(suits, ranks, (s, r) => r + s);
 
 export const clear = mutation({
   args: { table: v.string() },

diff --git a/src/pages/test/deal.tsx b/src/pages/test/deal.tsx
@@ -1,10 +1,6 @@
 import { useState } from "react";
-import { cross } from "d3-array";
 import { Card } from "../../components/Card";
-
-const suits = [..."♣♦♥♠"];
-const ranks = [..."23456789", "10", ..."JQKA"];
-const deck = cross(ranks, suits, (r, s) => r + s);
+import { deck } from "../../../convex/deals";
 
 export default function Test() {
   const [revealed, setRevealed] = useState(false);

diff --git a/src/pages/test/faces.tsx b/src/pages/test/faces.tsx
@@ -1,14 +1,10 @@
-import { cross } from "d3-array";
+import { deck } from "../../../convex/deals";
 import { Card } from "../../components/Card";
 
-const suits = [..."♣♦♥♠"];
-const ranks = [..."23456789", "10", ..."JQKA"];
-const deck = cross(ranks, suits, (r, s) => r + s);
-
 export default function Test() {
   return (
     <main>
-      {deck.slice(0, 26).map((card) => (
+      {deck.map((card) => (
         <Card key={card} card={card} anchor="top" rotation={0} revealed />
       ))}
       <style jsx>{`