Enhances dungeon game with new features and fixes (#141)

* Adds room editing dialog

Adds a dialog to edit room properties, specifically the position of doors.

This allows users to adjust room layouts and door placements after a room has been created.

* Enables door repositioning in room editor

Implements functionality to move door positions within the room editor dialog.

This allows users to fine-tune door placement within a room, enhancing the level design process.
It dynamically shows the correct axes of movement by looking at door direction and only displaying the perpendicular movement axes.

* Enables moving exits in room editor

Allows adjusting the position of exits on walls within the room editor.

This change introduces functionality to dynamically update exit positions, providing a more intuitive and interactive editing experience.
The "Modal" property of the dialog was set to false to allow background interaction.

* Improves door placement in room editor

Replaces directional buttons with a slider for precise
door positioning on walls.

This change allows users to visually adjust the door's
location within the room editor dialog, enhancing the
user experience.

* add id on div to identify map context menu

* Improves map menu placement.

Makes the map menu stick to the top of the screen to prevent it from scrolling off-screen during gameplay.

* Initial plan

* Implement maps-menu enable/disable based on nextRoom draft state

Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

* When dialogue cancelled nextroom should be set to null

* Disables room buttons when no room exists

Disables the "Add Room" and "Edit Room" buttons when there isn't a room to add or edit. This prevents the user from interacting with those features when they are not available and improves the user experience.

* Corrects door placement on the map

Adjusts the positioning of doors on the map to ensure they are placed outside the adjacent room's boundary.

Simplifies door drawing logic, ensuring doors are consistently drawn as full squares.

* Fixes typo in new room dialog

Corrects a typo in the new room dialog where "gameTurn" should be "get".

This improves the readability of the generated room description for the user.

* Corrects door placement on the map

Adjusts the door coordinate calculation to ensure
doors are placed correctly relative to rooms.

The canvas drawing logic was also reviewed, and
unnecessary offset code for vertical doors was removed.

* Updates save game count to use adventure previews

fixes #119
Changes the implementation of GetSaveGameCount to utilize the GetAdventurePreviews method, providing a more accurate count of saved games.

Adds .gitignore file for Rider IDE to ignore IDE specific files.

* Adds adventure deletion functionality

Implements the ability to delete saved adventures.

This change introduces a delete endpoint in the service and a corresponding button in the adventure picker component.
When a user clicks the delete button, the selected adventure is removed and the adventure list is refreshed.

* Fixes adventure deletion event handling

Stops event propagation on the adventure deletion button to prevent unintended row selection when deleting an adventure.
Also, adds project-level IDE configuration files.

* Refactors adventure preview loading

Improves the adventure picker component by extracting the adventure preview loading logic into a separate method.

This change enhances code readability and maintainability.
Also, this fixes a potential UI update issue by explicitly calling StateHasChanged after loading previews when deleting an adventure.

* Adds adventurer deletion functionality

Enables the deletion of adventurers, ensuring that an adventurer can only be deleted if it is not currently associated with any existing adventures.

This prevents data integrity issues and provides a safeguard against accidentally deleting adventurers that are actively used in a game.

* Add "Start a new fight" button to reset combat screen - fixes #116 (#124)

* Initial analysis of issue #116 - combat screen reset functionality

Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

* Implement "Start a new fight" button to reset combat screen - fixes #116

Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

* Add adventure name property and use adventurer ID reference (#126)

* Initial plan

* Add adventure name feature - update domain models and services

Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

* Remove foreign key constraint from adventures table

Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: FBoucher <2404846+FBoucher@users.noreply.github.com>

* Add complete Dungeon theme with custom backgrounds, text, and accent colors (#128)

* Initial plan

* Add Dungeon theme option to Settings page

Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>

* Address code review feedback - improve theme persistence

Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>

* Updates Aspire SDK and package versions

Updates the Aspire.AppHost.Sdk version in the AppHost project file.

Adds a Directory.Packages.props file to manage package versions centrally,
and updates various Aspire and related package versions to their latest releases,
ensuring consistency and compatibility across the solution.

* Implement full Dungeon theme with custom backgrounds and text colors

Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>
Co-authored-by: fboucher <fboucher@outlook.com>

* Implement door type drawing functions with lock/unlock feature for dungeon map (#129)

* Implement door details with different door types (Archway, Wooden, Metal, Reinforced, Curtain, Portcullis, Stone Slab)
Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: fboucher <2404846+fboucher@users.noreply.github.com>

* Fix: Addresses combobox selection and map debug issues (#130)

Addresses an issue where combobox selections were not handled correctly.
Now correctly passes the selected object instead of just the ID.

Also adds debug logging to help resolve an intermittent map drawing issue.

* Upgrades .NET and Aspire dependencies (#132)

* upgrade in progress

* feat(dab): Configure connection string via environment variable

Configures the Data API Builder (DAB) connection string using an environment variable.

This change ensures that the connection string for the database is properly set within the DAB configuration, especially during upgrade scenarios.
It removes the port from the DAB template and constructs the connection string dynamically in code, referencing the MySQL resource's properties.

* Replaces bind mount with file copy

Replaces the bind mount approach for database initialization with a simpler file copy mechanism.

This change simplifies the setup process, especially during upgrades, by ensuring that database scripts are copied directly into the container.

* Implements combat turn management. (#134)

Adds logic to manage combat turns, including identifying the current fighter and alternating turns between adventurer and creature.

Introduces a dialog to select the first fighter and displays the current turn information.

Fixes: #133

* Implements game over and victory conditions (#136)

Adds logic to handle adventurer and creature defeats, displaying appropriate messages.
Disables user interaction after combat ends to prevent further actions.
Resets health depletion flags and UI elements on new fight start.

Fixes #135

* Adds damage dice rolling functionality (#138)

Implements the ability to roll damage dice within the combat page.
This allows players to simulate damage rolls using 1D6 or 2D6 dice.

Issue #137

* Removes seed adventurers from database (#139)

* Removes demo adventurers from seed data

Removes the demo adventurers from the database seed data.

This prevents the creation of unnecessary or test adventurers
when the database is initialized, ensuring a cleaner and more
realistic initial state.

* Removes demo adventurers from seed data

The demo adventurers are no longer needed in the
database seed data. This commit removes them.

* Enables local Docker deployment (#140)

* Adds Docker configuration for local development

Sets up Docker Compose to orchestrate the application, database, and data api builder services for local development.

Includes Dockerfile for the web client.

Ensures database creation if it doesn't exist.

Includes `.dockerignore` to exclude unnecessary files during image builds.

Sets up `.env.example` with required environment variables

* Enables running the app locally with Docker

Provides a `docker-compose.yml` file for easy local deployment using Docker.

Adds Dockerfiles for the database, Data API Builder (DAB), and web app components.

Includes an `.env.example` file with configurable environment variables.

Publishes images to Docker Hub upon tagging a commit.

Fixes #91

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: fboucher

.aspire/settings.json

@@ -0,0 +1,3 @@
+{
+  "appHostPath": "../src/AppHost/AppHost.csproj"
+}

.env.example

@@ -0,0 +1,16 @@
+# Docker Hub namespace (username or org)
+DOCKERHUB_NAMESPACE=your-dockerhub-username
+# Image tag to pull with compose; usually matches the git tag that published the images
+IMAGE_TAG=latest
+
+# Database settings
+MYSQL_ROOT_PASSWORD=changeme
+MYSQL_DATABASE=db2d6
+MYSQL_PORT=3306
+
+# Data API Builder
+DAB_PORT=5000
+
+# Web app
+WEBAPP_PORT=8080
+ASPNETCORE_ENVIRONMENT=Production

.github/workflows/publish-images.yml

@@ -0,0 +1,61 @@
+name: Publish Docker images
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push database image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: database/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-database:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-database:latest
+
+      - name: Build and push DAB image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: database/dab/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-dab:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-dab:latest
+
+      - name: Build and push web app image
+        uses: docker/build-push-action@v6
+        with:
+          context: src
+          file: src/2d6-dungeon-web-client/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-app:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/2d6-dungeon-app:latest

README.md

@@ -32,13 +32,45 @@ While I prototype functionalities, and make progress I create content (blog post
 - 📺 [How to Create a DEV Environment with Multiple Dev Containers](https://www.youtube.com/watch?v=sf3Ai4271nA)
 
 
-### How to Run it Locally
+### Run it Locally
 
-The solution uses .NET Aspire to manage all the services and website. 
+#### For Players (No coding experience needed!)
 
-- You will need Docker [Docker](https://docs.docker.com/desktop/) or [Podman](https://podman.io/), and [.NET 9](https://dotnet.microsoft.com/en-us/download) installed.
+**Requirements:** [Docker Desktop](https://www.docker.com/products/docker-desktop/) must be installed and running on your computer.
+
+Want to play 2D6 Dungeon? Follow these simple steps:
+
+1. **Create a game folder**
+   - Create a new folder on your computer (name it anything you like, e.g., "2d6-game")
+   - Open a terminal/command prompt and navigate to that folder
+
+2. **Download the configuration**
+   - Run this command to download the game configuration:
+     ```
+     curl -o docker-compose.yml https://raw.githubusercontent.com/FBoucher/2d6-dungeon-app/main/docker-compose.yml
+     ```
+
+3. **Start the game**
+   - Run this command:
+     ```
+     docker-compose up -d --build
+     ```
+   - Wait a minute for everything to download and start
+
+4. **Play!**
+   - Open your web browser and go to: `http://localhost:8080`
+   - Start your adventure!
+
+**To stop playing:** Run `docker-compose down` in your game folder.
+
+
+#### For Developers
+
+The solution uses .NET Aspire to manage all the services and website.
+
+- You will need [Docker](https://docs.docker.com/desktop/) or [Podman](https://podman.io/), and [.NET 10](https://dotnet.microsoft.com/en-us/download) installed.
 - Clone the repository locally.
-- To start 2d6-dungeon-client, from Open the solution in VSCode or Visual Studio and press F5. If asked for the starting point of the solution select the orchestrator `AppHost`. Once the solution starts it will:
+- Open the solution in VSCode or Visual Studio and press F5. If asked for the starting point of the solution select the orchestrator `AppHost`. Once the solution starts it will:
   - Open the .NET Aspire Dashboard in a web browser.
   - Create a MySQL container, create the database using the SQL script included.
   - Create a data API, in a second container.

database/Dockerfile

@@ -0,0 +1,10 @@
+FROM mysql:8.0
+
+# Default database name; can be overridden at runtime
+ENV MYSQL_DATABASE=db2d6
+ENV MYSQL_ROOT_HOST=%
+
+# Ship schema and seed data inside the image so containers start ready-to-use
+COPY database/scripts/ /docker-entrypoint-initdb.d/
+
+EXPOSE 3306

database/dab-config.json

@@ -1,11 +1,15 @@
 {
-  "$schema": "https://github.com/Azure/data-api-builder/releases/download/v0.8.51/dab.draft.schema.json",
+  "$schema": "https://github.com/Azure/data-api-builder/releases/download/v1.6.84/dab.draft.schema.json",
   "data-source": {
     "database-type": "mysql",
     "connection-string": "@env('ConnectionStrings__db2d6')",
     "options": {}
   },
+  
   "runtime": {
+    "health": {
+      "max-query-parallelism": 8
+    },
     "rest": {
       "enabled": true,
       "path": "/api"

database/dab/Dockerfile

@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/azure-databases/data-api-builder:latest
+WORKDIR /App
+# Bundle the static DAB configuration; connection string provided at runtime
+COPY database/dab-config.json ./dab-config.json
+CMD ["--ConfigFileName", "/App/dab-config.json"]

database/mssql/data-mssql.sql

@@ -51,10 +51,6 @@ INSERT INTO dbo.rooms(roll, level, room_type, size, description, exits, is_uniqu
 VALUES (4,1,'Church', 'large','This room is lined with pews and chairs. Behind am allar...', 'Wooden doors',1);
 
 
--- demo adventurers
-INSERT INTO dbo.adventurers(name, level, xp) VALUES('Toby the Creator', 1, 100);
-INSERT INTO dbo.adventurers(name, level, xp) VALUES('Frank', 0, 0);
-
 
 -- weapons
 INSERT INTO dbo.weapons(id, name) VALUES(1, 'LONGSWORD');

database/scripts/1-schema.sql

@@ -1,4 +1,4 @@
-CREATE DATABASE db2d6;
+CREATE DATABASE IF NOT EXISTS db2d6;
 
 
 CREATE TABLE IF NOT EXISTS db2d6.meta_table (
@@ -22,7 +22,8 @@ CREATE TABLE IF NOT EXISTS db2d6.adventurers (
 
 CREATE TABLE IF NOT EXISTS db2d6.adventures (
   id int NOT NULL AUTO_INCREMENT,
-  adventurer_name varchar(255) DEFAULT NULL,
+  name varchar(255) DEFAULT NULL,
+  adventurer_id int DEFAULT NULL,
   level int DEFAULT 0,
   last_saved_datetime varchar(50) DEFAULT NULL,
   serialiazedObj longtext DEFAULT NULL,

database/scripts/2-data.sql

@@ -172,11 +172,6 @@ VALUES (12,	1, 'LIBRARY', 'large', 'Lined with bookshelves, this huge library is
 
 
 
--- demo adventurers
-INSERT INTO db2d6.adventurers(name, level, xp) VALUES('Toby the Creator', 1, 100);
-INSERT INTO db2d6.adventurers(name, level, xp) VALUES('Frank', 0, 0);
-
-
 -- weapons
 INSERT INTO db2d6.weapons(id, name) VALUES(1, 'LONGSWORD');
 INSERT INTO db2d6.weapons(id, name) VALUES(2, 'GREATAXE');