chore(ui): tidy npm structure

invokeai/frontend/web/index.d.ts

@@ -2,7 +2,7 @@ import React, { PropsWithChildren } from 'react';
 import { IAIPopoverProps } from '../web/src/common/components/IAIPopover';
 import { IAIIconButtonProps } from '../web/src/common/components/IAIIconButton';
 import { InvokeTabName } from 'features/ui/store/tabMap';
-import { PartialAppConfig } from 'app/invokeai';
+import { PartialAppConfig } from 'app/types/invokeai';
 
 export {};
 

invokeai/frontend/web/src/app/components/App.tsx

@@ -1,8 +1,8 @@
-import React, { lazy, PropsWithChildren, useEffect } from 'react';
+import React, { lazy, memo, PropsWithChildren, useEffect } from 'react';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
-import { buildMiddleware, store } from './app/store';
+import { buildMiddleware, store } from 'app/store/store';
-import { persistor } from './persistor';
+import { persistor } from '../store/persistor';
 import { OpenAPI } from 'services/api';
 import '@fontsource/inter/100.css';
 import '@fontsource/inter/200.css';
@@ -14,14 +14,14 @@ import '@fontsource/inter/700.css';
 import '@fontsource/inter/800.css';
 import '@fontsource/inter/900.css';
 
-import Loading from './common/components/Loading/Loading';
+import Loading from '../../common/components/Loading/Loading';
 import { addMiddleware, resetMiddlewares } from 'redux-dynamic-middlewares';
-import { PartialAppConfig } from 'app/invokeai';
+import { PartialAppConfig } from 'app/types/invokeai';
 
-import './i18n';
+import '../../i18n';
 
