Fixed refreshing page throwing exeception because of redirect not end…

…ing page initialize. Colored map to be able to diferentiate rooms easier.
jake1164 · Jan 3, 2025 · 04ecdca · 04ecdca
1 parent 67657a5
commit 04ecdca
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 31 deletions.
diff --git a/ShelterViewer.Shared/Pages/Dwellers.razor b/ShelterViewer.Shared/Pages/Dwellers.razor
@@ -103,9 +103,11 @@
         if(VaultService.IsVaultEmpty())
         {
             NavigationManager.NavigateTo("/");
+        } 
+        else
+        {
+            DwellerList = VaultService.DwellerList;
         }
-
-        DwellerList = VaultService.DwellerList;
     }
 
     private Task ShowDweller(Dweller selected)

diff --git a/ShelterViewer.Shared/Pages/Junk.razor b/ShelterViewer.Shared/Pages/Junk.razor
@@ -29,7 +29,9 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        ItemList = VaultService.Junk;
+        else
+        {
+            ItemList = VaultService.Junk;
+        }
     }
 }
diff --git a/ShelterViewer.Shared/Pages/Outfits.razor b/ShelterViewer.Shared/Pages/Outfits.razor
@@ -30,7 +30,9 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        ItemList = VaultService.Outfits;
+        else
+        {
+            ItemList = VaultService.Outfits;
+        }
     }
 }
diff --git a/ShelterViewer.Shared/Pages/Pets.razor b/ShelterViewer.Shared/Pages/Pets.razor
@@ -25,7 +25,9 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        ItemList = VaultService.Pets;
+        else
+        {
+            ItemList = VaultService.Pets;
+        }
     }
 }
diff --git a/ShelterViewer.Shared/Pages/RoomMap.razor b/ShelterViewer.Shared/Pages/RoomMap.razor
@@ -8,29 +8,19 @@
 <h3>Vault Layout</h3>
 
 <div class="grid-container">
-    @foreach(var roomList in Shelter)
+    @foreach (var roomList in Shelter)
     {
-        @foreach(Room room in roomList.Value.OrderBy(c => c.col))
+        @foreach (Room room in roomList.Value.OrderBy(c => c.col))
         {
-            <div class="grid-item"
+            <div class="grid-item @($"rt-{room.type.ToLowerInvariant()}")"
                  style="grid-column: @(room.col + 1) / span @room.Size;
-                grid-row: @(room.row + 1)">
-                <MudText>@($"{room.Name} (col: {room.col}, size: {room.Size})")</MudText>
+                     grid-row: @(room.row + 1)">
+                <MudText>@($"{room.Name} ({room.type})")</MudText>
             </div>
         }
     }
 </div>
 
-@foreach (var item in Shelter)
-{
-    <MudStack Row="true">
-        @foreach (Room room in item.Value.OrderBy(c => c.col))
-        {
-            <MudText>@room.row @room.col @room.Name</MudText>
-        }
-    </MudStack>
-}
-
 <style>
     .grid-container {
         display: grid;
@@ -47,8 +37,117 @@
         color: black;
         background-color: lime;
     }
+
+    .rt-fakewasteland {
+        display: none;
+    }
+
+    .rt-entrance {
+        background-color: darkslateblue;
+    }
+
+    .rt-elevator {
+        background-color: rosybrown;
+    }
+
+    .rt-overseer {
+        background-color: lightgray;
+    }
+
+    .rt-cafeteria {
+        background-color: forestgreen;
+    }
+
+    .rt-hydroponic {
+        background-color: lightseagreen;
+    }
+
+    .rt-nukacola {
+        background-color: mediumseagreen;
+    }
+
+    .rt-geothermal {
+        background-color: deepskyblue;
+    }
+
+    .rt-livingquarters {
+        background-color: saddlebrown;
+    }
+
+    .rt-waterplant {
+        background-color: seagreen;
+    }
+
+    .rt-storage {
+        background-color: sandybrown;
+    }
+
+    .rt-medbay {
+        background-color: green;
+    }
+
+    .rt-sciencelab {
+        background-color: green;
+    }
+
+    .rt-radio {
+        background-color: azure;
+    }
+
+    .rt-gym {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-water2 {
+        background-color: lime;
+    }
+
+    .rt-energy2 {
+        background-color: lime;
+    }
+
+    .rt-dojo {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-armory {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-classroom {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-superroom2 {
+        background-color: lime;
+    }
+
+    .rt-bar {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-casino {
+        background-color: lightgoldenrodyellow;
+    }
+
+    .rt-barbershop {
+        background-color: lightcoral;
+    }
+
+    .rt-weaponfactory {
+        background-color: coral;
+    }
+
+    .rt-outfitfactory {
+        background-color: coral;
+    }
+
+    .rt-designfactory {
+        background-color: coral;
+    }
 </style>
 
+
 @code {
     Dictionary<int, List<Room>> Shelter { get; set; } = new();
 
@@ -58,9 +157,11 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        Shelter = VaultService.Rooms
-            .GroupBy(r => r.row)
-            .ToDictionary(g => g.Key, g => g.ToList());
+        else
+        {
+            Shelter = VaultService.Rooms
+                .GroupBy(r => r.row)
+                .ToDictionary(g => g.Key, g => g.ToList());
+        }
     }
 }
diff --git a/ShelterViewer.Shared/Pages/RoomMap.razor.css b/ShelterViewer.Shared/Pages/RoomMap.razor.css
@@ -0,0 +1 @@
+
diff --git a/ShelterViewer.Shared/Pages/Rooms.razor b/ShelterViewer.Shared/Pages/Rooms.razor
@@ -73,8 +73,10 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        RoomList = VaultService.Rooms.OrderBy(r => r.row).ThenBy(r => r.col).ToList();
+        else 
+        {
+            RoomList = VaultService.Rooms.OrderBy(r => r.row).ThenBy(r => r.col).ToList();
+        }
     }
 
     private Task ShowRoom(Room selected)

diff --git a/ShelterViewer.Shared/Pages/Weapons.razor b/ShelterViewer.Shared/Pages/Weapons.razor
@@ -30,7 +30,9 @@
         {
             NavigationManager.NavigateTo("/");
         }
-
-        ItemList = VaultService.Weapons;
+        else
+        {
+            ItemList = VaultService.Weapons;
+        }
     }
 }