angular-ui · motin · Oct 20, 2015 · Oct 20, 2015 · Oct 20, 2015 · Oct 20, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/bower_components
+/node_modules
+/public
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -15,6 +15,7 @@
 var gulp = require('gulp'),
     plugins = require('gulp-load-plugins')(),
     mainBowerFiles = require('main-bower-files'),
+    opn = require('opn'),
     del = require('del');
 
 
@@ -44,8 +45,8 @@ var paths = {
   },
   html: {
     client: {
-      src: ['client/modules/**/*.html'],
-      dest: 'public/modules/',
+      src: ['client/**/*.html'],
+      dest: 'public/',
     }
   },
   styles: {
@@ -217,3 +218,18 @@ function scripts(paths, sort, parse) {
 
   };
 }
+
+
+////// LOCAL SERVER //////
+
+gulp.task('connect', ['build'], function() {
+  plugins.connect.server({
+    root: 'public',
+    livereload: true
+  });
+});
+
+gulp.task('open', ['connect'], function (done) {
+  opn('http://localhost:8080', done);
+});
+
diff --git a/index.html → client/index.html b/index.html → client/index.html
@@ -1,9 +1,10 @@
 <html>
 <head>
 	<title>AngularJS-ORM Demo</title>
-	<!-- Your choice of build system for CSS + JS -->
+	<script src="vendors.js"></script>
+	<script src="modules/townsquared.js"></script>
 </head>
 <body ng-app="App">
 	<ui-view></ui-view>
 </body>
