Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions src/app.tsx → app.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from "preact";

import { Notificator } from "./system/notificator";
import { NotificationDispatcher } from "./system/notification_dispatcher";
import { NotificationComponent } from "./pipeline/notification_component";
import { Notificator } from "./src/lib/system/notificator";
import { NotificationDispatcher } from "./src/lib/system/notification_dispatcher";
import { NotificationComponent } from "./src/ui/preact/notification_component";

import {
AlertArrayQueue,
Expand All @@ -11,33 +11,33 @@ import {
ConfirmMonitorNotificationQueue,
AlertLimitNotificationQueue,
ConfirmLimitNotificationQueue,
} from "./system/notification_types";
} from "./src/lib/system/notification_types";

import { NotificationModality } from "./system/notification";
import { NotificationModality } from "./src/lib/system/notification";

import { SystemClock } from "./system/system_clock";
import { LocalSystemClock } from "./system/local_system_clock";
import { SystemClock } from "./src/lib/system/system_clock";
import { LocalSystemClock } from "./src/lib/system/local_system_clock";

import { Fetcher } from "./http/fetcher";
import { Formatter } from "./fmt/formatter";
import { HTTPFetcher } from "./http/http_fetcher";
import { PeriodicDataFetcher } from "./device/periodic_data_fetcher";
import { JSONFormatter } from "./fmt/json_formatter";
import { Config } from "./device/config";
import { HTTPConfig } from "./device/http_config";
import { AnalogSensorComponent } from "./pipeline/sensor/soil/analog_sensor_component";
import { Fetcher } from "./src/lib/http/fetcher";
import { Formatter } from "./src/lib/fmt/formatter";
import { HTTPFetcher } from "./src/lib/http/http_fetcher";
import { PeriodicDataFetcher } from "./src/lib/device/periodic_data_fetcher";
import { JSONFormatter } from "./src/lib/fmt/json_formatter";
import { Config } from "./src/lib/device/config";
import { HTTPConfig } from "./src/lib/device/http_config";
import { AnalogSensorComponent } from "./src/ui/preact/sensor/soil/analog_sensor_component";

import { Rebooter } from "./device/rebooter";
import { Locator } from "./device/locator";
import { HTTPRebooter } from "./device/http_rebooter";
import { HTTPLocator } from "./device/http_locator";
import { NavigationComponent } from "./pipeline/navigation_component";
import { BonsaiLogo } from "./pipeline/logo/bonsai";
import { Rebooter } from "./src/lib/device/rebooter";
import { Locator } from "./src/lib/device/locator";
import { HTTPRebooter } from "./src/lib/device/http_rebooter";
import { HTTPLocator } from "./src/lib/device/http_locator";
import { NavigationComponent } from "./src/ui/preact/navigation_component";
import { BonsaiLogo } from "./src/ui/preact/logo/bonsai";

import { html as helpContent } from "./help.md";

import "./pipeline/app.css";
import "./pipeline/dashboard.css";
import "./src/ui/preact/app.css";
import "./src/ui/preact/dashboard.css";

type appProps = {};

Expand Down
31 changes: 31 additions & 0 deletions eslint.config.base.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import eslintPluginPrettier from "eslint-plugin-prettier";
import typescriptPlugin from "@typescript-eslint/eslint-plugin";
import typescriptParser from "@typescript-eslint/parser";

export default [
{
files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
languageOptions: {
parser: typescriptParser,
ecmaVersion: 2021,
sourceType: "module",
parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
globals: {
window: "readonly",
document: "readonly",
console: "readonly",
},
},
plugins: {
prettier: eslintPluginPrettier,
"@typescript-eslint": typescriptPlugin,
},
rules: {
"prettier/prettier": "error",
},
},
];
34 changes: 2 additions & 32 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,2 @@
import eslintPluginPrettier from "eslint-plugin-prettier";
import typescriptPlugin from "@typescript-eslint/eslint-plugin";
import typescriptParser from "@typescript-eslint/parser";

export default [
{
files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], // Specify file patterns
languageOptions: {
parser: typescriptParser,
ecmaVersion: 2021,
sourceType: "module",
parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
globals: {
window: "readonly",
document: "readonly",
console: "readonly",
// Add other browser or ES2021 globals as needed
},
},
plugins: {
prettier: eslintPluginPrettier,
"@typescript-eslint": typescriptPlugin,
},
rules: {
"prettier/prettier": "error",
},
},
];
import baseConfig from "./eslint.config.base.js";
export default baseConfig;
3 changes: 3 additions & 0 deletions help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Introduction

Place any useful information here.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/ico.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Bonsai Zero Analog 1 Kit Web GUI</title>
<title>Device UI</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.tsx"></script>
<script type="module" src="./main.tsx"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main.tsx → main.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "./pipeline/index.css";
import "./src/ui/preact/index.css";

import { render } from "preact";

Expand Down
70 changes: 0 additions & 70 deletions src/help.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from "preact";

import { Config } from "../device/config";
import { Notificator } from "../system/notificator";
import { NotificationSeverity } from "../system/notification";
import { Config } from "../../lib/device/config";
import { Notificator } from "../../lib/system/notificator";
import { NotificationSeverity } from "../../lib/system/notification";

type configState = {
data: Record<string, any> | null;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, JSX } from "preact";

import { ObjectMonitor } from "../core/object_monitor";
import { StateMonitor } from "../core/state_monitor";
import { ObjectMonitor } from "../../lib/core/object_monitor";
import { StateMonitor } from "../../lib/core/state_monitor";

