diff --git a/src/components/AccountHeader/AccountHeader.tsx b/src/components/AccountHeader/AccountHeader.tsx index 0744950..63e78cb 100644 --- a/src/components/AccountHeader/AccountHeader.tsx +++ b/src/components/AccountHeader/AccountHeader.tsx @@ -38,6 +38,8 @@ type AccountHeaderProps = { guestMode?: boolean; setOpenLoginModal?: (handleOpenLoginModal: boolean) => void; isTestUser?: boolean; + id?: number; + usernameLong?: any; }; const AccountHeader: FC = ({ @@ -70,6 +72,9 @@ const AccountHeader: FC = ({ guestMode, setOpenLoginModal, isTestUser, + id, + + usernameLong, }) => { const handleOpenImageUpload = () => { setOpenCoverImgModal(true); @@ -119,6 +124,8 @@ const AccountHeader: FC = ({ achievementTooltipTxt={achievementTooltipTxt} yourPointsUserPage={yourPointsUserPage} levelDetails={levelDetails} + // LLM - DO NOT TOUCH IT + exceptionUsername={id === 1034 && usernameLong} />
= ({ @@ -47,6 +48,7 @@ const AccountInfo: FC = ({ achievementTooltipTxt, yourPointsUserPage, levelDetails, + exceptionUsername, }) => { const router = useRouter(); const { locale } = router as TRouter; @@ -102,7 +104,9 @@ const AccountInfo: FC = ({ })} > {title} - {!!username ? ( + {!!exceptionUsername ? ( +

{exceptionUsername}

+ ) : !!username ? (

{username}

) : ( diff --git a/src/components/CertificateContainer/CertificateContainer.module.scss b/src/components/CertificateContainer/CertificateContainer.module.scss index cb1634e..b28d710 100644 --- a/src/components/CertificateContainer/CertificateContainer.module.scss +++ b/src/components/CertificateContainer/CertificateContainer.module.scss @@ -32,7 +32,7 @@ color: #bf8c0a; font-size: 76px; font-weight: 100; - margin: 0; + margin: 0 20px; font-family: 'Manrope-ExtraLight.ttf', sans-serif; } diff --git a/src/components/ToolHeader/ToolHeader.module.scss b/src/components/ToolHeader/ToolHeader.module.scss index 1f72668..37bd9cf 100644 --- a/src/components/ToolHeader/ToolHeader.module.scss +++ b/src/components/ToolHeader/ToolHeader.module.scss @@ -174,6 +174,11 @@ $headerHeight: 46px; } } } + .Disabled { + opacity: 50%; + pointer-events: none; + cursor: default; + } & .actions { font-size: 18px; @@ -443,6 +448,10 @@ $headerHeight: 46px; margin-right: 5px; gap: 8px; } + .Disabled { + opacity: 50%; + pointer-events: none; + } } } .Hidden { diff --git a/src/components/ToolHeader/ToolHeader.tsx b/src/components/ToolHeader/ToolHeader.tsx index 63b7cae..86c48e6 100644 --- a/src/components/ToolHeader/ToolHeader.tsx +++ b/src/components/ToolHeader/ToolHeader.tsx @@ -284,7 +284,9 @@ const ToolHeader: FC = ({
setOpenOurProjects(true)} > @@ -433,6 +435,7 @@ const ToolHeader: FC = ({ setOpenOurProjects(true)} diff --git a/src/components/UserProfile/UserProfile.tsx b/src/components/UserProfile/UserProfile.tsx index df031a0..e763433 100644 --- a/src/components/UserProfile/UserProfile.tsx +++ b/src/components/UserProfile/UserProfile.tsx @@ -38,6 +38,7 @@ type UserProfileProps = { disableStartTest?: boolean; matchingLevelDetails?: any; isTestUser?: boolean; + exceptionUsername?: string; }; const UserProfile: FC = ({ userName = 'Guest User', @@ -61,6 +62,7 @@ const UserProfile: FC = ({ title, matchingLevelDetails, isTestUser, + exceptionUsername, }) => { const router = useRouter(); const { isMobile } = useMobile()[1]; @@ -131,7 +133,9 @@ const UserProfile: FC = ({
{!!title && {title}} -

{userName}

+

+ {exceptionUsername ? exceptionUsername : userName} +

{`${ diff --git a/src/layouts/UXCatLayout/UXCatLayout.tsx b/src/layouts/UXCatLayout/UXCatLayout.tsx index f602590..90581a9 100644 --- a/src/layouts/UXCatLayout/UXCatLayout.tsx +++ b/src/layouts/UXCatLayout/UXCatLayout.tsx @@ -218,6 +218,9 @@ const UXCatLayout: FC = ({ guestLevel={guestLevel} userLevel={level} userName={!userInfo ? guestUsername : username} + exceptionUsername={ + userInfo?.id === 1034 && userInfo?.usernameLong + } title={userInfo?.title} openLoginModal={openLoginModal} loggedIn={!!accessToken} diff --git a/src/layouts/UserProfile/UserProfile.tsx b/src/layouts/UserProfile/UserProfile.tsx index 5ab527d..a01e7bd 100644 --- a/src/layouts/UserProfile/UserProfile.tsx +++ b/src/layouts/UserProfile/UserProfile.tsx @@ -205,6 +205,8 @@ const UserProfile: FC = ({ awarenessPoints={awarenessPoints} level={level} username={username} + id={Number(userInfo?.id)} + usernameLong={userInfo?.usernameLong || ''} setOpenCoverImgModal={setOpenCoverImgModal} linkedIn={linkedIn} email={isValidEmail(userData?.email) ? userData?.email : ''} diff --git a/src/local-types/uxcat-types/types.ts b/src/local-types/uxcat-types/types.ts index 4f35b1d..8682364 100644 --- a/src/local-types/uxcat-types/types.ts +++ b/src/local-types/uxcat-types/types.ts @@ -3,6 +3,7 @@ export type UserTypes = { id: number | string; nextTestTime?: number | null; username: string; + usernameLong?: string; email?: string; points?: number; title: string; @@ -31,7 +32,7 @@ export type UserTypes = { username: string; email?: string; picture?: string; - username_long: string; + usernameLong?: string; isTestUser?: boolean; points?: number; nextTestTime?: number | null; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index a5fadd3..2000ceb 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -152,7 +152,8 @@ function App({ Component, pageProps: { session, ...pageProps } }: TApp) { useEffect(() => { const getData = async () => { - if (!session?.user) return; + const hasAccessToken = !!localStorage.getItem('accessToken'); + if (!session?.user && !hasAccessToken) return; try { const data = await getMyInfo(); if (data) { diff --git a/src/pages/user/[userId]/certificate.tsx b/src/pages/user/[userId]/certificate.tsx index d2f874d..d37a0e0 100644 --- a/src/pages/user/[userId]/certificate.tsx +++ b/src/pages/user/[userId]/certificate.tsx @@ -1,5 +1,5 @@ import { useRouter } from 'next/router'; -import React from 'react'; +import React, { useContext } from 'react'; import type { TRouter } from '@local-types/global'; @@ -7,6 +7,7 @@ import { getCertificate } from '@api/uxcat/certificate'; import pageNotFoundData from '@data/404'; +import { GlobalContext } from '@components/Context/GlobalContext'; import Spinner from '@components/Spinner'; import CertificateLayout from '@layouts/CertificateLayout'; @@ -16,8 +17,12 @@ import NotFoundPage from '../../404'; const Certificate = ({ userId, certificate }) => { const router = useRouter(); const { locale } = router as TRouter; + const { accountData } = useContext(GlobalContext); - const name = `${certificate?.name} ${certificate?.surname}`; + const name = + accountData?.id === 1034 + ? 'Кузнецов Тимофей Юрьевич' + : `${certificate?.name} ${certificate?.surname}`; const date = new Date(certificate?.certificatedAt); const day = date.getUTCDate(); const month = date.getUTCMonth() + 1;