From 371474444d8b77817b2a4ee9d3fc9e6927ebe721 Mon Sep 17 00:00:00 2001 From: Alexander Preibisch Date: Mon, 20 May 2024 12:27:23 +0200 Subject: [PATCH] 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 --- CHANGELOG.md | 14 +++++ OpenBudgeteer.Blazor/Pages/Index.razor | 19 +----- OpenBudgeteer.Blazor/Pages/Index.razor.cs | 35 ----------- OpenBudgeteer.Blazor/Shared/MainLayout.razor | 2 +- .../wwwroot/css/icons8/announce.png | Bin 0 -> 2126 bytes .../OpenBudgeteer.Contracts.csproj | 8 --- .../EntityViewModels/BucketViewModel.cs | 2 +- README.md | 58 +++++++++--------- SECURITY.md | 4 +- docker-compose.yml | 12 ---- examples/compose-sqlite.yaml | 18 ------ examples/compose-tempdb.yaml | 12 ---- 12 files changed, 51 insertions(+), 133 deletions(-) delete mode 100644 OpenBudgeteer.Blazor/Pages/Index.razor.cs create mode 100644 OpenBudgeteer.Blazor/wwwroot/css/icons8/announce.png delete mode 100644 OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj delete mode 100644 docker-compose.yml delete mode 100644 examples/compose-sqlite.yaml delete mode 100644 examples/compose-tempdb.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 08d1f0e..243bb84 100644 --- 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 index a8981f2..684fd5a 100644 --- a/OpenBudgeteer.Blazor/Pages/Index.razor +++ b/OpenBudgeteer.Blazor/Pages/Index.razor @@ -46,27 +46,14 @@
- ... + ...
-
Display Change Log
 -

See latest updates and changes.

+
Display Announcements
 +

See latest updates and announcements.

- -

What's new

