refactor ui layout

3 files changed, 7 insertions, 5 deletions

diff --git a/client-web/source/user/local.ts b/client-web/source/user/local.ts
index 38bcfb9..a741726 100644
--- a/client-web/source/user/local.ts
+++ b/client-web/source/user/local.ts
@@ -7,6 +7,7 @@ import { get_rnnoise_node } from "../rnnoise.ts";
 import { Room } from "../room.ts";
 import { TrackHandle } from "../track_handle.ts";
 import { User } from "./mod.ts";
+import { BOTTOM_CONTAINER } from "../index.ts";
 
 export class LocalUser extends User {
     mic_gain?: GainNode
@@ -66,7 +67,7 @@ export class LocalUser extends User {
         const el = document.createElement("div")
         el.classList.add("local-controls")
         el.append(mic_toggle, camera_toggle, screen_toggle)
-        document.body.append(el)
+        BOTTOM_CONTAINER.append(el)
     }
 
     async create_camera_track() {
diff --git a/client-web/source/user/mod.ts b/client-web/source/user/mod.ts
index 6cb8715..c0aa6be 100644
--- a/client-web/source/user/mod.ts
+++ b/client-web/source/user/mod.ts
@@ -1,5 +1,6 @@
 /// <reference lib="dom" />
 
+import { ROOM_CONTAINER } from "../index.ts";
 import { log } from "../logger.ts"
 import { Room } from "../room.ts"
 import { TrackHandle } from "../track_handle.ts";
@@ -14,7 +15,7 @@ export abstract class User {
     constructor(public room: Room, public id: number) {
         this.el = document.createElement("div")
         this.el.classList.add("user")
-        this.room.el.append(this.el)
+        ROOM_CONTAINER.append(this.el)
         this.setup_view()
     }
 
diff --git a/client-web/source/user/remote.ts b/client-web/source/user/remote.ts
index eadb11f..ced8482 100644
--- a/client-web/source/user/remote.ts
+++ b/client-web/source/user/remote.ts
@@ -1,6 +1,6 @@
 /// <reference lib="dom" />
 
-import { servers } from "../index.ts"
+import { ROOM_CONTAINER, RTC_CONFIG } from "../index.ts"
 import { log } from "../logger.ts"
 import { Room } from "../room.ts"
 import { TrackHandle } from "../track_handle.ts";
@@ -13,7 +13,7 @@ export class RemoteUser extends User {
     constructor(room: Room, id: number) {
         super(room, id)
         log("usermodel", `added remote user: ${id}`)
-        this.peer = new RTCPeerConnection(servers)
+        this.peer = new RTCPeerConnection(RTC_CONFIG)
         this.peer.onicecandidate = ev => {
             if (!ev.candidate) return
             room.signaling.send_relay({ ice_candidate: ev.candidate.toJSON() }, this.id)
@@ -69,6 +69,6 @@ export class RemoteUser extends User {
     leave() {
         log("usermodel", `remove remote user: ${this.display_name}`)
         this.peer.close()
-        this.room.el.removeChild(this.el)
+        ROOM_CONTAINER.removeChild(this.el)
     }
 }
\ No newline at end of file