feat: fix-font and resolve chores (#139)

* fix: change font url * fix: font not being applied fix * quickfix: revert erased code * feat: add motion to normal play empty card
mash-up-kr · Aug 11, 2023 · 33b6ebf · 33b6ebf
1 parent d602e8b
commit 33b6ebf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/packages/service-frontend/app/deck/[id]/normal/page.tsx b/packages/service-frontend/app/deck/[id]/normal/page.tsx
@@ -175,16 +175,6 @@ export default function NormalPlayPage({ params }: Props): JSX.Element {
                 }}
               >
                 <AnimatePresence initial={false}>
-                  {/* Onboarding Overlay - Flip */}
-                  {onboardingState === OnboardingState.FLIP && (
-                    <OnboardingFlipOverlay key={101} />
-                  )}
-
-                  {/* Onboarding Overlay - Slide */}
-                  {onboardingState === OnboardingState.SLIDE && (
-                    <OnboardingSlideOverlay key={102} />
-                  )}
-
                   {curIndex !== cardListData.result.length && (
                     <>
                       <NormalCard
@@ -221,11 +211,29 @@ export default function NormalPlayPage({ params }: Props): JSX.Element {
                   )}
 
                   {curIndex === cardListData.result.length && (
-                    <div className="w-full px-[45px]">
+                    <motion.div
+                      initial="hidden"
+                      animate="visible"
+                      variants={{
+                        hidden: { opacity: 0 },
+                        visible: { opacity: 1 },
+                      }}
+                      className="w-full px-[45px]"
+                    >
                       <EmptyCard />
-                    </div>
+                    </motion.div>
                   )}
                 </AnimatePresence>
+
+                {/* Onboarding Overlay - Flip */}
+                {onboardingState === OnboardingState.FLIP && (
+                  <OnboardingFlipOverlay key={101} />
+                )}
+
+                {/* Onboarding Overlay - Slide */}
+                {onboardingState === OnboardingState.SLIDE && (
+                  <OnboardingSlideOverlay key={102} />
+                )}
               </div>
             </div>
           </main>

diff --git a/packages/service-frontend/app/globals.css b/packages/service-frontend/app/globals.css
@@ -1,9 +1,9 @@
+@import url('https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable-dynamic-subset.css');
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import url('https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable-dynamic-subset.css');
-
 /* @media (prefers-color-scheme: dark) {
   :root {
     --foreground-rgb: 255, 255, 255;