Skip to content

Commit a29382d

Browse files
authored
fix: update floating actions components nav link and Navigation components ui
2 parents a59488c + aa5c0d3 commit a29382d

File tree

6 files changed

+92
-23
lines changed

6 files changed

+92
-23
lines changed

thingconnect.pulse.client/obj/Debug/package.g.props

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageJsonDependenciesVisxTooltip Condition="$(PackageJsonDependenciesVisxTooltip) == ''">^3.12.0</PackageJsonDependenciesVisxTooltip>
2525
<PackageJsonDependenciesAxios Condition="$(PackageJsonDependenciesAxios) == ''">^1.11.0</PackageJsonDependenciesAxios>
2626
<PackageJsonDependenciesDateFns Condition="$(PackageJsonDependenciesDateFns) == ''">^4.1.0</PackageJsonDependenciesDateFns>
27+
<PackageJsonDependenciesFramerMotion Condition="$(PackageJsonDependenciesFramerMotion) == ''">^12.23.14</PackageJsonDependenciesFramerMotion>
2728
<PackageJsonDependenciesLodash Condition="$(PackageJsonDependenciesLodash) == ''">^4.17.21</PackageJsonDependenciesLodash>
2829
<PackageJsonDependenciesLucideReact Condition="$(PackageJsonDependenciesLucideReact) == ''">^0.541.0</PackageJsonDependenciesLucideReact>
2930
<PackageJsonDependenciesLuxon Condition="$(PackageJsonDependenciesLuxon) == ''">^3.7.2</PackageJsonDependenciesLuxon>
@@ -36,31 +37,31 @@
3637
<PackageJsonDependenciesReactHookForm Condition="$(PackageJsonDependenciesReactHookForm) == ''">^7.62.0</PackageJsonDependenciesReactHookForm>
3738
<PackageJsonDependenciesReactIcons Condition="$(PackageJsonDependenciesReactIcons) == ''">^5.5.0</PackageJsonDependenciesReactIcons>
3839
<PackageJsonDependenciesReactRouterDom Condition="$(PackageJsonDependenciesReactRouterDom) == ''">^7.8.1</PackageJsonDependenciesReactRouterDom>
39-
<PackageJsonDependenciesZod Condition="$(PackageJsonDependenciesZod) == ''">^4.0.17</PackageJsonDependenciesZod>
40+
<PackageJsonDependenciesZod Condition="$(PackageJsonDependenciesZod) == ''">^4.1.9</PackageJsonDependenciesZod>
4041
<PackageJsonDevdependenciesChakraUiCli Condition="$(PackageJsonDevdependenciesChakraUiCli) == ''">^3.24.0</PackageJsonDevdependenciesChakraUiCli>
4142
<PackageJsonDevdependenciesEslintJs Condition="$(PackageJsonDevdependenciesEslintJs) == ''">^9.33.0</PackageJsonDevdependenciesEslintJs>
4243
<PackageJsonDevdependenciesTanstackEslintPluginQuery Condition="$(PackageJsonDevdependenciesTanstackEslintPluginQuery) == ''">^5.83.1</PackageJsonDevdependenciesTanstackEslintPluginQuery>
4344
<PackageJsonDevdependenciesTanstackReactQueryDevtools Condition="$(PackageJsonDevdependenciesTanstackReactQueryDevtools) == ''">^5.85.5</PackageJsonDevdependenciesTanstackReactQueryDevtools>
4445
<PackageJsonDevdependenciesTypesLodash Condition="$(PackageJsonDevdependenciesTypesLodash) == ''">^4.17.20</PackageJsonDevdependenciesTypesLodash>
4546
<PackageJsonDevdependenciesTypesLuxon Condition="$(PackageJsonDevdependenciesTypesLuxon) == ''">^3.7.1</PackageJsonDevdependenciesTypesLuxon>
46-
<PackageJsonDevdependenciesTypesNode Condition="$(PackageJsonDevdependenciesTypesNode) == ''">^22</PackageJsonDevdependenciesTypesNode>
47+
<PackageJsonDevdependenciesTypesNode Condition="$(PackageJsonDevdependenciesTypesNode) == ''">^24</PackageJsonDevdependenciesTypesNode>
4748
<PackageJsonDevdependenciesTypesNumeral Condition="$(PackageJsonDevdependenciesTypesNumeral) == ''">^2.0.5</PackageJsonDevdependenciesTypesNumeral>
48-
<PackageJsonDevdependenciesTypesReact Condition="$(PackageJsonDevdependenciesTypesReact) == ''">^19.1.10</PackageJsonDevdependenciesTypesReact>
49-
<PackageJsonDevdependenciesTypesReactDom Condition="$(PackageJsonDevdependenciesTypesReactDom) == ''">^19.1.7</PackageJsonDevdependenciesTypesReactDom>
50-
<PackageJsonDevdependenciesVitejsPluginReactSwc Condition="$(PackageJsonDevdependenciesVitejsPluginReactSwc) == ''">^3.11.0</PackageJsonDevdependenciesVitejsPluginReactSwc>
51-
<PackageJsonDevdependenciesEslint Condition="$(PackageJsonDevdependenciesEslint) == ''">^9.33.0</PackageJsonDevdependenciesEslint>
49+
<PackageJsonDevdependenciesTypesReact Condition="$(PackageJsonDevdependenciesTypesReact) == ''">^19.1.13</PackageJsonDevdependenciesTypesReact>
50+
<PackageJsonDevdependenciesTypesReactDom Condition="$(PackageJsonDevdependenciesTypesReactDom) == ''">^19.1.9</PackageJsonDevdependenciesTypesReactDom>
51+
<PackageJsonDevdependenciesVitejsPluginReactSwc Condition="$(PackageJsonDevdependenciesVitejsPluginReactSwc) == ''">^4.1.0</PackageJsonDevdependenciesVitejsPluginReactSwc>
52+
<PackageJsonDevdependenciesEslint Condition="$(PackageJsonDevdependenciesEslint) == ''">^9.35.0</PackageJsonDevdependenciesEslint>
5253
<PackageJsonDevdependenciesEslintConfigPrettier Condition="$(PackageJsonDevdependenciesEslintConfigPrettier) == ''">^10.1.8</PackageJsonDevdependenciesEslintConfigPrettier>
53-
<PackageJsonDevdependenciesEslintPluginReactDom Condition="$(PackageJsonDevdependenciesEslintPluginReactDom) == ''">^1.52.3</PackageJsonDevdependenciesEslintPluginReactDom>
54+
<PackageJsonDevdependenciesEslintPluginReactDom Condition="$(PackageJsonDevdependenciesEslintPluginReactDom) == ''">^1.53.1</PackageJsonDevdependenciesEslintPluginReactDom>
5455
<PackageJsonDevdependenciesEslintPluginReactHooks Condition="$(PackageJsonDevdependenciesEslintPluginReactHooks) == ''">^5.2.0</PackageJsonDevdependenciesEslintPluginReactHooks>
5556
<PackageJsonDevdependenciesEslintPluginReactRefresh Condition="$(PackageJsonDevdependenciesEslintPluginReactRefresh) == ''">^0.4.20</PackageJsonDevdependenciesEslintPluginReactRefresh>
56-
<PackageJsonDevdependenciesEslintPluginReactX Condition="$(PackageJsonDevdependenciesEslintPluginReactX) == ''">^1.52.3</PackageJsonDevdependenciesEslintPluginReactX>
57+
<PackageJsonDevdependenciesEslintPluginReactX Condition="$(PackageJsonDevdependenciesEslintPluginReactX) == ''">^1.53.1</PackageJsonDevdependenciesEslintPluginReactX>
5758
<PackageJsonDevdependenciesGlobals Condition="$(PackageJsonDevdependenciesGlobals) == ''">^16.3.0</PackageJsonDevdependenciesGlobals>
5859
<PackageJsonDevdependenciesHusky Condition="$(PackageJsonDevdependenciesHusky) == ''">^9.1.7</PackageJsonDevdependenciesHusky>
5960
<PackageJsonDevdependenciesLintStaged Condition="$(PackageJsonDevdependenciesLintStaged) == ''">^16.1.4</PackageJsonDevdependenciesLintStaged>
6061
<PackageJsonDevdependenciesPrettier Condition="$(PackageJsonDevdependenciesPrettier) == ''">^3.6.2</PackageJsonDevdependenciesPrettier>
61-
<PackageJsonDevdependenciesTypescript Condition="$(PackageJsonDevdependenciesTypescript) == ''">~5.8.3</PackageJsonDevdependenciesTypescript>
62-
<PackageJsonDevdependenciesTypescriptEslint Condition="$(PackageJsonDevdependenciesTypescriptEslint) == ''">^8.39.1</PackageJsonDevdependenciesTypescriptEslint>
63-
<PackageJsonDevdependenciesVite Condition="$(PackageJsonDevdependenciesVite) == ''">^7.1.2</PackageJsonDevdependenciesVite>
62+
<PackageJsonDevdependenciesTypescript Condition="$(PackageJsonDevdependenciesTypescript) == ''">~5.9.2</PackageJsonDevdependenciesTypescript>
63+
<PackageJsonDevdependenciesTypescriptEslint Condition="$(PackageJsonDevdependenciesTypescriptEslint) == ''">^8.44.0</PackageJsonDevdependenciesTypescriptEslint>
64+
<PackageJsonDevdependenciesVite Condition="$(PackageJsonDevdependenciesVite) == ''">^7.1.6</PackageJsonDevdependenciesVite>
6465
<PackageJsonDevdependenciesViteTsconfigPaths Condition="$(PackageJsonDevdependenciesViteTsconfigPaths) == ''">^5.1.4</PackageJsonDevdependenciesViteTsconfigPaths>
6566
<PackageJsonLintStagedTsTsx Condition="$(PackageJsonLintStagedTsTsx) == ''">[
6667
"eslint --fix",

thingconnect.pulse.client/package-lock.json

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thingconnect.pulse.client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@visx/tooltip": "^3.12.0",
2626
"axios": "^1.11.0",
2727
"date-fns": "^4.1.0",
28+
"framer-motion": "^12.23.14",
2829
"lodash": "^4.17.21",
2930
"lucide-react": "^0.541.0",
3031
"luxon": "^3.7.2",

thingconnect.pulse.client/src/components/layout/FloatingActions.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import { NotificationBellSimple } from '@/components/notifications/NotificationB
77

88
// Route-to-help URL mapping
99
const ROUTE_HELP_URLS: Record<string, string> = {
10-
'/': 'https://docs.thingconnect.io/pulse/user-guide/dashboard',
11-
'/configuration': 'https://docs.thingconnect.io/pulse/user-guide/configuration',
12-
'/history': 'https://docs.thingconnect.io/pulse/user-guide/viewing-history',
13-
'/settings': 'https://docs.thingconnect.io/pulse/user-guide/settings',
14-
'/about': 'https://docs.thingconnect.io/pulse/about',
10+
'/': 'https://docs.thingconnect.io/pulse/live-board-and-history',
11+
'/configuration': 'https://docs.thingconnect.io/pulse/yaml-configuration',
12+
'/history': 'https://docs.thingconnect.io/pulse/live-board-and-history#historical-data-analysis',
13+
// '/settings': 'https://docs.thingconnect.io/pulse/user-guide/settings',
14+
// '/about': 'https://docs.thingconnect.io/pulse/about',
1515
};
1616

1717
export function FloatingActions() {

thingconnect.pulse.client/src/components/layout/Navigation.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Box, VStack, Text, Icon, Image, HStack, Badge, Button } from '@chakra-ui/react';
1+
import { Box, VStack, Text, Icon, Image, HStack, Button } from '@chakra-ui/react';
22
import { Link as RouterLink, useLocation } from 'react-router-dom';
3-
import { Wifi, Activity, LogOut } from 'lucide-react';
3+
import { LogOut } from 'lucide-react';
44
import thingConnectIcon from '@/assets/thingconnect-pulse-logo.svg';
55
import { Clock, Wrench, Settings, Info, Dashboard, Help, Users } from '@/icons';
66
import { useAuth } from '@/features/auth/context/AuthContext';
@@ -39,7 +39,7 @@ export function Navigation({ onItemClick }: NavigationProps) {
3939
return (
4040
<Box h='100%' display='flex' flexDirection='column' data-testid='navigation'>
4141
<Box
42-
p={6}
42+
m={3}
4343
borderBottom='1px'
4444
borderColor='gray.200'
4545
_dark={{ borderColor: 'gray.700' }}
@@ -104,7 +104,7 @@ export function Navigation({ onItemClick }: NavigationProps) {
104104
<Box p={4} borderTop='1px' borderColor='gray.200' _dark={{ borderColor: 'gray.700' }}>
105105
<VStack align='stretch' gap={4}>
106106
<VStack align='stretch' gap={3}>
107-
<HStack gap={2} display={{ base: 'none', md: 'flex' }} data-testid='connection-status'>
107+
{/* <HStack gap={2} display={{ base: 'none', md: 'flex' }} data-testid='connection-status'>
108108
<Wifi size={16} aria-label='Connection status' />
109109
<Badge colorPalette='green' variant='solid' size='sm'>
110110
Connected
@@ -120,8 +120,8 @@ export function Navigation({ onItemClick }: NavigationProps) {
120120
>
121121
Updated 2s ago
122122
</Text>
123-
</HStack>
124-
<HStack gap={2}>
123+
</HStack> */}
124+
{/* <HStack gap={2}>
125125
<Icon
126126
as={Activity}
127127
boxSize={4}
@@ -138,7 +138,7 @@ export function Navigation({ onItemClick }: NavigationProps) {
138138
>
139139
System Online
140140
</Text>
141-
</HStack>
141+
</HStack> */}
142142
</VStack>
143143
<Button
144144
onClick={handleLogout}

thingconnect.pulse.client/src/pages/Configuration.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default function Configuration() {
3939
h='full'
4040
display='flex'
4141
flexDirection='column'
42+
w={'full'}
4243
>
4344
<TabsList flexShrink={0} _dark={{ bg: 'gray.700' }}>
4445
<TabsTrigger value='editor'>

0 commit comments

Comments
 (0)