Skip to content

Commit

Permalink
remove miner page (#281)
Browse files Browse the repository at this point in the history
  • Loading branch information
BBK912 authored Apr 11, 2024
1 parent a7947b2 commit 26e5673
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 59 deletions.
94 changes: 47 additions & 47 deletions src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
// CSS
import Style from './style/Style.svelte'
// JS
import { listen } from '@tauri-apps/api/event'
import type { Event } from '@tauri-apps/api/event'
// import { listen } from '@tauri-apps/api/event'
// import type { Event } from '@tauri-apps/api/event'
import { onDestroy, onMount } from 'svelte'
import { Router, Route } from 'svelte-navigator'
// CARPE MODULES
import {
backlogInProgress,
backlogListenerReady,
backlogSubmitted,
minerEventReceived,
} from './modules/miner'
import { raise_error } from './modules/carpeError'
import type { CarpeError, CarpeOkReturn } from './modules/carpeError'
import { responses, debugMode } from './modules/debug'
// import {
// backlogInProgress,
// backlogListenerReady,
// backlogSubmitted,
// minerEventReceived,
// } from './modules/miner'
// import { raise_error } from './modules/carpeError'
// import type { CarpeError, CarpeOkReturn } from './modules/carpeError'
import { debugMode } from './modules/debug'
import { routes } from './modules/routes'
import 'uikit/dist/css/uikit.min.css'
import { init_locale_preferences } from './modules/preferences'
Expand All @@ -27,7 +27,7 @@
import Nav from './components/Nav.svelte'
import DebugCard from './components/dev/DebugCard.svelte'
import Wallet from './components/wallet/Wallet.svelte'
import Miner from './components/miner/Miner.svelte'
// import Miner from './components/miner/Miner.svelte'
import Settings from './components/settings/Settings.svelte'
import DevMode from './components/dev/DevMode.svelte'
import AccountCreate from './components/wallet/AccountCreate.svelte'
Expand All @@ -40,7 +40,7 @@
// import RecoveryMode from './components/layout/RecoveryMode.svelte'
import MakeWhole from './components/make-whole/MakeWhole.svelte'
import SpinnerAccount from './components/layout/SpinnerAccount.svelte'
import { maybeTowerOnce as maybeTowerOnce } from './modules/miner_invoke'
// import { maybeTowerOnce as maybeTowerOnce } from './modules/miner_invoke'
import KeyError from './components/layout/KeyError.svelte'
import UpgradeApp from './components/about/UpgradeApp.svelte'
import { tryUpdate } from './modules/updater'
Expand All @@ -50,10 +50,10 @@
// temporarily set up here otherwise... issues
init_locale_preferences()
let unlistenProofStart
let unlistenAck
let unlistenBacklogSuccess
let unlistenBacklogError
// let unlistenProofStart
// let unlistenAck
// let unlistenBacklogSuccess
// let unlistenBacklogError
onMount(async () => {
tryUpdate()
Expand All @@ -67,45 +67,45 @@
// there is a listener service which loads the key once, and then waits for a specific
// event to trigger the backlog submission.
unlistenProofStart = await listen('proof-start', (event: CarpeOkReturn) => {
responses.set(event.payload)
//update the tower stats after we show the backlog being up to date.
minerEventReceived.set(true)
})
// unlistenProofStart = await listen('proof-start', (event: CarpeOkReturn) => {
// responses.set(event.payload)
// //update the tower stats after we show the backlog being up to date.
// minerEventReceived.set(true)
// })
unlistenAck = await listen('ack-backlog-request', () => {
backlogInProgress.set(true)
backlogSubmitted.set(false)
// unlistenAck = await listen('ack-backlog-request', () => {
// backlogInProgress.set(true)
// backlogSubmitted.set(false)
// set listener ready in case
backlogListenerReady.set(true)
})
// // set listener ready in case
// backlogListenerReady.set(true)
// })
unlistenBacklogSuccess = await listen('backlog-success', (event: CarpeOkReturn) => {
responses.set(event.payload)
//update the tower stats after we show the backlog being up to date.
backlogInProgress.set(false)
backlogSubmitted.set(true)
// unlistenBacklogSuccess = await listen('backlog-success', (event: CarpeOkReturn) => {
// responses.set(event.payload)
// //update the tower stats after we show the backlog being up to date.
// backlogInProgress.set(false)
// backlogSubmitted.set(true)
// this is what keeps the loop going
maybeTowerOnce()
})
// // this is what keeps the loop going
// maybeTowerOnce()
// })
unlistenBacklogError = await listen('backlog-error', (event: Event<CarpeError>) => {
// TODO: show an UX in the miner view for this type of error
// unlistenBacklogError = await listen('backlog-error', (event: Event<CarpeError>) => {
// // TODO: show an UX in the miner view for this type of error
raise_error(event.payload, true, 'listen(backlog-error)')
// raise_error(event.payload, true, 'listen(backlog-error)')
backlogInProgress.set(false)
backlogSubmitted.set(false)
})
// backlogInProgress.set(false)
// backlogSubmitted.set(false)
// })
})
onDestroy(() => {
unlistenProofStart()
unlistenAck()
unlistenBacklogSuccess()
unlistenBacklogError()
// unlistenProofStart()
// unlistenAck()
// unlistenBacklogSuccess()
// unlistenBacklogError()
})
</script>
{#if $isLoading}
Expand Down Expand Up @@ -133,7 +133,7 @@
<Route path={routes.accountFromMnem} component={AccountCreate} primary={false} />
<Route path={routes.addWatchAccount} component={AddWatchAccount} primary={false} />
<Route path={routes.keygen} component={Keygen} primary={false} />
<Route path={routes.miner} component={Miner} primary={false} />
<!-- <Route path={routes.miner} component={Miner} primary={false} /> -->
<Route path={routes.transfer} component={Transactions} primary={false} />
<Route path={routes.events} component={Events} primary={false} />
<Route path={routes.settings} component={Settings} primary={false} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<li class="uk-padding {$location_store.pathname.includes('wallet') ? 'uk-active' : ''}">
<Link to={routes.wallet}>{$_('nav.wallet')}</Link>
</li>
<li class="uk-padding {$location_store.pathname.includes('miner') ? 'uk-active' : ''}">
<!-- <li class="uk-padding {$location_store.pathname.includes('miner') ? 'uk-active' : ''}">
<Link to={routes.miner}>{$_('nav.miner')}</Link>
</li>
</li> -->
<li class="uk-padding {$location_store.pathname.includes('transfer') ? 'uk-active' : ''}">
<Link to={routes.transfer}>{$_('nav.transactions')}</Link>
</li>
Expand Down
12 changes: 6 additions & 6 deletions src/components/dev/DevMode.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import { debugMode } from '../../modules/debug'
import DebugCard from './DebugCard.svelte'
import DebugActions from './DebugActions.svelte'
import DebugSwitchProdTest from './DebugSwitchProdTest.svelte'
// import DebugActions from './DebugActions.svelte'
// import DebugSwitchProdTest from './DebugSwitchProdTest.svelte'
import DebugSwitchRexMainnet from './DebugSwitchRexMainnet.svelte'
import DebugSwitcher from './DebugSwitcher.svelte'
import DebugPaths from './DebugPaths.svelte'
// import DebugPaths from './DebugPaths.svelte'
import DebugNetworkInfo from './DebugNetworkInfo.svelte'
import DebugGetPrivateKey from './DebugGetPrivateKey.svelte'
let debugEnabled = false
Expand All @@ -22,10 +22,10 @@
<p class="uk-margin-bottom"><DebugSwitcher /> Turn on debug view on all screens</p>

<DebugNetworkInfo />
<DebugPaths />
<!-- <DebugPaths /> -->
<DebugSwitchRexMainnet />
<DebugSwitchProdTest />
<DebugActions />
<!-- <DebugSwitchProdTest /> -->
<!-- <DebugActions /> -->
<DebugGetPrivateKey />
{#if !debugEnabled}
<DebugCard />
Expand Down
8 changes: 4 additions & 4 deletions src/modules/tick.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { get } from 'svelte/store'
import { getAccounts, refreshAccounts } from './accountActions'
import { getLocalHeight, getTowerChainView, maybeEmitBacklog } from './miner_invoke'
// import { getLocalHeight, getTowerChainView, maybeEmitBacklog } from './miner_invoke'
import { getMetadata } from './networks'
import { isInit } from './accounts'
import { Level, logger } from './carpeError'
Expand All @@ -25,9 +25,9 @@ export const carpeTick = async () => {
getMetadata()
.then(refreshAccounts)
// tower things
.then(getTowerChainView)
.then(getLocalHeight)
.then(maybeEmitBacklog)
// .then(getTowerChainView)
// .then(getLocalHeight)
// .then(maybeEmitBacklog)
.finally(() => (tick_in_progress = false))
}
}
Expand Down

0 comments on commit 26e5673

Please sign in to comment.