Merge branch 'master' into muc

# Conflicts: # package-lock.json # src/broker/delegate.ts # src/components/inbox/InboxMessaging.vue # src/store/index.ts # src/store/tables/inbox.ts
prose-im · Oct 10, 2023 · 3c5cf34 · 3c5cf34
2 parents c61d299 + f79c91c
commit 3c5cf34
Show file tree

Hide file tree

Showing 111 changed files with 2,117 additions and 558 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# prose-app-web
+# <picture><source media="(prefers-color-scheme: dark)" srcset="https://github.com/prose-im/prose-app-web/assets/1451907/8e6c83c6-26a0-4505-9561-50a9c97bf236" /><img src="https://github.com/prose-im/prose-app-web/assets/1451907/dd3f7cb4-b156-4ecc-a15f-744dea259e27" alt="prose-app-web" width="150" height="60" /></picture>
 
 [![Test and Lint](https://github.com/prose-im/prose-app-web/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/prose-im/prose-app-web/actions/workflows/test.yml)
 
@@ -76,6 +76,10 @@ PROSE_CORE_VIEWS_PATH="../prose-core-views" npm run dev
 
 ## Design
 
+![Prose main view](https://github.com/prose-im/prose-app-web/assets/1451907/624bcf38-7406-4194-9aba-924144b6a675)
+![Prose profile modal](https://github.com/prose-im/prose-app-web/assets/1451907/e930929b-2fee-4566-86b5-a1b104b39c03)
+![Prose login screen](https://github.com/prose-im/prose-app-web/assets/1451907/92af0399-b74a-4321-b66a-a9a64d56b783)
+
 _👉 The Prose Web app reference design [can be found there](https://github.com/prose-im/prose-medley/blob/master/designs/app/prose-app-web.sketch)._
 
 ## License

diff --git a/index.html b/index.html
@@ -33,11 +33,13 @@
     />
 
     <title>Prose</title>
+
+    <script type="module" src="/src/main.ts" defer async></script>
   </head>
 
   <body>
-    <div id="app"></div>
-
-    <script type="module" src="/src/main.ts"></script>
+    <div id="runtime">
+      <div id="loader"></div>
+    </div>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,6 +71,7 @@
     "sass": "1.57.x",
     "vite": "4.2.x",
     "vite-plugin-wasm": "3.2.x",
+    "vite-plugin-html-config": "1.0.x",
     "vite-plugin-pug-transformer": "1.0.x",
     "vite-plugin-static-copy": "0.13.x",
     "vite-plugin-svg-icons": "2.0.x",

diff --git a/public/videos/loader/dark/logo-av1.webm b/public/videos/loader/dark/logo-av1.webm
diff --git a/public/videos/loader/dark/logo-hvc1.mp4 b/public/videos/loader/dark/logo-hvc1.mp4
diff --git a/public/videos/loader/dark/logo-vp9.webm b/public/videos/loader/dark/logo-vp9.webm
diff --git a/public/videos/loader/light/logo-av1.webm b/public/videos/loader/light/logo-av1.webm
diff --git a/public/videos/loader/light/logo-hvc1.mp4 b/public/videos/loader/light/logo-hvc1.mp4
diff --git a/public/videos/loader/light/logo-vp9.webm b/public/videos/loader/light/logo-vp9.webm