From 0b2f6a312cbcfa1ec4ac24f54d503b46813c4d9d Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 30 Sep 2023 07:11:10 +0200 Subject: [PATCH 1/2] Sort imports (#2399) --- apps/api/src/app/portfolio/portfolio.service.ts | 4 ++-- .../src/app/directives/file-drop/file-drop.directive.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 228ab18f6..e9d0b2792 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -50,13 +50,13 @@ import { Inject, Injectable } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; import { Account, + Type as ActivityType, AssetClass, DataSource, Order, Platform, Prisma, - Tag, - Type as ActivityType + Tag } from '@prisma/client'; import Big from 'big.js'; import { diff --git a/apps/client/src/app/directives/file-drop/file-drop.directive.ts b/apps/client/src/app/directives/file-drop/file-drop.directive.ts index 65f3ed23a..129f6f251 100644 --- a/apps/client/src/app/directives/file-drop/file-drop.directive.ts +++ b/apps/client/src/app/directives/file-drop/file-drop.directive.ts @@ -1,4 +1,4 @@ -import { Directive, HostListener, Output, EventEmitter } from '@angular/core'; +import { Directive, EventEmitter, HostListener, Output } from '@angular/core'; @Directive({ selector: '[gfFileDrop]' From 19ea4479ffddcec900170d3303ce81ce7e92561b Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 30 Sep 2023 07:11:44 +0200 Subject: [PATCH 2/2] Bugfix/fix link on features page (#2398) * Fix link * Update changelog --- CHANGELOG.md | 6 ++++++ .../src/app/pages/features/features-page.component.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 915184d0a..abf1dd3d2 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 a link on the features page + ## 2.6.0 - 2023-09-26 ### Added diff --git a/apps/client/src/app/pages/features/features-page.component.ts b/apps/client/src/app/pages/features/features-page.component.ts index 07ae360fb..3ec35c91d 100644 --- a/apps/client/src/app/pages/features/features-page.component.ts +++ b/apps/client/src/app/pages/features/features-page.component.ts @@ -15,6 +15,7 @@ export class FeaturesPageComponent implements OnDestroy { public hasPermissionForSubscription: boolean; public info: InfoItem; public routerLinkRegister = ['/' + $localize`register`]; + public routerLinkResources = ['/' + $localize`resources`]; public user: User; private unsubscribeSubject = new Subject();