Master

README.md

@@ -46,7 +46,7 @@ Click on the bottom link "fix this" to create an admin user, say:
 
 ### Profit
 
-    DB_HOST=127.0.0.1 DB_PORT=5984 DB_USER=admin DB_PASSWORD=password COOKIE_SALT=secret PROXY_URL=https://hive-proxy.herokuapp.com npm run dev
+    DB_HOST=127.0.0.1 DB_PORT=5984 DB_USER=admin DB_PASSWORD=password COOKIE_SALT=secret PROXY_URL=https://hive-proxy.herokuapp.com?url= npm run dev
     open http://localhost:8080
 
 Optional environment variables:
@@ -64,6 +64,19 @@ This project has js & css live reload setup. If you wish to use it to boost your
 2. symlink the playbook file into place: `ln -s path/to/ansible/repo provisioners` (Windows users can add directory to %PATH%)
 3. `vagrant up` or `vagrant reload --provision`
 
+### Deploy to Heroku
+
+After all the regular heroku setup and hive-js setup as layed out above, install the heroku-hive-deploy plugin:
+
+    # one-time install
+    plugins:install https://github.com/hone/heroku-hive-deploy.git
+
+    # deploy from your local hive-js dir:
+    heroku deploy:hive `pwd`
+
+    # alternatively, you can also deploy from a git uri:
+    heroku deploy:hive <git uri>
+
 ## Contributing
 
 ### Instructions

app/application.js

@@ -38,7 +38,7 @@ window.initHiveApp = function() {
     _html.removeClass('prevent_scroll')
   })
 
