Merge branch 'main' of https://github.com/zmanna/Battleship

BlazorBattleship/Pages/Index.razor

@@ -26,6 +26,9 @@ Creation Date: September 10, 2024
 
 <!-- display your and opponents name at top of screen -->
 <div class="game-area @(isSidebarOpen ? "shifted" : "")">
+    <div class="leave">
+        <button @onclick="LeaveRoom" hidden="@(room == 0)">Leave Game</button>
+    </div>
 
     <div class="player-info">
 
@@ -40,9 +43,18 @@ Creation Date: September 10, 2024
     </div>
 
 <!-- initial game state when page is launched -->
-@if ((currentGameState == GameState.Initial) || userName == "")
+@if ((currentGameState == GameState.Initial || userName == "") && room == 0)
     {
         <div class="name-entry-container">
+            <div class="welcome-header">
+                <h2>Welcome to Battleship</h2>
+            </div>
+            <div class="friends-header">
+                <h2><span>Play</span> with Your Friends</h2>
+            </div>
+            <div class="enemies-header">
+                <h2><span>Destroy</span> Your Enemies</h2>
+            </div>
             <div class="name-entry-box">
                 <label>
                     Enter your name:
@@ -68,8 +80,14 @@ Creation Date: September 10, 2024
             <button class="join-room" @onclick="(() => JoinRoom(5))">@roomStatuses[4]</button>
         </div>
     }
-
-    <!-- game state to pick the number of ships to play with -->
+
+    @if (currentGameState == GameState.InLobby)
+    {
+        <div class="waiting-for-opponent">
+            <h1>Waiting for Opponent to Join<span class="first">.</span><span class="second">.</span><span class="third">.</span></h1>
+        </div>
+    }
+
     @if (currentGameState == GameState.PickShips)
     {
         <div class="num-ships">
@@ -82,14 +100,16 @@ Creation Date: September 10, 2024
     <!-- game state to wait for other player to choose ship -->
     @if (currentGameState == GameState.Waiting && shipLimit == 0)
     {
-        <h1>@opponent is choosing the number of ships</h1>
+        <div class="waiting-for-ship-num">
+            <p>@opponent is choosing the number of ships<span class="first">.</span><span class="second">.</span><span class="third">.</span></p>
+        </div>
     }
 
     <!-- display main board -->
     @if (userName != "" && (currentGameState == GameState.Setup || currentGameState == GameState.Playing || currentGameState  == GameState.Waiting))
 {
     // display either player is to be placing ships or "your board" if ships have been placed
-    <div class="user-board @(currentGameState == GameState.Playing ? "minimized" : "normal")">
+        <div class="user-board @(currentGameState == GameState.Playing ? "minimized" : "normal")" hidden="@(currentGameState != GameState.Setup && currentGameState != GameState.Playing)">
         <h3>@(currentGameState == GameState.Setup ? "Place your ships!" : "Your Board")</h3>
 
         <!-- display column names -->
@@ -106,7 +126,6 @@ Creation Date: September 10, 2024
                     int xCoord = x;//Capturing the x and Y coordinates so that their values at button creation are preserved.
                     int yCoord = y;
                     <button class="@(GetCellClass(xCoord, yCoord))"
-                            @* actions to place ships: on click places ship and hovering previews ship placement *@
                             @onclick='(() => { if(currentGameState == GameState.Setup && (shipCount < shipLimit)) PlaceShip(xCoord, yCoord, isShipHorizontal);})'
                             @onmouseover='(() => {if(currentGameState == GameState.Setup && (shipCount < shipLimit)) ShowShipPreview(xCoord, yCoord, isShipHorizontal); })'
                             @onmouseout='(() => { if(currentGameState == GameState.Setup && (shipCount < shipLimit)) HideShipPreview(xCoord, yCoord, isShipHorizontal); })'></button>
@@ -115,19 +134,18 @@ Creation Date: September 10, 2024
         }
 
         @* button to toggle ship orientation (vertical/horizontal) *@
-        <div>
-            <button @onclick="ToggleShipOrientation">@((isShipHorizontal ? "Horizontal" : "Vertical") + " Placement")</button>
-        </div>
+        <div class="user-buttons">
+            <div>
+                <button @onclick="ToggleShipOrientation">@((isShipHorizontal ? "Horizontal" : "Vertical") + " Placement")</button>
+            </div>
 
-        @* button to start game *@
-        @if (currentGameState == GameState.Setup)
-        {
-            <button class="square" @onclick="SendReadyMessage">Start Game</button>
-        }
+            @* button to start game *@
+            @if (currentGameState == GameState.Setup)
+            {
+                <button class="square" @onclick="SendReadyMessage">Start Game</button>
+            }
 
-        @* button to leave game *@
-        <div class="leave">
-            <button @onclick="LeaveRoom" disabled="@(room == 0)">Leave Game</button>
+            @* button to leave game *@
         </div>
     </div>
 }
