From d66fcf80663480018b6d50a8f3fdcef7fcfce312 Mon Sep 17 00:00:00 2001
From: xangelo <me@xangelo.ca>
Date: Mon, 21 Aug 2023 16:34:03 -0400
Subject: [PATCH 1/2] feat: display travel progress

When you're travelling it shows you your:
- Starting city
- Destination
- How long it will take you to get there
---
 public/assets/css/game.css                  |  3 +++
 src/server/views/components/progress-bar.ts | 14 ++++++++++++++
 src/server/views/travel.ts                  | 11 ++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/server/views/components/progress-bar.ts

diff --git a/public/assets/css/game.css b/public/assets/css/game.css
index 4060899..7afe629 100644
--- a/public/assets/css/game.css
+++ b/public/assets/css/game.css
@@ -486,6 +486,9 @@ h3 {
   gap: 1rem;
   margin-bottom: 1rem;
 }
+.travel-distance {
+  margin-bottom: 1rem;
+}
 
 
 #explore .shop-inventory-listing  {
diff --git a/src/server/views/components/progress-bar.ts b/src/server/views/components/progress-bar.ts
new file mode 100644
index 0000000..7d7677d
--- /dev/null
+++ b/src/server/views/components/progress-bar.ts
@@ -0,0 +1,14 @@
+export interface ProgressBarOptions {
+  startingColor: string;
+  endingColor: string;
+}
+
+export function ProgressBar(current: number, max: number, id: string, opts: ProgressBarOptions) {
+  let percent = 0;
+  if(max > 0) {
+    percent = Math.floor((current / max) * 100);
+  }
+
+  return `<div class="progress-bar" id="${id}" style="background: linear-gradient(to right, ${opts.startingColor}, ${opts.endingColor} ${percent}%, transparent ${percent}%, transparent)"
+title="${percent}% - ${current}/${max}">${current}/${max} - ${percent}%</div>`;
+}
diff --git a/src/server/views/travel.ts b/src/server/views/travel.ts
index 9aff00e..f1775f0 100644
--- a/src/server/views/travel.ts
+++ b/src/server/views/travel.ts
@@ -1,4 +1,5 @@
 import { TravelDTO } from "../../shared/map";
+import { ProgressBar } from './components/progress-bar';
 
 export function travelButton(blockTime: number): string {
   return `<button id="keep-walking" hx-post="/travel/step" class="${blockTime ? 'disabled': ''}" data-block="${blockTime}" ${blockTime ? 'disabled': ''}>Keep Walking</button>`;
@@ -11,7 +12,15 @@ export function renderTravel(data: TravelDTO): string {
 
   let html = `<section id="explore" class="tab active" hx-swap-oob="true" style="background-image: url('/assets/img/map/${data.closestTown}.jpeg')">
 
-<div id="travelling" class="city-details">`;
+<div id="travelling" class="city-details">
+  <div class="travel-distance">
+    <p>Travelling from ${data.travelPlan.source_city_name} to ${data.travelPlan.destination_city_name}</p>
+    ${ProgressBar(data.travelPlan.current_position, data.travelPlan.total_distance, 'travel-plan', {
+      startingColor: '#d9975a',
+      endingColor: '#bb724c'
+    })}
+  </div>
+`;
   html += '<div id="travelling-actions">';
   html += travelButton(blockTime);
   if(data.things.length) {
-- 
2.25.1


From 3f739806dacce504589af4639dc4eb9709454cae Mon Sep 17 00:00:00 2001
From: xangelo <me@xangelo.ca>
Date: Mon, 21 Aug 2023 16:39:17 -0400
Subject: [PATCH 2/2] chore(release): 0.2.14

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7370148..69685ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.2.14](https://git.xangelo.ca/?p=risinglegends.git;a=commitdiff;h=v0.2.14;hp=v0.2.13;ds=sidebyside) (2023-08-21)
+
+
+### Features
+
+* display travel progress d66fcf8
+
 ### [0.2.13](https://git.xangelo.ca/?p=risinglegends.git;a=commitdiff;h=v0.2.13;hp=v0.2.12;ds=sidebyside) (2023-08-21)
 
 
diff --git a/package-lock.json b/package-lock.json
index ec57395..88e09fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "rising-legends",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "rising-legends",
-      "version": "0.2.13",
+      "version": "0.2.14",
       "dependencies": {
         "@honeycombio/opentelemetry-node": "^0.4.0",
         "@opentelemetry/auto-instrumentations-node": "^0.37.0",
diff --git a/package.json b/package.json
index 4ea1eba..cfc0057 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rising-legends",
   "private": true,
-  "version": "0.2.13",
+  "version": "0.2.14",
   "scripts": {
     "up": "npx prisma migrate dev --name \"init\"",
     "start": "pm2 start dist/server/api.js",
-- 
2.25.1