main feed works again

DemocracyEarth · Jun 20, 2018 · b289ef1 · b289ef1
1 parent 0ffecb1
commit b289ef1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/imports/ui/templates/components/decision/ledger/ledger.html b/imports/ui/templates/components/decision/ledger/ledger.html
@@ -44,7 +44,7 @@ <h5>{{_ 'votes'}}</h5>
           <h5>{{_ 'recent-activity'}}</h5>
         </div>
         <div id="non-editable-feed" class="ledger">
-          {{> tally homeVotes hidePost=true}}
+          {{> tally homeVotes}}
         </div>
         {{> footnote}}
       </div>

diff --git a/imports/ui/templates/components/decision/ledger/ledger.js b/imports/ui/templates/components/decision/ledger/ledger.js
@@ -1,6 +1,7 @@
 import { $ } from 'meteor/jquery';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 
 import { setupSplit } from '/imports/ui/modules/split';

diff --git a/imports/ui/templates/layout/url/home/home.html b/imports/ui/templates/layout/url/home/home.html
@@ -34,13 +34,13 @@
       {{/if}}
 
       <div id="non-editable-feed">
-        {{> feed this}}
+        {{> feed mainFeed}}
       </div>
     </div>
   </div>
 
   <div class="split split-right">
-    {{> ledger options=this.options kind='DELEGATION' singlePost=true hidePost=false peerFeed=false postFeed=false homeFeed=true}}
+    {{> ledger mainLedger}}
   </div>
 
   {{> compose}}

diff --git a/imports/ui/templates/layout/url/home/home.js b/imports/ui/templates/layout/url/home/home.js
@@ -82,6 +82,25 @@ Template.homeFeed.helpers({
     }
     return undefined;
   },
+  mainFeed() {
+    const tally = this;
+    Session.set('longFeedView', this.options.view);
+    console.log(tally.options.view);
+    return tally;
+  },
+  mainLedger() {
+    // options=this.options kind='DELEGATION' singlePost=true hidePost=false peerFeed=false postFeed=false homeFeed=true
+    const tally = this;
+    return {
+      options: tally.options,
+      kind: 'DELEGATION',
+      singlePost: true,
+      hidePost: false,
+      peerFeed: false,
+      postFeed: false,
+      homeFeed: true,
+    };
+  },
 });
 
 Template.postFeed.onCreated(function () {

diff --git a/imports/ui/templates/widgets/feed/feed.js b/imports/ui/templates/widgets/feed/feed.js
@@ -76,19 +76,6 @@ Template.feed.onRendered(function () {
     if (count.ready()) {
       instance.count.set(Counts.get('feedItems'));
     }
-/*
-    if (Meteor.user()) {
-      const draft = instance.subscribe('contractDrafts', { view: 'contractByKeyword', keyword: `draft-${Meteor.userId()}` });
-      if (draft.ready()) {
-        const draftContract = Contracts.findOne({ keyword: `draft-${Meteor.userId()}` });
-        if (draftContract) {
-          Session.set('draftContract', draftContract);
-        } else {
-          Session.set('draftContract', createContract());
-        }
-      }
-    }
-  */
   });
 });
 

diff --git a/imports/ui/templates/widgets/feed/paginator.js b/imports/ui/templates/widgets/feed/paginator.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { $ } from 'meteor/jquery';
 import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
 import { ReactiveVar } from 'meteor/reactive-var';
 
 import { gui } from '/lib/const';
@@ -63,6 +64,8 @@ Template.paginator.helpers({
     let nextSkip = (this.options.skip + gui.ITEMS_PER_PAGE);
     if (nextSkip > this.count) { nextSkip = this.count; }
     this.options.skip = nextSkip;
+    this.options.view = Session.get('longFeedView');
+    console.log(`nextOptions: ${JSON.stringify(this.options)}`);
     return this.options;
   },
 });