@@ -497,9 +515,9 @@ Creation Date: September 10, 2024
         // when player leaves room
         hubConnection.On<string>("PlayerLeft", (user) =>
         {
-            moves.Add($"{user} has left the room."); // log that player left
-            currentGameState = GameState.Initial; // Or return to the lobby
-            InvokeAsync(StateHasChanged); // refresh ui
+            moves.Add($"{user} has left the room.");
+            currentGameState = GameState.InLobby; // Or return to the lobby
+            InvokeAsync(StateHasChanged);
         });
 
         // when ship number is received from opponent
@@ -529,13 +547,16 @@ Creation Date: September 10, 2024
             currentGameState = GameState.Playing; // change game state to playing so it is current players turn
             Ship? hitShip = null;
 
-            // check if own ships are hit
-            foreach (var ship in ships)
+            if (ships is not null)
             {
-                if(ship.IsHit(x,y))
+                foreach (var ship in ships)
                 {
-                    hitShip = ship; // store if ship is hit
-                    break;
+
+                    if (ship is not null && ship.IsHit(x, y))
+                    {
+                        hitShip = ship;
+                        break;
+                    }
                 }
             }
 

BlazorBattleship/Shared/Sidebar.razor

@@ -70,7 +70,7 @@
             }
         </ul>
 
-        <input @bind="newMessage" placeholder="Type here..." 
+        <input @bind="newMessage" placeholder="Send a Message" 
                @onkeydown="@(e => { if (e.Key == "Enter") SendMessage(); })" />
 
         <button @onclick="SendMessage" disabled="@(UserName == "")">Send</button>

BlazorBattleship/bin/Debug/net6.0/BlazorBattleship.staticwebassets.runtime.json

@@ -1 +1 @@
-{"ContentRoots":["C:\\Users\\A Big Baby\\Documents\\GitHub\\Battleship\\BlazorBattleship\\wwwroot\\","C:\\Users\\A Big Baby\\Documents\\GitHub\\Battleship\\BlazorBattleship\\obj\\Debug\\net6.0\\scopedcss\\bundle\\"],"Root":{"Children":{"css":{"Children":{"bootstrap":{"Children":{"bootstrap.min.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/bootstrap/bootstrap.min.css"},"Patterns":null},"bootstrap.min.css.map":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/bootstrap/bootstrap.min.css.map"},"Patterns":null}},"Asset":null,"Patterns":null},"open-iconic":{"Children":{"FONT-LICENSE":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/FONT-LICENSE"},"Patterns":null},"font":{"Children":{"css":{"Children":{"open-iconic-bootstrap.min.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/css/open-iconic-bootstrap.min.css"},"Patterns":null}},"Asset":null,"Patterns":null},"fonts":{"Children":{"open-iconic.eot":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.eot"},"Patterns":null},"open-iconic.otf":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.otf"},"Patterns":null},"open-iconic.svg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.svg"},"Patterns":null},"open-iconic.ttf":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.ttf"},"Patterns":null},"open-iconic.woff":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.woff"},"Patterns":null}},"Asset":null,"Patterns":null}},"Asset":null,"Patterns":null},"ICON-LICENSE":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/ICON-LICENSE"},"Patterns":null},"README.md":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/README.md"},"Patterns":null}},"Asset":null,"Patterns":null},"site.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/site.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"BlazorBattleship.styles.css":{"Children":null,"Asset":{"ContentRootIndex":1,"SubPath":"BlazorBattleship.styles.css"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
+{"ContentRoots":["C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\wwwroot\\","C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\obj\\Debug\\net6.0\\scopedcss\\bundle\\"],"Root":{"Children":{"css":{"Children":{"bootstrap":{"Children":{"bootstrap.min.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/bootstrap/bootstrap.min.css"},"Patterns":null},"bootstrap.min.css.map":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/bootstrap/bootstrap.min.css.map"},"Patterns":null}},"Asset":null,"Patterns":null},"open-iconic":{"Children":{"FONT-LICENSE":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/FONT-LICENSE"},"Patterns":null},"font":{"Children":{"css":{"Children":{"open-iconic-bootstrap.min.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/css/open-iconic-bootstrap.min.css"},"Patterns":null}},"Asset":null,"Patterns":null},"fonts":{"Children":{"open-iconic.eot":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.eot"},"Patterns":null},"open-iconic.otf":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.otf"},"Patterns":null},"open-iconic.svg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.svg"},"Patterns":null},"open-iconic.ttf":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.ttf"},"Patterns":null},"open-iconic.woff":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/font/fonts/open-iconic.woff"},"Patterns":null}},"Asset":null,"Patterns":null}},"Asset":null,"Patterns":null},"ICON-LICENSE":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/ICON-LICENSE"},"Patterns":null},"README.md":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/open-iconic/README.md"},"Patterns":null}},"Asset":null,"Patterns":null},"site.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/site.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"BlazorBattleship.styles.css":{"Children":null,"Asset":{"ContentRootIndex":1,"SubPath":"BlazorBattleship.styles.css"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}

