clean up commit

rajivramv · Jun 4, 2015 · f054258 · f054258
1 parent 4c57e58
commit f054258
Show file tree

Hide file tree

Showing 33 changed files with 58 additions and 204 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 node_modules/
 **/bower_components/
+Procfile
+platforms/
diff --git a/.~lock.Taskit - Mobile App using Kinvey mBaaS.odp# b/.~lock.Taskit - Mobile App using Kinvey mBaaS.odp#
diff --git a/Taskit - Mobile App using Kinvey mBaaS.pdf b/Taskit - Mobile App using Kinvey mBaaS.pdf
diff --git a/app-walkthrough.odp b/app-walkthrough.odp
diff --git a/config.xml b/config.xml
@@ -10,7 +10,6 @@
     <content src="index.html" />
     <preference name="permissions" value="none" />
     <preference name="orientation" value="default" />
-    <preference name="target-device" value="universal" />
     <preference name="fullscreen" value="true" />
     <preference name="webviewbounce" value="true" />
     <preference name="stay-in-webview" value="false" />
@@ -19,7 +18,7 @@
     <preference name="show-splash-screen-spinner" value="true" />
     <preference name="auto-hide-splash-screen" value="true" />
     <preference name="disable-cursor" value="false" />
-    <preference name="android-minSdkVersion" value="10" />
+    <preference name="android-minSdkVersion" value="17" />
     <preference name="android-installLocation" value="auto" />
     <preference name="SplashScreen" value="res/xml/splash.png" />
     <preference name="SplashScreenDelay" value="10000" />

