1 files changed, 30 insertions, 14 deletions

diff --git a/src/stores.types.ts b/src/stores.types.ts
index d09916653..14ae32133 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -1,3 +1,9 @@
+import Workspace from './features/workspaces/models/Workspace';
+import Recipe from './models/Recipe';
+import Service from './models/Service';
+import User from './models/User';
+import { CachedRequest } from './stores/lib/CachedRequest';
+
 export interface FerdiumStores {
   app: AppStore;
   communityRecipes: CommunityRecipesStore;
@@ -15,7 +21,7 @@ export interface FerdiumStores {
   workspaces: WorkspacesStore;
 }
 
-interface Stores {
+export interface Stores {
   app: AppStore;
   communityRecipes: CommunityRecipesStore;
   features: FeaturesStore;
@@ -62,9 +68,11 @@ interface AppStore {
   api: Api;
   authRequestFailed: () => void;
   autoLaunchOnStart: () => void;
+  automaticUpdates: boolean;
   clearAppCacheRequest: () => void;
   dictionaries: [];
   fetchDataInterval: 4;
+  get(key: string): any;
   getAppCacheSizeRequest: () => void;
   healthCheckRequest: () => void;
   isClearingAllCache: () => void;
@@ -74,6 +82,8 @@ interface AppStore {
   isSystemDarkModeEnabled: () => void;
   isSystemMuteOverridden: () => void;
   locale: () => void;
+  reloadAfterResume: boolean;
+  reloadAfterResumeTime: number;
   stores: Stores;
   timeOfflineStart: () => void;
   timeSuspensionStart: () => void;
@@ -95,8 +105,8 @@ interface AppStore {
 interface CommunityRecipesStore {
   actions: Actions;
   stores: Stores;
-  _actions: [];
-  _reactions: [];
+  _actions: any[];
+  _reactions: any[];
   communityRecipes: () => void;
 }
 
@@ -105,7 +115,7 @@ interface FeaturesStore {
   api: Api;
   defaultFeaturesRequest: () => void;
   features: () => void;
-  featuresRequest: () => void;
+  featuresRequest: CachedRequest;
   stores: Stores;
   _reactions: any[];
   _status: () => void;
@@ -136,8 +146,8 @@ interface RecipePreviewsStore {
   _reactions: [];
   _status: () => void;
   actionStatus: () => void;
-  all: () => void;
-  dev: () => void;
+  all: Recipe[];
+  dev: Recipe[];
   searchResults: () => void;
 }
 
@@ -152,7 +162,7 @@ interface RecipeStore {
   _status: () => void;
   actionStatus: () => void;
   active: () => void;
-  all: () => void;
+  all: Recipe[];
   recipeIdForServices: () => void;
 }
 
@@ -179,7 +189,7 @@ interface RouterStore {
   goForward: () => void;
   history: () => void;
   location: () => void;
-  push: () => void;
+  push(path: string): void;
   replace: () => void;
 }
 
@@ -200,7 +210,7 @@ export interface ServicesStore {
   actionStatus: () => void;
   active: () => void;
   activeSettings: () => void;
-  all: () => void;
+  all: Service[];
   allDisplayed: () => void;
   allDisplayedUnordered: () => void;
   enabled: () => void;
@@ -209,6 +219,11 @@ export interface ServicesStore {
   isTodosServiceAdded: () => void;
 }
 
+// TODO: Create actual type based on the default config in config.ts
+interface ISettings {
+  [key: string]: any;
+}
+
 interface SettingsStore {
   actions: Actions;
   api: Api;
@@ -220,7 +235,7 @@ interface SettingsStore {
   _reactions: [];
   _status: () => void;
   actionStatus: () => void;
-  all: () => void;
+  all: ISettings;
   app: AppStore;
   migration: () => void;
   proxy: () => void;
@@ -301,7 +316,7 @@ interface UserStore {
   deleteAccountRequest: () => void;
   fetchUserInfoInterval: null;
   getLegacyServicesRequest: () => void;
-  getUserInfoRequest: () => void;
+  getUserInfoRequest: CachedRequest;
   hasCompletedSignup: () => void;
   id: () => void;
   inviteRequest: () => void;
@@ -320,11 +335,11 @@ interface UserStore {
   _requireAuthenticatedUser: () => void;
   _status: () => void;
   changeServerRoute: () => void;
-  data: () => void;
+  data: User;
   importRoute: () => void;
   inviteRoute: () => void;
-  isLoggedIn: () => void;
-  isTokenExpired: () => void;
+  isLoggedIn: boolean;
+  isTokenExpired: () => boolean;
   legacyServices: () => void;
   loginRoute: () => void;
   logoutRoute: () => void;
@@ -348,6 +363,7 @@ export interface WorkspacesStore {
   isWorkspaceDrawerOpen: () => void;
   nextWorkspace: () => void;
   stores: Stores;
+  workspaces: Workspace[];
   workspaceBeingEdited: () => void;
   _actions: any[];
   _activateLastUsedWorkspaceReaction: () => void;