Add times for api debug and update announcements and index

Author: keitharm

api/0.1/Generator.js

@@ -29,6 +29,7 @@ const Generator = function(name, options) {
   this.cache        = {};
   this.snippetCache = {};
   this.timeoutCache = {};
+  this.times = {};
 
   this.context         = vm.createContext(this.availableFuncs());
   this.originalContext = [
@@ -205,6 +206,9 @@ util.inherits(Generator, EventEmitter);
 
 // Receives the query which contains API, owner, and reqest data
 Generator.prototype.instruct = function(options, done) {
+  this.times.instruct = {
+    start: new Date().getTime()
+  };
 
   this.options = options || {};
   this.results = Number(this.options.results);
@@ -265,11 +269,16 @@ Generator.prototype.instruct = function(options, done) {
   ], (err, results) => {
     // Make sure user is populated with dummy user if no real user provided
     this.user = this.user || {id: -1, apikey: ''};
+    this.times.instruct = new Date().getTime() - this.times.instruct.start;
     done(err);
   });
 };
 
 Generator.prototype.generate = function(cb) {
+  this.times.generate = {
+    start: new Date().getTime()
+  };
+
   this.results = this.results || 1;
   let output   = [];
 
@@ -718,14 +727,16 @@ Generator.prototype.updateRequires = function() {
 };
 
 Generator.prototype.returnResults = function(err, output, cb) {
+  this.times.generate = new Date().getTime() - this.times.generate.start;
   if (err === null) {
     let json = {
       results: output,
       info: {
         seed: String(this.seed),
         results: numeral(this.results).format('0,0'),
         page: numeral(this.page).format('0,0'),
-        version: this.version
+        version: this.version,
+        time: this.times
       }
     };
 

views/pages/dashboard.ejs

@@ -22,16 +22,16 @@
       You have used <span class='<%= session.user.memory > session.tier.memory ? "red" : "green" %>'><%= filesize(session.user.memory) %></span> of your <span class="green"><%= session.tier.memory === 0 ? 'unlimited' : filesize(session.tier.memory) %></span> List memory.<br>
 
       You have used <span id='quotaResults' class='<%= session.tier.snippets !== 0 && session.user.snippets > session.tier.snippets ? "red" : "green" %>'><%= session.user.snippets %></span> of your <span id='tierResults' class="green"><%= session.tier.snippets === 0 ? 'unlimited' : session.tier.snippets %></span> Snippets.<br>
-      <div class="ads">
-        <% include ../snippets/ads %>
-      </div>
       <div class="announcements">
         <h3>Announcements</h3>
         <div class="entry">
-          <span class="title"></span></span>
-          <p></p>
+          <span class="title">Welcome to the Beta! - <span class="date" data-date="07-29-2016 12:28:03"></span></span>
+          <p>Thanks for trying out the beta!<br><br>If you have any questions, feedback, etc. send an email to <a href="mailto:[email protected]" class="green">[email protected]</a>.<br><br>Thanks!<br>- Keith</p>
         </div>
       </div>
+      <div class="ads">
+        <% include ../snippets/ads %>
+      </div>
     </div>
   </div>
   <% include ../snippets/footer %>

views/pages/index.ejs

@@ -15,9 +15,15 @@
     <section class="tryitout">
       <h4>Try it out!</h4>
       <pre id="aceEditor" name="code">let age   = random.numeric(18, 65);
-api.age   = age; // Attached to api object
+api.age   = age;        // Attached to implicit api object
 api.phone = phoneNum(); // Calling user defined function
 
+api.favoriteColor = list([
+    'red', 'orange', 'yellow',
+    'green', 'blue', 'indigo',
+    'violet'
+]);
+
 function phoneNum(format) {
   format = format || "(xxx) xxx-xxxx";
   return String(format).split('').map(digit => {