diff --git a/back/package.json b/back/package.json
index 08b56450..4e4c9fc1 100644
--- a/back/package.json
+++ b/back/package.json
@@ -54,8 +54,9 @@
"prom-client": "^12.0.0",
"query-string": "^6.13.3",
"redis": "^3.1.2",
- "uWebSockets.js": "uNetworking/uWebSockets.js#v19.3.0",
- "uuidv4": "^6.0.7"
+ "uWebSockets.js": "uNetworking/uWebSockets.js#v18.5.0",
+ "uuidv4": "^6.0.7",
+ "zod": "^3.12.0"
},
"devDependencies": {
"@types/busboy": "^0.2.3",
diff --git a/back/yarn.lock b/back/yarn.lock
index 4e11b3e4..b706b984 100644
--- a/back/yarn.lock
+++ b/back/yarn.lock
@@ -2258,3 +2258,8 @@ yn@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+zod@^3.12.0:
+ version "3.14.2"
+ resolved "https://registry.yarnpkg.com/zod/-/zod-3.14.2.tgz#0b4ed79085c471adce0e7f2c0a4fbb5ddc516ba2"
+ integrity sha512-iF+wrtzz7fQfkmn60PG6XFxaWBhYYKzp2i+nv24WbLUWb2JjymdkHlzBwP0erpc78WotwP5g9AAu7Sk8GWVVNw==
diff --git a/front/nginx.conf b/front/nginx.conf
index 9521137c..876ee916 100644
--- a/front/nginx.conf
+++ b/front/nginx.conf
@@ -45,7 +45,7 @@ server {
rewrite ^/jwt /index.html break;
}
- location ~ ^/[@_]/ {
+ location ~ ^/[@_*]/ {
try_files $uri $uri/ /index.html;
}
}
diff --git a/front/package.json b/front/package.json
index cf307190..854a5c48 100644
--- a/front/package.json
+++ b/front/package.json
@@ -58,6 +58,7 @@
"simple-peer": "^9.11.0",
"socket.io-client": "^2.3.0",
"standardized-audio-context": "^25.2.4",
+ "ts-deferred": "^1.0.4",
"ts-proto": "^1.96.0",
"typesafe-i18n": "^2.59.0",
"uuidv4": "^6.2.10",
diff --git a/front/public/resources/help-setting-camera-permission/de-DE-chrome.png b/front/public/resources/help-setting-camera-permission/de-DE-chrome.png
new file mode 100644
index 00000000..9903c308
Binary files /dev/null and b/front/public/resources/help-setting-camera-permission/de-DE-chrome.png differ
diff --git a/front/src/Components/HelpCameraSettings/images/help-setting-camera-permission-firefox.png b/front/public/resources/help-setting-camera-permission/en-US-firefox.png
similarity index 100%
rename from front/src/Components/HelpCameraSettings/images/help-setting-camera-permission-firefox.png
rename to front/public/resources/help-setting-camera-permission/en-US-firefox.png
diff --git a/front/src/Components/HelpCameraSettings/images/help-setting-camera-permission-chrome.png b/front/public/resources/help-setting-camera-permission/fr-FR-chrome.png
similarity index 100%
rename from front/src/Components/HelpCameraSettings/images/help-setting-camera-permission-chrome.png
rename to front/public/resources/help-setting-camera-permission/fr-FR-chrome.png
diff --git a/front/public/resources/logos/blockSign.svg b/front/public/resources/logos/blockSign.svg
deleted file mode 100644
index c64ba294..00000000
--- a/front/public/resources/logos/blockSign.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/front/public/resources/logos/blockingIcon.png b/front/public/resources/logos/blockingIcon.png
deleted file mode 100644
index ef5f66cc..00000000
Binary files a/front/public/resources/logos/blockingIcon.png and /dev/null differ
diff --git a/front/public/resources/logos/boy.svg b/front/public/resources/logos/boy.svg
deleted file mode 100644
index d6d9582e..00000000
--- a/front/public/resources/logos/boy.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
diff --git a/front/public/resources/logos/cancel.png b/front/public/resources/logos/cancel.png
deleted file mode 100644
index 5bf9b6d2..00000000
Binary files a/front/public/resources/logos/cancel.png and /dev/null differ
diff --git a/front/public/resources/logos/close.svg b/front/public/resources/logos/close.svg
deleted file mode 100644
index 6acd8b49..00000000
--- a/front/public/resources/logos/close.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/cowebsite-swipe.svg b/front/public/resources/logos/cowebsite-swipe.svg
deleted file mode 100644
index 1d4f9ebc..00000000
--- a/front/public/resources/logos/cowebsite-swipe.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/discussion.svg b/front/public/resources/logos/discussion.svg
deleted file mode 100644
index 1b4572b3..00000000
--- a/front/public/resources/logos/discussion.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/fullscreen-exit.svg b/front/public/resources/logos/fullscreen-exit.svg
deleted file mode 100644
index 1d15cd8b..00000000
--- a/front/public/resources/logos/fullscreen-exit.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/fullscreen.svg b/front/public/resources/logos/fullscreen.svg
deleted file mode 100644
index 2c518466..00000000
--- a/front/public/resources/logos/fullscreen.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/megaphone.svg b/front/public/resources/logos/megaphone.svg
deleted file mode 100644
index 708f860c..00000000
--- a/front/public/resources/logos/megaphone.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/front/public/resources/logos/monitor-yellow.svg b/front/public/resources/logos/monitor-yellow.svg
deleted file mode 100644
index f26d30c1..00000000
--- a/front/public/resources/logos/monitor-yellow.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/phone-open.svg b/front/public/resources/logos/phone-open.svg
deleted file mode 100644
index 73b08951..00000000
--- a/front/public/resources/logos/phone-open.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/front/public/resources/logos/phone.svg b/front/public/resources/logos/phone.svg
deleted file mode 100644
index ac8e595a..00000000
--- a/front/public/resources/logos/phone.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/front/public/resources/logos/report.back.svg b/front/public/resources/logos/report.back.svg
deleted file mode 100644
index 1cb3b068..00000000
--- a/front/public/resources/logos/report.back.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/report.svg b/front/public/resources/logos/report.svg
deleted file mode 100644
index 14753256..00000000
--- a/front/public/resources/logos/report.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/send-bkack.svg b/front/public/resources/logos/send-bkack.svg
deleted file mode 100644
index b4e44d9a..00000000
--- a/front/public/resources/logos/send-bkack.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
diff --git a/front/public/resources/logos/send-white.svg b/front/public/resources/logos/send-white.svg
deleted file mode 100644
index 8c45e8fe..00000000
--- a/front/public/resources/logos/send-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/send-yellow.svg b/front/public/resources/logos/send-yellow.svg
deleted file mode 100644
index 8fb4f2ec..00000000
--- a/front/public/resources/logos/send-yellow.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/setting-black.svg b/front/public/resources/logos/setting-black.svg
deleted file mode 100644
index a3098e19..00000000
--- a/front/public/resources/logos/setting-black.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
diff --git a/front/public/resources/logos/setting-white.svg b/front/public/resources/logos/setting-white.svg
deleted file mode 100644
index 64ffba6d..00000000
--- a/front/public/resources/logos/setting-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/resources/logos/setting-yellow.svg b/front/public/resources/logos/setting-yellow.svg
deleted file mode 100644
index 1fd29378..00000000
--- a/front/public/resources/logos/setting-yellow.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/front/public/static/images/Powered_By_WorkAdventure_Small.png b/front/public/static/images/Powered_By_WorkAdventure_Small.png
new file mode 100644
index 00000000..548ab97e
Binary files /dev/null and b/front/public/static/images/Powered_By_WorkAdventure_Small.png differ
diff --git a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte
index b200a7bd..0bf55070 100644
--- a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte
+++ b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte
@@ -11,6 +11,8 @@
import { HtmlUtils } from "../../WebRtc/HtmlUtils";
import { i18nJson } from "../../i18n/locales";
+ import uploadFile from "../images/jitsi.png";
+
export let index: number;
export let coWebsite: CoWebsite;
export let vertical: boolean;
@@ -24,7 +26,7 @@
onMount(() => {
const fallback = location.protocol + "%2F%2F" + location.host + "%2Fresources%2Ficons%2Fwebsite.png";
icon.src = isJitsi
- ? "/resources/logos/jitsi.png"
+ ? uploadFile
: `${ICON_URL}/icon?url=${coWebsite.getUrl().hostname}&size=64..96..256&fallback_icon_color=14304c&fallback_icon_url=${fallback}`;
icon.alt = coWebsite.getUrl().hostname;
icon.onload = () => {
@@ -269,6 +271,10 @@
.cowebsite-thumbnail-hint {
display: inline-block;
}
+
+ &.hide {
+ display: none;
+ }
}
}
diff --git a/front/src/Components/HelpCameraSettings/HelpCameraSettingsPopup.svelte b/front/src/Components/HelpCameraSettings/HelpCameraSettingsPopup.svelte
index 34d174c6..f28d05ca 100644
--- a/front/src/Components/HelpCameraSettings/HelpCameraSettingsPopup.svelte
+++ b/front/src/Components/HelpCameraSettings/HelpCameraSettingsPopup.svelte
@@ -1,8 +1,6 @@