Merge pull request #25 from openpearl/develop

v1.2.0

.gitignore

@@ -1,21 +1,23 @@
-scss/_components
-
-www/_templates/
-www/assets/lib
-www/app/bundle.js
-
-node_modules
+*.swp
+*.swo
+*.log
+*.DS_Store
+DS_Store/
+.DS_Store/
 
 .tmp
 .sass-cache
-<%= appPath %>/bower_components
 coverage
 platforms
 resources
 plugins
-*.swp
-*.swo
-*.log
-*.DS_Store
-DS_Store/
-.DS_Store/
+
+node_modules
+bower_components
+<%= appPath %>/bower_components
+
+www/_templates/
+www/assets/lib
+www/app/bundle.js
+
+scss/_components

README.md

@@ -4,25 +4,25 @@ iOS app for your personal assistant to your health.
 
 ## About
 
-PearlClient is the code repository for Pearl's iOS app. Inspired by apps such as [Lark](TODO: Future Link Here), PearlClient wants to bring friendly and intelligent health assistance with an open source community.
+PearlClient is the code repository for Pearl's iOS app. Inspired by apps such as [Lark](http://www.web.lark.com/#top), PearlClient wants to bring friendly and intelligent health assistance with an open source community.
 
 You can find out more about [Pearl at our homepage](https://www.openpearl.org).
 
-Pearl is developed at [Involution Studios](https://www.goinvo.com/) in [Arlington, MA](TODO: Google Maps).
+Pearl is developed at [Involution Studios](http://www.goinvo.com/) in [Arlington, MA](https://goo.gl/XKWvaD).
 
 ## For Developers
 
 ### Setup
 
-* Make sure you have [XCode](TODO: Link to XCode) and [Node.JS](https://www.nodejs.org). 
+* Make sure you have [XCode](https://developer.apple.com/xcode/) and [Node.JS](https://nodejs.org/). 
 
 * Install Ionic in the [following instructions](https://www.youtube.com/watch?v=1RQCjwnlTRk).
 
 * Install all dependencies using `npm install` and `bower install`.
 
 * Run the app in the emulator using `ionic emulate ios`.
 
-  * Additional details can be found at the [Ionic Framework documentation](TODO: Link to Ionic install).
+  * Additional details can be found at the [Ionic Framework documentation](http://ionicframework.com/).
 
 ### Fun Facts
 

bower.json

@@ -13,6 +13,8 @@
     "ng-token-auth": "~0.0.25",
     "angular-cookie": "~4.0.8",
     "angular-toArrayFilter": "~1.0.1",
-    "d3": "~3.5.6"
+    "d3": "~3.5.6",
+    "jquery": "~2.1.4",
+    "angular-local-storage": "~0.2.2"
   }
 }

config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.InvoStudios.Pearl" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.InvoStudios.Pearl" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>Pearl</name>
   <description>
         Your personal health assistant.
@@ -19,17 +19,33 @@
   <preference name="SplashScreenDelay" value="0"/>
   <preference name="keyboardDisplayRequiresUserAction" value="false"/>
   <platform name="ios">
-    <icon src="icons/ios/pearl.png"/>
-    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
-    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
-    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
-    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
-    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
-    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
-    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
-    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
-    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
-    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
+    <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
+    <icon src="resources/ios/icon/[email protected]" width="114" height="114"/>
+    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
+    <icon src="resources/ios/icon/[email protected]" width="80" height="80"/>
+    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
+    <icon src="resources/ios/icon/[email protected]" width="100" height="100"/>
+    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
+    <icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
+    <icon src="resources/ios/icon/[email protected]" width="180" height="180"/>
+    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
+    <icon src="resources/ios/icon/[email protected]" width="144" height="144"/>
+    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
+    <icon src="resources/ios/icon/[email protected]" width="152" height="152"/>
+    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
+    <icon src="resources/ios/icon/[email protected]" width="58" height="58"/>
+    <icon src="resources/ios/icon/[email protected]" width="87" height="87"/>
+    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
+    <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
+    <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
+    <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
+    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+    <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
+    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+    <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
+    <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
+    <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
   </platform>
   <plugin name="cordova-plugin-whitelist" spec="^1.0.0"/>
+  <icon src="resources/ios/icon/[email protected]"/>
 </widget>

karma.conf.js

@@ -55,5 +55,5 @@ module.exports = function(config) {
   // Continuous Integration mode
   // if true, Karma captures browsers, runs the tests and exits
   singleRun: false
-  })
-}
+  });
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pearl-client",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Personal health assistant client for the iOS",
   "author": "David Zhu <[email protected]>",
   "repository": {

plugins.js

@@ -13,35 +13,35 @@ var sys = require('sys')
 var exec = require('child_process').exec;
 
 function createAddRemoveStatement(plugin) {
-    var pluginCmd = 'cordova plugin ' + command + ' ';
-    if(typeof plugin === 'string') {
-        pluginCmd += plugin;
+  var pluginCmd = 'cordova plugin ' + command + ' ';
+  if(typeof plugin === 'string') {
+    pluginCmd += plugin;
+  } else {
+    if(command === 'add') {
+      pluginCmd += plugin.locator + ' ';
+      if(plugin.variables) {
+        Object.keys(plugin.variables).forEach(function(variable){
+          pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
+        });
+      }
     } else {
-        if(command === 'add') {
-            pluginCmd += plugin.locator + ' ';
-            if(plugin.variables) {
-                Object.keys(plugin.variables).forEach(function(variable){
-                    pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
-                });
-            }
-        } else {
-            pluginCmd += plugin.id;
-        }
+      pluginCmd += plugin.id;
     }
+  }
 
-    return pluginCmd;
+  return pluginCmd;
 }
 
 function processPlugin(index) {
-    if(index >= packageJson.cordovaPlugins.length)
-        return;
-
-    var plugin = packageJson.cordovaPlugins[index];
-    var pluginCommand = createAddRemoveStatement(plugin);
-    console.log(pluginCommand);
-    exec(pluginCommand, function(){
-        processPlugin(index + 1);
-    });
+  if(index >= packageJson.cordovaPlugins.length)
+    return;
+
+  var plugin = packageJson.cordovaPlugins[index];
+  var pluginCommand = createAddRemoveStatement(plugin);
+  console.log(pluginCommand);
+  exec(pluginCommand, function(){
+    processPlugin(index + 1);
+  });
 }
 
 processPlugin(0);

scss/ionic.app.scss

@@ -18,25 +18,21 @@ $dark:                            #444 !default;
 // The path for our ionicons font files, relative to the built CSS in www/css
 $ionicons-font-path: "../lib/ionic/fonts" !default;
 
-// Include all of Ionic
-// @import "www/assets/lib/ionic/scss/ionic";
-
 // Vendors
 
 // Helpers
 @import "./helpers/colors";
 @import "./helpers/shadows";
 
 // Base
-@import "./base/base";
+@import "base";
 
 // Components
 @import "./_components/chat";
+@import "./_components/chatBubble";
 @import "./_components/messages";
 @import "./_components/inputSpace";
 @import "./_components/inputBubble";
 
 @import "./_components/settings";
 @import "./_components/moveLine";
-
-// Pages

www/app/app.m.js

@@ -1,50 +1,21 @@
-// TODO: Move this to a better home.
-Object.size = function(obj) {
-  var size = 0, key;
-  for (key in obj) {
-      if (obj.hasOwnProperty(key)) size++;
-  }
-  return size;
-};
-
-logger = function() {
-  var oldConsoleLog = null;
-  var pub = {};
-
-  pub.enableLogger =  function enableLogger() {
-      if(oldConsoleLog == null)
-          return;
-
-      window['console']['log'] = oldConsoleLog;
-  };
-
-  pub.disableLogger = function disableLogger() {
-      oldConsoleLog = console.log;
-      window['console']['log'] = function() {};
-  };
-
-  return pub;
-}();
-
-// logger.disableLogger();
-
-// ACTUAL CODE ****************************************************************
+// Run pre script.
+require('./pre.js');
 
 // Core.
 var CoreM = require('./core/core.m.js');
 
-// Shared.
-var UserM = require('./shared/user/user.m.js');
-var GoalsM = require('./shared/goals/goals.m.js');
-var UserContextM = require('./shared/userContext/userContext.m.js');
-
-// Utils.
-var InputTypeM = require('./shared/inputType/inputType.d.js');
+// Models.
+// var LocalStorageM = require('./models/localStorage/localStorage.m.js');
+var ErrorsM = require('./models/errors/errors.m.js');
+var UserM = require('./models/user/user.m.js');
+var GoalsM = require('./models/goals/goals.m.js');
+var UserContextM = require('./models/userContext/userContext.m.js');
 
 // Layouts.
-var SliderM = require('./layout/slider/slider.m.js');
+var SliderM = require('./components/slider/slider.m.js');
 
 // Components.
+var UtilsM = require('./components/utils/utils.m.js');
 var ChatM = require('./components/chat/chat.m.js');
 var SettingsM = require('./components/settings/settings.m.js');
 
@@ -54,23 +25,22 @@ var app = angular.module('app', [
   // Core.
   CoreM.name,
 
-  // Shared.
+  // Models.
+  // LocalStorageM.name,
+  ErrorsM.name,
   UserM.name,
   GoalsM.name,
   UserContextM.name,
 
-  // Utils.
-
   // Layouts.
   SliderM.name,
 
   // Components.
+  UtilsM.name,
   ChatM.name,
   SettingsM.name,
 
 ]);
 
 require('./app.run.js')(app); // Runs required files during the beginning.
 require('./app.r.js')(app); // Loads the routes.
-
-require('./shared/load.d.js')(app);