diff --git a/Taskit - Mobile App using Kinvey mBaaS.odp → ...askit - Mobile App using Kinvey mBaaS.odp b/Taskit - Mobile App using Kinvey mBaaS.odp → ...askit - Mobile App using Kinvey mBaaS.odp
diff --git a/docs/Taskit - Mobile App using Kinvey mBaaS.pdf b/docs/Taskit - Mobile App using Kinvey mBaaS.pdf
diff --git a/docs/task-it.apk b/docs/task-it.apk
diff --git a/gulpfile.js b/gulpfile.js
@@ -39,8 +39,8 @@ gulp.task('watch',function(){
 gulp.task('build-dist',function(done){
 	plugins.runSequence(
 		'clean-dist',
-		['copy-library','copy-scripts','copy-css','copy-partials'],
-		'inject-files',
+		['copy-scripts','copy-css'],
+		'copy-library','copy-partials','inject-files',
 		done
 	)
 });

diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml
@@ -12,5 +12,5 @@
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="22" />
 </manifest>
diff --git a/platforms/android/assets/www/app.min.css b/platforms/android/assets/www/app.min.css
@@ -108,3 +108,7 @@ nav .glyphicon {
 .btn {
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s; }
+
+@media (min-width: 768px) {
+  .navbar-header {
+    float: none !important; } }
diff --git a/platforms/android/assets/www/app.min.js b/platforms/android/assets/www/app.min.js
diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html
@@ -7,9 +7,10 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
-    <meta name="description" content="Task management">
+    <meta name="description" content="Task It">
+    <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' http://da189i1jfloii.cloudfront.net">
 
-    <title>Task Management</title>
+    <title>Task It</title>
     <!-- Place favicon.ico in the root directory -->
 
     <!--lib:css-->
@@ -28,12 +29,9 @@
     <!--src:js-->
     <script src="app.min.js"></script>
     <!--endinject-->
+   <script type="text/javascript" src="cordova.js"></script>      
 </head>
 <body data-ui-view="body">
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-
-  </body>
-  </html>
+
+</body>
+</html>
diff --git a/platforms/android/assets/www/partials/add-task.html b/platforms/android/assets/www/partials/add-task.html
@@ -17,7 +17,7 @@
   <div class="form-group">
     <label class="control-label col-xs-offset-1 col-sm-2" for="endDate">End Date</label>
     <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-pull-1"> 
-      <input type="date" class="form-control" id="endDate" placeholder="End Date" data-ng-model="task.endDate" name="endDate" required/>
+      <input type="date" class="form-control" id="endDate" placeholder="End Date" data-ng-model="task.endDate" name="endDate" min={{addTaskForm.startDate.$viewValue}} required/>
     </div>
   </div>
 

diff --git a/platforms/android/assets/www/splash.png b/platforms/android/assets/www/splash.png
diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml
@@ -20,7 +20,6 @@
     <content src="index.html" />
     <preference name="permissions" value="none" />
     <preference name="orientation" value="default" />
-    <preference name="target-device" value="universal" />
     <preference name="fullscreen" value="true" />
     <preference name="webviewbounce" value="true" />
     <preference name="stay-in-webview" value="false" />
@@ -29,7 +28,7 @@
     <preference name="show-splash-screen-spinner" value="true" />
     <preference name="auto-hide-splash-screen" value="true" />
     <preference name="disable-cursor" value="false" />
-    <preference name="android-minSdkVersion" value="10" />
+    <preference name="android-minSdkVersion" value="17" />
     <preference name="android-installLocation" value="auto" />
     <preference name="SplashScreen" value="res/xml/splash.png" />
     <preference name="SplashScreenDelay" value="10000" />

diff --git a/src/components/login/js/controllers/index.js b/src/components/login/js/controllers/index.js
@@ -1,8 +1,8 @@
 angular.module('login')
 .controller('loginController',['$rootScope','$scope','$state','$kinvey','notify',function($rootScope,$scope,$state,$kinvey,notify){
+
 	$scope.login = function(){
 		if ($scope.loginForm.username.$error.required || $scope.loginForm.password.$error.required) return null;
-
 		$kinvey.User.login({
 			username: $scope.user.username.trim(),
 			password: $scope.user.pwd

diff --git a/src/components/main/js/config/index.js b/src/components/main/js/config/index.js
@@ -2,6 +2,7 @@ angular.module('main')
 .config(['$stateProvider','$urlRouterProvider',function($stateProvider,$urlRouterProvider){
 	$urlRouterProvider.otherwise('/');
 	$stateProvider.state('root',{
+		abstract: true,
 		views: {
 			'body': {
 				templateUrl: 'partials/body.html'

diff --git a/src/components/main/js/run/index.js b/src/components/main/js/run/index.js
@@ -1,6 +1,7 @@
-angular.module('login')
-.run(['$kinvey','$state','$rootScope',function($kinvey,$state,$rootScope){
-	$kinvey.init({
+angular.module('main')
+.run(['$kinvey','$state','$rootScope','$document','$timeout','notify',function($kinvey,$state,$rootScope,$document,$timeout,notify){
+
+	$kinvey.init({	
 			appKey: 'kid_Wk8MsXwikg',
 			appSecret: '68c9a63e8a4a41b98898796652bfccc5'
 	}).then(function(activeUser){

diff --git a/src/components/tasks/partials/add-task.html b/src/components/tasks/partials/add-task.html
@@ -17,7 +17,7 @@
   <div class="form-group">
     <label class="control-label col-xs-offset-1 col-sm-2" for="endDate">End Date</label>
     <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-pull-1"> 
-      <input type="date" class="form-control" id="endDate" placeholder="End Date" data-ng-model="task.endDate" name="endDate" required/>
+      <input type="date" class="form-control" id="endDate" placeholder="End Date" data-ng-model="task.endDate" name="endDate" min={{addTaskForm.startDate.$viewValue}} required/>
     </div>
   </div>
 

diff --git a/src/css/index.css b/src/css/index.css
@@ -108,3 +108,7 @@ nav .glyphicon {
 .btn {
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s; }
+
+@media (min-width: 768px) {
+  .navbar-header {
+    float: none !important; } }
diff --git a/src/index.html b/src/index.html
@@ -7,9 +7,10 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
-    <meta name="description" content="Task management">
+    <meta name="description" content="Task It">
+    <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' http://da189i1jfloii.cloudfront.net">
 
-    <title>Task Management</title>
+    <title>Task It</title>
     <!-- Place favicon.ico in the root directory -->
 
     <!--lib:css-->
@@ -21,12 +22,9 @@
     <script src="http://da189i1jfloii.cloudfront.net/js/kinvey-angular-1.3.2.min.js"></script>
     <!--src:js-->
     <!--endinject-->
+   <script type="text/javascript" src="cordova.js"></script>      
 </head>
 <body data-ui-view="body">
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-
-  </body>
-  </html>
+
+</body>
+</html>
diff --git a/src/js/index.js b/src/js/index.js
@@ -1,8 +1,6 @@
-"use strict";
-
 var environment = (function defineEnvironment(){
-	// var agent = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)?'webview':'browser';
-	var agent = 'browser'
+	var agent = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)?'webview':'browser';
+	// var agent = 'browser'
 	return {
 		agent: agent,
 		readyEvent: agent === 'webview'? 'deviceready':'DOMContentLoaded',