Skip to content
This repository was archived by the owner on Oct 29, 2021. It is now read-only.

Commit

Permalink
Vote bitcoin com (#7)
Browse files Browse the repository at this point in the history
* rebrand from Bitcoinocracy to Vote
* fix bug in admin/arguments/%/hide
* replace arguments with propositions in the UI
* fix the link to bitcoin.com and add the favicon
  • Loading branch information
arsenische authored Dec 11, 2016
1 parent 7adc8d3 commit 1cc73fb
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 25 deletions.
Binary file added app/assets/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions app/controllers/admin/arguments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ArgumentsController < Admin::ApplicationController

# Define a custom finder by overriding the `find_resource` method:
def find_resource(param)
Argument.find_by!(slug: param)
Argument.friendly.find(param)
end

def hide
Expand All @@ -27,8 +27,7 @@ def unhide

private
def argument
Argument.find_by!(slug: params[:id]) ||
Argument.find_by!(id: params[:id])
Argument.friendly.find(params[:slug] || params[:id])
end
end
end
2 changes: 1 addition & 1 deletion app/views/arguments/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
h1 =t '.title', :default => model_class.model_name.human.pluralize.titleize

.lead Bitcoinocracy offers free and transparent voting mechanism to facilitate decentralized decision making in the Bitcoin ecosystem and to determine the truth backed by real monetary value.
.lead Vote is a free and decentralized way to measure the Bitcoin community's stance on a given proposition. Voting requires proof of bitcoin holdings via cryptographic signatures. Signed votes cannot be forged, and are fully auditable by all users.

.lead
= link_to t('.new'), new_argument_path
Expand Down
10 changes: 5 additions & 5 deletions app/views/faq/index.html.slim
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
h1 Frequently Asked Questions

h3 What is Bitcoinocracy?
h3 What is Vote?
p
| Bitcoinocracy offers a free and transparent voting mechanism to facilitate decentralized decision making in the Bitcoin ecosystem and to determine the truth backed by real monetary value.
| Vote offers a free and transparent voting mechanism to facilitate decentralized decision making in the Bitcoin ecosystem and to determine the truth backed by real monetary value.

h3 What is the point of Bitcoin voting?
p
| Voting with your Bitcoin is a mathematically secure and anonymous way to publicly make a statement about a topic that you are interested in. By signing a message with your Bitcoin key, you are able to back-up your statement with the monetary value associated with the public key you possess and are signing with. Similar concepts are used in schemes such as
a href="https://wiki.bitcoin.com/w/Proof_of_Stake" proof-of-stake
|.

h3 How does Bitcoinocracy work?
h3 How does Vote work?
p
| The voting mechanism utilizes the
a href="https://wiki.bitcoin.com/index.php?title=ECDSA" cryptography
Expand All @@ -28,9 +28,9 @@ p
a href="https://www.bitcoin.com/choose-your-wallet" choose a wallet
| if you don’t have one already. Most wallets will have an area where your address is displayed that you can copy the voting argument into it and sign the message. After signing, the program will return a cryptographically secure signature for you to paste into the Argument page for verification.

h3 Is Bitcoinocracy safe?
h3 Is Vote safe?
p
| Yes, it’s safe. Bitcoinocracy does not use or ask for your Bitcoin private keys at any time, and do not submit them anywhere on this site. Message signing is all done via your Bitcoin wallet program. Please note: Bitcoin signatures
| Yes, it’s safe. Vote does not use or ask for your Bitcoin private keys at any time, and do not submit them anywhere on this site. Message signing is all done via your Bitcoin wallet program. Please note: Bitcoin signatures
a href="https://www.reddit.com/r/btc/comments/4mhjh3/psa_bitcoinocracycom_signatures_expose_your/" expose your public keys
| (which isn't a problem until ECDSA is broken). Moreover address reuse with a faulty random number generator
a href="http://www.nilsschneider.net/2013/01/28/recovering-bitcoin-private-keys.html" may leak
Expand Down
14 changes: 6 additions & 8 deletions app/views/layouts/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ doctype html
html
head
/ title Bitcoinocracy
= display_meta_tags site: 'Bitcoinocracy', separator: "&mdash;".html_safe
= display_meta_tags site: 'Vote.bitcoin.com', separator: "&mdash;".html_safe
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
= render 'layouts/google_analytics'
= csrf_meta_tags
link rel="shortcut icon" href="#{image_url('favicon.png')}" type="image/x-icon"
body
= nav_bar static: :top, brand: image_tag('bitcoin.com.png', alt: ''), responsive: true
= nav_bar static: :top, brand: image_tag('bitcoin.com.png', alt: ''), brand_link: 'https://bitcoin.com', responsive: true
= menu_group
= menu_item "Home", root_path
= menu_item t("arguments.index.new"), new_argument_path
Expand All @@ -27,11 +28,8 @@ html

.footer
.container
a.pull-right href="https://github.com/arsenische/bitcoinocracy/issues/new" target="_blank" Report a bug
a.pull-right href="https://github.com/bitcoin-portal/bitcoinocracy/issues/new" target="_blank" Report a bug
p
a href="http://bitcoinocracy.com" Bitcoinocracy.com
a href="http://vote.bitcoin.com" Vote.bitcoin.com
|. Source code is available at
a href="https://github.com/arsenische/bitcoinocracy/" target="_blank" GitHub
| and you can also
a href="https://tip4commit.com/github/arsenische/bitcoinocracy" target="_blank" support
| its development.
a href="https://github.com/bitcoin-portal/bitcoinocracy/" target="_blank" GitHub.
14 changes: 9 additions & 5 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@
# available at http://guides.rubyonrails.org/i18n.html.

en:
hello: "Hello world"
arguments:
index:
new: "Submit your Argument"
title: "Bitcoinocracy - vote with your Bitcoin signature"
new: Submit your Proposition
title: Vote with your Bitcoin signature
addresses:
index: 'Bitcoin Addresses'
faq: "FAQ"
index: Bitcoin Addresses
faq: FAQ
activerecord:
models:
argument:
one: Proposition
other: Propositions
2 changes: 1 addition & 1 deletion public/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="http://vote.bitcoin.com/">Home</a></div>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Argument</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Proposition</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="dialog">
<div>
<h1>We're sorry, but something went wrong.</h1>
Expand Down
2 changes: 1 addition & 1 deletion public/422.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="http://vote.bitcoin.com/">Home</a></div>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Argument</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Proposition</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="dialog">
<div>
<h1>We're sorry, but something went wrong.</h1>
Expand Down
2 changes: 1 addition & 1 deletion public/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="http://vote.bitcoin.com/">Home</a></div>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Argument</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="navbar-collapse collapse"><ul class="nav navbar-nav "><li class="active"><a href="/">Home</a></li><li><a href="/arguments/new">Submit your Proposition</a></li><li><a href="/addresses">Bitcoin Addresses</a></li></ul></div></div></nav>
<div class="dialog">
<div>
<h1>We're sorry, but something went wrong.</h1>
Expand Down

0 comments on commit 1cc73fb

Please sign in to comment.