Commit c4afb513 authored by Bitcoin Please's avatar Bitcoin Please

Cleanup and bug fixes.

parent 4acd478e
......@@ -13,7 +13,7 @@ pragma cashscript ^0.4.0;
* support@bchplease.org
*
* This contract enforces a fiat-based market price for daily payouts to the
* contract's receipient.
* contract's recipient.
*
* recipient : party whom will will receive the payouts
* funder : party whom is pledging the funding for the payouts
......@@ -26,7 +26,7 @@ pragma cashscript ^0.4.0;
* and a new UTXO is generated.
*
* NOTE: Although the pledged budget is set as a monthly value by the
* contract's funder, payouts are made daily to contract's receipient.
* contract's funder, payouts are made daily to contract's recipient.
*
* eg. February payouts are 1/28 or 1/29 the monthly pledge amount
* June payouts are 1/30 the monthly pledge amount
......@@ -42,7 +42,7 @@ contract MecenasOracle(
/**
* Payout
*
* Will make a payout to the receipient of the contract.
* Will make a payout to the recipient of the contract.
*
* pk : public key of the transaction's originator
* s : signature of the transaction
......@@ -123,7 +123,7 @@ contract MecenasOracle(
/**
* Reclaim
*
* Allows the funder to at ANYTIME reclaim their remaining pledge balance.
* Allows the funder at ANYTIME to reclaim their remaining pledge balance.
*
* NOTE: This method is NOT dependent on the operation of the Oracle.
*/
......
{
"name": "causes-cash",
"version": "20.8.11",
"version": "20.8.16",
"description": "An uncensorable funding platform for radical creators and unstoppable service providers.",
"author": "Bitcoin Cash Please <support@bchplease.org>",
"scripts": {
......@@ -23,6 +23,7 @@
"ipfs": "0.40.0",
"moment": "2.24.0",
"msgpack-lite": "0.1.26",
"nitojs": "gitlab:bchplease/nitojs",
"numeral": "2.0.6",
"orbit-db": "0.23.1",
"qrcode": "1.4.4",
......
......@@ -24,19 +24,19 @@
</a>
</nav>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab">
<Email />
</div>
<div class="tab-pane fade" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
<Extensions />
</div>
<div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">
<Ledger />
</div>
</div>
<!-- <div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab">
<Email />
</div>
<div class="tab-pane fade" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
<Extensions />
</div>
<div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">
<Ledger />
</div>
</div> -->
</form>
</div>
</template>
......@@ -46,9 +46,9 @@
import { mapActions, mapGetters } from 'vuex'
/* Import components. */
import Email from './SigninEmail'
import Extensions from './SigninExtensions'
import Ledger from './SigninLedger'
// import Email from './SigninEmail'
// import Extensions from './SigninExtensions'
// import Ledger from './SigninLedger'
import scrypt from 'scrypt-js'
import superagent from 'superagent'
import Swal from 'sweetalert2'
......@@ -59,9 +59,9 @@ import Swal from 'sweetalert2'
export default {
components: {
Email,
Extensions,
Ledger,
// Email,
// Extensions,
// Ledger,
},
data: () => {
return {
......@@ -175,12 +175,12 @@ export default {
/* Set derived key length (in bytes). */
const dkLen = 32
/* Compute key. */
const key = await scrypt
/* Compute master seed. */
const masterSeed = await scrypt
.scrypt(password, salt, N, r, p, dkLen)
/* Update master seed. */
this.updateMasterSeed(key)
this.updateMasterSeed(masterSeed)
/* Update email address. */
this.updateEmail(_email)
......
/* Import modules (getters). */
// ...
/* Import modules (actions). */
import startWatching from './blockchain/actions/startWatching'
/* Import modules (mutations). */
import setWatching from './blockchain/mutations/setWatching'
/* Initialize state. */
const state = {
/**
* Watching
*
* 1. Addresses
* 2. UTXOs
*/
watching: null,
}
/* Getters. */
const getters = {
//
}
/* Actions. */
const actions = {
startWatching,
}
/* Mutations. */
const mutations = {
setWatching,
}
/* Export. */
// NOTE: We DO NOT namespace here to allow for global use of `dispatch`.
export default {
namespaced: true,
state,
getters,
actions,
mutations
}
/**
* Start Watching
*
* Pulls the latest asset source from our Eternal Db.
*/
const startWatching = async ({ commit }, _request) => {
console.log('Start watching...', _request)
/* Commit wallet's master seed. */
commit('setWatching', _request)
}
/* Export module. */
export default startWatching
/* Import modules. */
import msgpack from 'msgpack-lite'
/**
* Set Watching
*
* Allows us to update a stored asset resource.
*/
const setWatching = (state, _watching) => {
/* Update the asset resource. */
state.watching = msgpack.encode(_watching).toString('hex')
}
/* Export module. */
export default setWatching
......@@ -532,7 +532,7 @@ export default {
const message = `Deposit address copied to your clipboard.`
/* Display notification. */
this.toast(['Hey!', message, 'info'])
this.toast(['Done!', message, 'info'])
},
/**
......
......@@ -432,6 +432,10 @@ export default {
this.photo1Url = media.main
}
if (media.banner) {
this.bannerUrl = media.banner
}
if (media.gallery && media.gallery[0]) {
this.photo2Url = media.gallery[0]
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment