status-im/open-bounty
2
0
Fork 0
mirror of https://github.com/status-im/open-bounty.git synced 2025-02-17 03:47:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Teemu Patja 2017-11-02 20:53:12 +02:00
commit 188193938e
No known key found for this signature in database
GPG Key ID: F5B7035E6580FD4C
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/sql/queries.sql
View File

@ -424,7 +424,7 @@ SELECT
i.payout_hash AS payout_hash, i.payout_hash AS payout_hash,
i.payout_receipt AS payout_receipt, i.payout_receipt AS payout_receipt,
i.updated AS updated, i.updated AS updated,
i.winner_login AS winner_login i.winner_login AS winner_login,
r.repo AS repo_name, r.repo AS repo_name,
o.address AS owner_address o.address AS owner_address
FROM issues i, users o, repositories r FROM issues i, users o, repositories r

6
src/cljs/commiteth/handlers.cljs
View File

@ -182,7 +182,7 @@
(reg-event-fx (reg-event-fx
:load-owner-bounties :load-owner-bounties
(fn [{:keys [db]} [_]] (fn [{:keys [db]} [_]]
{:db db {:db (assoc db :owner-bounties-loading? true)
:http {:method GET :http {:method GET
:url "/api/user/bounties" :url "/api/user/bounties"
:on-success #(dispatch [:set-owner-bounties %])}})) :on-success #(dispatch [:set-owner-bounties %])}}))
@ -190,7 +190,9 @@
(reg-event-db (reg-event-db
:set-owner-bounties :set-owner-bounties
(fn [db [_ issues]] (fn [db [_ issues]]
(assoc db :owner-bounties issues))) (assoc db
:owner-bounties issues
:owner-bounties-loading? false)))
(defn get-ls-token [db token] (defn get-ls-token [db token]
(let [login (get-in db [:user :login])] (let [login (get-in db [:user :login])]

9
src/cljs/commiteth/manage_payouts.cljs
View File

@ -59,8 +59,13 @@
(defn manage-payouts-page [] (defn manage-payouts-page []
(let [owner-bounties (rf/subscribe [:owner-bounties])] (let [owner-bounties (rf/subscribe [:owner-bounties])
owner-bounties-loading? (rf/subscribe [:get-in [:owner-bounties-loading?]])]
(fn [] (fn []
(if @owner-bounties-loading?
[:container
[:div.ui.active.inverted.dimmer
[:div.ui.text.loader "Loading"]]]
(let [web3 (.-web3 js/window) (let [web3 (.-web3 js/window)
bounties (vals @owner-bounties) bounties (vals @owner-bounties)
unpaid? #(empty? (:payout_hash %)) unpaid? #(empty? (:payout_hash %))
@ -75,4 +80,4 @@
[:h3 "New claims"] [:h3 "New claims"]
[claim-list unpaid-bounties] [claim-list unpaid-bounties]
[:h3 "Old claims"] [:h3 "Old claims"]
[claim-list paid-bounties]])))) [claim-list paid-bounties]])))))