diff --git a/components/shared/BoxFancy/BoxFancy.test.tsx b/components/shared/BoxFancy/BoxFancy.test.tsx index 2c10098f..4e32626e 100644 --- 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 index 97865220..2c8b051a 100644 --- a/components/shared/BoxFancy/BoxFancy.tsx +++ b/components/shared/BoxFancy/BoxFancy.tsx @@ -52,7 +52,7 @@ export interface BaseBoxFancyProp { borderGradientColor?: BoxFancyBorderGradientVariant; } -export type BoxFancyProps = +export type BoxFancyProps = PolymorphicComponentProp; type InnerBoxFancyComponent = ( @@ -98,11 +98,9 @@ const InnerBoxFancy: InnerBoxFancyComponent = ( ]); return ( - <> - - {children} - - + + {children} + ); }; diff --git a/pages/login.tsx b/pages/login.tsx index 6c91246b..e19219b1 100644 --- a/pages/login.tsx +++ b/pages/login.tsx @@ -85,45 +85,43 @@ const Login: NextPageWithProps = () => { }, [internalEndpoint, onLoginClick]); return checkAuth ? ( - <> -
- {/* fog */} -
-
- {bye ? ( -

- {"原帳號已註銷成功。\n我們非常歡迎你再加入,\n和我們一起遊樂!"} +

+ {/* fog */} +
+
+ {bye ? ( +

+ {"原帳號已註銷成功。\n我們非常歡迎你再加入,\n和我們一起遊樂!"} +

+ ) : null} +

+ + 遊戲微服務大平台 +

+ {!bye ? ( + <> +

+ 一起創造與冒險!

- ) : null} -

- - 遊戲微服務大平台 -

- {!bye ? ( - <> -

- 一起創造與冒險! -

-

- 加入遊戲微服務大平台,和100+遊戲開發者共同創建更多可能! -

- - ) : null} -
+

+ 加入遊戲微服務大平台,和100+遊戲開發者共同創建更多可能! +

+ + ) : null} +
-
- {loginButtons} -
+
+ {loginButtons}
- +
) : ( <> );