Merge pull request #720 from adshares/develop

v1.4.0

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.0] - 2019-11-22
+### Added
+- Conversions definition
+- Target URL placeholders
+- Pops ad units configuration
+- Site domain requirement
+### Changed
+- Hid Requires section from site filtering
+
 ## [1.2.5] - 2019-10-01
 ### Changed
 - Upgrade @angular/cli to version 1.7.0
@@ -133,7 +142,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Advertiser features (Campaigns & Ads)
 - Publisher features (Sites & AdUnits)
 
-[Unreleased]: https://github.com/adshares/adpanel/compare/v1.2.5...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v1.4.0...develop
+[1.4.0]: https://github.com/adshares/adpanel/compare/v1.2.5...v1.4.0
 [1.2.5]: https://github.com/adshares/adpanel/compare/v1.2.4...v1.2.5
 [1.2.4]: https://github.com/adshares/adpanel/compare/v1.2.1...v1.2.4
 [1.2.1]: https://github.com/adshares/adpanel/compare/v0.11.0...v1.2.1

src/app/admin/dashboard/dashboard.component.ts

@@ -42,7 +42,7 @@ export class DashboardComponent extends HandleSubscription implements OnInit {
       link: '/admin/dashboard/privacy',
       values: [
         {name: 'Privacy', icon: 'assets/images/preferences.svg'},
-        {name: 'Terms and condition', icon: 'assets/images/preferences.svg'},
+        {name: 'Terms and conditions', icon: 'assets/images/preferences.svg'},
       ],
     },
     {

src/app/admin/finances/finances-settings.component.html

@@ -65,7 +65,7 @@ <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Walle
     <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Cold wallet settings</h1>
     <mat-checkbox [checked]="settings.coldWalletIsActive"
                   (change)="updateSettings($event.checked, 'coldWalletIsActive')">
-      Enable Cold Wallet
+      Enable cold wallet
     </mat-checkbox>
   </section>
   <p *ngIf="settings.coldWalletIsActive"

src/app/admin/general-settings/license/license.component.html

@@ -12,25 +12,25 @@ <h1 class="dwmth-heading dwmth-heading--primary"> License </h1>
   <div *ngIf="license !== null; else info">
     <div class="license__inputs-wrapper">
       <app-input type="text"
-                 [label]="'Type'"
+                 label="Type"
                  [readonly]="true"
                  [value]="license.type"
       ></app-input>
       <app-input type="text"
-                 [label]="'Owner'"
+                 label="Owner"
                  [readonly]="true"
                  [value]="license.owner"
       ></app-input>
     </div>
 
     <div class="license__inputs-wrapper">
       <app-input type="text"
-                 [label]="'Date Start'"
+                 label="Start date"
                  [readonly]="true"
                  [value]="license.dateStart"
       ></app-input>
       <app-input type="text"
-                 [label]="'Date End'"
+                 label="End date"
                  [readonly]="true"
                  [value]="license.dateEnd"
       ></app-input>

src/app/admin/privacy-and-terms-settings/privacy-and-terms-settings.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="privacy"
       class="dwmth-box--large dwmth-box privacy-and-terms__forms-box">
-  <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Privacy Settings</h1>
+  <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Privacy</h1>
   <p
     class="
       dwmth-copy
@@ -30,7 +30,7 @@ <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Priva
 
 <form [formGroup]="terms"
       class="dwmth-box--large dwmth-box privacy-and-terms__forms-box">
-  <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Terms Settings</h1>
+  <h1 class="dwmth-heading dwmth-heading--primary finances-settings__header">Terms and conditions</h1>
   <p
     class="
       dwmth-copy

src/app/admin/user-reports/user-reports.component.html

@@ -68,7 +68,7 @@ <h1 class="user-reports__title">
         <mat-icon>
           save_alt
         </mat-icon>
-        Download Advertisers Report
+        Download advertisers' report
       </a>
       <a
         class="user-reports__btn"
@@ -79,7 +79,7 @@ <h1 class="user-reports__title">
         <mat-icon>
           save_alt
         </mat-icon>
-        Download Publishers Report
+        Download publishers' report
       </a>
     </div>
   </div>

src/app/advertiser/advertiser-routing.module.ts

@@ -4,6 +4,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { AdvertiserComponent } from './advertiser.component';
 import { EditCampaignComponent } from './edit-campaign/edit-campaign.component';
 import { EditCampaignBasicInformationComponent } from './edit-campaign/edit-campaign-basic-info/edit-campaign-basic-information.component';
+import { EditCampaignConversionComponent } from './edit-campaign/edit-campaign-conversion/edit-campaign-conversion.component';
 import { EditCampaignAdditionalTargetingComponent } from './edit-campaign/edit-campaign-additional-targeting/edit-campaign-additional-targeting.component';
 import { EditCampaignCreateAdsComponent } from './edit-campaign/edit-campaign-create-ads/edit-campaign-create-ads.component';
 import { EditCampaignSummaryComponent } from './edit-campaign/edit-campaign-summary/edit-campaign-summary.component';
@@ -64,6 +65,10 @@ const advertiserRoutes: Routes = [
             path: 'basic-information',
             component: EditCampaignBasicInformationComponent,
           },
+          {
+            path: 'conversion',
+            component: EditCampaignConversionComponent,
+          },
           {
             path: 'additional-targeting',
             component: EditCampaignAdditionalTargetingComponent,

src/app/advertiser/advertiser.module.ts

@@ -6,20 +6,23 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { MatInputModule } from '@angular/material';
+import { MatCheckboxModule, MatInputModule } from '@angular/material';
 import { MatSelectModule } from '@angular/material/select';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatTabsModule } from '@angular/material/tabs';
 import { FileUploadModule } from 'ng2-file-upload';
-import { OwlDateTimeModule, OwlNativeDateTimeModule, OWL_DATE_TIME_FORMATS } from 'ng-pick-datetime';
+import { OWL_DATE_TIME_FORMATS, OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime';
 import { OwlMomentDateTimeModule } from 'ng-pick-datetime-moment';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { AppCommonModule } from 'common/common.module';
 import { AdvertiserComponent } from './advertiser.component';
 import { AdvertiserRoutingModule } from './advertiser-routing.module';
 import { EditCampaignComponent } from './edit-campaign/edit-campaign.component';
 import { CampaignListComponent } from './campaign-list/campaign-list.component';
 import { CampaignListItemComponent } from './campaign-list/campaign-list-item/campaign-list-item.component';
 import { EditCampaignBasicInformationComponent } from './edit-campaign/edit-campaign-basic-info/edit-campaign-basic-information.component';
+import { EditCampaignConversionComponent } from './edit-campaign/edit-campaign-conversion/edit-campaign-conversion.component';
 import { EditCampaignAdditionalTargetingComponent } from './edit-campaign/edit-campaign-additional-targeting/edit-campaign-additional-targeting.component';
 import { EditCampaignCreateAdsComponent } from './edit-campaign/edit-campaign-create-ads/edit-campaign-create-ads.component';
 import { EditCampaignSummaryComponent } from './edit-campaign/edit-campaign-summary/edit-campaign-summary.component';
@@ -28,32 +31,32 @@ import { CampaignDetailsComponent } from './campaign-details/campaign-details.co
 import { AdListComponent } from './campaign-details/ad-list/ad-list.component';
 import { AdListItemComponent } from './campaign-details/ad-list/ad-list-item/ad-list-item.component';
 
-import { CampaignBudgetPerDayPipe } from "common/pipes/campaign-budget-per-day.pipe";
+import { CampaignBudgetPerDayPipe } from 'common/pipes/campaign-budget-per-day.pipe';
 import { AdvertiserGuard } from './advertiser-guard.service';
 import { CampaignResolver } from './resolvers/campaign.resolver';
 import { TargetingCriteriaResolver } from './resolvers/targeting-criteria.resolver';
-import {
-  DATE_AND_TIME_PICKER_FORMATS
-} from "common/utilities/consts";
-
+import { DATE_AND_TIME_PICKER_FORMATS } from 'common/utilities/consts';
 
 
 const matModules = [
+  MatCheckboxModule,
   MatExpansionModule,
   MatFormFieldModule,
   MatMomentDateModule,
   MatDatepickerModule,
   MatInputModule,
   MatMenuModule,
-  MatSelectModule
+  MatSelectModule,
+  MatTabsModule,
 ];
 
 const editCampaignComponents = [
   EditCampaignComponent,
   EditCampaignBasicInformationComponent,
+  EditCampaignConversionComponent,
   EditCampaignAdditionalTargetingComponent,
   EditCampaignCreateAdsComponent,
-  EditCampaignSummaryComponent
+  EditCampaignSummaryComponent,
 ];
 
 const advertiserComponents = [
@@ -63,7 +66,7 @@ const advertiserComponents = [
   DashboardComponent,
   CampaignDetailsComponent,
   AdListComponent,
-  AdListItemComponent
+  AdListItemComponent,
 ];
 
 @NgModule({
@@ -72,25 +75,26 @@ const advertiserComponents = [
     HttpModule,
     AppCommonModule,
     AdvertiserRoutingModule,
+    FontAwesomeModule,
     FormsModule,
     ReactiveFormsModule,
     FileUploadModule,
     OwlDateTimeModule,
     OwlNativeDateTimeModule,
     OwlMomentDateTimeModule,
-    ...matModules
+    ...matModules,
   ],
   providers: [
     AdvertiserGuard,
     CampaignResolver,
     TargetingCriteriaResolver,
-    {provide: OWL_DATE_TIME_FORMATS, useValue: DATE_AND_TIME_PICKER_FORMATS}
+    {provide: OWL_DATE_TIME_FORMATS, useValue: DATE_AND_TIME_PICKER_FORMATS},
   ],
 
   declarations: [
     CampaignBudgetPerDayPipe,
     ...advertiserComponents,
-    ...editCampaignComponents
+    ...editCampaignComponents,
   ]
 })
 export class AdvertiserModule {

src/app/advertiser/advertiser.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Store } from "@ngrx/store";
 import { environment } from 'environments/environment';
-import { Campaign, CampaignTotalsResponse } from 'models/campaign.model';
+import { Campaign, CampaignConversion, CampaignTotalsResponse } from 'models/campaign.model';
 import { TargetingOption } from 'models/targeting-option.model';
 import { parseTargetingForBackend } from 'common/components/targeting/targeting.helpers';
 import { NavigationStart, Router } from "@angular/router";
@@ -59,7 +59,6 @@ export class AdvertiserService {
       const targetingObject = parseTargetingForBackend(campaign.targetingArray);
       Object.assign(campaign, {targeting: targetingObject});
     }
-
     return this.http.patch<Campaign>(`${environment.apiUrl}/campaigns/${campaign.id}`, {campaign});
   }