Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-11 09:45:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #245 from Philreact/bugfix/api-popup-conflict-with-tour

Browse Source 
disable tour with api popup
This commit is contained in:
AlphaX-Projects 2024-01-11 14:20:07 +01:00 committed by GitHub
commit d901a5d2da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/apiKeyUtils.js
View File

@ -35,6 +35,12 @@ export const checkApiKey = async (nodeConfig) => {
else {
console.log("API key test failed");
mykey.show();
this.dispatchEvent(
new CustomEvent('disable-tour', {
bubbles: true,
composed: true
}),
);
}
}

19
core/src/components/beginner-tour/tour-component.js
View File

@ -17,6 +17,7 @@ class TourComponent extends connect(store)(LitElement) {
getElements: { attribute: false },
dialogOpenedCongrats: { type: Boolean },
hasViewedTour: { type: Boolean },
disableTour: {type: Boolean}
};
}
@ -28,6 +29,8 @@ class TourComponent extends connect(store)(LitElement) {
this.hasName = false;
this.nodeUrl = this.getNodeUrl();
this.myNode = this.getMyNode();
this._disableTour = this._disableTour.bind(this)
this.disableTour = false
}
static get styles() {
@ -139,12 +142,21 @@ class TourComponent extends connect(store)(LitElement) {
this.dialogOpenedCongrats = true;
}
_disableTour(){
this.disableTour = true
driver.reset()
}
connectedCallback() {
super.connectedCallback();
window.addEventListener(
'open-welcome-modal-sync',
this._controlOpenWelcomeModal
);
window.addEventListener(
'disable-tour',
this._disableTour
);
}
disconnectedCallback() {
@ -152,7 +164,10 @@ class TourComponent extends connect(store)(LitElement) {
'open-welcome-modal-sync',
this._controlOpenWelcomeModal
);
window.addEventListener(
'disable-tour',
this._disableTour
);
super.disconnectedCallback();
}
@ -216,7 +231,7 @@ class TourComponent extends connect(store)(LitElement) {
res();
}, 1000);
});
if (!this.hasViewedTour) {
if (!this.hasViewedTour && this.disableTour !== true) {
const elements = this.getElements();
let steps = [
{