diff --git a/src/pages/VirtualList/Index.tsx b/src/pages/VirtualList/Index.tsx
index d86ab7cc..0326284f 100644
--- a/src/pages/VirtualList/Index.tsx
+++ b/src/pages/VirtualList/Index.tsx
@@ -69,7 +69,7 @@ export const VirtualList: Component
= (props) => {
left: 0,
}}>
import('@components/ContextMenu'))
-const DebugMenu = lazy(() => import('@components/ContextMenu/DevTools'))
+import { Header } from '@containers/Header'
const AppRoutes: Component = () => {
- const Path = useRoutes(routes)
-
const { get, set } = usePersistentStore()
const { doGHRequest, channelMode } = useAppAPIContext()
-
const { setDebugMode, getDebugMode } = useAppContext()
+ const { setContextMenuAnchor } = useAppUIContext()
const {
setEnableNotifications,
setEnableNotificationsSounds,
@@ -33,11 +29,8 @@ const AppRoutes: Component = () => {
checkPermission,
} = useAppNotificationsContext()
- const { setContextMenuAnchor, getContextAnchor } = useAppUIContext()
-
onMount(() => {
setContextMenuAnchor('custom-context-menu')
- console.log('context anchor', getContextAnchor())
//* load the app settings from the persistent store and assign to the global state
get('settings').then((settings) => {
if (settings) {
@@ -96,15 +89,17 @@ const AppRoutes: Component = () => {
})
return (
-
+ {
+ return (
+
+ )
+ }}>
+ {routes}
+
)
}
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 3176bbea..678d0622 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -1,14 +1,14 @@
import { lazy } from 'solid-js'
import type { RouteDefinition } from '@solidjs/router'
-const BoardConfigurator = lazy(() => import('@containers/ManageBoard/ManageBoard'))
-const NetworkConfigurator = lazy(() => import('@containers/ManageNetwork/ManageNetwork'))
-const FlashFirmware = lazy(() => import('@containers/FlashFirmware/FlashFirmware'))
+const NetworkConfigurator = lazy(() => import('@containers/ManageNetwork'))
+const BoardConfigurator = lazy(() => import('@containers/ManageBoard'))
+const FlashFirmware = lazy(() => import('@containers/FlashFirmware'))
const page404 = lazy(() => import('@containers/404/[...404]'))
export const routes: RouteDefinition[] = [
- { path: '/', component: BoardConfigurator },
- { path: '/network', component: NetworkConfigurator },
{ path: '/flashFirmware', component: FlashFirmware },
+ { path: '/network', component: NetworkConfigurator },
+ { path: '/', component: BoardConfigurator },
{ path: '**', component: page404 },
]
diff --git a/src/static/index.ts b/src/static/index.ts
index 78c754b2..ad16e710 100644
--- a/src/static/index.ts
+++ b/src/static/index.ts
@@ -51,6 +51,10 @@ export const stepStatus: {
export const BoardDescription: {
[key in BOARD_TYPE]: string
} = {
+ [BOARD_TYPE.BABBLE_WROOMS_S3]: 'Official Babble tracker board (wireless mode)',
+ [BOARD_TYPE.BABBLE_WROOMS_S3_RELEASE]: 'Official Babble tracker board (wireless mode)',
+ [BOARD_TYPE.BABBLE_USB_WROOMS_S3]: 'Official Babble tracker board (wired mode)',
+ [BOARD_TYPE.BABBLE_USB_WROOMS_S3_RELEASE]: 'Official Babble tracker board (wired mode)',
[BOARD_TYPE.ESP_32_AI_THINKER]: 'Default for ESP32-AI-THINKER and ESP CAM boards.',
[BOARD_TYPE.ESP_32]:
'Special ESP32-CAM, it is unlikely that you will need to use this environment.',
@@ -61,15 +65,17 @@ export const BoardDescription: {
[BOARD_TYPE.WROOMS_3_QIO]: 'FREENOVE-ESP32-S3 (wireless mode, for boards with octal flash)',
[BOARD_TYPE.WROOMS_3_USB]: 'FREENOVE-ESP32-S3 (wired mode)',
[BOARD_TYPE.WROOMS_3QIOUSB]: 'FREENOVE-ESP32-S3 (wired mode, for boards with octal flash)',
- // eslint-disable-next-line quotes
[BOARD_TYPE.XIAOSENSES_3]: "SeedStudio's XIAO ESP32-S3 Sense (wireless mode)",
- // eslint-disable-next-line quotes
[BOARD_TYPE.XIAOSENSES_3_USB]: "SeedStudio's XIAO ESP32-S3 Sense (wired mode)",
}
export const BoardConnectionMethod: {
[key in BOARD_TYPE]: string
} = {
+ [BOARD_TYPE.BABBLE_WROOMS_S3]: 'wireless mode',
+ [BOARD_TYPE.BABBLE_WROOMS_S3_RELEASE]: 'wireless mode',
+ [BOARD_TYPE.BABBLE_USB_WROOMS_S3_RELEASE]: 'wired mode',
+ [BOARD_TYPE.BABBLE_USB_WROOMS_S3]: 'wired mode',
[BOARD_TYPE.ESP_32_AI_THINKER]: 'wireless mode',
[BOARD_TYPE.ESP_32]: 'wireless mode',
[BOARD_TYPE.ESP_32_M_5_STACK]: 'wireless mode',
diff --git a/src/static/types/enums.ts b/src/static/types/enums.ts
index 834539bf..762332ad 100644
--- a/src/static/types/enums.ts
+++ b/src/static/types/enums.ts
@@ -97,6 +97,10 @@ export enum DIRECTION {
}
export enum BOARD_TYPE {
+ BABBLE_WROOMS_S3 = 'Babble_wrooms_s3',
+ BABBLE_WROOMS_S3_RELEASE = 'Babble_wrooms_s3_release',
+ BABBLE_USB_WROOMS_S3 = 'Babble_USB_wrooms_s3',
+ BABBLE_USB_WROOMS_S3_RELEASE = 'Babble_USB_wrooms_s3_release',
ESP_32_AI_THINKER = 'esp32AIThinker',
ESP_32 = 'esp32Cam',
ESP_32_M_5_STACK = 'esp32M5Stack',
diff --git a/src/store/context/api.tsx b/src/store/context/api.tsx
index e73b1dbd..769a7386 100644
--- a/src/store/context/api.tsx
+++ b/src/store/context/api.tsx
@@ -28,6 +28,7 @@ import { DEFAULT_PORT_NAME } from '@src/static'
import { GHEndpoints } from '@src/static/endpoints'
import { O } from '@static/types'
import { makeRequest } from 'tauri-plugin-request-client'
+import { formatDeviceName } from '@src/utils'
interface AppAPIContext {
//********************************* gh rest *************************************/
@@ -376,7 +377,9 @@ export const AppAPIProvider: Component = (props) => {
const firmware_assets = assets.map((asset: { name: string }) => asset.name)
// split the firmware_assets array of strings on the first dash and return the first element of the array
- const boardName = firmware_assets.map((asset: string) => asset.split('-')[0])
+ const boardName = firmware_assets.map((asset: string) => {
+ return formatDeviceName(asset)
+ })
// set the board name in the store
for (let i = 0; i < boardName.length; i++) {
diff --git a/src/styles/index.css b/src/styles/index.css
index 2e9f69e3..ac6cf59b 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -3,52 +3,6 @@ input[type='password']::-ms-clear {
display: none;
}
-@layer components {
- .card {
- background-color: theme('colors.white');
- border-radius: theme('borderRadius.lg');
- padding-left: theme('spacing.6');
- padding-right: theme('spacing.6');
- padding-bottom: theme('spacing.6');
- padding-top: theme('spacing.8');
- /* box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 6px, rgba(0, 0, 0, 0.23) 0px 3px 6px; */
- box-shadow:
- rgba(0, 0, 0, 0.19) 0px 10px 20px,
- rgba(0, 0, 0, 0.23) 0px 6px 6px;
- margin-top: 2rem;
- }
-
- .menu-bars {
- margin-left: 2rem;
- background: none;
- }
-
- .quick-menu-text-gradient {
- background-color: #5f5f5f /* #5f5f5f */;
- background-image: linear-gradient(90deg, #000000c1, #ffffff);
- background-size: 100%;
- background-clip: text;
- -webkit-background-clip: text;
- -moz-background-clip: text;
- -webkit-text-fill-color: transparent;
- -moz-text-fill-color: transparent;
- }
-
- .icon:hover svg path {
- fill: #fff;
- }
-
- .icon:focus svg path {
- fill: #fff;
- }
-
- @media screen and (min-width: 768px) {
- .nav-text:hover {
- background-color: theme('colors.blue.300');
- }
- }
-}
-
#root {
text-align: center;
background-color: transparent;
@@ -89,7 +43,11 @@ input[type='password']::-ms-clear {
/* This style is REQUIRED due to how kobalte handles focus-visible state */
* {
- @apply outline-none [&[data-focus-visible]]:outline-white;
+ outline: none;
+}
+
+*:focus-visible {
+ outline: 0px;
}
body {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 15765f63..dd81842d 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -81,11 +81,18 @@ export const shortName = (label: string, size: number = 12): string => {
return `${label.slice(0, size)}...${label.slice(-size)}`
}
-export const stringToHex = (str: string) => {
- let hex = '';
+export const stringToHex = (str: string) => {
+ let hex = ''
for (let i = 0; i < str.length; i++) {
// Convert each character to its UTF-16 code unit and then to hex
- hex += str.charCodeAt(i).toString(16).padStart(2, '0'); // pad to 2 digits
+ hex += str.charCodeAt(i).toString(16).padStart(2, '0') // pad to 2 digits
}
- return hex;
+ return hex
+}
+
+export const formatDeviceName = (filename: string): string => {
+ return filename
+ .replace(/\.zip$/, '')
+ .split('-v')[0]
+ .replace(/-/g, '_')
}
diff --git a/src/windows/docs/docs.tsx b/src/windows/docs/docs.tsx
index 591493f6..746e76ec 100644
--- a/src/windows/docs/docs.tsx
+++ b/src/windows/docs/docs.tsx
@@ -36,11 +36,15 @@ const App = () => {
render(
() => (
-
-
-
-
-
+ {
+ return (
+
+
+
+ )
+ }}
+ />
),
document.getElementById('root') as HTMLElement,
)
diff --git a/src/windows/docs/index.html b/src/windows/docs/index.html
index 1f7ed076..fb0fa520 100644
--- a/src/windows/docs/index.html
+++ b/src/windows/docs/index.html
@@ -42,7 +42,7 @@
-
+
Date: Thu, 30 Jan 2025 19:16:16 +0100
Subject: [PATCH 02/90] Beta conflicts (#27)
* conflict
* conflicts
* resolved issue with imports
* terminal header
---
src/App.tsx | 2 +-
src/components/Board/{Board => DefaultBoard}/index.tsx | 4 ++--
src/components/Buttons/{DefaultButton => Button}/index.tsx | 0
.../Buttons/{CheckboxButton/Index.tsx => Checkbox/index.tsx} | 0
.../Buttons/DropdownButton/{Index.tsx => index.tsx} | 0
src/components/Checkbox/{Index.tsx => index.tsx} | 0
src/components/Dropdown/Dropdown/{Index.tsx => index.tsx} | 0
src/components/Dropdown/DropdownList/{Index.tsx => index.tsx} | 4 ++--
src/components/Footer/index.tsx | 2 +-
src/components/Modal/{Index.tsx => index.tsx} | 0
src/components/ModalHeader/{Index.tsx => index.tsx} | 0
src/components/Terminal/Firmware/{Index.tsx => index.tsx} | 0
src/components/Terminal/Step/{Index.tsx => index.tsx} | 0
.../Terminal/TerminalHeader/{Index.tsx => index.tsx} | 0
src/containers/Modals/{Index.tsx => index.tsx} | 0
src/pages/Modals/ApModeModal.tsx | 2 +-
src/pages/Modals/BeforeFlashingModal.tsx | 4 ++--
src/pages/Modals/WifiModal.tsx | 2 +-
src/pages/Terminal/{Index.tsx => index.tsx} | 2 +-
src/pages/VirtualList/{Index.tsx => index.tsx} | 0
20 files changed, 11 insertions(+), 11 deletions(-)
rename src/components/Board/{Board => DefaultBoard}/index.tsx (92%)
rename src/components/Buttons/{DefaultButton => Button}/index.tsx (100%)
rename src/components/Buttons/{CheckboxButton/Index.tsx => Checkbox/index.tsx} (100%)
rename src/components/Buttons/DropdownButton/{Index.tsx => index.tsx} (100%)
rename src/components/Checkbox/{Index.tsx => index.tsx} (100%)
rename src/components/Dropdown/Dropdown/{Index.tsx => index.tsx} (100%)
rename src/components/Dropdown/DropdownList/{Index.tsx => index.tsx} (95%)
rename src/components/Modal/{Index.tsx => index.tsx} (100%)
rename src/components/ModalHeader/{Index.tsx => index.tsx} (100%)
rename src/components/Terminal/Firmware/{Index.tsx => index.tsx} (100%)
rename src/components/Terminal/Step/{Index.tsx => index.tsx} (100%)
rename src/components/Terminal/TerminalHeader/{Index.tsx => index.tsx} (100%)
rename src/containers/Modals/{Index.tsx => index.tsx} (100%)
rename src/pages/Terminal/{Index.tsx => index.tsx} (99%)
rename src/pages/VirtualList/{Index.tsx => index.tsx} (100%)
diff --git a/src/App.tsx b/src/App.tsx
index 051d153d..e712ff71 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,7 +3,7 @@ import { lazy, onMount, Suspense } from 'solid-js'
import { useAppContextMain } from './store/context/main'
const ToastNotificationWindow = lazy(() => import('@components/Notifications'))
-const Modals = lazy(() => import('@containers/Modals/Index'))
+const Modals = lazy(() => import('@containers/Modals'))
const AppRoutes = lazy(() => import('@routes/Routes'))
const App = () => {
diff --git a/src/components/Board/Board/index.tsx b/src/components/Board/DefaultBoard/index.tsx
similarity index 92%
rename from src/components/Board/Board/index.tsx
rename to src/components/Board/DefaultBoard/index.tsx
index 52482285..1ffb96f5 100644
--- a/src/components/Board/Board/index.tsx
+++ b/src/components/Board/DefaultBoard/index.tsx
@@ -8,7 +8,7 @@ export interface IProps {
isActive?: boolean
}
-export const Board: Component
= (props) => {
+export const DefaultBoard: Component = (props) => {
return (
})
-