drawing-crdt @ 139ab6e2

+Subproject commit 139ab6e2cc9d6f0501fa958f3c813df0fcc81310

src/elements.js

-export const userIDElem = document.getElementById("user-id")
-
-export const peerIDElem = document.getElementById("peer-id")
-export const peerButton = document.getElementById("peer-connect")
 export const connectedPeers = document.getElementById("connected-peers")
 
+export const overallStatusIcon = document.getElementById("overall-status-icon")
+export const overallStatusIconImage = document.getElementById(
+  "overall-status-icon-img",
+)
+
 export const canvas = document.getElementById("canvas")
 export const penButton = document.getElementById("pen-tool")
 export const eraserButton = document.getElementById("eraser-tool")
+export const recognitionModeButton = document.getElementById("recognition-mode")
+export const draggingToolButton = document.getElementById("dragging-tool")
+export const canvasCenterToolButton = document.getElementById("canvas-center")
+
+export const fastUndoButton = document.getElementById("fast-undo-tool")
+export const undoButton = document.getElementById("undo-tool")
 
 export const roomIDElem = document.getElementById("room-id")
 export const roomConnectButton = document.getElementById("room-connect")
@@ -14,3 +21,15 @@ export const connectedRoomID = document.getElementById("connected-room-id")
 export const connectedRoomInfoContainer = document.getElementById(
   "connected-room-info",
 )
+
+export const penProperties = document.getElementById("pen-properties")
+export const closeButton = document.querySelectorAll(".close")
+export const palette = document.getElementById("palette")
+export const rectangle = document.getElementById("rectangle")
+export const wheel = document.getElementById("wheel")
+export const strokeColorPicker = document.getElementById("other-colours")
+export const strokeRadiusSlider = document.getElementById("range")
+export const output = document.getElementById("value")
+export const labelColours = document.getElementById("colours")
+export const userInfo = document.getElementById("user-avatar")
+export const topPanel = document.getElementById("top-panel")

src/server.js

@@ -45,6 +45,17 @@ app.use((request, response, next) => {
   next()
 })
 
+app.get("/", (request, response, next) => {
+  if (request.query.room == null) {
+    const url = new URL(
+      `${request.protocol}://${request.get("host")}${request.originalUrl}`,
+    )
+    url.searchParams.set("room", "imperial")
+    return response.redirect(url)
+  }
+  next()
+})
+
 app.use("/", express.static("public"))
 
 server.listen(port, host, () => {

public/service-worker.js → src/service-worker.js

@@ -7,14 +7,7 @@ self.addEventListener("activate", (event) => {
 })
 
 const CACHE_NAME = "APP-V0"
-const FILES_TO_CACHE = [
-  "/index.html",
-  "/styles.css",
-  "/js/app.js",
-  "/js/queue.js",
-  "/logo.png",
-  "/manifest.json",
-]
+const FILES_TO_CACHE = [FILES_TO_CACHE_LIST] // eslint-disable-line no-undef
 const FILE_ALIASES = new Map([["/", "/index.html"]])
 
 self.addEventListener("install", async () => {
@@ -30,7 +23,11 @@ self.addEventListener("activate", async () => {
 })
 
 const normalizePath = (path) => {
-  let normalizedPath = path.replace(/\/+/g, "/").replace(/$(?<!^)\/$/, "")
+  let normalizedPath = path.replace(/\/+/g, "/")
+  // TODO: Is this a correct replacement for replace(/$(?<!^)\/$/, "") (compatible with Safari)?
+  if (normalizedPath != "/" && normalizedPath.endsWith("/")) {
+    normalizedPath = normalizedPath.slice(0, -1)
+  }
   normalizedPath = FILE_ALIASES.get(normalizedPath) || normalizedPath
   return normalizedPath
 }

signalbuddy @ 216be42b

-Subproject commit 04ea4e5081059faffdebae65c92da25fa98f996d
+Subproject commit 216be42b2a6cc5632d427cf222c789d34026a274

src/y-webrtc/LICENSE

-The MIT License (MIT)
-
-Copyright (c) 2014 Kevin Jahns <kevin.jahns@rwth-aachen.de>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

yjs @ 44aa194d

-Subproject commit c2a07807dfaa1e5e6b667d83aa4a7d348c759c0f
+Subproject commit 44aa194d19217cbc1d8e0828cf8fdf39fc4dcdd3