Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-07-09 03:04:07 -04:00
Code Actions Packages Releases Activity

Fixed #208 - Can't link Patreon account if you've closed the banner.

Browse Source 
Made it possible from the beestat menu; also added a link to the support page on the documentation and reworded some stuff.
This commit is contained in:
Jon Ziebell 2019-12-31 08:23:12 -05:00
parent 08403cedc6
commit edb55c8e2a
4 changed files with 159 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/component/card/patreon.js
View File

@ -41,7 +41,7 @@ beestat.component.card.patreon.prototype.decorate_top_right_ = function(parent)
.set_text_color('#fff') .set_text_color('#fff')
.set_background_hover_color(beestat.style.color.green.light) .set_background_hover_color(beestat.style.color.green.light)
.addEventListener('click', function() { .addEventListener('click', function() {
(new beestat.component.modal.patreon_hide()).render(); (new beestat.component.modal.enjoy_beestat()).render();
}) })
.render(parent); .render(parent);
}; };

7
js/component/header.js
View File

@ -153,6 +153,13 @@ beestat.component.header.prototype.decorate_ = function(parent) {
(new beestat.component.modal.download_data()).render(); (new beestat.component.modal.download_data()).render();
})); }));
menu.add_menu_item(new beestat.component.menu_item()
.set_text('Link Patreon')
.set_icon('patreon')
.set_callback(function() {
(new beestat.component.modal.enjoy_beestat()).render();
}));
menu.add_menu_item(new beestat.component.menu_item() menu.add_menu_item(new beestat.component.menu_item()
.set_text('Log Out') .set_text('Log Out')
.set_icon('exit_to_app') .set_icon('exit_to_app')

33
js/component/modal/patreon_hide.js → js/component/modal/enjoy_beestat.js
View File

@ -1,25 +1,26 @@
/** /**
* Options for hiding the patreon card. * Options for hiding the patreon card.
*/ */
beestat.component.modal.patreon_hide = function() { beestat.component.modal.enjoy_beestat = function() {
beestat.component.modal.apply(this, arguments); beestat.component.modal.apply(this, arguments);
}; };
beestat.extend(beestat.component.modal.patreon_hide, beestat.component.modal); beestat.extend(beestat.component.modal.enjoy_beestat, beestat.component.modal);
beestat.component.modal.patreon_hide.poll_interval_ = 5000; beestat.component.modal.enjoy_beestat.poll_interval_ = 5000;
/** /**
* Decorate * Decorate
* *
* @param {rocket.Elements} parent * @param {rocket.Elements} parent
*/ */
beestat.component.modal.patreon_hide.prototype.decorate_contents_ = function(parent) { beestat.component.modal.enjoy_beestat.prototype.decorate_contents_ = function(parent) {
switch (this.is_active_patron_()) { switch (this.is_active_patron_()) {
case false: case false:
parent.appendChild($.createElement('p').innerText('Your Patreon account is connected but you\'re not currently a supporter. If you recently became a supporter it could take up to 24 hours to update.')); parent.appendChild($.createElement('p').innerText('Your Patreon account is connected but you\'re not currently a supporter. If you recently became a supporter it could take up to 24 hours to update.'));
break; break;
case null: case null:
parent.appendChild($.createElement('p').innerText('Hey there! If you didn\'t notice, beestat doesn\'t run ads, cost money, or sell your data. If you find beestat useful, please consider supporting the project. Your contribution helps pay for servers, storage, and other cool things. Thanks!')); parent.appendChild($.createElement('p').innerHTML('If you didn\'t notice, beestat doesn\'t run ads, charge money, or sell your data. If you find beestat useful, <strong>please consider supporting the project on <a href="https://patreon.com/beestat" target="_blank" class="inverted">Patreon</a>.</strong> Your contribution helps pay for servers, storage, and other cool things. Thanks!'));
parent.appendChild($.createElement('p').innerHTML('Not into Patreon? <a href="https://www.notion.so/beestat/Support-Beestat-bf7f099eb8de486bad51aa6245c00891" target="_blank" class="inverted">Here are some other ways to help</a>.'));
break; break;
} }
}; };
@ -29,18 +30,18 @@ beestat.component.modal.patreon_hide.prototype.decorate_contents_ = function(par
* *
* @return {string} The title. * @return {string} The title.
*/ */
beestat.component.modal.patreon_hide.prototype.get_title_ = function() { beestat.component.modal.enjoy_beestat.prototype.get_title_ = function() {
return 'Don\'t want to see this anymore?'; return 'Enjoy beestat?';
}; };
/** /**
* Close the modal but run some special code first to make sure any running * Close the modal but run some special code first to make sure any running
* interval gets stopped. * interval gets stopped.
*/ */
beestat.component.modal.patreon_hide.prototype.dispose = function() { beestat.component.modal.enjoy_beestat.prototype.dispose = function() {
if (this.is_polling_ === true) { if (this.is_polling_ === true) {
beestat.remove_poll_interval(beestat.component.modal.patreon_hide.poll_interval_); beestat.remove_poll_interval(beestat.component.modal.enjoy_beestat.poll_interval_);
beestat.dispatcher.removeEventListener('poll.patreon_hide'); beestat.dispatcher.removeEventListener('poll.enjoy_beestat');
} }
beestat.component.modal.prototype.dispose.apply(this, arguments); beestat.component.modal.prototype.dispose.apply(this, arguments);
@ -52,7 +53,7 @@ beestat.component.modal.patreon_hide.prototype.dispose = function() {
* @param {number} amount How long. * @param {number} amount How long.
* @param {string} unit The unit (day, month, etc). * @param {string} unit The unit (day, month, etc).
*/ */
beestat.component.modal.patreon_hide.prototype.hide_patreon_card_for_ = function(amount, unit) { beestat.component.modal.enjoy_beestat.prototype.hide_patreon_card_for_ = function(amount, unit) {
beestat.setting( beestat.setting(
'patreon_hide_until', 'patreon_hide_until',
moment().utc() moment().utc()
@ -67,7 +68,7 @@ beestat.component.modal.patreon_hide.prototype.hide_patreon_card_for_ = function
* *
* @return {boolean} true if yes, false if no, null if not connected. * @return {boolean} true if yes, false if no, null if not connected.
*/ */
beestat.component.modal.patreon_hide.prototype.is_active_patron_ = function() { beestat.component.modal.enjoy_beestat.prototype.is_active_patron_ = function() {
var user = beestat.get_user(); var user = beestat.get_user();
if (user.patreon_status !== null) { if (user.patreon_status !== null) {
return (user.patreon_status.patron_status === 'active_patron'); return (user.patreon_status.patron_status === 'active_patron');
@ -80,7 +81,7 @@ beestat.component.modal.patreon_hide.prototype.is_active_patron_ = function() {
* *
* @return {[beestat.component.button]} The buttons. * @return {[beestat.component.button]} The buttons.
*/ */
beestat.component.modal.patreon_hide.prototype.get_buttons_ = function() { beestat.component.modal.enjoy_beestat.prototype.get_buttons_ = function() {
var self = this; var self = this;
var hide = new beestat.component.button() var hide = new beestat.component.button()
@ -95,7 +96,7 @@ beestat.component.modal.patreon_hide.prototype.get_buttons_ = function() {
if (self.is_active_patron_() === null) { if (self.is_active_patron_() === null) {
var link = new beestat.component.button() var link = new beestat.component.button()
.set_text('Link Patreon to hide forever') .set_text('Link Patreon')
.set_background_color(beestat.style.color.green.base) .set_background_color(beestat.style.color.green.base)
.set_background_hover_color(beestat.style.color.green.light) .set_background_hover_color(beestat.style.color.green.light)
.set_text_color('#fff') .set_text_color('#fff')
@ -106,10 +107,10 @@ beestat.component.modal.patreon_hide.prototype.get_buttons_ = function() {
.set_text('Waiting for Patreon...') .set_text('Waiting for Patreon...')
.removeEventListener('click'); .removeEventListener('click');
beestat.add_poll_interval(beestat.component.modal.patreon_hide.poll_interval_); beestat.add_poll_interval(beestat.component.modal.enjoy_beestat.poll_interval_);
self.is_polling_ = true; self.is_polling_ = true;
beestat.dispatcher.addEventListener('poll.patreon_hide', function() { beestat.dispatcher.addEventListener('poll.enjoy_beestat', function() {
switch (self.is_active_patron_()) { switch (self.is_active_patron_()) {
case true: case true:
// Connected and is Patron // Connected and is Patron

2
js/js.php
View File

@ -86,7 +86,7 @@ if($setting->get('environment') === 'dev' || $setting->get('environment') === 'd
echo '<script src="/js/component/modal/help_system.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/help_system.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/help_comparison_settings.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/help_comparison_settings.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/help_temperature_profiles.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/help_temperature_profiles.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/patreon_hide.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/enjoy_beestat.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/runtime_detail_custom.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/runtime_detail_custom.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/thermostat_info.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/thermostat_info.js"></script>' . PHP_EOL;
echo '<script src="/js/component/modal/help_score.js"></script>' . PHP_EOL; echo '<script src="/js/component/modal/help_score.js"></script>' . PHP_EOL;