Moved AngularJS app into a client directory

nitingautam · Jun 16, 2016 · 6e0d963 · 6e0d963
1 parent c752d1b
commit 6e0d963
Show file tree

Hide file tree

Showing 36 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,2 @@
-/node_modules
-/dist
-/.tmp
-/.sass-cache
-/bower_components
-.DS_Store
+.DS_Store
+.tmp/
diff --git a/.bowerrc → client/.bowerrc b/.bowerrc → client/.bowerrc
diff --git a/client/.gitignore b/client/.gitignore
@@ -0,0 +1,5 @@
+/node_modules
+/dist
+/.tmp
+/.sass-cache
+/bower_components
diff --git a/Gruntfile.js → client/Gruntfile.js b/Gruntfile.js → client/Gruntfile.js
diff --git a/app/404.html → client/app/404.html b/app/404.html → client/app/404.html
diff --git a/app/app.config.js → client/app/app.config.js b/app/app.config.js → client/app/app.config.js
diff --git a/app/app.js → client/app/app.js b/app/app.js → client/app/app.js
diff --git a/app/app.routes.js → client/app/app.routes.js b/app/app.routes.js → client/app/app.routes.js
diff --git a/...ts/message-form/message-form.directive.js → ...ts/message-form/message-form.directive.js b/...ts/message-form/message-form.directive.js → ...ts/message-form/message-form.directive.js
diff --git a/...components/message-form/message-form.html → ...components/message-form/message-form.html b/...components/message-form/message-form.html → ...components/message-form/message-form.html
diff --git a/...s/message-form/type-tracking.directive.js → ...s/message-form/type-tracking.directive.js b/...s/message-form/type-tracking.directive.js → ...s/message-form/type-tracking.directive.js
diff --git a/...ts/message-item/message-item.directive.js → ...ts/message-item/message-item.directive.js b/...ts/message-item/message-item.directive.js → ...ts/message-item/message-item.directive.js
diff --git a/...components/message-item/message-item.html → ...components/message-item/message-item.html b/...components/message-item/message-item.html → ...components/message-item/message-item.html
diff --git a/...ts/message-list/message-list.directive.js → ...ts/message-list/message-list.directive.js b/...ts/message-list/message-list.directive.js → ...ts/message-list/message-list.directive.js
diff --git a/...components/message-list/message-list.html → ...components/message-list/message-list.html b/...components/message-list/message-list.html → ...components/message-list/message-list.html
diff --git a/...e-user-list/online-user-list.directive.js → ...e-user-list/online-user-list.directive.js b/...e-user-list/online-user-list.directive.js → ...e-user-list/online-user-list.directive.js
diff --git a/...ts/online-user-list/online-user-list.html → ...ts/online-user-list/online-user-list.html b/...ts/online-user-list/online-user-list.html → ...ts/online-user-list/online-user-list.html
diff --git a/...tor-box/typing-indicator-box.directive.js → ...tor-box/typing-indicator-box.directive.js b/...tor-box/typing-indicator-box.directive.js → ...tor-box/typing-indicator-box.directive.js
diff --git a/...g-indicator-box/typing-indicator-box.html → ...g-indicator-box/typing-indicator-box.html b/...g-indicator-box/typing-indicator-box.html → ...g-indicator-box/typing-indicator-box.html
diff --git a/app/index.html → client/app/index.html b/app/index.html → client/app/index.html
@@ -35,7 +35,7 @@
     <script src="bower_components/angular/angular.js"></script>
     <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/Materialize/bin/materialize.js"></script>
-    <script src="bower_components/pubnub/web/pubnub.min.js"></script>
+    <script src="bower_components/pubnub/web/dist/pubnub.min.js"></script>
     <script src="bower_components/pubnub-angular/dist/pubnub-angular.min.js"></script>
     <script src="bower_components/lodash/lodash.js"></script>
     <script src="bower_components/ng-notify/src/scripts/ng-notify.js"></script>

diff --git a/app/robots.txt → client/app/robots.txt b/app/robots.txt → client/app/robots.txt
diff --git a/app/services/current_user.service.js → client/app/services/current_user.service.js b/app/services/current_user.service.js → client/app/services/current_user.service.js
diff --git a/app/services/message-factory.js → client/app/services/message-factory.js b/app/services/message-factory.js → client/app/services/message-factory.js
diff --git a/app/services/typing-indicator.service.js → .../app/services/typing-indicator.service.js b/app/services/typing-indicator.service.js → .../app/services/typing-indicator.service.js
diff --git a/app/services/user.service.js → client/app/services/user.service.js b/app/services/user.service.js → client/app/services/user.service.js
diff --git a/app/shared/user-avatar.directive.js → client/app/shared/user-avatar.directive.js b/app/shared/user-avatar.directive.js → client/app/shared/user-avatar.directive.js
diff --git a/app/styles/chat.css → client/app/styles/chat.css b/app/styles/chat.css → client/app/styles/chat.css
diff --git a/app/styles/ng-notify.theme.css → client/app/styles/ng-notify.theme.css b/app/styles/ng-notify.theme.css → client/app/styles/ng-notify.theme.css
diff --git a/app/styles/online-user-list.css → client/app/styles/online-user-list.css b/app/styles/online-user-list.css → client/app/styles/online-user-list.css
diff --git a/app/styles/typing-indicator-box.css → client/app/styles/typing-indicator-box.css b/app/styles/typing-indicator-box.css → client/app/styles/typing-indicator-box.css
diff --git a/app/styles/typing-indicator.css → client/app/styles/typing-indicator.css b/app/styles/typing-indicator.css → client/app/styles/typing-indicator.css
diff --git a/app/views/chat.html → client/app/views/chat.html b/app/views/chat.html → client/app/views/chat.html
diff --git a/bower.json → client/bower.json b/bower.json → client/bower.json
diff --git a/package.json → client/package.json b/package.json → client/package.json
@@ -25,9 +25,10 @@
     "grunt-svgmin": "^2.0.0",
     "grunt-usemin": "^3.0.0",
     "grunt-wiredep": "^2.0.0",
+    "gulp": "^3.9.1",
     "jit-grunt": "^0.9.1",
-    "time-grunt": "^1.0.0",
-    "jshint-stylish": "^1.0.0"
+    "jshint-stylish": "^1.0.0",
+    "time-grunt": "^1.0.0"
   },
   "engines": {
     "node": ">=0.10.0"

diff --git a/test/.jshintrc → client/test/.jshintrc b/test/.jshintrc → client/test/.jshintrc
diff --git a/test/karma.conf.js → client/test/karma.conf.js b/test/karma.conf.js → client/test/karma.conf.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
       'bower_components/angular/angular.js',
       'bower_components/angular-route/angular-route.js',
       'bower_components/Materialize/bin/materialize.js',
-      'bower_components/pubnub/web/pubnub.min.js',
+      'bower_components/pubnub/web/dist/pubnub.min.js',
       'bower_components/pubnub-angular/dist/pubnub-angular-3.1.1.min.js',
       'bower_components/lodash/lodash.js',
       'bower_components/ng-notify/src/scripts/ng-notify.js',