Finished main view.

samwightt · samwightt · commit cd8932b13953 · 2019-02-03T00:02:18.000-06:00
diff --git a/.meteor/packages b/.meteor/packages
@@ -19,3 +19,4 @@ shell-server@0.4.0            # Server-side component of the `meteor shell` comm
 
 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
+reactive-dict
diff --git a/.meteor/versions b/.meteor/versions
@@ -57,6 +57,7 @@ observe-sequence@1.0.16
 ordered-dict@1.1.0
 promise@0.11.2
 random@1.1.0
+reactive-dict@1.2.1
 reactive-var@1.0.11
 reload@1.2.0
 retry@1.1.0
diff --git a/client/blobs/components/blob.html b/client/blobs/components/blob.html
@@ -0,0 +1,28 @@
+<template name="singlenumber">
+  <div class="item singleitem">
+    <i class="phone icon"></i>
+    <div class="content">
+      <h4 class="header">{{document.phone}}</h4>
+      <div class="list">
+        {{#each blob in blobs}}
+          {{> blobview blob=blob}}
+        {{/each}}
+      </div>
+    </div>
+  </div>
+  {{#if opened}}
+    <a id="showMore" class="ui button primary basic">View More</a>
+  {{else}}
+    <a id="showMore" class="ui primary basic button">View Less</a>
+  {{/if}}
+</template>
+
+<template name="blobview">
+  <div class="item" id="blob-">
+    <i class="circle outline icon"></i>
+    <div class="content">
+      <div class="header">{{blob.content}}</div>
+      <div class="description">Location</div>
+    </div>
+  </div>
+</template>
diff --git a/client/blobs/components/blob.js b/client/blobs/components/blob.js
@@ -0,0 +1,37 @@
+import './blob.html'
+import { Template } from 'meteor/templating';
+import { ReactiveDict } from 'meteor/reactive-dict';
+
+Template.singlenumber.onCreated(function singlenumberOnCreated() {
+  this.state = new ReactiveDict();
+  this.state.set('buttonClosed', true);
+});
+
+Template.singlenumber.onRendered(function() {
+  this.$('.singleitem').transition('fade in up');
+})
+
+Template.singlenumber.helpers({
+  blobs: function() {
+    const instance = Template.instance();
+    if (instance.state.get('buttonClosed')) {
+      return this.document.blobs.sort(function(a, b) { return b.lastEdited - a.lastEdited }).slice(0, 3);
+    }
+    else return this.document.blobs.sort(function(a, b) { return b.lastEdited - a.lastEdited });
+  },
+  opened: function() {
+    return Template.instance().state.get('buttonClosed');
+  }
+});
+
+Template.singlenumber.events({
+  'click #showMore': function(e) {
+    e.preventDefault();
+    const instance = Template.instance();
+    instance.state.set('buttonClosed', !instance.state.get('buttonClosed'));
+  }
+});
+
+Template.blobview.onRendered(function() {
+  this.$('.item').transition('fade in up');
+});
diff --git a/client/blobs/showBlobs.html b/client/blobs/showBlobs.html
@@ -1,14 +1,9 @@
 <template name="showblobs">
-  <div class="ui items">
-    <h2 class="ui dividing header">Info</h2>
+  <h2 class="ui dividing header">Inbox</h2>
+  <div class="ui list">
     {{#each document in blobs}}
-      <div class="item">
-        <div class="middle aligned content">
-          <div class="header">{{document.phone}}</div>
-          {{#each blob in document.blobs}}
-            <p>{{blob}}</p>
-          {{/each}}
-        </div>
+      <div class="ui raised segment">
+        {{> singlenumber document=document}}
       </div>
     {{/each}}
   </div>
diff --git a/client/blobs/showBlobs.js b/client/blobs/showBlobs.js
@@ -1,9 +1,10 @@
 import './showBlobs.html';
+import './components/blob.js';
 import { Template } from 'meteor/templating';
 import { Conversations } from '../collections.js';
 
 Template.showblobs.helpers({
   blobs: function() {
-    return Conversations.find({state: {$gte: 2}});
+    return Conversations.find({state: {$gte: 2}}, {sort: { lastEdited: -1 }});
   }
-})
+});
diff --git a/client/main.css b/client/main.css
@@ -1,3 +1,3 @@
 .ui#content {
-  padding-top: 55px;
+  padding-top: 95px;
 }
diff --git a/client/main.html b/client/main.html
@@ -3,20 +3,23 @@
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css">
   </head>
 <body>
-  <div class="ui top red icon inverted fixed menu">
+  <div class="ui top red icon inverted labeled fixed menu">
     <div class="ui container">
       <div class="item">
-        bAware
+        <img src="/emergency.png">
       </div>
       <div class="right menu">
         <a class="item">
           <i class="icon home"></i>
+          Home
         </a>
         <a class="item">
           <i class="plus square icon"></i>
+          Add Citizens
         </a>
         <a class="item">
           <i class="bullhorn icon"></i>
+          Send Alerts
         </a>
       </div>
     </div>
diff --git a/client/stats/received.js b/client/stats/received.js
@@ -6,4 +6,8 @@ Template.received.helpers({
   numReceived: function() {
     return Conversations.find({state: { "$gte": 3 }}).count();
   }
-})
+})
+
+Template.received.onRendered(function() {
+  this.$('.segment').transition('fade in up');
+});
diff --git a/client/stats/sent.js b/client/stats/sent.js
@@ -6,4 +6,8 @@ Template.sent.helpers({
   numSent: function() {
     return Conversations.find({}).count();
   }
+});
+
+Template.sent.onRendered(function() {
+  this.$('.segment').transition('fade in up');
 })
diff --git a/public/emergency.png b/public/emergency.png

Original file line number	Diff line number	Diff line change
@@ -19,3 +19,4 @@ [email protected] # Server-side component of the `meteor shell` comm
`19`	`19`
`20`	`20`	`[email protected] # Publish all data to the clients (for prototyping)`
`21`	`21`	`[email protected] # Allow all DB writes from clients (for prototyping)`
	`22`	`+reactive-dict`
-Original file line number
+Diff line change
 [email protected]
 [email protected]
 [email protected]
 +[email protected]
 [email protected]
 [email protected]
 [email protected]
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`.ui#content {`
`2`		`- padding-top: 55px;`
	`2`	`+ padding-top: 95px;`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,8 @@ Template.sent.helpers({`
`6`	`6`	`numSent: function() {`
`7`	`7`	`return Conversations.find({}).count();`
`8`	`8`	`}`
	`9`	`+});`
	`10`	`+`
	`11`	`+Template.sent.onRendered(function() {`
	`12`	`+ this.$('.segment').transition('fade in up');`
`9`	`13`	`})`