-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
technical/layout into [email protected] 🐢 minor global changes (not found page, page metadata, titles) #76
Open
Melly5
wants to merge
8
commits into
[email protected]
Choose a base branch
from
technical/layout
base: [email protected]
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f623571
technical/layout 🐢 add not found page, change metadata
Melly5 d3000cb
Merge branch '[email protected]' into technical/layout
Melly5 f3aed82
technical/layout 🐢 fix not-found and add metadata
Melly5 1b6d2f1
technical/layout 🐢 add metadata
Melly5 d3c33c0
technical/layout 🐢 add translations to metadata
Melly5 07a8cee
technical/layout 🐢 add user role in nor found
Melly5 feafca6
Merge branch '[email protected]' into technical/layout
Melly5 1de1d90
technical/layout 🐢 replace dictionaries with geti18n, change naming
Melly5 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
import { headers } from 'next/headers'; | ||
import Link from 'next/link'; | ||
|
||
import { I18nText } from '@/components/common'; | ||
import { buttonVariants, Typography } from '@/components/ui'; | ||
import { cn } from '@/lib/utils'; | ||
import { getUserSession } from '@/utils/helpers/server'; | ||
|
||
import Layout from './org/(panel)/layout'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OrgLayout |
||
|
||
const NotFoundComponent = ({ link }: { link: string }) => ( | ||
<div className='flex h-full w-full flex-col items-center justify-center gap-2 p-6'> | ||
<Typography variant='h3'> | ||
<I18nText path='page.notFound.title' /> | ||
</Typography> | ||
<Link | ||
href={{ | ||
pathname: link, | ||
query: { step: 'login' } | ||
}} | ||
className={cn(buttonVariants({ size: 'lg', variant: 'primary' }), 'w-full max-w-96')} | ||
> | ||
<I18nText path='button.backToRoot' /> | ||
</Link> | ||
</div> | ||
); | ||
|
||
const NotFound = () => { | ||
const userSession = getUserSession(); | ||
const headersList = headers(); | ||
|
||
const pathname = headersList.get('referer'); | ||
const isOrg = pathname?.includes('/org/'); | ||
const isPartner = pathname?.includes('/partner/'); | ||
|
||
// TODO будем ли отслеживать org / partner пути для редиректа | ||
console.log(userSession, pathname, isOrg, isPartner); | ||
|
||
return ( | ||
<> | ||
{!userSession && ( | ||
<div className='h-screen w-screen'> | ||
<NotFoundComponent link='/' /> | ||
</div> | ||
)} | ||
{userSession && ( | ||
Melly5 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<Layout> | ||
<NotFoundComponent link='/org/organizations/dashboard' /> | ||
</Layout> | ||
)} | ||
</> | ||
); | ||
}; | ||
|
||
export default NotFound; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
не нужно делать 1 not found на все, not found можно реализоваывать на каждый сегмент org можно сделать отдельно, для обчного приложения тоже отдельно
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
вчера выяснили точно, что такая история не прокатит, возможен только глобальный not-found, поэтому думала как предложила отслеживать через isOrg и isPartner, но выявила проблему что при рендере referer всегда пустой, поэтому отказалась от них
единственный варик который вижу - отслеживать в мидлваре, но стоит ли оно сейчас того, жду предложений
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.