From 4601c2f1fcdaf551705a9da3c5e6ddfc3eff9138 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 22 Nov 2024 06:42:27 +0100
Subject: Some fixes all over, policy list work

---
 .../MainTabComponents/MainTabSpaceItem.razor       |  2 +-
 .../Index2Components/RoomsIndex2MainTab.razor      | 37 +++++++++++-----------
 2 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components')

diff --git a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/MainTabComponents/MainTabSpaceItem.razor b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/MainTabComponents/MainTabSpaceItem.razor
index 6483f01..596d63d 100644
--- a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/MainTabComponents/MainTabSpaceItem.razor
+++ b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/MainTabComponents/MainTabSpaceItem.razor
@@ -8,7 +8,7 @@
             <span onclick="@ToggleSpace">▶ </span>
         }
 
-        <MxcImage Circular="true" Height="32" Width="32" Homeserver="Space.Room.Homeserver" MxcUri="@Space.RoomIcon"></MxcImage>
+        <MxcImage Circular="true" Height="32" Width="32" MxcUri="@Space.RoomIcon"></MxcImage>
         <span class="spaceNameEllipsis">@Space.RoomName</span>
     </div>
     @if (IsSpaceOpened()) {
diff --git a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/RoomsIndex2MainTab.razor b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/RoomsIndex2MainTab.razor
index 7ccfae2..d2b6d5a 100644
--- a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/RoomsIndex2MainTab.razor
+++ b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2Components/RoomsIndex2MainTab.razor
@@ -22,26 +22,27 @@
 @*     </div> *@
 @* </div> *@
 
-<div>
-    <div class="row">
-        <div class="col-3" style="background-color: #ffffff22;">
-            <LinkButton>Uncategorised rooms</LinkButton>
-            @foreach (var space in GetTopLevelSpaces()) {
-                @* @RecursingSpaceChildren(space) *@
-                <MainTabSpaceItem Space="space" OpenedSpaces="OpenedSpaces" @bind-SelectedSpace="SelectedSpace" />
-            }
-        </div>
-        <div class="col-9" style="background-color: #ff00ff66;">
-            <p>Placeholder for rooms list...</p>
-            @if (SelectedSpace != null) {
-                foreach (var room in GetSpaceChildRooms(SelectedSpace)) {
-                    <p>@room.RoomName</p>
+<CascadingValue Name="Homeserver" Value="@Data.Homeserver">
+    <div>
+        <div class="row">
+            <div class="col-3" style="background-color: #ffffff22;">
+                <LinkButton>Uncategorised rooms</LinkButton>
+                @foreach (var space in GetTopLevelSpaces()) {
+                    @* @RecursingSpaceChildren(space) *@
+                    <MainTabSpaceItem Space="space" OpenedSpaces="OpenedSpaces" @bind-SelectedSpace="SelectedSpace"/>
+                }
+            </div>
+            <div class="col-9" style="background-color: #ff00ff66;">
+                <p>Placeholder for rooms list...</p>
+                @if (SelectedSpace != null) {
+                    foreach (var room in GetSpaceChildRooms(SelectedSpace)) {
+                        <p>@room.RoomName</p>
+                    }
                 }
-            }
+            </div>
         </div>
     </div>
-</div>
-
+</CascadingValue>
 
 @code {
 
@@ -118,7 +119,7 @@
         var childSpaces = children.Where(x => x.RoomType == "m.space").ToList();
         return childSpaces;
     }
-    
+
     private List<RoomInfo> GetSpaceChildRooms(RoomInfo space) {
         var children = GetSpaceChildren(space);
         var childRooms = children.Where(x => x.RoomType != "m.space").ToList();
-- 
cgit 1.5.1