-const App = lazy(() => import('./app/App'));
+const InvokeAIUI = lazy(() => import('./InvokeAIUI'));
-const ThemeLocaleProvider = lazy(() => import('./app/ThemeLocaleProvider'));
+const ThemeLocaleProvider = lazy(() => import('./ThemeLocaleProvider'));
 
 interface Props extends PropsWithChildren {
   apiUrl?: string;
@@ -29,7 +29,7 @@ interface Props extends PropsWithChildren {
   config?: PartialAppConfig;
 }
 
-export default function Component({ apiUrl, token, config, children }: Props) {
+const App = ({ apiUrl, token, config, children }: Props) => {
   useEffect(() => {
     // configure API client token
     if (token) {
@@ -59,11 +59,13 @@ export default function Component({ apiUrl, token, config, children }: Props) {
         <PersistGate loading={<Loading />} persistor={persistor}>
           <React.Suspense fallback={<Loading />}>
             <ThemeLocaleProvider>
-              <App config={config}>{children}</App>
+              <InvokeAIUI config={config}>{children}</InvokeAIUI>
             </ThemeLocaleProvider>
           </React.Suspense>
         </PersistGate>
       </Provider>
     </React.StrictMode>
   );
-}
+};
+
+export default memo(App);

invokeai/frontend/web/src/app/components/InvokeAIUI.tsx

@@ -3,7 +3,6 @@ import Console from 'features/system/components/Console';
 import ProgressBar from 'features/system/components/ProgressBar';
 import SiteHeader from 'features/system/components/SiteHeader';
 import InvokeTabs from 'features/ui/components/InvokeTabs';
-import { keepGUIAlive } from './utils';
 
 import useToastWatcher from 'features/system/hooks/useToastWatcher';
 
@@ -13,23 +12,27 @@ import { Box, Flex, Grid, Portal, useColorMode } from '@chakra-ui/react';
 import { APP_HEIGHT, APP_WIDTH } from 'theme/util/constants';
 import ImageGalleryPanel from 'features/gallery/components/ImageGalleryPanel';
 import Lightbox from 'features/lightbox/components/Lightbox';
-import { useAppDispatch, useAppSelector } from './storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { PropsWithChildren, useCallback, useEffect, useState } from 'react';
+import {
+  memo,
+  PropsWithChildren,
+  useCallback,
+  useEffect,
+  useState,
+} from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
 import Loading from 'common/components/Loading/Loading';
 import { useIsApplicationReady } from 'features/system/hooks/useIsApplicationReady';
-import { PartialAppConfig } from './invokeai';
+import { PartialAppConfig } from 'app/types/invokeai';
 import { useGlobalHotkeys } from 'common/hooks/useGlobalHotkeys';
 import { configChanged } from 'features/system/store/configSlice';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 
-keepGUIAlive();
-
 interface Props extends PropsWithChildren {
   config?: PartialAppConfig;
 }
 
-const App = ({ config = {}, children }: Props) => {
+const InvokeAIUI = ({ config = {}, children }: Props) => {
   useToastWatcher();
   useGlobalHotkeys();
 
@@ -121,4 +124,4 @@ const App = ({ config = {}, children }: Props) => {
   );
 };
 
-export default App;
+export default memo(InvokeAIUI);

invokeai/frontend/web/src/app/components/ThemeLocaleProvider.tsx

@@ -2,8 +2,8 @@ import { ChakraProvider, extendTheme } from '@chakra-ui/react';
 import { ReactNode, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { theme as invokeAITheme } from 'theme/theme';
-import { RootState } from './store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from './storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 
 import { greenTeaThemeColors } from 'theme/colors/greenTea';
 import { invokeAIThemeColors } from 'theme/colors/invokeAI';

invokeai/frontend/web/src/app/constants.ts

@@ -2,22 +2,7 @@
 
 import { InProgressImageType } from 'features/system/store/systemSlice';
 
-// Valid samplers
+export const DIFFUSERS_SCHEDULERS: Array<string> = [
-export const SAMPLERS: Array<string> = [
-  'ddim',
-  'plms',
-  'k_lms',
-  'k_dpm_2',
-  'k_dpm_2_a',
-  'k_dpmpp_2',
-  'k_dpmpp_2_a',
-  'k_euler',
-  'k_euler_a',
-  'k_heun',
-];
-
-// Valid Diffusers Samplers
-export const DIFFUSERS_SAMPLERS: Array<string> = [
   'ddim',
   'plms',
   'k_lms',

invokeai/frontend/web/src/app/socketio/actions.ts

@@ -1,5 +1,5 @@
 import { createAction } from '@reduxjs/toolkit';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import { GalleryCategory } from 'features/gallery/store/gallerySlice';
 import { InvokeTabName } from 'features/ui/store/tabMap';
 

invokeai/frontend/web/src/app/socketio/emitters.ts

@@ -1,6 +1,6 @@
 import { AnyAction, Dispatch, MiddlewareAPI } from '@reduxjs/toolkit';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
-import type { RootState } from 'app/store';
+import type { RootState } from 'app/store/store';
 import {
   frontendToBackendParameters,
   FrontendToBackendParametersConfig,

invokeai/frontend/web/src/app/socketio/listeners.ts

@@ -3,7 +3,7 @@ import dateFormat from 'dateformat';
 import i18n from 'i18n';
 import { v4 as uuidv4 } from 'uuid';
 
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 import {
   addLogEntry,
@@ -30,7 +30,7 @@ import {
   setIntermediateImage,
 } from 'features/gallery/store/gallerySlice';
 
-import type { RootState } from 'app/store';
+import type { RootState } from 'app/store/store';
 import { addImageToStagingArea } from 'features/canvas/store/canvasSlice';
 import {
   clearInitialImage,

invokeai/frontend/web/src/app/socketio/middleware.ts

@@ -4,7 +4,7 @@ import { io } from 'socket.io-client';
 import makeSocketIOEmitters from './emitters';
 import makeSocketIOListeners from './listeners';
 
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 /**
  * Creates a socketio middleware to handle communication with server.

invokeai/frontend/web/src/app/store/persistor.ts

@@ -1,4 +1,4 @@
-import { store } from 'app/store';
+import { store } from 'app/store/store';
 import { persistStore } from 'redux-persist';
 
 export const persistor = persistStore(store);

invokeai/frontend/web/src/app/store/store.ts

@@ -19,7 +19,7 @@ import hotkeysReducer from 'features/ui/store/hotkeysSlice';
 import modelsReducer from 'features/system/store/modelSlice';
 import nodesReducer from 'features/nodes/store/nodesSlice';
 
-import { socketioMiddleware } from './socketio/middleware';
+import { socketioMiddleware } from '../socketio/middleware';
 import { socketMiddleware } from 'services/events/middleware';
 import { canvasDenylist } from 'features/canvas/store/canvasPersistDenylist';
 import { galleryDenylist } from 'features/gallery/store/galleryPersistDenylist';

invokeai/frontend/web/src/app/store/storeHooks.ts

@@ -1,5 +1,5 @@
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import { AppDispatch, RootState } from './store';
+import { AppDispatch, RootState } from 'app/store/store';
 
 // Use throughout your app instead of plain `useDispatch` and `useSelector`
 export const useAppDispatch: () => AppDispatch = useDispatch;

invokeai/frontend/web/src/app/store/storeUtils.ts

@@ -1,5 +1,5 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
-import { AppDispatch, RootState } from './store';
+import { AppDispatch, RootState } from 'app/store/store';
 
 // https://redux-toolkit.js.org/usage/usage-with-typescript#defining-a-pre-typed-createasyncthunk
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{

invokeai/frontend/web/src/app/utils.ts

@@ -1,25 +0,0 @@
-export function keepGUIAlive() {
-  async function getRequest(url = '') {
-    const response = await fetch(url, {
-      method: 'GET',
-      cache: 'no-cache',
-    });
-    return response;
-  }
-
-  const keepAliveServer = () => {
-    const url = document.location;
-    const route = '/flaskwebgui-keep-server-alive';
-    getRequest(url + route).then((data) => {
-      return data;
-    });
-  };
-
-  if (!import.meta.env.NODE_ENV || import.meta.env.NODE_ENV === 'production') {
-    document.addEventListener('DOMContentLoaded', () => {
-      const intervalRequest = 3 * 1000;
-      keepAliveServer();
-      setInterval(keepAliveServer, intervalRequest);
-    });
-  }
-}

invokeai/frontend/web/src/common/components/GuidePopover.tsx

@@ -8,7 +8,7 @@ import {
 } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
 import { Feature, useFeatureHelpInfo } from 'app/features';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { SystemState } from 'features/system/store/systemSlice';
 import { memo, ReactElement } from 'react';

invokeai/frontend/web/src/common/components/ImageToImageOverlay.tsx

@@ -1,12 +1,12 @@
 import { Badge, Box, ButtonGroup, Flex } from '@chakra-ui/react';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { clearInitialImage } from 'features/parameters/store/generationSlice';
 import { useCallback } from 'react';
 import IAIIconButton from 'common/components/IAIIconButton';
 import { FaUndo, FaUpload } from 'react-icons/fa';
 import { useTranslation } from 'react-i18next';
-import { Image } from 'app/invokeai';
+import { Image } from 'app/types/invokeai';
 
 type ImageToImageOverlayProps = {
   setIsLoaded: (isLoaded: boolean) => void;

invokeai/frontend/web/src/common/components/ImageToImageSettingsHeader.tsx

@@ -20,8 +20,8 @@ import IAIIconButton from 'common/components/IAIIconButton';
 
 import { useTranslation } from 'react-i18next';
 import { FaUndo, FaUpload } from 'react-icons/fa';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { useCallback } from 'react';
 import { clearInitialImage } from 'features/parameters/store/generationSlice';
 

invokeai/frontend/web/src/common/components/ImageUploader.tsx

@@ -1,6 +1,6 @@
 import { Box, useToast } from '@chakra-ui/react';
 import { ImageUploaderTriggerContext } from 'app/contexts/ImageUploaderTriggerContext';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import useImageUploader from 'common/hooks/useImageUploader';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { ResourceKey } from 'i18next';

invokeai/frontend/web/src/common/hooks/useGlobalHotkeys.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { shiftKeyPressed } from 'features/ui/store/hotkeysSlice';
 import { isEqual } from 'lodash';
 import { isHotkeyPressed, useHotkeys } from 'react-hotkeys-hook';

invokeai/frontend/web/src/common/util/getPromptAndNegative.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import promptToString from './promptToString';
 
 export function getPromptAndNegative(inputPrompt: InvokeAI.Prompt) {

invokeai/frontend/web/src/common/util/getUrl.ts

@@ -1,5 +1,5 @@
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { OpenAPI } from 'services/api';
 
 export const getUrlAlt = (url: string, shouldTransformUrls: boolean) => {

invokeai/frontend/web/src/common/util/promptToString.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 const promptToString = (prompt: InvokeAI.Prompt): string => {
   if (typeof prompt === 'string') {

invokeai/frontend/web/src/common/util/seedWeightPairs.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 export const stringToSeedWeights = (
   string: string

invokeai/frontend/web/src/exports.tsx

@@ -1,20 +1,22 @@
-import Component from './component';
+// import App from './app/components/App';
 
-import InvokeAiLogoComponent from './features/system/components/InvokeAILogoComponent';
+// import InvokeAiLogoComponent from './features/system/components/InvokeAILogoComponent';
-import ThemeChanger from './features/system/components/ThemeChanger';
+// import ThemeChanger from './features/system/components/ThemeChanger';
-import IAIPopover from './common/components/IAIPopover';
+// import IAIPopover from './common/components/IAIPopover';
-import IAIIconButton from './common/components/IAIIconButton';
+// import IAIIconButton from './common/components/IAIIconButton';
-import SettingsModal from './features/system/components/SettingsModal/SettingsModal';
+// import SettingsModal from './features/system/components/SettingsModal/SettingsModal';
-import StatusIndicator from './features/system/components/StatusIndicator';
+// import StatusIndicator from './features/system/components/StatusIndicator';
-import ModelSelect from 'features/system/components/ModelSelect';
+// import ModelSelect from 'features/system/components/ModelSelect';
 
-export default Component;
+// export default App;
-export {
+// export {
-  InvokeAiLogoComponent,
+//   InvokeAiLogoComponent,
-  ThemeChanger,
+//   ThemeChanger,
-  IAIPopover,
+//   IAIPopover,
-  IAIIconButton,
+//   IAIIconButton,
-  SettingsModal,
+//   SettingsModal,
-  StatusIndicator,
+//   StatusIndicator,
-  ModelSelect,
+//   ModelSelect,
-};
+// };
+
+export default {};

invokeai/frontend/web/src/features/canvas/components/ClearCanvasHistoryButtonModal.tsx

@@ -1,4 +1,4 @@
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIAlertDialog from 'common/components/IAIAlertDialog';
 import IAIButton from 'common/components/IAIButton';
 import { clearCanvasHistory } from 'features/canvas/store/canvasSlice';

invokeai/frontend/web/src/features/canvas/components/IAICanvas.tsx

@@ -1,6 +1,6 @@
 import { Box, chakra, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/components/IAICanvasBoundingBoxOverlay.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { isEqual } from 'lodash';
 
 import { Group, Rect } from 'react-konva';

invokeai/frontend/web/src/features/canvas/components/IAICanvasGrid.tsx

@@ -2,8 +2,8 @@
 
 import { useToken } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { isEqual, range } from 'lodash';
 

invokeai/frontend/web/src/features/canvas/components/IAICanvasIntermediateImage.tsx

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import { GalleryState } from 'features/gallery/store/gallerySlice';
 import { ImageConfig } from 'konva/lib/shapes/Image';

invokeai/frontend/web/src/features/canvas/components/IAICanvasMaskCompositer.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { RectConfig } from 'konva/lib/shapes/Rect';
 import { Rect } from 'react-konva';

invokeai/frontend/web/src/features/canvas/components/IAICanvasMaskLines.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { GroupConfig } from 'konva/lib/Group';
 import { isEqual } from 'lodash';

invokeai/frontend/web/src/features/canvas/components/IAICanvasObjectRenderer.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { rgbaColorToString } from 'features/canvas/util/colorToString';

invokeai/frontend/web/src/features/canvas/components/IAICanvasResizer.tsx

@@ -1,6 +1,6 @@
 import { Flex, Spinner } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   initialCanvasImageSelector,

invokeai/frontend/web/src/features/canvas/components/IAICanvasStagingArea.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { GroupConfig } from 'konva/lib/Group';

invokeai/frontend/web/src/features/canvas/components/IAICanvasStagingAreaToolbar.tsx

@@ -1,7 +1,7 @@
 import { ButtonGroup, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
 import { saveStagingAreaImageToGallery } from 'app/socketio/actions';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIIconButton from 'common/components/IAIIconButton';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import {

invokeai/frontend/web/src/features/canvas/components/IAICanvasStatusText.tsx

@@ -1,6 +1,6 @@
 import { Box, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { isEqual } from 'lodash';
 

invokeai/frontend/web/src/features/canvas/components/IAICanvasStatusText/IAICanvasStatusTextCursorPos.tsx

@@ -1,6 +1,6 @@
 import { Box } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import roundToHundreth from 'features/canvas/util/roundToHundreth';
 import { isEqual } from 'lodash';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolPreview.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { rgbaColorToString } from 'features/canvas/util/colorToString';
 import { GroupConfig } from 'konva/lib/Group';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasBoundingBox.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   roundDownToMultiple,
   roundToMultiple,

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasMaskOptions.tsx

@@ -1,6 +1,6 @@
 import { ButtonGroup, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIButton from 'common/components/IAIButton';
 import IAICheckbox from 'common/components/IAICheckbox';
 import IAIColorPicker from 'common/components/IAIColorPicker';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasRedoButton.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIIconButton from 'common/components/IAIIconButton';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasSettingsButtonPopover.tsx

@@ -1,6 +1,6 @@
 import { Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAICheckbox from 'common/components/IAICheckbox';
 import IAIIconButton from 'common/components/IAIIconButton';
 import IAIPopover from 'common/components/IAIPopover';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolChooserOptions.tsx

@@ -1,6 +1,6 @@
 import { ButtonGroup, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIColorPicker from 'common/components/IAIColorPicker';
 import IAIIconButton from 'common/components/IAIIconButton';
 import IAIPopover from 'common/components/IAIPopover';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx

@@ -1,6 +1,6 @@
 import { ButtonGroup, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIIconButton from 'common/components/IAIIconButton';
 import IAISelect from 'common/components/IAISelect';
 import useImageUploader from 'common/hooks/useImageUploader';

invokeai/frontend/web/src/features/canvas/components/IAICanvasToolbar/IAICanvasUndoButton.tsx

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIIconButton from 'common/components/IAIIconButton';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import { useHotkeys } from 'react-hotkeys-hook';

invokeai/frontend/web/src/features/canvas/hooks/useCanvasDragMove.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/hooks/useCanvasHotkeys.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/hooks/useCanvasMouseDown.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/hooks/useCanvasMouseMove.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/hooks/useCanvasMouseOut.ts

@@ -1,4 +1,4 @@
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { mouseLeftCanvas } from 'features/canvas/store/canvasSlice';
 import { useCallback } from 'react';
 

invokeai/frontend/web/src/features/canvas/hooks/useCanvasMouseUp.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   canvasSelector,
   isStagingSelector,

invokeai/frontend/web/src/features/canvas/hooks/useCanvasZoom.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 import {
   setStageCoordinates,

invokeai/frontend/web/src/features/canvas/hooks/useColorUnderCursor.ts

@@ -1,4 +1,4 @@
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import Konva from 'konva';
 import {
   commitColorPickerColor,

invokeai/frontend/web/src/features/canvas/store/canvasSelectors.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { CanvasImage, CanvasState, isCanvasBaseImage } from './canvasTypes';

invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts

@@ -1,6 +1,6 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import {
   roundDownToMultiple,
   roundToMultiple,

invokeai/frontend/web/src/features/canvas/store/canvasTypes.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import { IRect, Vector2d } from 'konva/lib/types';
 import { RgbaColor } from 'react-colorful';
 

invokeai/frontend/web/src/features/canvas/store/thunks/mergeAndUploadCanvas.ts

@@ -1,6 +1,6 @@
 import { AnyAction, ThunkAction } from '@reduxjs/toolkit';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { addImage } from 'features/gallery/store/gallerySlice';
 import {
   addToast,

invokeai/frontend/web/src/features/canvas/store/thunks/requestCanvasScale.ts

@@ -1,4 +1,4 @@
-import { AppDispatch, AppGetState } from 'app/store';
+import { AppDispatch, AppGetState } from 'app/store/store';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { debounce } from 'lodash';
 import { setDoesCanvasNeedScaling } from '../canvasSlice';

invokeai/frontend/web/src/features/gallery/components/CurrentImageButtons.tsx

@@ -11,7 +11,7 @@ import {
   useToast,
 } from '@chakra-ui/react';
 import { runESRGAN, runFacetool } from 'app/socketio/actions';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIButton from 'common/components/IAIButton';
 import IAIIconButton from 'common/components/IAIIconButton';
 import IAIPopover from 'common/components/IAIPopover';

invokeai/frontend/web/src/features/gallery/components/CurrentImageDisplay.tsx

@@ -1,6 +1,6 @@
 import { Flex, Icon } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { isEqual } from 'lodash';
 

invokeai/frontend/web/src/features/gallery/components/CurrentImagePreview.tsx

@@ -1,6 +1,6 @@
 import { Box, Flex, Image } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import { systemSelector } from 'features/system/store/systemSelectors';
 import { uiSelector } from 'features/ui/store/uiSelectors';

invokeai/frontend/web/src/features/gallery/components/DeleteImageModal.tsx

@@ -9,7 +9,7 @@ import {
   Text,
 } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIButton from 'common/components/IAIButton';
 import IAISwitch from 'common/components/IAISwitch';
 import { configSelector } from 'features/system/store/configSelectors';

invokeai/frontend/web/src/features/gallery/components/HoverableImage.tsx

@@ -10,7 +10,7 @@ import {
   useTheme,
   useToast,
 } from '@chakra-ui/react';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   imageSelected,
   setCurrentImage,
@@ -32,7 +32,7 @@ import {
 } from 'react-icons/fa';
 import DeleteImageModal from './DeleteImageModal';
 import { ContextMenu } from 'chakra-ui-contextmenu';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import {
   resizeAndScaleCanvas,
   setInitialCanvasImage,

invokeai/frontend/web/src/features/gallery/components/ImageGallery.tsx

@@ -10,7 +10,7 @@
 //   useTheme,
 // } from '@chakra-ui/react';
 // import { requestImages } from 'app/socketio/actions';
-// import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+// import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 // import IAIButton from 'common/components/IAIButton';
 // import IAICheckbox from 'common/components/IAICheckbox';
 // import IAIIconButton from 'common/components/IAIIconButton';

invokeai/frontend/web/src/features/gallery/components/ImageGalleryContent.tsx

@@ -1,6 +1,6 @@
 import { ButtonGroup, Flex, Grid, Icon, Image, Text } from '@chakra-ui/react';
 import { requestImages } from 'app/socketio/actions';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIButton from 'common/components/IAIButton';
 import IAICheckbox from 'common/components/IAICheckbox';
 import IAIIconButton from 'common/components/IAIIconButton';
@@ -36,7 +36,7 @@ import {
 } from 'services/thunks/gallery';
 import { selectUploadsAll, uploadsAdapter } from '../store/uploadsSlice';
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 
 const GALLERY_SHOW_BUTTONS_MIN_WIDTH = 290;
 

invokeai/frontend/web/src/features/gallery/components/ImageGalleryPanel.tsx

@@ -1,4 +1,4 @@
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { gallerySelector } from 'features/gallery/store/gallerySelectors';
 import {
   selectNextImage,

invokeai/frontend/web/src/features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer.tsx

@@ -9,8 +9,8 @@ import {
   Text,
   Tooltip,
 } from '@chakra-ui/react';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import promptToString from 'common/util/promptToString';
 import { seedWeightsToString } from 'common/util/seedWeightPairs';

invokeai/frontend/web/src/features/gallery/components/ImageMetaDataViewer/OLD_ImageMetadataViewer.tsx

@@ -9,8 +9,8 @@ import {
   Text,
   Tooltip,
 } from '@chakra-ui/react';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { useGetUrl } from 'common/util/getUrl';
 import promptToString from 'common/util/promptToString';
 import { seedWeightsToString } from 'common/util/seedWeightPairs';

invokeai/frontend/web/src/features/gallery/components/NextPrevImageButtons.tsx

@@ -1,6 +1,6 @@
 import { ChakraProps, Flex, Grid, IconButton } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { isEqual } from 'lodash';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/gallery/hooks/useGetImageByName.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { ImageType } from 'services/api';
 import { selectResultsEntities } from '../store/resultsSlice';
 import { selectUploadsEntities } from '../store/uploadsSlice';

invokeai/frontend/web/src/features/gallery/hooks/useGetImageByUuid.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { gallerySelector } from '../store/gallerySelectors';
 
 const selector = createSelector(gallerySelector, (gallery) => ({

invokeai/frontend/web/src/features/gallery/store/gallerySelectors.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { lightboxSelector } from 'features/lightbox/store/lightboxSelectors';
 import { configSelector } from 'features/system/store/configSelectors';
 import { systemSelector } from 'features/system/store/systemSelectors';

invokeai/frontend/web/src/features/gallery/store/gallerySlice.ts

@@ -1,6 +1,6 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import { invocationComplete } from 'services/events/actions';
 import { InvokeTabName } from 'features/ui/store/tabMap';
 import { IRect } from 'konva/lib/types';

invokeai/frontend/web/src/features/gallery/store/resultsSlice.ts

@@ -1,8 +1,8 @@
 import { createEntityAdapter, createSlice } from '@reduxjs/toolkit';
-import { Image } from 'app/invokeai';
+import { Image } from 'app/types/invokeai';
 import { invocationComplete } from 'services/events/actions';
 
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import {
   receivedResultImagesPage,
   IMAGES_PER_PAGE,

invokeai/frontend/web/src/features/gallery/store/uploadsSlice.ts

@@ -1,7 +1,7 @@
 import { createEntityAdapter, createSlice } from '@reduxjs/toolkit';
-import { Image } from 'app/invokeai';
+import { Image } from 'app/types/invokeai';
 
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import {
   receivedUploadImagesPage,
   IMAGES_PER_PAGE,

invokeai/frontend/web/src/features/lightbox/components/Lightbox.tsx

@@ -1,7 +1,7 @@
 import { Box, Flex } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIIconButton from 'common/components/IAIIconButton';
 import CurrentImageButtons from 'features/gallery/components/CurrentImageButtons';
 import ImageMetadataViewer from 'features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer';

invokeai/frontend/web/src/features/lightbox/components/ReactPanZoomImage.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TransformComponent, useTransformContext } from 'react-zoom-pan-pinch';
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import { useGetUrl } from 'common/util/getUrl';
 
 type ReactPanZoomProps = {

invokeai/frontend/web/src/features/lightbox/store/lightboxSelectors.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { isEqual } from 'lodash';
 
 export const lightboxSelector = createSelector(

invokeai/frontend/web/src/features/nodes/components/AddNodeMenu.tsx

@@ -11,15 +11,15 @@ import {
   IconButton,
 } from '@chakra-ui/react';
 import { FaEllipsisV, FaPlus } from 'react-icons/fa';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { nodeAdded } from '../store/nodesSlice';
 import { cloneDeep, map } from 'lodash';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { useBuildInvocation } from '../hooks/useBuildInvocation';
 import { addToast } from 'features/system/store/systemSlice';
 import { makeToast } from 'features/system/hooks/useToastWatcher';
-import { IAIIconButton } from 'exports';
 import { AnyInvocationType } from 'services/events/types';
+import IAIIconButton from 'common/components/IAIIconButton';
 
 const AddNodeMenu = () => {
   const dispatch = useAppDispatch();

invokeai/frontend/web/src/features/nodes/components/Flow.tsx

@@ -7,8 +7,8 @@ import {
   OnConnectStart,
   OnConnectEnd,
 } from 'reactflow';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import {
   connectionEnded,
   connectionMade,

invokeai/frontend/web/src/features/nodes/components/IAINode/IAINodeInputs.tsx

@@ -5,8 +5,8 @@ import {
 } from 'features/nodes/types/types';
 import { memo, ReactNode, useCallback } from 'react';
 import { map } from 'lodash';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import {
   Box,
   Flex,

invokeai/frontend/web/src/features/nodes/components/IAINode/IAINodeOutputs.tsx

@@ -5,8 +5,8 @@ import {
 } from 'features/nodes/types/types';
 import { memo, ReactNode, useCallback } from 'react';
 import { map } from 'lodash';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { Box, Flex, FormControl, FormLabel, HStack } from '@chakra-ui/react';
 import FieldHandle from '../FieldHandle';
 import { useIsValidConnection } from 'features/nodes/hooks/useIsValidConnection';

invokeai/frontend/web/src/features/nodes/components/InvocationComponent.tsx

@@ -8,10 +8,10 @@ import IAINodeOutputs from './IAINode/IAINodeOutputs';
 import IAINodeInputs from './IAINode/IAINodeInputs';
 import IAINodeHeader from './IAINode/IAINodeHeader';
 import IAINodeResizer from './IAINode/IAINodeResizer';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { AnyInvocationType } from 'services/events/types';
 import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { NODE_MIN_WIDTH } from 'app/constants';
 
 type InvocationComponentWrapperProps = PropsWithChildren & {

invokeai/frontend/web/src/features/nodes/components/NodeGraphOverlay.tsx

@@ -1,6 +1,6 @@
 import { Box } from '@chakra-ui/react';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { memo } from 'react';
 import { buildNodesGraph } from '../util/nodesGraphBuilder/buildNodesGraph';
 

invokeai/frontend/web/src/features/nodes/components/ViewportControls.tsx

@@ -1,6 +1,6 @@
 import { ButtonGroup } from '@chakra-ui/react';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { IAIIconButton } from 'exports';
+import IAIIconButton from 'common/components/IAIIconButton';
 import { memo, useCallback } from 'react';
 import { FaCode, FaExpand, FaMinus, FaPlus } from 'react-icons/fa';
 import { useReactFlow } from 'reactflow';

invokeai/frontend/web/src/features/nodes/components/fields/BooleanInputFieldComponent.tsx

@@ -1,5 +1,5 @@
 import { Switch } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { fieldValueChanged } from 'features/nodes/store/nodesSlice';
 import {
   BooleanInputFieldTemplate,

invokeai/frontend/web/src/features/nodes/components/fields/EnumInputFieldComponent.tsx

@@ -1,5 +1,5 @@
 import { Select } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { fieldValueChanged } from 'features/nodes/store/nodesSlice';
 import {
   EnumInputFieldTemplate,

invokeai/frontend/web/src/features/nodes/components/fields/ImageInputFieldComponent.tsx

@@ -1,5 +1,5 @@
 import { Box, Image, Icon, Flex } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import SelectImagePlaceholder from 'common/components/SelectImagePlaceholder';
 import { useGetUrl } from 'common/util/getUrl';
 import useGetImageByNameAndType from 'features/gallery/hooks/useGetImageByName';

invokeai/frontend/web/src/features/nodes/components/fields/ModelInputFieldComponent.tsx

@@ -1,7 +1,7 @@
 import { Select } from '@chakra-ui/react';
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { fieldValueChanged } from 'features/nodes/store/nodesSlice';
 import {
   ModelInputFieldTemplate,

invokeai/frontend/web/src/features/nodes/components/fields/NumberInputFieldComponent.tsx

@@ -5,7 +5,7 @@ import {
   NumberInputField,
   NumberInputStepper,
 } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { fieldValueChanged } from 'features/nodes/store/nodesSlice';
 import {
   FloatInputFieldTemplate,

invokeai/frontend/web/src/features/nodes/components/fields/StringInputFieldComponent.tsx

@@ -1,5 +1,5 @@
 import { Input } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { fieldValueChanged } from 'features/nodes/store/nodesSlice';
 import {
   StringInputFieldTemplate,

invokeai/frontend/web/src/features/nodes/components/panels/MinimapPanel.tsx

@@ -1,5 +1,5 @@
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { CSSProperties, memo } from 'react';
 import { MiniMap } from 'reactflow';
 

invokeai/frontend/web/src/features/nodes/components/panels/TopCenterPanel.tsx

@@ -1,5 +1,5 @@
 import { HStack } from '@chakra-ui/react';
-import { useAppDispatch } from 'app/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import IAIButton from 'common/components/IAIButton';
 import { memo, useCallback } from 'react';
 import { Panel } from 'reactflow';

invokeai/frontend/web/src/features/nodes/components/panels/TopRightPanel.tsx

@@ -1,5 +1,5 @@
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { memo } from 'react';
 import { Panel } from 'reactflow';
 import FieldTypeLegend from '../FieldTypeLegend';

invokeai/frontend/web/src/features/nodes/components/search/NodeSearch.tsx

@@ -1,6 +1,6 @@
 import { Box, Flex } from '@chakra-ui/layout';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIInput from 'common/components/IAIInput';
 import { Panel } from 'reactflow';
 import { map } from 'lodash';

invokeai/frontend/web/src/features/nodes/hooks/useBuildInvocation.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
-import { useAppSelector } from 'app/storeHooks';
+import { useAppSelector } from 'app/store/storeHooks';
 import { reduce } from 'lodash';
 import { useCallback } from 'react';
 import { Node, useReactFlow } from 'reactflow';

invokeai/frontend/web/src/features/nodes/store/selectors/invocationTemplatesSelector.ts

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 
 export const invocationTemplatesSelector = createSelector(
   (state: RootState) => state.nodes,

invokeai/frontend/web/src/features/nodes/util/linearGraphBuilder/buildImageToImageNode.ts

@@ -1,11 +1,11 @@
 import { v4 as uuidv4 } from 'uuid';
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import {
   Edge,
   ImageToImageInvocation,
   TextToImageInvocation,
 } from 'services/api';
-import { _Image } from 'app/invokeai';
+import { _Image } from 'app/types/invokeai';
 import { initialImageSelector } from 'features/parameters/store/generationSelectors';
 
 export const buildImg2ImgNode = (state: RootState): ImageToImageInvocation => {

invokeai/frontend/web/src/features/nodes/util/linearGraphBuilder/buildLinearGraph.ts

@@ -1,4 +1,4 @@
-import { RootState } from 'app/store';
+import { RootState } from 'app/store/store';
 import { Graph } from 'services/api';
 import { buildImg2ImgNode } from './buildImageToImageNode';
 import { buildTxt2ImgNode } from './buildTextToImageNode';