Merge develop

This commit is contained in:
Pieter Vander Vennet 2021-10-08 04:40:33 +02:00
commit 38dcf3578c
26 changed files with 20512 additions and 86 deletions

View file

@ -57,6 +57,19 @@ export default class ImportButton extends Toggle {
new Combine([button, appliedTags]).SetClass("flex flex-col"),
State.state.featurePipeline.runningQuery
)
super(t.hasBeenImported, withLoadingCheck, isImported)
const importButton = new Toggle(t.hasBeenImported, withLoadingCheck, isImported)
const pleaseLoginButton =
new Toggle(t.pleaseLogin.Clone()
.onClick(() => State.state.osmConnection.AttemptLogin())
.SetClass("login-button-friendly"),
undefined,
State.state.featureSwitchUserbadge)
super(importButton,
pleaseLoginButton,
State.state.osmConnection.isLoggedIn
)
}
}