3 Commits

Author SHA1 Message Date
931ac91526 3.0 Beta 5 2026-04-13 15:14:24 +02:00
c56b0aab8a Started implementing Chatenium Pictures 2026-04-12 17:40:51 +02:00
62bc82f158 3.0 Beta 4 2026-04-11 17:23:19 +02:00
56 changed files with 1307 additions and 60 deletions

View File

@@ -42,12 +42,12 @@
{ {
"type": "initial", "type": "initial",
"maximumWarning": "500kB", "maximumWarning": "500kB",
"maximumError": "1MB" "maximumError": "100MB"
}, },
{ {
"type": "anyComponentStyle", "type": "anyComponentStyle",
"maximumWarning": "4kB", "maximumWarning": "4kB",
"maximumError": "8kB" "maximumError": "100MB"
} }
], ],
"outputHashing": "all", "outputHashing": "all",

30
ngsw-config.json Normal file
View File

@@ -0,0 +1,30 @@
{
"$schema": "./node_modules/@angular/service-worker/config/schema.json",
"index": "/index.html",
"assetGroups": [
{
"name": "app",
"installMode": "prefetch",
"resources": {
"files": [
"/favicon.ico",
"/index.csr.html",
"/index.html",
"/manifest.webmanifest",
"/*.css",
"/*.js"
]
}
},
{
"name": "assets",
"installMode": "lazy",
"updateMode": "prefetch",
"resources": {
"files": [
"/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
]
}
}
]
}

26
package-lock.json generated
View File