import "./markdown_component.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Component, JSX } from "preact";

import { Rebooter } from "../device/rebooter";
import { Locator } from "../device/locator";
import { Notificator } from "../system/notificator";
import { NotificationSeverity } from "../system/notification";
import { Rebooter } from "../../lib/device/rebooter";
import { Locator } from "../../lib/device/locator";
import { Notificator } from "../../lib/system/notificator";
import { NotificationSeverity } from "../../lib/system/notification";
import { MarkdownComponent } from "./markdown_component";
import { StateMonitor } from "../core/state_monitor";
import { StateMonitor } from "../../lib/core/state_monitor";

import "./dashboard.css";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { render } from "@testing-library/preact";

import { describe, test, expect } from "vitest";

import { MonitorNotificationQueue } from "../system/monitor_notification_queue";

import { NotificationDispatcher } from "../system/notification_dispatcher";
import { MonitorNotificationQueue } from "../../lib/system/monitor_notification_queue";
import { NotificationDispatcher } from "../../lib/system/notification_dispatcher";

import {
AlertNotification,
Expand All @@ -13,17 +12,17 @@ import {
ConfirmArrayQueue,
AlertLimitNotificationQueue,
ConfirmLimitNotificationQueue,
} from "../system/notification_types";
} from "../../lib/system/notification_types";

import {
Notification,
NotificationSeverity,
NotificationModality,
} from "../system/notification";
} from "../../lib/system/notification";

import { TestSystemClock } from "../tests/test_system_clock";
import { TestSystemClock } from "../../lib/tests/test_system_clock";

import { ObjectMonitor } from "../core/object_monitor";
import { ObjectMonitor } from "../../lib/core/object_monitor";

import { NotificationComponent } from "./notification_component";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import {
ConfirmNotification,
AlertMonitorNotificationQueue,
ConfirmMonitorNotificationQueue,
} from "../system/notification_types";
} from "../../lib/system/notification_types";

import {
NotificationSeverity,
NotificationModality,
} from "../system/notification";
} from "../../lib/system/notification";

import { ObjectMonitor } from "../core/object_monitor";
import { SystemClock } from "../system/system_clock";
import { ObjectMonitor } from "../../lib/core/object_monitor";
import { SystemClock } from "../../lib/system/system_clock";

import "./notification_component.css";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { describe, test, expect } from "vitest";

import { AnalogSensorComponent } from "./analog_sensor_component";

import { DefaultNotificator } from "../../../system/default_notificator";
import { PeriodicDataFetcher } from "../../../device/periodic_data_fetcher";
import { JSONFormatter } from "../../../fmt/json_formatter";
import { Fetcher } from "../../../http/fetcher";
import { DefaultNotificator } from "../../../../lib/system/default_notificator";
import { PeriodicDataFetcher } from "../../../../lib/device/periodic_data_fetcher";
import { JSONFormatter } from "../../../../lib/fmt/json_formatter";
import { Fetcher } from "../../../../lib/http/fetcher";

import { TestFetcher } from "../../../tests/test_fetcher";
import { TestConfig } from "../../../tests/test_config";
import { TestFetcher } from "../../../../lib/tests/test_fetcher";
import { TestConfig } from "../../../../lib/tests/test_config";

describe("Analog Soil Sensor Component", () => {
test("Queue state management on mount/unmount", async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Component } from "preact";

import { FormConfigComponent } from "../../../pipeline/form_config_component";
import { Config } from "../../../device/config";
import { Notificator } from "../../../system/notificator";
import { AnalogSensorData } from "../../../device/sensor/soil/data_types";
import { PeriodicDataFetcher } from "../../../device/periodic_data_fetcher";
import { TelemetryParser } from "../../../device/telemetry_parser";
import { FormConfigComponent } from "../../../../ui/preact/form_config_component";
import { Config } from "../../../../lib/device/config";
import { Notificator } from "../../../../lib/system/notificator";
import { AnalogSensorData } from "../../../../lib/device/sensor/soil/data_types";
import { PeriodicDataFetcher } from "../../../../lib/device/periodic_data_fetcher";
import { TelemetryParser } from "../../../../lib/device/telemetry_parser";

import "./analog_sensor_component.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "preact/hooks";

import { SystemTelemetryData } from "../device/data_types";
import { SystemTelemetryData } from "../../lib/device/data_types";

// System telemetry settings used during the rendering process.
export type SystemTelemetryProps = {
Expand Down
File renamed without changes.
13 changes: 13 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"jsx": "react-jsx",
"jsxImportSource": "preact",
"strict": true,
"target": "es6",
"module": "esnext",
"moduleResolution": "node",
"esModuleInterop": true,
"lib": ["dom", "es2024"],
"types": ["vite/client"]
}
}
17 changes: 3 additions & 14 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
{
"compilerOptions": {
"jsx": "react-jsx",
"jsxImportSource": "preact",
"strict": true,
"target": "es6",
"module": "esnext",
"moduleResolution": "node",
"esModuleInterop": true,
"lib": ["dom", "es2024"],
// Only include Vite types.
"types": ["vite/client"]
},
"include": ["src/**/*"],
"exclude": ["src/**/*.test.ts", "src/**/*.test.tsx", "src/tests/**/*"]
"extends": "./tsconfig.base.json",
"include": ["src/**/**/*"],
"exclude": ["src/**/**/*.test.ts", "src/**/**/*.test.tsx", "src/lib/tests/**/*"]
}
Loading