refactor: Moved model for `chatroom` into file `chatroom.model.ts` -- ALIGN

diff --git a/src/app/chatroom/chatroom.component.ts b/src/app/chatroom/chatroom.component.ts
index b04ec509bf3bf234d11ffd89894a16f2c9263a85..b4cbd6c05a74fc6e81e0d2be4a98f68f04fcae39 100644 (file)
--- 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 9539823f0ca7759bc012118a020cccb044951074..179bc586e2d5d1431c33ded69709766cbf32e879 100644 (file)
--- 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 a2b039b36dc53f7fe9a6252679cca860cb7f8190..a0129466e1a50ef358694314292e9307f2db6c7e 100644 (file)
--- 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 6473b31d2d08e22e8c01343fa1c6797419a3de7f..75f508db9a06bfa64c93345906d2bb325d45631b 100644 (file)
--- 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';