jarvis implementation

api/controllers/FlagController.js

@@ -17,6 +17,7 @@ module.exports = {
           or: [
             {english: {contains: word}},
             {thai: {contains: word}},
+            {iso2: word},
           ]
         },
         sort: {

api/controllers/ObjReferenceController.js

@@ -0,0 +1,11 @@
+/**
+ * ObjReferenceController
+ *
+ * @description :: Server-side logic for managing objreferences
+ * @help        :: See http://sailsjs.org/#!/documentation/concepts/Controllers
+ */
+
+module.exports = {
+	
+};
+

api/controllers/ObjRevisionController.js

@@ -0,0 +1,11 @@
+/**
+ * ObjRevisionController
+ *
+ * @description :: Server-side logic for managing objrevisions
+ * @help        :: See http://sailsjs.org/#!/documentation/concepts/Controllers
+ */
+
+module.exports = {
+	
+};
+

api/controllers/UserActivityController.js

@@ -0,0 +1,11 @@
+/**
+ * UserActivityController
+ *
+ * @description :: Server-side logic for managing useractivities
+ * @help        :: See http://sailsjs.org/#!/documentation/concepts/Controllers
+ */
+
+module.exports = {
+	
+};
+

api/models/ObjReference.js

@@ -0,0 +1,14 @@
+/**
+* ObjReference.js
+*
+* @description :: TODO: You might write a short summary of how this model works and what it represents here.
+* @docs        :: http://sailsjs.org/#!documentation/models
+*/
+
+module.exports = {
+  connection: 'jarvisBlackboard',
+  attributes: {
+
+  }
+};
+

api/models/ObjRevision.js

@@ -0,0 +1,14 @@
+/**
+* ObjRevision.js
+*
+* @description :: TODO: You might write a short summary of how this model works and what it represents here.
+* @docs        :: http://sailsjs.org/#!documentation/models
+*/
+
+module.exports = {
+  connection: 'jarvisBlackboard',
+  attributes: {
+
+  }
+};
+

api/models/UserActivity.js

@@ -0,0 +1,14 @@
+/**
+* UserActivity.js
+*
+* @description :: TODO: You might write a short summary of how this model works and what it represents here.
+* @docs        :: http://sailsjs.org/#!documentation/models
+*/
+
+module.exports = {
+  connection: 'jarvisBlackboard',
+  attributes: {
+
+  }
+};
+

config/bootstrap.js

@@ -13,5 +13,6 @@ module.exports.bootstrap = function(cb) {
 
   // It's very important to trigger this callback method when you are finished
   // with the bootstrap!  (otherwise your server will never lift, since it's waiting on the bootstrap)
+  sails.hooks.http.app.set('trust proxy', true);
   cb();
 };

config/connections.js

@@ -59,13 +59,20 @@ module.exports.connections = {
 
   hackintoshMongo: {
     adapter: 'sails-mongo',
-    host: '10hackintosh.vnll',
+    host: '10hackintosh',
     port: 27017,
     // user: 'username',
     // password: 'password',
-    database: 'feeder',
+    database: 'sails',
+  },
+  jarvisBlackboard: {
+    adapter: 'sails-mongo',
+    host: '10hackintosh',
+    port: 27017,
+    // user: 'username',
+    // password: 'password',
+    database: 'jarvis-bb',
   },
-
   /***************************************************************************
   *                                                                          *
   * PostgreSQL is another officially supported relational database.          *

config/env/development.js

@@ -18,7 +18,8 @@ module.exports = {
    ***************************************************************************/
 
   models: {
-    connection: 'hackintoshMongo'
+    connection: 'jarvisBlackboard',
+    connection: 'hackintoshMongo',
   }
 
 };

config/env/production.js

@@ -18,6 +18,7 @@ module.exports = {
    ***************************************************************************/
 
   models: {
+    connection: 'jarvisBlackboard',
     connection: 'nj2mongo'
   },
 

config/env/production/connections.js

@@ -1,12 +1,20 @@
 module.exports.connections = {
 
-  njMongo: {
+  nj2mongo: {
     adapter: 'sails-mongo',
     host: 'nj2',
     port: 27017,
     // user: 'username',
     // password: 'password',
     database: 'bbSailer',
-  }
+  },
+  jarvisBlackboard: {
+    adapter: 'sails-mongo',
+    host: 'nj2',
+    port: 27017,
+    // user: 'username',
+    // password: 'password',
+    database: 'jarvis-bb',
+  },
 
 };

views/homepage.ejs

@@ -13,7 +13,7 @@ setTimeout(function sunrise () {
 <div class="default-page">
     <div class="header">
         <h1 id="main-title" class="container"><%= __('A brand new app.') %></h1>
-        <h3 class="container">You're looking at: <code><%= view.pathFromApp + '.' +view.ext %></code></h3>
+        <h3 class="container">You're looking at: <code><%= view.pathFromApp + '.' +view.ext %></code> <%= req.ip %></h3>
     </div>
     <div class="main container clearfix">
         <!-- <h1>Getting started</h1>