Merge pull request #444 from DemocracyEarth/landing

Landing Mode for Sovereign navigation

.meteor/packages

@@ -12,7 +12,7 @@
 [email protected]             # Packages every Meteor app needs to have
 [email protected]                 # Meteor's client-side reactive programming library
 [email protected]                # ECMAScript 5 compatibility for older browsers.
-[email protected].0             # Enable ECMAScript2015+ syntax in app code
+[email protected].3             # Enable ECMAScript2015+ syntax in app code
 
 # standard libraries
 [email protected]                # Helpful client-side library
@@ -22,7 +22,7 @@ [email protected]    # Compile .html files into Meteor Blaze views
 mrt:jquery-ui
 rajit:bootstrap3-datepicker
 mystor:device-detection
-[email protected].0
+[email protected].2
 # [email protected]
 velocityjs:velocityjs
 
@@ -44,7 +44,7 @@ iron:router
 tap:i18n
 
 # accounts, users
-session@1.1.8                 # Client-side reactive dictionary for your app
+session@1.2.0                 # Client-side reactive dictionary for your app
 [email protected]
 [email protected]
 [email protected]

.meteor/release

@@ -1 +1 @@
-[email protected]
+[email protected].0.1

.meteor/versions

@@ -12,7 +12,7 @@ aldeed:[email protected]
 aldeed:[email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -35,11 +35,11 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 dispatch:[email protected]
 dispatch:[email protected]
 [email protected]
-[email protected].1
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -91,7 +91,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -127,7 +127,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-session@1.1.8
+session@1.2.0
 [email protected]
 [email protected]
 [email protected]
@@ -151,7 +151,7 @@ [email protected]
 [email protected]
 [email protected]
 velocityjs:[email protected]
-[email protected].0
+[email protected].1
 [email protected]
 xolvio:[email protected]
 xolvio:[email protected]

i18n/en.i18n.json

@@ -611,11 +611,20 @@
   "get-dapp-browser": "Install recommended Dapp Browser",
   "get-web3-wallet": "Install recommended Web3 Wallet",
   "ethereum-dapp-browsers": "Sign In with Browser",
-  "ethereum-web3-wallet": "Sign In with Wallet",
+  "ethereum-web3-wallet": "Ethereum Sign In",
   "feed-token-posts": "Posts with {{asset}} Token",
   "feed-geo-posts": "Posts from {{asset}}",
   "ledger-token-posts": "{{asset}} Transactions",
   "ledger-geo-posts": "Transactions from {{asset}}",
   "feed-peer-posts": "Posts by @{{asset}}",
-  "ledger-peer-posts": "Transactions by @{{asset}}"
+  "ledger-peer-posts": "Transactions by @{{asset}}",
+  "start-a-democracy": "Start an Organization",
+  "landing-title": "Governance for <br>decentralized networks.",
+  "landing-tagline": "Democracy Earth enables token-powered commmunity participation. Built with open source technology over peer to peer protocols.",
+  "join": "Join Now",
+  "email": "E-mail",
+  "home": "Home",
+  "paper": "Paper",
+  "code": "Code",
+  "foundation": "Foundation"
 }

imports/startup/both/modules/metamask.js

@@ -3,18 +3,15 @@ import { Accounts } from 'meteor/accounts-base';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { Router } from 'meteor/iron:router';
 import { Session } from 'meteor/session';
+import { $ } from 'meteor/jquery';
+
 import { displayModal } from '/imports/ui/modules/modal';
 import { transact } from '/imports/api/transactions/transaction';
 import { displayNotice } from '/imports/ui/modules/notice';
 import { addDecimal, getCoin } from '/imports/api/blockchain/modules/web3Util';
-
-import { createDelegation } from '/imports/startup/both/modules/Contract';
+import { animatePopup } from '/imports/ui/modules/popup';
 import { Transactions } from '/imports/api/transactions/Transactions';
 
-import { token } from '/lib/token';
-import { defaultSettings } from '/lib/const';
-import { convertToSlug } from '/lib/utils';
-
 
 import abi from 'human-standard-token-abi';
 
@@ -88,6 +85,15 @@ const _getTransactionStatus = (hash) => {
   return false;
 };
 
+/**
+* @summary hide login forms
+*/
+const _hideLogin = () => {
+  $('.right').scrollTop(0);
+  Session.set('userLoginVisible', false);
+  animatePopup(false, 'user-login');
+};
+
 /**
 * @summary syncs app with blockchain data
 * @param {object} contract to verify if still pending
@@ -429,6 +435,7 @@ if (Meteor.isClient) {
                 methodArguments,
               });
               Router.go('/');
+              _hideLogin();
             },
           });
         } else {
@@ -486,3 +493,4 @@ export const transactWithMetamask = _transactWithMetamask;
 export const getTransactionStatus = _getTransactionStatus;
 export const setupWeb3 = _web3;
 export const syncBlockchain = _syncBlockchain;
+export const hideLogin = _hideLogin;

imports/startup/client/functions.js

@@ -474,7 +474,7 @@ const _getNavbarAction = (path) => {
 const _configNavbar = (label, path) => {
   if (Meteor.Device.isPhone()) {
     if (Session.get('sidebar') === undefined) {
-      Session.set('sidebar', true);
+      if (Meteor.user()) { Session.set('sidebar', true); }
       toggleSidebar();
     }
   } else if (Session.get('sidebar') === undefined) {