@@ -16,7 +16,7 @@
"@angular/platform-browser": "^21.2.0", "@angular/platform-browser": "^21.2.0",
"@angular/router": "^21.2.0", "@angular/router": "^21.2.0",
"@angular/service-worker": "^21.2.0", "@angular/service-worker": "^21.2.0",
"@chatenium/chatenium-sdk": "^1.1.5", "@chatenium/chatenium-sdk": "^1.1.8",
"@fortawesome/angular-fontawesome": "^4.0.0", "@fortawesome/angular-fontawesome": "^4.0.0",
"@fortawesome/free-brands-svg-icons": "^7.1.0", "@fortawesome/free-brands-svg-icons": "^7.1.0",
"@fortawesome/free-solid-svg-icons": "^7.1.0", "@fortawesome/free-solid-svg-icons": "^7.1.0",
@@ -1011,9 +1011,9 @@
} }
}, },
"node_modules/@chatenium/chatenium-sdk": { "node_modules/@chatenium/chatenium-sdk": {
"version": "1.1.5", "version": "1.1.8",
"resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.1.5.tgz", "resolved": "https://registry.npmjs.org/@chatenium/chatenium-sdk/-/chatenium-sdk-1.1.8.tgz",
"integrity": "sha512-seEsxlRk96WHsE4h6oPPa5nGZioePIZpB5qk0Xs3CaKNbVJKH02/Q5HW2PIi6DHw+djAENWu5zVXIic+9DrqZw==", "integrity": "sha512-UuPCr/NqZhLrT/lt8I1AM+UNFAdI00adtvvlu3BQgqCYPASoUpTJJ4HdMzJ+E0cb0pUS6DmN0Kv+w3vFQfRYwg==",
"dependencies": { "dependencies": {
"@faker-js/faker": "^10.4.0", "@faker-js/faker": "^10.4.0",
"axios": "^1.14.0", "axios": "^1.14.0",
@@ -4969,9 +4969,9 @@
"optional": true "optional": true
}, },
"node_modules/baseline-browser-mapping": { "node_modules/baseline-browser-mapping": {
"version": "2.10.17", "version": "2.10.18",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.17.tgz", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.18.tgz",
"integrity": "sha512-HdrkN8eVG2CXxeifv/VdJ4A4RSra1DTW8dc/hdxzhGHN8QePs6gKaWM9pHPcpCoxYZJuOZ8drHmbdpLHjCYjLA==", "integrity": "sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"bin": { "bin": {
@@ -5045,9 +5045,9 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "2.0.3", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
"integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"dependencies": { "dependencies": {
@@ -7854,9 +7854,9 @@
} }
}, },
"node_modules/multimatch/node_modules/brace-expansion": { "node_modules/multimatch/node_modules/brace-expansion": {
"version": "1.1.13", "version": "1.1.14",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"dependencies": { "dependencies": {

View File

@@ -19,7 +19,7 @@
"@angular/platform-browser": "^21.2.0", "@angular/platform-browser": "^21.2.0",
"@angular/router": "^21.2.0", "@angular/router": "^21.2.0",
"@angular/service-worker": "^21.2.0", "@angular/service-worker": "^21.2.0",
"@chatenium/chatenium-sdk": "^1.1.5", "@chatenium/chatenium-sdk": "^1.1.8",
"@fortawesome/angular-fontawesome": "^4.0.0", "@fortawesome/angular-fontawesome": "^4.0.0",
"@fortawesome/free-brands-svg-icons": "^7.1.0", "@fortawesome/free-brands-svg-icons": "^7.1.0",
"@fortawesome/free-solid-svg-icons": "^7.1.0", "@fortawesome/free-solid-svg-icons": "^7.1.0",

View File

@@ -1,5 +1,5 @@
{ {
"version": "3.0 Beta 3 (April 11, 2026)", "version": "3.0 Beta 5 (April 13, 2026)",
"ok": "Ok", "ok": "Ok",
"back": "Back", "back": "Back",
"aChatProgram": "A messaging platform that you can trust.", "aChatProgram": "A messaging platform that you can trust.",
@@ -104,12 +104,15 @@
"changeLogDialog": { "changeLogDialog": {
"label": "Chatenium has been updated", "label": "Chatenium has been updated",
"changeLog": { "changeLog": {
"1": "Fixed WebSocket connection issues", "1": "Started implementing Chatenium Pictures",
"2": "The web is now mobile-friendly", "2": "Made small changes to the UI",
"3": "The web is now a PWA. You can now install it on your home screen" "3": "Minor bug fixes in message box"
} }
}, },
"chatnav": { "chatnav": {
"pictureList": {
"myPictures": "My pictures"
},
"dmList": { "dmList": {
"newChat": "Start new chat", "newChat": "Start new chat",
"messageBox": { "messageBox": {
@@ -117,6 +120,14 @@
"you": "You: " "you": "You: "
} }
} }
},
"networkList": {
"newNetwork": "Start new network"
}
},
"pictures": {
"albumList": {
"noAlbum": "This user has no albums published"
} }
}, },
"elements": { "elements": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 658 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 769 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
public/icons/icon-72x72.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
public/icons/icon-96x96.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

View File

@@ -0,0 +1,57 @@
{
"name": "Chatenium",
"short_name": "Chtn",
"display": "standalone",
"scope": "./",
"start_url": "./",
"icons": [
{
"src": "icons/icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-128x128.png",
"sizes": "128x128",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-152x152.png",
"sizes": "152x152",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-384x384.png",
"sizes": "384x384",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "icons/icon-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable any"
}
]
}

View File

@@ -1,6 +1,6 @@
import {provideTaiga} from '@taiga-ui/core'; import {provideTaiga} from '@taiga-ui/core';
import {ApplicationConfig, provideBrowserGlobalErrorListeners, isDevMode} from '@angular/core'; import {ApplicationConfig, provideBrowserGlobalErrorListeners, isDevMode} from '@angular/core';
import {provideRouter} from '@angular/router'; import {provideRouter, withRouterConfig} from '@angular/router';
import {routes} from './app.routes'; import {routes} from './app.routes';
import {provideTranslateService} from '@ngx-translate/core'; import {provideTranslateService} from '@ngx-translate/core';
@@ -10,7 +10,9 @@ import { provideServiceWorker } from '@angular/service-worker';
export const appConfig: ApplicationConfig = { export const appConfig: ApplicationConfig = {
providers: [ providers: [
provideBrowserGlobalErrorListeners(), provideBrowserGlobalErrorListeners(),
provideRouter(routes), provideRouter(routes, withRouterConfig({
paramsInheritanceStrategy: "always"
})),
provideTaiga(), provideTaiga(),
provideTranslateService({ provideTranslateService({
fallbackLang: "en", fallbackLang: "en",
@@ -19,7 +21,8 @@ export const appConfig: ApplicationConfig = {
prefix: "/i18n/", prefix: "/i18n/",
suffix: ".json" suffix: ".json"
}) })
}), provideServiceWorker('ngsw-worker.js', { }),
provideServiceWorker('ngsw-worker.js', {
enabled: !isDevMode(), enabled: !isDevMode(),
registrationStrategy: 'registerWhenStable:30000' registrationStrategy: 'registerWhenStable:30000'
}) })

View File

@@ -7,6 +7,9 @@ import {authNeededGuard} from './guards/auth-needed-guard';
import {Homepage} from './homepage/homepage'; import {Homepage} from './homepage/homepage';
import {Privacy} from './privacy/privacy'; import {Privacy} from './privacy/privacy';
import {TOS} from './tos/tos'; 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 = [ export const routes: Routes = [
{path: '', component: Homepage}, {path: '', component: Homepage},
@@ -16,6 +19,12 @@ export const routes: Routes = [
{ {
path: 'chat', component: Chat, canActivate: [authNeededGuard], children: [ path: 'chat', component: Chat, canActivate: [authNeededGuard], children: [
{path: 'dm/:chatid', component: Dm}, {path: 'dm/:chatid', component: Dm},
{path: 'picture/:uploaderId', component: See},
{
path: 'network/:networkId', component: Network, children: [
{path: ":categoryId/:channelId", component: Text}
]
},
] ]
}, },
]; ];

View File

@@ -4,7 +4,6 @@
<ul> <ul>
<li>{{ "chat.changeLogDialog.changeLog.1"|translate }}</li> <li>{{ "chat.changeLogDialog.changeLog.1"|translate }}</li>
<li>{{ "chat.changeLogDialog.changeLog.2"|translate }}</li> <li>{{ "chat.changeLogDialog.changeLog.2"|translate }}</li>
<li>{{ "chat.changeLogDialog.changeLog.3"|translate }}</li>
</ul> </ul>
<button tuiButton iconStart="@tui.check" <button tuiButton iconStart="@tui.check"
@@ -21,14 +20,14 @@
<main id="layout" tuiGroup [collapsed]="true"> <main id="layout" tuiGroup [collapsed]="true">
<aside id="chatnav"> <aside id="chatnav">
<aside> <aside>
<tui-segmented id="mode_switcher"> <tui-segmented id="mode_switcher" [(activeItemIndex)]="navigationActiveIndex">
<button> <button>
<tui-icon icon="@tui.message-circle"/> <tui-icon icon="@tui.message-circle"/>
</button> </button>
<button disabled style="pointer-events: none; opacity: 0.5"> <button>
<tui-icon icon="@tui.network"/> <tui-icon icon="@tui.network"/>
</button> </button>
<button disabled style="pointer-events: none; opacity: 0.5"> <button>
<tui-icon icon="@tui.image"/> <tui-icon icon="@tui.image"/>
</button> </button>
</tui-segmented> </tui-segmented>
@@ -39,16 +38,37 @@
</aside> </aside>
<main> <main>
@switch (navigationActiveIndex) {
@case (0) {
<app-dm-list [token]="serviceManager.currentSession()!.token" <app-dm-list [token]="serviceManager.currentSession()!.token"
[userid]="serviceManager.currentSession()!.userData.userid"></app-dm-list> [userid]="serviceManager.currentSession()!.userData.userid"></app-dm-list>
}
@case (1) {
<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> </main>
</aside> </aside>
<main id="content"> <main id="content">
<div id="content_tint"> <div id="content_tint">
@if (router.url.startsWith("/chat/dm") && router.url.startsWith("/chat/picture")) {
<!-- To ensure data is loaded -->
@defer (when serviceManager.chatsStatus() != LoadStatus.loading) { @defer (when serviceManager.chatsStatus() != LoadStatus.loading) {
<router-outlet/> <router-outlet/>
} }
} @else if (router.url.startsWith("/chat/network")) {
@defer (when serviceManager.networksStatus() != LoadStatus.loading) {
<router-outlet/>
}
} @else {
<router-outlet/>
}
</div> </div>
</main> </main>
</main> </main>
@@ -62,6 +82,10 @@
<app-dm-list [token]="serviceManager.currentSession()!.token" <app-dm-list [token]="serviceManager.currentSession()!.token"
[userid]="serviceManager.currentSession()!.userData.userid"></app-dm-list> [userid]="serviceManager.currentSession()!.userData.userid"></app-dm-list>
} }
@case (1) {
<network-list [token]="serviceManager.currentSession()!.token"
[userid]="serviceManager.currentSession()!.userData.userid"></network-list>
}
} }
</div> </div>
@@ -82,9 +106,18 @@
</div> </div>
} }
@if (router.url.startsWith("/chat/dm")) {
<!-- To ensure data is loaded -->
@defer (when serviceManager.chatsStatus() != LoadStatus.loading) { @defer (when serviceManager.chatsStatus() != LoadStatus.loading) {
<router-outlet (activate)="routerOutletActive.set(true)" (deactivate)="routerOutletActive.set(false)"/> <router-outlet (activate)="routerOutletActive.set(true)" (deactivate)="routerOutletActive.set(false)"/>
} }
} @else if (router.url.startsWith("/chat/network")) {
@defer (when serviceManager.networksStatus() != LoadStatus.loading) {
<router-outlet (activate)="routerOutletActive.set(true)" (deactivate)="routerOutletActive.set(false)"/>
}
} @else {
<router-outlet (activate)="routerOutletActive.set(true)" (deactivate)="routerOutletActive.set(false)"/>
}
</main> </main>
} }
} }