-
- @_convertedHtml -
- -@if (_showErrorMessage) -{ - -} diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor.cs b/OpenBudgeteer.Blazor/Pages/Index.razor.cs deleted file mode 100644 index 4c93722..0000000 --- a/OpenBudgeteer.Blazor/Pages/Index.razor.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; - -namespace OpenBudgeteer.Blazor.Pages; - -public partial class Index : ComponentBase -{ - private const string NEWS_SOURCE = "https://raw.githubusercontent.com/TheAxelander/OpenBudgeteer-News/main/README.md"; - private MarkupString _convertedHtml; - private bool _showErrorMessage; - - protected override async Task OnInitializedAsync() - { - await base.OnInitializedAsync(); - - await LoadNewsAsync(); - } - - private async Task LoadNewsAsync() - { - try - { - _showErrorMessage = false; - var httpResponse = await new HttpClient().GetAsync(NEWS_SOURCE); - httpResponse.EnsureSuccessStatusCode(); - _convertedHtml = new MarkupString(await httpResponse.Content.ReadAsStringAsync()); - } - catch - { - _convertedHtml = new MarkupString(); - _showErrorMessage = true; - } - } -} \ No newline at end of file diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor index b43896d..c1af803 100644 --- a/OpenBudgeteer.Blazor/Shared/MainLayout.razor +++ b/OpenBudgeteer.Blazor/Shared/MainLayout.razor @@ -16,7 +16,7 @@ OpenBudgeteer Database: @CurrentDatabase - Version: 1.8.2 (Change Log) + Version: 1.8.3 (Change Log)
diff --git a/OpenBudgeteer.Blazor/wwwroot/css/icons8/announce.png b/OpenBudgeteer.Blazor/wwwroot/css/icons8/announce.png new file mode 100644 index 0000000000000000000000000000000000000000..f28644727c7eb7b7050b9cad27d20bb1c5063e28 GIT binary patch literal 2126 zcmV-U2(kBxP)Rn2LNo->?#-5+_J|UT>pWgrd-|>HgATlyCGBPqUp+S96*qUv0 zfY~iXKOOySH#%2p8F7rgHU=8|!S_uT=qFjG#=mPBapY9j$c#K$pr33nZuq^%EZ(hX zyZ30eJXxS0KJyw7O1p4f`!F<^^sp5r3m$#8RzUbe9Xg(}9e- zm=>6G(D5p6ZmQBS&N0*3Z#=bkrh*a|Qv$a$^}ot8+ShB%Vh3@k#dX-;GhMepanUUh zfH=4aR+|JJUeeT|W&{sieZ_U6{Q+nQfwUzrF!KPrEX(M89&WQ>NWxQ+ER+2MytL^U zUfOg;ZE||Z!!0Amnj4;~%Y)!tZ*cRQ1Oh=ErnS6+66|gjRdZ2A@x3U{PAG6ISV(*F z{4K}moYI=bF`}$x#87^IXjeu1gHPCN1Xcw45oc<$9vP0nrSvvX!f;f!iyI|OcTOJ*a0#U-6 z4iiSW<~%yO1%f!ZR9TGBrI(OElwc>6dfV3u(z+!vlU+8iJ_T-lH7)n6k;RfnFA;%o ztqYUsTYDXDjN-4Z!oPgMcleUr9=J%B1%k%}&i0YXbWCCtch%=egxfRX_{~Kdee@C; zflv1NtwM)OL2;Ys2vm}MUtV>eEU^FS0%49&>G>bYH;6qrYw_T8v2zYi9+3RroOd=@3?R?L8aY7DZFt5N5 z4tkd{X@<%l&k>l6pLsbox5gz41alVBFl@aGX>R_7wD%x^>w%}uaux1|yw zY<-Tr*(h}E>h%0t7tIaI%b5OPkFzMQV{3_goYffYfhwxu{(zC(;9`WbA{qrkl6CBI zjNnGYEm0Az0%s&r+|bt2uBmX%iHc|z`2YJ6CBfSXF#hq!-?x6X8nh-Qo%2;(w5>?^OP108 zN_Md$A=~J9Ps@l$b)`+6>VwX4ST|F|U-uRl1z9{PslYTt{m)R69WZ>+6Ocg7u^WKM ztDX@!yn8ojPDmIG^#7}i#lNXd4z;eNxn08up2Dgw*NICHKttaW5eQKb*7w&JI^BT? zgnP>DywfuRVQWc97;9U(^0&eELu<7EGP~HZR%;e75M|9HWsN=4p$hY`3QRVf`6))Q z?wu#^`YkZ`L@#*9V0ld7<+QY+rWGqzg`!V6pESIzD-|ofCBFahEVNQJ>;;x6$rf!Y zzU22!-mcT%fi%+kn7|tu8Ixjs{Ekre3(lchMl6{rG7qu{GwcFa>Arj^)llR1zmj1P zs0b?<_~^i6iKHbdsXlDaSk0n?Jkshq*%_hF959maHB|baOxEYsfbM<99}>x~U7$HW zejuEE%rQ15s~O=wQ+snF;vU+dB>UkeKdjy^;y`_4J)}!~P1~Qql$fonPUVN7JBt!-k3G#KbCOF#sS=!#K6D2D>^^ z9vdcRvdg?zqW;|}Q=i`kZ>v8C;+t;*F+P60DJiMCZN-XTAd5)0sqwXldhV*y+uGs& z*dKv~>>$7hZhV#2@+U+>V1m(@h5JW^-YLliVidP8)7&xbZy0af-#Ug79EnH_+%9Su zp})-DGbyP+l(436pas9@LAV7(N%nq5M%#0U#HbH6{SJO~;&|(K(tUIyh2&mL&8-Qj zws75Ey9>kFw~+`y^3R@RWVAhp;?~K%R{x8W^p!n8Npkm=8|r_8L;#Y1cn72SfNN{u zVT6)kvyliPhjDI^?9)#wif`3@_Dw(ncU1KOCCLxMg9#+o!3ge)ZDn5vBoMZ>1&t#q zI?Gxl)=}uJ1@D{M1AbqkF24>`dYgd6IttvfdE@?;fDTw;+jHg~Tv(4Hu}(5>Oq8{gN!FhE=bHSwfCZ8jw}Fb{yOCH&X|O$yk=%G7RSfVTc3pwpjq2D; zsrw%hC@KEBze^do=-#-$#e-3{^UDqOKa#rd5dn&`DXVkOy5Zf&eByFXdG`ivl5=}YWchB4;y!{88l~==jEszo3=$Il3)LzVr?aO)J^%m!07*qoM6N<$ Eg4PK9RR910 literal 0 HcmV?d00001 diff --git a/OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj b/OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj deleted file mode 100644 index b8f88c0..0000000 --- a/OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - net7.0 - disable - - - diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs index aa069bc..628d21c 100644 --- 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 index d150b40..ab57035 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,11 @@

- - Docker Image pre-release - - - Docker Image latest - + Docker Image pre-release + Docker Image latest

- - Mentioned in Awesome-Selfhosted - + Mentioned in Awesome-Selfhosted Docker Pulls GitHub release (latest by date)

@@ -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 index e5d88e7..20bd3f9 100644 --- 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 deleted file mode 100644 index cb4026d..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: "3" - -services: - openbudgeteer: - image: openbudgeteer:pre-release - container_name: openbudgeteer - ports: - - 8081:8080 - environment: - - CONNECTION_PROVIDER=tempdb - - APPSETTINGS_CULTURE=en-US - - APPSETTINGS_THEME=solar diff --git a/examples/compose-sqlite.yaml b/examples/compose-sqlite.yaml deleted file mode 100644 index 334b878..0000000 --- a/examples/compose-sqlite.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - openbudgeteer: - image: openbudgeteer:pre-release - container_name: openbudgeteer - ports: - - 8081:80 - environment: - - CONNECTION_PROVIDER=sqlite - - CONNECTION_DATABASE=/srv/openbudgeteer.db - - APPSETTINGS_CULTURE=en-US - - APPSETTINGS_THEME=solar - volumes: - - data:/srv - -volumes: - data: diff --git a/examples/compose-tempdb.yaml b/examples/compose-tempdb.yaml deleted file mode 100644 index ab32190..0000000 --- a/examples/compose-tempdb.yaml +++ /dev/null @@ -1,12 +0,0 @@ -version: "3" - -services: - openbudgeteer: - image: openbudgeteer:pre-release - container_name: openbudgeteer - ports: - - 8081:80 - environment: - - CONNECTION_PROVIDER=tempdb - - APPSETTINGS_CULTURE=en-US - - APPSETTINGS_THEME=solar