From 1afc1fcee346edfd7ecfd4538ad4d081d47a0a6c Mon Sep 17 00:00:00 2001
From: ben3 <Ben3@benjamins-mbp.home>
Date: Wed, 21 Aug 2019 14:48:48 +0100
Subject: [PATCH] Working so far - need to add assets and partials

---
 src/.idea/workspace.xml                       | 852 +++++++++++++++++-
 src/angularjs/app/app.ts                      |  21 +-
 src/angularjs/app/controllers.ts              |  19 -
 src/angularjs/app/directives.ts               |  20 -
 src/angularjs/app/filters.ts                  |   3 -
 src/angularjs/app/services.ts                 |  47 -
 src/angularjs/connectors/index.ts             |   3 +
 src/angularjs/connectors/online-connector.ts  |   2 +-
 src/angularjs/controllers/chat-bar.ts         |   2 +
 src/angularjs/controllers/chat-embed.ts       |   2 +
 src/angularjs/controllers/chat-settings.ts    |   2 +
 src/angularjs/controllers/chat.ts             |   1 +
 src/angularjs/controllers/create-room.ts      |   2 +
 src/angularjs/controllers/draggable-user.ts   |   1 +
 src/angularjs/controllers/emoji.ts            |   2 +
 src/angularjs/controllers/error-box.ts        |   1 +
 src/angularjs/controllers/inbox-rooms-list.ts |   2 +
 src/angularjs/controllers/index.ts            |  19 +
 src/angularjs/controllers/login.ts            |   1 +
 .../controllers/{app.ts => main-app.ts}       |  61 +-
 src/angularjs/controllers/main-box.ts         |   2 +
 src/angularjs/controllers/notification.ts     |   1 +
 .../controllers/online-users-list.ts          |   2 +
 src/angularjs/controllers/profile-settings.ts |   2 +
 .../controllers/public-rooms-list.ts          |   2 +
 src/angularjs/controllers/room-list-box.ts    |   2 +
 src/angularjs/controllers/user-list.ts        |   2 +
 src/angularjs/controllers/user-profile-box.ts |   2 +-
 src/angularjs/directives/animate-room.ts      |   1 +
 src/angularjs/directives/cc-flash.ts          |   2 +
 src/angularjs/directives/cc-focus.ts          |   1 +
 src/angularjs/directives/cc-uncloak.ts        |   1 +
 src/angularjs/directives/center-mouse-y.ts    |   1 +
 src/angularjs/directives/consume-event.ts     |   2 +
 src/angularjs/directives/disable-drag.ts      |   1 +
 src/angularjs/directives/draggable-room.ts    |   2 +
 src/angularjs/directives/draggable-user.ts    |   2 +
 src/angularjs/directives/enter-submit.ts      |   1 +
 src/angularjs/directives/fit-text.ts          |   2 +
 src/angularjs/directives/index.ts             |  19 +
 src/angularjs/directives/infinite-scroll.ts   |   2 +
 src/angularjs/directives/on-edit-message.ts   |   2 +
 src/angularjs/directives/on-file-change.ts    |   1 +
 src/angularjs/directives/resize-room.ts       |   1 +
 src/angularjs/directives/scroll-glue.ts       |   2 +
 src/angularjs/directives/social-iframe.ts     |   2 +
 src/angularjs/directives/stop-shake.ts        |   1 +
 .../directives/user-drop-location.ts          |   2 +
 src/angularjs/entities/index.ts               |   4 +
 src/angularjs/entities/room.ts                |   2 +-
 src/angularjs/entities/user.ts                |   2 +-
 src/angularjs/filters/index.ts                |   3 +
 src/angularjs/network/auth.ts                 |   2 +-
 src/angularjs/network/index.ts                |   9 +
 src/angularjs/persistence/index.ts            |   5 +
 src/angularjs/persistence/user-store.ts       |   2 +-
 src/angularjs/services/config.ts              |   6 +-
 src/angularjs/services/index.ts               |  18 +
 src/angularjs/services/state-manager.ts       |   2 +-
 src/app/app.component.ts                      |   3 +-
 src/app/app.module.ts                         |  20 +-
 src/index.html                                |  15 +
 src/main.ts                                   |   4 +
 63 files changed, 1107 insertions(+), 116 deletions(-)
 create mode 100644 src/angularjs/connectors/index.ts
 create mode 100644 src/angularjs/controllers/index.ts
 rename src/angularjs/controllers/{app.ts => main-app.ts} (94%)
 create mode 100644 src/angularjs/directives/index.ts
 create mode 100644 src/angularjs/entities/index.ts
 create mode 100644 src/angularjs/filters/index.ts
 create mode 100644 src/angularjs/network/index.ts
 create mode 100644 src/angularjs/persistence/index.ts
 create mode 100644 src/angularjs/services/index.ts

diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml
index 764c38ed..23c8f532 100644
--- a/src/.idea/workspace.xml
+++ b/src/.idea/workspace.xml
@@ -1,17 +1,861 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8f6e66be-3d1f-48f1-b83d-56c7338f63db" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/angularjs/connectors/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/controllers/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/directives/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/entities/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/filters/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/network/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/persistence/index.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/angularjs/services/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/app/app.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/app/app.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/app/controllers.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/app/controllers.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/app/directives.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/app/directives.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/app/filters.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/app/filters.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/app/services.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/app/services.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/connectors/online-connector.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/connectors/online-connector.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/app.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/main-app.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/chat-bar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/chat-bar.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/chat-embed.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/chat-embed.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/chat-settings.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/chat-settings.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/chat.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/chat.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/create-room.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/create-room.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/draggable-user.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/draggable-user.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/emoji.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/emoji.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/error-box.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/error-box.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/inbox-rooms-list.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/inbox-rooms-list.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/login.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/login.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/main-box.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/main-box.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/notification.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/notification.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/online-users-list.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/online-users-list.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/profile-settings.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/profile-settings.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/public-rooms-list.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/public-rooms-list.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/room-list-box.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/room-list-box.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/user-list.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/user-list.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/controllers/user-profile-box.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/controllers/user-profile-box.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/animate-room.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/animate-room.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/cc-flash.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/cc-flash.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/cc-focus.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/cc-focus.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/cc-uncloak.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/cc-uncloak.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/center-mouse-y.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/center-mouse-y.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/consume-event.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/consume-event.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/disable-drag.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/disable-drag.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/draggable-room.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/draggable-room.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/draggable-user.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/draggable-user.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/enter-submit.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/enter-submit.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/fit-text.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/fit-text.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/infinite-scroll.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/infinite-scroll.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/on-edit-message.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/on-edit-message.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/on-file-change.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/on-file-change.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/resize-room.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/resize-room.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/scroll-glue.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/scroll-glue.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/social-iframe.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/social-iframe.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/stop-shake.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/stop-shake.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/directives/user-drop-location.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/directives/user-drop-location.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/entities/room.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/entities/room.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/entities/user.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/entities/user.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/network/auth.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/network/auth.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/persistence/user-store.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/persistence/user-store.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/services/config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/services/config.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/angularjs/services/state-manager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/angularjs/services/state-manager.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/app.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.module.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/main.ts" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/controllers/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+              <folding>
+                <element signature="e#0#27#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/directives/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="18" column="29" lean-forward="true" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
+              <folding>
+                <element signature="e#0#35#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/services/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+              <folding>
+                <element signature="e#104#136#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/persistence/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="75">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+              <folding>
+                <element signature="e#0#16#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/connectors/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/entities/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/filters/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
+              <folding>
+                <element signature="e#0#31#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/angularjs/app/app.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/network/index.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="120">
+              <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/angularjs/directives/user-drop-location.ts">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="570">
+              <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
+              <folding>
+                <element signature="e#0#34#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>import '../app/directives'</find>
+      <find>import '../app/controllers'</find>
+      <find>AppController</find>
+      <find>../controllers/</find>
+      <find>MainAppController</find>
+      <find>../controllers</find>
+      <find>./directives</find>
+      <find>./services</find>
+      <find>./persistence/</find>
+      <find>./connectors</find>
+      <find>./entities</find>
+      <find>./network</find>
+    </findStrings>
+    <replaceStrings>
+      <replace />
+      <replace>.</replace>
+    </replaceStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/angularjs/controllers/inbox-rooms-list.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/login.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/main-box.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/notification.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/online-users-list.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/profile-settings.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/public-rooms-list.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/room-list-box.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/user-list.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/user-profile-box.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/animate-room.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/cc-flash.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/cc-focus.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/cc-uncloak.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/center-mouse-y.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/consume-event.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/disable-drag.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/draggable-room.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/draggable-user.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/enter-submit.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/fit-text.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/infinite-scroll.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/on-edit-message.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/on-file-change.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/resize-room.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/scroll-glue.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/social-iframe.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/stop-shake.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/user-drop-location.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/pikaday.ts" />
+        <option value="$PROJECT_DIR$/app/app.component.ts" />
+        <option value="$PROJECT_DIR$/app/app.module.ts" />
+        <option value="$PROJECT_DIR$/main.ts" />
+        <option value="$PROJECT_DIR$/angularjs/services/config.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/app.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/app-controller.ts" />
+        <option value="$PROJECT_DIR$/angularjs/app/filters.ts" />
+        <option value="$PROJECT_DIR$/angularjs/app/directives.ts" />
+        <option value="$PROJECT_DIR$/angularjs/app/services.ts" />
+        <option value="$PROJECT_DIR$/angularjs/app/controllers.ts" />
+        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/main-app.ts" />
+        <option value="$PROJECT_DIR$/angularjs/controllers/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/directives/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/services/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/persistence/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/connectors/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/entities/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/network/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/filters/index.ts" />
+        <option value="$PROJECT_DIR$/angularjs/app/app.ts" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-1975" />
-    <option name="y" value="-1016" />
-    <option name="width" value="1439" />
-    <option name="height" value="1292" />
+    <option name="x" value="-1686" />
+    <option name="y" value="-1264" />
+    <option name="width" value="1479" />
+    <option name="height" value="1646" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="connectors" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="directives" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="entities" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="filters" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="network" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="persistence" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="angularjs" type="462c0819:PsiDirectoryNode" />
+              <item name="services" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="src" type="b2602c69:ProjectViewProjectNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566395272293" />
+    <property name="editor.config.ad.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
   </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8f6e66be-3d1f-48f1-b83d-56c7338f63db" name="Default Changelist" comment="" />
