Skip to content

Commit 56e7f6b

Browse files
aristatharistath
committed
partial fix for branding-id
1 parent 5957963 commit 56e7f6b

10 files changed

Lines changed: 45 additions & 8 deletions

File tree

‎assets/js/web-components/prpl-badge-progress-bar.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
customElements.define(
1414
'prpl-badge-progress-bar',
1515
class extends HTMLElement {
16-
constructor( badgeId, points, maxPoints ) {
16+
constructor( badgeId, points, maxPoints, brandingId = 0 ) {
1717
// Get parent class properties
1818
super();
1919
badgeId = badgeId || this.getAttribute( 'data-badge-id' );
2020
points = points || this.getAttribute( 'data-points' );
2121
maxPoints = maxPoints || this.getAttribute( 'data-max-points' );
22+
brandingId = brandingId || this.getAttribute( 'data-branding-id' );
2223
const progress = ( points / maxPoints ) * 100;
2324

2425
this.innerHTML = `
@@ -49,6 +50,7 @@ customElements.define(
4950
position: absolute;
5051
left: calc(${ progress }% - 3.75rem);
5152
top: -2.5rem;"
53+
branding-id="${ brandingId }"
5254
></prpl-badge>
5355
</div>
5456
</div>
@@ -93,16 +95,19 @@ const prplUpdatePreviousMonthBadgeProgressBar = ( pointsDiff ) => {
9395
const badgeMaxPoints = progressBar.getAttribute( 'data-max-points' );
9496
const badgeProgress = customElements.get( 'prpl-badge-progress-bar' );
9597
const badgeNewPoints = parseInt( badgePoints ) + pointsDiff;
98+
const brandingId = progressBar.getAttribute( 'data-branding-id' );
9699

97100
// Create a new badge progress bar.
98101
const newProgressBar = new badgeProgress(
99102
badgeId,
100103
badgeNewPoints,
101-
badgeMaxPoints
104+
badgeMaxPoints,
105+
brandingId
102106
);
103107
newProgressBar.setAttribute( 'data-badge-id', badgeId );
104108
newProgressBar.setAttribute( 'data-points', badgeNewPoints );
105109
newProgressBar.setAttribute( 'data-max-points', badgeMaxPoints );
110+
newProgressBar.setAttribute( 'data-branding-id', brandingId );
106111

107112
// Replace the old badge progress bar with the new one.
108113
progressBar.replaceWith( newProgressBar );

‎assets/js/web-components/prpl-badge.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,26 @@
1313
customElements.define(
1414
'prpl-badge',
1515
class extends HTMLElement {
16-
constructor( badgeId, badgeName ) {
16+
constructor( badgeId, badgeName, brandingId = 0 ) {
1717
// Get parent class properties
1818
super();
1919

2020
badgeId = badgeId || this.getAttribute( 'badge-id' );
2121
badgeName = badgeName || this.getAttribute( 'badge-name' );
22+
brandingId = brandingId || this.getAttribute( 'branding-id' );
23+
24+
let url = `${ progressPlannerBadge.remoteServerRootUrl }/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=${ badgeId }`;
25+
if ( brandingId ) {
26+
url += `&branding_id=${ brandingId }`;
27+
}
2228

2329
if ( ! badgeName || 'null' === badgeName ) {
2430
badgeName = `${ prplL10n( 'badge' ) }`;
2531
}
2632

2733
this.innerHTML = `
2834
<img
29-
src="${ progressPlannerBadge.remoteServerRootUrl }/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=${ badgeId }"
35+
src="${ url }"
3036
alt="${ badgeName }"
3137
onerror="this.onerror=null;this.src='${ progressPlannerBadge.placeholderImageUrl }';"
3238
/>

‎assets/js/web-components/prpl-gauge.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ customElements.define(
2626
contentPadding:
2727
'var(--prpl-padding) var(--prpl-padding) calc(var(--prpl-padding) * 2) var(--prpl-padding)',
2828
marginBottom: 'var(--prpl-padding)',
29+
brandingId: 0,
2930
},
3031
content = ''
3132
) {
@@ -60,6 +61,8 @@ customElements.define(
6061
this.getAttribute( 'contentPadding' ) || props.contentPadding;
6162
props.marginBottom =
6263
this.getAttribute( 'marginBottom' ) || props.marginBottom;
64+
props.brandingId =
65+
this.getAttribute( 'branding-id' ) || props.brandingId;
6366

6467
this.innerHTML = `
6568
<div style="padding: ${ props.contentPadding };
@@ -130,15 +133,17 @@ const prplUpdateRaviGauge = ( pointsDiff ) => {
130133
contentPadding:
131134
'var(--prpl-padding) var(--prpl-padding) calc(var(--prpl-padding) * 2) var(--prpl-padding)',
132135
marginBottom: 'var(--prpl-padding)',
136+
brandingId: gaugeProps.brandingId,
133137
},
134-
`<prpl-badge complete="true" badge-id="${ gaugeProps.badgeId }" badge-name="${ gaugeProps.badgeName }"></prpl-badge>`
138+
`<prpl-badge complete="true" badge-id="${ gaugeProps.badgeId }" badge-name="${ gaugeProps.badgeName }" branding-id="${ gaugeProps.brandingId }"></prpl-badge>`
135139
);
136140
gauge.id = gaugeProps.id;
137141
gauge.setAttribute( 'background', gaugeProps.background );
138142
gauge.setAttribute( 'color', gaugeProps.color );
139143
gauge.setAttribute( 'data-max', gaugeProps.max );
140144
gauge.setAttribute( 'data-value', newValue );
141145
gauge.setAttribute( 'data-badge-id', gaugeProps.badgeId );
146+
gauge.setAttribute( 'data-branding-id', gaugeProps.brandingId );
142147

143148
// Replace the old gauge with the new one.
144149
const oldGauge = document.getElementById( gaugeProps.id );

‎views/dashboard-widgets/score.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
complete="true"
2929
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
3030
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
31+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
3132
></prpl-badge>
3233
</progress>
3334
</prpl-gauge>

‎views/page-widgets/badge-streak-content.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131
<div class="prpl-latest-badges-wrapper">
3232
<prpl-gauge background="<?php echo \esc_attr( $prpl_widget_details->get_background() ); ?>" color="var(--prpl-color-accent-orange)">
3333
<progress max="100" value="<?php echo (float) $prpl_widget_details->get_progress()['progress']; ?>">
34-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?> " badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"></prpl-badge>
34+
<prpl-badge
35+
complete="true"
36+
badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>"
37+
badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"
38+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
39+
></prpl-badge>
3540
</progress>
3641
</prpl-gauge>
3742
<div class="prpl-badge-content-wrapper">
@@ -77,6 +82,7 @@ class="prpl-badge"
7782
complete="<?php echo 100 === (int) $prpl_badge->get_progress()['progress'] ? 'true' : 'false'; ?>"
7883
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
7984
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
85+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
8086
></prpl-badge>
8187
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
8288
</span>

‎views/page-widgets/badge-streak-maintenance.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131
<div class="prpl-latest-badges-wrapper">
3232
<prpl-gauge background="<?php echo \esc_attr( $prpl_widget_details->get_background() ); ?>" color="var(--prpl-color-accent-orange)">
3333
<progress max="100" value="<?php echo (float) $prpl_widget_details->get_progress()['progress']; ?>">
34-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>" badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"></prpl-badge>
34+
<prpl-badge
35+
complete="true"
36+
badge-id="<?php echo \esc_attr( $prpl_widget_details->get_id() ); ?>"
37+
badge-name="<?php echo \esc_attr( $prpl_widget_details->get_name() ); ?>"
38+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
39+
></prpl-badge>
3540
</progress>
3641
</prpl-gauge>
3742
<div class="prpl-badge-content-wrapper">
@@ -77,6 +82,7 @@ class="prpl-badge"
7782
complete="<?php echo 100 === (int) $prpl_badge->get_progress()['progress'] ? 'true' : 'false'; ?>"
7883
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
7984
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
85+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
8086
></prpl-badge>
8187
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
8288
</span>

‎views/page-widgets/monthly-badges.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
data-badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
3131
>
3232
<progress max="<?php echo (int) Monthly::TARGET_POINTS; ?>" value="<?php echo (float) $prpl_widget->get_score()['target_score']; ?>">
33-
<prpl-badge complete="true" badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>" badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"></prpl-badge>
33+
<prpl-badge
34+
complete="true"
35+
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
36+
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
37+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
38+
></prpl-badge>
3439
</progress>
3540
</prpl-gauge>
3641

‎views/page-widgets/parts/monthly-badges.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class="prpl-badge prpl-badge-<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
6565
complete="<?php echo 100 === (int) $prpl_badge->progress_callback()['progress'] ? 'true' : 'false'; ?>"
6666
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
6767
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
68+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
6869
></prpl-badge>
6970
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
7071
</span>

‎views/popovers/monthly-badges.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class="prpl-badge"
6464
complete="<?php echo $prpl_badge_completed ? 'true' : 'false'; ?>"
6565
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
6666
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
67+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
6768
></prpl-badge>
6869
<p><?php echo \esc_html( $prpl_badge->get_name() ); ?></p>
6970
</span>

‎views/popovers/parts/badge-streak-badge.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class="prpl-badge"
2121
complete="<?php echo 100 === (int) $prpl_badge_progress['progress'] ? 'true' : 'false'; ?>"
2222
badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
2323
badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
24+
branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
2425
></prpl-badge>
2526
<?php echo \esc_html( $prpl_badge->get_name() ); ?>
2627
</div>

0 commit comments

Comments
 (0)