Compare commits

..

4 Commits

Author SHA1 Message Date
Szilárd Dóró
1bb71df7a1 Merge pull request #1616 from nhost/changeset-release/main
chore: update versions
2023-02-15 15:30:21 +01:00
github-actions[bot]
d7404e2247 chore: update versions 2023-02-15 14:04:47 +00:00
Szilárd Dóró
2aa91cf266 Merge pull request #1613 from nhost/fix/header-navlinks
fix(dashboard): fix header link color
2023-02-15 15:03:27 +01:00
Szilárd Dóró
7b970e6858 fix(dashboard): fix header link color 2023-02-15 09:58:53 +01:00
6 changed files with 28 additions and 23 deletions

View File

@@ -1,5 +1,11 @@
# @nhost/dashboard
## 0.11.9
### Patch Changes
- 7b970e68: fix(dashboard): fix header link color
## 0.11.8
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/dashboard",
"version": "0.11.8",
"version": "0.11.9",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",

View File

@@ -31,6 +31,7 @@ export default function Breadcrumbs({ className, ...props }: BreadcrumbsProps) {
<NavLink
href="/local/local"
className="truncate text-[13px] hover:underline sm:text-sm"
sx={{ color: 'text.primary' }}
>
local
</NavLink>
@@ -53,6 +54,7 @@ export default function Breadcrumbs({ className, ...props }: BreadcrumbsProps) {
<NavLink
href={`/${currentWorkspace.slug}`}
className="truncate text-[13px] hover:underline sm:text-sm"
sx={{ color: 'text.primary' }}
>
{currentWorkspace.name}
</NavLink>
@@ -66,6 +68,7 @@ export default function Breadcrumbs({ className, ...props }: BreadcrumbsProps) {
<NavLink
href={`/${currentWorkspace.slug}/${currentApplication.slug}`}
className="truncate text-[13px] hover:underline sm:text-sm"
sx={{ color: 'text.primary' }}
>
{currentApplication.name}
</NavLink>

View File

@@ -2,13 +2,12 @@ import Breadcrumbs from '@/components/common/Breadcrumbs';
import FeedbackForm from '@/components/common/FeedbackForm';
import Logo from '@/components/common/Logo';
import MobileNav from '@/components/common/MobileNav';
import NavLink from '@/components/common/NavLink';
import ThemeSwitcher from '@/components/common/ThemeSwitcher';
import { AccountMenu } from '@/components/dashboard/AccountMenu';
import useIsPlatform from '@/hooks/common/useIsPlatform';
import Box from '@/ui/v2/Box';
import { Dropdown } from '@/ui/v2/Dropdown';
import Link from '@/ui/v2/Link';
import NavLink from 'next/link';
import { useRouter } from 'next/router';
import type { DetailedHTMLProps, HTMLProps, PropsWithoutRef } from 'react';
import { twMerge } from 'tailwind-merge';
@@ -32,10 +31,8 @@ export default function Header({ className, ...props }: HeaderProps) {
{...props}
>
<div className="grid grid-flow-col items-center gap-3">
<NavLink href="/" passHref>
<Link href="/" className="w-12">
<Logo className="mx-auto cursor-pointer" />
</Link>
<NavLink href="/" className="w-12">
<Logo className="mx-auto cursor-pointer" />
</NavLink>
{(router.query.workspaceSlug || router.query.appSlug) && (
@@ -63,22 +60,17 @@ export default function Header({ className, ...props }: HeaderProps) {
)}
<NavLink
underline="none"
href="https://docs.nhost.io"
passHref
className="mr-2 rounded-md px-2.5 py-1.5 text-sm motion-safe:transition-colors"
sx={{
color: 'text.primary',
'&:hover': { backgroundColor: 'grey.200' },
}}
target="_blank"
rel="noopener noreferrer"
>
<Link
underline="none"
href="https://docs.nhost.io"
className="mr-2 rounded-md px-2.5 py-1.5 text-sm motion-safe:transition-colors"
sx={{
color: 'text.primary',
'&:hover': { backgroundColor: 'grey.200' },
}}
>
Docs
</Link>
Docs
</NavLink>
{isPlatform ? <AccountMenu /> : <ThemeSwitcher className="w-52" />}

View File

@@ -1,5 +1,7 @@
import type { LinkProps as MaterialLinkProps } from '@mui/material/Link';
import MaterialLink from '@mui/material/Link';
import MaterialLink, {
linkClasses as materialLinkClasses,
} from '@mui/material/Link';
import type { ForwardedRef } from 'react';
import { forwardRef } from 'react';
@@ -24,4 +26,6 @@ function Link(
Link.displayName = 'NhostLink';
export { materialLinkClasses as linkClasses };
export default forwardRef(Link);

View File

@@ -35,15 +35,15 @@ export default function useNotFoundRedirect() {
}
if (noResolvedWorkspace && notIn404Already) {
router.push('/404');
router.replace('/404');
}
if (noResolvedApplication && notIn404Already) {
router.push('/404');
router.replace('/404');
}
if (isProjectUsingRDS && inSettingsDatabasePage) {
router.push('/404');
router.replace('/404');
}
}, [
updating,