Working so far - need to add assets and partials

src/angularjs/app/app.ts

@@ -1,10 +1,17 @@
 import * as angular from 'angular'
+import './filters'
+import './services'
+import './directives'
+import './controllers'
 
-import '../app/controllers'
-import '../app/directives'
-import '../app/filters'
-import '../app/services'
-import {SetBy} from "../services/config";
+import '../controllers/index'
+import '../services/index'
+import '../directives/index'
+import '../filters/index'
+import '../entities/index'
+import '../network/index'
+import '../connectors/index'
+import '../persistence/index'
 
 // Declare app level module which depends on filters, and services
 export let myApp = angular.module('myApp',
@@ -39,10 +46,8 @@ export let myApp = angular.module('myApp',
         };
         return $delegate;
     }]);
-}]).run(['Config', 'Environment', (Config, Environment) => {
-    Config.setConfig(SetBy.Include, Environment.config());
 }]);
 
-angular.bootstrap(document.getElementById("cc-app"), ['myApp']);
+// angular.bootstrap(document.getElementById("cc-app"), ['myApp']);
 
 

src/angularjs/app/controllers.ts

@@ -2,22 +2,3 @@ import * as angular from 'angular'
 
 angular.module('myApp.controllers', []);
 
-import '../controllers/app'
-import '../controllers/chat'
-import '../controllers/chat-bar'
-import '../controllers/chat-embed'
-import '../controllers/chat-settings'
-import '../controllers/create-room'
-import '../controllers/draggable-user'
-import '../controllers/emoji'
-import '../controllers/error-box'
-import '../controllers/inbox-rooms-list'
-import '../controllers/login'
-import '../controllers/main-box'
-import '../controllers/notification'
-import '../controllers/online-users-list'
-import '../controllers/profile-settings'
-import '../controllers/public-rooms-list'
-import '../controllers/room-list-box'
-import '../controllers/user-list'
-import '../controllers/user-profile-box'

src/angularjs/app/directives.ts

@@ -7,23 +7,3 @@ angular.module('myApp.directives', []).
         };
     }]);
 
-import '../directives/animate-room'
-import '../directives/cc-flash'
-import '../directives/cc-focus'
-import '../directives/cc-uncloak'
-import '../directives/center-mouse-y'
-import '../directives/consume-event'
-import '../directives/disable-drag'
-import '../directives/draggable-room'
-import '../directives/draggable-user'
-import '../directives/enter-submit'
-import '../directives/fit-text'
-import '../directives/infinite-scroll'
-import '../directives/on-edit-message'
-import '../directives/on-file-change'
-import '../directives/pikaday'
-import '../directives/resize-room'
-import '../directives/scroll-glue'
-import '../directives/social-iframe'
-import '../directives/stop-shake'
-import '../directives/user-drop-location'

src/angularjs/app/filters.ts

@@ -2,9 +2,6 @@ import * as angular from 'angular'
 
 angular.module('myApp.filters', []);
 
-import '../filters/interpolate'
-import '../filters/new-line'
-import '../filters/emoji-filter'
 
 
 

src/angularjs/app/services.ts

@@ -2,51 +2,4 @@ import * as angular from 'angular'
 
 angular.module('myApp.services', []).value('version', '0.1');
 
-// Entity
-import '../entities/message'
-import '../entities/room'
-import '../entities/user'
 
-// Services
-import '../services/array-utils'
-import '../services/before-unload'
-import '../services/cloud-image'
-import '../services/config'
-import '../entities/entity'
-import '../services/environment'
-import '../services/log'
-import '../services/marquee'
-import '../services/partials'
-import '../services/path-analyser'
-import '../services/room-open-queue'
-import '../services/room-position-manager'
-import '../services/screen'
-import '../services/sound-effects'
-import '../services/state-manager'
-import '../services/time'
-import '../services/utils'
-import '../services/visibility'
-import '../services/emoji'
-
-// Persistence
-import '../persistence/cache'
-import '../persistence/local-storage'
-import '../persistence/room-store'
-import '../persistence/user-store'
-import '../persistence/web-storage'
-
-// Network
-import '../network/auth'
-import '../network/auto-login'
-import '../network/credential'
-import '../network/firebase-upload-handler'
-import '../network/network-manager'
-import '../network/paths'
-import '../network/presence'
-import '../network/single-sign-on'
-import '../network/abstract-authentication-handler'
-
-// Connectors
-import '../connectors/friend-connector'
-import '../connectors/online-connector'
-import '../connectors/public-rooms-connector'

