Skip to content

Commit

Permalink
Merge branch 'main' into features
Browse files Browse the repository at this point in the history
  • Loading branch information
theelims authored Oct 8, 2023
2 parents 01508f9 + bca085c commit c69ba2b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 27 deletions.
2 changes: 1 addition & 1 deletion docs/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Three slots are available. Besides the main slot for the content there is a name

The component exports two properties to determine its behavior. `collapsible` is a boolean describing wether the component should behave like a collapsible in the first place. `open` is a boolean as well and if set true shows the full content of the body on mount.

## Spinner
## Spinner (OBSOLETE)

A small component showing an animated spinner which can be used while waiting for data.

Expand Down
1 change: 1 addition & 0 deletions docs/stores.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ It exposes an array of the following properties you can subscribe to:
| `$analytics.core_temp` | `Number` | Core temperature (on some chips) |

By default there is one data point every 2 seconds.

4 changes: 2 additions & 2 deletions factory_settings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ build_flags =
-D FACTORY_JWT_SECRET=\"#{random}-#{random}\" ; supports placeholders

; Deep Sleep Configuration
-D WAKEUP_PIN_NUMBER=1 ; pin number to wake up the ESP
-D WAKEUP_SIGNAL=1 ; 1 for wakeup on HIGH, 0 for wakeup on LOW
-D WAKEUP_PIN_NUMBER=38 ; pin number to wake up the ESP
-D WAKEUP_SIGNAL=0 ; 1 for wakeup on HIGH, 0 for wakeup on LOW


22 changes: 0 additions & 22 deletions interface/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions interface/src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
NotificationSource?.close();
});
onDestroy(() => {
NotificationSource.close();
});
async function validateUser(userdata: userProfile) {
try {
const response = await fetch('/rest/verifyAuthorization', {
Expand Down Expand Up @@ -167,6 +171,7 @@
}
connectionLost = true;
}
</script>

<svelte:head>
Expand Down
9 changes: 7 additions & 2 deletions interface/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ const config: UserConfig = {
proxy: {
// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
'/rest': {
target: 'http://192.168.1.89',
target: 'http://192.168.1.83',
changeOrigin: true
},
// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
'/events': {
target: 'http://192.168.1.83',
changeOrigin: true
},
// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
Expand All @@ -26,7 +31,7 @@ const config: UserConfig = {
},
// Proxying websockets ws://localhost:5173/ws -> ws://192.168.1.83/ws
'/ws': {
target: 'ws://192.168.1.89',
target: 'ws://192.168.1.83',
changeOrigin: true,
ws: true
}
Expand Down

0 comments on commit c69ba2b

Please sign in to comment.