+      <created>1566388720217</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1566388720217</updated>
+      <workItem from="1566388721547" duration="5357000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="5357000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1686" y="-1264" width="1479" height="1646" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Image Layers" />
+      <window_info id="Designer" />
+      <window_info id="UI Designer" />
+      <window_info id="Capture Tool" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24286708" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="TypeScript" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" visible="true" weight="0.25482625" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Maven" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/online-users-list.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/profile-settings.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/public-rooms-list.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/room-list-box.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/user-list.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/user-profile-box.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="32" column="24" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/animate-room.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" lean-forward="true" selection-start-line="2" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/cc-flash.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/cc-focus.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/cc-uncloak.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/center-mouse-y.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/consume-event.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/disable-drag.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/draggable-room.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/draggable-user.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/enter-submit.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/fit-text.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/infinite-scroll.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/on-edit-message.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/resize-room.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/scroll-glue.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/social-iframe.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/stop-shake.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/pikaday.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/on-file-change.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../node_modules/@angular/upgrade/static/static.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="383">
+          <caret line="278" column="24" selection-start-line="278" selection-start-column="24" selection-end-line="278" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../node_modules/@angular/core/core.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="383">
+          <caret line="4708" column="4" selection-start-line="4708" selection-start-column="4" selection-end-line="4708" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/app.component.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="23" lean-forward="true" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/app.module.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="43" lean-forward="true" selection-start-line="6" selection-start-column="43" selection-end-line="6" selection-end-column="43" />
+          <folding>
+            <element signature="e#0#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#0#47#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/entities/room.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="25" column="19" lean-forward="true" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/services/config.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2640">
+          <caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/config.ts">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/directives.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/filters.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/services.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/controllers.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="70" lean-forward="true" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/chat.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/emoji.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/main-app.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="21" column="37" lean-forward="true" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/controllers/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/user-drop-location.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#34#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/directives/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="29" lean-forward="true" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/services/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+          <folding>
+            <element signature="e#104#136#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/persistence/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+          <folding>
+            <element signature="e#0#16#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/connectors/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/entities/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/network/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/filters/index.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/angularjs/app/app.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+  </component>
 </project>
\ No newline at end of file
diff --git a/src/angularjs/app/app.ts b/src/angularjs/app/app.ts
index 48ce899a..40a2e25e 100755
--- a/src/angularjs/app/app.ts
+++ b/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']);
 
 
diff --git a/src/angularjs/app/controllers.ts b/src/angularjs/app/controllers.ts
index d922f880..021cba89 100755
--- a/src/angularjs/app/controllers.ts
+++ b/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'
\ No newline at end of file
diff --git a/src/angularjs/app/directives.ts b/src/angularjs/app/directives.ts
index c34f29e4..381243f3 100755
--- a/src/angularjs/app/directives.ts
+++ b/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'
diff --git a/src/angularjs/app/filters.ts b/src/angularjs/app/filters.ts
index 1cc25a98..384ede53 100755
--- a/src/angularjs/app/filters.ts
+++ b/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'
 
 
 
