3.0 Beta 5

This commit is contained in:
2026-04-13 15:14:24 +02:00
parent c56b0aab8a
commit 931ac91526
16 changed files with 151 additions and 32 deletions

View File

@@ -61,8 +61,6 @@ export class Dm implements OnInit {
}
}
this.store.messageBox.editingMessage.set(null)
this.store.messageBox.message.set("")
return
}

View File

@@ -104,6 +104,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) {

View File

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

View File

@@ -4,7 +4,7 @@
@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">

View File

@@ -120,8 +120,6 @@ export class Text {
}
})
}
this.store.messageBox.message.set("")
}
async deleteMessage(messageId: string) {

View File

@@ -20,7 +20,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>

View File

@@ -14,7 +14,7 @@
grid-template-columns: 1fr 300px;
#router {
background: var(--tui-background-neutral-1-pressed);
background: var(--tui-background-neutral-1);
}
main {

View File

@@ -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';
@@ -31,6 +31,7 @@ export class Network implements OnInit {
route = inject(ActivatedRoute)
indexedDb = inject(IndexedDB)
breakpoint = inject(TUI_BREAKPOINT)
router = inject(Router)
routerOutletActive = signal(false)

View File

@@ -1,5 +1,5 @@
<button disabled tuiButton appearance="secondary" iconStart="@tui.mail-plus">
{{"chat.chatnav.dmList.newChat"|translate}}
<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) {

View File

@@ -1,10 +1,14 @@
<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 == "") {
@if (!store.uploaderData().displayName) {
<span class="main-name">{{'@'+store.uploaderData().username}}</span>
} @else {
<span class="main-name">{{store.uploaderData().displayName}}</span>
@@ -18,17 +22,39 @@
</navbar>
<main>
@for (album of store.albums(); track album) {
<div class="album">
<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>
@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>
}

View File

@@ -31,7 +31,7 @@ main {
}
}
main {
#albumList {
display: flex;
gap: 10px;
flex-wrap: wrap;
@@ -45,6 +45,7 @@ main {
border-radius: 30px;
overflow: hidden;
position: relative;
cursor: pointer;
.album-name {
position: absolute;
@@ -66,4 +67,19 @@ main {
}
}
}
#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

@@ -1,12 +1,17 @@
import {Component, inject, signal} from '@angular/core';
import {DmStorage, PictureStorage, ServiceManager} from '../../../service-manager';
import {ActivatedRoute} from '@angular/router';
import {ActivatedRoute, Router} from '@angular/router';
import {IndexedDB} from '../../../storage/indexed-db';
import {TUI_BREAKPOINT, TuiButton, TuiIcon} from '@taiga-ui/core';
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',
@@ -15,7 +20,11 @@ import {Masonry} from '../../elements/masonry/masonry';
Oimg,
TuiButton,
TuiIcon,
Masonry
Masonry,
TuiDialog,
TuiBlockStatusComponent,
TranslatePipe,
TuiBadgedContentDirective
],
templateUrl: './see.html',
styleUrl: './see.scss',
@@ -25,13 +34,50 @@ export class See {
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'];
@@ -60,7 +106,28 @@ export class See {
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

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

View File

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