Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8afd4a81b0 | |||
| a0a6fdaf55 | |||
| 0dc1e15e59 | |||
| 931ac91526 | |||
| c56b0aab8a |
@@ -1,2 +1,2 @@
|
||||
# Chatenium On Web
|
||||
A modern web application for Chatenium compatible with a wide range of devices.
|
||||
# Chatenium Nexum
|
||||
The next generation Web application for Chatenium, built on modern standards powered by Chatenium SDK (TypeScript).
|
||||
|
||||
@@ -42,12 +42,12 @@
|
||||
{
|
||||
"type": "initial",
|
||||
"maximumWarning": "500kB",
|
||||
"maximumError": "1MB"
|
||||
"maximumError": "100MB"
|
||||
},
|
||||
{
|
||||
"type": "anyComponentStyle",
|
||||
"maximumWarning": "4kB",
|
||||
"maximumError": "8kB"
|
||||
"maximumError": "100MB"
|
||||
}
|
||||
],
|
||||
"outputHashing": "all",
|
||||
|
||||
8
package-lock.json
generated
8
package-lock.json
generated
@@ -16,7 +16,7 @@
|
||||
"@angular/platform-browser": "^21.2.0",
|
||||
"@angular/router": "^21.2.0",
|
||||
"@angular/service-worker": "^21.2.0",
|
||||
"@chatenium/chatenium-sdk": "^1.1.7",
|
||||
"@chatenium/chatenium-sdk": "^1.2.0",
|
||||
"@fortawesome/angular-fontawesome": "^4.0.0",
|
||||
"@fortawesome/free-brands-svg-icons": "^7.1.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^7.1.0",
|
||||
@@ -1011,9 +1011,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@chatenium/chatenium-sdk": {
|
||||
"version": "1.1.7",
|
||||
"resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.1.7.tgz",
|
||||
"integrity": "sha512-8stVVjKwwWZvUfVeWzSK1WGIiSt95Yxr80nfltZSDmqMKQaEA1sL9/2V6pobM4mCs9nzjUQQiniEPVQ0uxPXAg==",
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.2.0.tgz",
|
||||
"integrity": "sha512-myNvjsMbxRji6MEHufhgEbCmltLL+Azb2UUA+ovUDuf5+LcdYiLYcIF4A4/NAxRVYx3IcPB4uOVF2f5SqW2sLA==",
|
||||
"dependencies": {
|
||||
"@faker-js/faker": "^10.4.0",
|
||||
"axios": "^1.14.0",
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
"@angular/platform-browser": "^21.2.0",
|
||||
"@angular/router": "^21.2.0",
|
||||
"@angular/service-worker": "^21.2.0",
|
||||
"@chatenium/chatenium-sdk": "^1.1.7",
|
||||
"@chatenium/chatenium-sdk": "^1.2.0",
|
||||
"@fortawesome/angular-fontawesome": "^4.0.0",
|
||||
"@fortawesome/free-brands-svg-icons": "^7.1.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^7.1.0",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "3.0 Beta 4 (April 11, 2026)",
|
||||
"version": "Chatenium Nexum 3.0 Beta 8 (April 17, 2026)",
|
||||
"ok": "Ok",
|
||||
"back": "Back",
|
||||
"aChatProgram": "A messaging platform that you can trust.",
|
||||
@@ -8,14 +8,16 @@
|
||||
"independent": "Independent",
|
||||
"scrollDownForMore": "Scroll down for more",
|
||||
"whatIsChtn": "Chatenium is a chat platform aiming to provide a secure, well integrated fast chatting experience across any devices. You can create a new account for free and start chatting and broadcasting messages.",
|
||||
"updating": "Updating...",
|
||||
"home": {
|
||||
"soon": "Coming soon...",
|
||||
"chtn": "Chatenium ",
|
||||
"chtnIs": "Chatenium is ",
|
||||
"help": "Help",
|
||||
"blog": "Blog",
|
||||
"apiSpecs": "API specifications",
|
||||
"adaptsToYou": "adapts to you",
|
||||
"adaptsToYouDesc": "We actively work on bringing Chatenium to every device, but not the fast way, the good way by developing a native application for each platform.",
|
||||
"adaptsTo": "Chatenium adapts to ",
|
||||
"adaptsToYouDesc": "Choose your platform:",
|
||||
"chtnOnWeb": "Chatenium On Web",
|
||||
"chtnOnWebDesc": "Built for maximum compatibility. The Web will work on every device you have.",
|
||||
"chtnOnAndroid": "Chatenium On Android™",
|
||||
@@ -101,14 +103,77 @@
|
||||
"tab3": "Pictures",
|
||||
"tab4": "Settings"
|
||||
},
|
||||
"network": {
|
||||
"tabs": {
|
||||
"channels": "Channels",
|
||||
"members": "Members",
|
||||
"settings": "Settings"
|
||||
},
|
||||
"settings": {
|
||||
"options": {
|
||||
"categories": {
|
||||
"apps": "Apps",
|
||||
"moderation": "Moderation",
|
||||
"community": "Community"
|
||||
},
|
||||
"overview": "Overview",
|
||||
"rank": "Ranks",
|
||||
"emoji": "Emojis",
|
||||
"embed": "Embed",
|
||||
"invite": "Invites",
|
||||
"webhook": "Webhooks",
|
||||
"bots": "Bots",
|
||||
"activityHistory": "Activity history",
|
||||
"bans": "Bans",
|
||||
"communityChannels": "Community channels",
|
||||
"networkIntroducer": "Network introducer",
|
||||
"members": "Members"
|
||||
},
|
||||
"overviewPage": {
|
||||
"networkPicture": "Network picture",
|
||||
"networkName": "Network name",
|
||||
"networkVisibility": "Network visibility",
|
||||
"uploadNewPicture": "Upload new picture",
|
||||
"setNewName": "Set new name",
|
||||
"changeToPrivate": "Change to private",
|
||||
"changeToPrivateDialog": {
|
||||
"label": "You are about to make your network private",
|
||||
"warn": {
|
||||
"1": "Your network will be delisted from Network Discovery.",
|
||||
"2": "Users will no longer be able to freely join your network without an invite.",
|
||||
"3": "Your broadcasts may be unavailable to users outside your network."
|
||||
}
|
||||
},
|
||||
"changeToPublic": "Change to public",
|
||||
"changeToPublicDialog": {
|
||||
"label": "You are about to make your network public",
|
||||
"warn": {
|
||||
"1": "Your network will be listed in Network Discovery.",
|
||||
"2": "Users will be able to freely join your network without an invite.",
|
||||
"3": "Your broadcasts will be available to users outside your network."
|
||||
}
|
||||
},
|
||||
"setNewNameDialog": {
|
||||
"label": "New name"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"changeLogDialog": {
|
||||
"label": "Chatenium has been updated",
|
||||
"changeLog": {
|
||||
"1": "Added support for text channels inside networks",
|
||||
"2": "Bug fixes in message box"
|
||||
"1": "Optimized the loading of chats and networks",
|
||||
"2": "Added skeleton loaders for messages inside DMs and channels",
|
||||
"3": "Added tabs in networks",
|
||||
"4": "Added option to edit network name",
|
||||
"5": "Added option to change network visibility",
|
||||
"6": "Fixed overflow issues in the mobile UI"
|
||||
}
|
||||
},
|
||||
"chatnav": {
|
||||
"pictureList": {
|
||||
"myPictures": "My pictures"
|
||||
},
|
||||
"dmList": {
|
||||
"newChat": "Start new chat",
|
||||
"messageBox": {
|
||||
@@ -121,6 +186,11 @@
|
||||
"newNetwork": "Start new network"
|
||||
}
|
||||
},
|
||||
"pictures": {
|
||||
"albumList": {
|
||||
"noAlbum": "This user has no albums published"
|
||||
}
|
||||
},
|
||||
"elements": {
|
||||
"messageBox": {
|
||||
"editMessageLabel": "Editing message: ",
|
||||
|
||||
@@ -9,6 +9,7 @@ import {Privacy} from './privacy/privacy';
|
||||
import {TOS} from './tos/tos';
|
||||
import {Network} from './chat/network/network';
|
||||
import {Text} from './chat/network/channel/text/text';
|
||||
import {See} from './chat/picture/see/see';
|
||||
|
||||
export const routes: Routes = [
|
||||
{path: '', component: Homepage},
|
||||
@@ -18,6 +19,7 @@ export const routes: Routes = [
|
||||
{
|
||||
path: 'chat', component: Chat, canActivate: [authNeededGuard], children: [
|
||||
{path: 'dm/:chatid', component: Dm},
|
||||
{path: 'picture/:uploaderId', component: See},
|
||||
{
|
||||
path: 'network/:networkId', component: Network, children: [
|
||||
{path: ":categoryId/:channelId", component: Text}
|
||||
|
||||
@@ -4,6 +4,10 @@
|
||||
<ul>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.1"|translate }}</li>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.2"|translate }}</li>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.3"|translate }}</li>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.4"|translate }}</li>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.5"|translate }}</li>
|
||||
<li>{{ "chat.changeLogDialog.changeLog.6"|translate }}</li>
|
||||
</ul>
|
||||
|
||||
<button tuiButton iconStart="@tui.check"
|
||||
@@ -27,7 +31,7 @@
|
||||
<button>
|
||||
<tui-icon icon="@tui.network"/>
|
||||
</button>
|
||||
<button disabled style="pointer-events: none; opacity: 0.5">
|
||||
<button>
|
||||
<tui-icon icon="@tui.image"/>
|
||||
</button>
|
||||
</tui-segmented>
|
||||
@@ -47,13 +51,17 @@
|
||||
<network-list [token]="serviceManager.currentSession()!.token"
|
||||
[userid]="serviceManager.currentSession()!.userData.userid"></network-list>
|
||||
}
|
||||
@case (2) {
|
||||
<app-picture-list [token]="serviceManager.currentSession()!.token"
|
||||
[userid]="serviceManager.currentSession()!.userData.userid"></app-picture-list>
|
||||
}
|
||||
}
|
||||
</main>
|
||||
</aside>
|
||||
|
||||
<main id="content">
|
||||
<div id="content_tint">
|
||||
@if (router.url.startsWith("/chat/dm")) {
|
||||
@if (router.url.startsWith("/chat/dm") || router.url.startsWith("/chat/picture")) {
|
||||
<!-- To ensure data is loaded -->
|
||||
@defer (when serviceManager.chatsStatus() != LoadStatus.loading) {
|
||||
<router-outlet/>
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
}
|
||||
|
||||
#navigation_content {
|
||||
overflow-y: scroll;
|
||||
height: 100%;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import {TranslatePipe, TranslateService} from '@ngx-translate/core';
|
||||
import {environment} from '../../environments/environment';
|
||||
import {TuiTabBarComponent, TuiTabBarItem} from '@taiga-ui/addon-mobile';
|
||||
import {NetworkList} from './network-list/network-list';
|
||||
import {PictureList} from './picture-list/picture-list';
|
||||
|
||||
@Component({
|
||||
selector: 'app-chat',
|
||||
@@ -29,7 +30,8 @@ import {NetworkList} from './network-list/network-list';
|
||||
TranslatePipe,
|
||||
TuiTabBarComponent,
|
||||
TuiTabBarItem,
|
||||
NetworkList
|
||||
NetworkList,
|
||||
PictureList
|
||||
],
|
||||
templateUrl: './chat.html',
|
||||
styleUrl: './chat.scss',
|
||||
@@ -72,6 +74,8 @@ export class Chat implements OnInit {
|
||||
async ngOnInit() {
|
||||
if (this.router.url.startsWith("/chat/network")) {
|
||||
this.navigationActiveIndex = 1
|
||||
} else if (this.router.url.startsWith("/chat/picture")) {
|
||||
this.navigationActiveIndex = 2
|
||||
}
|
||||
|
||||
this.indexedDb.openDatabase().then(async () => {
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
<button disabled tuiButton appearance="secondary" iconStart="@tui.mail-plus">
|
||||
{{"chat.chatnav.dmList.newChat"|translate}}
|
||||
{{ "chat.chatnav.dmList.newChat"|translate }}
|
||||
</button>
|
||||
|
||||
@if (serviceManager.chatsStatus() == LoadStatus.updating) {
|
||||
<div id="loader">
|
||||
<tui-loader/>
|
||||
{{ "updating"|translate }}
|
||||
</div>
|
||||
}
|
||||
@for (chat of serviceManager.chats(); track chat.chatid) {
|
||||
<button [class.enlarge]="breakpoint() == 'mobile'" tuiButton [appearance]="router.url == '/chat/dm/' + chat.chatid ? 'primary' : 'flat'" [routerLink]="'/chat/dm/' + chat.chatid">
|
||||
<button [class.enlarge]="breakpoint() == 'mobile'" tuiButton
|
||||
[appearance]="router.url == '/chat/dm/' + chat.chatid ? 'primary' : 'flat'"
|
||||
[routerLink]="'/chat/dm/' + chat.chatid">
|
||||
<oimg [src]="chat.pfp" height="35px" width="35px" [radius]="10"></oimg>
|
||||
<div class="info">
|
||||
@if (chat.displayName == "") {
|
||||
<span>{{'@'+chat.username}}</span>
|
||||
<span>{{ '@' + chat.username }}</span>
|
||||
} @else {
|
||||
<span>{{chat.displayName}}</span>
|
||||
<span>{{ chat.displayName }}</span>
|
||||
}
|
||||
@if (chat.latestMessage) {
|
||||
<span class="latest_message">
|
||||
@if (chat.latestMessage.isAuthor) {
|
||||
{{"chat.chatnav.dmList.messageBox.latestMessage.you"|translate}}
|
||||
{{ "chat.chatnav.dmList.messageBox.latestMessage.you"|translate }}
|
||||
}
|
||||
{{chat.latestMessage.message}}
|
||||
{{ chat.latestMessage.message }}
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
|
||||
#loader {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: start;
|
||||
padding: 5px;
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
button {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
||||
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { DmList } from './dm-list';
|
||||
|
||||
describe('DmList', () => {
|
||||
describe('PictureList', () => {
|
||||
let component: DmList;
|
||||
let fixture: ComponentFixture<DmList>;
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import {Component, inject, input, OnInit, signal} from '@angular/core';
|
||||
import {Component, inject, input, OnInit} from '@angular/core';
|
||||
import {ChatService} from '@chatenium/chatenium-sdk/services/chatService';
|
||||
import {IndexedDB} from '../../storage/indexed-db';
|
||||
import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
|
||||
import {TUI_BREAKPOINT, TuiButton} from '@taiga-ui/core';
|
||||
import {TUI_BREAKPOINT, TuiButton, TuiLoader} from '@taiga-ui/core';
|
||||
import {Oimg} from '../elements/oimg/oimg';
|
||||
import {Router, RouterLink} from '@angular/router';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
@@ -14,7 +13,8 @@ import {LoadStatus, ServiceManager} from '../../service-manager';
|
||||
TuiButton,
|
||||
Oimg,
|
||||
RouterLink,
|
||||
TranslatePipe
|
||||
TranslatePipe,
|
||||
TuiLoader
|
||||
],
|
||||
templateUrl: './dm-list.html',
|
||||
styleUrl: './dm-list.scss',
|
||||
@@ -30,6 +30,13 @@ export class DmList implements OnInit {
|
||||
|
||||
async ngOnInit() {
|
||||
this.serviceManager.chatService = new ChatService(this.userid(), this.token(), this.indexedDb.getApi(), () => {})
|
||||
if (this.serviceManager.chatsStatus() != LoadStatus.loaded) {
|
||||
try {
|
||||
this.serviceManager.chats.set(await this.serviceManager.chatService.getQuick())
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.updating)
|
||||
} catch (e) {
|
||||
console.warn(`Cache load failed: ${e}. Skipping cache load...`)
|
||||
}
|
||||
try {
|
||||
this.serviceManager.chats.set(await this.serviceManager.chatService.get())
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.loaded)
|
||||
@@ -38,4 +45,7 @@ export class DmList implements OnInit {
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.error)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected readonly LoadStatus = LoadStatus;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</div>
|
||||
</navbar>
|
||||
|
||||
<messages [messageBoxViewModel]="store.messageBox" [messages]="store.messages()" id="scrollContainer" (onDelete)="deleteMessage($event)"/>
|
||||
<messages (scrollend)="handleMessagesScroll($event)" [loading]="store.messagesStatus() == LoadStatus.loading" [messageBoxViewModel]="store.messageBox" [messages]="store.messages()" id="scrollContainer" (onDelete)="deleteMessage($event)"/>
|
||||
|
||||
<message-box [viewModel]="store.messageBox"/>
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {Component, inject, OnInit, signal} from '@angular/core';
|
||||
import {DmStorage, ServiceManager} from '../../service-manager';
|
||||
import {DmStorage, LoadStatus, ServiceManager} from '../../service-manager';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {DMService} from '@chatenium/chatenium-sdk/services/dmService';
|
||||
import {IndexedDB} from '../../storage/indexed-db';
|
||||
@@ -11,9 +11,10 @@ import {Messages} from '../elements/messages/messages';
|
||||
import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
|
||||
import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema';
|
||||
import {MessageBoxViewModel} from '../elements/message-box/message-box-viewmodel';
|
||||
import {WebSocketHandler} from '@chatenium/chatenium-sdk/core/webSocketHandler';
|
||||
import {FileData, FileUploadProgressListener} from '@chatenium/chatenium-sdk/domain/fileUploadService.schema';
|
||||
import {FileUploadProgressListener} from '@chatenium/chatenium-sdk/domain/fileUploadService.schema';
|
||||
import {Attachment} from '@chatenium/chatenium-sdk/domain/common.schema';
|
||||
import {MessagesViewModel} from '../elements/messages/messages-viewmodel';
|
||||
import {v4 as uuidv4} from 'uuid';
|
||||
|
||||
@Component({
|
||||
selector: 'app-dm',
|
||||
@@ -42,6 +43,7 @@ export class Dm implements OnInit {
|
||||
|
||||
async sendMessage(message: string, files: FileDataWithPreview[] | null) {
|
||||
if (!files && message.trim() == "") return
|
||||
this.scrollToBottom("smooth")
|
||||
|
||||
const session = this.serviceManager.currentSession();
|
||||
if (session != null) {
|
||||
@@ -61,15 +63,16 @@ export class Dm implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
this.store.messageBox.editingMessage.set(null)
|
||||
this.store.messageBox.message.set("")
|
||||
return
|
||||
}
|
||||
|
||||
let attachments: Attachment[] = []
|
||||
files?.forEach(file => {
|
||||
const extraMetaData: Record<string, string> = {}
|
||||
const extraMetaData: Record<string, any> = {}
|
||||
extraMetaData["thumbnailMetaData"] = file.videoThumbnail ?? ""
|
||||
extraMetaData["progressShown"] = true
|
||||
extraMetaData["totalChunks"] = 0
|
||||
extraMetaData["uploadedChunks"] = 0
|
||||
|
||||
attachments.push({
|
||||
fileName: file.name,
|
||||
@@ -83,6 +86,7 @@ export class Dm implements OnInit {
|
||||
})
|
||||
})
|
||||
|
||||
const tempMsgId = uuidv4()
|
||||
this.store.messages.update(value => [...value, {
|
||||
message: message,
|
||||
chatid: this.chatid,
|
||||
@@ -90,7 +94,7 @@ export class Dm implements OnInit {
|
||||
replyTo: "",
|
||||
author: session.userData.userid,
|
||||
seen: false,
|
||||
msgid: "",
|
||||
msgid: tempMsgId,
|
||||
forwardedFrom: "",
|
||||
isEdited: false,
|
||||
sent_at: {T: 0, I: 0},
|
||||
@@ -100,14 +104,13 @@ export class Dm implements OnInit {
|
||||
|
||||
this.scrollToBottom("smooth")
|
||||
|
||||
await this.store.service.sendMessage("", message, null, null, files, <FileUploadProgressListener>{
|
||||
const respMessage = await this.store.service.sendMessage(tempMsgId, message, null, null, files, <FileUploadProgressListener>{
|
||||
fileProgressUpdate: (tempMsgId, fileId, allChunks, chunksDone) => {
|
||||
this.uploadProgressUpdate(tempMsgId, fileId, allChunks, chunksDone)
|
||||
}
|
||||
})
|
||||
this.updateTempMessage(tempMsgId, respMessage)
|
||||
}
|
||||
|
||||
this.store.messageBox.message.set("")
|
||||
}
|
||||
|
||||
async deleteMessage(messageId: string) {
|
||||
@@ -127,15 +130,61 @@ export class Dm implements OnInit {
|
||||
setTimeout(() => {
|
||||
const scrollContainer = <HTMLDivElement>document.querySelector("#scrollContainer")
|
||||
scrollContainer.scroll({
|
||||
top: scrollContainer.scrollHeight,
|
||||
top: this.store.messagesVm.scrollBarStatus() == -1 ? scrollContainer.scrollHeight : this.store.messagesVm.scrollBarStatus(),
|
||||
left: 0,
|
||||
behavior: anim
|
||||
});
|
||||
|
||||
if (this.store.messagesVm.scrollBarStatus() == -1) {
|
||||
this.store.messagesVm.scrollBarStatus.set(scrollContainer.scrollHeight)
|
||||
}
|
||||
}, 0)
|
||||
}
|
||||
|
||||
handleMessagesScroll(e: any) {
|
||||
this.store.messagesVm.scrollBarStatus.set(e.target.scrollTop)
|
||||
}
|
||||
|
||||
uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) {
|
||||
console.log(fileId, allChunks, chunksDone)
|
||||
console.log(tempMsgId, fileId, allChunks, chunksDone)
|
||||
this.store.messages.update(messages =>
|
||||
messages.map(m => {
|
||||
if (m.msgid !== tempMsgId) return m;
|
||||
|
||||
return {
|
||||
...m,
|
||||
files: m.files.map(f => {
|
||||
if (f.fileId !== fileId) return f;
|
||||
return {
|
||||
...f,
|
||||
extraMetaData: {
|
||||
...f.extraMetaData,
|
||||
totalChunks: allChunks,
|
||||
uploadedChunks: chunksDone
|
||||
}
|
||||
};
|
||||
})
|
||||
};
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
updateTempMessage(tempMsgId: string, message: Message) {
|
||||
this.store.messages.update(messages =>
|
||||
messages.map(m => {
|
||||
if (m.msgid !== tempMsgId) return m;
|
||||
|
||||
return {
|
||||
...m,
|
||||
msgid: message.msgid,
|
||||
sent_at: message.sent_at,
|
||||
files: m.files.map(f => {
|
||||
f.extraMetaData["progressShown"] = false
|
||||
return f
|
||||
})
|
||||
};
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
// The chatid parameter ensures isolation
|
||||
@@ -158,6 +207,7 @@ export class Dm implements OnInit {
|
||||
this.route.params.subscribe(async params => {
|
||||
const chatid = params['chatid'];
|
||||
this.chatid = chatid;
|
||||
console.log(`Loading chat ${chatid}...`)
|
||||
|
||||
const session = this.serviceManager.currentSession();
|
||||
const chatData = this.serviceManager.chats().find(c => c.chatid === chatid);
|
||||
@@ -170,7 +220,9 @@ export class Dm implements OnInit {
|
||||
const newStore = {
|
||||
chatData: signal<Chat>(chatData),
|
||||
messages: signal<Message[]>([]),
|
||||
messagesStatus: signal<LoadStatus>(LoadStatus.loading),
|
||||
messageBox: new MessageBoxViewModel((msg, files) => this.sendMessage(msg, files)),
|
||||
messagesVm: new MessagesViewModel(),
|
||||
wsListener: (action, data) => this.onWsListen(action, data, chatid),
|
||||
} as DmStorage;
|
||||
|
||||
@@ -185,12 +237,25 @@ export class Dm implements OnInit {
|
||||
this.serviceManager.dmServices()[chatid] = newStore;
|
||||
|
||||
const currentStore = this.serviceManager.dmServices()[chatid];
|
||||
const history = await currentStore.service.get();
|
||||
currentStore.messages.set(history);
|
||||
try {
|
||||
const messagesCache = await currentStore.service.getQuick();
|
||||
currentStore.messages.set(messagesCache);
|
||||
this.store.messagesStatus.set(LoadStatus.updating)
|
||||
this.scrollToBottom("instant")
|
||||
} catch (e) {
|
||||
console.warn(`Cache load failed: ${e}. Skipping cache load...`)
|
||||
}
|
||||
const messages = await currentStore.service.get();
|
||||
currentStore.messages.set(messages);
|
||||
this.store.messagesStatus.set(LoadStatus.loaded)
|
||||
this.scrollToBottom("instant")
|
||||
|
||||
await currentStore.service.joinWebSocketRoom();
|
||||
} else {
|
||||
this.scrollToBottom("instant")
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected readonly LoadStatus = LoadStatus;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
:host {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
height: 100%;
|
||||
|
||||
img {
|
||||
::ng-deep img {
|
||||
display: block;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
</ng-template>
|
||||
|
||||
<main>
|
||||
<div id="message-box-extension" tuiAppearance="floating" [class.shown]="viewModel().editingMessage()">
|
||||
<div id="message-box-extension" tuiAppearance="floating" [class.shown]="viewModel().editingMessage()" [class.fullWidth]="breakpoint() != 'desktopLarge'">
|
||||
<div id="content">
|
||||
@if (viewModel().editingMessage()) {
|
||||
<tui-icon icon="@tui.pencil"></tui-icon>
|
||||
@@ -59,7 +59,7 @@
|
||||
<tui-icon icon="@tui.paperclip"></tui-icon>
|
||||
<span>{{"chat.elements.messageBox.attachments"|translate}}</span>
|
||||
} @else {
|
||||
{{viewModel().editingMessage()!.message}}
|
||||
<span style="width: 300px" tuiScrollable tuiFade>{{viewModel().editingMessage()!.message}}</span>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
@@ -80,12 +80,12 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="items-middle">
|
||||
<textarea (keydown.enter)="viewModel().message.set(''); handleEnterKeydown($event); viewModel().onMessageSend(message.value, null)" [style]="'height:'+textareaHeight+'px;'" #message (input)="onTextAreaInput(message)" [(ngModel)]="viewModel().message"></textarea>
|
||||
<textarea (keydown.enter)="viewModel().onMessageSend(message.value, null); viewModel().message.set(''); viewModel().editingMessage.set(null); handleEnterKeydown($event)" [style]="'height:'+textareaHeight+'px;'" #message (input)="onTextAreaInput(message)" [(ngModel)]="viewModel().message"></textarea>
|
||||
<span class="placeholder"
|
||||
[class.hidden]="message.value != ''">{{ "chat.elements.messageBox.placeholder"|translate }}</span>
|
||||
</div>
|
||||
<div class="items-right">
|
||||
<button [disabled]="message.value.trim() == ''" tuiButton appearance="flat" (click)="viewModel().message.set(''); viewModel().onMessageSend(message.value, null)">
|
||||
<button [disabled]="message.value.trim() == ''" tuiButton appearance="flat" (click)="viewModel().onMessageSend(message.value, null); viewModel().message.set(''); viewModel().editingMessage.set(null);">
|
||||
<tui-icon icon="@tui.send"/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -67,6 +67,10 @@
|
||||
justify-content: center;
|
||||
height: 0;
|
||||
|
||||
&.fullWidth {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#content {
|
||||
padding-left: 10px;
|
||||
display: flex;
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
TuiButton,
|
||||
TuiDialog,
|
||||
TuiGroup,
|
||||
TuiIcon,
|
||||
TuiIcon, TuiScrollable,
|
||||
TuiScrollbarDirective,
|
||||
TuiTextfield
|
||||
} from '@taiga-ui/core';
|
||||
@@ -17,7 +17,7 @@ import {v4 as uuidv4} from 'uuid';
|
||||
import {Masonry} from '../masonry/masonry';
|
||||
import {Oimg} from '../oimg/oimg';
|
||||
import {FileData} from '@chatenium/chatenium-sdk/domain/fileUploadService.schema';
|
||||
import {TuiTextarea, TuiTextareaComponent} from '@taiga-ui/kit';
|
||||
import {TuiFade, TuiTextarea, TuiTextareaComponent} from '@taiga-ui/kit';
|
||||
|
||||
@Component({
|
||||
selector: 'message-box',
|
||||
@@ -33,7 +33,9 @@ import {TuiTextarea, TuiTextareaComponent} from '@taiga-ui/kit';
|
||||
Oimg,
|
||||
Masonry,
|
||||
TuiTextfield,
|
||||
TuiTextarea
|
||||
TuiTextarea,
|
||||
TuiScrollable,
|
||||
TuiFade
|
||||
],
|
||||
templateUrl: './message-box.html',
|
||||
styleUrl: './message-box.scss',
|
||||
@@ -104,6 +106,7 @@ export class MessageBox {
|
||||
this.viewModel().message.set("")
|
||||
this.viewModel().files.set([])
|
||||
this.viewModel().dialogOpen.set(false)
|
||||
this.viewModel().editingMessage.set(null)
|
||||
}
|
||||
|
||||
handleEnterKeydown(e: any) {
|
||||
|
||||
6
src/app/chat/elements/messages/messages-viewmodel.ts
Normal file
6
src/app/chat/elements/messages/messages-viewmodel.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
import {signal} from '@angular/core';
|
||||
|
||||
export class MessagesViewModel {
|
||||
// Saves scrolling state. First value initialized when scrolling to bottom on the message load
|
||||
scrollBarStatus = signal<number>(-1)
|
||||
}
|
||||
@@ -1,4 +1,18 @@
|
||||
@if (serviceManager.currentSession != null) {
|
||||
@if (loading()) {
|
||||
@for (_ of [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}]; track _; let i = $index) {
|
||||
<div class="message"
|
||||
[class.chained_start]="i == 0 || i == 3 || i == 6"
|
||||
[class.chained_end]="i == 2 || i == 5 || i == 9"
|
||||
[class.chained_middle]="i != 0 && i != 3 && i != 6 && i != 2 && i != 5 && i != 9"
|
||||
[class.author]="i == 3 || i == 4 || i == 5"
|
||||
>
|
||||
<div class="bubble" [tuiSkeleton]="true">
|
||||
{{i}}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
} @else {
|
||||
@if (serviceManager.currentSession != null) {
|
||||
@for (message of messages(); track message.msgid; let i = $index) {
|
||||
<div
|
||||
class="message"
|
||||
@@ -17,6 +31,16 @@
|
||||
<span class="message-text">{{ message.message }}</span>
|
||||
<masonry style="max-height: 300px">
|
||||
@for (file of filterExpressedMedia(message.files); track file) {
|
||||
<div style="position:relative;">
|
||||
@if (file.extraMetaData && Object.keys(file.extraMetaData).length > 0) {
|
||||
@if (file.extraMetaData['progressShown']) {
|
||||
<tui-progress-circle
|
||||
style="position: absolute; top: 0; right: 0; z-index: 10; transform: translate(-50%, -50%)"
|
||||
[max]="file.extraMetaData['totalChunks']"
|
||||
[value]="file.extraMetaData['uploadedChunks']"
|
||||
/>
|
||||
}
|
||||
}
|
||||
@if (file.type == "image") {
|
||||
<img [src]="file.path"
|
||||
style="width: 100%; height: 100%; max-height: 300px; object-fit: cover; border-radius: 25px"/>
|
||||
@@ -28,13 +52,26 @@
|
||||
<video-player maxHeight="300px" maxWidth="300px" [src]="file.path"></video-player>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</masonry>
|
||||
|
||||
<div tuiGroup orientation="vertical" style="width: 100%">
|
||||
@for (file of filterNonExpressedMedia(message.files); track file) {
|
||||
<div style="width: 100%; height: 50px; display: flex; align-items: center; padding: 0 10px; background: var(--tui-background-accent-1); gap: 5px">
|
||||
<div style="width: 100%; height: 50px; display: flex; align-items: center; padding: 0 10px; background: var(--tui-background-base-alt); gap: 5px">
|
||||
@if (file.extraMetaData && Object.keys(file.extraMetaData).length > 0) {
|
||||
@if (file.extraMetaData['progressShown']) {
|
||||
<tui-progress-circle
|
||||
size="xs"
|
||||
[max]="file.extraMetaData['totalChunks']"
|
||||
[value]="file.extraMetaData['uploadedChunks']"
|
||||
/>
|
||||
} @else {
|
||||
<tui-icon icon="@tui.file"/>
|
||||
}
|
||||
} @else {
|
||||
<tui-icon icon="@tui.file"/>
|
||||
}
|
||||
<span>{{ file.fileName }}</span>
|
||||
</div>
|
||||
}
|
||||
@@ -66,4 +103,6 @@
|
||||
</ng-template>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -17,6 +17,24 @@
|
||||
.bubble {
|
||||
background: var(--tui-background-accent-1-hover);
|
||||
}
|
||||
|
||||
&.chained_start {
|
||||
.bubble {
|
||||
border-radius: 10px 25px 10px 10px !important;
|
||||
}
|
||||
}
|
||||
|
||||
&.chained_middle {
|
||||
.bubble {
|
||||
border-radius: 10px !important;
|
||||
}
|
||||
}
|
||||
|
||||
&.chained_end {
|
||||
.bubble {
|
||||
border-radius: 10px 10px 25px 10px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.chained_start {
|
||||
@@ -65,7 +83,7 @@
|
||||
padding: 10px;
|
||||
|
||||
.message-text {
|
||||
white-space: none;
|
||||
white-space: break-spaces;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {MessageBoxViewModel} from '../message-box/message-box-viewmodel';
|
||||
import {FileDataWithPreview} from '../message-box/message-box';
|
||||
import {Attachment} from '@chatenium/chatenium-sdk/domain/common.schema';
|
||||
import {TuiProgressCircle, TuiSkeleton} from '@taiga-ui/kit';
|
||||
|
||||
@Component({
|
||||
selector: 'messages',
|
||||
@@ -32,7 +33,9 @@ import {Attachment} from '@chatenium/chatenium-sdk/domain/common.schema';
|
||||
TranslatePipe,
|
||||
TuiDataListComponent,
|
||||
TuiGroup,
|
||||
TuiIcon
|
||||
TuiIcon,
|
||||
TuiProgressCircle,
|
||||
TuiSkeleton
|
||||
],
|
||||
templateUrl: './messages.html',
|
||||
styleUrl: './messages.scss',
|
||||
@@ -42,6 +45,7 @@ export class Messages {
|
||||
|
||||
messages = input.required<Message[] | NetworkMessage[]>()
|
||||
messageBoxViewModel = input.required<MessageBoxViewModel>()
|
||||
loading = input(false)
|
||||
|
||||
@Output() onDelete = new EventEmitter<string>()
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
img {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
<button disabled tuiButton appearance="secondary" iconStart="@tui.plus">
|
||||
{{ "chat.chatnav.networkList.newNetwork"|translate }}
|
||||
</button>
|
||||
|
||||
@if (serviceManager.networksStatus() == LoadStatus.updating) {
|
||||
<div id="loader">
|
||||
<tui-loader />
|
||||
{{"updating"|translate}}
|
||||
</div>
|
||||
}
|
||||
@for (network of serviceManager.networks(); track network.networkId) {
|
||||
<button [class.enlarge]="breakpoint() == 'mobile'" tuiButton
|
||||
[appearance]="router.url == '/chat/network/' + network.networkId ? 'primary' : 'flat'"
|
||||
[appearance]="router.url.startsWith('/chat/network/' + network.networkId) ? 'primary' : 'flat'"
|
||||
[routerLink]="'/chat/network/' + network.networkId">
|
||||
<oimg [src]="network.picture" height="35px" width="35px" [radius]="10"></oimg>
|
||||
<div class="info">
|
||||
|
||||
@@ -2,8 +2,7 @@ import {Component, inject, input, OnInit} from '@angular/core';
|
||||
import {IndexedDB} from '../../storage/indexed-db';
|
||||
import {Router, RouterLink} from '@angular/router';
|
||||
import {LoadStatus, ServiceManager} from '../../service-manager';
|
||||
import {TUI_BREAKPOINT, TuiButton} from '@taiga-ui/core';
|
||||
import {ChatService} from '@chatenium/chatenium-sdk/services/chatService';
|
||||
import {TUI_BREAKPOINT, TuiButton, TuiLoader} from '@taiga-ui/core';
|
||||
import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService';
|
||||
import {Oimg} from '../elements/oimg/oimg';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
@@ -14,7 +13,8 @@ import {TranslatePipe} from '@ngx-translate/core';
|
||||
Oimg,
|
||||
TranslatePipe,
|
||||
TuiButton,
|
||||
RouterLink
|
||||
RouterLink,
|
||||
TuiLoader
|
||||
],
|
||||
templateUrl: './network-list.html',
|
||||
styleUrl: './network-list.scss',
|
||||
@@ -30,6 +30,13 @@ export class NetworkList implements OnInit {
|
||||
|
||||
async ngOnInit() {
|
||||
this.serviceManager.networkService = new NetworkService(this.userid(), this.token(), "", this.indexedDb.getApi(), () => {})
|
||||
if (this.serviceManager.networksStatus() != LoadStatus.loaded) {
|
||||
try {
|
||||
this.serviceManager.networks.set(await this.serviceManager.networkService.getQuick())
|
||||
this.serviceManager.networksStatus.set(LoadStatus.updating)
|
||||
} catch (e) {
|
||||
console.warn(`Cache load failed: ${e}. Skipping cache load...`)
|
||||
}
|
||||
try {
|
||||
this.serviceManager.networks.set(await this.serviceManager.networkService.get())
|
||||
this.serviceManager.networksStatus.set(LoadStatus.loaded)
|
||||
@@ -38,4 +45,7 @@ export class NetworkList implements OnInit {
|
||||
this.serviceManager.networksStatus.set(LoadStatus.error)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected readonly LoadStatus = LoadStatus;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
</navbar>
|
||||
|
||||
<messages [messageBoxViewModel]="store!.messageBox" [messages]="store!.messages()" id="scrollContainer"
|
||||
<messages [loading]="store!.messagesStatus() == LoadStatus.loading" (scrollend)="handleMessagesScroll($event)" [messageBoxViewModel]="store!.messageBox" [messages]="store!.messages()" id="scrollContainer"
|
||||
(onDelete)="deleteMessage($event)"/>
|
||||
|
||||
<message-box [viewModel]="store!.messageBox"/>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {Component, inject, signal} from '@angular/core';
|
||||
import {DmStorage, ServiceManager, TextChannelStorage} from '../../../../service-manager';
|
||||
import {DmStorage, LoadStatus, ServiceManager, TextChannelStorage} from '../../../../service-manager';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {IndexedDB} from '../../../../storage/indexed-db';
|
||||
import {TUI_BREAKPOINT, TuiButton, TuiIcon} from '@taiga-ui/core';
|
||||
@@ -12,6 +12,8 @@ import {Message} from '@chatenium/chatenium-sdk/domain/textChannelService.schema
|
||||
import {Messages} from '../../../elements/messages/messages';
|
||||
import {Navbar} from '../../../elements/navbar/navbar';
|
||||
import {Oimg} from '../../../elements/oimg/oimg';
|
||||
import {MessagesViewModel} from '../../../elements/messages/messages-viewmodel';
|
||||
import {v4 as uuidv4} from 'uuid';
|
||||
|
||||
@Component({
|
||||
selector: 'app-text',
|
||||
@@ -65,15 +67,16 @@ export class Text {
|
||||
}
|
||||
}
|
||||
|
||||
this.store.messageBox.editingMessage.set(null)
|
||||
this.store.messageBox.message.set("")
|
||||
return
|
||||
}
|
||||
|
||||
let attachments: Attachment[] = []
|
||||
files?.forEach(file => {
|
||||
const extraMetaData: Record<string, string> = {}
|
||||
const extraMetaData: Record<string, any> = {}
|
||||
extraMetaData["thumbnailMetaData"] = file.videoThumbnail ?? ""
|
||||
extraMetaData["progressShown"] = true
|
||||
extraMetaData["totalChunks"] = 0
|
||||
extraMetaData["uploadedChunks"] = 0
|
||||
|
||||
attachments.push({
|
||||
fileName: file.name,
|
||||
@@ -87,6 +90,7 @@ export class Text {
|
||||
})
|
||||
})
|
||||
|
||||
const tempMsgId = uuidv4()
|
||||
this.store.messages.update(value => [...value, {
|
||||
author: {
|
||||
userid: session.userData.userid,
|
||||
@@ -94,7 +98,7 @@ export class Text {
|
||||
username: session.userData.username,
|
||||
displayName: session.userData.displayName
|
||||
},
|
||||
msgid: "",
|
||||
msgid: tempMsgId,
|
||||
message: message,
|
||||
sent_at: {
|
||||
T: 0,
|
||||
@@ -104,7 +108,7 @@ export class Text {
|
||||
channelId: "",
|
||||
networkId: "",
|
||||
categoryId: "",
|
||||
files: [],
|
||||
files: attachments,
|
||||
seen: false,
|
||||
replyTo: "",
|
||||
replyToId: "",
|
||||
@@ -114,14 +118,13 @@ export class Text {
|
||||
|
||||
this.scrollToBottom("smooth")
|
||||
|
||||
await this.store.service.sendMessage("", message, null, null, files, <FileUploadProgressListener>{
|
||||
const respMessage = await this.store.service.sendMessage(tempMsgId, message, null, null, files, <FileUploadProgressListener>{
|
||||
fileProgressUpdate: (tempMsgId, fileId, allChunks, chunksDone) => {
|
||||
this.uploadProgressUpdate(tempMsgId, fileId, allChunks, chunksDone)
|
||||
}
|
||||
})
|
||||
this.updateTempMessage(tempMsgId, respMessage)
|
||||
}
|
||||
|
||||
this.store.messageBox.message.set("")
|
||||
}
|
||||
|
||||
async deleteMessage(messageId: string) {
|
||||
@@ -140,19 +143,69 @@ export class Text {
|
||||
|
||||
scrollToBottom(anim: 'instant' | 'smooth'): void {
|
||||
setTimeout(() => {
|
||||
if (!this.store) {
|
||||
return
|
||||
}
|
||||
const scrollContainer = <HTMLDivElement>document.querySelector("#scrollContainer")
|
||||
scrollContainer.scroll({
|
||||
top: scrollContainer.scrollHeight,
|
||||
top: this.store.messagesVm.scrollBarStatus() == -1 ? scrollContainer.scrollHeight : this.store.messagesVm.scrollBarStatus(),
|
||||
left: 0,
|
||||
behavior: anim
|
||||
});
|
||||
|
||||
if (this.store.messagesVm.scrollBarStatus() == -1) {
|
||||
this.store.messagesVm.scrollBarStatus.set(scrollContainer.scrollHeight)
|
||||
}
|
||||
}, 0)
|
||||
}
|
||||
|
||||
uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) {
|
||||
console.log(fileId, allChunks, chunksDone)
|
||||
handleMessagesScroll(e: any) {
|
||||
if (!this.store) return
|
||||
this.store.messagesVm.scrollBarStatus.set(e.target.scrollTop)
|
||||
}
|
||||
|
||||
uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) {
|
||||
if (!this.store) return
|
||||
this.store.messages.update(messages =>
|
||||
messages.map(m => {
|
||||
if (m.msgid !== tempMsgId) return m;
|
||||
|
||||
return {
|
||||
...m,
|
||||
files: m.files.map(f => {
|
||||
if (f.fileId !== fileId) return f;
|
||||
return {
|
||||
...f,
|
||||
extraMetaData: {
|
||||
...f.extraMetaData,
|
||||
totalChunks: allChunks,
|
||||
uploadedChunks: chunksDone
|
||||
}
|
||||
};
|
||||
})
|
||||
};
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
updateTempMessage(tempMsgId: string, message: Message) {
|
||||
if (!this.store) return
|
||||
this.store.messages.update(messages =>
|
||||
messages.map(m => {
|
||||
if (m.msgid !== tempMsgId) return m;
|
||||
|
||||
return {
|
||||
...m,
|
||||
msgid: message.msgid,
|
||||
sent_at: message.sent_at,
|
||||
files: m.files.map(f => {
|
||||
f.extraMetaData["progressShown"] = false
|
||||
return f
|
||||
})
|
||||
};
|
||||
})
|
||||
);
|
||||
}
|
||||
// The chatid parameter ensures isolation
|
||||
onWsListen(action: string, message: string, networkId: string, channelId: string) {
|
||||
const data = JSON.parse(message);
|
||||
@@ -207,6 +260,8 @@ export class Text {
|
||||
categoryData: signal(categoryData),
|
||||
channelData: signal(channelData),
|
||||
messages: signal<Message[]>([]),
|
||||
messagesVm: new MessagesViewModel(),
|
||||
messagesStatus: signal<LoadStatus>(LoadStatus.loading),
|
||||
messageBox: new MessageBoxViewModel((msg, files) => this.sendMessage(msg, files)),
|
||||
wsListener: (action, data) => this.onWsListen(action, data, networkId, categoryId),
|
||||
} as TextChannelStorage;
|
||||
@@ -224,12 +279,25 @@ export class Text {
|
||||
this.serviceManager.networkServices()[networkId].textChannels()[channelId] = newStore;
|
||||
|
||||
const currentStore = this.serviceManager.networkServices()[networkId].textChannels()[channelId]
|
||||
const history = await currentStore.service.get();
|
||||
currentStore.messages.set(history);
|
||||
try {
|
||||
const messagesCache = await currentStore.service.getQuick();
|
||||
currentStore.messages.set(messagesCache);
|
||||
this.scrollToBottom("instant")
|
||||
currentStore.messagesStatus.set(LoadStatus.updating)
|
||||
} catch (e) {
|
||||
console.warn(`Cache load failed: ${e}. Skipping cache load...`)
|
||||
}
|
||||
const messages = await currentStore.service.get();
|
||||
currentStore.messages.set(messages);
|
||||
currentStore.messagesStatus.set(LoadStatus.loaded)
|
||||
this.scrollToBottom("instant")
|
||||
|
||||
await currentStore.service.joinWebSocketRoom();
|
||||
} else {
|
||||
this.scrollToBottom("instant")
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected readonly LoadStatus = LoadStatus;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,37 @@
|
||||
<div class="items-right"></div>
|
||||
</navbar>
|
||||
|
||||
<tui-tabs [(activeItemIndex)]="tabActiveIndex">
|
||||
<button
|
||||
iconStart="@tui.hash"
|
||||
tuiTab
|
||||
type="button"
|
||||
>
|
||||
{{"chat.network.tabs.channels"|translate}}
|
||||
</button>
|
||||
|
||||
<button
|
||||
disabled
|
||||
iconStart="@tui.users"
|
||||
tuiTab
|
||||
type="button"
|
||||
>
|
||||
{{"chat.network.tabs.members"|translate}}
|
||||
</button>
|
||||
|
||||
<button
|
||||
iconStart="@tui.cog"
|
||||
tuiTab
|
||||
type="button"
|
||||
>
|
||||
{{"chat.network.tabs.settings"|translate}}
|
||||
</button>
|
||||
</tui-tabs>
|
||||
|
||||
<br/>
|
||||
|
||||
@switch (tabActiveIndex) {
|
||||
@case (0) {
|
||||
<main tuiGroup orientation="vertical" style="width: 100%">
|
||||
@for (category of store.networkData().categories; track category) {
|
||||
<div class="category">
|
||||
@@ -20,7 +51,7 @@
|
||||
|
||||
<div tuiGroup orientation="vertical" style="width: 100%">
|
||||
@for (channel of category.channels; track channel) {
|
||||
<button tuiButton class="channel" appearance="secondary" [disabled]="channel.type != 'message'" [routerLink]="'/chat/network/'+store.networkData().networkId+'/'+category.categoryId+'/'+channel.channelId">
|
||||
<button tuiButton class="channel" [appearance]="router.url.endsWith(channel.channelId) ? 'primary' : 'secondary'" [disabled]="channel.type != 'message'" [routerLink]="'/chat/network/'+store.networkData().networkId+'/'+category.categoryId+'/'+channel.channelId">
|
||||
@switch (channel.type) {
|
||||
@case ("message") {
|
||||
<tui-icon icon="@tui.hash"></tui-icon>
|
||||
@@ -39,6 +70,13 @@
|
||||
</div>
|
||||
}
|
||||
</main>
|
||||
}
|
||||
@case (2) {
|
||||
<main id="settings">
|
||||
<network-settings [networkStore]="this.store"></network-settings>
|
||||
</main>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -8,13 +8,18 @@
|
||||
padding: 15px;
|
||||
transition: 0.2s;
|
||||
|
||||
#network-data {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
&.routerOutletActive {
|
||||
overflow-y: hidden;
|
||||
padding: 0;
|
||||
grid-template-columns: 1fr 300px;
|
||||
|
||||
#router {
|
||||
background: var(--tui-background-neutral-1-pressed);
|
||||
background: var(--tui-background-neutral-1);
|
||||
}
|
||||
|
||||
main {
|
||||
@@ -42,4 +47,11 @@
|
||||
justify-content: start;
|
||||
}
|
||||
}
|
||||
|
||||
#settings {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: var(--tui-background-base-alt);
|
||||
border-radius: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {Component, inject, OnInit, signal} from '@angular/core';
|
||||
import {ActivatedRoute, RouterLink, RouterOutlet} from '@angular/router';
|
||||
import {ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
|
||||
import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
|
||||
import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema';
|
||||
import {MessageBoxViewModel} from '../elements/message-box/message-box-viewmodel';
|
||||
@@ -11,6 +11,10 @@ import {IndexedDB} from '../../storage/indexed-db';
|
||||
import {Navbar} from '../elements/navbar/navbar';
|
||||
import {Oimg} from '../elements/oimg/oimg';
|
||||
import {TUI_BREAKPOINT, TuiButton, TuiGroup, TuiIcon} from '@taiga-ui/core';
|
||||
import {TuiTab, TuiTabsHorizontal, TuiTabsWithMore} from '@taiga-ui/kit';
|
||||
import {TuiItem} from '@taiga-ui/cdk';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {Settings} from './settings/settings';
|
||||
|
||||
@Component({
|
||||
selector: 'app-network',
|
||||
@@ -21,7 +25,13 @@ import {TUI_BREAKPOINT, TuiButton, TuiGroup, TuiIcon} from '@taiga-ui/core';
|
||||
TuiGroup,
|
||||
TuiButton,
|
||||
TuiIcon,
|
||||
RouterLink
|
||||
RouterLink,
|
||||
TuiTabsWithMore,
|
||||
TuiItem,
|
||||
TuiTab,
|
||||
TranslatePipe,
|
||||
TuiTabsHorizontal,
|
||||
Settings
|
||||
],
|
||||
templateUrl: './network.html',
|
||||
styleUrl: './network.scss',
|
||||
@@ -31,6 +41,9 @@ export class Network implements OnInit {
|
||||
route = inject(ActivatedRoute)
|
||||
indexedDb = inject(IndexedDB)
|
||||
breakpoint = inject(TUI_BREAKPOINT)
|
||||
router = inject(Router)
|
||||
|
||||
tabActiveIndex = 2
|
||||
|
||||
routerOutletActive = signal(false)
|
||||
|
||||
|
||||
114
src/app/chat/network/settings/overview/overview.html
Normal file
114
src/app/chat/network/settings/overview/overview.html
Normal file
@@ -0,0 +1,114 @@
|
||||
<div tuiGroup id="options" orientation="vertical">
|
||||
<div>
|
||||
<header>
|
||||
<tui-icon icon="@tui.image"></tui-icon>
|
||||
{{ "chat.network.settings.overviewPage.networkPicture"|translate }}
|
||||
<oimg [src]="networkStore().networkData().picture" height="25px" width="25px" [radius]="6"/>
|
||||
</header>
|
||||
|
||||
<main>
|
||||
<button tuiButton appearance="outline" disabled iconEnd="@tui.file-up">
|
||||
{{ "chat.network.settings.overviewPage.uploadNewPicture"|translate }}
|
||||
</button>
|
||||
</main>
|
||||
</div>
|
||||
<div>
|
||||
<ng-template [(tuiDialog)]="setNewNameDialogOpen"
|
||||
[tuiDialogOptions]="{label: 'chat.network.settings.overviewPage.setNewName'|translate}">
|
||||
|
||||
<tui-textfield #newName iconStart="@tui.signature">
|
||||
<label tuiLabel>{{"chat.network.settings.overviewPage.setNewNameDialog.label"|translate}}</label>
|
||||
<input type="text" tuiInput>
|
||||
</tui-textfield>
|
||||
@if (setNewNameError() != "") {
|
||||
<tui-error [error]="setNewNameError()"></tui-error>
|
||||
}
|
||||
|
||||
<footer>
|
||||
<button tuiButton iconStart="@tui.check" [loading]="setNewNamePending()" [disabled]="setNewNamePending()" (click)="setNewName(newName.value())">
|
||||
{{'chat.network.settings.overviewPage.setNewName'|translate}}
|
||||
</button>
|
||||
</footer>
|
||||
</ng-template>
|
||||
|
||||
<header>
|
||||
<tui-icon icon="@tui.network"></tui-icon>
|
||||
{{ "chat.network.settings.overviewPage.networkName"|translate }}
|
||||
<b style="color: gray">{{ networkStore().networkData().name }}</b>
|
||||
</header>
|
||||
<main>
|
||||
<button (click)="setNewNameDialogOpen.set(true)" tuiButton appearance="outline" iconEnd="@tui.pencil">
|
||||
{{ "chat.network.settings.overviewPage.setNewName"|translate }}
|
||||
</button>
|
||||
</main>
|
||||
|
||||
</div>
|
||||
<div>
|
||||
<ng-template [(tuiDialog)]="makeNetworkPrivateWarnDialogOpen"
|
||||
[tuiDialogOptions]="{label: 'chat.network.settings.overviewPage.changeToPrivateDialog.label'|translate}">
|
||||
<ul>
|
||||
<li>
|
||||
<tui-icon icon="@tui.eye-off"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPrivateDialog.warn.1"|translate }}
|
||||
</li>
|
||||
<li>
|
||||
<tui-icon icon="@tui.ticket"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPrivateDialog.warn.2"|translate }}
|
||||
</li>
|
||||
<li>
|
||||
<tui-icon icon="@tui.radio"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPrivateDialog.warn.3"|translate }}
|
||||
</li>
|
||||
</ul>
|
||||
<footer>
|
||||
<button tuiButton iconStart="@tui.eye-off" [loading]="networkVisChangePending()" [disabled]="networkVisChangePending()" (click)="changeVisibility('private')">
|
||||
{{'chat.network.settings.overviewPage.changeToPrivate'|translate}}
|
||||
</button>
|
||||
</footer>
|
||||
</ng-template>
|
||||
|
||||
<ng-template [(tuiDialog)]="makeNetworkPublicWarnDialogOpen"
|
||||
[tuiDialogOptions]="{label: 'chat.network.settings.overviewPage.changeToPublicDialog.label'|translate}">
|
||||
<ul>
|
||||
<li>
|
||||
<tui-icon icon="@tui.eye"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPublicDialog.warn.1"|translate }}
|
||||
</li>
|
||||
<li>
|
||||
<tui-icon icon="@tui.ticket"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPublicDialog.warn.2"|translate }}
|
||||
</li>
|
||||
<li>
|
||||
<tui-icon icon="@tui.radio"/>
|
||||
{{ "chat.network.settings.overviewPage.changeToPublicDialog.warn.3"|translate }}
|
||||
</li>
|
||||
</ul>
|
||||
<footer>
|
||||
<button tuiButton iconStart="@tui.eye" [loading]="networkVisChangePending()" [disabled]="networkVisChangePending()" (click)="changeVisibility('public')">
|
||||
{{'chat.network.settings.overviewPage.changeToPublic'|translate}}
|
||||
</button>
|
||||
</footer>
|
||||
</ng-template>
|
||||
|
||||
<header>
|
||||
@if (networkStore().networkData().visibility == "public") {
|
||||
<tui-icon icon="@tui.eye"></tui-icon>
|
||||
} @else {
|
||||
<tui-icon icon="@tui.eye-off"></tui-icon>
|
||||
}
|
||||
{{ "chat.network.settings.overviewPage.networkVisibility"|translate }}
|
||||
</header>
|
||||
|
||||
<main>
|
||||
@if (networkStore().networkData().visibility == "public") {
|
||||
<button tuiButton appearance="outline" iconEnd="@tui.eye-off" (click)="makeNetworkPrivateWarnDialogOpen.set(true)">
|
||||
{{ "chat.network.settings.overviewPage.changeToPrivate"|translate }}
|
||||
</button>
|
||||
} @else {
|
||||
<button tuiButton appearance="outline" iconEnd="@tui.eye" (click)="makeNetworkPublicWarnDialogOpen.set(true)">
|
||||
{{ "chat.network.settings.overviewPage.changeToPublic"|translate }}
|
||||
</button>
|
||||
}
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
31
src/app/chat/network/settings/overview/overview.scss
Normal file
31
src/app/chat/network/settings/overview/overview.scss
Normal file
@@ -0,0 +1,31 @@
|
||||
#options {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
div {
|
||||
width: 100%;
|
||||
height: 60px;
|
||||
background: var(--tui-background-base-alt);
|
||||
padding: 15px;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
|
||||
header {
|
||||
display: flex;
|
||||
gap: 5px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
main {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: end;
|
||||
|
||||
button {
|
||||
height: 35px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/app/chat/network/settings/overview/overview.spec.ts
Normal file
22
src/app/chat/network/settings/overview/overview.spec.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { Overview } from './overview';
|
||||
|
||||
describe('Overview', () => {
|
||||
let component: Overview;
|
||||
let fixture: ComponentFixture<Overview>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [Overview],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(Overview);
|
||||
component = fixture.componentInstance;
|
||||
await fixture.whenStable();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
79
src/app/chat/network/settings/overview/overview.ts
Normal file
79
src/app/chat/network/settings/overview/overview.ts
Normal file
@@ -0,0 +1,79 @@
|
||||
import {Component, inject, input, signal} from '@angular/core';
|
||||
import {NetworkStorage} from '../../../../service-manager';
|
||||
import {
|
||||
TuiAlertService,
|
||||
TuiButton,
|
||||
TuiDialog,
|
||||
TuiErrorComponent,
|
||||
TuiGroup,
|
||||
TuiIcon,
|
||||
TuiInputDirective
|
||||
} from '@taiga-ui/core';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {Oimg} from '../../../elements/oimg/oimg';
|
||||
import {environment} from '../../../../../environments/environment';
|
||||
import {TuiButtonLoading, TuiComboBox} from '@taiga-ui/kit';
|
||||
|
||||
@Component({
|
||||
selector: 'network-settings-overview',
|
||||
imports: [
|
||||
TuiGroup,
|
||||
TranslatePipe,
|
||||
TuiIcon,
|
||||
Oimg,
|
||||
TuiButton,
|
||||
TuiDialog,
|
||||
TuiComboBox,
|
||||
TuiInputDirective,
|
||||
TuiButtonLoading,
|
||||
TuiErrorComponent
|
||||
],
|
||||
templateUrl: './overview.html',
|
||||
styleUrl: './overview.scss',
|
||||
})
|
||||
export class Overview {
|
||||
networkStore = input.required<NetworkStorage>()
|
||||
protected readonly environment = environment;
|
||||
protected readonly localStorage = localStorage;
|
||||
|
||||
setNewNameDialogOpen = signal(false)
|
||||
setNewNamePending = signal(false)
|
||||
setNewNameError = signal("")
|
||||
|
||||
makeNetworkPrivateWarnDialogOpen = signal(false)
|
||||
makeNetworkPublicWarnDialogOpen = signal(false)
|
||||
networkVisChangePending = signal(false)
|
||||
|
||||
async setNewName(name: string) {
|
||||
this.setNewNameError.set("")
|
||||
this.setNewNamePending.set(true)
|
||||
try {
|
||||
await this.networkStore().service.editName(name)
|
||||
this.setNewNamePending.set(false)
|
||||
this.setNewNameDialogOpen.set(false)
|
||||
this.networkStore().networkData.update(
|
||||
value => {
|
||||
value.name = name
|
||||
return value
|
||||
}
|
||||
)
|
||||
} catch (e) {
|
||||
this.setNewNamePending.set(false)
|
||||
this.setNewNameError.set(e as string)
|
||||
}
|
||||
}
|
||||
|
||||
async changeVisibility(newVisibility: "public" | "private") {
|
||||
this.networkVisChangePending.set(true)
|
||||
await this.networkStore().service.changeVisibility(newVisibility)
|
||||
this.networkStore().networkData.update(
|
||||
value => {
|
||||
value.visibility = newVisibility
|
||||
return value
|
||||
}
|
||||
)
|
||||
this.networkVisChangePending.set(false)
|
||||
this.makeNetworkPrivateWarnDialogOpen.set(false)
|
||||
this.makeNetworkPublicWarnDialogOpen.set(false)
|
||||
}
|
||||
}
|
||||
29
src/app/chat/network/settings/settings.html
Normal file
29
src/app/chat/network/settings/settings.html
Normal file
@@ -0,0 +1,29 @@
|
||||
<aside>
|
||||
@for (category of networkSettingsOptions; track category) {
|
||||
<header>
|
||||
<tui-icon [icon]="'@tui.'+category.icon"></tui-icon>
|
||||
@if (category.name == "networkName") {
|
||||
{{networkStore().networkData().name}}
|
||||
} @else {
|
||||
{{'chat.network.settings.options.categories.'+category.name|translate}}
|
||||
}
|
||||
</header>
|
||||
|
||||
<div class="optionList">
|
||||
@for (option of category.options; track option;) {
|
||||
<button (click)="selectedOption = option.name" [appearance]="selectedOption == option.name ? 'primary' : 'flat'" tuiButton [disabled]="!option.implemented || !optionRequiredPermissionsGranted(networkStore().networkData().permissions, option.requiredAtLeastOneOf ?? [])">
|
||||
<tui-icon [icon]="'@tui.'+option.icon"></tui-icon>
|
||||
{{'chat.network.settings.options.'+option.name|translate}}
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</aside>
|
||||
|
||||
<main>
|
||||
@switch (selectedOption) {
|
||||
@case ("overview") {
|
||||
<network-settings-overview [networkStore]="networkStore()"/>
|
||||
}
|
||||
}
|
||||
</main>
|
||||
37
src/app/chat/network/settings/settings.scss
Normal file
37
src/app/chat/network/settings/settings.scss
Normal file
@@ -0,0 +1,37 @@
|
||||
:host {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
display: grid;
|
||||
grid-template-columns: 300px 1fr;
|
||||
|
||||
aside {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
border-radius: 20px 0 0 20px;
|
||||
padding: 15px;
|
||||
|
||||
header {
|
||||
display: flex;
|
||||
gap: 5px;
|
||||
align-items: center;
|
||||
}
|
||||
div {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1px;
|
||||
padding: 5px;
|
||||
|
||||
button {
|
||||
height: 40px;
|
||||
display: flex;
|
||||
justify-content: start;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main {
|
||||
background: var(--tui-background-neutral-2);
|
||||
border-radius: 0 20px 20px 0;
|
||||
padding: 15px;
|
||||
}
|
||||
}
|
||||
22
src/app/chat/network/settings/settings.spec.ts
Normal file
22
src/app/chat/network/settings/settings.spec.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { Settings } from './settings';
|
||||
|
||||
describe('Settings', () => {
|
||||
let component: Settings;
|
||||
let fixture: ComponentFixture<Settings>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [Settings],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(Settings);
|
||||
component = fixture.componentInstance;
|
||||
await fixture.whenStable();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
150
src/app/chat/network/settings/settings.ts
Normal file
150
src/app/chat/network/settings/settings.ts
Normal file
@@ -0,0 +1,150 @@
|
||||
import {Component, inject, input} from '@angular/core';
|
||||
import {TuiButton, TuiGroup, TuiIcon} from '@taiga-ui/core';
|
||||
import {permissionGranted, permissions} from '@chatenium/chatenium-sdk/core/permissions';
|
||||
import {NetworkStorage, ServiceManager} from '../../../service-manager';
|
||||
import {Session} from '@chatenium/chatenium-sdk/domain/sessionManager.schema';
|
||||
import {SessionManager} from '@chatenium/chatenium-sdk/services/sessionManager';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {Overview} from './overview/overview';
|
||||
|
||||
@Component({
|
||||
selector: 'network-settings',
|
||||
imports: [
|
||||
TuiGroup,
|
||||
TuiIcon,
|
||||
TranslatePipe,
|
||||
TuiButton,
|
||||
Overview
|
||||
],
|
||||
templateUrl: './settings.html',
|
||||
styleUrl: './settings.scss',
|
||||
})
|
||||
export class Settings {
|
||||
serviceManager = inject(ServiceManager)
|
||||
networkStore = input.required<NetworkStorage>()
|
||||
|
||||
selectedOption = "overview"
|
||||
|
||||
optionRequiredPermissionsGranted(permissions: number, required: number[]) {
|
||||
if (!this.serviceManager.currentSession) {
|
||||
return false
|
||||
}
|
||||
|
||||
let granted = false;
|
||||
|
||||
if (this.networkStore().networkData().createdBy == this.serviceManager.currentSession()!.userData.userid) {
|
||||
return true
|
||||
}
|
||||
|
||||
required.forEach((permission) => {
|
||||
if (permissionGranted(permissions, permission)) {
|
||||
granted = true
|
||||
}
|
||||
})
|
||||
|
||||
return granted
|
||||
}
|
||||
|
||||
networkSettingsOptions: {
|
||||
name: string,
|
||||
icon: string,
|
||||
options: {
|
||||
name: string, // ? channel.settings.[name]
|
||||
icon: string // ? Class name
|
||||
requiredAtLeastOneOf?: number[],
|
||||
implemented: boolean
|
||||
}[]
|
||||
}[] = [
|
||||
{
|
||||
name: "networkName", // ? UI Will show network name
|
||||
icon: "network",
|
||||
options: [
|
||||
{
|
||||
icon: "eye",
|
||||
name: "overview",
|
||||
implemented: true,
|
||||
requiredAtLeastOneOf: [permissions.changeNetworkNamePictureAndVisibility]
|
||||
},
|
||||
{
|
||||
name: "rank",
|
||||
icon: "book",
|
||||
requiredAtLeastOneOf: [permissions.createAndEditRanks, permissions.deleteRanks],
|
||||
implemented: false,
|
||||
},
|
||||
{
|
||||
name: "emoji",
|
||||
icon: "smile",
|
||||
implemented: false,
|
||||
requiredAtLeastOneOf: [permissions.createEmojis]
|
||||
},
|
||||
{
|
||||
name: "embed",
|
||||
icon: "code",
|
||||
implemented: false,
|
||||
requiredAtLeastOneOf: [permissions.manageEmbed]
|
||||
},
|
||||
{
|
||||
name: "invite",
|
||||
icon: "ticket",
|
||||
implemented: false,
|
||||
requiredAtLeastOneOf: [permissions.createInvites, permissions.deleteInvites]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
name: "apps",
|
||||
icon: "layout-panel-left",
|
||||
options: [
|
||||
{
|
||||
name: "webhook",
|
||||
icon: "globe",
|
||||
implemented: false,
|
||||
requiredAtLeastOneOf: [permissions.deleteWebhooks, permissions.createWebhooks]
|
||||
},
|
||||
{
|
||||
name: "bots",
|
||||
icon: "bot",
|
||||
implemented: false,
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
name: "moderation",
|
||||
icon: "shield-half",
|
||||
options: [
|
||||
{
|
||||
name: "activityHistory",
|
||||
icon: "scroll-text",
|
||||
implemented: false,
|
||||
},
|
||||
{
|
||||
name: "bans",
|
||||
icon: "gavel",
|
||||
implemented: false,
|
||||
requiredAtLeastOneOf: [permissions.banMembers]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
name: "community",
|
||||
icon: "users",
|
||||
options: [
|
||||
{
|
||||
name: "communityChannels",
|
||||
icon: "hash",
|
||||
implemented: false,
|
||||
},
|
||||
{
|
||||
name: "networkIntroducer",
|
||||
icon: "network",
|
||||
implemented: false,
|
||||
},
|
||||
{
|
||||
name: "members",
|
||||
icon: "users",
|
||||
implemented: false,
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
16
src/app/chat/picture-list/picture-list.html
Normal file
16
src/app/chat/picture-list/picture-list.html
Normal file
@@ -0,0 +1,16 @@
|
||||
<button (click)="router.navigate(['/chat/picture/'+serviceManager.currentSession()!.userData.userid])" tuiButton [appearance]="router.url == '/chat/picture/' + serviceManager.currentSession()!.userData.userid ? 'primary' : 'secondary'" iconStart="@tui.user">
|
||||
{{"chat.chatnav.pictureList.myPictures"|translate}}
|
||||
</button>
|
||||
|
||||
@for (chat of serviceManager.chats(); track chat.chatid) {
|
||||
<button [class.enlarge]="breakpoint() == 'mobile'" tuiButton [appearance]="router.url == '/chat/picture/' + chat.userid ? 'primary' : 'flat'" [routerLink]="'/chat/picture/' + chat.userid">
|
||||
<oimg [src]="chat.pfp" height="35px" width="35px" [radius]="10"></oimg>
|
||||
<div class="info">
|
||||
@if (chat.displayName == "") {
|
||||
<span>{{'@'+chat.username}}</span>
|
||||
} @else {
|
||||
<span>{{chat.displayName}}</span>
|
||||
}
|
||||
</div>
|
||||
</button>
|
||||
}
|
||||
28
src/app/chat/picture-list/picture-list.scss
Normal file
28
src/app/chat/picture-list/picture-list.scss
Normal file
@@ -0,0 +1,28 @@
|
||||
:host {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
|
||||
button {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: start;
|
||||
font-weight: 600;
|
||||
|
||||
&.enlarge {
|
||||
height: 75px;
|
||||
}
|
||||
|
||||
.info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
text-align: start;
|
||||
|
||||
.latest_message {
|
||||
margin-top: -5px;
|
||||
font-size: 12px;
|
||||
opacity: 50%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/app/chat/picture-list/picture-list.spec.ts
Normal file
22
src/app/chat/picture-list/picture-list.spec.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { PictureList } from './picture-list';
|
||||
|
||||
describe('PictureList', () => {
|
||||
let component: PictureList;
|
||||
let fixture: ComponentFixture<PictureList>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [PictureList],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(PictureList);
|
||||
component = fixture.componentInstance;
|
||||
await fixture.whenStable();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
49
src/app/chat/picture-list/picture-list.ts
Normal file
49
src/app/chat/picture-list/picture-list.ts
Normal file
@@ -0,0 +1,49 @@
|
||||
import {Component, inject, input, OnInit, signal} from '@angular/core';
|
||||
import {ChatService} from '@chatenium/chatenium-sdk/services/chatService';
|
||||
import {IndexedDB} from '../../storage/indexed-db';
|
||||
import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
|
||||
import {TUI_BREAKPOINT, TuiButton} from '@taiga-ui/core';
|
||||
import {Oimg} from '../elements/oimg/oimg';
|
||||
import {Router, RouterLink} from '@angular/router';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {LoadStatus, ServiceManager} from '../../service-manager';
|
||||
|
||||
@Component({
|
||||
selector: 'app-picture-list',
|
||||
imports: [
|
||||
TuiButton,
|
||||
Oimg,
|
||||
RouterLink,
|
||||
TranslatePipe
|
||||
],
|
||||
templateUrl: './picture-list.html',
|
||||
styleUrl: './picture-list.scss',
|
||||
})
|
||||
export class PictureList implements OnInit {
|
||||
userid = input<string>("")
|
||||
token = input<string>("")
|
||||
|
||||
indexedDb = inject(IndexedDB)
|
||||
router = inject(Router)
|
||||
serviceManager = inject(ServiceManager)
|
||||
breakpoint = inject(TUI_BREAKPOINT)
|
||||
|
||||
async ngOnInit() {
|
||||
this.serviceManager.chatService = new ChatService(this.userid(), this.token(), this.indexedDb.getApi(), () => {})
|
||||
if (this.serviceManager.chatsStatus() != LoadStatus.loaded) {
|
||||
try {
|
||||
this.serviceManager.chats.set(await this.serviceManager.chatService.getQuick())
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.updating)
|
||||
} catch (e) {
|
||||
console.warn(`Cache load failed: ${e}. Skipping cache load...`)
|
||||
}
|
||||
try {
|
||||
this.serviceManager.chats.set(await this.serviceManager.chatService.get())
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.loaded)
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
this.serviceManager.chatsStatus.set(LoadStatus.error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
61
src/app/chat/picture/see/see.html
Normal file
61
src/app/chat/picture/see/see.html
Normal file
@@ -0,0 +1,61 @@
|
||||
<ng-template [(tuiDialog)]="viewerOpen">
|
||||
<oimg [src]="viewedPicture!.path" height="100%" width="100%" [radius]="0"></oimg>
|
||||
</ng-template>
|
||||
|
||||
<main>
|
||||
@defer (when store) {
|
||||
<navbar backButtonDest="/chat">
|
||||
<div class="data">
|
||||
<oimg [src]="store.uploaderData().pfp" height="50px" width="50px" [radius]="15"></oimg>
|
||||
<div class="uploader-data">
|
||||
@if (!store.uploaderData().displayName) {
|
||||
<span class="main-name">{{'@'+store.uploaderData().username}}</span>
|
||||
} @else {
|
||||
<span class="main-name">{{store.uploaderData().displayName}}</span>
|
||||
<span class="alt-name">{{'@'+store.uploaderData().username}}</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="items-right">
|
||||
</div>
|
||||
</navbar>
|
||||
|
||||
<main>
|
||||
@if (openedAlbum) {
|
||||
<div style="display: flex; align-items: center; gap: 10px">
|
||||
<button tuiButton appearance="flat" iconStart="@tui.chevron-left" (click)="exitAlbum()"></button>
|
||||
<h1 style="padding: 0; margin: 0">{{openedAlbum.name}}</h1>
|
||||
</div>
|
||||
|
||||
<div id="pictureList">
|
||||
@for (picture of openedAlbum.images; track picture) {
|
||||
<oimg (click)="viewPicture(picture)" [src]="picture.path" height="200px" width="200px" [radius]="25" objectFit="none"></oimg>
|
||||
}
|
||||
</div>
|
||||
} @else {
|
||||
@if (store.albums().length == 0) {
|
||||
<tui-block-status style="height: 300px">
|
||||
<tui-icon icon="@tui.frown" tuiSlot="top" style="font-size: 150px"></tui-icon>
|
||||
<h4>{{"chat.pictures.albumList.noAlbum"|translate}}</h4>
|
||||
</tui-block-status>
|
||||
} @else {
|
||||
<div id="albumList">
|
||||
@for (album of store.albums(); track album) {
|
||||
<div class="album" (click)="enterAlbum(album.albumId)">
|
||||
<masonry [maxColSize]="3" style="height: 300px; pointer-events: none;">
|
||||
@for (file of album.images; track file) {
|
||||
<img [src]="file.path+'_thumbnail.png'" style="filter: blur(5px)"/>
|
||||
}
|
||||
</masonry>
|
||||
<div class="album-name">
|
||||
<h2>{{album.name}}</h2>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</main>
|
||||
}
|
||||
</main>
|
||||
85
src/app/chat/picture/see/see.scss
Normal file
85
src/app/chat/picture/see/see.scss
Normal file
@@ -0,0 +1,85 @@
|
||||
main {
|
||||
height: 98svh;
|
||||
display: grid;
|
||||
grid-template-rows: 70px minmax(0, 1fr) auto;
|
||||
padding: 15px;
|
||||
|
||||
navbar {
|
||||
.uploader-data {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.main-name {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.alt-name {
|
||||
margin-top: -5px;
|
||||
color: gray;
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.items-right {
|
||||
margin-top: -10px;
|
||||
|
||||
button {
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#albumList {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
align-content: flex-start;
|
||||
|
||||
.album {
|
||||
width: 300px;
|
||||
height: 300px;
|
||||
background: var(--tui-background-base-alt);
|
||||
border: 2px solid var(--tui-border-normal);
|
||||
border-radius: 30px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
|
||||
.album-name {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
background: color-mix(in srgb, var(--tui-background-base) 50%, transparent);
|
||||
padding: 10px;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
h2 {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pictureList {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
align-content: flex-start;
|
||||
overflow-y: scroll;
|
||||
|
||||
oimg {
|
||||
background: var(--tui-background-base-alt);
|
||||
height: 200px;
|
||||
border-radius: 25px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
22
src/app/chat/picture/see/see.spec.ts
Normal file
22
src/app/chat/picture/see/see.spec.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { See } from './see';
|
||||
|
||||
describe('See', () => {
|
||||
let component: See;
|
||||
let fixture: ComponentFixture<See>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [See],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(See);
|
||||
component = fixture.componentInstance;
|
||||
await fixture.whenStable();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
133
src/app/chat/picture/see/see.ts
Normal file
133
src/app/chat/picture/see/see.ts
Normal file
@@ -0,0 +1,133 @@
|
||||
import {Component, inject, signal} from '@angular/core';
|
||||
import {DmStorage, PictureStorage, ServiceManager} from '../../../service-manager';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {IndexedDB} from '../../../storage/indexed-db';
|
||||
import {TUI_BREAKPOINT, TuiButton, TuiDialog, TuiIcon} from '@taiga-ui/core';
|
||||
import {PictureService} from '@chatenium/chatenium-sdk/services/pictureService';
|
||||
import {Navbar} from '../../elements/navbar/navbar';
|
||||
import {Oimg} from '../../elements/oimg/oimg';
|
||||
import {Masonry} from '../../elements/masonry/masonry';
|
||||
import {Album, Image} from '@chatenium/chatenium-sdk/domain/pictureService.schema';
|
||||
import {pictureHandlers} from '@chatenium/chatenium-sdk/mocks/handlers/picture.http';
|
||||
import {TuiBlockStatusComponent} from '@taiga-ui/layout';
|
||||
import {TranslatePipe} from '@ngx-translate/core';
|
||||
import {TuiBadgedContentDirective} from '@taiga-ui/kit';
|
||||
|
||||
@Component({
|
||||
selector: 'app-see',
|
||||
imports: [
|
||||
Navbar,
|
||||
Oimg,
|
||||
TuiButton,
|
||||
TuiIcon,
|
||||
Masonry,
|
||||
TuiDialog,
|
||||
TuiBlockStatusComponent,
|
||||
TranslatePipe,
|
||||
TuiBadgedContentDirective
|
||||
],
|
||||
templateUrl: './see.html',
|
||||
styleUrl: './see.scss',
|
||||
})
|
||||
export class See {
|
||||
serviceManager = inject(ServiceManager)
|
||||
route = inject(ActivatedRoute)
|
||||
indexedDb = inject(IndexedDB)
|
||||
breakpoint = inject(TUI_BREAKPOINT)
|
||||
router = inject(Router)
|
||||
|
||||
uploaderId = ""
|
||||
openedAlbum: Album | null = null
|
||||
|
||||
viewedPicture: Image | null = null
|
||||
get viewerOpen() {
|
||||
return this.viewedPicture != null
|
||||
}
|
||||
set viewerOpen(_: any) {
|
||||
this.viewedPicture = null
|
||||
this.router.navigate([], {
|
||||
queryParams: { pictureId: null },
|
||||
queryParamsHandling: "merge"
|
||||
})
|
||||
}
|
||||
|
||||
get store(): PictureStorage {
|
||||
return this.serviceManager.pictureServices()[this.uploaderId]
|
||||
}
|
||||
|
||||
enterAlbum(albumId: string) {
|
||||
this.router.navigate([], {
|
||||
queryParams: { albumId: albumId },
|
||||
queryParamsHandling: "merge"
|
||||
})
|
||||
}
|
||||
|
||||
exitAlbum() {
|
||||
this.openedAlbum = null
|
||||
this.router.navigate([], {
|
||||
queryParams: { albumId: null },
|
||||
queryParamsHandling: "merge"
|
||||
})
|
||||
}
|
||||
|
||||
viewPicture(picture: Image) {
|
||||
this.viewedPicture = picture
|
||||
this.router.navigate([], {
|
||||
queryParams: { pictureId: picture.imageId },
|
||||
queryParamsHandling: "merge"
|
||||
})
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.params.subscribe(async params => {
|
||||
const uploaderId = params['uploaderId'];
|
||||
this.uploaderId = uploaderId;
|
||||
|
||||
const session = this.serviceManager.currentSession();
|
||||
if (!session) {
|
||||
return
|
||||
}
|
||||
|
||||
if (!this.serviceManager.pictureServices()[uploaderId]) {
|
||||
const newService = new PictureService(
|
||||
session.token,
|
||||
uploaderId,
|
||||
session.userData.userid,
|
||||
this.indexedDb.getApi(),
|
||||
);
|
||||
|
||||
const uploaderInfo = await newService.get()
|
||||
|
||||
this.serviceManager.pictureServices.update(services => ({
|
||||
...services,
|
||||
[uploaderId]: {
|
||||
albums: signal(uploaderInfo.pictures),
|
||||
uploaderData: signal(uploaderInfo.userData),
|
||||
service: newService,
|
||||
} as PictureStorage
|
||||
}));
|
||||
|
||||
// Show album
|
||||
this.route.queryParams.subscribe(params => {
|
||||
const albumId = params['albumId'];
|
||||
if (albumId) {
|
||||
const album = uploaderInfo.pictures.find(a => a.albumId === albumId)
|
||||
if (album) {
|
||||
this.openedAlbum = album
|
||||
|
||||
const pictureId = params['pictureId'];
|
||||
if (pictureId) {
|
||||
const picture = album.images.find(img => img.imageId === pictureId)
|
||||
if (picture) {
|
||||
this.viewedPicture = picture
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected readonly pictureHandlers = pictureHandlers;
|
||||
}
|
||||
@@ -70,6 +70,11 @@
|
||||
{{'home.enterChtnOnWeb'|translate}}
|
||||
</button>
|
||||
|
||||
<button style="width: 350px" tuiButton appearance="secondary" (click)="openGit()">
|
||||
<fa-icon [icon]="faGitAlt" style="font-size: 25px; display: flex; justify-content: center; width: 10px"></fa-icon>
|
||||
Git
|
||||
</button>
|
||||
|
||||
<button style="width: 350px" appearance="secondary" (click)="openRoadmap()" tuiButton iconStart="@tui.chart-no-axes-gantt">
|
||||
Roadmap
|
||||
</button>
|
||||
@@ -82,71 +87,6 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="detailedFeature">
|
||||
<div class="style">
|
||||
<h1>{{ 'home.chtn'|translate }} <span style="color: var(--tui-status-negative)"><tui-icon icon="@tui.circle-gauge"></tui-icon>
|
||||
{{ 'home.adaptsToYou'|translate }}</span></h1>
|
||||
<p>{{ 'home.adaptsToYouDesc'|translate }}</p>
|
||||
|
||||
<div class="cardList">
|
||||
<div tuiCardLarge>
|
||||
<tui-icon icon="@tui.globe" style="font-size: 80px"></tui-icon>
|
||||
|
||||
<h2>{{ 'home.chtnOnWeb'|translate }}</h2>
|
||||
<p>{{ 'home.chtnOnWebDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faAndroid"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnOnAndroid'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnOnAndroidDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faApple"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnOnApple'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnOnAppleDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faWindows"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnOnWindows'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnOnWindowsDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faLinux"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnOnLinux'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnOnLinuxDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faRecordVinyl"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnEcho'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnEchoDesc'|translate }}</p>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faDesktop"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.chtnReson'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{ 'home.chtnResonDesc'|translate }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="detailedFeature">
|
||||
<div class="style">
|
||||
<h1>{{ 'home.chtnIs'|translate }} <span style="color: var(--tui-status-positive)"><tui-icon icon="@tui.lock"></tui-icon>
|
||||
@@ -192,48 +132,35 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="detailedFeature" style="margin-bottom: 5%;">
|
||||
<section class="detailedFeature" id="platformList" style="margin-bottom: 5%;">
|
||||
<div class="style">
|
||||
<h1>{{ 'home.weAreExcitedFor'|translate }} <span style="color: var(--tui-status-negative)"><tui-icon icon="@tui.heart"></tui-icon>
|
||||
<h1>{{ 'home.adaptsTo'|translate }} <span style="color: var(--tui-status-negative)"><tui-icon icon="@tui.heart"></tui-icon>
|
||||
{{ 'home.you'|translate }}</span></h1>
|
||||
<p>{{ 'home.weAreExcitedForYouDesc'|translate }}</p>
|
||||
<p>{{ 'home.adaptsToYouDesc'|translate }}</p>
|
||||
|
||||
<div class="cardList">
|
||||
<div tuiCardLarge>
|
||||
<tui-icon icon="@tui.globe" style="font-size: 80px"></tui-icon>
|
||||
|
||||
<h2><a routerLink="/chat">{{ 'home.enterChtnOnWeb'|translate }}</a></h2>
|
||||
<p>{{ 'home.enterChtnOnWebDesc'|translate }}</p>
|
||||
<div class="disabled card">
|
||||
<fa-icon [icon]="faLinux"></fa-icon>
|
||||
<h2>Linux</h2>
|
||||
<div tuiBadge appearance="accent">{{'home.soon'|translate}}</div>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faGooglePlay"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.downloadChtnOnAndroid'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{'home.openBetaDesc'|translate}}</p>
|
||||
|
||||
<button (click)="androidBetaTestDialogOpen = true" tuiButton iconStart="@tui.door-open">{{'home.requestAlphaAccess'|translate}}</button>
|
||||
<div class="disabled card">
|
||||
<fa-icon [icon]="faGoogle"></fa-icon>
|
||||
<h2>Google</h2>
|
||||
<div tuiBadge appearance="accent">{{'home.soon'|translate}}</div>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<fa-icon [icon]="faAppStoreIos"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.downloadChtnOnApple'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{'home.openBetaDesc'|translate}}</p>
|
||||
|
||||
<button (click)="appleBetaTestDialogOpen = true" tuiButton iconStart="@tui.door-open">{{'home.requestAlphaAccess'|translate}}</button>
|
||||
<div class="disabled card">
|
||||
<fa-icon [icon]="faApple"></fa-icon>
|
||||
<h2>Apple</h2>
|
||||
<div tuiBadge appearance="accent">{{'home.soon'|translate}}</div>
|
||||
</div>
|
||||
|
||||
<div tuiCardLarge>
|
||||
<div class="disabled card">
|
||||
<fa-icon [icon]="faMicrosoft"></fa-icon>
|
||||
|
||||
<h2>{{ 'home.downloadOnWindows'|translate }}</h2>
|
||||
<div tuiBadge>{{'home.openBeta'|translate}}</div>
|
||||
<p>{{'home.openBetaDesc'|translate}}</p>
|
||||
|
||||
<button (click)="msBetaTestDialogOpen = true" tuiButton iconStart="@tui.door-open">{{'home.requestAlphaAccess'|translate}}</button>
|
||||
<h2>Microsoft</h2>
|
||||
<div tuiBadge appearance="accent">{{'home.soon'|translate}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -117,6 +117,35 @@ main {
|
||||
font-size: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
#platformList {
|
||||
.cardList {
|
||||
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
|
||||
|
||||
.card {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
aspect-ratio: 1/1;
|
||||
background: var(--tui-background-base);
|
||||
border-radius: 1.5rem;
|
||||
cursor: pointer;
|
||||
|
||||
&.disabled {
|
||||
pointer-events: none;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
fa-icon {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.logo {
|
||||
|
||||
@@ -8,7 +8,7 @@ import {FaIconComponent} from '@fortawesome/angular-fontawesome';
|
||||
import {
|
||||
faAndroid,
|
||||
faApple,
|
||||
faAppStoreIos,
|
||||
faAppStoreIos, faGitAlt, faGitee, faGoogle,
|
||||
faGooglePlay,
|
||||
faLinux,
|
||||
faMicrosoft,
|
||||
@@ -97,6 +97,10 @@ export class Homepage {
|
||||
window.open('https://help.chatenium.hu/s/169154db-df3e-44cb-980d-2db1915ecdf8', '_blank')
|
||||
}
|
||||
|
||||
openGit() {
|
||||
window.open('https://git.chatenium.hu', '_blank')
|
||||
}
|
||||
|
||||
openMsStore() {
|
||||
window.open('https://apps.microsoft.com/detail/9p1xq5vb62b0?ocid=webpdpshare', '_blank')
|
||||
}
|
||||
@@ -150,4 +154,7 @@ export class Homepage {
|
||||
protected readonly faGooglePlay = faGooglePlay;
|
||||
protected readonly faAppStoreIos = faAppStoreIos;
|
||||
protected readonly faMicrosoft = faMicrosoft;
|
||||
protected readonly faGoogle = faGoogle;
|
||||
protected readonly faGitee = faGitee;
|
||||
protected readonly faGitAlt = faGitAlt;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,10 @@ import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService';
|
||||
import {Network, NetworkCategory, NetworkChannel} from '@chatenium/chatenium-sdk/domain/networkService.schema';
|
||||
import {TextChannelServiceService} from '@chatenium/chatenium-sdk/services/textChannelService';
|
||||
import {Message as NetworkMessage} from '@chatenium/chatenium-sdk/domain/textChannelService.schema';
|
||||
import {PictureService} from '@chatenium/chatenium-sdk/services/pictureService';
|
||||
import {Album} from '@chatenium/chatenium-sdk/domain/pictureService.schema';
|
||||
import {PublicUserData} from '@chatenium/chatenium-sdk/domain/common.schema';
|
||||
import {MessagesViewModel} from './chat/elements/messages/messages-viewmodel';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
@@ -25,7 +29,7 @@ export class ServiceManager {
|
||||
sessionManager = new SessionManager(this.database.getApi(), this.keyring.getApi(), this.keyValue.getApi())
|
||||
currentSession = signal<Session | null>(null)
|
||||
|
||||
chatService: ChatService | null = null // Initialized in dm-list.ts
|
||||
chatService: ChatService | null = null // Initialized in picture-list.ts
|
||||
chatsStatus = signal<LoadStatus>(LoadStatus.loading)
|
||||
chats = signal<Chat[]>([])
|
||||
|
||||
@@ -36,6 +40,7 @@ export class ServiceManager {
|
||||
networkServices = signal<Record<string, NetworkStorage>>({})
|
||||
|
||||
dmServices = signal<Record<string, DmStorage>>({})
|
||||
pictureServices = signal<Record<string, PictureStorage>>({})
|
||||
}
|
||||
|
||||
export enum LoadStatus {
|
||||
@@ -48,11 +53,19 @@ export enum LoadStatus {
|
||||
export interface DmStorage {
|
||||
service: DMService
|
||||
messages: WritableSignal<Message[]>
|
||||
messagesStatus: WritableSignal<LoadStatus>
|
||||
messagesVm: MessagesViewModel
|
||||
chatData: WritableSignal<Chat>
|
||||
messageBox: MessageBoxViewModel
|
||||
wsListener: (action: string, message: string) => void
|
||||
}
|
||||
|
||||
export interface PictureStorage {
|
||||
service: PictureService
|
||||
albums: WritableSignal<Album[]>
|
||||
uploaderData: WritableSignal<PublicUserData>
|
||||
}
|
||||
|
||||
export interface NetworkStorage {
|
||||
service: NetworkService
|
||||
networkData: WritableSignal<Network>
|
||||
@@ -63,6 +76,8 @@ export interface NetworkStorage {
|
||||
export interface TextChannelStorage {
|
||||
service: TextChannelServiceService
|
||||
messages: WritableSignal<NetworkMessage[]>
|
||||
messagesVm: MessagesViewModel
|
||||
messagesStatus: WritableSignal<LoadStatus>
|
||||
channelData: WritableSignal<NetworkChannel>
|
||||
categoryData: WritableSignal<NetworkCategory>
|
||||
messageBox: MessageBoxViewModel
|
||||
|
||||
@@ -6,7 +6,7 @@ import {DatabaseAPI} from '@chatenium/chatenium-sdk/storage/database';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class IndexedDB {
|
||||
private dbVersion = 2
|
||||
private dbVersion = 3
|
||||
private db: IDBDatabase | null = null
|
||||
|
||||
getApi(): DatabaseAPI {
|
||||
@@ -36,6 +36,7 @@ export class IndexedDB {
|
||||
db.createObjectStore('files', { keyPath: 'id' })
|
||||
db.createObjectStore('messages', { keyPath: 'id' })
|
||||
db.createObjectStore('networkmessages', { keyPath: 'id' })
|
||||
db.createObjectStore('pictures', { keyPath: 'id' })
|
||||
}
|
||||
|
||||
request.onsuccess = (event: Event) => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export const environment = {
|
||||
version: "3.0-beta4",
|
||||
version: "3.0-beta8",
|
||||
api_url: "http://localhost:3000",
|
||||
cdn_url: "http://localhost:4000",
|
||||
ws_url: "ws://localhost:3000",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export const environment = {
|
||||
version: "3.0-beta4",
|
||||
version: "3.0-beta8",
|
||||
api_url: "https://api.chatenium.hu",
|
||||
cdn_url: "https://cdn.chatenium.hu",
|
||||
ws_url: "wss://api.chatenium.hu",
|
||||
|
||||
Reference in New Issue
Block a user