BlazorBattleship/obj/BlazorBattleship.csproj.nuget.dgspec.json

@@ -1,25 +1,32 @@
 {
   "format": 1,
   "restore": {
-    "/Users/spenceraddis/Desktop/EECS 581/Battleship_p1/BlazorBattleship/BlazorBattleship.csproj": {}
+    "C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\BlazorBattleship.csproj": {}
   },
   "projects": {
-    "/Users/spenceraddis/Desktop/EECS 581/Battleship_p1/BlazorBattleship/BlazorBattleship.csproj": {
+    "C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\BlazorBattleship.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/Users/spenceraddis/Desktop/EECS 581/Battleship_p1/BlazorBattleship/BlazorBattleship.csproj",
+        "projectUniqueName": "C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\BlazorBattleship.csproj",
         "projectName": "BlazorBattleship",
-        "projectPath": "/Users/spenceraddis/Desktop/EECS 581/Battleship_p1/BlazorBattleship/BlazorBattleship.csproj",
-        "packagesPath": "/Users/spenceraddis/.nuget/packages/",
-        "outputPath": "/Users/spenceraddis/Desktop/EECS 581/Battleship_p1/BlazorBattleship/obj/",
+        "projectPath": "C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\BlazorBattleship.csproj",
+        "packagesPath": "C:\\Users\\johnm\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\johnm\\OneDrive\\Desktop\\Visual-Studio-Code-Projects\\Raiser's Edge Website\\backend\\Battleship\\BlazorBattleship\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
-          "/Users/spenceraddis/.nuget/NuGet/NuGet.Config"
+          "C:\\Users\\johnm\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
           "net6.0"
         ],
         "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -36,9 +43,8 @@
         "restoreAuditProperties": {
           "enableAudit": "true",
           "auditLevel": "low",
-          "auditMode": "all"
-        },
-        "SdkAnalysisLevel": "9.0.100"
+          "auditMode": "direct"
+        }
       },
       "frameworks": {
         "net6.0": {
@@ -60,20 +66,6 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "downloadDependencies": [
-            {
-              "name": "Microsoft.AspNetCore.App.Ref",
-              "version": "[6.0.33, 6.0.33]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Host.osx-arm64",
-              "version": "[6.0.33, 6.0.33]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Ref",
-              "version": "[6.0.33, 6.0.33]"
-            }
-          ],
           "frameworkReferences": {
             "Microsoft.AspNetCore.App": {
               "privateAssets": "none"
@@ -82,7 +74,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/9.0.100-rc.1.24452.12/RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

BlazorBattleship/obj/BlazorBattleship.csproj.nuget.g.props

@@ -4,12 +4,13 @@
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/spenceraddis/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/spenceraddis/.nuget/packages/</NuGetPackageFolders>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\johnm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="/Users/spenceraddis/.nuget/packages/" />
+    <SourceRoot Include="C:\Users\johnm\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>

BlazorBattleship/obj/BlazorBattleship.csproj.nuget.g.targets

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json/8.0.4/buildTransitive/net6.0/System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json/8.0.4/buildTransitive/net6.0/System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.extensions.options/8.0.2/buildTransitive/net6.0/Microsoft.Extensions.Options.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.options/8.0.2/buildTransitive/net6.0/Microsoft.Extensions.Options.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions/8.0.1/buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions/8.0.1/buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets')" />
+    <Import Project="$(NuGetPackageRoot)system.text.json\8.0.4\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\8.0.4\buildTransitive\net6.0\System.Text.Json.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.options\8.0.2\buildTransitive\net6.0\Microsoft.Extensions.Options.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.options\8.0.2\buildTransitive\net6.0\Microsoft.Extensions.Options.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.1\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.1\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
   </ImportGroup>
 </Project>

BlazorBattleship/obj/Debug/net6.0/BlazorBattleship.AssemblyInfo.cs

@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("BlazorBattleship")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+46e4fe111a531ed84ba88048005d6ade9f987150")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+faec3df22cca5af86e7559024102047a4827e248")]
 [assembly: System.Reflection.AssemblyProductAttribute("BlazorBattleship")]
 [assembly: System.Reflection.AssemblyTitleAttribute("BlazorBattleship")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

BlazorBattleship/obj/Debug/net6.0/BlazorBattleship.AssemblyInfoInputs.cache

@@ -1 +1 @@
-bd0ea119c7bde24a79f480b71915ac08d0d6d91c409b76a5277b2e716371da76
+bbfed71264a5c3b750074b0f07d4dc4a60a23c0d3955416413b3caae65c8ba73