diff --git a/components/HeaderMenu/index.scss b/components/HeaderMenu/index.scss index bbea705d..e5584f7f 100644 --- a/components/HeaderMenu/index.scss +++ b/components/HeaderMenu/index.scss @@ -88,8 +88,9 @@ display: block; height: $diameter; width: $diameter; - transition: transform 100ms; - transform: translateX(-2px); + position: absolute; + top: 3px; + left: 3px; z-index: 3; &:hover { @@ -98,7 +99,7 @@ &[data-state='checked'] { background: $grey-100; - transform: translateX(17px); + left: 23px; } } diff --git a/types/GranblueCookie.d.ts b/types/GranblueCookie.d.ts index eb0cca52..fb7e89ff 100644 --- a/types/GranblueCookie.d.ts +++ b/types/GranblueCookie.d.ts @@ -1,5 +1,5 @@ interface GranblueCookie { - account: AccountCookie - user: UserCookie + account?: AccountCookie + user?: UserCookie locale: string } diff --git a/utils/retrieveCookies.tsx b/utils/retrieveCookies.tsx index 3577625a..68337b89 100644 --- a/utils/retrieveCookies.tsx +++ b/utils/retrieveCookies.tsx @@ -6,18 +6,20 @@ export default function retrieveCookies( res?: NextApiResponse ): GranblueCookie | undefined { const cookies = getCookies({ req, res }) - if (!cookies) return undefined - const { account: accountData, user: userData, NEXT_LOCALE: localeData, } = cookies - if (!accountData || !userData) return undefined - const account = JSON.parse(decodeURIComponent(accountData)) ?? undefined - const user = JSON.parse(decodeURIComponent(userData)) ?? undefined - const locale = localeData as string + if ((!accountData || !userData) && localeData) + return { account: undefined, user: undefined, locale: localeData } - return { account, user, locale } + if (accountData && userData) { + const account = JSON.parse(decodeURIComponent(accountData)) ?? undefined + const user = JSON.parse(decodeURIComponent(userData)) ?? undefined + const locale = localeData as string + + return { account, user, locale } + } }