Merge pull request #418 from loomnetwork/develop

production release: mobile ui and universal signing
loomnetwork · Apr 12, 2019 · be6e50c · be6e50c
2 parents 126f829 + 4057438
commit be6e50c
Show file tree

Hide file tree

Showing 41 changed files with 2,554 additions and 1,046 deletions.
diff --git a/jenkins.sh b/jenkins.sh
@@ -7,6 +7,7 @@ export SENTRY_PROJECT=loomgames-frontend
 
 
 
+PRESET_MOBILE="m-dashboard.dappchains.com"
 PRESET_DEV="dev-dashboard.dappchains.com"
 PRESET_STAGE="rinkeby-dashboard.dappchains.com" #future production
 PRESET_PROD="dashboard.dappchains.com"
@@ -32,6 +33,9 @@ case "$BRANCH_CHOICE" in
   origin/develop|develop)
     FAUCET_PATH="${PRESET_DEV}"
   ;;
+  origin/mobile-ui|mobile-ui)
+    FAUCET_PATH="${PRESET_MOBILE}"
+  ;;
   *)
     echo "Sanity check failed. You are trying to deploy from branch $GIT_BRANCH. Is that intended? If so add it to jenkins.sh so that it does the right thing."
     exit 1

diff --git a/package.json b/package.json
@@ -20,16 +20,17 @@
     "@fortawesome/fontawesome-free-regular": "^5.0.6",
     "@fortawesome/fontawesome-free-solid": "^5.0.6",
     "@fortawesome/vue-fontawesome": "^0.0.22",
-    "@ledgerhq/hw-app-eth": "^4.41.0",
-    "@ledgerhq/hw-transport-u2f": "^4.41.1",
-    "@ledgerhq/web3-subprovider": "^4.41.1",
+    "@ledgerhq/hw-app-eth": "4.48.0",
+    "@ledgerhq/hw-transport-u2f": "4.46.0",
+    "@ledgerhq/web3-subprovider": "^4.48.0",
     "@sentry/browser": "^4.6.1",
     "@types/auth0-lock": "^11.4.9",
     "@types/google-protobuf": "^3.2.7",
     "@types/retry": "^0.10.2",
     "@types/web3": "^1.0.12",
     "@xkeshi/vue-qrcode": "^1.0.0",
     "add": "^2.0.6",
+    "animate.css": "^3.7.0",
     "animejs": "^2.2.0",
     "auth0-js": "^9.8.2",
     "auth0-lock": "^11.11.0",
@@ -44,7 +45,7 @@
     "ethers": "^4.0.26",
     "google-protobuf": "^3.6.0",
     "ledger-wallet-provider": "loomnetwork/ledger-wallet-provider.git",
-    "loom-js": "1.49.3",
+    "loom-js": "^1.49.4",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.2.2",
     "node-sass": "^4.9.0",
@@ -65,6 +66,7 @@
     "vue-clipboard2": "^0.2.1",
     "vue-i18n": "^8.7.0",
     "vue-json-pretty": "^1.4.1",
+    "vue-multiple-progress": "^1.6.0",
     "vue-progressbar": "^0.7.5",
     "vue-property-decorator": "^7.0.0",
     "vue-router": "^3.0.1",

diff --git a/public/index.html b/public/index.html
@@ -26,9 +26,6 @@
       body {
         overflow: hidden;
       }
-      #app {
-        min-width: 470px;
-      }
       #loading_wrapper-outer {
         height: 100vh;
         width: 100vw;

diff --git a/set_eth_addresses.sh b/set_eth_addresses.sh
@@ -1,2 +1,21 @@
-sed -i 's/LOOM_ADDRESS = "[^"]*"/LOOM_ADDRESS = "'$LOOM_ADDRESS'"/' src/store/dappChainStore.js; 
-sed -i 's/GW_ADDRESS = "[^"]*"/GW_ADDRESS = "'$GW_ADDRESS'"/' src/store/dappChainStore.js;
+sed_linux () {
+  sed -i 's/LOOM_ADDRESS = "[^"]*"/LOOM_ADDRESS = "'$LOOM_ADDRESS'"/' src/store/dappChainStore.js; 
+  sed -i 's/GW_ADDRESS = "[^"]*"/GW_ADDRESS = "'$GW_ADDRESS'"/' src/store/dappChainStore.js;  
+}
+
+sed_osx () {
+  gsed -i 's/LOOM_ADDRESS = "[^"]*"/LOOM_ADDRESS = "'$LOOM_ADDRESS'"/' src/store/dappChainStore.js; 
+  gsed -i 's/GW_ADDRESS = "[^"]*"/GW_ADDRESS = "'$GW_ADDRESS'"/' src/store/dappChainStore.js;  
+}
+
+(sed_linux || sed_osx) 2> /dev/null
+
+if [[ -n $LOOM_ADDRESS ]] || [[ -n $GW_ADDRESS ]]
+then
+  echo "============================"
+  echo "LOOM ADDRESS: $LOOM_ADDRESS"
+  echo "GW_ADDRESS:   $GW_ADDRESS"
+  echo "============================"
+fi
+
+
diff --git a/src/App.vue b/src/App.vue
@@ -13,7 +13,21 @@ export default {
   components: {
     Layout,
   },
-}</script>
+}
+</script>
 
 <style lang="scss">
+  @media (max-width: 767px) { 
+    body {
+      background: #9e9e9e12;
+    }
+    .modal-dialog {
+      max-width: 100vw;
+      margin: 0;
+
+      > .modal-content {
+        max-width: 100vw;
+      }
+    }
+  }
 </style>
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
@@ -111,14 +111,9 @@ button {
 }
 
 h1, h2, h3 {
-  color: #fff;
+  //color: #fff;
   // font-family: $font-family-kalisto;
 }
-
-h4, h5, h6, span, p {
-  color: #808080;
-}
-
 .color-blue {
   color: #d3edfc !important;
 }

diff --git a/src/components/FaucetFooter.vue b/src/components/FaucetFooter.vue
@@ -64,6 +64,9 @@ export default class FaucetFooter extends Vue {
       color: #495057; 
     }    
   }
+  a {
+    color: #495057;
+  }
   @media (max-width: 529px) {
     & {
       position: relative;
@@ -130,9 +133,7 @@ p {
   color: white;
 }
 
-a {
-  color: #495057;
-}
+
 
 a.hover-warning:hover {
   text-decoration: none;