-  emitter.on('wallet-ready', function(){
+  emitter.on('balance-ready', function(){
     auth.hide()
     frame.show()
   })

app/index.html

@@ -4,8 +4,9 @@
   <title>Hive Web</title>
   <link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" href="assets/img/favicon.ico">
   <link rel="apple-touch-icon" href="assets/img/apple-touch-icon-precomposed.png" sizes="152x152">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1 user-scalable=0">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black" />
   <link rel="stylesheet" href="assets/css/application.css">
   <link rel="stylesheet" href="https://s3.amazonaws.com/fonts.typotheque.com/WF-018717-007225.css" type="text/css" />

app/lib/geo/index.js

@@ -15,7 +15,7 @@ function fetchUserInfo(callback){
     userInfo.name = doc.userInfo.firstName
     userInfo.email = doc.userInfo.email
     userInfo.avatarIndex = doc.userInfo.avatarIndex
-    userInfo.address = getWallet().currentAddress
+    userInfo.address = getWallet().getNextAddress()
     userInfo.network = getNetwork()
 
     callback()

app/lib/i18n/package.json

@@ -6,7 +6,7 @@
   "author": "Wei Lu",
   "license": "GPL-2.0+",
   "dependencies": {
-    "brfs": "^1.2.0",
+    "brfs": "1.2.0",
     "counterpart": "^0.16.0"
   },
   "browserify": {

app/lib/i18n/translations/cs-cz.json

@@ -0,0 +1,108 @@
+{
+    "Back to hivewallet.com": "Zpět na hivewallet.com",
+    "Create new wallet": "Založit novou peněženku",
+    "Open existing wallet": "Otevřít existující peněženku",
+    "We are about to generate your very own passphrase": "Nyní vygenerujeme Vaše vlastní heslo",
+    "This keeps your account secure, and lets you open your wallet on multiple devices.": "Toto umožňuje Vašemu účtu být vždy zabezpečený i při přístupu z různých zařízení.",
+    "It is very important you write this down.": "Je velmi důležité si tohle zaznamenat.",
+    "Generate passphrase": "Vygenerovat heslo",
+    "Go back": "Vrátit se zpět",
+    "Generating": "Generuji",
+    "Decoding passphrase": "Dekóduji heslo",
+    "Synchronizing Wallet": "Synchronizuji peněženku",
+    "Set your PIN": "Nastavte svůj PIN",
+    "Your passphrase": "Vaše heslo",
+    "Your passphrase will not be shown again.": "Vaše heslo nebude znovu zobrazeno.",
+    "Without it you will lose access to your wallet.": "Bez něj ztratíte přístup ke své peněžence.",
+    "I have written down or otherwise securely stored my passphrase": "Zapsal jsem si nebo jinak bezpečně uchoval mé heslo",
+    "Open wallet": "Otevřít peněženku",
+    "Checking passphrase": "Kontroluji heslo",
+    "Enter Passphrase": "Vložte heslo",
+    "Invalid passphrase": "Neplatné heslo",
+    "Enter your PIN": "Zadejte Váš PIN",
+    "Set a PIN for quick access": "Zadejte PIN pro rychlý přístup",
+    "Review passphrase again": "Znovu zkontrolovat heslo",
+    "Open a different wallet": "Otevřít jinou peněženku",
+    "Forgot PIN": "Forgot PIN",
+    "PIN must be a 4-digit number": "PIN musí být 4-místné číslo",
+    "Verifying PIN": "Ověřuji pin",
+    "Setting PIN": "Nastavuji PIN",
+    "This might take some time,": "Tohle může zabrat nějaký čas.",
+    "please be patient.": "prosím o strpení",
+    "Your PIN is incorrect": "Zadaný PIN není správný",
+    "Request timeout. Please check your internet connection.": "Vypršel čas na odpověď. Prosím zkontrolujte své internetové připojení.",
+    "Could not save your details": "Vaše informace nebyli uloženy",
+    "We could not connect you to Waggle, please check your internet connection.": "Nemohli jsme Vás připojit k Vašemu Waggle, prosím zkontrolujte své internetové připojení.",
+    "Please enter a valid address to send to": "Prosím zadejte platnou adresu k zaslání",
+    "Please enter an amount above": "Prosím výše zadejte množství %(dust)s",
+    "Some funds are temporarily unavailable. To send this transaction, you will need to wait for your pending transactions to be confirmed first (this should not take more than a few minutes).": "Některé prostředky jsou dočasně nedostupné. K odeslání této transakce musíte nejprve počkat na potvrzení příchozích transakcí (toto by nemělo trvat více než několik minut).",
+    "What does this mean?": "Co to znamená?",
+    "It seems like you are trying to empty your wallet. Taking transaction fee into account, we estimated that the max amount you can send is. We have amended the value in the amount field for you": "Vypadá to, že se snažíte použít vyprázdnit svou peněženku. Po  započtení transakcí, odhadujeme maximální možné množství k odeslání %(sendableBalance)s. Nastavili jsme pro Vás toto množství ve formuláři.",
+    "You do not have enough funds in your wallet": "Nemáte dostatek prostředků ve Vaší peněžence.",
+    "A name is required to set your profile on Hive": "Jméno je vyžadováno k založení profilu na Hive",
+    "Uh Oh...": "Jejda...",
+    "Whoops!": "Hups...",
+    "Just saying...": "Jen říkám...",
+    "Your browser does not support geolocation": "Váš prohlížeč nepodporuje geolokaci",
+    "Unable to retrieve your location": "Vaše lokace nebyla zjištěna",
+    "Without a name, the payer would not be able to identify you on Waggle.": "Bez jména by Vás plátce nebyl schopný na Waggle najít.",
+    "cannot be blank": "%(blankField)s nemůže/nemohou být prázdné.",
+    "name": "jméno",
+    "email": "e-mail",
+    "description": "popis",
+    "Change your details": "Změnit svůj profil",
+    "Your name": "Vaše jméno",
+    "Gravatar email": "Gravatar e-mail",
+    "Submit": "Odeslat",
+    "Gravatar (globally recognised avatar) is a service that lets you re-use the same avatar across websites and apps by specifying an email address.": "Gravatar (globálně používaný avatar) je služba, která Vám umožňuje zadáním e-mailové adresy znovu použít stejného avatara napříč různými webovými stránkami a aplikacemi.",
+    "Create a gravatar": "Vytvořit gravatar",
+    "Logout": "Odhlásit se",
+    "Support": "Podpora",
+    "Send": "Odeslat",
+    "Receive": "Přijmout",
+    "History": "Historie",
+    "Tokens": "Tokeny",
+    "Waggle lets you broadcast your wallet address to other nearby Hive users by comparing GPS data. This data is deleted once you turn Waggle off.": "Waggle vám umožňujě šířit adresu Vaší peněženky uživatelům nacházejícím se blízko Vás pomocí porovnávání GPS dat. Tyto data jsou smazána poté co vypnete Waggle.",
+    "Having problems?": "Máte problémy?",
+    "Description": "Popis",
+    "Your email address": "Vaše e-mailová schránka",
+    "Nevermind": "Zapomeň na to",
+    "Before you start using Waggle, you need to enter a name that will help others identify you.": "Předtím než začnete používat Waggle, musíte nejprve zadat jméno, které pomůže ostatním Vás najít.",
+    "Save": "Uložit",
+    "Loading transactions...": "Loading transactions...",
+    "Your transaction history": "Historie Vašich transakcí",
+    "pending confirmation": "probíhá potvrzení",
+    "Received": "Přijato",
+    "You do not have any transactions yet": "Zatím nebyli uskutečněny žádné transakce.",
+    "Transaction Id:": "Id transakce:",
+    "Transaction Fee:": "Transaction Fee:",
+    "Inputs:": "Inputs:",
+    "Outputs:": "Outputs:",
+    "Sent to:": "Odesláno na:",
+    "Your wallet address": "Adresa Vaší peněženky",
+    "Waggle": "Waggle",
+    "Turn Waggle on": "Zapnout Waggle",
+    "Turn Waggle off": "Vypnout Waggle",
+    "Checking your location": "Zjišťuji vaši polohu",
+    "Broadcasting your location...": "Publikovat Vaši polohu",
+    "Wallet address": "Adresa peněženky",
+    "Amount": "Množství",
+    "Exchange rate unavailable for the selected currency": "Směnný kurz pro zvolenou měnu je nedostupný ",
+    "Confirm": "Potvrdit",
+    "No Hive users found nearby": "Žádní uživatelé Hive nejsou poblíž",
+    "Search Again": "Hledat znovu",
+    "Searching...": "Hledám...",
+    "Searching your area for other Hive Web users": "Hledám uživatele Hive Web ve Vaší blízkosti",
+    "Confirm transaction": "Potvrdit transakci",
+    "transaction fee": "poplatek transakce",
+    "Cancel": "Zrušit",
+    "Transaction Successful": "Transakce byla úspěšná",
+    "Your transaction will appear in your history tab shortly.": "Vaše transakce se během chvíle objeví v záložce historie.",
+    "Close": "Zavřít",
+    "Report": "Nahlásit",
+    "Transaction Failed": "Transakce selhala",
+    "Please make sure you are connected to the internet.": "Prosím zkontrolujte své připojení k internetu.",
+    "Please describe what happened above. Below are network error logs that could help us identify your issue.": "Prosím výše uveďte co se přesně stalo. Níže jsou uvedeny záznamy, které nám pomohou identifikovat problém.",
+    "Sorry, Hive Wallet did not load.": "Omlouváme se, Hive peněžěnka se nenačetla.",
+    "Try updating your browser, or switching out of private browsing mode. If all else fails, download Chrome for your device.": "Zkuste instalovat nejnovější verzi prohlížeče nebo vypněte prohlížení v anonymním módu. Pokud vše selže, stáhněte prohlížeč Chrome pro své zařízení."
+}

app/lib/i18n/translations/de.json

@@ -23,6 +23,7 @@
     "Set a PIN for quick access": "Lege einen PIN für schnellen Zugang fest",
     "Review passphrase again": "Prüfe die Passphrase noch einmal",
     "Open a different wallet": "Eine andere Brieftasche öffnen",
+    "Forgot PIN": "Forgot PIN",
     "PIN must be a 4-digit number": "PIN muss eine 4-stellige Nummer sein",
     "Verifying PIN": "Prüfe PIN",
     "Setting PIN": "Setze PIN",
@@ -68,11 +69,15 @@
     "Nevermind": "Mach Dir nichts daraus!",
     "Before you start using Waggle, you need to enter a name that will help others identify you.": "Um Waggle zu benutzen, musst Du einen Benutzernamen auswählen. So können Dich andere Benutzer finden.",
     "Save": "Speichern",
+    "Loading transactions...": "Loading transactions...",
     "Your transaction history": "Chronik Deiner Transaktionen",
     "pending confirmation": "Warte auf Bestätigungen",
     "Received": "Erhalten",
     "You do not have any transactions yet": "Du hast noch keine Transaktionen getätigt",
     "Transaction Id:": "Transaktions-ID:",
+    "Transaction Fee:": "Transaction Fee:",
+    "Inputs:": "Inputs:",
+    "Outputs:": "Outputs:",
     "Sent to:": "Überwiesen an:",
     "Your wallet address": "Die Adresse Deiner Brieftasche",
     "Waggle": "Waggle",

app/lib/i18n/translations/en.json

@@ -23,6 +23,7 @@
   "Set a PIN for quick access": "Set a PIN for quick access",
   "Review passphrase again": "Review passphrase again",
   "Open a different wallet": "Open a different wallet",
+  "Forgot PIN": "Forgot PIN",
   "PIN must be a 4-digit number": "PIN must be a 4-digit number",
   "Verifying PIN": "Verifying PIN",
   "Setting PIN": "Setting PIN",
@@ -68,11 +69,15 @@
   "Nevermind": "Nevermind",
   "Before you start using Waggle, you need to enter a name that will help others identify you.": "Before you start using Waggle, you need to enter a name that will help others identify you.",
   "Save": "Save",
+  "Loading transactions...": "Loading transactions...",
   "Your transaction history": "Your transaction history",
   "pending confirmation": "pending confirmation",
   "Received": "Received",
   "You do not have any transactions yet": "You don't have any transactions yet",
   "Transaction Id:": "Transaction Id:",
+  "Transaction Fee:": "Transaction Fee:",
+  "Inputs:": "Inputs:",
+  "Outputs:": "Outputs:",
   "Sent to:": "Sent to:",
   "Your wallet address": "Your wallet address",
   "Waggle": "Waggle",

app/lib/i18n/translations/es.json

@@ -23,6 +23,7 @@
     "Set a PIN for quick access": "Elige un PIN para acceso rápido",
     "Review passphrase again": "Revisa tu passphrase de nuevo",
     "Open a different wallet": "Abrir un monedero diferente",
+    "Forgot PIN": "Forgot PIN",
     "PIN must be a 4-digit number": "El pin debe ser un número de 4 digitos",
     "Verifying PIN": "Verificando PIN",
     "Setting PIN": "Ajustando PIN",
@@ -68,11 +69,15 @@
     "Nevermind": "No importa",
     "Before you start using Waggle, you need to enter a name that will help others identify you.": "Antes de empezar a usar Waggle, necesitas un nombre para ayudar a los demás a identificarte.",
     "Save": "Guardar",
+    "Loading transactions...": "Loading transactions...",
     "Your transaction history": "Tu historial de transacciones",
     "pending confirmation": "confirmación pendiente",
     "Received": "Recibido",
     "You do not have any transactions yet": "No tienes ninguna transacción aún",
     "Transaction Id:": "Id de la transacción:",
+    "Transaction Fee:": "Transaction Fee:",
+    "Inputs:": "Inputs:",
+    "Outputs:": "Outputs:",
     "Sent to:": "Enviado a:",
     "Your wallet address": "Tu dirección del monedero",
     "Waggle": "Waggle",

app/lib/i18n/translations/fil.json

@@ -8,7 +8,7 @@
     "Generate passphrase": "Bumuo ng passphrase",
     "Go back": "Bumalik",
     "Generating": "Bumubuo",
-    "Decoding passphrase": "Decoding passphrase",
+    "Decoding passphrase": "Dine-decode ang passphrase",
     "Synchronizing Wallet": "Sini-synchronize ang Wallet",
     "Set your PIN": "I-set ang iyong PIN",
     "Your passphrase": "Ang iyong passphrase",
@@ -23,6 +23,7 @@
     "Set a PIN for quick access": "Mag-set ng PIN para sa mabilis na access",
     "Review passphrase again": "I-review ang passphrase uli",
     "Open a different wallet": "Magbukas ng ibang wallet",
+    "Forgot PIN": "Forgot PIN",
     "PIN must be a 4-digit number": "Ang PIN ay kinakailangang maging 4- digit na numero",
     "Verifying PIN": "Vine-verify ang PIN",
     "Setting PIN": "Nagse-set ng PIN",
@@ -68,11 +69,15 @@
     "Nevermind": "Hindi bale",
     "Before you start using Waggle, you need to enter a name that will help others identify you.": "Bago mo simulan ang paggamit ng Waggle, kinakailangan mong mag-enter ng pangalan na tutulong sa iba sa pagkakilala sa iyo.",
     "Save": "I-save",
+    "Loading transactions...": "Loading transactions...",
     "Your transaction history": "Ang iyong kasaysayan ng transaksyon",
     "pending confirmation": "pending na kumpirmasyon",
     "Received": "natanggap ",
     "You do not have any transactions yet": "Wala ka pang mga transaksyon pa",
     "Transaction Id:": "Transaction Id:",
+    "Transaction Fee:": "Transaction Fee:",
+    "Inputs:": "Inputs:",
+    "Outputs:": "Outputs:",
     "Sent to:": "Naipadala kay:",
     "Your wallet address": "Ang iyong wallet address",
     "Waggle": "Waggle",
@@ -86,18 +91,18 @@
     "Confirm": "Ikumpirma",
     "No Hive users found nearby": "Walang mga Hive user na mahanap na malapit",
     "Search Again": "Maghanap Uli",
-    "Searching...": "Searching...",
+    "Searching...": "Naghahanap...",
     "Searching your area for other Hive Web users": "Maghanap sa iyong lugar para sa ibang Hive Web user",
     "Confirm transaction": "Kumpirmahin ang transaksyon",
     "transaction fee": "transaction fee",
     "Cancel": "Ikansela",
     "Transaction Successful": "Matagumpay ang Transaksyon",
     "Your transaction will appear in your history tab shortly.": "Ang iyong transaksyon ay makikita sa iyong tab ng kasaysayan nang ilang sandali.",
     "Close": "Isara",
-    "Report": "Report",
+    "Report": "I-report",
     "Transaction Failed": "Ang Transaksyon ay Nabigo",
     "Please make sure you are connected to the internet.": "Maari lamang na siguraduhin na ikaw ay nakakunekta sa internet.",
-    "Please describe what happened above. Below are network error logs that could help us identify your issue.": "Please describe what happened above. Below are network error logs that could help us identify your issue.",
+    "Please describe what happened above. Below are network error logs that could help us identify your issue.": "Maari lamang na ilarawan ang pangyayari sa itaas. Sa ilalim naman ay mga network log na maaring makatulong sa amin upang malaman ang iyong isyu.",
     "Sorry, Hive Wallet did not load.": "Patawad, ang Hive Wallet ay hindi na-load.",
     "Try updating your browser, or switching out of private browsing mode. If all else fails, download Chrome for your device.": "Subukang i-update ang iyong browser, o lumabas sa private browsing mode. Kung lahat ay bigo, i-download ang Chrome sa iyong aparato."
 }

app/lib/i18n/translations/fr.json

@@ -1,5 +1,5 @@
 {
-    "Back to hivewallet.com": "Retour a hivewallet.com",
+    "Back to hivewallet.com": "Retour vers hivewallet.com",
     "Create new wallet": "Créer un nouveau portefeuille",
     "Open existing wallet": "Ouvrir un portefeuille existant",
     "We are about to generate your very own passphrase": "Nous générons votre propre mot de passe maintenant",
@@ -23,6 +23,7 @@
     "Set a PIN for quick access": "Définir un code PIN pour un accès rapide",
     "Review passphrase again": "Revue mot de passe à nouveau",
     "Open a different wallet": "Ouvrez un portefeuille différent",
+    "Forgot PIN": "Forgot PIN",
     "PIN must be a 4-digit number": "PIN doit être un nombre à 4 chiffres",
     "Verifying PIN": "Vérification code PIN",
     "Setting PIN": "PIN de réglage",
@@ -68,11 +69,15 @@
     "Nevermind": "Tant pis",
     "Before you start using Waggle, you need to enter a name that will help others identify you.": "Avant de commencer à utiliser Waggle, vous devez entrer un nom qui aidera les autres à vous identifier.",
     "Save": "Sauvegarder",
+    "Loading transactions...": "Loading transactions...",
     "Your transaction history": "Votre historique des transactions",
     "pending confirmation": "en attente de confirmation",
     "Received": "Reçu",
     "You do not have any transactions yet": "Vous n'avez pas encore de transactions",
     "Transaction Id:": "Identité de transaction",
+    "Transaction Fee:": "Frais de transaction : ",
+    "Inputs:": "Entrées : ",
+    "Outputs:": "Sorties : ",
     "Sent to:": "envoyé à:",
     "Your wallet address": "Votre adresse de portefeuille",
     "Waggle": "Waggle",