hippoz/waffle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: hippoz:164545bb26c8fd900662855747f40d2b5e81271c
Branches Tags
hippoz:master
...
compare: hippoz:3668b45a309d058ba19a2532316452d90653a908
Branches Tags
hippoz:master

2 commits
164545bb26 ... 3668b45a30

Author SHA1 Message Date
hippoz
3668b45a30
frontend: separate more elements into different components 2022-04-23 01:06:04 +03:00
hippoz
6a1e89c288
frontend: remove debug function 2022-04-23 00:31:36 +03:00
4 changed files with 102 additions and 92 deletions
Show stats Expand all files Collapse all files

26
frontend/src/components/pages/main/ChannelTopBar.svelte Normal file
View file

@ -0,0 +1,26 @@
<script>
import { HashIcon } from "svelte-feather-icons";
export let channel;
</script>
<style>
.top-bar {
display: flex;
align-items: center;
justify-content: flex-start;
height: 3.4em;
width: 100%;
padding: var(--space-xs);
border-bottom: 1px solid var(--background-color-2);
}
.channel-heading {
margin-left: var(--space-xxs);
}
</style>
<div class="top-bar">
<HashIcon />
<span class="h5 channel-heading">{ channel.name }</span>
</div>

86
frontend/src/components/pages/main/ChannelView.svelte
View file

@ -1,48 +1,9 @@
<script>
import { HashIcon } from "svelte-feather-icons";
import request from "../../../request";
import { apiRoute } from "../../../storage";
import { messagesStoreProvider, userInfoStore } from "../../../stores";
import ChannelTopBar from "./ChannelTopBar.svelte";
import MessageInput from "./MessageInput.svelte";
import Messages from "./Messages.svelte";
export let channel;
let messageInput = "";
$: messages = messagesStoreProvider.getStore(channel.id);
const onKeydown = async (e) => {
if (e.code !== "Enter")
return;
if (messageInput.trim() === "" || !$userInfoStore)
return;
// optimistically add message to store
const optimisticMessageId = Math.floor(Math.random() * 999999);
const optimisticMessage = {
id: optimisticMessageId,
content: messageInput,
channel_id: channel.id,
author_id: $userInfoStore.id,
author_username: $userInfoStore.username,
created_at: Date.now().toString(),
_isPending: true
};
messages.addMessage(optimisticMessage);
messageInput = "";
const res = await request("POST", apiRoute(`channels/${channel.id}/messages`), true, {
content: optimisticMessage.content
});
if (res.success && res.ok) {
messages.setMessage(optimisticMessageId, res.json);
} else {
messages.deleteMessage({
id: optimisticMessageId
});
}
};
</script>
<style>
@ -54,49 +15,10 @@
width: 100%;
height: 100%;
}
.top-bar {
height: 3.4em;
width: 100%;
padding: var(--space-xs);
display: flex;
align-items: center;
border-bottom: 1px solid var(--background-color-2);
}
.channel-heading {
margin-left: var(--space-xxs);
}
.message-input-container {
width: 100%;
padding: var(--space-norm);
}
.message-input {
height: 3em;
width: 100%;
background-color : var(--background-color-2);
border: none;
color: currentColor;
border-radius: var(--radius-md);
padding: var(--space-sm);
font-size: inherit;
line-height: inherit;
}
.message-input::placeholder {
color: var(--foreground-color-3);
}
</style>
<div class="main-container">
<div class="top-bar">
<HashIcon />
<span class="h5 channel-heading">{ channel.name }</span>
</div>
<ChannelTopBar channel={ channel } />
<Messages channelId="{ channel.id }" />
<div class="message-input-container">
<input placeholder={`Send something interesting to #${channel.name}`} type="text" class="message-input" on:keydown={ onKeydown } bind:value={ messageInput }>
</div>
<MessageInput channel={ channel } />
</div>

71
frontend/src/components/pages/main/MessageInput.svelte Normal file
View file

@ -0,0 +1,71 @@
<script>
import request from "../../../request";
import { apiRoute } from "../../../storage";
import { messagesStoreProvider, userInfoStore } from "../../../stores";
export let channel;
let messageInput = "";
$: messages = messagesStoreProvider.getStore(channel.id);
const onKeydown = async (e) => {
if (e.code !== "Enter")
return;
if (messageInput.trim() === "" || !$userInfoStore)
return;
// optimistically add message to store
const optimisticMessageId = Math.floor(Math.random() * 999999);
const optimisticMessage = {
id: optimisticMessageId,
content: messageInput,
channel_id: channel.id,
author_id: $userInfoStore.id,
author_username: $userInfoStore.username,
created_at: Date.now().toString(),
_isPending: true
};
messages.addMessage(optimisticMessage);
messageInput = "";
const res = await request("POST", apiRoute(`channels/${channel.id}/messages`), true, {
content: optimisticMessage.content
});
if (res.success && res.ok) {
messages.setMessage(optimisticMessageId, res.json);
} else {
messages.deleteMessage({
id: optimisticMessageId
});
}
};
</script>
<style>
.message-input-container {
width: 100%;
padding: var(--space-norm);
}
.message-input {
height: 3em;
width: 100%;
background-color : var(--background-color-2);
border: none;
color: currentColor;
border-radius: var(--radius-md);
padding: var(--space-sm);
font-size: inherit;
line-height: inherit;
}
.message-input::placeholder {
color: var(--foreground-color-3);
}
</style>
<div class="message-input-container">
<input placeholder={`Send something interesting to #${channel.name}`} type="text" class="message-input" on:keydown={ onKeydown } bind:value={ messageInput }>
</div>

11
frontend/src/main.js
View file

@ -1,7 +1,6 @@
import App from './components/App.svelte';
import gateway from './gateway';
import request from './request';
import { apiRoute, initStorageDefaults } from './storage';
import { initStorageDefaults } from './storage';
initStorageDefaults();
gateway.init();
@ -12,14 +11,6 @@ if (loadingElement) {
loadingElement.parentElement.removeChild(loadingElement);
}
window.__testing = async () => {
for (let i = 0; i < 100; i++) {
await request("POST", apiRoute("channels/6/messages"), true, {
content: `test ${i}`
});
}
};
const app = new App({
target: document.body
});