View File

@@ -61,7 +61,6 @@
border-radius: 0 20px 20px 0; border-radius: 0 20px 20px 0;
height: 100%; height: 100%;
background: var(--tui-background-neutral-2); background: var(--tui-background-neutral-2);
padding: 15px;
} }
} }
} }

View File

@@ -11,6 +11,8 @@ import {WebSocketHandler} from '@chatenium/chatenium-sdk/core/webSocketHandler';
import {TranslatePipe, TranslateService} from '@ngx-translate/core'; import {TranslatePipe, TranslateService} from '@ngx-translate/core';
import {environment} from '../../environments/environment'; import {environment} from '../../environments/environment';
import {TuiTabBarComponent, TuiTabBarItem} from '@taiga-ui/addon-mobile'; import {TuiTabBarComponent, TuiTabBarItem} from '@taiga-ui/addon-mobile';
import {NetworkList} from './network-list/network-list';
import {PictureList} from './picture-list/picture-list';
@Component({ @Component({
selector: 'app-chat', selector: 'app-chat',
@@ -27,7 +29,9 @@ import {TuiTabBarComponent, TuiTabBarItem} from '@taiga-ui/addon-mobile';
TuiDialog, TuiDialog,
TranslatePipe, TranslatePipe,
TuiTabBarComponent, TuiTabBarComponent,
TuiTabBarItem TuiTabBarItem,
NetworkList,
PictureList
], ],
templateUrl: './chat.html', templateUrl: './chat.html',
styleUrl: './chat.scss', styleUrl: './chat.scss',
@@ -51,7 +55,7 @@ export class Chat implements OnInit {
{ {
text: "chat.tabBar.tab2", text: "chat.tabBar.tab2",
icon: '@tui.network', icon: '@tui.network',
implemented: false, implemented: true,
}, },
{ {
text: "chat.tabBar.tab3", text: "chat.tabBar.tab3",
@@ -68,6 +72,12 @@ export class Chat implements OnInit {
changeLogOpen = signal(false) changeLogOpen = signal(false)
async ngOnInit() { 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 () => { this.indexedDb.openDatabase().then(async () => {
const session = await this.serviceManager.sessionManager.loadPreferredSession() const session = await this.serviceManager.sessionManager.loadPreferredSession()
this.serviceManager.currentSession.set(session) this.serviceManager.currentSession.set(session)

View File

@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DmList } from './dm-list'; import { DmList } from './dm-list';
describe('DmList', () => { describe('PictureList', () => {
let component: DmList; let component: DmList;
let fixture: ComponentFixture<DmList>; let fixture: ComponentFixture<DmList>;

View File

@@ -1,7 +1,7 @@
<main [class.mobile]="breakpoint() == 'mobile'"> <main [class.mobile]="breakpoint() == 'mobile'">
@defer (when store) { @defer (when store) {
<navbar backButtonDest="/chat"> <navbar backButtonDest="/chat">
<div class="items-left"> <div class="data">
<oimg [src]="store.chatData().pfp" height="50px" width="50px" [radius]="15"></oimg> <oimg [src]="store.chatData().pfp" height="50px" width="50px" [radius]="15"></oimg>
<div class="chat-data"> <div class="chat-data">
@if (store.chatData().displayName == "") { @if (store.chatData().displayName == "") {

View File

@@ -1,7 +1,8 @@
main { main {
height: 95svh; height: 98svh;
display: grid; display: grid;
grid-template-rows: 70px minmax(0, 1fr) auto; grid-template-rows: 70px minmax(0, 1fr) auto;
padding: 15px;
&.mobile { &.mobile {
height: 100svh; height: 100svh;

View File

@@ -61,8 +61,6 @@ export class Dm implements OnInit {
} }
} }
this.store.messageBox.editingMessage.set(null)
this.store.messageBox.message.set("")
return return
} }
@@ -163,8 +161,7 @@ export class Dm implements OnInit {
const chatData = this.serviceManager.chats().find(c => c.chatid === chatid); const chatData = this.serviceManager.chats().find(c => c.chatid === chatid);
if (!session || !chatData) { if (!session || !chatData) {
console.warn(`Initialization deferred for ${chatid}: Session or ChatData missing.`); return
return;
} }
if (!this.serviceManager.dmServices()[chatid]) { if (!this.serviceManager.dmServices()[chatid]) {

View File

@@ -1,9 +1,8 @@
:host { :host {
display: grid; display: grid;
gap: 4px;
height: 100%; height: 100%;
img { ::ng-deep img {
display: block; display: block;
height: 100%; height: 100%;
width: 100%; width: 100%;

View File

@@ -80,12 +80,12 @@
</button> </button>
</div> </div>
<div class="items-middle"> <div class="items-middle">
<textarea (keydown.enter)="handleEnterKeydown($event); viewModel().onMessageSend(message.value, null)" [style]="'height:'+textareaHeight+'px;'" #message (input)="onTextAreaInput(message)" [(ngModel)]="viewModel().message"></textarea> <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>
<span class="placeholder" <span class="placeholder"
[class.hidden]="message.value != ''">{{ "chat.elements.messageBox.placeholder"|translate }}</span> [class.hidden]="message.value != ''">{{ "chat.elements.messageBox.placeholder"|translate }}</span>
</div> </div>
<div class="items-right"> <div class="items-right">
<button [disabled]="message.value.trim() == ''" tuiButton appearance="flat" (click)="viewModel().onMessageSend(message.value, null)"> <button [disabled]="message.value.trim() == ''" tuiButton appearance="flat" (click)="viewModel().message.set(''); viewModel().onMessageSend(message.value, null)">
<tui-icon icon="@tui.send"/> <tui-icon icon="@tui.send"/>
</button> </button>
</div> </div>

View File

@@ -101,8 +101,10 @@ export class MessageBox {
sendMessageWithCaption() { sendMessageWithCaption() {
this.viewModel().onMessageSend(this.viewModel().message(), this.viewModel().files()) this.viewModel().onMessageSend(this.viewModel().message(), this.viewModel().files())
this.viewModel().message.set("")
this.viewModel().files.set([]) this.viewModel().files.set([])
this.viewModel().dialogOpen.set(false) this.viewModel().dialogOpen.set(false)
this.viewModel().editingMessage.set(null)
} }
handleEnterKeydown(e: any) { handleEnterKeydown(e: any) {

View File

@@ -2,7 +2,10 @@
@for (message of messages(); track message.msgid; let i = $index) { @for (message of messages(); track message.msgid; let i = $index) {
<div <div
class="message" class="message"
[class.author]="message.author == serviceManager.currentSession()!.userData.userid" [class.author]="
messageAsDm(message).author == serviceManager.currentSession()!.userData.userid ||
messageAsNetwork(message).author.userid == serviceManager.currentSession()!.userData.userid
"
[class.chained_start]="isMessageStartOfChain(i)" [class.chained_start]="isMessageStartOfChain(i)"
[class.chained_middle]="isMessageMiddleInChain(i)" [class.chained_middle]="isMessageMiddleInChain(i)"
[class.chained_end]="isMessageEndOfChain(i)" [class.chained_end]="isMessageEndOfChain(i)"

View File

@@ -9,6 +9,7 @@
.message { .message {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: start;
&.author { &.author {
align-items: end; align-items: end;

View File

@@ -1,10 +1,13 @@
<nav [class.mobile]="breakpoint() == 'mobile'"> <nav [class.includeBackButton]="breakpoint() == showBackButtonAt()" [class.mobile]="breakpoint() == 'mobile'" [class.alignCenter]="dataAlignment() == 'center'">
@if (breakpoint() == "mobile") { @if (breakpoint() == showBackButtonAt()) {
<div> <div>
<button (click)="router.navigate([backButtonDest()])" tuiButton appearance="flat" iconStart="@tui.chevron-left"> <button (click)="router.navigate([backButtonDest()])" tuiButton appearance="flat" iconStart="@tui.chevron-left">
{{"back"|translate}} {{"back"|translate}}
</button> </button>
</div> </div>
} }
@if (dataAlignment() == "center" && breakpoint() != showBackButtonAt()) {
<div></div> <!-- filler to align data to center -->
}
<ng-content></ng-content> <ng-content></ng-content>
</nav> </nav>

View File

@@ -2,18 +2,31 @@ nav {
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
&.mobile { &.includeBackButton {
zoom: 0.85;
grid-template-columns: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr;
::ng-deep .items-left { ::ng-deep .data {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
} }
::ng-deep .items-right, ::ng-deep .items-left { &.mobile {
zoom: 0.85;
}
&.alignCenter {
grid-template-columns: 1fr 1fr 1fr;
::ng-deep .data {
display: flex;
justify-content: center;
align-items: center;
}
}
::ng-deep .items-right, ::ng-deep .data {
display: flex; display: flex;
gap: 10px; gap: 10px;
align-items: center; align-items: center;

View File

@@ -22,4 +22,6 @@ export class Navbar {
breakpoint = inject(TUI_BREAKPOINT) breakpoint = inject(TUI_BREAKPOINT)
router = inject(Router) router = inject(Router)
backButtonDest = input.required<string>() backButtonDest = input.required<string>()
showBackButtonAt = input<"desktopSmall"|"mobile">("mobile")
dataAlignment = input<"left"|"center">("left")
} }

View File

@@ -0,0 +1,3 @@
img {
display: block;
}

View File

@@ -0,0 +1,14 @@
<button disabled tuiButton appearance="secondary" iconStart="@tui.plus">
{{ "chat.chatnav.networkList.newNetwork"|translate }}
</button>
@for (network of serviceManager.networks(); track network.networkId) {
<button [class.enlarge]="breakpoint() == 'mobile'" tuiButton
[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">
<span>{{ network.name }}</span>
</div>
</button>
}

View 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%;
}
}
}
}

View File

@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NetworkList } from './network-list';
describe('NetworkList', () => {
let component: NetworkList;
let fixture: ComponentFixture<NetworkList>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [NetworkList],
}).compileComponents();
fixture = TestBed.createComponent(NetworkList);
component = fixture.componentInstance;
await fixture.whenStable();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,41 @@
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 {NetworkService} from '@chatenium/chatenium-sdk/services/networkService';
import {Oimg} from '../elements/oimg/oimg';
import {TranslatePipe} from '@ngx-translate/core';
@Component({
selector: 'network-list',
imports: [
Oimg,
TranslatePipe,
TuiButton,
RouterLink
],
templateUrl: './network-list.html',
styleUrl: './network-list.scss',
})
export class NetworkList 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.networkService = new NetworkService(this.userid(), this.token(), "", this.indexedDb.getApi(), () => {})
try {
this.serviceManager.networks.set(await this.serviceManager.networkService.get())
this.serviceManager.networksStatus.set(LoadStatus.loaded)
} catch (e) {
console.error(e)
this.serviceManager.networksStatus.set(LoadStatus.error)
}
}
}

View File

@@ -0,0 +1,34 @@
<main [class.mobile]="breakpoint() == 'mobile'">
@defer (when store) {
<navbar backButtonDest="/chat/network/{{networkId}}" showBackButtonAt="desktopSmall">
<div class="data">
<div class="chat-data">
@switch (store!.channelData().type) {
@case ("message") {
<tui-icon icon="@tui.hash"></tui-icon>
}
@case ("broadcast") {
<tui-icon icon="@tui.radio"></tui-icon>
}
@case ("voice") {
<tui-icon icon="@tui.audio-lines"></tui-icon>
}
}
<span class="main-name">{{ store!.channelData().name }}</span>
</div>
</div>
<div class="items-right">
<button tuiButton appearance="flat" disabled>
<tui-icon icon="@tui.phone"/>
</button>
</div>
</navbar>
<messages [messageBoxViewModel]="store!.messageBox" [messages]="store!.messages()" id="scrollContainer"
(onDelete)="deleteMessage($event)"/>
<message-box [viewModel]="store!.messageBox"/>
}
</main>

View File

@@ -0,0 +1,43 @@
main {
height: 98svh;
display: grid;
grid-template-rows: 70px minmax(0, 1fr) auto;
padding: 15px;
&.mobile {
height: 100svh;
padding: 15px;
}
.mobile {
height: 5px;
}
navbar {
.chat-data {
display: flex;
justify-content: center;
gap: 5px;
.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;
}
}
}
}

View File

@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Text } from './text';
describe('Text', () => {
let component: Text;
let fixture: ComponentFixture<Text>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Text],
}).compileComponents();
fixture = TestBed.createComponent(Text);
component = fixture.componentInstance;
await fixture.whenStable();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,233 @@
import {Component, inject, signal} from '@angular/core';
import {DmStorage, 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';
import {FileDataWithPreview, MessageBox} from '../../../elements/message-box/message-box';
import {Attachment} from '@chatenium/chatenium-sdk/domain/common.schema';
import {FileUploadProgressListener} from '@chatenium/chatenium-sdk/domain/fileUploadService.schema';
import {MessageBoxViewModel} from '../../../elements/message-box/message-box-viewmodel';
import {TextChannelServiceService} from '@chatenium/chatenium-sdk/services/textChannelService';
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';
@Component({
selector: 'app-text',
imports: [
MessageBox,
Messages,
Navbar,
Oimg,
TuiButton,
TuiIcon
],
templateUrl: './text.html',
styleUrl: './text.scss',
})
export class Text {
serviceManager = inject(ServiceManager)
route = inject(ActivatedRoute)
indexedDb = inject(IndexedDB)
breakpoint = inject(TUI_BREAKPOINT)
networkId = ""
channelId = ""
categoryId = ""
get store(): TextChannelStorage | null {
if (!this.serviceManager.networkServices()[this.networkId]) {
return null
}
return this.serviceManager.networkServices()[this.networkId].textChannels()[this.channelId]
}
async sendMessage(message: string, files: FileDataWithPreview[] | null) {
if (!this.store) return
if (!files && message.trim() == "") return
const session = this.serviceManager.currentSession();
if (session != null) {
const editedMessage = this.store.messageBox.editingMessage()
if (editedMessage) {
const storedMsg = this.store.messages().find(m => m.msgid == editedMessage.messageId)
const originalMessage: Message = JSON.parse(JSON.stringify(storedMsg))
if (storedMsg) {
storedMsg.message = message
}
try {
await this.store.service.editMessage(editedMessage.messageId, message)
} catch (e) {
if (storedMsg) {
storedMsg.message = originalMessage.message
}
}
this.store.messageBox.editingMessage.set(null)
this.store.messageBox.message.set("")
return
}
let attachments: Attachment[] = []
files?.forEach(file => {
const extraMetaData: Record<string, string> = {}
extraMetaData["thumbnailMetaData"] = file.videoThumbnail ?? ""
attachments.push({
fileName: file.name,
fileId: file.fileId,
type: file.type,
format: file.extension,
path: file.blob,
height: file.height,
width: file.width,
extraMetaData: extraMetaData
})
})
this.store.messages.update(value => [...value, {
author: {
userid: session.userData.userid,
pfp: session.userData.pfp,
username: session.userData.username,
displayName: session.userData.displayName
},
msgid: "",
message: message,
sent_at: {
T: 0,
I: 0
},
isEdited: false,
channelId: "",
networkId: "",
categoryId: "",
files: [],
seen: false,
replyTo: "",
replyToId: "",
forwardedFrom: "",
forwardedFromName: ""
}])
this.scrollToBottom("smooth")
await this.store.service.sendMessage("", message, null, null, files, <FileUploadProgressListener>{
fileProgressUpdate: (tempMsgId, fileId, allChunks, chunksDone) => {
this.uploadProgressUpdate(tempMsgId, fileId, allChunks, chunksDone)
}
})
}
}
async deleteMessage(messageId: string) {
if (!this.store) return
const i = this.store.messages().findIndex(m => m.msgid == messageId)
if (i != -1) {
const originalMessage: Message = JSON.parse(JSON.stringify(this.store.messages()[i]))
this.store.messages().splice(i, 1)
try {
await this.store.service.deleteMessages([messageId])
} catch (e) {
this.store.messages().splice(i, 0, originalMessage)
}
}
}
scrollToBottom(anim: 'instant' | 'smooth'): void {
setTimeout(() => {
const scrollContainer = <HTMLDivElement>document.querySelector("#scrollContainer")
scrollContainer.scroll({
top: scrollContainer.scrollHeight,
left: 0,
behavior: anim
});
}, 0)
}
uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) {
console.log(fileId, allChunks, chunksDone)
}
// The chatid parameter ensures isolation
onWsListen(action: string, message: string, networkId: string, channelId: string) {
const data = JSON.parse(message);
if (data.channelId === channelId) {
const targetStore = this.serviceManager.networkServices()[networkId].textChannels()[channelId];
if (targetStore) {
switch (action) {
case "newMessage":
targetStore.messages.update(messages => [...messages, data]);
this.scrollToBottom("smooth")
break;
}
}
}
}
ngOnInit() {
this.route.params.subscribe(async params => {
const networkId = params['networkId'];
const categoryId = params['categoryId'];
const channelId = params['channelId'];
this.networkId = networkId;
this.categoryId = categoryId;
this.channelId = channelId;
const session = this.serviceManager.currentSession();
const networkData = this.serviceManager.networks().find(c => c.networkId === networkId);
if (!session || !networkData) {
console.warn("No network data")
return
}
const categoryData = networkData.categories.find(c => c.categoryId === categoryId);
if (!categoryData) {
console.warn("No category data")
return
}
const channelData = categoryData.channels.find(c => c.channelId === channelId);
if (!channelData) {
console.warn("No channel data")
return
}
if (!this.serviceManager.networkServices()[networkId]) {
console.warn("No networkService")
return
}
console.log(this.serviceManager.networkServices())
console.log(this.serviceManager.networkServices()[networkId])
if (!this.serviceManager.networkServices()[networkId].textChannels()[channelId]) {
const newStore = {
categoryData: signal(categoryData),
channelData: signal(channelData),
messages: signal<Message[]>([]),
messageBox: new MessageBoxViewModel((msg, files) => this.sendMessage(msg, files)),
wsListener: (action, data) => this.onWsListen(action, data, networkId, categoryId),
} as TextChannelStorage;
newStore.service = new TextChannelServiceService(
session.userData.userid,
session.token,
networkId,
categoryId,
channelId,
this.indexedDb.getApi(),
(action, data) => newStore.wsListener(action, data)
);
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);
this.scrollToBottom("instant")
await currentStore.service.joinWebSocketRoom();
}
});
}
}

View File

@@ -0,0 +1,44 @@
@defer(when store) {
<div id="layout" [class.routerOutletActive]="routerOutletActive()" [class.hideNetworkNav]="routerOutletActive() && breakpoint() == 'desktopSmall'">
<div id="router">
<router-outlet (activate)="routerOutletActive.set(true)" (deactivate)="routerOutletActive.set(false)"></router-outlet>
</div>
<div id="network-data">
<navbar backButtonDest="/chat" dataAlignment="center">
<div class="data">
<oimg [src]="store.networkData().picture" height="50px" width="50px" [radius]="15"></oimg>
<h2>{{store.networkData().name}}</h2>
</div>
<div class="items-right"></div>
</navbar>
<main tuiGroup orientation="vertical" style="width: 100%">
@for (category of store.networkData().categories; track category) {
<div class="category">
<h2>{{category.name}}</h2>
<div tuiGroup orientation="vertical" style="width: 100%">
@for (channel of category.channels; track channel) {
<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>
}
@case ("broadcast") {
<tui-icon icon="@tui.radio"></tui-icon>
}
@case ("voice") {
<tui-icon icon="@tui.audio-lines"></tui-icon>
}
}
<span>{{channel.name}}</span>
</button>
}
</div>
</div>
}
</main>
</div>
</div>
}

View File

@@ -0,0 +1,45 @@
#layout {
overflow-y: scroll;
width: 100%;
height: 100%;
display: grid;
grid-template-columns: 0 100%;
overflow-x: hidden;
padding: 15px;
transition: 0.2s;
&.routerOutletActive {
overflow-y: hidden;
padding: 0;
grid-template-columns: 1fr 300px;
#router {
background: var(--tui-background-neutral-1);
}
main {
padding: 15px;
}
}
&.hideNetworkNav {
grid-template-columns: 1fr;
#network-data {
&.hidden {
display: none;
}
}
}
.category {
background: var(--tui-background-base-alt);
width: 100%;
padding: 15px;
.channel {
display: flex;
justify-content: start;
}
}
}

View File

@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Network } from './network';
describe('Network', () => {
let component: Network;
let fixture: ComponentFixture<Network>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Network],
}).compileComponents();
fixture = TestBed.createComponent(Network);
component = fixture.componentInstance;
await fixture.whenStable();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,77 @@
import {Component, inject, OnInit, signal} from '@angular/core';
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';
import {DmStorage, NetworkStorage, ServiceManager} from '../../service-manager';
import {DMService} from '@chatenium/chatenium-sdk/services/dmService';
import {Network as NetworkData} from "@chatenium/chatenium-sdk/domain/networkService.schema"
import {NetworkService} from '@chatenium/chatenium-sdk/services/networkService';
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';
@Component({
selector: 'app-network',
imports: [
RouterOutlet,
Navbar,
Oimg,
TuiGroup,
TuiButton,
TuiIcon,
RouterLink
],
templateUrl: './network.html',
styleUrl: './network.scss',
})
export class Network implements OnInit {
serviceManager = inject(ServiceManager)
route = inject(ActivatedRoute)
indexedDb = inject(IndexedDB)
breakpoint = inject(TUI_BREAKPOINT)
router = inject(Router)
routerOutletActive = signal(false)
networkId = ""
get store() {
return this.serviceManager.networkServices()[this.networkId]
}
ngOnInit() {
this.route.params.subscribe(async params => {
console.log("Loading network...")
const networkId = params['networkId'];
this.networkId = networkId;
const session = this.serviceManager.currentSession();
const networkData = this.serviceManager.networks().find(c => c.networkId === networkId);
if (!session || !networkData) {
console.warn(`Initialization deferred for ${networkId}: Session or NetworkData missing.`);
return;
}
if (!this.serviceManager.networkServices()[networkId]) {
const newStore = {
networkData: signal<NetworkData>(networkData),
textChannels: signal({}),
wsListener: (action, data) => {
},
} as NetworkStorage;
newStore.service = new NetworkService(
session.userData.userid,
session.token,
networkId,
this.indexedDb.getApi(),
(action, data) => newStore.wsListener(action, data)
);
this.serviceManager.networkServices()[networkId] = newStore;
}
});
}
}

View 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>
}

View 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%;
}
}
}
}

View 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();
});
});

View File

@@ -0,0 +1,41 @@
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(), () => {})
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)
}
}
}

View 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>

View 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;
}
}
}

View 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();
});
});