src/angularjs/connectors/index.ts

@@ -0,0 +1,3 @@
+import './friend-connector'
+import './online-connector'
+import './public-rooms-connector'

src/angularjs/connectors/online-connector.ts

@@ -6,7 +6,7 @@ import {N} from "../keys/notification-keys";
 import {IUser} from "../entities/user";
 import {IPaths} from "../network/paths";
 import {IUserStore} from "../persistence/user-store";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 
 export interface IOnlineConnector {
     on(): void

src/angularjs/controllers/chat-bar.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {IRoomListScope} from "./room-list-box";
 import {ICache} from "../persistence/cache";

src/angularjs/controllers/chat-embed.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {RoomType} from "../keys/room-type";
 import {UserStatus} from "../keys/user-status";
 import {N} from "../keys/notification-keys";

src/angularjs/controllers/chat-settings.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {DEBUG} from "../keys/defines";
 import * as FileSaver from 'file-saver'
 import {IRoomScope} from "./chat";

src/angularjs/controllers/chat.ts

@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 import {N} from "../keys/notification-keys";
 import * as Defines from "../keys/defines";
 import * as TabKeys from "../keys/tab-keys";

src/angularjs/controllers/create-room.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {ShowCreateChatBox} from "../keys/defines";
 import {RoomType} from "../keys/room-type";
 import {IRoomCreator} from "../entities/room";

src/angularjs/controllers/draggable-user.ts

@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.controllers').controller('DraggableUserController', ['$scope', function($scope) {
     $scope.init = function () {
 

src/angularjs/controllers/emoji.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {Emoji} from "../services/emoji";
 import {IRoomScope} from "./chat";
 

src/angularjs/controllers/error-box.ts

@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.controllers').controller('ErrorBoxController', ['$scope', function($scope) {
 
 

src/angularjs/controllers/inbox-rooms-list.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {ArrayUtils} from "../services/array-utils";
 import {Log} from "../services/log";

src/angularjs/controllers/index.ts

@@ -0,0 +1,19 @@
+import './main-app'
+import './chat'
+import './chat-bar'
+import './chat-embed'
+import './chat-settings'
+import './create-room'
+import './draggable-user'
+import './emoji'
+import './error-box'
+import './inbox-rooms-list'
+import './login'
+import './main-box'
+import './notification'
+import './online-users-list'
+import './profile-settings'
+import './public-rooms-list'
+import './room-list-box'
+import './user-list'
+import './user-profile-box'

src/angularjs/controllers/login.ts

@@ -1,6 +1,7 @@
 import * as angular from 'angular'
 import * as firebase from 'firebase';
 
+
 import {NotificationTypeAlert, NotificationTypeWaiting} from "../keys/defines";
 import {N} from "../keys/notification-keys";
 import {Utils} from "../services/utils";

src/angularjs/controllers/app.ts → src/angularjs/controllers/main-app.ts

@@ -14,7 +14,7 @@ export interface IRootScope extends ng.IRootScopeService{
     user: IUser
 }
 
-angular.module('myApp.controllers').controller('AppController', [
+angular.module('myApp.controllers').controller('MainAppController', [
     '$rootScope', '$scope','$timeout', '$window', '$sce', 'PathAnalyser', 'OnlineConnector', 'FriendsConnector', 'Cache', 'UserStore', 'RoomStore','$document', 'Presence', 'LocalStorage', 'RoomCreator', 'Config', 'Partials', 'RoomPositionManager', 'Paths', 'Auth', 'StateManager', 'RoomOpenQueue', 'NetworkManager', 'Environment',
     function($rootScope, $scope, $timeout, $window, $sce, PathAnalyser, OnlineConnector, FriendsConnector, Cache, UserStore, RoomStore, $document, Presence, LocalStorage, RoomCreator, Config, Partials, RoomPositionManager, Paths, Auth, StateManager, RoomOpenQueue, NetworkManager, Environment) {
 
@@ -96,7 +96,7 @@ angular.module('myApp.controllers').controller('AppController', [
             $scope.setMainBoxMinimized(LocalStorage.getProperty(LocalStorage.mainMinimizedKey));
 
             $scope.$on(N.UserOnlineStateChanged, function () {
-                Log.notification(N.UserOnlineStateChanged, "AppController");
+                Log.notification(N.UserOnlineStateChanged, "MainAppController");
                 $scope.updateTotalUserCount();
                 $timeout(() => {
                     $scope.$digest();
@@ -579,3 +579,60 @@ angular.module('myApp.controllers').controller('AppController', [
         $scope.init();
 
     }]);
+
+class MainApp {
+
+    static inject = [
+        '$rootScope',
+        '$scope',
+        '$timeout',
+        '$window',
+        '$sce',
+        'PathAnalyser',
+        'OnlineConnector',
+        'FriendsConnector',
+        'Cache',
+        'UserStore',
+        'RoomStore',
+        '$document',
+        'Presence',
+        'LocalStorage',
+        'RoomCreator',
+        'Config',
+        'Partials',
+        'RoomPositionManager',
+        'Paths',
+        'Auth',
+        'StateManager',
+        'RoomOpenQueue',
+        'NetworkManager',
+        'Environment'];
+
+    constructor(
+        private $rootScope: ng.IRootScopeService,
+        private $scope: ng.IScope,
+        private $timeout: ng.ITimeoutService,
+        private $window: ng.IWindowService,
+        private $sce: ng.ISCEService,
+        PathAnalyser,
+        OnlineConnector,
+        FriendsConnector,
+        Cache,
+        UserStore,
+        RoomStore,
+        $document,
+        Presence,
+        LocalStorage,
+        RoomCreator,
+        Config,
+        Partials,
+        RoomPositionManager,
+        Paths,
+        Auth,
+        StateManager,
+        RoomOpenQueue,
+        NetworkManager,
+        Environment) {
+
+    }
+}

src/angularjs/controllers/main-box.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {FriendsTab, InboxTab, RoomsTab, UsersTab} from "../keys/tab-keys";
 import {NotificationTypeWaiting} from "../keys/defines";

src/angularjs/controllers/notification.ts

@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.controllers').controller('NotificationController', ['$scope', function($scope) {
     $scope.submit = function () {
         $scope.notification.show = false;

src/angularjs/controllers/online-users-list.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {ArrayUtils} from "../services/array-utils";
 import {Log} from "../services/log";

src/angularjs/controllers/profile-settings.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {NotificationTypeAlert, ShowProfileSettingsBox} from "../keys/defines";
 import {UserKeys} from "../keys/user-keys";
 import {Utils} from "../services/utils";

src/angularjs/controllers/public-rooms-list.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {Utils} from "../services/utils";
 import {ArrayUtils} from "../services/array-utils";

src/angularjs/controllers/room-list-box.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {IRoom} from "../entities/room";
 import {Dimensions} from "../keys/dimensions";

src/angularjs/controllers/user-list.ts

@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {ArrayUtils} from "../services/array-utils";
 import {Log} from "../services/log";

src/angularjs/controllers/user-profile-box.ts

@@ -1,5 +1,5 @@
 import * as angular from 'angular'
-import {IUser} from "../entities/user";
+
 
 export interface IProfileBoxScope extends ng.IScope {
     hover: any,

src/angularjs/directives/animate-room.ts

@@ -1,6 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
 
+
 import {N} from "../keys/notification-keys";
 import {IRoomScope} from "../controllers/chat";
 import {Utils} from "../services/utils";