-</html>
+</html>
diff --git a/modules/App.js → client/modules/App.js b/modules/App.js → client/modules/App.js
@@ -1,4 +1,4 @@
-var module = angular.module('App', ['ui.router', 'App.Authentication', 'App.Guest']);
+var module = angular.module('App', ['ui.router', 'App.Authenticated', 'App.Guest']);
 
 module.config(function($urlRouterProvider) {
 

diff --git a/modules/App.scss → client/modules/App.scss b/modules/App.scss → client/modules/App.scss
diff --git a/modules/Authentication/Authenticated.html → ...modules/Authentication/Authenticated.html b/modules/Authentication/Authenticated.html → ...modules/Authentication/Authenticated.html
diff --git a/modules/Authentication/Authenticated.js → ...t/modules/Authentication/Authenticated.js b/modules/Authentication/Authenticated.js → ...t/modules/Authentication/Authenticated.js
diff --git a/modules/Authentication/Login.html → client/modules/Authentication/Login.html b/modules/Authentication/Login.html → client/modules/Authentication/Login.html
diff --git a/modules/Authentication/Login.js → client/modules/Authentication/Login.js b/modules/Authentication/Login.js → client/modules/Authentication/Login.js
diff --git a/modules/Guest/Guest.html → client/modules/Guest/Guest.html b/modules/Guest/Guest.html → client/modules/Guest/Guest.html
diff --git a/modules/Guest/Guest.js → client/modules/Guest/Guest.js b/modules/Guest/Guest.js → client/modules/Guest/Guest.js
diff --git a/modules/Intro/Intro.js → client/modules/Intro/Intro.js b/modules/Intro/Intro.js → client/modules/Intro/Intro.js
diff --git a/modules/Intro/done.html → client/modules/Intro/done.html b/modules/Intro/done.html → client/modules/Intro/done.html
diff --git a/modules/Intro/intro.html → client/modules/Intro/intro.html b/modules/Intro/intro.html → client/modules/Intro/intro.html
diff --git a/modules/Intro/projects.html → client/modules/Intro/projects.html b/modules/Intro/projects.html → client/modules/Intro/projects.html
diff --git a/modules/Intro/tasks.html → client/modules/Intro/tasks.html b/modules/Intro/tasks.html → client/modules/Intro/tasks.html
diff --git a/modules/Object.js → client/modules/Object.js b/modules/Object.js → client/modules/Object.js
diff --git a/modules/Paginator.js → client/modules/Paginator.js b/modules/Paginator.js → client/modules/Paginator.js
diff --git a/modules/Project/Project.html → client/modules/Project/Project.html b/modules/Project/Project.html → client/modules/Project/Project.html
diff --git a/modules/Project/Project.js → client/modules/Project/Project.js b/modules/Project/Project.js → client/modules/Project/Project.js
diff --git a/modules/Project/ProjectHeader.html → client/modules/Project/ProjectHeader.html b/modules/Project/ProjectHeader.html → client/modules/Project/ProjectHeader.html
diff --git a/modules/Project/ProjectObject.js → client/modules/Project/ProjectObject.js b/modules/Project/ProjectObject.js → client/modules/Project/ProjectObject.js
diff --git a/modules/Project/Projects.html → client/modules/Project/Projects.html b/modules/Project/Projects.html → client/modules/Project/Projects.html
diff --git a/modules/Socket.js → client/modules/Socket.js b/modules/Socket.js → client/modules/Socket.js
diff --git a/modules/Stream.js → client/modules/Stream.js b/modules/Stream.js → client/modules/Stream.js
diff --git a/modules/Task/Task.html → client/modules/Task/Task.html b/modules/Task/Task.html → client/modules/Task/Task.html
diff --git a/modules/Task/Task.js → client/modules/Task/Task.js b/modules/Task/Task.js → client/modules/Task/Task.js
diff --git a/modules/Task/TaskHeader.html → client/modules/Task/TaskHeader.html b/modules/Task/TaskHeader.html → client/modules/Task/TaskHeader.html
diff --git a/modules/Task/TaskObject.js → client/modules/Task/TaskObject.js b/modules/Task/TaskObject.js → client/modules/Task/TaskObject.js
@@ -23,7 +23,7 @@ module.factory( 'Task', (BaseObject, $http) => {
       // wraps `this.uploading` in a promise that resolves immediately if it is `null` or waits for the promise
       return this.cache('creating', () => $q.when(this.uploading)
         .then( () => $http.post('/api/tasks', this) ) // uploading callback
-        .then( response => return Object.assign(this, response.data) ) // creating callback
+        .then( response => Object.assign(this, response.data) ) // creating callback
         .finally( () => this.creating = null ) // state cleanup (doesn't affect chaining)
       );
     }
@@ -32,7 +32,7 @@ module.factory( 'Task', (BaseObject, $http) => {
       // wraps `this.uploading` in a promise that resolves immediately if it is `null` or waits for the promise
       return this.cache('updating', () => $q.when(this.uploading)
         .then( () => $http.post(`/api/tasks/${this.id}`, this) ) // uploading callback
-        .then( response => return Object.assign(this, response.data) ) // creating callback
+        .then( response => Object.assign(this, response.data) ) // creating callback
         .finally( () => this.updating = null ) // state cleanup (doesn't affect chaining)
       );
     }

diff --git a/modules/User/Register.html → client/modules/User/Register.html b/modules/User/Register.html → client/modules/User/Register.html
diff --git a/modules/User/RegisterStep1.html → client/modules/User/RegisterStep1.html b/modules/User/RegisterStep1.html → client/modules/User/RegisterStep1.html
diff --git a/modules/User/RegisterStep3.html → client/modules/User/RegisterStep3.html b/modules/User/RegisterStep3.html → client/modules/User/RegisterStep3.html
diff --git a/modules/User/User.js → client/modules/User/User.js b/modules/User/User.js → client/modules/User/User.js
diff --git a/modules/User/UserObject.js → client/modules/User/UserObject.js b/modules/User/UserObject.js → client/modules/User/UserObject.js
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "gulp-babel": "^5.1.0",
     "gulp-bless": "^3.0.1",
     "gulp-concat": "^2.5.2",
+    "gulp-connect": "^2.0.5",
     "gulp-debug": "^2.0.1",
     "gulp-if": "^1.2.5",
     "gulp-livereload": "^3.8.0",
@@ -28,6 +29,7 @@
     "gulp-sourcemaps": "^1.5.2",
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.4",
+    "opn": "^0.1.2",
     "main-bower-files": "^2.7.0"
   },
   "scripts": {