Skip to content

Small changes and improvements #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 2, 2024
Merged

Small changes and improvements #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db0e1ee
Adds type for notification type
runeharlyk Apr 2, 2024
6d7a3fc
Removes duplicate code
runeharlyk Apr 2, 2024
744df74
Closes notification channel
runeharlyk Apr 2, 2024
5bdcdda
Removes uncommented code
runeharlyk Apr 2, 2024
2fc6d95
Moves appname and copyright to layoutts
runeharlyk Apr 2, 2024
54ffa90
Handles unsuccessful release requests
runeharlyk Apr 2, 2024
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
6 changes: 5 additions & 1 deletion interface/src/lib/components/UpdateIndicator.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
let firmwareDownloadLink: string;

async function getGithubAPI() {
const githubUrl = `https://api.github.com/repos/${$page.data.github}/releases/latest`;
try {
const response = await fetch(
'https://api.github.com/repos/' + $page.data.github + '/releases/latest',
githubUrl,
{
method: 'GET',
headers: {
Expand All @@ -28,6 +29,9 @@
}
}
);
if (response.status !== 200) {
throw new Error(`Failed to fetch latest release from ${githubUrl}`);
}
const results = await response.json();

update = false;
Expand Down
12 changes: 6 additions & 6 deletions interface/src/lib/components/toasts/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { writable, derived } from 'svelte/store';
import { writable, derived, type Writable } from 'svelte/store';

type StateType = 'info' | 'success' | 'warning' | 'error';

type State = {
id: string;
type: string;
type: StateType;
message: string;
timeout: number;
};
Expand All @@ -11,14 +13,12 @@ function createNotificationStore() {
const state: State[] = [];
const _notifications = writable(state);

function send(message: string, type = 'info', timeout: number) {
function send(message: string, type: StateType = 'info', timeout: number) {
_notifications.update((state) => {
return [...state, { id: id(), type, message, timeout }];
});
}

let timers = [];

const notifications = derived(_notifications, ($_notifications, set) => {
set($_notifications);
if ($_notifications.length > 0) {
Expand All @@ -32,7 +32,7 @@ function createNotificationStore() {
clearTimeout(timer);
};
}
});
}) as Writable<State[]>;
const { subscribe } = notifications;

return {
Expand Down
8 changes: 1 addition & 7 deletions interface/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

export let data: LayoutData;

//$: console.log($analytics);

onMount(() => {
if ($user.bearer_token !== '') {
validateUser($user);
Expand All @@ -31,10 +29,6 @@
NotificationSource?.close();
});

onDestroy(() => {
NotificationSource.close();
});

async function validateUser(userdata: userProfile) {
try {
const response = await fetch('/rest/verifyAuthorization', {
Expand Down Expand Up @@ -162,7 +156,7 @@

function reconnectEventSource() {
if (connectionLost === false) {
NotificationSource.close;
NotificationSource.close();
notifications.error('Connection to device lost', 5000);
if (reconnectIntervalId === 0) {
reconnectIntervalId = setInterval(connectToEventSource, 2000);
Expand Down
4 changes: 3 additions & 1 deletion interface/src/routes/+layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export const load = (async () => {
return {
features: item,
title: 'ESP32-SvelteKit',
github: 'theelims/ESP32-sveltekit'
github: 'theelims/ESP32-sveltekit',
copyright: '2023 theelims',
appName: 'ESP32 SvelteKit'
};
}) satisfies LayoutLoad;
8 changes: 2 additions & 6 deletions interface/src/routes/menu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
import { user } from '$lib/stores/user';
import { createEventDispatcher } from 'svelte';

const appName = 'ESP32 SvelteKit';

const copyright = '2023 theelims';

const github = { href: 'https://github.com/' + $page.data.github, active: true };

const discord = { href: '.', active: false };
Expand Down Expand Up @@ -179,7 +175,7 @@
on:click={() => setActiveMenuItem(menuItems, '')}
>
<img src={logo} alt="Logo" class="h-12 w-12" />
<h1 class="px-4 text-2xl font-bold">{appName}</h1>
<h1 class="px-4 text-2xl font-bold">{$page.data.appName}</h1>
</a>
<ul class="menu rounded-box menu-vertical flex-nowrap overflow-y-auto">
{#each menuItems as menuItem, i (menuItem.title)}
Expand Down Expand Up @@ -260,7 +256,7 @@
>
{/if}
<div class="inline-flex flex-grow items-center justify-end text-sm">
<Copyright class="h-4 w-4" /><span class="px-2">{copyright}</span>
<Copyright class="h-4 w-4" /><span class="px-2">{$page.data.copyright}</span>
</div>
</div>
</div>