diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index cd4fa0bae..a90e61a77 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -75,6 +75,7 @@ import { set, setDayOfYear, subDays, + subMonths, subYears } from 'date-fns'; import { isEmpty, last, sortBy, uniq, uniqBy } from 'lodash'; @@ -1599,6 +1600,18 @@ export class PortfolioService { setDayOfYear(new Date().setHours(0, 0, 0, 0), 1) ]); break; + case '1w': + portfolioStart = max([ + portfolioStart, + subDays(new Date().setHours(0, 0, 0, 0), 7) + ]); + break; + case '1m': + portfolioStart = max([ + portfolioStart, + subMonths(new Date().setHours(0, 0, 0, 0), 1) + ]); + break; case '1y': portfolioStart = max([ portfolioStart, diff --git a/apps/api/src/app/user/update-user-setting.dto.ts b/apps/api/src/app/user/update-user-setting.dto.ts index f618e42b1..35b61e0bd 100644 --- a/apps/api/src/app/user/update-user-setting.dto.ts +++ b/apps/api/src/app/user/update-user-setting.dto.ts @@ -30,7 +30,7 @@ export class UpdateUserSettingDto { @IsOptional() colorScheme?: ColorScheme; - @IsIn(['1d', '1y', '5y', 'max', 'ytd']) + @IsIn(['1d', '1w', '1m', '1y', '5y', 'max', 'ytd']) @IsOptional() dateRange?: DateRange; diff --git a/apps/client/src/app/components/toggle/toggle.component.ts b/apps/client/src/app/components/toggle/toggle.component.ts index 622c1e144..a21044e50 100644 --- a/apps/client/src/app/components/toggle/toggle.component.ts +++ b/apps/client/src/app/components/toggle/toggle.component.ts @@ -20,6 +20,8 @@ export class ToggleComponent implements OnChanges, OnInit { public static DEFAULT_DATE_RANGE_OPTIONS: ToggleOption[] = [ { label: $localize`Today`, value: '1d' }, { label: $localize`YTD`, value: 'ytd' }, + { label: $localize`1W`, value: '1w' }, + { label: $localize`1M`, value: '1m' }, { label: $localize`1Y`, value: '1y' }, { label: $localize`5Y`, value: '5y' }, { label: $localize`Max`, value: 'max' } diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html index 5ea587c9b..4734ffbe3 100644 --- a/apps/client/src/app/pages/features/features-page.html +++ b/apps/client/src/app/pages/features/features-page.html @@ -146,8 +146,9 @@

Check the rate of return of your portfolio for - Today, YTD, 1Y, - 5Y, and Max. + Today, YTD, 1W, + 1M, 1Y, 5Y, and + Max.

diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index d61afac5d..79b53dd06 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -1186,7 +1186,7 @@ Registrieren apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -1600,7 +1600,7 @@ 1J apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1608,7 +1608,7 @@ 5J apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1616,7 +1616,7 @@ Max apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -1956,7 +1956,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3500,7 +3500,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3992,7 +3992,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4564,7 +4564,7 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4572,7 +4572,7 @@ Marktstimmung apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4580,7 +4580,7 @@ Statische Analyse apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4588,7 +4588,7 @@ Mehrsprachigkeit apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4596,7 +4596,7 @@ Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14275,6 +14275,22 @@ 126 + + 1w + 1W + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index 895367d90..20b386b7a 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -1187,7 +1187,7 @@ Empezar apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -1598,7 +1598,7 @@ 1 año apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1606,7 +1606,7 @@ 5 años apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1614,7 +1614,7 @@ Máximo apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -1954,7 +1954,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3498,7 +3498,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3990,7 +3990,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4562,7 +4562,7 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4570,7 +4570,7 @@ Market Mood apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4578,7 +4578,7 @@ Static Analysis apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4586,7 +4586,7 @@ Multi-Language apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4594,7 +4594,7 @@ Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14273,6 +14273,22 @@ 126 + + 1w + 1S + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index 1e8435552..28f52b3f9 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -1937,7 +1937,7 @@ 1A apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1945,7 +1945,7 @@ 5A apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1953,7 +1953,7 @@ Max apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -2245,7 +2245,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -2305,7 +2305,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3105,7 +3105,7 @@ Démarrer apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -3989,7 +3989,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4561,7 +4561,7 @@ Mode Sombre apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4569,7 +4569,7 @@ Sentiment du Marché apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4577,7 +4577,7 @@ Analyse statique apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4585,7 +4585,7 @@ Multi-Langue apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4593,7 +4593,7 @@ Logiciel Open Source apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14272,6 +14272,22 @@ 126 + + 1w + 1S + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 5150e1abe..00b1024cb 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -1187,7 +1187,7 @@ Inizia apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -1598,7 +1598,7 @@ 1 anno apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1606,7 +1606,7 @@ 5 anni apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1614,7 +1614,7 @@ Massimo apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -1954,7 +1954,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3498,7 +3498,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3990,7 +3990,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4562,7 +4562,7 @@ Modalità scura apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4570,7 +4570,7 @@ Umore del mercato apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4578,7 +4578,7 @@ Analisi statica apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4586,7 +4586,7 @@ Multilingue apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4594,7 +4594,7 @@ Software open source apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14273,6 +14273,22 @@ 126 + + 1w + 1S + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index e09c9fa2d..a6286950c 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -1186,7 +1186,7 @@ Aan de slag apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -1597,7 +1597,7 @@ 1J apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1605,7 +1605,7 @@ 5J apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1613,7 +1613,7 @@ Max apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -1953,7 +1953,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3497,7 +3497,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3989,7 +3989,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4561,7 +4561,7 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4569,7 +4569,7 @@ Marktsentiment apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4577,7 +4577,7 @@ Statische Analyse apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4585,7 +4585,7 @@ Meerdere talen apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4593,7 +4593,7 @@ Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14272,6 +14272,22 @@ 126 + + 1w + 1W + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.pl.xlf b/apps/client/src/locales/messages.pl.xlf index 3b1c881ec..6cdcd548b 100644 --- a/apps/client/src/locales/messages.pl.xlf +++ b/apps/client/src/locales/messages.pl.xlf @@ -1422,7 +1422,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3508,7 +3508,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -3628,7 +3628,7 @@ 1Y apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -3636,7 +3636,7 @@ 5Y apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -3644,7 +3644,7 @@ Max apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -3860,7 +3860,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -4320,7 +4320,7 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4328,7 +4328,7 @@ Market Mood apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4336,7 +4336,7 @@ Static Analysis apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4344,7 +4344,7 @@ Multi-Language apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4352,7 +4352,7 @@ Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -4360,7 +4360,7 @@ Get Started apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -14275,6 +14275,22 @@ 126 + + 1w + 1T + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index 9819d6439..d86106ba3 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -1921,7 +1921,7 @@ 1A apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -1929,7 +1929,7 @@ 5A apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -1937,7 +1937,7 @@ Máx apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -2229,7 +2229,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3001,7 +3001,7 @@ Começar apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -3553,7 +3553,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3989,7 +3989,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -4561,7 +4561,7 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -4569,7 +4569,7 @@ Market Mood apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -4577,7 +4577,7 @@ Static Analysis apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -4585,7 +4585,7 @@ Multi-Language apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -4593,7 +4593,7 @@ Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -14272,6 +14272,22 @@ 126 + + 1w + 1S + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.tr.xlf b/apps/client/src/locales/messages.tr.xlf index e1b118921..74b2d0d21 100644 --- a/apps/client/src/locales/messages.tr.xlf +++ b/apps/client/src/locales/messages.tr.xlf @@ -1398,7 +1398,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3349,7 +3349,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -3469,7 +3469,7 @@ 1Y apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 @@ -3477,7 +3477,7 @@ 5Y apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 @@ -3485,7 +3485,7 @@ Maks. apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -3853,7 +3853,7 @@ Karanlık Mod apps/client/src/app/pages/features/features-page.html - 179 + 180 @@ -3865,7 +3865,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -3873,7 +3873,7 @@ Piyasa Modu apps/client/src/app/pages/features/features-page.html - 209 + 210 @@ -3881,7 +3881,7 @@ Statik Analiz apps/client/src/app/pages/features/features-page.html - 227 + 228 @@ -3889,7 +3889,7 @@ Çoklu Dil apps/client/src/app/pages/features/features-page.html - 245 + 246 @@ -3897,7 +3897,7 @@ Açık Kaynak Yazılım apps/client/src/app/pages/features/features-page.html - 279 + 280 @@ -3905,7 +3905,7 @@ Başla apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -14272,6 +14272,22 @@ 126 + + 1w + 1H + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1m + 1A + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index 2fd83f937..0cd5e38ac 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -1400,7 +1400,7 @@ apps/client/src/app/pages/features/features-page.html - 260 + 261 @@ -3316,7 +3316,7 @@ apps/client/src/app/pages/features/features-page.html - 161 + 162 apps/client/src/app/pages/pricing/pricing-page.html @@ -3426,21 +3426,21 @@ 1Y apps/client/src/app/components/toggle/toggle.component.ts - 23 + 25 5Y apps/client/src/app/components/toggle/toggle.component.ts - 24 + 26 Max apps/client/src/app/components/toggle/toggle.component.ts - 25 + 27 @@ -3630,7 +3630,7 @@ apps/client/src/app/pages/features/features-page.html - 192 + 193 @@ -4042,42 +4042,42 @@ Dark Mode apps/client/src/app/pages/features/features-page.html - 179 + 180 Market Mood apps/client/src/app/pages/features/features-page.html - 209 + 210 Static Analysis apps/client/src/app/pages/features/features-page.html - 227 + 228 Multi-Language apps/client/src/app/pages/features/features-page.html - 245 + 246 Open Source Software apps/client/src/app/pages/features/features-page.html - 279 + 280 Get Started apps/client/src/app/pages/features/features-page.html - 299 + 300 apps/client/src/app/pages/public/public-page.html @@ -13674,6 +13674,20 @@ 126 + + 1W + + apps/client/src/app/components/toggle/toggle.component.ts + 23 + + + + 1M + + apps/client/src/app/components/toggle/toggle.component.ts + 24 + + - + \ No newline at end of file diff --git a/libs/common/src/lib/types/date-range.type.ts b/libs/common/src/lib/types/date-range.type.ts index afee7b100..3e41de83b 100644 --- a/libs/common/src/lib/types/date-range.type.ts +++ b/libs/common/src/lib/types/date-range.type.ts @@ -1 +1 @@ -export type DateRange = '1d' | '1y' | '5y' | 'max' | 'ytd'; +export type DateRange = '1d' | '1y' | '1w' | '1m' | '5y' | 'max' | 'ytd';