mv services/state > ui_models/app_state

app/assets/javascripts/services/index.ts

@@ -7,4 +7,3 @@ export { NativeExtManager } from './nativeExtManager';
 export { PreferencesManager } from './preferencesManager';
 export { StatusManager } from './statusManager';
 export { ThemeManager } from './themeManager';
-export { AppState } from './state';

app/assets/javascripts/services/lockManager.ts

@@ -1,6 +1,6 @@
 import { WebApplication } from '@/ui_models/application';
 import { isDesktopApplication } from '@/utils';
-import { AppStateEvent } from '@/services/state';
+import { AppStateEvent } from '@/ui_models/app_state';
 
 const MILLISECONDS_PER_SECOND = 1000;
 const FOCUS_POLL_INTERVAL = 1 * MILLISECONDS_PER_SECOND;

app/assets/javascripts/services/themeManager.ts

@@ -7,7 +7,7 @@ import {
   SNTheme,
   ComponentArea,
 } from 'snjs';
-import { AppStateEvent } from '@/services/state';
+import { AppStateEvent } from '@/ui_models/app_state';
 
 const CACHED_THEMES_KEY = 'cachedThemes';
 

app/assets/javascripts/ui_models/application.ts

@@ -16,7 +16,6 @@ import { getPlatformString } from '@/utils';
 import { AlertService } from '@/services/alertService';
 import { WebDeviceInterface } from '@/interface';
 import {
-  AppState,
   DesktopManager,
   LockManager,
   ArchiveManager,
@@ -26,6 +25,7 @@ import {
   PreferencesManager,
   KeyboardManager
 } from '@/services';
+import { AppState } from '@/ui_models/app_state';
 
 type WebServices = {
   appState: AppState

app/assets/javascripts/ui_models/application_group.ts

@@ -8,9 +8,9 @@ import {
   NativeExtManager,
   PreferencesManager,
   StatusManager,
-  ThemeManager,
-  AppState
+  ThemeManager
 } from '@/services';
+import { AppState } from '@/ui_models/app_state';
 
 type AppManagerChangeCallback = () => void
 

app/assets/javascripts/views/application/application_view.ts

@@ -2,7 +2,7 @@ import { ComponentModalScope } from './../../directives/views/componentModal';
 import { WebDirective, PermissionsModalScope } from '@/types';
 import { getPlatformString } from '@/utils';
 import template from './application-view.pug';
-import { AppStateEvent } from '@/services/state';
+import { AppStateEvent } from '@/ui_models/app_state';
 import { ApplicationEvent, SNComponent } from 'snjs';
 import angular from 'angular';
 import {

app/assets/javascripts/views/editor/editor_view.ts

@@ -22,7 +22,7 @@ import { isDesktopApplication } from '@/utils';
 import { KeyboardModifier, KeyboardKey } from '@/services/keyboardManager';
 import template from './editor-view.pug';
 import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
-import { AppStateEvent, EventSource } from '@/services/state';
+import { AppStateEvent, EventSource } from '@/ui_models/app_state';
 import {
   STRING_DELETED_NOTE,
   STRING_INVALID_NOTE,

app/assets/javascripts/views/footer/footer_view.ts

@@ -11,7 +11,7 @@ import {
   ComponentAction
 } from 'snjs';
 import template from './footer-view.pug';
-import { AppStateEvent, EventSource } from '@/services/state';
+import { AppStateEvent, EventSource } from '@/ui_models/app_state';
 import {
   STRING_GENERIC_SYNC_ERROR,
   STRING_NEW_UPDATE_READY

app/assets/javascripts/views/notes/notes_view.ts

@@ -11,7 +11,7 @@ import {
   findInArray
 } from 'snjs';
 import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
-import { AppStateEvent } from '@/services/state';
+import { AppStateEvent } from '@/ui_models/app_state';
 import { KeyboardModifier, KeyboardKey } from '@/services/keyboardManager';
 import {
   PANEL_NAME_NOTES

app/assets/javascripts/views/tags/tags_view.ts

@@ -11,7 +11,7 @@ import {
   WebPrefKey
 } from 'snjs';
 import template from './tags-view.pug';
-import { AppStateEvent } from '@/services/state';
+import { AppStateEvent } from '@/ui_models/app_state';
 import { PANEL_NAME_TAGS } from '@/views/constants';
 import { STRING_DELETE_TAG } from '@/strings';
 import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';