Merge pull request #2 from smolgrrr/master

Rough UI suggestions
This commit is contained in:
Léo Haf 2024-02-26 22:28:32 +01:00 committed by GitHub
commit 66f69965a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 16 additions and 24 deletions

View File

@ -4,7 +4,7 @@
</a>
<h1 align="center">Bitcoin Node for Umbrel</h1>
<p align="center">
Run a Bitcoin node on your Umbrel personal server. An official app by Umbrel. Powered by Bitcoin Core.
Run a Bitcoin node on your Umbrel personal server. An official app by Umbrel. Powered by Bitcoin Knots.
<br />
<a href="https://umbrel.com"><strong>umbrel.com »</strong></a>
<br />

View File

@ -61,7 +61,7 @@ export default {
this.loadingPollInProgress = true;
// Then check if middleware api and bitcoin core are both up
// Then check if middleware api and Bitcoin Knots are both up
if (this.loadingProgress <= 40) {
this.loadingProgress = 40;
await this.$store.dispatch("system/getApi");

View File

@ -145,7 +145,7 @@ export default {
},
methods: {
async fetchBlocks() {
// don't poll if bitcoin core isn't yet running
// don't poll if Bitcoin Knots isn't yet running
if (!this.isBitcoinCoreOperational) {
return;
}

View File

@ -4,7 +4,7 @@
>
<h3>Connect to Bitcoin Node</h3>
<p class="text-muted mb-md-4">
Connect any wallet that supports Bitcoin Core's RPC or P2P connection to your node using these details.
Connect any wallet that supports Bitcoin Knots's RPC or P2P connection to your node using these details.
</p>
<div class="pb-2 pb-sm-3">
<div class="row flex-column-reverse flex-lg-row">
@ -30,7 +30,7 @@
<b-col cols="12" lg="6">
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core RPC Username</small
>Bitcoin Knots RPC Username</small
></label
>
<input-copy
@ -49,7 +49,7 @@
<b-col cols="12" lg="6">
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core RPC Password</small
>Bitcoin Knots RPC Password</small
></label
>
<input-copy
@ -68,7 +68,7 @@
<b-col cols="12" lg="6">
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core RPC Address (Host)</small
>Bitcoin Knots RPC Address (Host)</small
></label
>
<input-copy
@ -87,7 +87,7 @@
<b-col cols="12" lg="6">
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core RPC Port</small
>Bitcoin Knots RPC Port</small
></label
>
<input-copy
@ -108,7 +108,7 @@
<div v-if="chosenMode === 'p2pLocal' || chosenMode === 'p2pTor'">
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core P2P Address (Host)</small
>Bitcoin Knots P2P Address (Host)</small
></label
>
<div v-if="p2p.torAddress">
@ -120,7 +120,7 @@
</div>
<label class="mb-1 d-block"
><small class="font-weight-bold"
>Bitcoin Core P2P Port</small
>Bitcoin Knots P2P Port</small
></label
>
<div v-if="p2p.port">

View File

@ -2,7 +2,7 @@
<div
class="d-flex flex-column align-items-center justify-content-center min-vh100 p-2"
>
<img alt="Knots" src="@/assets/icon.svg" class="mb-5 logo" />
<!-- <b-spinner class="my-4" variant="primary"></b-spinner> -->
<small v-if="isRestarting" class="text-muted mb-3">Restarting...</small>
<b-progress
@ -52,4 +52,4 @@ export default {
height: 30px;
}
}
</style>
</style>

View File

@ -4,14 +4,6 @@
:style="{ width: `${size}px`, height: `${size}px` }"
@click="$emit('click')"
>
<!-- Popup umbrel logo in the middle of QR code -->
<transition name="qr-logo-popup" appear>
<img
v-show="showLogo"
src="@/assets/umbrel-qr-icon.svg"
class="qr-logo"
/>
</transition>
<!-- QR Code element -->
<qrcode-vue

View File

@ -292,7 +292,7 @@ export default {
);
if (response.data.success) {
// reload the page to reset all state and show loading view while bitcoin core restarts.
// reload the page to reset all state and show loading view while Bitcoin Knots restarts.
this.$router.push({ query: { restart: "1" } });
window.location.reload();
} else {
@ -328,7 +328,7 @@ export default {
this.$store.dispatch("user/getBitcoinConfig");
if (response.data.success) {
// reload the page to reset all state and show loading view while bitcoin core restarts.
// reload the page to reset all state and show loading view while Bitcoin Knots restarts.
this.$router.push({ query: { restart: "1" } });
window.location.reload();
} else {
@ -347,11 +347,11 @@ export default {
}
},
async created() {
// fetch settings first because bitcoin core
// fetch settings first because Bitcoin Knots
// is not operational if pruning is in progress
this.fetchBitcoinConfigSettings();
// wait until bitcoin core is operational
// wait until Bitcoin Knots is operational
while (true) { /* eslint-disable-line */
await this.$store.dispatch("bitcoin/getStatus");
if (this.isBitcoinCoreOperational) {