From f22ce389b96214b16a96d6e8cd6692787ef2355f Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Tue, 7 Nov 2017 16:36:35 -0500 Subject: [PATCH] meteor 1.6 --- .meteor/packages | 25 +++--- .meteor/release | 2 +- .meteor/versions | 88 ++++++++++--------- imports/ui/css/earth.css | 12 ++- .../components/identity/card/card.html | 5 ++ .../templates/layout/navigation/navigation.js | 5 +- imports/ui/templates/widgets/feed/feed.js | 1 + 7 files changed, 79 insertions(+), 59 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 9ac03279c..55d801501 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -6,10 +6,10 @@ # meteor libraries -meteor-base@1.1.0 # Packages every Meteor app needs to have +meteor-base@1.2.0 # Packages every Meteor app needs to have tracker@1.1.3 # Meteor's client-side reactive programming library es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers. -ecmascript@0.8.3 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.9.0 # Enable ECMAScript2015+ syntax in app code # standard libraries jquery@1.11.10 # Helpful client-side library @@ -28,7 +28,7 @@ react-template-helper react-meteor-data # data -mongo@1.2.2 # The database Meteor supports right now +mongo@1.3.0 # The database Meteor supports right now aldeed:simple-schema aldeed:collection2 dburles:collection-helpers @@ -42,10 +42,10 @@ tap:i18n # accounts, users session@1.1.7 # Client-side reactive dictionary for your app -accounts-ui@1.1.9 -accounts-password@1.4.0 -accounts-twitter@1.3.0 -accounts-facebook@1.2.1 +accounts-ui@1.2.0 +accounts-password@1.5.0 +accounts-twitter@1.4.0 +accounts-facebook@1.3.0 # mobile mobile-experience@1.0.5 # Packages for a great mobile UX @@ -65,20 +65,21 @@ dburles:factory lh84:medium-editor meteorhacks:search-source check@1.2.5 -ejson@1.0.14 +ejson@1.1.0 houston:admin # meteortoys:allthings edgee:slingshot -http@1.2.12 +http@1.3.0 email@1.2.3 meteorhacks:ssr service-configuration@1.0.11 -shell-server@0.2.4 +shell-server@0.3.0 xolvio:cleaner practicalmeteor:chai dispatch:mocha-phantomjs reactive-var@1.0.11 -reactive-dict@1.1.9 +reactive-dict@1.2.0 facebook-config-ui@1.0.0 twitter-config-ui@1.0.0 -dynamic-import@0.1.3 +dynamic-import@0.2.0 +mdg:meteor-apm-agent diff --git a/.meteor/release b/.meteor/release index 099d5b9c0..0fa8d22dd 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.5.2.2 +METEOR@1.6 diff --git a/.meteor/versions b/.meteor/versions index a6c3141a1..33f228067 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,61 +1,60 @@ -accounts-base@1.3.4 -accounts-facebook@1.2.1 +accounts-base@1.4.0 +accounts-facebook@1.3.0 accounts-oauth@1.1.15 -accounts-password@1.4.0 -accounts-twitter@1.3.0 -accounts-ui@1.1.9 -accounts-ui-unstyled@1.2.1 +accounts-password@1.5.0 +accounts-twitter@1.4.0 +accounts-ui@1.2.0 +accounts-ui-unstyled@1.3.0 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 aldeed:schema-index@1.1.1 aldeed:simple-schema@1.5.3 -allow-deny@1.0.9 +allow-deny@1.1.0 autoupdate@1.3.12 -babel-compiler@6.20.0 -babel-runtime@1.0.1 +babel-compiler@6.24.7 +babel-runtime@1.1.1 base64@1.0.10 binary-heap@1.0.10 blaze@2.3.2 blaze-html-templates@1.1.2 blaze-tools@1.0.10 -boilerplate-generator@1.2.0 +boilerplate-generator@1.3.0 caching-compiler@1.1.9 caching-html-compiler@1.1.2 callback-hook@1.0.10 cfs:http-methods@0.0.32 check@1.2.5 -coffeescript@1.12.7_1 -coffeescript-compiler@1.12.7_1 +coffeescript@1.12.6_1 dburles:collection-helpers@1.1.0 dburles:factory@1.1.0 dburles:mongo-collection-instances@0.3.5 -ddp@1.3.1 -ddp-client@2.1.3 -ddp-common@1.2.9 +ddp@1.4.0 +ddp-client@2.2.0 +ddp-common@1.3.0 ddp-rate-limiter@1.0.7 -ddp-server@2.0.2 +ddp-server@2.1.0 deps@1.0.12 diff-sequence@1.0.7 dispatch:mocha-phantomjs@0.1.9 dispatch:phantomjs-tests@0.0.7 -dynamic-import@0.1.3 -ecmascript@0.8.3 -ecmascript-runtime@0.4.1 -ecmascript-runtime-client@0.4.3 -ecmascript-runtime-server@0.4.1 +dynamic-import@0.2.0 +ecmascript@0.9.0 +ecmascript-runtime@0.5.0 +ecmascript-runtime-client@0.5.0 +ecmascript-runtime-server@0.5.0 edgee:slingshot@0.7.1 -ejson@1.0.14 +ejson@1.1.0 email@1.2.3 es5-shim@4.6.15 facebook-config-ui@1.0.0 -facebook-oauth@1.3.2 +facebook-oauth@1.4.0 geojson-utils@1.0.10 hot-code-push@1.0.4 houston:admin@2.0.7 html-tools@1.0.11 htmljs@1.0.11 -http@1.2.12 +http@1.3.0 id-map@1.0.9 iron:controller@1.0.12 iron:core@1.0.11 @@ -68,35 +67,38 @@ iron:url@1.1.0 jquery@1.11.10 lai:collection-extensions@0.2.1_1 launch-screen@1.1.1 -less@2.7.9 +less@2.7.11 lh84:medium-editor@5.4.0 livedata@1.0.18 -localstorage@1.1.1 -logging@1.1.17 +localstorage@1.2.0 +logging@1.1.19 +mdg:meteor-apm-agent@3.1.0 mdg:validated-method@1.1.0 mdg:validation-error@0.5.1 -meteor@1.7.2 -meteor-base@1.1.0 +meteor@1.8.1 +meteor-base@1.2.0 +meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:search-source@1.4.2 meteorhacks:ssr@2.2.0 meteorspark:util@0.2.0 minifier-css@1.2.16 -minimongo@1.3.2 +minimongo@1.4.0 mobile-experience@1.0.5 mobile-status-bar@1.0.14 -modules@0.10.0 -modules-runtime@0.8.0 -mongo@1.2.2 -mongo-dev-server@1.0.1 +modules@0.11.0 +modules-runtime@0.9.0 +mongo@1.3.0 +mongo-dev-server@1.1.0 mongo-id@1.0.6 +mongo-livedata@1.0.12 mrt:jquery-ui@1.9.2 mystor:device-detection@0.2.0 npm-bcrypt@0.9.3 -npm-mongo@2.2.30 -oauth@1.1.13 -oauth1@1.1.11 -oauth2@1.1.11 +npm-mongo@2.2.33 +oauth@1.2.0 +oauth1@1.2.0 +oauth2@1.2.0 observe-sequence@1.0.16 ordered-dict@1.0.9 practicalmeteor:chai@2.1.0_1 @@ -104,14 +106,14 @@ practicalmeteor:loglevel@1.2.0_2 practicalmeteor:mocha@2.4.5_6 practicalmeteor:mocha-core@1.0.1 practicalmeteor:sinon@1.14.1_2 -promise@0.9.0 +promise@0.10.0 raix:eventemitter@0.1.3 rajit:bootstrap3-datepicker@1.7.1 random@1.0.10 rate-limit@1.0.8 -react-meteor-data@0.2.13 +react-meteor-data@0.2.15 react-template-helper@0.2.9 -reactive-dict@1.1.9 +reactive-dict@1.2.0 reactive-var@1.0.11 reload@1.1.11 retry@1.0.9 @@ -119,7 +121,7 @@ routepolicy@1.0.12 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 -shell-server@0.2.4 +shell-server@0.3.0 spacebars@1.0.15 spacebars-compiler@1.1.3 srp@1.0.10 @@ -139,6 +141,6 @@ ui@1.0.13 underscore@1.0.10 url@1.1.0 velocityjs:velocityjs@1.2.1 -webapp@1.3.19 +webapp@1.4.0 webapp-hashing@1.0.9 xolvio:cleaner@0.3.1 diff --git a/imports/ui/css/earth.css b/imports/ui/css/earth.css index 68680beaa..30757ad84 100755 --- a/imports/ui/css/earth.css +++ b/imports/ui/css/earth.css @@ -3591,7 +3591,7 @@ blockquote { .login { width: 100%; - padding: 10px 10px 5px; + padding: 5px 5px 0px; float: left; font-size: 14px; text-align: center; @@ -3652,6 +3652,13 @@ blockquote { float: left; } +.login-label.title-label { + margin: 5px -20px 10px; + padding: 5px 20px; + border-bottom: 1px dotted #6c5b7c; + text-align: left; +} + .authenticate { display: inline-block; margin-right: auto; @@ -5981,6 +5988,9 @@ blockquote { .actor.actor-score { right: 0px; } + .avatar-icon-box { + max-height: 24px; + } } @media (max-width: 479px) { diff --git a/imports/ui/templates/components/identity/card/card.html b/imports/ui/templates/components/identity/card/card.html index 03744c76c..5c25316b5 100644 --- a/imports/ui/templates/components/identity/card/card.html +++ b/imports/ui/templates/components/identity/card/card.html @@ -3,6 +3,11 @@ {{> avatar profile=this includeName=true includeNation=true editable=false disabled=true includeRole=false}} {{#if currentUser}} {{#unless myself}} + +
+ {{_ 'delegation-status'}} +
+ {{#with voteSettings}} {{> liquid _id=this.voteId sourceId=this.sourceId contract=contract targetId=this.targetId wallet=this.wallet editable=true}} {{/with}} diff --git a/imports/ui/templates/layout/navigation/navigation.js b/imports/ui/templates/layout/navigation/navigation.js index 6646d6222..8d1a2df5c 100644 --- a/imports/ui/templates/layout/navigation/navigation.js +++ b/imports/ui/templates/layout/navigation/navigation.js @@ -62,7 +62,8 @@ function hideBar() { * @summary verifies if current screen should have back button on navbar */ function displayBackButton() { - return (Meteor.Device.isPhone() && (Router.current().url.search('/idea/') >= 0 || Router.current().url.search('/peer/') >= 0)); + return false; + // return (Meteor.Device.isPhone() && (Router.current().url.search('/idea/') >= 0 || Router.current().url.search('/peer/') >= 0)); } /** @@ -127,7 +128,7 @@ Template.navigation.events({ Session.set('showPostEditor', false); } else if (displayBackButton()) { window.history.back(); - } else if (Session.get('navbar').action === 'SIDEBAR') { + } else { // if (Session.get('navbar').action === 'SIDEBAR') toggleSidebar(); } }, diff --git a/imports/ui/templates/widgets/feed/feed.js b/imports/ui/templates/widgets/feed/feed.js index 3af9fffab..f7582b886 100644 --- a/imports/ui/templates/widgets/feed/feed.js +++ b/imports/ui/templates/widgets/feed/feed.js @@ -11,6 +11,7 @@ import './feedEmpty.js'; Template.feed.helpers({ item() { const feed = Contracts.find(this.query, { sort: this.sort, skip: this.skip, limit: this.limit }).fetch(); + console.log(feed); if (feed.length === 0) { Session.set('emptyFeed', true); } else {