Content

6 files changed, 218 insertions, 64 deletions

diff --git a/app.coffee b/app.coffee
index 518831f4..b96d81d5 100644
--- a/app.coffee
+++ b/app.coffee
@@ -53,6 +53,14 @@ app.get('/about', (req, res) ->
   res.render('about',  js: (-> global.js), css: (-> global.css))
 )
 
+app.get('/merchants', (req, res) ->
+  res.render('merchants',  js: (-> global.js), css: (-> global.css))
+)
+
+app.get('/exchangers', (req, res) ->
+  res.render('exchangers',  js: (-> global.js), css: (-> global.css))
+)
+
 app.get('/bcrypt', (req, res) ->
   salt = "$2a$10$3R8tUtIoU/fllQD9zEgTZe"
   hash = bcrypt.hashSync("chelsea", salt)
diff --git a/public/css/index.less b/public/css/index.less
index ba828bf5..1ac812d0 100644
--- a/public/css/index.less
+++ b/public/css/index.less
@@ -1 +1,9 @@
 @import "bootstrap.min.css";
+
+.navbar-inverse .brand, .navbar-inverse .nav > li > a { color: #ddd; }
+footer { 
+  background: black; 
+  color: white; 
+  padding: 10px 0px 2px 5px; 
+  margin: 0 -20px 0 -20px;
+}
diff --git a/views/about.html b/views/about.html
index d5665018..17492ada 100644
--- a/views/about.html
+++ b/views/about.html
@@ -17,8 +17,9 @@
               <a href="/login" class="navbar-link">Login</a>
             </p>
             <ul class="nav">
-              <li><a href="/about">Merchants</a></li>
-              <li><a href="/contact">Exchangers</a></li>
+              <li><a href="/about">Info</a></li>
+              <li><a href="/merchants">Merchants</a></li>
+              <li><a href="/exchangers">Exchangers</a></li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
@@ -33,31 +34,32 @@
           <h1>What are bitcoins?</h1>
           <p>
           Bitcoins are units of digital currency that can be 
-          transferred over the Internet. They get stored at a 
-          unique address which is like an online wallet or 
+          transferred over the Internet.
+          They get sent to and stored at a bitcoin address which is like a digital
           bank account that you can access with a 
-          password. Registering a new address is free and 
-          is as easy as signing up for an email account -- <a href="https://blockchain.info/wallet/new">try it.</a>
+          password. Registering and using a new address is as free and 
+          easy as email...  <a href="https://blockchain.info/wallet/new">try it!</a>
           </p>
           
           <p>
           Transactions between bitcoin addresses are 
-          recorded in a public record that's published on 
-          the Internet and keeps track of what amounts are 
-          stored at every address. Fifty new bitcoins are 
-          generated by a mathematical algorithm every ten 
-          minutes and are distributed to people who 
+          recorded in a public record that's <a href="http://blockchain.info/unconfirmed-transactions">published on 
+          the Internet</a>.  It keeps track of what amounts are 
+          stored at what addresses.
+          </p>
+          
+          Every 10 minutes, 50 new bitcoins are 
+          generated by a mathematical algorithm and distributed to people who 
           contribute computing power to the network. The 
-          <a href="http://bitcoin.org">software to participate in the network</a> is free so 
-          anyone can run it.
+          <a href="http://bitcoin.org">software to participate in the network</a> is free and open source so anyone can run it on their computer.
           </p>
 
           <p>
           Over time, fewer and fewer 
           bitcoins will be created until there are a total of 
-          21 million of them by the year 2040. Each bitcoin 
+          21 million of them in circulation by the year 2040. Each bitcoin 
           is divisible up to 8 decimal places, making 
-          it possible to transact tiny amounts.
+          it possible to transact very small amounts.
           </p>
         </div>
         <div class="span6">
@@ -78,7 +80,7 @@
           <p>
           You can use bitcoins to securely store 
           and backup your savings and gain access to them 
-          from anywhere that has Internet. Bitcoins tend to 
+          from anywhere that has Internet. They tend to 
           appreciate in value over time because of their 
           limited supply so they make a good investment. 
           Unlike dollars and other national currencies, no 
@@ -87,7 +89,7 @@
           </p>
 
           <p>
-          They enable you to send free, 
+          Bitcoins enable you to send free, 
           immediate payments to your friends and family 
           from a phone or laptop so you can pay a co-worker 
           back for coffee, transfer wages to family overseas, 
@@ -100,31 +102,23 @@
 
       <div class="row-fluid">
         <div class="span6">
-          <h1>What can I buy with them?</h1>
+          <h1>Where can I get some?</h1>
           <p>
-          <a href="http://bitcoinmagazine.net/where-to-spend-your-bitcoins/">This article</a> has some good suggestions.
-          The number of <a href="https://en.bitcoin.it/wiki/Trade">companies accepting bitcoins</a>
-          is growing quickly but in our opinion their immediate utility is 
-          for personal value transfer rather than for
-          commerce.  If it helps, think of them as a competitor to the likes
-          of PayPal and Western Union rather than VISA and Mastercard,
-          although they're eventually going to be competitive in 
-          the retail payment industry as well.
+          Contact one of our trusted in-person <a href="/exchangers">exchangers</a>.
           </p>
-          
 
           <p>
-          We're working to get more stores accepting them in 
-          Vancouver because we believe it'll be in 
-          their best interest to avoid the transaction fees 
-          charged by the credit card companies. Transaction 
-          fees end up getting built into the prices we pay for 
-          goods and services across the board so we're 
-          indirectly subsidizing the big banks and credit card 
-          companies whether we use their services 
-          or not.
+          There are also several bitcoin markets operating online. The largest one in Canada 
+          is <a href="http://cavirtex.com/">cavirtex.com</a> and is run out of Calgary. They link up buyers and sellers and facilitate trades by 
+          allowing you to deposit and withdraw Canadian dollars directly from your bank account. A list of other 
+          online exchanges and their rates can be found at <a href="http://bitcoincharts.com">bitcoincharts.com</a>.
+          </p>
+
+          <p>
+          You can also use sites like <a href="http://localbitcoins.com/">Local Bitcoins</a>, <a href="http://bitcoinary.com/">Bitcoinary</a>, and <a href="http://bitcoin-otc.com/">Bitcoin OTC</a> to find people to trade with directly if you want to take your chances with strangers.
+          </p>
         </div>
-  
+
         <div class="span6">
           <h1>How is their price set?</h1>
           <p>
@@ -140,40 +134,42 @@
           <p>
           Bitcoins aren't backed by any underlying 
           commodity or insured by any authority. They 
-          have an intrinsic value as a superior 
-          form of currency due to their mathematically 
+          have value as a form of currency due to their mathematically 
           guaranteed scarcity, security, ease of use, 
           distributed nature, lack of fees, divisibility, and 
           global recognition.
           </p>
 
           <p>
-          We offer to pay cash to local 
-          merchants in exchange for bitcoins they receive 
-          as payment. We also offer to sell bitcoins for cash 
-          in person at various locations. We peg our rates 
-          to <a href="http://cavirtex.com/">cavirtex.com</a> and don't take any commission.
+          We peg our rates 
+          to <a href="http://cavirtex.com/">cavirtex.com</a>.
           </p>
         </div>
       </div>
 
       <div class="row-fluid">
         <div class="span6">
-          <h1>Where can I get some?</h1>
+          <h1>What can I buy with them?</h1>
           <p>
-          Contact one of our trusted in-person <a href="/exchangers">exchangers</a>.
-          There are also several bitcoin markets operating online. The largest one in Canada 
-          is <a href="http://cavirtex.com/">cavirtex.com</a> and is run out of Calgary. They link up buyers and sellers and facilitate trades by 
-          allowing you to deposit and withdraw Canadian dollars directly from your bank account. A list of other 
-          online exchanges and their rates can be found at <a href="http://bitcoincharts.com">bitcoincharts.com</a>
-        </div>
+          You can <a href="/merchants">spend them locally</a> at one of our participating merchants or check out
+          <a href="http://bitcoinmagazine.net/where-to-spend-your-bitcoins/">this article</a> for some other good suggestions.
+          The number of <a href="https://en.bitcoin.it/wiki/Trade">companies accepting bitcoins</a>
+          is growing quickly. We're working to get more stores accepting them in 
+          Vancouver because we believe it'll be in 
+          their best interest to avoid the transaction fees 
+          charged by the credit card companies. Transaction 
+          fees end up getting built into the prices we pay for 
+          goods and services across the board so we're 
+          indirectly subsidizing the big banks and credit card 
+          companies whether we use their services 
+          or not.
+          </p>
 
+        </div>
         <div class="span6">
           <h1>Where can I learn more?</h1>
           <p>
-          Come to our <a href="http://meetup.com/bitcoinvan/">monthly meetup group</a> or <a href="mailto:[email protected]">contact us</a> directly. I'm a local software 
-          developer who's made a bitcoin payment app that's running in stores around town. I'd be happy to 
-          send you some bitcoins and teach you more about them.
+          Come to our <a href="http://meetup.com/bitcoinvan/">monthly meetup group</a> or <a href="/exchangers">contact one of us</a> directly.
           </p>
         </div><!--/span-->
       </div><!--/row-->
diff --git a/views/exchangers.html b/views/exchangers.html
new file mode 100644
index 00000000..f608a506
--- /dev/null
+++ b/views/exchangers.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
+    <title>Vancouver Bitcoin</title>
+    <link href="img/favicon.ico" rel="shortcut icon" />
+    {{#css}}index{{/css}}
+    <style>
+      div.span4 img { width: 150px; height: 150px; float: left; padding-right: 20px; }
+    </style>
+  </head>
+  <body>
+    <div class="navbar navbar-inverse">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+          <a class="brand" href="/">VanBTC</a>
+          <div class="nav-collapse collapse">
+            <p class="navbar-text pull-right">
+              <a href="/login" class="navbar-link">Login</a>
+            </p>
+            <ul class="nav">
+              <li><a href="/about">Info</a></li>
+              <li><a href="/merchants">Merchants</a></li>
+              <li><a href="/exchangers">Exchangers</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span6">
+          <h1>Exchangers</h1>
+          <p>
+           Our aim is to establish a network of trusted individuals who are willing to provide a consistent experience and price for people wanting to trade bitcoins in Vancouver.
+          </p>
+          <p><a class="btn" href="/exchangers/new">Join Us!</a></p>
+        </div>
+      </div>
+      <div class="row-fluid">
+        <div class="span4">
+          <h2>Adam Soltys</h2>
+          <img src="http://photos3.meetupstatic.com/photos/member/c/5/0/member_60963152.jpeg" />
+          <p>Neighbourhood: Hastings/Sunrise, Gastown</p>
+          <p>Email: <a href="mailto:[email protected]">[email protected]</a></p>
+          <p>Availability: 9am - 9pm Mon - Sun</p>
+          
+        </div>
+        <!--/span-->
+      </div><!--/row-->
+
+      <hr>
+
+      <footer>
+        <p>&copy; VanBTC 2012</p>
+      </footer>
+    </div>
+  </body>
+</html> 
diff --git a/views/index.html b/views/index.html
index d6fac3d8..10930021 100644
--- a/views/index.html
+++ b/views/index.html
@@ -16,6 +16,11 @@
             <p class="navbar-text pull-right">
               <a href="/login" class="navbar-link">Login</a>
             </p>
+            <ul class="nav">
+              <li><a href="/about">Info</a></li>
+              <li><a href="/merchants">Merchants</a></li>
+              <li><a href="/exchangers">Exchangers</a></li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </div>
@@ -26,24 +31,24 @@
         <div class="span12">
           <div class="hero-unit">
             <h1>Vancouver Bitcoin</h1>
-            <p>Bitcoins are units of digital currency that can be transferred over the Internet.  We are a community of merchants, exchangers, and enthusiasts in Vancouver, British Columbia who are passionate about this technology.</p>
+            <p>We help local businesses accept bitcoins by providing them with custom made payment software and prepurchasing bitcoins from them with cash.  We also sell bitcoins to the public through a network of qualified local exchangers. We believe that liquidity will be a key to Bitcoin's success so we're striving to promote its adoption in our community.</p>
             <p><a href="/about" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
           </div>
           <div class="row-fluid">
             <div class="span4">
-              <h2>Learn</h2>
-              <p>Are you new to bitcoins?  Find out all about them here.  We'll explain why you might want to use them and point you to some useful resources.</p>
-              <p><a class="btn" href="/about">View details &raquo;</a></p>
+              <h2>Info</h2>
+              <p>New to bitcoins?  We'll explain why you might want to use them and point you to some useful resources.</p>
+              <p><a class="btn" href="/about">Go &raquo;</a></p>
             </div><!--/span-->
             <div class="span4">
-              <h2>Spend</h2>
-              <p>You can spend your bitcoins in town to support local merchants.  Want to accept bitcoins in your store?  Check out our Point of Sale application.</p>
-              <p><a class="btn" href="/merchants">View details &raquo;</a></p>
+              <h2>Merchants</h2>
+              <p>You can spend your bitcoins in town to support local merchants and improve the local economy.  Want to accept bitcoins in your store?  Check out our <a href="/merchants/new">Point of Sale</a> application.</p>
+              <p><a class="btn" href="/merchants">Go &raquo;</a></p>
             </div><!--/span-->
             <div class="span4">
-              <h2>Exchange</h2>
-              <p>Looking to buy or sell bitcoins in town?  Our network of local, accredited exchangers are trained to give you a fair price and a professional experience.</p>
-              <p><a class="btn" href="/exchangers">View details &raquo;</a></p>
+              <h2>Exchangers</h2>
+              <p>Looking to buy or sell bitcoins?  Our trusted exchangers will give you a fair price and a professional experience.</p>
+              <p><a class="btn" href="/exchangers">Go &raquo;</a></p>
             </div><!--/span-->
           </div><!--/row-->
           <!--/row-->
diff --git a/views/merchants.html b/views/merchants.html
new file mode 100644
index 00000000..a3663c3c
--- /dev/null
+++ b/views/merchants.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
+    <title>Vancouver Bitcoin</title>
+    <link href="img/favicon.ico" rel="shortcut icon" />
+    {{#css}}index{{/css}}
+    <style>
+      div.span4 img { width: 150px; height: 150px; float: left; padding-right: 20px; }
+    </style>
+  </head>
+  <body>
+    <div class="navbar navbar-inverse">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+          <a class="brand" href="/">VanBTC</a>
+          <div class="nav-collapse collapse">
+            <p class="navbar-text pull-right">
+              <a href="/login" class="navbar-link">Login</a>
+            </p>
+            <ul class="nav">
+              <li><a href="/about">Info</a></li>
+              <li><a href="/merchants">Merchants</a></li>
+              <li><a href="/exchangers">Exchangers</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
+    <div></div>
+
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span6">
+          <h1>Merchants</h1>
+          <p>
+          Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.  Would you like to be included here?  We'd love to have you!
+          </p>
+          <p><a class="btn" href="/merchants/new">Sign me up!</a></p>
+        </div>
+      </div>
+      <div class="row-fluid">
+        <div class="span4">
+          <h2>Pacific Bliss Massage</h2>
+          <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
+          <p>
+          Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa &amp; in the summer months at Vancouver's most beautiful location - Wreck Beach!
+          </p>
+        </div>
+
+        <div class="span4">
+          <h2>Spartacus Books</h2>
+          <img src="http://www.spartacusbooks.net/new/resources/spartacuslogo.jpg" />
+          <p>
+          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai, Homemade soup to Italian specialty coffee drinks, all made right in front of you
+          </p>
+        </div>
+
+        <div class="span4">
+          <h2>Sweet Tooth Cafe</h2>
+          <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
+          <p>
+          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai, Homemade soup to Italian specialty coffee drinks, all made right in front of you
+          </p>
+        </div>
+      </div>
+      <hr>
+
+      <footer>
+        <p>VanBTC</p>
+      </footer>
+    </div>
+  </body>
+</html>