diff --git a/package-lock.json b/package-lock.json
index 0402a23..94ca433 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,13 +11,14 @@
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
- "@mantine/core": "^9.4.1",
- "@mantine/dates": "^9.4.1",
+ "@mantine/core": "^9.8.1",
+ "@mantine/dates": "^9.8.1",
"@mantine/form": "^9.3.1",
- "@mantine/hooks": "^9.4.1",
- "@mantine/modals": "^9.4.1",
- "@mantine/notifications": "^9.4.1",
- "@mantine/tiptap": "^9.4.1",
+ "@mantine/hooks": "^9.8.1",
+ "@mantine/modals": "^9.8.1",
+ "@mantine/notifications": "^9.8.1",
+ "@mantine/spotlight": "^9.8.1",
+ "@mantine/tiptap": "^9.8.1",
"@tabler/icons-react": "^3.44.0",
"@tanstack/react-query": "^5.101.0",
"@tiptap/extension-link": "^3.27.3",
@@ -517,32 +518,32 @@
}
},
"node_modules/@floating-ui/core": {
- "version": "1.7.5",
- "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
- "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+ "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
"license": "MIT",
"dependencies": {
- "@floating-ui/utils": "^0.2.11"
+ "@floating-ui/utils": "^0.2.12"
}
},
"node_modules/@floating-ui/dom": {
- "version": "1.7.6",
- "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
- "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+ "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
"license": "MIT",
"dependencies": {
- "@floating-ui/core": "^1.7.5",
- "@floating-ui/utils": "^0.2.11"
+ "@floating-ui/core": "^1.8.0",
+ "@floating-ui/utils": "^0.2.12"
}
},
"node_modules/@floating-ui/react": {
- "version": "0.27.19",
- "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.19.tgz",
- "integrity": "sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==",
+ "version": "0.27.20",
+ "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.20.tgz",
+ "integrity": "sha512-CMqMy7OaXl9W0eq1Uy7L7i2Y/anPvHmFmESd2CEw0t5YvZhcVCeo4MBevAmswRllX7Y2dEidA4ozGPunLSTQpw==",
"license": "MIT",
"dependencies": {
- "@floating-ui/react-dom": "^2.1.8",
- "@floating-ui/utils": "^0.2.11",
+ "@floating-ui/react-dom": "^2.1.9",
+ "@floating-ui/utils": "^0.2.12",
"tabbable": "^6.0.0"
},
"peerDependencies": {
@@ -551,12 +552,12 @@
}
},
"node_modules/@floating-ui/react-dom": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz",
- "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==",
+ "version": "2.1.9",
+ "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+ "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
"license": "MIT",
"dependencies": {
- "@floating-ui/dom": "^1.7.6"
+ "@floating-ui/dom": "^1.8.0"
},
"peerDependencies": {
"react": ">=16.8.0",
@@ -564,9 +565,9 @@
}
},
"node_modules/@floating-ui/utils": {
- "version": "0.2.11",
- "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
- "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+ "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==",
"license": "MIT"
},
"node_modules/@humanfs/core": {
@@ -686,34 +687,34 @@
}
},
"node_modules/@mantine/core": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/core/-/core-9.4.1.tgz",
- "integrity": "sha512-lZWEICrum4+vwKxzh/mk4RB1N6BqZ0Cshdl6lhm7OYLiQzmOaxKtOgyaWz+vr65G8mqTXjalZalB+wmMVBYK2Q==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/core/-/core-9.8.1.tgz",
+ "integrity": "sha512-+ayBTxun7MslJL6x4qaylVy6TyHu3o68+PH22gt70eJSHgy0CHYR/c2q+BYxS8WvORuc4f5mr0xFbi0vzlgHug==",
"license": "MIT",
"dependencies": {
- "@floating-ui/react": "^0.27.19",
+ "@floating-ui/react": "^0.27.20",
"clsx": "^2.1.1",
"react-number-format": "^5.4.5",
"react-remove-scroll": "^2.7.2",
- "type-fest": "^5.7.0"
+ "type-fest": "^5.10.0"
},
"peerDependencies": {
- "@mantine/hooks": "9.4.1",
+ "@mantine/hooks": "9.8.1",
"react": "^19.2.0",
"react-dom": "^19.2.0"
}
},
"node_modules/@mantine/dates": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/dates/-/dates-9.4.1.tgz",
- "integrity": "sha512-DoQDvQMAlIw6ohwhUwYuTYQevG9y5AQmYWkhOHUuavABFEZmtBglkwziBoATvxT09I/6I56UMPhproXcS6XUfg==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/dates/-/dates-9.8.1.tgz",
+ "integrity": "sha512-BDYvM3hSvTkFNAqnRmL/nhf8NnoqwXOUe+jxq7xZZ1ME9NaVT5u3QuLY2zEilqF3Wm0iUtf3LP6deL9c4gunSQ==",
"license": "MIT",
"dependencies": {
"clsx": "^2.1.1"
},
"peerDependencies": {
- "@mantine/core": "9.4.1",
- "@mantine/hooks": "9.4.1",
+ "@mantine/core": "9.8.1",
+ "@mantine/hooks": "9.8.1",
"dayjs": ">=1.0.0",
"react": "^19.2.0",
"react-dom": "^19.2.0"
@@ -734,59 +735,74 @@
}
},
"node_modules/@mantine/hooks": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-9.4.1.tgz",
- "integrity": "sha512-eTI8wmzPx3r98zgKIEuvukmoGTHBhmtI6+9E6o2DbTmEU2eM1bCdjE2vFdf0op2AlRO0KEYEcZhNQi4T/SJk0A==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-9.8.1.tgz",
+ "integrity": "sha512-aAbY3zcqrS/n+wbMnKBXMiF5TJ7HZ06sH455Cf4ZkWRXko9Td2FYSe9aONCzXFaW62XqaWHBICyeIsAmUds3uA==",
"license": "MIT",
"peerDependencies": {
"react": "^19.2.0"
}
},
"node_modules/@mantine/modals": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-9.4.1.tgz",
- "integrity": "sha512-z5G3Biz7/5Ybz5Z8u5Xyvo9UBmFhAX/YXMf6U96ejvtAB11xVnCo8m37R5DJyzeFEqB4D1tvUgWiVVPBb+yadw==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-9.8.1.tgz",
+ "integrity": "sha512-QwlPGmwyWXIq5YM3xzbeVQ6dJXTm98YBcrI7YQ6lraHxEXHZAr6M2HDIF4Pqd158mP/Oc+HL+UPd0cvSeZfHLQ==",
"license": "MIT",
"peerDependencies": {
- "@mantine/core": "9.4.1",
- "@mantine/hooks": "9.4.1",
+ "@mantine/core": "9.8.1",
+ "@mantine/hooks": "9.8.1",
"react": "^19.2.0",
"react-dom": "^19.2.0"
}
},
"node_modules/@mantine/notifications": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-9.4.1.tgz",
- "integrity": "sha512-Sm1g8E8RkFmesxpNz9zFvOjkTVxOa7dJJjMGoHNIXH+9/wO0s9kInny4mVnxTbLJJsD6nTqIQlk1v8tq2C4Ftw==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-9.8.1.tgz",
+ "integrity": "sha512-lqi9+HfXMbMKzEsAIUkWRFw2rURzgVMv8//oCyq0rhy27X6NjSMMlzvwsjbSazT/+WugDIYLJ8khZ+JMW1gkMQ==",
"license": "MIT",
"dependencies": {
- "@mantine/store": "9.4.1",
+ "@mantine/store": "9.8.1",
"react-transition-group": "4.4.5"
},
"peerDependencies": {
- "@mantine/core": "9.4.1",
- "@mantine/hooks": "9.4.1",
+ "@mantine/core": "9.8.1",
+ "@mantine/hooks": "9.8.1",
+ "react": "^19.2.0",
+ "react-dom": "^19.2.0"
+ }
+ },
+ "node_modules/@mantine/spotlight": {
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/spotlight/-/spotlight-9.8.1.tgz",
+ "integrity": "sha512-x5BL6D1Khp6GxhWWxhPgtoyPb40zFgwKx8XfjyoDMRANGhQ+vijyjyDHol7nYQq8DMiM2G4Hnue2vMyTDEkS1g==",
+ "license": "MIT",
+ "dependencies": {
+ "@mantine/store": "9.8.1"
+ },
+ "peerDependencies": {
+ "@mantine/core": "9.8.1",
+ "@mantine/hooks": "9.8.1",
"react": "^19.2.0",
"react-dom": "^19.2.0"
}
},
"node_modules/@mantine/store": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/store/-/store-9.4.1.tgz",
- "integrity": "sha512-/DCZq0aqqIdm03J0RJ7pbzoau2cwY8ndSOjskHOKHhTeWMnOBdCKXA3oMO5aIDldDqJ9T7Io4Boh4Pt461zNQw==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/store/-/store-9.8.1.tgz",
+ "integrity": "sha512-Wb5+6i6m3GdNgOjX1IbDPYrP76v9y4zThRoKDWH9Es+qY2c6gT2NpH7n10/zYgNPL8ipB6H6gGUPhLurs1o4kg==",
"license": "MIT",
"peerDependencies": {
"react": "^19.2.0"
}
},
"node_modules/@mantine/tiptap": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/@mantine/tiptap/-/tiptap-9.4.1.tgz",
- "integrity": "sha512-0qN6SFh9BuwXNOHUf4ygx8LPvWcgU1zUULY7IJ9zKiVHfa1K6b0BRa8LpLVKtVv7K5NLyj2uHJwv+mXB+ypOJw==",
+ "version": "9.8.1",
+ "resolved": "https://registry.npmjs.org/@mantine/tiptap/-/tiptap-9.8.1.tgz",
+ "integrity": "sha512-jpeLjEL0z6QUoTMuZnwfTem3ITuNd1zKjHqElptEuhFCUWKtV4sIobiRk6bOkPcANeAXCzy4P3Xquxlnq/+erg==",
"license": "MIT",
"peerDependencies": {
- "@mantine/core": "9.4.1",
- "@mantine/hooks": "9.4.1",
+ "@mantine/core": "9.8.1",
+ "@mantine/hooks": "9.8.1",
"@tiptap/extension-link": ">=3.3.0",
"@tiptap/react": ">=3.3.0",
"react": "^19.2.0",
@@ -4356,9 +4372,9 @@
}
},
"node_modules/tabbable": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
- "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.5.2.tgz",
+ "integrity": "sha512-XgdnB1nGU6KU4VgMnZPaZCx7M1hBrLyEiZYau2G2gq9UT0d7d4FUBlNX7vvPlm/B1vk1PjrzJBx9Lbv4fsqS9g==",
"license": "MIT"
},
"node_modules/tagged-tag": {
@@ -4429,9 +4445,9 @@
}
},
"node_modules/type-fest": {
- "version": "5.7.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.7.0.tgz",
- "integrity": "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==",
+ "version": "5.10.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.10.0.tgz",
+ "integrity": "sha512-NoSdpq/WEiAg5sjmBkmV/hfxv6HJH4NqPNrqjtSO5CwRmpsDfaf4begxW34KdJykH/l1yHtwBWQkCRdoXO8mPA==",
"license": "(MIT OR CC0-1.0)",
"dependencies": {
"tagged-tag": "^1.0.0"
diff --git a/package.json b/package.json
index 9a1d8e4..2805e9a 100644
--- a/package.json
+++ b/package.json
@@ -13,13 +13,14 @@
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
- "@mantine/core": "^9.4.1",
- "@mantine/dates": "^9.4.1",
+ "@mantine/core": "^9.8.1",
+ "@mantine/dates": "^9.8.1",
"@mantine/form": "^9.3.1",
- "@mantine/hooks": "^9.4.1",
- "@mantine/modals": "^9.4.1",
- "@mantine/notifications": "^9.4.1",
- "@mantine/tiptap": "^9.4.1",
+ "@mantine/hooks": "^9.8.1",
+ "@mantine/modals": "^9.8.1",
+ "@mantine/notifications": "^9.8.1",
+ "@mantine/spotlight": "^9.8.1",
+ "@mantine/tiptap": "^9.8.1",
"@tabler/icons-react": "^3.44.0",
"@tanstack/react-query": "^5.101.0",
"@tiptap/extension-link": "^3.27.3",
diff --git a/src/components/Layout/Header.tsx b/src/components/Layout/Header.tsx
index d53691f..4d0aedd 100644
--- a/src/components/Layout/Header.tsx
+++ b/src/components/Layout/Header.tsx
@@ -1,13 +1,12 @@
import {
- Group,
- Burger,
- Text,
- Avatar,
- Menu,
- ActionIcon,
+ Group, Burger, Text, Avatar, Menu, ActionIcon, Button, Kbd, Breadcrumbs, Box, UnstyledButton,
+ useMantineColorScheme, useComputedColorScheme,
} from '@mantine/core'
-import { IconLogout, IconUser } from '@tabler/icons-react'
+import { spotlight } from '@mantine/spotlight'
+import { IconLogout, IconSearch, IconSun, IconMoon, IconUser } from '@tabler/icons-react'
+import { useLocation } from 'react-router-dom'
import { useAuth } from '@/hooks/useAuth'
+import { findTrail } from './navigation'
interface HeaderProps {
toggleMobile: () => void
@@ -16,54 +15,93 @@ interface HeaderProps {
desktopOpened: boolean
}
-export default function Header({
- toggleMobile,
- toggleDesktop,
- mobileOpened,
- desktopOpened
- }: HeaderProps) {
+function ColorSchemeToggle() {
+ const { setColorScheme } = useMantineColorScheme()
+ const computed = useComputedColorScheme('light', { getInitialValueInEffect: true })
+ return (
+ setColorScheme(computed === 'light' ? 'dark' : 'light')}
+ >
+ {computed === 'dark' ? : }
+
+ )
+}
+
+export default function Header({ toggleMobile, toggleDesktop, mobileOpened, desktopOpened }: HeaderProps) {
const { user, logout } = useAuth()
+ const { pathname } = useLocation()
+ const trail = findTrail(pathname)
+ const role = user?.is_root ? 'Суперадмин' : user?.is_observer ? 'Наблюдатель' : 'Администратор'
return (
-
-
-
-
-
- Портал сотрудника РусПЭТ
-
+
+
+
+
+
+
+
+ Р
+
+ Портал РусПЭТ
+
+
+ {trail.length > 0 && (
+
+ {trail.map((t, i) => (
+
+ {t}
+
+ ))}
+
+ )}
-
-