fix: sonarcloud issues

Game-as-a-Service · Apr 28, 2024 · 613b117 · 613b117
1 parent bb5db82
commit 613b117
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 45 deletions.
diff --git a/components/shared/BoxFancy/BoxFancy.test.tsx b/components/shared/BoxFancy/BoxFancy.test.tsx
@@ -5,6 +5,7 @@ import {
   BoxFancyBorderGradientVariant,
   BoxFancyBorderRadiusVariant,
   BoxFancyBorderWidthVariant,
+  BoxFancyProps,
 } from "./BoxFancy";
 
 type ClassesFoundTest = {
@@ -81,7 +82,7 @@ describe("BoxFancy", () => {
 
       const matchers = [
         () => expect(baseElement.querySelector(`.${classes}`)),
-        () => expect(baseElement.querySelector(`.before\\\:${classes}`)),
+        () => expect(baseElement.querySelector(`.before\\:${classes}`)),
       ];
       matchers.forEach((matcher) =>
         found ? matcher().toBeTruthy() : matcher().toBeFalsy()
@@ -98,7 +99,7 @@ describe("BoxFancy", () => {
 
       const matchers = [
         () => expect(baseElement.querySelector(`.${classes}`)),
-        () => expect(baseElement.querySelector(`.before\\\:${classes}`)),
+        () => expect(baseElement.querySelector(`.before\\:${classes}`)),
       ];
       matchers.forEach((matcher) =>
         found ? matcher().toBeTruthy() : matcher().toBeFalsy()
@@ -114,7 +115,7 @@ describe("BoxFancy", () => {
       );
 
       const matchers = [
-        () => expect(baseElement.querySelector(`.before\\\:${classes}`)),
+        () => expect(baseElement.querySelector(`.before\\:${classes}`)),
       ];
       matchers.forEach((matcher) =>
         found ? matcher().toBeTruthy() : matcher().toBeFalsy()

diff --git a/components/shared/BoxFancy/BoxFancy.tsx b/components/shared/BoxFancy/BoxFancy.tsx
@@ -52,7 +52,7 @@ export interface BaseBoxFancyProp {
   borderGradientColor?: BoxFancyBorderGradientVariant;
 }
 
-export type BoxFancyProps<C extends React.ElementType> =
+export type BoxFancyProps<C extends React.ElementType = "div"> =
   PolymorphicComponentProp<C, BaseBoxFancyProp>;
 
 type InnerBoxFancyComponent = <C extends React.ElementType = "div">(
@@ -98,11 +98,9 @@ const InnerBoxFancy: InnerBoxFancyComponent = (
   ]);
 
   return (
-    <>
-      <Component ref={ref} className={allClassName} {...restProps}>
-        {children}
-      </Component>
-    </>
+    <Component ref={ref} className={allClassName} {...restProps}>
+      {children}
+    </Component>
   );
 };
 

diff --git a/pages/login.tsx b/pages/login.tsx
@@ -85,45 +85,43 @@ const Login: NextPageWithProps = () => {
   }, [internalEndpoint, onLoginClick]);
 
   return checkAuth ? (
-    <>
-      <div className="relative w-full h-full flex flex-col xl:flex-row justify-between items-center p-4 gap-[18px]">
-        {/* fog */}
-        <div
-          className={
-            "absolute xl:-top-5 xl:-right-5 xl:w-[58%] xl:h-[calc(100%+40px)] rounded-2xl gradient-light shadow blur-[20px]"
-          }
-        />
-        <div className="px-2 sm:px-6 xl:pl-24 2xl:px-24 flex-1 flex flex-col justify-center items-start">
-          {bye ? (
-            <p
-              className={
-                "text-primary-50 text-[22px] font-normal whitespace-pre-line mb-9"
-              }
-            >
-              {"原帳號已註銷成功。\n我們非常歡迎你再加入，\n和我們一起遊樂！"}
+    <div className="relative w-full h-full flex flex-col xl:flex-row justify-between items-center p-4 gap-[18px]">
+      {/* fog */}
+      <div
+        className={
+          "absolute xl:-top-5 xl:-right-5 xl:w-[58%] xl:h-[calc(100%+40px)] rounded-2xl gradient-light shadow blur-[20px]"
+        }
+      />
+      <div className="px-2 sm:px-6 xl:pl-24 2xl:px-24 flex-1 flex flex-col justify-center items-start">
+        {bye ? (
+          <p
+            className={
+              "text-primary-50 text-[22px] font-normal whitespace-pre-line mb-9"
+            }
+          >
+            {"原帳號已註銷成功。\n我們非常歡迎你再加入，\n和我們一起遊樂！"}
+          </p>
+        ) : null}
+        <h2 className="relative flex items-center text-[22px] font-normal text-primary-100 mb-12">
+          <Icon name="leadingIcon" className="w-12 h-12" />
+          遊戲微服務大平台
+        </h2>
+        {!bye ? (
+          <>
+            <p className="text-primary-50 text-[32px] font-medium mb-4">
+              一起創造與冒險！
             </p>
-          ) : null}
-          <h2 className="relative flex items-center text-[22px] font-normal text-primary-100 mb-12">
-            <Icon name="leadingIcon" className="w-12 h-12" />
-            遊戲微服務大平台
-          </h2>
-          {!bye ? (
-            <>
-              <p className="text-primary-50 text-[32px] font-medium mb-4">
-                一起創造與冒險！
-              </p>
-              <p className="text-primary-50 text-[22px] font-normal">
-                加入遊戲微服務大平台，和100+遊戲開發者共同創建更多可能！
-              </p>
-            </>
-          ) : null}
-        </div>
+            <p className="text-primary-50 text-[22px] font-normal">
+              加入遊戲微服務大平台，和100+遊戲開發者共同創建更多可能！
+            </p>
+          </>
+        ) : null}
+      </div>
 
-        <div className="flex-1 flex flex-col justify-center items-center w-full px-[124px] gap-5">
-          {loginButtons}
-        </div>
+      <div className="flex-1 flex flex-col justify-center items-center w-full px-[124px] gap-5">
+        {loginButtons}
       </div>
-    </>
+    </div>
   ) : (
     <></>
   );