Revert "Use self-referenced imports in web"

This reverts commit 12d5037.
nisargjhaveri · Aug 31, 2024 · 5db8c3d · 5db8c3d
1 parent b0fe7f6
commit 5db8c3d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/web/components/app.tsx b/src/web/components/app.tsx
@@ -6,15 +6,14 @@ import { Link } from '@fluentui/react/lib/Link';
 import { Toggle } from '@fluentui/react/lib/Toggle';
 import { PrimaryButton } from '@fluentui/react/lib/Button';
 import { NeutralColors } from '@fluentui/theme';
-
-import { RemoteAdbDevice } from 'remote-adb/client';
-import { UsbDeviceManager } from 'remote-adb/client';
-import { ServerConnection } from 'remote-adb/client';
-
 import { Device } from './device';
-import { Status } from './status';
+
+import { RemoteAdbDevice } from '../../client/RemoteAdbDevice';
+import { UsbDeviceManager } from '../../client/UsbDeviceManager';
+import { ServerConnection } from '../../client/ServerConnection';
 
 import { initializeIcons } from '@fluentui/font-icons-mdl2';
+import { Status } from './status';
 initializeIcons();
 
 const enum StoredItemKeys {

diff --git a/src/web/components/device.tsx b/src/web/components/device.tsx
@@ -6,12 +6,12 @@ import { Icon } from '@fluentui/react/lib/Icon';
 import { MessageBar, MessageBarType } from '@fluentui/react/lib/MessageBar';
 import { DefaultButton, PrimaryButton } from '@fluentui/react/lib/Button';
 import { NeutralColors } from '@fluentui/theme';
-import bytes from 'bytes';
 
-import logger from 'remote-adb/logger';
-import { RemoteAdbDevice } from 'remote-adb/client';
-import { ServerConnection } from 'remote-adb/client';
+import logger from '../../common/logger';
+import { RemoteAdbDevice } from '../../client/RemoteAdbDevice';
+import { ServerConnection } from '../../client/ServerConnection';
 
+import * as bytes from 'bytes';
 
 function CommunicationSpeed(props: {device: RemoteAdbDevice}) {
     let device: RemoteAdbDevice = props.device;

diff --git a/src/web/components/status.tsx b/src/web/components/status.tsx
@@ -7,7 +7,7 @@ import { MessageBar, MessageBarType } from '@fluentui/react/lib/MessageBar';
 import { DefaultButton, MessageBarButton, PrimaryButton } from '@fluentui/react/lib/Button';
 import { Separator } from '@fluentui/react/lib/Separator';
 
-import { ServerStatus, ServerConnection } from 'remote-adb/client';
+import { ServerStatus, ServerConnection } from '../../client/ServerConnection';
 
 
 function LoginDialog(props: {showDialog: boolean, setShowDialog: Dispatch<SetStateAction<Boolean>>, onLoginSuccess: () => void, serverConnection: ServerConnection}) {