Skip to content

Commit

Permalink
Hide "Copy Link" link after moves are made until turn is over - close…
Browse files Browse the repository at this point in the history
…s 47
  • Loading branch information
djwhitt committed Feb 15, 2017
1 parent 5ab8b79 commit debfa4f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
13 changes: 8 additions & 5 deletions src/cljs/zetawar/events/game.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@
defender-q defender-r)
action (merge action {:action/attacker-damage attacker-damage
:action/defender-damage defender-damage})]
{:tx (game/action-tx db game action)
:notify [[:zetawar.players/apply-action :faction.color/all action]]})
{:tx (game/action-tx db game action)
:dispatch [[:zetawar.events.ui/hide-copy-link]]
:notify [[:zetawar.players/apply-action :faction.color/all action]]})

:action.type/end-turn
(let [game (app/current-game db)
next-faction-color (game/next-faction-color game)]
{:tx (game/action-tx db game action)
:dispatch [[:zetawar.events.ui/set-url-game-state]]
:dispatch [[:zetawar.events.ui/set-url-game-state]
[:zetawar.events.ui/show-copy-link]]
:notify [[:zetawar.players/apply-action :faction.color/all action]
[:zetawar.players/start-turn next-faction-color]]})

{:tx (game/action-tx db game action)
:notify [[:zetawar.players/apply-action :faction.color/all action]]})))
{:tx (game/action-tx db game action)
:dispatch [[:zetawar.events.ui/hide-copy-link]]
:notify [[:zetawar.players/apply-action :faction.color/all action]]})))
15 changes: 15 additions & 0 deletions src/cljs/zetawar/events/ui.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,21 @@
[{:as handler-ctx :keys [ev-chan conn db]} _]
(app/set-url-game-state! @conn))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Copy link

(defmethod router/handle-event ::show-copy-link
[{:as handler-ctx :keys [ev-chan db]} _]
(let [app (app/root db)]
{:tx [[:db/add (e app) :app/show-copy-link true]]}))

(defmethod router/handle-event ::hide-copy-link
[{:as handler-ctx :keys [ev-chan db]} _]
(let [app (app/root db)
{:keys [app/show-copy-link]} app]
(when-not (nil? show-copy-link)
{:tx [[:db/retract (e app) :app/show-copy-link show-copy-link]]})))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Unit picker

Expand Down
9 changes: 5 additions & 4 deletions src/cljs/zetawar/views.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
[:span.text-muted.pull-right (str "+" income)
[:span.hidden-md "/turn"]]]))

(defn copy-url-link [{:as view-ctx :keys [translate]}]
(defn copy-url-link [{:as view-ctx :keys [conn translate]}]
(let [clipboard (atom nil)
text-fn (fn [] js/window.location)]
(r/create-class
Expand All @@ -145,16 +145,17 @@
(translate :copy-game-url-link)])})))

(defn faction-status [{:as view-ctx :keys [conn dispatch translate]}]
(let [{:keys [game/round]} @(subs/game conn)
(let [{:keys [app/show-copy-link]} @(subs/app conn)
{:keys [game/round]} @(subs/game conn)
base-count @(subs/current-base-count conn)]
[:div#faction-status
;; TODO: make link red
[:a {:href "#" :on-click (fn [e]
(.preventDefault e)
(dispatch [::events.ui/end-turn]))}
(translate :end-turn-link)]
" · "
[copy-url-link view-ctx]
(when show-copy-link
[:span " · " [copy-url-link view-ctx]])
[:div.pull-right
[:a {:href "#"
:on-click (fn [e]
Expand Down

0 comments on commit debfa4f

Please sign in to comment.