diff --git a/.gitignore b/.gitignore index 801902a73..23900fae9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,4 @@ lib/* js/copayBundle.js config.js webapp - +chrome-extension diff --git a/bower.json b/bower.json index 80e3c20d3..7197b53f0 100644 --- a/bower.json +++ b/bower.json @@ -17,6 +17,7 @@ "crypto-js": "http://crypto-js.googlecode.com/files/CryptoJS%20v3.1.2.zip", "sjcl": "1.0.0", "file-saver": "*", - "qrcode-decoder-js": "*" + "qrcode-decoder-js": "*", + "bitcore": "~0.1.19" } } diff --git a/css/main.css b/css/main.css index 18ee8a8c4..f44f11a5e 100644 --- a/css/main.css +++ b/css/main.css @@ -631,3 +631,7 @@ p.dr-notification-text { margin-top: -5px; font-size: 12px; } + +input.ng-invalid-wallet-secret { + background: #FFB6C1; +} diff --git a/ghpages.sh b/ghpages.sh deleted file mode 100755 index 8aa6e11cd..000000000 --- a/ghpages.sh +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/bash - -#Description: A simple script to compile and copy only the needed files for the web app. - -# Configs -APPDIR="webapp" -LIBDIR="$APPDIR/lib" -DOWNLOADDIR="$APPDIR/download" -ZIPFILE="copay_webapp_.zip" - -OpenColor="\033[" -Red="1;31m" -Yellow="1;33m" -Green="1;32m" -CloseColor="\033[0m" - -# Create/Clean temp dir -echo -e "${OpenColor}${Green}* Checking temp dir...${CloseColor}" -if [ -d $APPDIR ]; then - rm -rf $APPDIR -fi - -mkdir -p $APPDIR - -# Generate and copy bitcore bundle -if [ ! -d node_modules/bitcore ]; then - echo -e "${OpenColor}${Red}X The node_modules/bitcore dir does not exist. \nRun npm install and try again.${CloseColor}" - exit 1 -else - echo -e "${OpenColor}${Green}* Generating bitcore bundle...${CloseColor}" - cd node_modules/bitcore - grunt --target=dev shell - cd ../.. -fi - -# Re-compile copayBundle.js -echo -e "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" -grunt --target=dev shell - -# Copy all app files -echo -e "${OpenColor}${Green}* Copying all app files...${CloseColor}" -cp -af {css,font,img,js,lib,config.js,index.html} $APPDIR -cp -af node_modules/bitcore/browser/bundle.js $LIBDIR/ -mv $LIBDIR/bundle.js $LIBDIR/bitcore.js - -echo -e "${OpenColor}${Green}* Zipping all app files...${CloseColor}" -zip -r $ZIPFILE $APPDIR -mkdir -p $DOWNLOADDIR -mv $ZIPFILE $DOWNLOADDIR - -echo -e "${OpenColor}${Yellow}\nAwesome! You just need to copy and paste the ./webapp content to your local repository and push it.${CloseColor}" diff --git a/img/icons/icon.png b/img/icons/icon.png new file mode 100644 index 000000000..47cdc4b1f Binary files /dev/null and b/img/icons/icon.png differ diff --git a/index-download-chrome.html b/index-download-chrome.html new file mode 100644 index 000000000..675112999 --- /dev/null +++ b/index-download-chrome.html @@ -0,0 +1,22 @@ + + +
+ + +