Merge pull request #9 from JollyGrin/feat/api-decks

Feat/api decks
JollyGrin · Sep 9, 2024 · b5d70e6 · b5d70e6
2 parents c329dc3 + d51c6a5
commit b5d70e6
Show file tree

Hide file tree

Showing 13 changed files with 308 additions and 54 deletions.
diff --git a/package.json b/package.json
@@ -14,6 +14,9 @@
     "@dnd-kit/sortable": "^8.0.0",
     "@radix-ui/react-dialog": "^1.1.1",
     "@shadow-panda/style-context": "^0.7.1",
+    "@tanstack/react-query": "^5.55.4",
+    "@tanstack/react-query-devtools": "^5.55.4",
+    "axios": "^1.7.7",
     "next": "14.2.8",
     "react": "^18",
     "react-dom": "^18"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/atoms/card-view/atlas.tsx b/src/components/atoms/card-view/atlas.tsx
@@ -1,3 +1,4 @@
+import { CARD_CDN } from "@/components/organisms/GameBoard/constants";
 import { Box } from "styled-system/jsx";
 
 export const FullCardAtlas = ({
@@ -15,7 +16,9 @@ export const FullCardAtlas = ({
       isolation="isolate"
     >
       <Box
-        style={{ backgroundImage: `url(/mock-cards/${img})` }} // bgImage has caching issues
+        style={{
+          backgroundImage: `url(${CARD_CDN}/${img}.webp)`,
+        }} // bgImage has caching issues
         isolation="isolate"
         w="100%"
         h="100%"

diff --git a/src/components/atoms/card-view/card.tsx b/src/components/atoms/card-view/card.tsx
@@ -1,3 +1,4 @@
+import { CARD_CDN } from "@/components/organisms/GameBoard/constants";
 import { Box } from "styled-system/jsx";
 
 export const CardImage = ({
@@ -22,7 +23,9 @@ export const CardImage = ({
       transition="all 0.25s ease"
     >
       <Box
-        style={{ backgroundImage: `url(/mock-cards/${img})` }}
+        style={{
+          backgroundImage: `url(${CARD_CDN}/${img}.webp)`,
+        }}
         w="100%"
         h="100%"
         minH="300px"

diff --git a/src/components/atoms/mock-cards/atlas.tsx b/src/components/atoms/mock-cards/atlas.tsx
@@ -1,3 +1,4 @@
+import { CARD_CDN } from "@/components/organisms/GameBoard/constants";
 import { Box } from "styled-system/jsx";
 
 export const CardAtlas = ({
@@ -20,7 +21,9 @@ export const CardAtlas = ({
       style={{ height }}
     >
       <Box
-        style={{ backgroundImage: `url(/mock-cards/${img})` }} // bgImage has caching issues
+        style={{
+          backgroundImage: `url(${CARD_CDN}/${img}.webp)`,
+        }} // bgImage has caching issues
         isolation="isolate"
         h="310px"
         w="100%"

diff --git a/src/components/atoms/mock-cards/card.tsx b/src/components/atoms/mock-cards/card.tsx
@@ -1,3 +1,4 @@
+import { CARD_CDN } from "@/components/organisms/GameBoard/constants";
 import { useHover } from "@/utils/hooks/useHover";
 import { useKeyPress } from "@/utils/hooks/useKeyPress";
 import { useEffect, useRef, useState } from "react";
@@ -62,7 +63,7 @@ export const CardImage = ({
         transform={show ? "scale(1.5)" : "unset"}
         transition="all 0.25s ease"
         style={{
-          backgroundImage: `url(/mock-cards/${img})`,
+          backgroundImage: `url(${CARD_CDN}/5/${img}.webp)`,
         }}
       />{" "}
     </Box>