Merge changes for version 1.8.3 (#243)

* Fix #234 * Update Version * Update CHANGELOG.md * Update README.md * Update SECURITY.md * Replace News with Link to GitHub Announcements #241 * Cleanup files * Update README.md * Update README.md
TheAxelander · May 20, 2024 · 3714744 · 3714744
1 parent 21666fe
commit 3714744
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.8.3 (2024-05-20)
+
+### :warning: Breaking Changes
+
+* Dropping support for SQLite [#239](https://github.com/TheAxelander/OpenBudgeteer/issues/239) [#242](https://github.com/TheAxelander/OpenBudgeteer/discussions/242)
+
+### :gear: Features & Enhancements
+
+* Replace News with Link to GitHub Announcements [#241](https://github.com/TheAxelander/OpenBudgeteer/issues/241)
+
+### :beetle: Bug Fixes
+
+* Fix error message after creating new Bucket [#234](https://github.com/TheAxelander/OpenBudgeteer/issues/234) Thanks also [Anu6is](https://github.com/Anu6is)
+
 ## 1.8.2 (2024-04-04)
 
 ### :hammer: Maintenance

diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor b/OpenBudgeteer.Blazor/Pages/Index.razor
@@ -46,27 +46,14 @@
     <div class="card card-home m-2">
         <div class="row g-0">
             <div class="col-4 card-img-col-padding">
-                <img src="css/icons8/question-group.png" class="img-fluid rounded-start" alt="...">
+                <img src="css/icons8/announce.png" class="img-fluid rounded-start" alt="...">
             </div>
             <div class="col-8">
                 <div class="card-body">
-                    <a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank"><h5 class="card-title">Display Change Log</h5></a>
-                    <p class="card-text">See latest updates and changes.</p>
+                    <a href="https://github.com/TheAxelander/OpenBudgeteer/discussions/categories/announcements" target="_blank"><h5 class="card-title">Display Announcements</h5></a>
+                    <p class="card-text">See latest updates and announcements.</p>
                 </div>
             </div>
         </div>
     </div>
 </div>
-
-<h4>What's new</h4>
-<div style="max-width: 1000px; margin:auto">
-    @_convertedHtml
-</div>
-
-@if (_showErrorMessage)
-{
-    <div class="alert alert-danger d-flex align-items-center" role="alert" style="margin-bottom: 0">
-        <svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Danger:"><use xlink:href="#exclamation-triangle-fill"/></svg>
-        <div>Unable to load News</div>
-    </div>
-}
diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor.cs b/OpenBudgeteer.Blazor/Pages/Index.razor.cs
diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor
@@ -16,7 +16,7 @@
         </button>
         <span class="navbar-brand flex-fill ms-2 fs-5">OpenBudgeteer</span>
         <span class="navbar-text ms-3 d-none d-md-block">Database: @CurrentDatabase</span>
-        <span class="navbar-text ms-3 d-none d-md-block">Version: 1.8.2 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
+        <span class="navbar-text ms-3 d-none d-md-block">Version: 1.8.3 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
     </div>
 </header>
 <div class="container-fluid">

diff --git a/OpenBudgeteer.Blazor/wwwroot/css/icons8/announce.png b/OpenBudgeteer.Blazor/wwwroot/css/icons8/announce.png
diff --git a/OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj b/OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj
diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs
@@ -612,8 +612,8 @@ public ViewModelOperationResult CreateOrUpdateBucket()
                 ServiceManager.BucketService.Update(BucketVersion.HasModification
                     ? ConvertToDtoWithNewVersion()
                     : ConvertToDto());
+                CalculateValues();
             }
-            CalculateValues();
             return new ViewModelOperationResult(true, true);
         }
         catch (Exception e)

diff --git a/README.md b/README.md
@@ -3,17 +3,11 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml">
-        <img alt="Docker Image pre-release" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml/badge.svg">
-    </a>
-    <a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml">
-        <img alt="Docker Image latest" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml/badge.svg">
-    </a>
+    <a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml" target="_blank"><img alt="Docker Image pre-release" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml/badge.svg"></a>
+    <a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml" target="_blank"><img alt="Docker Image latest" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml/badge.svg"></a>
 </p>
 <p align="center">
-    <a href="https://github.com/awesome-selfhosted/awesome-selfhosted#money-budgeting--management">
-        <img alt="Mentioned in Awesome-Selfhosted" src="https://awesome.re/mentioned-badge.svg">
-    </a>
+    <a href="https://github.com/awesome-selfhosted/awesome-selfhosted#money-budgeting--management" target="_blank"><img alt="Mentioned in Awesome-Selfhosted" src="https://awesome.re/mentioned-badge.svg"></a>
     <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/axelander/openbudgeteer">
     <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/theaxelander/openbudgeteer">
 </p>
@@ -30,24 +24,9 @@ Within the [Documentation](https://theaxelander.github.io) you will find all the
 
 ## Quick Start
 
-For a quick ramp-up up of OpenBudgeteer using Docker and Sqlite use below command or docker compose.
-
-### docker run
-
-```bash
-docker run -d --name='openbudgeteer' \
-    -e 'CONNECTION_PROVIDER'='SQLITE' \
-    -e 'CONNECTION_DATABASE'='/srv/openbudgeteer.db' \
-    -p 8080:8080 \
-    -v 'data:/srv'  \
-    'axelander/openbudgeteer:latest' # alternatively use 'pre-release' or a specific version tag
-```
-
-### docker compose
+For a quick ramp-up up of OpenBudgeteer using Docker and MariaDB use below docker compose.
 
 ```yml
-version: "3"
-
 services:
   openbudgeteer:
     image: axelander/openbudgeteer:latest
@@ -57,10 +36,33 @@ services:
     ports:
       - 8080:8080
     environment:
-      - CONNECTION_PROVIDER=SQLITE
-      - CONNECTION_DATABASE=/srv/openbudgeteer.db
+      - CONNECTION_PROVIDER=mariadb
+      - CONNECTION_SERVER=openbudgeteer-mysql
+      - CONNECTION_PORT=3306
+      - CONNECTION_DATABASE=openbudgeteer
+      - CONNECTION_USER=openbudgeteer
+      - CONNECTION_PASSWORD=openbudgeteer
+      - APPSETTINGS_CULTURE=en-US
+      - APPSETTINGS_THEME=solar
+    depends_on:
+      - mariadb
+
+  mariadb:
+    image: mariadb
+    container_name: openbudgeteer-mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: myRootPassword
     volumes:
-      - data:/srv
+      - data:/var/lib/mysql
+
+  # optional    
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: openbudgeteer-phpmyadmin
+    links:
+      - mariadb:db
+    ports:
+      - 8081:80
 
 volumes:
   data:

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,9 +4,9 @@
 
 | Version     | Supported          |
 |-------------| ------------------ |
-| 1.8.2       | :white_check_mark: |
+| 1.8.3       | :white_check_mark: |
 | pre-release | :white_check_mark: |
-| < 1.8.2     | :x:                |
+| < 1.8.3     | :x:                |
 
 ## Reporting a Vulnerability
 

diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/examples/compose-sqlite.yaml b/examples/compose-sqlite.yaml
diff --git a/examples/compose-tempdb.yaml b/examples/compose-tempdb.yaml