topaLE
/
ghostfolio
mirror of https://github.com/ghostfolio/ghostfolio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'main' into feature/upgrade-zone.js-to-version-0.15.1

pull/4869/head
Thomas Kaul 3 weeks ago
committed by GitHub
parent
d72b67bf68 6056cf9a6a
commit
ec4f2e5b89
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 52 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 70
      apps/client/src/app/app.component.ts
  3. 80
      package-lock.json
  4. 2
      package.json

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Upgraded `@keyv/redis` from version `4.3.4` to `4.4.0`
- Upgraded `zone.js` from version `0.15.0` to `0.15.1` - Upgraded `zone.js` from version `0.15.0` to `0.15.1`
### Fixed ### Fixed

70
apps/client/src/app/app.component.ts
View File

@ -3,7 +3,11 @@ import { HoldingDetailDialogParams } from '@ghostfolio/client/components/holding
import { getCssVariable } from '@ghostfolio/common/helper'; import { getCssVariable } from '@ghostfolio/common/helper';
import { InfoItem, User } from '@ghostfolio/common/interfaces'; import { InfoItem, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { publicRoutes, routes } from '@ghostfolio/common/routes'; import {
internalRoutes,
publicRoutes,
routes
} from '@ghostfolio/common/routes';
import { ColorScheme } from '@ghostfolio/common/types'; import { ColorScheme } from '@ghostfolio/common/types';
import { DOCUMENT } from '@angular/common'; import { DOCUMENT } from '@angular/common';
@ -160,10 +164,13 @@ export class AppComponent implements OnDestroy, OnInit {
this.currentSubRoute = urlSegments[1]?.path; this.currentSubRoute = urlSegments[1]?.path;
if ( if (
((this.currentRoute === 'home' && !this.currentSubRoute) || ((this.currentRoute === internalRoutes.home.path &&
(this.currentRoute === 'home' && !this.currentSubRoute) ||
this.currentSubRoute === 'holdings') || (this.currentRoute === internalRoutes.home.path &&
(this.currentRoute === 'portfolio' && !this.currentSubRoute)) && this.currentSubRoute ===
internalRoutes.home.subRoutes.holdings.path) ||
(this.currentRoute === internalRoutes.portfolio.path &&
!this.currentSubRoute)) &&
this.user?.settings?.viewMode !== 'ZEN' this.user?.settings?.viewMode !== 'ZEN'
) { ) {
this.hasPermissionToChangeDateRange = true; this.hasPermissionToChangeDateRange = true;
@ -172,14 +179,19 @@ export class AppComponent implements OnDestroy, OnInit {
} }
if ( if (
(this.currentRoute === 'home' && (this.currentRoute === internalRoutes.home.path &&
this.currentSubRoute === 'holdings') || this.currentSubRoute ===
(this.currentRoute === 'portfolio' && !this.currentSubRoute) || internalRoutes.home.subRoutes.holdings.path) ||
(this.currentRoute === 'portfolio' && (this.currentRoute === internalRoutes.portfolio.path &&
this.currentSubRoute === 'activities') || !this.currentSubRoute) ||
(this.currentRoute === 'portfolio' && (this.currentRoute === internalRoutes.portfolio.path &&
this.currentSubRoute === 'allocations') || this.currentSubRoute ===
(this.currentRoute === 'zen' && this.currentSubRoute === 'holdings') internalRoutes.portfolio.subRoutes.activities.path) ||
(this.currentRoute === internalRoutes.portfolio.path &&
this.currentSubRoute === routes.allocations) ||
(this.currentRoute === internalRoutes.zen.path &&
this.currentSubRoute ===
internalRoutes.home.subRoutes.holdings.path)
) { ) {
this.hasPermissionToChangeFilters = true; this.hasPermissionToChangeFilters = true;
} else { } else {
@ -187,25 +199,25 @@ export class AppComponent implements OnDestroy, OnInit {
} }
this.hasTabs = this.hasTabs =
(this.currentRoute === this.routerLinkAbout[0].slice(1) || (this.currentRoute === routes.about ||
this.currentRoute === this.routerLinkFaq[0].slice(1) || this.currentRoute === routes.faq ||
this.currentRoute === this.routerLinkResources[0].slice(1) || this.currentRoute === routes.resources ||
this.currentRoute === 'account' || this.currentRoute === routes.account ||
this.currentRoute === 'admin' || this.currentRoute === routes.adminControl ||
this.currentRoute === 'home' || this.currentRoute === internalRoutes.home.path ||
this.currentRoute === 'portfolio' || this.currentRoute === internalRoutes.portfolio.path ||
this.currentRoute === 'zen') && this.currentRoute === internalRoutes.zen.path) &&
this.deviceType !== 'mobile'; this.deviceType !== 'mobile';
this.showFooter = this.showFooter =
(this.currentRoute === 'blog' || (this.currentRoute === routes.blog ||
this.currentRoute === this.routerLinkFeatures[0].slice(1) || this.currentRoute === routes.features ||
this.currentRoute === this.routerLinkMarkets[0].slice(1) || this.currentRoute === routes.markets ||
this.currentRoute === 'open' || this.currentRoute === publicRoutes.openStartup.path ||
this.currentRoute === 'p' || this.currentRoute === routes.public ||
this.currentRoute === this.routerLinkPricing[0].slice(1) || this.currentRoute === routes.pricing ||
this.currentRoute === this.routerLinkRegister[0].slice(1) || this.currentRoute === publicRoutes.register.path ||
this.currentRoute === 'start') && this.currentRoute === routes.start) &&
this.deviceType !== 'mobile'; this.deviceType !== 'mobile';
if (this.deviceType === 'mobile') { if (this.deviceType === 'mobile') {

80
package-lock.json
View File

@ -30,7 +30,7 @@
"@dfinity/principal": "0.15.7", "@dfinity/principal": "0.15.7",
"@dinero.js/currencies": "2.0.0-alpha.8", "@dinero.js/currencies": "2.0.0-alpha.8",
"@internationalized/number": "3.6.0", "@internationalized/number": "3.6.0",
"@keyv/redis": "4.3.4", "@keyv/redis": "4.4.0",
"@nestjs/bull": "11.0.2", "@nestjs/bull": "11.0.2",
"@nestjs/cache-manager": "3.0.1", "@nestjs/cache-manager": "3.0.1",
"@nestjs/common": "11.1.3", "@nestjs/common": "11.1.3",
@ -4962,13 +4962,13 @@
} }
}, },
"node_modules/@keyv/redis": { "node_modules/@keyv/redis": {
"version": "4.3.4", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/@keyv/redis/-/redis-4.3.4.tgz", "resolved": "https://registry.npmjs.org/@keyv/redis/-/redis-4.4.0.tgz",
"integrity": "sha512-PLWmawfq9McxEvtHa2Uj5WjI7g6qWtv2eOvXvXJ9tkwEV5vLkqA+pFeZ/0pz9xvP20NQiAkGm4521YJ0DhuFiw==", "integrity": "sha512-n/KEj3S7crVkoykggqsMUtcjNGvjagGPlJYgO/r6m9hhGZfhp1txJElHxcdJ1ANi/LJoBuOSILj15g6HD2ucqQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"cluster-key-slot": "^1.1.2", "@redis/client": "^1.6.0",
"redis": "^4.7.0" "cluster-key-slot": "^1.1.2"
}, },
"engines": { "engines": {
"node": ">= 18" "node": ">= 18"
@ -9875,19 +9875,10 @@
"@prisma/debug": "6.8.2" "@prisma/debug": "6.8.2"
} }
}, },
"node_modules/@redis/bloom": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz",
"integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==",
"license": "MIT",
"peerDependencies": {
"@redis/client": "^1.0.0"
}
},
"node_modules/@redis/client": { "node_modules/@redis/client": {
"version": "1.6.0", "version": "1.6.1",
"resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.0.tgz", "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.6.1.tgz",
"integrity": "sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==", "integrity": "sha512-/KCsg3xSlR+nCK8/8ZYSknYxvXHwubJrU82F3Lm1Fp6789VQ0/3RJKfsmRXjqfaTA++23CvC3hqmqe/2GEt6Kw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"cluster-key-slot": "1.1.2", "cluster-key-slot": "1.1.2",
@ -9898,42 +9889,6 @@
"node": ">=14" "node": ">=14"
} }
}, },
"node_modules/@redis/graph": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz",
"integrity": "sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==",
"license": "MIT",
"peerDependencies": {
"@redis/client": "^1.0.0"
}
},
"node_modules/@redis/json": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.7.tgz",
"integrity": "sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==",
"license": "MIT",
"peerDependencies": {
"@redis/client": "^1.0.0"
}
},
"node_modules/@redis/search": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@redis/search/-/search-1.2.0.tgz",
"integrity": "sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==",
"license": "MIT",
"peerDependencies": {
"@redis/client": "^1.0.0"
}
},
"node_modules/@redis/time-series": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.1.0.tgz",
"integrity": "sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==",
"license": "MIT",
"peerDependencies": {
"@redis/client": "^1.0.0"
}
},
"node_modules/@rollup/rollup-android-arm-eabi": { "node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.34.8", "version": "4.34.8",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
@ -29778,23 +29733,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/redis": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/redis/-/redis-4.7.0.tgz",
"integrity": "sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==",
"license": "MIT",
"workspaces": [
"./packages/*"
],
"dependencies": {
"@redis/bloom": "1.2.0",
"@redis/client": "1.6.0",
"@redis/graph": "1.1.1",
"@redis/json": "1.0.7",
"@redis/search": "1.2.0",
"@redis/time-series": "1.1.0"
}
},
"node_modules/redis-errors": { "node_modules/redis-errors": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",

2
package.json
View File

@ -76,7 +76,7 @@
"@dfinity/principal": "0.15.7", "@dfinity/principal": "0.15.7",
"@dinero.js/currencies": "2.0.0-alpha.8", "@dinero.js/currencies": "2.0.0-alpha.8",
"@internationalized/number": "3.6.0", "@internationalized/number": "3.6.0",
"@keyv/redis": "4.3.4", "@keyv/redis": "4.4.0",
"@nestjs/bull": "11.0.2", "@nestjs/bull": "11.0.2",
"@nestjs/cache-manager": "3.0.1", "@nestjs/cache-manager": "3.0.1",
"@nestjs/common": "11.1.3", "@nestjs/common": "11.1.3",

Write Preview
Loading…
Cancel
Save