From 5f7a230fd38668868f4812f6524fbcc8e983534a Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 1 Oct 2023 19:11:48 +0200 Subject: [PATCH 1/5] Bugfix/fix sidebar on user account page (#2413) * Fix sidebar on user account page * Update changelog --- CHANGELOG.md | 6 ++++++ apps/client/src/app/app.component.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 692208064..91432d854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed + +- Fixed the sidebar navigation on the user account page + ## 2.7.0 - 2023-09-30 ### Added diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index f260f4bbd..d1d9529ce 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -112,6 +112,7 @@ export class AppComponent implements OnDestroy, OnInit { this.hasTabs = (this.currentRoute === this.routerLinkAbout[0].slice(1) || + this.currentRoute === 'account' || this.currentRoute === 'admin' || this.currentRoute === 'home' || this.currentRoute === 'portfolio' || From f40f0653c2f0b18ff2aac89a1e076e000f4460f8 Mon Sep 17 00:00:00 2001 From: shyam kachhadiya <39761970+shyam1s15@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:24:21 +0530 Subject: [PATCH 2/5] Add request params (ship, take) for pagination to GET order endpoint (#2382) * Add request params (ship, take) for pagination to GET order endpoint * Update changelog --- CHANGELOG.md | 4 ++++ apps/api/src/app/order/order.controller.ts | 6 +++++- apps/api/src/app/order/order.service.ts | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91432d854..f31b6a80b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added + +- Added pagination parameters (`skip`, `take`) to the endpoint `GET api/v1/order` + ### Fixed - Fixed the sidebar navigation on the user account page diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index be6a6bead..8c8e3e27a 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -89,7 +89,9 @@ export class OrderController { @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId, @Query('accounts') filterByAccounts?: string, @Query('assetClasses') filterByAssetClasses?: string, - @Query('tags') filterByTags?: string + @Query('skip') skip?: number, + @Query('tags') filterByTags?: string, + @Query('take') take?: number ): Promise { const filters = this.apiService.buildFiltersFromQueryParams({ filterByAccounts, @@ -105,6 +107,8 @@ export class OrderController { filters, userCurrency, includeDrafts: true, + skip: isNaN(skip) ? undefined : skip, + take: isNaN(take) ? undefined : take, userId: impersonationUserId || this.request.user.id, withExcludedAccounts: true }); diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index f518e0bb3..10515018c 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -230,6 +230,8 @@ export class OrderService { public async getOrders({ filters, includeDrafts = false, + skip, + take = Number.MAX_SAFE_INTEGER, types, userCurrency, userId, @@ -237,6 +239,8 @@ export class OrderService { }: { filters?: Filter[]; includeDrafts?: boolean; + skip?: number; + take?: number; types?: TypeOfOrder[]; userCurrency: string; userId: string; @@ -315,6 +319,8 @@ export class OrderService { return ( await this.orders({ + skip, + take, where, include: { // eslint-disable-next-line @typescript-eslint/naming-convention From f1ec5e704e5a8c104d0644dfceac2d717b6ac756 Mon Sep 17 00:00:00 2001 From: Anirudh Sudhir <137381184+anirudhsudhir@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:35:01 +0530 Subject: [PATCH 3/5] Add version to Overview of Admin Control panel (#2414) * Add version to Overview of Admin Control panel * Update changelog --- CHANGELOG.md | 1 + .../app/components/admin-overview/admin-overview.component.ts | 2 ++ .../src/app/components/admin-overview/admin-overview.html | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f31b6a80b..128ea4603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Added the version to the admin control panel - Added pagination parameters (`skip`, `take`) to the endpoint `GET api/v1/order` ### Fixed diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.ts index 2053c4298..2ca3f0724 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts +++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { MatCheckboxChange } from '@angular/material/checkbox'; +import { environment } from '@ghostfolio/client/../environments/environment'; import { AdminService } from '@ghostfolio/client/services/admin.service'; import { CacheService } from '@ghostfolio/client/services/cache.service'; import { DataService } from '@ghostfolio/client/services/data.service'; @@ -42,6 +43,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit { public transactionCount: number; public userCount: number; public user: User; + public version = environment.version; private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html index 6d8245cb7..2739547b5 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.html +++ b/apps/client/src/app/components/admin-overview/admin-overview.html @@ -3,6 +3,10 @@
+
+
Version
+
{{ version }}
+
User Count
From c9a8dd4958ff003f90d239a9f300084ed13e1996 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 2 Oct 2023 10:48:36 +0200 Subject: [PATCH 4/5] Support copy-assets Nx target on Windows (#2410) * Introduce shx plugin --- apps/client/project.json | 24 ++++++++++++------------ package.json | 1 + yarn.lock | 10 +++++++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/apps/client/project.json b/apps/client/project.json index 9da89ea9e..2e36f7144 100644 --- a/apps/client/project.json +++ b/apps/client/project.json @@ -104,40 +104,40 @@ "options": { "commands": [ { - "command": "mkdir -p dist/apps/client" + "command": "shx mkdir -p dist/apps/client" }, { - "command": "cp -r apps/client/src/assets dist/apps/client" + "command": "shx cp -r apps/client/src/assets dist/apps/client" }, { - "command": "cp -r apps/client/src/assets/.well-known dist/apps/client" + "command": "shx cp -r apps/client/src/assets/.well-known dist/apps/client" }, { - "command": "cp apps/client/src/assets/favicon.ico dist/apps/client" + "command": "shx cp apps/client/src/assets/favicon.ico dist/apps/client" }, { - "command": "cp apps/client/src/assets/index.html dist/apps/client" + "command": "shx cp apps/client/src/assets/index.html dist/apps/client" }, { - "command": "cp apps/client/src/assets/robots.txt dist/apps/client" + "command": "shx cp apps/client/src/assets/robots.txt dist/apps/client" }, { - "command": "cp apps/client/src/assets/site.webmanifest dist/apps/client" + "command": "shx cp apps/client/src/assets/site.webmanifest dist/apps/client" }, { - "command": "cp node_modules/ionicons/dist/index.js dist/apps/client" + "command": "shx cp node_modules/ionicons/dist/index.js dist/apps/client" }, { - "command": "cp node_modules/ionicons/dist/ionicons.js dist/apps/client" + "command": "shx cp node_modules/ionicons/dist/ionicons.js dist/apps/client" }, { - "command": "cp -r node_modules/ionicons/dist/ionicons dist/apps/client/ionicons" + "command": "shx cp -r node_modules/ionicons/dist/ionicons dist/apps/client/ionicons" }, { - "command": "cp CHANGELOG.md dist/apps/client/assets" + "command": "shx cp CHANGELOG.md dist/apps/client/assets" }, { - "command": "cp LICENSE dist/apps/client/assets" + "command": "shx cp LICENSE dist/apps/client/assets" } ] } diff --git a/package.json b/package.json index 56192852a..f303e5f51 100644 --- a/package.json +++ b/package.json @@ -194,6 +194,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "replace-in-file": "7.0.1", + "shx": "0.3.4", "storybook": "7.0.9", "ts-jest": "29.1.0", "ts-node": "10.9.1", diff --git a/yarn.lock b/yarn.lock index 43b5deddd..69f995b5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14264,7 +14264,7 @@ minimatch@^9.0.0, minimatch@^9.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -16984,6 +16984,14 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" +shx@0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.4.tgz#74289230b4b663979167f94e1935901406e40f02" + integrity sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g== + dependencies: + minimist "^1.2.3" + shelljs "^0.8.5" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" From ad5ae938ef6c7581900d8a4561cb61bf550eebe7 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:29:33 +0200 Subject: [PATCH 5/5] Feature/harmonize settings icon of user account page (#2412) * Harmonize icon * Update changelog --- CHANGELOG.md | 4 ++++ .../src/app/pages/user-account/user-account-page.component.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 128ea4603..71e888246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added the version to the admin control panel - Added pagination parameters (`skip`, `take`) to the endpoint `GET api/v1/order` +### Changed + +- Harmonized the settings icon of the user account page + ### Fixed - Fixed the sidebar navigation on the user account page diff --git a/apps/client/src/app/pages/user-account/user-account-page.component.ts b/apps/client/src/app/pages/user-account/user-account-page.component.ts index 970dadd6a..80c4a8f72 100644 --- a/apps/client/src/app/pages/user-account/user-account-page.component.ts +++ b/apps/client/src/app/pages/user-account/user-account-page.component.ts @@ -30,7 +30,7 @@ export class UserAccountPageComponent implements OnDestroy, OnInit { this.tabs = [ { - iconName: 'cog-outline', + iconName: 'settings-outline', label: $localize`Settings`, path: ['/account'] },