diff --git a/src/angularjs/app/services.ts b/src/angularjs/app/services.ts
index 73165ad0..77753906 100755
--- a/src/angularjs/app/services.ts
+++ b/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'
\ No newline at end of file
diff --git a/src/angularjs/connectors/index.ts b/src/angularjs/connectors/index.ts
new file mode 100644
index 00000000..c0590aa9
--- /dev/null
+++ b/src/angularjs/connectors/index.ts
@@ -0,0 +1,3 @@
+import './friend-connector'
+import './online-connector'
+import './public-rooms-connector'
\ No newline at end of file
diff --git a/src/angularjs/connectors/online-connector.ts b/src/angularjs/connectors/online-connector.ts
index af836641..a3f4e344 100755
--- a/src/angularjs/connectors/online-connector.ts
+++ b/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
diff --git a/src/angularjs/controllers/chat-bar.ts b/src/angularjs/controllers/chat-bar.ts
index 99cbb49d..45408df5 100755
--- a/src/angularjs/controllers/chat-bar.ts
+++ b/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";
diff --git a/src/angularjs/controllers/chat-embed.ts b/src/angularjs/controllers/chat-embed.ts
index e88bb5c4..bfc8c5c2 100755
--- a/src/angularjs/controllers/chat-embed.ts
+++ b/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";
diff --git a/src/angularjs/controllers/chat-settings.ts b/src/angularjs/controllers/chat-settings.ts
index 1e029dba..7c244b76 100755
--- a/src/angularjs/controllers/chat-settings.ts
+++ b/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";
diff --git a/src/angularjs/controllers/chat.ts b/src/angularjs/controllers/chat.ts
index b4217d34..f3aa540d 100755
--- a/src/angularjs/controllers/chat.ts
+++ b/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";
diff --git a/src/angularjs/controllers/create-room.ts b/src/angularjs/controllers/create-room.ts
index 2d5df14a..655367c2 100755
--- a/src/angularjs/controllers/create-room.ts
+++ b/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";
diff --git a/src/angularjs/controllers/draggable-user.ts b/src/angularjs/controllers/draggable-user.ts
index c0f125cb..c9d345c1 100755
--- a/src/angularjs/controllers/draggable-user.ts
+++ b/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 () {
 
diff --git a/src/angularjs/controllers/emoji.ts b/src/angularjs/controllers/emoji.ts
index 14e9c574..62d5d4cf 100755
--- a/src/angularjs/controllers/emoji.ts
+++ b/src/angularjs/controllers/emoji.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {Emoji} from "../services/emoji";
 import {IRoomScope} from "./chat";
 
diff --git a/src/angularjs/controllers/error-box.ts b/src/angularjs/controllers/error-box.ts
index 41422a34..c49ad22e 100755
--- a/src/angularjs/controllers/error-box.ts
+++ b/src/angularjs/controllers/error-box.ts
@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.controllers').controller('ErrorBoxController', ['$scope', function($scope) {
 
 
diff --git a/src/angularjs/controllers/inbox-rooms-list.ts b/src/angularjs/controllers/inbox-rooms-list.ts
index e9bb2eb7..f076fb39 100755
--- a/src/angularjs/controllers/inbox-rooms-list.ts
+++ b/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";
diff --git a/src/angularjs/controllers/index.ts b/src/angularjs/controllers/index.ts
new file mode 100644
index 00000000..3a9bad06
--- /dev/null
+++ b/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'
\ No newline at end of file
diff --git a/src/angularjs/controllers/login.ts b/src/angularjs/controllers/login.ts
index 5275a218..2373024e 100755
--- a/src/angularjs/controllers/login.ts
+++ b/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";
diff --git a/src/angularjs/controllers/app.ts b/src/angularjs/controllers/main-app.ts
similarity index 94%
rename from src/angularjs/controllers/app.ts
rename to src/angularjs/controllers/main-app.ts
index 925de31d..62480ef6 100755
--- a/src/angularjs/controllers/app.ts
+++ b/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) {
+
+    }
+}
\ No newline at end of file
diff --git a/src/angularjs/controllers/main-box.ts b/src/angularjs/controllers/main-box.ts
index 4eb6a38c..66d86f67 100755
--- a/src/angularjs/controllers/main-box.ts
+++ b/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";
diff --git a/src/angularjs/controllers/notification.ts b/src/angularjs/controllers/notification.ts
index 5f06b568..76ccdb6b 100755
--- a/src/angularjs/controllers/notification.ts
+++ b/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;
diff --git a/src/angularjs/controllers/online-users-list.ts b/src/angularjs/controllers/online-users-list.ts
index dfb4464b..4fd66633 100755
--- a/src/angularjs/controllers/online-users-list.ts
+++ b/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";
diff --git a/src/angularjs/controllers/profile-settings.ts b/src/angularjs/controllers/profile-settings.ts
index 4ebc8042..7f4bc0a1 100755
--- a/src/angularjs/controllers/profile-settings.ts
+++ b/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";
diff --git a/src/angularjs/controllers/public-rooms-list.ts b/src/angularjs/controllers/public-rooms-list.ts
index 47126c18..06e0f470 100755
--- a/src/angularjs/controllers/public-rooms-list.ts
+++ b/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";
diff --git a/src/angularjs/controllers/room-list-box.ts b/src/angularjs/controllers/room-list-box.ts
index b9be9181..551ad826 100755
--- a/src/angularjs/controllers/room-list-box.ts
+++ b/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";
diff --git a/src/angularjs/controllers/user-list.ts b/src/angularjs/controllers/user-list.ts
index 72805572..c97bcb5a 100755
--- a/src/angularjs/controllers/user-list.ts
+++ b/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";
diff --git a/src/angularjs/controllers/user-profile-box.ts b/src/angularjs/controllers/user-profile-box.ts
index 582735ef..6c23f925 100755
--- a/src/angularjs/controllers/user-profile-box.ts
+++ b/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,
diff --git a/src/angularjs/directives/animate-room.ts b/src/angularjs/directives/animate-room.ts
index 567f4845..4943c32c 100755
--- a/src/angularjs/directives/animate-room.ts
+++ b/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";
diff --git a/src/angularjs/directives/cc-flash.ts b/src/angularjs/directives/cc-flash.ts
index 121fb3df..73d33c86 100755
--- a/src/angularjs/directives/cc-flash.ts
+++ b/src/angularjs/directives/cc-flash.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 import {IRoomScope} from "../controllers/chat";
 
