electron fix links

gnosis · May 25, 2018 · 0e589bf · 0e589bf
1 parent 87cdcc1
commit 0e589bf
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 4 deletions.
diff --git a/dapp/controllers/footerCtrl.js b/dapp/controllers/footerCtrl.js
@@ -0,0 +1,26 @@
+(
+    function () {
+      angular
+      .module('multiSigWeb')
+      .controller('footerCtrl', function ($scope) {
+        $scope.navCollapsed = true;
+        $scope.isElectron = isElectron;
+        console.log(isElectron, shell)
+
+
+        // electron show terms and policy
+        $scope.openTerms = function() {
+            shell.openExternal('https://wallet.gnosis.pm/TermsofUseMultisig.pdf');
+        }
+
+        $scope.openPolicy = function () {
+            shell.openExternal('https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
+        }
+
+        $scope.openImprint = function () {
+            shell.openExternal('https://wallet.gnosis.pm/imprint.html');
+        }
+
+      });
+    }
+)();
diff --git a/dapp/controllers/navCtrl.js b/dapp/controllers/navCtrl.js
@@ -61,6 +61,14 @@
                 // call web3 selection modal
                 showWeb3SelectionModal();
               };
+
+              $scope.openTerms = function() {
+                shell.openExternal('https://wallet.gnosis.pm/TermsofUseMultisig.pdf');
+              }
+
+              $scope.openPolicy = function () {
+                shell.openExternal('https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
+              }
             }
           });
         }

diff --git a/dapp/index.html b/dapp/index.html
@@ -52,6 +52,7 @@
         var ethereumWallet = require('ethereumjs-wallet');
         var hdkeyring = require('eth-hd-keyring');
         var encryptor = require('browser-passworder');
+        var shell = require('electron').shell;
       }
       else {
         document.write('<script src="./node_modules/ledger-wallet-provider/dist/ledgerwallet.js"><' + '/script>');
@@ -113,6 +114,7 @@
     <script src="./controllers/confirmMultisigTransactionOfflineCtrl.js"></script>
     <script src="./controllers/editABICtrl.js"></script>
     <script src="./controllers/accountCtrl.js"></script>
+    <script src="./controllers/footerCtrl.js"></script>
     <script src="./expose.js"></script>
     <script>
       if (isElectron) {
@@ -184,10 +186,13 @@
       <ng-view></ng-view>
     </div>
     <footer>
-        <nav class="imprint">
-          <div class="container">
+        <nav class="imprint" ng-controller="footerCtrl">
+          <div class="container" ng-hide="isElectron">
               Please read our full <a href="https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf" target="_blank" >Privacy Policy</a> and <a href="/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a>. - <a target="_blank" href="/imprint.html">Imprint</a>
           </div>
+          <div class="container" ng-show="isElectron">
+            Please read our full <a ng-click="openPolicy()">Privacy Policy</a> and <a ng-click="openTerms()">Terms of Use</a>. - <a ng-click="openImprint()">Imprint</a>
+        </div>
           </nav>
     </footer>
   </body>

diff --git a/dapp/package.json b/dapp/package.json
@@ -18,7 +18,7 @@
     "install-electron": "npm install && ./node_modules/.bin/electron-rebuild",
     "electron-rebuild": "electron-rebuild --force --module_dir . -w node-hid -e node_modules/electron && npm rebuild leveldown scrypt",
     "start": "http-server -a 0.0.0.0 -p 5000",
-    "start-electron": "NODE_ENV=development node_modules/.bin/electron .",
+    "start-electron": "NODE_ENV=development electron .",
     "package-linux-x64": "electron-packager . MultisigWallet --prune --ignore=tests/* --ignore=testrpc.sh --platform=linux --out=./dist --overwrite=true --asar=true",
     "package-osx": "electron-packager . MultisigWallet --prune --ignore=tests/* --ignore=testrpc.sh --platform=darwin --out=./dist --overwrite=true --asar=true",
     "package-win": "electron-packager . MultisigWallet --prune --ignore=tests/* --ignore=testrpc.sh --platform=win32 --out=./dist --overwrite=true --asar=true",

diff --git a/dapp/partials/modals/disclaimerElectron.html b/dapp/partials/modals/disclaimerElectron.html
@@ -5,7 +5,7 @@
   </div>
   <div class="modal-body">
     <p>
-        For using the application, you have to agree with our <a href="https://wallet.gnosis.pm/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a> and <a href="https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf" target="_blank" >Privacy Policy.</a>
+        For using the application, you have to agree with our <a ng-click="openTerms()">Terms of Use</a> and <a ng-click="openPolicy()">Privacy Policy.</a>
     </p>
     <p>
       All smart contracts have been audited carefully multiple times.