summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/lib/apiServer.js27
-rw-r--r--ui/lib/store/channels.js14
-rw-r--r--ui/routes/+layout.svelte8
3 files changed, 1 insertions, 48 deletions
diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js
index 3e270fc..5c6e5ef 100644
--- a/ui/lib/apiServer.js
+++ b/ui/lib/apiServer.js
@@ -1,6 +1,5 @@
import axios from 'axios';
-import { get } from 'svelte/store';
-import { currentUser, channelsList, logins, messages } from '$lib/store';
+import { channelsList, logins, messages } from '$lib/store';
export const apiServer = axios.create({
baseURL: '/api/',
@@ -116,33 +115,9 @@ function onMessageEvent(data) {
switch (data.event) {
case 'sent':
messages.update((value) => value.addMessage(data.channel, data.id, data.at, data.sender, data.body));
- displayToast(data);
break;
case 'deleted':
messages.update((value) => value.deleteMessage(data.id));
break;
}
}
-
-function displayToast(data) {
- // we use get throughout this as this function is not reactive, and just
- // needs the values of the stores at a moment in time.
- const currentUserId = get(currentUser).id;
- if (currentUserId === data.sender) {
- return;
- }
-
- const senderName = get(logins).get(data.sender);
- const channelName = get(channelsList).get(data.channel);
- const title = `${senderName} in ${channelName}`;
-
- const opts = {
- body: data.body,
- tag: title,
- // TODO: we need to inject the understory/hi icon in a more principled way here:
- icon: "/ui/lib/assets/logo.png",
- // TODO: support onclick bringing you to the relevant channel?
- onclick: null
- }
- new Notification(title, opts);
-}
diff --git a/ui/lib/store/channels.js b/ui/lib/store/channels.js
index 6d722c5..b57ca7e 100644
--- a/ui/lib/store/channels.js
+++ b/ui/lib/store/channels.js
@@ -1,26 +1,17 @@
export class Channels {
constructor() {
this.channels = [];
- this.channelData = {};
}
setChannels(channels) {
this.channels = [...channels];
this.sort();
- this.channelData = channels.reduce(
- (acc, val) => ({
- ...acc,
- [val.id]: val.name,
- }),
- {}
- );
return this;
}
addChannel(id, name) {
this.channels = [...this.channels, { id, name }];
this.sort();
- this.channelData[id] = name;
return this;
}
@@ -29,14 +20,9 @@ export class Channels {
if (channelIndex !== -1) {
this.channels.splice(channelIndex, 1);
}
- delete this.channelData[id];
return this;
}
- get(id) {
- return this.channelData[id];
- }
-
sort() {
this.channels.sort((a, b) => {
if (a.name < b.name) {
diff --git a/ui/routes/+layout.svelte b/ui/routes/+layout.svelte
index eb29179..a86a7e8 100644
--- a/ui/routes/+layout.svelte
+++ b/ui/routes/+layout.svelte
@@ -2,8 +2,6 @@
import "../app.css";
import logo from '$lib/assets/logo.png';
- import { onMount } from 'svelte';
-
import { AppBar } from '@skeletonlabs/skeleton';
import { showMenu, currentUser } from '$lib/store';
@@ -12,12 +10,6 @@
function toggleMenu() {
showMenu.update((value) => !value);
}
-
- onMount(() => {
- Notification.requestPermission().then((result) => {
- console.log(result);
- });
- });
</script>
<div id="app" class="m-0 p-0 h-vh w-full">