From e35b7a8edc82c443f740b9649b580ef4551773cd Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 30 Dec 2025 08:43:16 +0100 Subject: [PATCH 1/9] refactor pdf export in its own component --- frontend/src/components/CharacterDetails.vue | 241 +------------- frontend/src/components/ExportPdfDialog.vue | 319 +++++++++++++++++++ 2 files changed, 330 insertions(+), 230 deletions(-) create mode 100644 frontend/src/components/ExportPdfDialog.vue diff --git a/frontend/src/components/CharacterDetails.vue b/frontend/src/components/CharacterDetails.vue index 4502ef7..4657283 100644 --- a/frontend/src/components/CharacterDetails.vue +++ b/frontend/src/components/CharacterDetails.vue @@ -11,44 +11,12 @@ -
-
-
-

{{ $t('export.exportPDF') }}

- -
-
-
- -

{{ $t('export.generating') }}

-
-
- - -
-
- -
-
-
- - -
-
-
+ @@ -168,138 +136,6 @@ justify-content: center; } -.close-button:hover { - color: #333; -} - -.modal-body { - padding: 20px; - position: relative; -} - -.loading-overlay { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(255, 255, 255, 0.95); - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - z-index: 10; - border-radius: 0 0 8px 8px; -} - -.spinner { - border: 4px solid #f3f3f3; - border-top: 4px solid #007bff; - border-radius: 50%; - width: 50px; - height: 50px; - animation: spin 1s linear infinite; - margin-bottom: 15px; -} - -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - -.loading-overlay p { - color: #007bff; - font-weight: 500; - margin: 0; -} - -.form-group { - margin-bottom: 20px; -} - -.form-group label { - display: block; - margin-bottom: 8px; - font-weight: 500; - color: #495057; -} - -.template-select { - width: 100%; - padding: 10px 12px; - border: 1px solid #dee2e6; - border-radius: 6px; - background: white; - color: #495057; - font-size: 0.95rem; - cursor: pointer; -} - -.template-select:focus { - outline: none; - border-color: #007bff; - box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); -} - -.checkbox-label { - display: flex; - align-items: center; - gap: 8px; - cursor: pointer; - user-select: none; -} - -.checkbox-label input[type="checkbox"] { - width: 18px; - height: 18px; - cursor: pointer; -} - -.modal-footer { - display: flex; - justify-content: flex-end; - gap: 10px; - padding: 20px; - border-top: 1px solid #dee2e6; -} - -.btn-cancel { - padding: 10px 20px; - border: 1px solid #dee2e6; - border-radius: 6px; - background: #f8f9fa; - color: #495057; - cursor: pointer; - font-weight: 500; - transition: all 0.2s ease; -} - -.btn-cancel:hover { - background: #e9ecef; - border-color: #adb5bd; -} - -.btn-export { - padding: 10px 20px; - border: 1px solid #007bff; - border-radius: 6px; - background: #007bff; - color: white; - cursor: pointer; - font-weight: 500; - transition: all 0.2s ease; -} - -.btn-export:hover:not(:disabled) { - background: #0056b3; - border-color: #0056b3; -} - -.btn-export:disabled { - opacity: 0.6; - cursor: not-allowed; -} - .submenu { display: flex; gap: 10px; @@ -333,6 +169,7 @@ + \ No newline at end of file diff --git a/frontend/src/components/ExportPdfDialog.vue b/frontend/src/components/ExportPdfDialog.vue new file mode 100644 index 0000000..f7fe023 --- /dev/null +++ b/frontend/src/components/ExportPdfDialog.vue @@ -0,0 +1,319 @@ + + + + + From 53369baeef54773d5c824f9bbf48ed4d75a1b432 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 30 Dec 2025 08:55:00 +0100 Subject: [PATCH 2/9] Export allowes now PDF, VTT and Bamort format --- frontend/src/components/CharacterDetails.vue | 8 +- .../{ExportPdfDialog.vue => ExportDialog.vue} | 100 +++++++++++++++++- frontend/src/locales/de | 10 +- frontend/src/locales/en | 10 +- 4 files changed, 116 insertions(+), 12 deletions(-) rename frontend/src/components/{ExportPdfDialog.vue => ExportDialog.vue} (66%) diff --git a/frontend/src/components/CharacterDetails.vue b/frontend/src/components/CharacterDetails.vue index 4657283..5469b72 100644 --- a/frontend/src/components/CharacterDetails.vue +++ b/frontend/src/components/CharacterDetails.vue @@ -3,7 +3,7 @@
-

{{ $t('char') }}: {{ character.name }} ({{ $t(currentView) }})

@@ -11,7 +11,7 @@
- import API from '../utils/api' -import ExportPdfDialog from "./ExportPdfDialog.vue"; +import ExportDialog from "./ExportDialog.vue"; import DatasheetView from "./DatasheetView.vue"; // Component for character stats import SkillView from "./SkillView.vue"; // Component for character history import WeaponView from "./WeaponView.vue"; // Component for character history @@ -183,7 +183,7 @@ export default { name: "CharacterDetails", props: ["id"], // Receive the route parameter as a prop components: { - ExportPdfDialog, + ExportDialog, DatasheetView, SkillView, WeaponView, diff --git a/frontend/src/components/ExportPdfDialog.vue b/frontend/src/components/ExportDialog.vue similarity index 66% rename from frontend/src/components/ExportPdfDialog.vue rename to frontend/src/components/ExportDialog.vue index f7fe023..d4e94d5 100644 --- a/frontend/src/components/ExportPdfDialog.vue +++ b/frontend/src/components/ExportDialog.vue @@ -2,7 +2,7 @@
-

{{ $t('export.exportPDF') }}

+

{{ $t('export.title') }}

@@ -11,6 +11,15 @@

{{ $t('export.generating') }}

+ + +
+
-
+
- - diff --git a/frontend/src/components/RegisterForm.vue b/frontend/src/components/RegisterForm.vue index d479394..19084e7 100644 --- a/frontend/src/components/RegisterForm.vue +++ b/frontend/src/components/RegisterForm.vue @@ -47,6 +47,8 @@ export default { diff --git a/frontend/src/components/SkillImproveDialog.vue b/frontend/src/components/SkillImproveDialog.vue index c68bbe8..53562d8 100644 --- a/frontend/src/components/SkillImproveDialog.vue +++ b/frontend/src/components/SkillImproveDialog.vue @@ -165,31 +165,8 @@
- - - - - diff --git a/frontend/src/components/WeaponView.vue b/frontend/src/components/WeaponView.vue index 1812e17..2b32f3f 100644 --- a/frontend/src/components/WeaponView.vue +++ b/frontend/src/components/WeaponView.vue @@ -191,7 +191,9 @@ - - - From 095631dd292a5b1d082f1a3b43b514eaf69507d9 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 30 Dec 2025 21:41:20 +0100 Subject: [PATCH 5/9] consolidated even more css styling --- frontend/src/assets/main.css | 590 ++++++++++++++++++ frontend/src/components/SkillLearnDialog.vue | 613 +------------------ frontend/src/components/SkillView.vue | 59 +- 3 files changed, 594 insertions(+), 668 deletions(-) diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index bc75314..4b0daf8 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -1730,6 +1730,10 @@ a, transform: scale(1.1); } +.icon { + font-size: 14px; +} + .btn-improve-small { font-size: 1.2rem; } @@ -2546,4 +2550,590 @@ a, color: #333; border-bottom: 2px solid #1da766; padding-bottom: 10px; +} + +/* ======================================== + SKILL LEARN DIALOG STYLES + ======================================== */ + +/* Dialog Header */ +.dialog-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 20px 24px; + border-bottom: 2px solid #1da766; + background: #f8f9fa; + border-radius: 0; + flex-shrink: 0; + z-index: 10; +} + +.dialog-header h3 { + margin: 0; + color: #333; + font-size: 1.5rem; +} + +.btn-close { + background: none; + border: none; + font-size: 24px; + cursor: pointer; + color: #666; + padding: 0; + width: 30px; + height: 30px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + transition: all 0.2s ease; +} + +.btn-close:hover { + background: #e9ecef; + color: #333; +} + +/* Resources Section */ +.resources-section { + padding: 20px 24px; + background: #f8f9fa; + border-bottom: 1px solid #dee2e6; + flex-shrink: 0; +} + +.resources-section h4 { + margin: 0 0 15px 0; + color: #495057; + font-size: 1.1rem; +} + +.text-info { + color: #17a2b8 !important; +} + +/* Reward Method Section */ +.reward-method-section { + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid #dee2e6; +} + +.reward-method-section label { + display: block; + margin-bottom: 8px; + font-weight: 600; + color: #495057; + font-size: 0.95rem; +} + +.reward-method-section .form-select { + width: 100%; + padding: 12px 16px; + border: 2px solid #dee2e6; + border-radius: 8px; + font-size: 14px; + font-family: inherit; + transition: border-color 0.2s ease, box-shadow 0.2s ease; + box-sizing: border-box; + background: white; +} + +.reward-method-section .form-select:focus { + outline: none; + border-color: #1da766; + box-shadow: 0 0 0 3px rgba(29, 167, 102, 0.1); +} + +.reward-method-section .form-hint { + display: block; + margin-top: 4px; + font-size: 0.85rem; + color: #6c757d; + font-style: italic; +} + +/* Form Section */ +.form-section { + padding: 24px; + flex: 1; + overflow-y: auto; +} + +.form-input, +.form-select, +.form-textarea { + width: 100%; + padding: 12px 16px; + border: 2px solid #dee2e6; + border-radius: 8px; + font-size: 14px; + font-family: inherit; + transition: border-color 0.2s ease, box-shadow 0.2s ease; + box-sizing: border-box; +} + +.form-input:focus, +.form-select:focus, +.form-textarea:focus { + outline: none; + border-color: #1da766; + box-shadow: 0 0 0 3px rgba(29, 167, 102, 0.1); +} + +.form-textarea { + resize: vertical; + min-height: 80px; +} + +.form-hint { + display: block; + margin-top: 4px; + font-size: 0.85rem; + color: #6c757d; + font-style: italic; +} + +/* Costs Preview */ +.costs-preview { + padding: 20px 24px; + background: #fff3cd; + border-top: 1px solid #ffeaa7; + border-bottom: 1px solid #ffeaa7; + flex-shrink: 0; +} + +.costs-preview h4 { + margin: 0 0 12px 0; + color: #856404; + font-size: 1rem; +} + +.cost-item { + display: flex; + align-items: center; + gap: 8px; +} + +.cost-label { + color: #856404; + font-weight: 500; +} + +.cost-value { + font-weight: bold; + color: #495057; + background: white; + padding: 4px 8px; + border-radius: 4px; + border: 1px solid #ffeaa7; +} + +/* Action Info */ +.action-info { + flex: 1; +} + +.selection-count { + font-size: 0.9rem; + color: #6c757d; + font-weight: 500; +} + +.action-buttons { + display: flex; + gap: 12px; +} + +/* Skills Selection Container */ +.skills-selection-container { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px; + margin-bottom: 20px; +} + +@media (max-width: 1024px) { + .skills-selection-container { + grid-template-columns: 1fr; + gap: 16px; + } +} + +.skills-available, +.skills-selected { + border: 2px solid #dee2e6; + border-radius: 8px; + overflow: hidden; +} + +.skills-available h4, +.skills-selected h4 { + margin: 0; + padding: 12px 16px; + background: #f8f9fa; + border-bottom: 1px solid #dee2e6; + font-size: 1rem; + color: #495057; +} + +/* Category Filters */ +.category-filters { + padding: 12px 16px; + border-bottom: 1px solid #dee2e6; + display: flex; + flex-wrap: wrap; + gap: 8px; + background: #f8f9fa; +} + +.category-filter-btn { + padding: 6px 12px; + background: white; + border: 2px solid #dee2e6; + border-radius: 20px; + font-size: 0.85rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: nowrap; + font-weight: 500; + color: #495057; +} + +.category-filter-btn:hover { + border-color: #1da766; + color: #1da766; +} + +.category-filter-btn.active { + background: #1da766; + border-color: #1da766; + color: white; + font-weight: 600; +} + +.category-filter-btn:first-child { + font-weight: 600; + background: #e9ecef; + border-color: #adb5bd; +} + +.category-filter-btn:first-child.active { + background: #495057; + border-color: #495057; + color: white; +} + +/* Sort and Search Controls */ +.search-input { + margin: 0; + font-size: 13px; +} + +.sort-and-search-controls { + padding: 12px 16px; + border-bottom: 1px solid #dee2e6; + display: flex; + align-items: center; + gap: 20px; + background: #f8f9fa; + flex-wrap: wrap; +} + +.sort-controls { + display: flex; + align-items: center; + gap: 12px; + flex: 0 0 auto; +} + +.skills-search { + flex: 1; + min-width: 200px; +} + +.sort-label { + font-size: 0.9rem; + color: #495057; + font-weight: 500; +} + +.sort-btn { + padding: 6px 12px; + background: white; + border: 2px solid #dee2e6; + border-radius: 6px; + font-size: 0.85rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: nowrap; + font-weight: 500; + color: #495057; + display: flex; + align-items: center; + gap: 4px; +} + +.sort-btn:hover { + border-color: #1da766; + color: #1da766; +} + +.sort-btn.active { + background: #1da766; + border-color: #1da766; + color: white; + font-weight: 600; +} + +.sort-icon { + font-size: 0.8rem; + font-weight: bold; +} + +/* Skills List */ +.skills-list { + max-height: 60vh; + overflow-y: auto; + background: white; +} + +.skill-item { + padding: 12px 16px; + border-bottom: 1px solid #f8f9fa; + display: flex; + align-items: center; + gap: 12px; + cursor: grab; + transition: all 0.2s ease; +} + +.skill-item:hover { + background: #f8f9fa; +} + +.skill-item:active { + cursor: grabbing; +} + +.skill-item.skill-affordable { + border-left: 4px solid #1da766; +} + +.skill-item:not(.skill-affordable) { + opacity: 0.6; + cursor: not-allowed; +} + +.skill-info { + flex: 1; +} + +.skill-main-line { + display: flex; + align-items: center; + gap: 12px; + flex-wrap: wrap; +} + +.skill-name { + font-weight: 600; + color: #333; + font-size: 0.95rem; + min-width: 120px; +} + +.skill-category { + font-size: 0.8rem; + color: #6c757d; + font-style: italic; + min-width: 100px; +} + +.skill-costs { + display: flex; + gap: 8px; + font-size: 0.85rem; + margin-left: auto; +} + +.cost-ep { + color: #1da766; + font-weight: 600; +} + +.cost-gold { + color: #ffc107; + font-weight: 600; +} + +.skill-actions { + display: flex; + gap: 8px; +} + +.btn-select { + width: 32px; + height: 32px; + border: 2px solid #1da766; + background: white; + color: #1da766; + border-radius: 50%; + cursor: pointer; + font-weight: bold; + font-size: 14px; + transition: all 0.2s ease; + display: flex; + align-items: center; + justify-content: center; +} + +.btn-select:hover:not(:disabled) { + background: #1da766; + color: white; + transform: scale(1.1); +} + +.btn-select:disabled { + border-color: #6c757d; + color: #6c757d; + cursor: not-allowed; + transform: none; +} + +/* Skills Drop Zone */ +.skills-drop-zone { + min-height: 60vh; + padding: 16px; + background: white; + border: 2px dashed #dee2e6; + margin: 16px; + border-radius: 8px; + transition: all 0.2s ease; +} + +.skills-drop-zone.drag-over { + border-color: #1da766; + background: rgba(29, 167, 102, 0.05); +} + +.drop-zone-placeholder { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100%; + min-height: 200px; + color: #6c757d; + text-align: center; +} + +.placeholder-icon { + font-size: 48px; + margin-bottom: 16px; + opacity: 0.7; +} + +.placeholder-text { + font-size: 0.9rem; + line-height: 1.4; + max-width: 200px; +} + +/* Selected Skills List */ +.selected-skills-list { + display: flex; + flex-direction: column; + gap: 8px; +} + +.selected-skill-item { + display: flex; + align-items: center; + gap: 12px; + padding: 12px; + background: #f8f9fa; + border: 1px solid #dee2e6; + border-radius: 6px; + transition: all 0.2s ease; +} + +.selected-skill-item:hover { + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + +.selected-skill-info { + flex: 1; +} + +.selected-skill-name { + font-weight: 600; + color: #333; + margin-bottom: 4px; +} + +.selected-skill-costs { + display: flex; + gap: 12px; + font-size: 0.85rem; +} + +/* Total Costs */ +.total-costs-header { + font-weight: 600; + color: #856404; + margin-bottom: 8px; +} + +.total-costs-breakdown { + display: flex; + gap: 16px; + margin-bottom: 8px; +} + +.total-ep, +.total-gold { + font-weight: 600; + font-size: 0.9rem; +} + +.total-ep { + color: #1da766; +} + +.total-gold { + color: #ffc107; +} + +.affordability-check { + font-size: 0.85rem; + font-weight: 600; +} + +.text-success { + color: #28a745; +} + +.loading-skills { + padding: 20px; + text-align: center; + color: #6c757d; + display: flex; + align-items: center; + justify-content: center; + gap: 8px; +} + +.simple-input-section { + margin-bottom: 20px; + padding: 16px; + background: #fff3cd; + border: 1px solid #ffeaa7; + border-radius: 8px; +} + +.simple-input-section .form-group { + margin-bottom: 0; } \ No newline at end of file diff --git a/frontend/src/components/SkillLearnDialog.vue b/frontend/src/components/SkillLearnDialog.vue index f8b9658..13e6a43 100644 --- a/frontend/src/components/SkillLearnDialog.vue +++ b/frontend/src/components/SkillLearnDialog.vue @@ -742,6 +742,7 @@ export default { diff --git a/frontend/src/components/CharacterCreation.vue b/frontend/src/components/CharacterCreation.vue index fcbab46..26fa0db 100644 --- a/frontend/src/components/CharacterCreation.vue +++ b/frontend/src/components/CharacterCreation.vue @@ -360,133 +360,5 @@ export default { diff --git a/frontend/src/components/DatasheetView.vue b/frontend/src/components/DatasheetView.vue index e159bf3..5b028c1 100644 --- a/frontend/src/components/DatasheetView.vue +++ b/frontend/src/components/DatasheetView.vue @@ -176,94 +176,7 @@ From 4e49a38cf91242c41c2a55f1fc5f63fbbaf84e61 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 30 Dec 2025 22:47:52 +0100 Subject: [PATCH 8/9] Added version to landing page --- backend/VERSION.md | 70 ++++++++++++++++++++++++ backend/cmd/main.go | 2 + backend/config/handlers.go | 10 ++++ backend/config/routes.go | 15 ++++++ backend/config/version.go | 60 +++++++++++++++++++++ backend/config/version_test.go | 43 +++++++++++++++ docker/docker-compose.dev.yml | 1 + docker/start-dev.sh | 4 ++ frontend/VERSION.md | 87 ++++++++++++++++++++++++++++++ frontend/package.json | 4 +- frontend/src/locales/de | 6 ++- frontend/src/locales/en | 2 + frontend/src/version.js | 20 +++++++ frontend/src/views/LandingView.vue | 33 +++++++----- 14 files changed, 341 insertions(+), 16 deletions(-) create mode 100644 backend/VERSION.md create mode 100644 backend/config/handlers.go create mode 100644 backend/config/routes.go create mode 100644 backend/config/version.go create mode 100644 backend/config/version_test.go create mode 100644 frontend/VERSION.md create mode 100644 frontend/src/version.js diff --git a/backend/VERSION.md b/backend/VERSION.md new file mode 100644 index 0000000..e1e9cf4 --- /dev/null +++ b/backend/VERSION.md @@ -0,0 +1,70 @@ +# Version Management + +## Current Version: 0.1.30 + +The backend version is managed in `/backend/config/version.go`. + +## Updating the Version + +To update the application version: + +1. Edit `/backend/config/version.go` +2. Change the `Version` constant: + ```go + const Version = "0.1.31" // Update this + ``` + +## Git Commit Information + +The git commit hash is automatically detected at runtime from: + +1. `GIT_COMMIT` environment variable (preferred for Docker) +2. Git command output (works in development) +3. Falls back to "unknown" if neither is available + +## Setting Git Commit in Docker + +### Development Environment + +Add to `docker/.env`: +```bash +GIT_COMMIT=$(git rev-parse --short HEAD) +``` + +Then restart the container: +```bash +cd docker +docker-compose -f docker-compose.dev.yml up -d backend-dev +``` + +### Production Build + +Use build-time variable: +```bash +docker build --build-arg GIT_COMMIT=$(git rev-parse --short HEAD) . +``` + +Or set in docker-compose.yml: +```yaml +environment: + - GIT_COMMIT=${GIT_COMMIT:-unknown} +``` + +## API Endpoints + +- **Public**: `GET /api/public/version` (no authentication) +- **Protected**: `GET /api/version` (requires JWT token) + +Both return: +```json +{ + "version": "0.1.30", + "gitCommit": "d0c177b" +} +``` + +## Frontend Integration + +The landing page automatically fetches version information from `/api/public/version` and displays it. + +To see the version in the frontend, visit: http://localhost:5173 diff --git a/backend/cmd/main.go b/backend/cmd/main.go index ca6de1b..fe775e3 100644 --- a/backend/cmd/main.go +++ b/backend/cmd/main.go @@ -82,9 +82,11 @@ func main() { importer.RegisterRoutes(protected) pdfrender.RegisterRoutes(protected) transfer.RegisterRoutes(protected) + config.RegisterRoutes(protected) // Register public routes (no authentication) pdfrender.RegisterPublicRoutes(r) + config.RegisterPublicRoutes(r) logger.Info("API-Routen erfolgreich registriert") diff --git a/backend/config/handlers.go b/backend/config/handlers.go new file mode 100644 index 0000000..ba75953 --- /dev/null +++ b/backend/config/handlers.go @@ -0,0 +1,10 @@ +package config + +import ( + "github.com/gin-gonic/gin" +) + +// Versionsinfo returns version and git commit information +func Versionsinfo(c *gin.Context) { + c.JSON(200, GetInfo()) +} diff --git a/backend/config/routes.go b/backend/config/routes.go new file mode 100644 index 0000000..d09a4fe --- /dev/null +++ b/backend/config/routes.go @@ -0,0 +1,15 @@ +package config + +import "github.com/gin-gonic/gin" + +// RegisterRoutes registers config-related routes (protected) +func RegisterRoutes(r *gin.RouterGroup) { + r.GET("/version", Versionsinfo) +} + +// RegisterPublicRoutes registers public config routes (no auth required) +func RegisterPublicRoutes(r *gin.Engine) { + // Public version endpoint - no authentication required + public := r.Group("/api/public") + public.GET("/version", Versionsinfo) +} diff --git a/backend/config/version.go b/backend/config/version.go new file mode 100644 index 0000000..f22469e --- /dev/null +++ b/backend/config/version.go @@ -0,0 +1,60 @@ +package config + +// Version is the application version +const Version = "0.1.30" + +var ( + // GitCommit will be set by build flags or detected at runtime + GitCommit = "unknown" +) + +// init detects git commit if not set during build +func init() { + /* + if GitCommit == "" { + // Try environment variable first + if envCommit := os.Getenv("GIT_COMMIT"); envCommit != "" { + GitCommit = envCommit + } else { + // Try to detect from git command + GitCommit = detectGitCommit() + } + } + */ +} + +/* +// detectGitCommit tries to get the current git commit hash +func detectGitCommit() string { + cmd := exec.Command("git", "rev-parse", "--short", "HEAD") + output, err := cmd.Output() + if err != nil { + return "unknown" + } + return strings.TrimSpace(string(output)) +} +*/ +// GetVersion returns the current application version +func GetVersion() string { + return Version +} + +/* +// GetGitCommit returns the git commit hash +func GetGitCommit() string { + return GitCommit +} +*/ +// Info contains version information +type Info struct { + Version string `json:"version"` + GitCommit string `json:"gitCommit"` +} + +// GetInfo returns version information as a struct +func GetInfo() Info { + return Info{ + Version: Version, + GitCommit: GitCommit, + } +} diff --git a/backend/config/version_test.go b/backend/config/version_test.go new file mode 100644 index 0000000..62f702a --- /dev/null +++ b/backend/config/version_test.go @@ -0,0 +1,43 @@ +package config + +import ( + "testing" +) + +func TestGetVersion(t *testing.T) { + version := GetVersion() + if version == "" { + t.Error("Version should not be empty") + } + if version != Version { + t.Errorf("Expected version %s, got %s", Version, version) + } +} + +/* + func TestGetGitCommit(t *testing.T) { + commit := GetGitCommit() + if commit == "" { + t.Error("GitCommit should not be empty") + } + // Should be either "unknown" or a valid git hash + if commit != "unknown" && len(commit) < 7 { + t.Errorf("Invalid git commit format: %s", commit) + } + } +*/ +func TestGetInfo(t *testing.T) { + info := GetInfo() + + if info.Version == "" { + t.Error("Info.Version should not be empty") + } + + if info.GitCommit == "" { + t.Error("Info.GitCommit should not be empty") + } + + if info.Version != Version { + t.Errorf("Expected info.Version %s, got %s", Version, info.Version) + } +} diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index f13867b..1a2d930 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -14,6 +14,7 @@ services: - API_PORT=${API_PORT:-8180} - TEMPLATES_DIR=${TEMPLATES_DIR:-./templatesx} - EXPORT_TEMP_DIR=${EXPORT_TEMP_DIR:-./export_tempx} + - GIT_COMMIT=${GIT_COMMIT:-unknown} depends_on: mariadb-dev: condition: service_healthy diff --git a/docker/start-dev.sh b/docker/start-dev.sh index 8aaf104..255c0b3 100755 --- a/docker/start-dev.sh +++ b/docker/start-dev.sh @@ -11,6 +11,10 @@ fi # Gehe ins Docker-Verzeichnis cd "$(dirname "$0")" +# Get current git commit +export GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown") +echo "📝 Git Commit: $GIT_COMMIT" + echo "📦 Building and starting development containers..." # Stoppe vorhandene Container diff --git a/frontend/VERSION.md b/frontend/VERSION.md new file mode 100644 index 0000000..b4835d2 --- /dev/null +++ b/frontend/VERSION.md @@ -0,0 +1,87 @@ +# Frontend Version Management + +## Current Version: 0.1.30 + +The frontend version is managed independently from the backend. + +## Version Locations + +1. **Primary source**: `/frontend/src/version.js` + - Contains the VERSION constant + - Exports version info functions + +2. **Package metadata**: `/frontend/package.json` + - Standard npm version field + - Should match version.js + +## Updating the Version + +### Option 1: Using the update script (Recommended) +```bash +# Updates both backend and frontend +./scripts/update-version.sh 0.1.31 +``` + +### Option 2: Manual update +Edit `/frontend/src/version.js`: +```javascript +export const VERSION = '0.1.31' // Update this +``` + +And `/frontend/package.json`: +```json +{ + "version": "0.1.31" // Update this +} +``` + +## Git Commit Information + +The git commit is injected via environment variable: +- Set `VITE_GIT_COMMIT` in `.env` or at build time +- Falls back to "unknown" if not set + +Example `.env`: +```bash +VITE_GIT_COMMIT=d0c177b +``` + +## Usage in Components + +```javascript +import { getVersion, getGitCommit, getVersionInfo } from '@/version' + +// Get version string +const version = getVersion() // "0.1.30" + +// Get git commit +const commit = getGitCommit() // "d0c177b" or "unknown" + +// Get full info object +const info = getVersionInfo() // { version: "0.1.30", gitCommit: "d0c177b" } +``` + +## Landing Page Display + +The landing page shows both: +- **Frontend Version**: From `/frontend/src/version.js` +- **Backend Version**: Fetched from `/api/public/version` + +This allows users to see if frontend and backend are in sync. + +## Build-time Version Injection + +To inject git commit at build time, update `vite.config.js`: + +```javascript +import { defineConfig } from 'vite' +import { execSync } from 'child_process' + +const gitCommit = execSync('git rev-parse --short HEAD').toString().trim() + +export default defineConfig({ + define: { + 'import.meta.env.VITE_GIT_COMMIT': JSON.stringify(gitCommit) + } +}) +``` diff --git a/frontend/package.json b/frontend/package.json index d83539a..faae845 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { - "name": "my-app", - "version": "0.0.0", + "name": "bamort-frontend", + "version": "0.1.21", "private": true, "type": "module", "scripts": { diff --git a/frontend/src/locales/de b/frontend/src/locales/de index 8efcb40..557aee0 100644 --- a/frontend/src/locales/de +++ b/frontend/src/locales/de @@ -47,8 +47,10 @@ export default { Home:'Startseite', }, landing:{ - title:'BaMoRT - Charakterverwaltung für Rollenspiele', - description:'Bamort ist ein modernes Werkzeug zur Charakterverwaltung für Rollenspiele. Es bietet umfassende Funktionen zur Charaktererstellung, -entwicklung und -verwaltung mit Unterstützung für Fertigkeiten, Zauber, Ausrüstung und mehr.', + title:'BaMoRT - Charakterverwaltung für mein Lieblingsrollenspielsystem', + description:'Bamort ist ein Werkzeug zur Charakterverwaltung für Rollenspiele. Es bietet Funktionen zur Charaktererstellung, -entwicklung und -verwaltung mit Unterstützung für Fertigkeiten, Zauber, Ausrüstung und mehr. Viele Ausrüstungsteile, Fertikeiten und Zauber fehlen noch, da das Projekt noch in der Entwicklung ist.', + frontendVersion:'Frontend Version', + backendVersion:'Backend Version', version:'Version', commit:'Commit', login:'Zum Login', diff --git a/frontend/src/locales/en b/frontend/src/locales/en index a41a67b..ed4b0af 100644 --- a/frontend/src/locales/en +++ b/frontend/src/locales/en @@ -48,6 +48,8 @@ export default { landing:{ title:'BaMoRT - Character Management for Role-Playing Games', description:'Bamort is a modern character management tool for role-playing games. It provides comprehensive features for character creation, development, and management with support for skills, spells, equipment, and more.', + frontendVersion:'Frontend Version', + backendVersion:'Backend Version', version:'Version', commit:'Commit', login:'Login', diff --git a/frontend/src/version.js b/frontend/src/version.js new file mode 100644 index 0000000..9115b5c --- /dev/null +++ b/frontend/src/version.js @@ -0,0 +1,20 @@ +// Frontend version information +export const VERSION = '0.1.21' + +// Git commit will be injected at build time or detected from env +export const GIT_COMMIT = import.meta.env.VITE_GIT_COMMIT || 'unknown' + +export function getVersion() { + return VERSION +} + +export function getGitCommit() { + return GIT_COMMIT +} + +export function getVersionInfo() { + return { + version: VERSION, + gitCommit: GIT_COMMIT + } +} diff --git a/frontend/src/views/LandingView.vue b/frontend/src/views/LandingView.vue index 0778f40..9bf2683 100644 --- a/frontend/src/views/LandingView.vue +++ b/frontend/src/views/LandingView.vue @@ -10,8 +10,8 @@

{{ $t('landing.description') }}

-

{{ $t('landing.version') }}: {{ version }}

-

{{ $t('landing.commit') }}: {{ commit }}

+

{{ $t('landing.frontendVersion') }}: {{ frontendVersion }}

+

{{ $t('landing.backendVersion') }}: {{ backendVersion }}

@@ -32,28 +32,37 @@