diff --git a/src/angularjs/directives/cc-focus.ts b/src/angularjs/directives/cc-focus.ts
index e9e6864b..efebe3f9 100755
--- a/src/angularjs/directives/cc-focus.ts
+++ b/src/angularjs/directives/cc-focus.ts
@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.directives').directive('ccFocus', function () {
     return {
         restrict: 'A',
diff --git a/src/angularjs/directives/cc-uncloak.ts b/src/angularjs/directives/cc-uncloak.ts
index 3d0e3186..2a3316d2 100755
--- a/src/angularjs/directives/cc-uncloak.ts
+++ b/src/angularjs/directives/cc-uncloak.ts
@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.directives').directive('ccUncloak', function () {
     return function (scope, element, attr) {
         element.removeAttr('style');
diff --git a/src/angularjs/directives/center-mouse-y.ts b/src/angularjs/directives/center-mouse-y.ts
index 4280f198..c259b48c 100755
--- a/src/angularjs/directives/center-mouse-y.ts
+++ b/src/angularjs/directives/center-mouse-y.ts
@@ -4,6 +4,7 @@ import * as $ from 'jquery'
 import * as angular from 'angular'
 import {IProfileBoxScope} from "../controllers/user-profile-box";
 
+
 angular.module('myApp.directives').directive('centerMouseY', ['$document', 'Screen', function ($document, Screen) {
     return function (scope: IProfileBoxScope, elm) {
 
diff --git a/src/angularjs/directives/consume-event.ts b/src/angularjs/directives/consume-event.ts
index 32558e3b..dac145bd 100755
--- a/src/angularjs/directives/consume-event.ts
+++ b/src/angularjs/directives/consume-event.ts
@@ -1,5 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
+
+
 import {Utils} from "../services/utils";
 
 angular.module('myApp.directives').directive('consumeEvent', [function () {
diff --git a/src/angularjs/directives/disable-drag.ts b/src/angularjs/directives/disable-drag.ts
index d1a3065b..07a4ddf2 100755
--- a/src/angularjs/directives/disable-drag.ts
+++ b/src/angularjs/directives/disable-drag.ts
@@ -1,6 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
 
+
 angular.module('myApp.directives').directive('disableDrag', ['$rootScope','$document', function ($rootScope, $document) {
     return function (scope, elm, attrs) {
 
diff --git a/src/angularjs/directives/draggable-room.ts b/src/angularjs/directives/draggable-room.ts
index b089c955..c6cf0395 100755
--- a/src/angularjs/directives/draggable-room.ts
+++ b/src/angularjs/directives/draggable-room.ts
@@ -1,5 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
+
+
 import {N} from "../keys/notification-keys";
 import {IRoomScope} from "../controllers/chat";
 import {Dimensions} from "../keys/dimensions";
diff --git a/src/angularjs/directives/draggable-user.ts b/src/angularjs/directives/draggable-user.ts
index b991d1f0..c50c880e 100755
--- a/src/angularjs/directives/draggable-user.ts
+++ b/src/angularjs/directives/draggable-user.ts
@@ -1,5 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
+
+
 import {UserListScope} from "../controllers/user-list";
 import {Utils} from "../services/utils";
 
diff --git a/src/angularjs/directives/enter-submit.ts b/src/angularjs/directives/enter-submit.ts
index b7dc4e73..cd7bc9c9 100755
--- a/src/angularjs/directives/enter-submit.ts
+++ b/src/angularjs/directives/enter-submit.ts
@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.directives').directive('enterSubmit', function () {
     return {
         restrict: 'A',
diff --git a/src/angularjs/directives/fit-text.ts b/src/angularjs/directives/fit-text.ts
index 078eb28c..95ea0a79 100755
--- a/src/angularjs/directives/fit-text.ts
+++ b/src/angularjs/directives/fit-text.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {IRoomScope} from "../controllers/chat";
 
 angular.module('myApp.directives').directive('fitText', function () {
diff --git a/src/angularjs/directives/index.ts b/src/angularjs/directives/index.ts
new file mode 100644
index 00000000..2634fbc7
--- /dev/null
+++ b/src/angularjs/directives/index.ts
@@ -0,0 +1,19 @@
+import './animate-room'
+import './cc-flash'
+import './cc-focus'
+import './cc-uncloak'
+import './center-mouse-y'
+import './consume-event'
+import './disable-drag'
+import './draggable-room'
+import './draggable-user'
+import './enter-submit'
+import './fit-text'
+import './infinite-scroll'
+import './on-edit-message'
+import './on-file-change'
+import './pikaday'
+import './scroll-glue'
+import './social-iframe'
+import './stop-shake'
+import './user-drop-location'
\ No newline at end of file
diff --git a/src/angularjs/directives/infinite-scroll.ts b/src/angularjs/directives/infinite-scroll.ts
index d1ad5a77..f65abdac 100755
--- a/src/angularjs/directives/infinite-scroll.ts
+++ b/src/angularjs/directives/infinite-scroll.ts
@@ -1,5 +1,7 @@
 import * as $ from 'jquery'
 import * as angular from 'angular'
+
+
 import {IRoomScope} from "../controllers/chat";
 import {IRoom} from "../entities/room";
 
diff --git a/src/angularjs/directives/on-edit-message.ts b/src/angularjs/directives/on-edit-message.ts
index 41924a78..f1523409 100755
--- a/src/angularjs/directives/on-edit-message.ts
+++ b/src/angularjs/directives/on-edit-message.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {MessageScope} from "../controllers/chat";
 import {N} from "../keys/notification-keys";
 
diff --git a/src/angularjs/directives/on-file-change.ts b/src/angularjs/directives/on-file-change.ts
index 78b9f952..753b1150 100755
--- a/src/angularjs/directives/on-file-change.ts
+++ b/src/angularjs/directives/on-file-change.ts
@@ -1,5 +1,6 @@
 import * as angular from 'angular'
 
+
 angular.module('myApp.directives').directive('onFileChange', function () {
     return {
         restrict: 'A',
diff --git a/src/angularjs/directives/resize-room.ts b/src/angularjs/directives/resize-room.ts
index 0e131f21..a3c9b853 100755
--- a/src/angularjs/directives/resize-room.ts
+++ b/src/angularjs/directives/resize-room.ts
@@ -1,6 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
 
+
 import {IRoomScope} from "../controllers/chat";
 import {Dimensions} from "../keys/dimensions";
 import {Utils} from "../services/utils";
diff --git a/src/angularjs/directives/scroll-glue.ts b/src/angularjs/directives/scroll-glue.ts
index 964f8744..93609116 100755
--- a/src/angularjs/directives/scroll-glue.ts
+++ b/src/angularjs/directives/scroll-glue.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {IRoomScope} from "../controllers/chat";
 
 angular.module('myApp.directives').directive('scrollGlue', function(){
diff --git a/src/angularjs/directives/social-iframe.ts b/src/angularjs/directives/social-iframe.ts
index 5a5a8938..9d9f240e 100755
--- a/src/angularjs/directives/social-iframe.ts
+++ b/src/angularjs/directives/social-iframe.ts
@@ -1,5 +1,7 @@
 import * as $ from 'jquery'
 import * as angular from 'angular'
+
+
 import {N} from "../keys/notification-keys";
 
 angular.module('myApp.directives').directive('socialIframe', ["$rootScope", "$document", "$window", "Paths", function ($rootScope, $document, $window, Paths) {
diff --git a/src/angularjs/directives/stop-shake.ts b/src/angularjs/directives/stop-shake.ts
index 3e91b265..65857654 100755
--- a/src/angularjs/directives/stop-shake.ts
+++ b/src/angularjs/directives/stop-shake.ts
@@ -1,6 +1,7 @@
 import * as angular from 'angular'
 import * as $ from 'jquery'
 
+
 /**
  * #54
  * This directive is used for scrollbars when the component can
diff --git a/src/angularjs/directives/user-drop-location.ts b/src/angularjs/directives/user-drop-location.ts
index e7d0aee7..b22470c9 100755
--- a/src/angularjs/directives/user-drop-location.ts
+++ b/src/angularjs/directives/user-drop-location.ts
@@ -1,4 +1,6 @@
 import * as angular from 'angular'
+
+
 import {NotificationTypeAlert} from "../keys/defines";
 import * as $ from 'jquery'
 import {IRoomScope} from "../controllers/chat";
diff --git a/src/angularjs/entities/index.ts b/src/angularjs/entities/index.ts
new file mode 100644
index 00000000..da45d273
--- /dev/null
+++ b/src/angularjs/entities/index.ts
@@ -0,0 +1,4 @@
+import './message'
+import './room'
+import './user'
+import './entity'
diff --git a/src/angularjs/entities/room.ts b/src/angularjs/entities/room.ts
index e5c03882..3dd22997 100755
--- a/src/angularjs/entities/room.ts
+++ b/src/angularjs/entities/room.ts
@@ -17,7 +17,7 @@ import {IUser} from "./user";
 import {Utils} from "../services/utils";
 import {UserStatus} from "../keys/user-status";
 import {UserKeys} from "../keys/user-keys";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 import {Log} from "../services/log";
 import {IFirebaseReference} from "../network/paths";
 
diff --git a/src/angularjs/entities/user.ts b/src/angularjs/entities/user.ts
index 4cc20ec0..f754e452 100755
--- a/src/angularjs/entities/user.ts
+++ b/src/angularjs/entities/user.ts
@@ -11,7 +11,7 @@ import {UserAllowInvites} from "../keys/allow-invite-type";
 import {Utils} from "../services/utils";
 import {IRoom} from "./room";
 import {RoomKeys} from "../keys/room-keys";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 
 export interface IUser extends IEntity {
     online: boolean
diff --git a/src/angularjs/filters/index.ts b/src/angularjs/filters/index.ts
new file mode 100644
index 00000000..52cfecea
--- /dev/null
+++ b/src/angularjs/filters/index.ts
@@ -0,0 +1,3 @@
+import './interpolate'
+import './new-line'
+import './emoji-filter'
\ No newline at end of file
diff --git a/src/angularjs/network/auth.ts b/src/angularjs/network/auth.ts
index 55d94533..dd0b7e02 100755
--- a/src/angularjs/network/auth.ts
+++ b/src/angularjs/network/auth.ts
@@ -8,7 +8,7 @@ import {Utils} from "../services/utils";
 import {IPresence} from "./presence";
 import {IUserStore} from "../persistence/user-store";
 import {IEnvironment} from "../services/environment";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 import {IStateManager} from "../services/state-manager";
 import {IConfig, SetBy} from "../services/config";
 import {IPaths} from "./paths";
diff --git a/src/angularjs/network/index.ts b/src/angularjs/network/index.ts
new file mode 100644
index 00000000..b34eb621
--- /dev/null
+++ b/src/angularjs/network/index.ts
@@ -0,0 +1,9 @@
+import './auth'
+import './auto-login'
+import './credential'
+import './firebase-upload-handler'
+import './network-manager'
+import './paths'
+import './presence'
+import './single-sign-on'
+import './abstract-authentication-handler'
\ No newline at end of file
diff --git a/src/angularjs/persistence/index.ts b/src/angularjs/persistence/index.ts
new file mode 100644
index 00000000..2f775cee
--- /dev/null
+++ b/src/angularjs/persistence/index.ts
@@ -0,0 +1,5 @@
+import './cache'
+import './local-storage'
+import './room-store'
+import './user-store'
+import './web-storage'
diff --git a/src/angularjs/persistence/user-store.ts b/src/angularjs/persistence/user-store.ts
index b2d276a9..249ab665 100755
--- a/src/angularjs/persistence/user-store.ts
+++ b/src/angularjs/persistence/user-store.ts
@@ -1,6 +1,6 @@
 import * as angular from 'angular'
 import {IUser} from "../entities/user";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 import {ILocalStorage} from "./local-storage";
 import {IBeforeUnload, IBeforeUnloadListener} from "../services/before-unload";
 import {INetworkManager} from "../network/network-manager";
diff --git a/src/angularjs/services/config.ts b/src/angularjs/services/config.ts
index d062be27..69cfce53 100755
--- a/src/angularjs/services/config.ts
+++ b/src/angularjs/services/config.ts
@@ -193,4 +193,8 @@ class Config implements IConfig {
     }
 }
 
-angular.module('myApp.services').service('Config', Config);
\ No newline at end of file
+angular.module('myApp.services').service('Config', Config)
+    // Check this
+    .run(['Config', 'Environment', (Config, Environment) => {
+    Config.setConfig(SetBy.Include, Environment.config());
+}]);
diff --git a/src/angularjs/services/index.ts b/src/angularjs/services/index.ts
new file mode 100644
index 00000000..fdb1eddf
--- /dev/null
+++ b/src/angularjs/services/index.ts
@@ -0,0 +1,18 @@
+import './array-utils'
+import './before-unload'
+import './cloud-image'
+import './config'
+import './environment'
+import './log'
+import './marquee'
+import './partials'
+import './path-analyser'
+import './room-open-queue'
+import './room-position-manager'
+import './screen'
+import './sound-effects'
+import './state-manager'
+import './time'
+import './utils'
+import './visibility'
+import './emoji'
diff --git a/src/angularjs/services/state-manager.ts b/src/angularjs/services/state-manager.ts
index e9d068b1..624eb738 100755
--- a/src/angularjs/services/state-manager.ts
+++ b/src/angularjs/services/state-manager.ts
@@ -3,7 +3,7 @@ import {RoomType} from "../keys/room-type";
 import {UserAllowInvites} from "../keys/allow-invite-type";
 import {RoomKeys} from "../keys/room-keys";
 import {N} from "../keys/notification-keys";
-import {IRootScope} from "../controllers/app";
+import {IRootScope} from "../controllers/main-app";
 import {IFriendsConnector} from "../connectors/friend-connector";
 import {IConfig} from "./config";
 import {ICache} from "../persistence/cache";
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f18388d3..8e880d58 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import {myApp} from "../angularjs/app/app";
 
 @Component({
   selector: 'app-root',
@@ -6,5 +7,5 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'chat-sdk-web';
+  title = 'chat-sdk-web-123-hello';
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f6571635..0d2481fb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,16 +1,28 @@
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import { NgModule, DoBootstrap } from '@angular/core';
+import { UpgradeModule } from '@angular/upgrade/static'
+import './../angularjs/app/app'
 
 import { AppComponent } from './app.component';
+import {myApp} from "../angularjs/app/app";
 
 @NgModule({
   declarations: [
     AppComponent
   ],
   imports: [
-    BrowserModule
+    BrowserModule, UpgradeModule
   ],
   providers: [],
-  bootstrap: [AppComponent]
+  // bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule implements DoBootstrap {
+  constructor(private upgrade: UpgradeModule) {
+    console.log("Angular Running!")
+  }
+  ngDoBootstrap() {
+    console.log("Bootstrap");
+    this.upgrade.bootstrap(document.body, [myApp.name], {staticDi: true})
+  }
+
+}
diff --git a/src/index.html b/src/index.html
index 310ea16d..b3beb03e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,5 +10,20 @@
 </head>
 <body>
   <app-root></app-root>
+
+  <!--<div data-ng-app="myApp" id="cc-app" ng-controller="MainAppController"><ng-include src=" partialsURL + 'chatsdk.html'" ></ng-include>-->
+  <div id="cc-app" ng-controller="MainAppController"><ng-include src=" partialsURL + 'chatsdk.html'" ></ng-include>
+
+    <!--<div data-ng-controller="ChatEmbedController" data-ng-init="init('1234', 300, 400)" style="background: white; width: 300px; height: 400px">-->
+    <!--<div data-ng-repeat="(id, room) in rooms">-->
+    <!--<div data-ng-controller="ChatController">-->
+    <!--<div data-ng-include data-ng-init="init(room)" src=" partialsURL + 'chat-room-embed.html'"></div>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--</div>-->
+
+  </div>
+
+
 </body>
 </html>
diff --git a/src/main.ts b/src/main.ts
index c7b673cf..91fa1bb5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,7 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { setAngularJSGlobal } from '@angular/upgrade/static'
+import * as angular from 'angular';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
@@ -8,5 +10,7 @@ if (environment.production) {
   enableProdMode();
 }
 
+setAngularJSGlobal(angular);
+
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));