Skip to content

Develop #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valyukhov merged 2 commits into from
Nov 25, 2024
Merged

Develop #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785595b
fix: :bug: fix routing in main page
Valyukhov Nov 25, 2024
73fa73f
Merge pull request #734 from hiscoder-com/fix-rouing-main-page
Valyukhov Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions components/StartPage/SectionBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Link from 'next/link'
import { useRouter } from 'next/router'

import Close from 'public/icons/close.svg'
Expand Down Expand Up @@ -41,14 +40,6 @@ function SectionBlock({
showSection ? '' : 'hidden'
}`}
/>
{showSection && (
<Link
href="/"
className="absolute z-10 cursor-pointer"
onClick={(e) => e.stopPropagation()}
scroll={false}
></Link>
)}
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions components/StartPage/StartPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ function StartPage({ defaultContentKey = null }) {
})
}
}

const mainLink = router.pathname === '/' ? `/${contentRoutes['logo']}` : '/'
return (
<>
<main className="relative mx-auto hidden h-[84vh] max-h-[40rem] w-full max-w-6xl px-5 text-xl font-bold md:flex lg:max-h-[40rem] lg:px-16 xl:max-h-[50rem] xl:px-20 2xl:max-h-[56.4rem] 2xl:px-0">
<aside className="flex w-1/4 flex-col gap-4 pr-3 xl:gap-7 xl:pr-6">
<Link
href={`/${contentRoutes['logo']}`}
href={mainLink}
className="flex flex-grow cursor-pointer items-center justify-center rounded-2xl bg-white p-5 lg:p-7"
>
<LevelLogo className="" />
Expand Down Expand Up @@ -257,7 +257,7 @@ function StartPage({ defaultContentKey = null }) {
</div>
</main>
<main className="relative flex flex-col gap-5 p-5 text-lg font-medium md:hidden">
<Link href={`/${contentRoutes['logo']}`}>
<div onClick={() => router.replace(mainLink)}>
<SectionBlock
sectionKey="logo"
content={<Logo t={t} />}
Expand All @@ -266,7 +266,7 @@ function StartPage({ defaultContentKey = null }) {
isLogo={true}
label={<LevelLogo className="h-7" />}
/>
</Link>
</div>
<div className="grid grid-cols-2 gap-5 text-center">
{!showSections.signIn && (
<div className="z-20 flex items-center justify-center rounded-xl bg-th-secondary-10 p-4">
Expand Down