Merge remote-tracking branch 'origin/development' into development

RaiderIO · Nov 11, 2024 · ac30aaa · ac30aaa
2 parents b993d7a + 50c282e
commit ac30aaa
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/database/seeders/dungeondata/mapping_commit_logs.json b/database/seeders/dungeondata/mapping_commit_logs.json
@@ -2494,5 +2494,11 @@
         "merged": 0,
         "created_at": "2024-11-03T10:10:08.000000Z",
         "updated_at": "2024-11-03T10:10:08.000000Z"
+    },
+    {
+        "id": 417,
+        "merged": 0,
+        "created_at": "2024-11-06T14:15:12.000000Z",
+        "updated_at": "2024-11-06T14:15:12.000000Z"
     }
 ]
diff --git a/resources/assets/js/custom/constants.js b/resources/assets/js/custom/constants.js
@@ -657,7 +657,7 @@ let c = {
             }
         },
         echo: {
-            tooltipFadeOutTimeout: 3000,
+            tooltipFadeOutTimeoutMs: 3000,
             // The amount of time that must pass before another mouse location is saved to be synced to others, in milliseconds
             mousePollFrequencyMs: 100,
             // How often to send the mouse frequency, in milliseconds

diff --git a/resources/assets/js/custom/echo/echo.js b/resources/assets/js/custom/echo/echo.js
@@ -44,7 +44,7 @@ class Echo extends Signalable {
             new PathDeletedHandler(this),
 
             // Color changed
-            // new ColorChangedHandler(this),
+            new UserColorChangedHandler(this),
 
             // Whisper handlers
             new MousePositionHandler(this),

diff --git a/resources/assets/js/custom/echo/message/listen/usercolorchanged.js b/resources/assets/js/custom/echo/message/listen/usercolorchanged.js
@@ -0,0 +1,11 @@
+
+/**
+ * @property {String} model_class
+ * @property {Object} model
+ * @property {string} color
+ */
+class UserColorChangedMessage extends ModelMessage {
+    static getName() {
+        return 'user-color-changed';
+    }
+}
diff --git a/resources/assets/js/custom/echo/message/messagefactory.js b/resources/assets/js/custom/echo/message/messagefactory.js
@@ -52,6 +52,11 @@ class MessageFactory {
                 result = new PathDeletedMessage(props);
                 break;
 
+            // Color changed
+            case UserColorChangedMessage.getName():
+                result = new UserColorChangedMessage(props);
+                break;
+
             // LiveSession
             case LiveSessionInviteMessage.getName():
                 result = new LiveSessionInviteMessage(props);

diff --git a/...cho/messagehandler/listen/colorchanged.js → ...messagehandler/listen/usercolorchanged.js b/...cho/messagehandler/listen/colorchanged.js → ...messagehandler/listen/usercolorchanged.js
@@ -1,4 +1,4 @@
-class ColorChangedHandler extends MessageHandler {
+class UserColorChangedHandler extends MessageHandler {
 
     constructor(echo) {
         super(echo, '.user-color-changed');
@@ -10,4 +10,4 @@ class ColorChangedHandler extends MessageHandler {
 
         this.echo.setUserColorByPublicKey(e.user.public_key, e.color);
     }
-}
+}
diff --git a/resources/assets/js/handlebars/map_controls_route_echo_connected_users_template.handlebars b/resources/assets/js/handlebars/map_controls_route_echo_connected_users_template.handlebars
@@ -52,7 +52,7 @@
                         {{/unless}}
                     {{/ifCond}}
                     <a class="dropdown-item" href="{{url}}" target="_blank">
-                        <i class="fas fa-user"></i> {{../connected_user_view_profile_label}}
+                        <i class="fas fa-user" style="color: {{color}};"></i> {{../connected_user_view_profile_label}}
                     </a>
                 </div>
             </div>
@@ -67,7 +67,7 @@
                 <div class="dropdown-menu" aria-labelledby="edit_route_echo_members_overflow_dropdown">
                     {{#each usersOverflow}}
                     <a class="dropdown-item" href="{{url}}" target="_blank">
-                        <i class="fas fa-user"></i> {{initials}}
+                        <i class="fas fa-user" style="color: {{color}};"></i> {{initials}}
                     </a>
                     {{/each}}
                 </div>

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -185,13 +185,13 @@ let scripts = [
     'resources/assets/js/custom/echo/message/listen/models/overpulledenemy/deleted.js',
     'resources/assets/js/custom/echo/message/listen/models/path/changed.js',
     'resources/assets/js/custom/echo/message/listen/models/path/deleted.js',
+    'resources/assets/js/custom/echo/message/listen/usercolorchanged.js',
     'resources/assets/js/custom/echo/message/whisper/viewport.js',
     'resources/assets/js/custom/echo/message/whisper/mouseposition.js',
     'resources/assets/js/custom/echo/message/messagefactory.js',
 
     // Echo message handlers
     'resources/assets/js/custom/echo/messagehandler/messagehandler.js',
-    'resources/assets/js/custom/echo/messagehandler/listen/colorchanged.js',
     'resources/assets/js/custom/echo/messagehandler/listen/livesession/invite.js',
     'resources/assets/js/custom/echo/messagehandler/listen/livesession/stop.js',
     'resources/assets/js/custom/echo/messagehandler/listen/models/basemodelhandler.js',
@@ -209,6 +209,7 @@ let scripts = [
     'resources/assets/js/custom/echo/messagehandler/listen/models/overpulledenemy/deleted.js',
     'resources/assets/js/custom/echo/messagehandler/listen/models/path/changed.js',
     'resources/assets/js/custom/echo/messagehandler/listen/models/path/deleted.js',
+    'resources/assets/js/custom/echo/messagehandler/listen/usercolorchanged.js',
     'resources/assets/js/custom/echo/messagehandler/whisper/whispermessagehandler.js',
     'resources/assets/js/custom/echo/messagehandler/whisper/viewport.js',
     'resources/assets/js/custom/echo/messagehandler/whisper/mouseposition.js',