From 04f958df4c5c63f2b8b00edcbd07a8485e8a3d6f Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Thu, 18 Sep 2025 23:45:55 +0200 Subject: [PATCH] refactor: Moved model for `chatroom` into file `chatroom.model.ts` -- ALIGN --- src/app/chatroom/chatroom.component.ts | 3 +-- src/app/chatroom/chatroom.model.ts | 9 +++++++++ src/app/chatroom/chatroom.service.ts | 3 +-- src/app/chatrooms/chatrooms.component.ts | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/chatroom/chatroom.component.ts b/src/app/chatroom/chatroom.component.ts index b04ec509..b4cbd6c0 100644 --- a/src/app/chatroom/chatroom.component.ts +++ b/src/app/chatroom/chatroom.component.ts @@ -2,8 +2,7 @@ import { Component, OnInit, NgZone, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ChatroomService } from './chatroom.service'; import { UserService } from '../user/user.service'; -import { Chatroom } from './chatroom'; -import { Message } from './message'; +import { Chatroom, Message } from './chatroom.model'; @Component({ diff --git a/src/app/chatroom/chatroom.model.ts b/src/app/chatroom/chatroom.model.ts index 9539823f..179bc586 100644 --- a/src/app/chatroom/chatroom.model.ts +++ b/src/app/chatroom/chatroom.model.ts @@ -4,3 +4,12 @@ export interface Chatroom name: string, shard: number } + +export interface Message +{ + id: string, + serialNumber: number, + timestamp: string, + user: string, + text: string, +} diff --git a/src/app/chatroom/chatroom.service.ts b/src/app/chatroom/chatroom.service.ts index a2b039b3..a0129466 100644 --- a/src/app/chatroom/chatroom.service.ts +++ b/src/app/chatroom/chatroom.service.ts @@ -2,8 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { EventSourceMessage, fetchEventSource } from '@microsoft/fetch-event-source'; import { Observable, Subscriber } from 'rxjs'; -import { Chatroom } from './chatroom'; -import { Message } from './message'; +import { Chatroom, Message } from './chatroom.model'; class RetriableError extends Error { } class CanceledError extends Error { } diff --git a/src/app/chatrooms/chatrooms.component.ts b/src/app/chatrooms/chatrooms.component.ts index 6473b31d..75f508db 100644 --- a/src/app/chatrooms/chatrooms.component.ts +++ b/src/app/chatrooms/chatrooms.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Chatroom } from '../chatroom/chatroom'; +import { Chatroom } from '../chatroom/chatroom.model'; import { UserService } from "../user/user.service"; import { ChatroomService } from "../chatroom/chatroom.service"; import { RouterLink } from '@angular/router'; -- 2.39.5