From d83c2f8ad3880360a4ea85e9946bf1c3bf683790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Podkalicki?= <38037054+PawelPodkalicki@users.noreply.github.com> Date: Mon, 30 May 2022 09:25:49 +0200 Subject: [PATCH 1/5] Fix DCL builder link (#895) --- CHANGELOG.md | 2 ++ .../publisher-list-item/publisher-list-item.component.ts | 3 ++- src/app/models/enum/link.enum.ts | 2 ++ src/app/publisher/site-details/site-details.component.ts | 7 ++++--- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5e022269..feab3a3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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 +- DCL builder link ## [1.17.0] - 2022-05-19 ### Added diff --git a/src/app/admin/users/publisher-list/publisher-list-item/publisher-list-item.component.ts b/src/app/admin/users/publisher-list/publisher-list-item/publisher-list-item.component.ts index 077ecfdf7..4231877b2 100644 --- a/src/app/admin/users/publisher-list/publisher-list-item/publisher-list-item.component.ts +++ b/src/app/admin/users/publisher-list/publisher-list-item/publisher-list-item.component.ts @@ -9,6 +9,7 @@ import { SessionService } from '../../../../session.service' import { pageRankInfoEnum } from 'models/enum/site.enum' import { Store } from '@ngrx/store' import { AppState } from 'models/app-state.model' +import { DECENTRALAND_BUILDER } from 'models/enum/link.enum' import { User } from 'models/user.model' import { CryptovoxelsConverter } from 'common/utilities/targeting-converter/cryptovoxels-converter' import { DecentralandConverter } from 'common/utilities/targeting-converter/decentraland-converter' @@ -71,7 +72,7 @@ export class PublisherListItemComponent implements OnInit { if (PublisherListItemComponent.isDecentralandDomain(domain)) { if ('scene-0-0.decentraland.org' === domain) { presentedName = 'DCL Builder' - url = '' + url = DECENTRALAND_BUILDER } else { const converter = new DecentralandConverter() presentedName = `Decentraland ${converter.decodeValue(domain)}` diff --git a/src/app/models/enum/link.enum.ts b/src/app/models/enum/link.enum.ts index cdd199eaf..2797ca763 100644 --- a/src/app/models/enum/link.enum.ts +++ b/src/app/models/enum/link.enum.ts @@ -6,5 +6,7 @@ export const ADD_UNIT_DECENTRALAND_SMART = 'https://adshar.es/dclsmart' export const ADSHARES_UNITS = 'https://adshares.net/units' // Adshares wallet installation instruction export const ADSHARES_WALLET = 'https://adshares.net/wallet' +// Decentraland builder +export const DECENTRALAND_BUILDER = 'https://builder.decentraland.org/' // Metamask wallet installation instruction export const METAMASK_WALLET = 'https://metamask.io/' diff --git a/src/app/publisher/site-details/site-details.component.ts b/src/app/publisher/site-details/site-details.component.ts index b7ca242de..256f95119 100644 --- a/src/app/publisher/site-details/site-details.component.ts +++ b/src/app/publisher/site-details/site-details.component.ts @@ -36,6 +36,7 @@ import { } from 'publisher/dialogs/site-code-metaverse-dialog/site-code-metaverse-dialog.component' import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; import { CryptovoxelsConverter } from 'common/utilities/targeting-converter/cryptovoxels-converter' +import { DECENTRALAND_BUILDER } from 'models/enum/link.enum' @Component({ selector: 'app-site-details', @@ -139,9 +140,9 @@ export class SiteDetailsComponent extends HandleSubscription implements OnInit { private getSiteLinkUrl(): string { if ('metaverse' === this.site.medium) { if ('decentraland' === this.site.vendor) { - return 'DCL Builder' !== this.site.name - ? new DecentralandConverter().convertBackendUrlToValidUrl(this.site.url) - : '' + return 'DCL Builder' === this.site.name + ? DECENTRALAND_BUILDER + : new DecentralandConverter().convertBackendUrlToValidUrl(this.site.url) } else if ('cryptovoxels' === this.site.vendor) { return new CryptovoxelsConverter().convertBackendUrlToValidUrl(this.site.url) } From 6f613ed3ea3026f4c19cadf3160bb0c0be9c1f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Podkalicki?= <38037054+PawelPodkalicki@users.noreply.github.com> Date: Mon, 30 May 2022 09:31:15 +0200 Subject: [PATCH 2/5] Fix newsletter subscription (#897) Co-authored-by: Maciej Pilarczyk --- CHANGELOG.md | 1 + src/app/settings/settings.service.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index feab3a3c9..7e3ac28c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed +- Newsletter subscription - DCL builder link ## [1.17.0] - 2022-05-19 diff --git a/src/app/settings/settings.service.ts b/src/app/settings/settings.service.ts index cdbf21e88..d92b99893 100644 --- a/src/app/settings/settings.service.ts +++ b/src/app/settings/settings.service.ts @@ -71,7 +71,7 @@ export class SettingsService { } newsletter (isSubscribed: boolean): Observable { - return this.http.post(`${environment.authUrl}/newsletter/subscription`, + return this.http.post(`${environment.apiUrl}/newsletter/subscription`, { isSubscribed }) } From 056e239c66d2bbc412d4b8d00f8f8cd1c3cd8424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Podkalicki?= <38037054+PawelPodkalicki@users.noreply.github.com> Date: Mon, 30 May 2022 17:14:19 +0200 Subject: [PATCH 3/5] Fix edit site's option for manual approval (#900) --- CHANGELOG.md | 1 + .../edit-site-additional-targeting.component.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e3ac28c2..7f9acc2ba 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 ### Fixed - Newsletter subscription - DCL builder link +- Edit site's option for manual approval ## [1.17.0] - 2022-05-19 ### Added diff --git a/src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.ts b/src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.ts index 964012422..a7a0c6baf 100644 --- a/src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.ts +++ b/src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.ts @@ -44,9 +44,7 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscription imp super(); } - ngOnInit() { - const acceptBannersManuallyOption = this.route.snapshot.data.siteOptions.acceptBannersManually - this.isCheckedOnlyAcceptedBanners = !!acceptBannersManuallyOption + ngOnInit(): void { this.createSiteMode = !!this.router.url.match('/create-site/'); this.targetingOptionsToAdd = cloneDeep(this.route.parent.snapshot.data.filteringOptions); this.targetingOptionsToExclude = cloneDeep(this.route.parent.snapshot.data.filteringOptions); @@ -136,6 +134,12 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscription imp this.addedItems = [...filtering.requires]; this.showRequiresSection = this.addedItems.length > 0; this.excludedItems = [...filtering.excludes]; + + if (this.createSiteMode) { + this.isCheckedOnlyAcceptedBanners = !!this.route.snapshot.data.siteOptions.acceptBannersManually + } else { + this.isCheckedOnlyAcceptedBanners = lastEditedSite.onlyAcceptedBanners + } }); this.subscriptions.push(lastSiteSubscription); } From 244a8be4076b0590461ea1e1679c1cae87b296d6 Mon Sep 17 00:00:00 2001 From: Maciej Pilarczyk Date: Mon, 30 May 2022 17:16:21 +0200 Subject: [PATCH 4/5] v1.17.1 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f9acc2ba..5054fa404 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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] + +## [1.17.1] - 2022-05-30 ### Fixed - Newsletter subscription - DCL builder link @@ -415,7 +417,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Publisher features (Sites & AdUnits) -[Unreleased]: https://github.com/adshares/adpanel/compare/v1.17.0...develop +[Unreleased]: https://github.com/adshares/adpanel/compare/v1.17.1...develop +[1.17.1]: https://github.com/adshares/adpanel/compare/v1.17.0...v1.17.1 [1.17.0]: https://github.com/adshares/adpanel/compare/v1.16.1...v1.17.0 [1.16.1]: https://github.com/adshares/adpanel/compare/v1.16.0...v1.16.1 [1.16.0]: https://github.com/adshares/adpanel/compare/v1.15.0...v1.16.0 From d2d9e136aac0586889ea4029eb84985ad79b8076 Mon Sep 17 00:00:00 2001 From: Maciej Pilarczyk Date: Mon, 30 May 2022 17:16:38 +0200 Subject: [PATCH 5/5] v1.17.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 114c3c315..e90d383a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adpanel", - "version": "1.17.0", + "version": "1.17.1", "scripts": { "ng": "ng", "start": "ng serve adshares",