View 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;
}

View File

@@ -9,6 +9,13 @@ import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
import {DMService} from '@chatenium/chatenium-sdk/services/dmService'; import {DMService} from '@chatenium/chatenium-sdk/services/dmService';
import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema'; import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema';
import {MessageBoxViewModel} from './chat/elements/message-box/message-box-viewmodel'; import {MessageBoxViewModel} from './chat/elements/message-box/message-box-viewmodel';
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';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@@ -21,11 +28,18 @@ export class ServiceManager {
sessionManager = new SessionManager(this.database.getApi(), this.keyring.getApi(), this.keyValue.getApi()) sessionManager = new SessionManager(this.database.getApi(), this.keyring.getApi(), this.keyValue.getApi())
currentSession = signal<Session | null>(null) 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) chatsStatus = signal<LoadStatus>(LoadStatus.loading)
chats = signal<Chat[]>([]) chats = signal<Chat[]>([])
networkService: NetworkService | null = null // Initialized in network-list.ts
networksStatus = signal<LoadStatus>(LoadStatus.loading)
networks = signal<Network[]>([])
// Services for individual networks
networkServices = signal<Record<string, NetworkStorage>>({})
dmServices = signal<Record<string, DmStorage>>({}) dmServices = signal<Record<string, DmStorage>>({})
pictureServices = signal<Record<string, PictureStorage>>({})
} }
export enum LoadStatus { export enum LoadStatus {
@@ -42,3 +56,25 @@ export interface DmStorage {
messageBox: MessageBoxViewModel messageBox: MessageBoxViewModel
wsListener: (action: string, message: string) => void 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>
wsListener: (action: string, message: string) => void
textChannels: WritableSignal<Record<string, TextChannelStorage>>
}
export interface TextChannelStorage {
service: TextChannelServiceService
messages: WritableSignal<NetworkMessage[]>
channelData: WritableSignal<NetworkChannel>
categoryData: WritableSignal<NetworkCategory>
messageBox: MessageBoxViewModel
wsListener: (action: string, message: string) => void
}

View File

@@ -6,7 +6,7 @@ import {DatabaseAPI} from '@chatenium/chatenium-sdk/storage/database';
providedIn: 'root' providedIn: 'root'
}) })
export class IndexedDB { export class IndexedDB {
private dbVersion = 1 private dbVersion = 3
private db: IDBDatabase | null = null private db: IDBDatabase | null = null
getApi(): DatabaseAPI { getApi(): DatabaseAPI {
@@ -35,6 +35,8 @@ export class IndexedDB {
db.createObjectStore('networks', { keyPath: 'id' }) db.createObjectStore('networks', { keyPath: 'id' })
db.createObjectStore('files', { keyPath: 'id' }) db.createObjectStore('files', { keyPath: 'id' })
db.createObjectStore('messages', { keyPath: 'id' }) db.createObjectStore('messages', { keyPath: 'id' })
db.createObjectStore('networkmessages', { keyPath: 'id' })
db.createObjectStore('pictures', { keyPath: 'id' })
} }
request.onsuccess = (event: Event) => { request.onsuccess = (event: Event) => {

View File

@@ -1,5 +1,5 @@
export const environment = { export const environment = {
version: "3.0-beta3", version: "3.0-beta5",
api_url: "http://localhost:3000", api_url: "http://localhost:3000",
cdn_url: "http://localhost:4000", cdn_url: "http://localhost:4000",
ws_url: "ws://localhost:3000", ws_url: "ws://localhost:3000",

View File

@@ -1,5 +1,5 @@
export const environment = { export const environment = {
version: "3.0-beta3", version: "3.0-beta5",
api_url: "https://api.chatenium.hu", api_url: "https://api.chatenium.hu",
cdn_url: "https://cdn.chatenium.hu", cdn_url: "https://cdn.chatenium.hu",
ws_url: "wss://api.chatenium.hu", ws_url: "wss://api.chatenium.hu",