Skip to content

Commit

Permalink
Merge pull request #8462 from blockframes/change-requests-merge-back-2
Browse files Browse the repository at this point in the history
change requests merge back 2
  • Loading branch information
RemcoSimonides committed May 13, 2022
2 parents af293a8 + b6753b5 commit ed67f5a
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 28 deletions.
22 changes: 11 additions & 11 deletions apps/festival/festival/src/app/dashboard/home/home.component.html
Expand Up @@ -31,20 +31,20 @@ <h3>{{ title.title.international }}</h3>
<analytics-pie-chart class="surface" carouselItem [data]="orgActivityOfPopularTitle$ | async"></analytics-pie-chart>
<analytics-map class="surface" carouselItem [data]="territoryActivityOfPopularTitle$ | async"></analytics-map>
<analytics-line-chart class="surface" carouselItem [eventNames]="interactions" [data]="interactionsOfPopularTitle$ | async">
<mat-icon svgIcon="switch_access_shortcut"></mat-icon>
<div>
<h5>Interactions</h5>
<p class="mat-caption">Learn how people interact with your Title.</p>
</div>
<h5>
<mat-icon svgIcon="switch_access_shortcut"></mat-icon>
<span>Interactions</span>
</h5>
<p class="mat-caption">Learn how people interact with your Title.</p>

</analytics-line-chart>
<analytics-line-chart class="surface" carouselItem [eventNames]="['pageView']" [data]="pageViewsOfPopularTitle$ | async">
<mat-icon svgIcon="visibility"></mat-icon>
<div>
<h5>Film Page Views</h5>
<p class="mat-caption">See how many Buyers viewed your Film Page recently.</p>
</div>
</analytics-line-chart>
<h5>
<mat-icon svgIcon="visibility"></mat-icon>
<span>Film Page Views</span>
</h5>
<p class="mat-caption">See how many Buyers viewed your Film Page recently.</p>
</analytics-line-chart>
</bf-carousel>
</ng-container>

Expand Down
Expand Up @@ -17,16 +17,12 @@ header {
display: flex;
flex-direction: column;

article {
display: flex;

h3 {
margin: auto auto auto 0;
}
}

bf-carousel {
margin-top: 24px;

h5 {
display: flex;
}
}

.see_titles {
Expand Down
Expand Up @@ -2,11 +2,6 @@ analytics-line-chart {
display: flex;
flex-direction: column;

header {
display: flex;
gap: 8px;
}

section {
display: flex;
gap: 16px;
Expand Down
6 changes: 4 additions & 2 deletions libs/analytics/src/lib/components/map/map.component.html
@@ -1,7 +1,9 @@
<header>
<mat-icon svgIcon="landscape"></mat-icon>
<article>
<h5>Split by Company Territory</h5>
<h5>
<mat-icon svgIcon="landscape"></mat-icon>
<span>Split by Company Territory</span>
</h5>
<p class="mat-caption">Learn where are the interested people from.</p>
</article>
<button mat-icon-button *ngIf="selected" (click)="toggleSelect(selected)" matTooltip="Remove selection">
Expand Down
4 changes: 4 additions & 0 deletions libs/analytics/src/lib/components/map/map.component.scss
Expand Up @@ -5,6 +5,10 @@
header {
display: flex;
gap: 8px;

h5 {
display: flex;
}
}

world-map {
Expand Down
@@ -1,7 +1,9 @@
<header>
<mat-icon svgIcon="business"></mat-icon>
<article>
<h5>Split by Company Activity</h5>
<h5>
<mat-icon svgIcon="business"></mat-icon>
<span>Split by Company Activity</span>
</h5>
<p class="mat-caption">Learn who are the users who were interested in this Title.</p>
</article>

Expand Down
Expand Up @@ -6,6 +6,10 @@
header {
display: flex;
gap: 8px;

h5 {
display: flex;
}
}

apx-chart {
Expand Down

0 comments on commit ed67f5a

Please sign in to comment.