Skip to content

Commit 95fab57

Browse files
langleydlangleyd
committed
Reorganise more files into feature folders
1 parent ea0175b commit 95fab57

File tree

76 files changed

+202
-348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+202
-348
lines changed

‎src/App.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import { Client } from "./Client.tsx";
1111
import { useClientStoreContext } from "./context/ClientStoreContext";
1212
import { useClientStoresContext } from "./context/ClientStoresContext";
1313
import { useSessionStoreContext } from "./context/SessionStoreContext";
14-
import { Encryption } from "./Encryption.tsx";
14+
import { Encryption } from "./CryptoSetup/EncryptionPage";
1515
import { LoadingScreen } from "./LoadingScreen/LoadingScreen.tsx";
16-
import { Login } from "./Login.tsx";
17-
import { OidcCallback } from "./OidcCallback.tsx";
16+
import { Login } from "./Login/LoginPage";
17+
import { OidcCallback } from "./Login/OidcCallback";
1818
import { createI18nApi } from "./utils/i18nApi.ts";
19-
import { ClientViewModel } from "./viewmodel/ClientViewModel";
20-
import { ClientState } from "./viewmodel/client-view.types";
19+
import { ClientViewModel } from "./ClientViewModel";
20+
import { ClientState } from "./client-view.types";
2121

2222
console.log("running App.tsx");
2323

‎src/Client.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import type React from "react";
22
import "./App.css";
33
import { useViewModel } from "@element-hq/web-shared-components";
44
import { useClientStoreContext } from "./context/ClientStoreContext";
5-
import { RoomListHeader, RoomListSearch, RoomListView } from "./RoomList";
6-
import { RoomView } from "./RoomView";
5+
import { RoomListHeader } from "./RoomList/RoomListHeader";
6+
import { RoomListSearch } from "./RoomList/RoomListSearch";
7+
import { RoomListView } from "./RoomList/RoomListView";
8+
import { RoomView } from "./Room/RoomView";
79
import { SidePanelView } from "./SidePanelView.tsx";
8-
import { SplashView } from "./SplashView.tsx";
10+
import { SplashView } from "./LoadingScreen/SplashView";
911

1012
console.log("running Client.tsx");
1113

src/viewmodel/ClientViewModel.ts renamed to src/ClientViewModel.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import {
1111
createAuthenticationClient,
1212
restoreClient,
1313
validateNativeSlidingSync,
14-
} from "../utils/clientBuilder";
14+
} from "./utils/clientBuilder";
1515
import { BaseViewModel } from "@element-hq/web-shared-components";
16-
import { MemberListViewModel } from "./MemberListViewModel.ts";
17-
import { TimelineViewModel } from "./TimelineViewModel";
18-
import { RoomViewModel } from "./RoomViewModel";
16+
import { MemberListViewModel } from "./MemberList/MemberListViewModel";
17+
import { TimelineViewModel } from "./Timeline/TimelineViewModel";
18+
import { RoomViewModel } from "./Room/RoomViewModel";
1919
import {
2020
type ClientInterface,
2121
type ClientSessionDelegate,
@@ -28,20 +28,20 @@ import {
2828
type SyncServiceInterface,
2929
type TaskHandleInterface,
3030
initPlatform,
31-
} from "../index.web.ts";
32-
import { getOidcConfiguration } from "../oidcConfig";
33-
import { printRustError } from "../utils.ts";
31+
} from "./index.web.ts";
32+
import { getOidcConfiguration } from "./oidcConfig";
33+
import { printRustError } from "./utils/printRustError";
3434
import {
3535
ClientState,
3636
type ClientViewActions,
3737
type ClientViewSnapshot,
3838
type LoginParams,
3939
type Props,
4040
} from "./client-view.types";
41-
import type { Credential } from "../Login/credentials.types";
42-
import { EncryptionFlowViewModel } from "../CryptoSetup";
43-
import { LoginFlowViewModel } from "../Login/LoginFlowViewModel";
44-
import { RoomListViewViewModel } from "../RoomList/RoomListViewViewModel";
41+
import type { Credential } from "./Login/credentials.types";
42+
import { EncryptionFlowViewModel } from "./CryptoSetup/EncryptionFlowViewModel";
43+
import { LoginFlowViewModel } from "./Login/LoginFlowViewModel";
44+
import { RoomListViewViewModel } from "./RoomList/RoomListViewViewModel";
4545

4646
export class ClientViewModel
4747
extends BaseViewModel<ClientViewSnapshot, Props>

‎src/CryptoSetup/EncryptionFlowViewModel.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
*/
77

88
import { BaseViewModel } from "@element-hq/web-shared-components";
9-
import type { FlowStepViewModel } from "./FlowStepViewModel";
9+
import type { FlowStepViewModel } from "../utils/FlowStepViewModel";
1010
import type {
1111
ClientInterface,
1212
EncryptionInterface,
1313
} from "../index.web";
14-
import { ConfirmIdentityStepViewModel, IdentityConfirmationAction } from "./ConfirmIdentityStepViewModel";
15-
import { RecoveryKeyEntryStepViewModel } from "./RecoveryKeyEntryStepViewModel";
16-
import { SetupRecoveryStepViewModel } from "./SetupRecoveryStepViewModel";
17-
import { SaveRecoveryKeyStepViewModel } from "./SaveRecoveryKeyStepViewModel";
18-
import { ResetIdentityWarningStepViewModel } from "./ResetIdentityWarningStepViewModel";
19-
import { ResetIdentityConfirmStepViewModel } from "./ResetIdentityConfirmStepViewModel";
20-
import { ResetIdentityExecuteStepViewModel } from "./ResetIdentityExecuteStepViewModel";
21-
import { ResetIdentityPasswordStepViewModel } from "./ResetIdentityPasswordStepViewModel";
22-
import { EnablingRecoveryStepViewModel } from "./EnablingRecoveryStepViewModel";
23-
import { printRustError } from "../utils";
14+
import { ConfirmIdentityStepViewModel, IdentityConfirmationAction } from "./steps/ConfirmIdentity/ConfirmIdentityStepViewModel";
15+
import { RecoveryKeyEntryStepViewModel } from "./steps/RecoveryKeyEntry/RecoveryKeyEntryStepViewModel";
16+
import { SetupRecoveryStepViewModel } from "./steps/SetupRecovery/SetupRecoveryStepViewModel";
17+
import { SaveRecoveryKeyStepViewModel } from "./steps/SaveRecoveryKey/SaveRecoveryKeyStepViewModel";
18+
import { ResetIdentityWarningStepViewModel } from "./steps/ResetIdentityWarning/ResetIdentityWarningStepViewModel";
19+
import { ResetIdentityConfirmStepViewModel } from "./steps/ResetIdentityConfirm/ResetIdentityConfirmStepViewModel";
20+
import { ResetIdentityExecuteStepViewModel } from "./steps/ResetIdentityExecute/ResetIdentityExecuteStepViewModel";
21+
import { ResetIdentityPasswordStepViewModel } from "./steps/ResetIdentityPassword/ResetIdentityPasswordStepViewModel";
22+
import { EnablingRecoveryStepViewModel } from "./steps/EnablingRecovery/EnablingRecoveryStepViewModel";
23+
import { printRustError } from "../utils/printRustError";
2424

2525
/**
2626
* Result of the encryption flow

src/Encryption.tsx renamed to src/CryptoSetup/EncryptionPage.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import { InlineSpinner, Glass, TooltipProvider } from "@vector-im/compound-web";
1212
import FocusLock from "react-focus-lock";
1313
import LockIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock";
1414
import type React from "react";
15-
import type { EncryptionFlowViewModel } from "./CryptoSetup";
16-
import { ModalFlowOverlay } from "./ModalFlowOverlay";
17-
import { SetupScreenLayout, SetupScreenHeader } from "./SetupScreen";
15+
import type { EncryptionFlowViewModel } from "./EncryptionFlowViewModel";
16+
import { ModalFlowOverlay } from "../Dialog/ModalFlowOverlay";
17+
import { SetupScreenLayout } from "../SetupScreen/SetupScreenLayout";
18+
import { SetupScreenHeader } from "../SetupScreen/SetupScreenHeader";
1819

1920
export interface EncryptionProps {
2021
encryptionFlowViewModel: EncryptionFlowViewModel;

‎src/CryptoSetup/index.ts‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/CryptoSetup/ConfirmIdentityScreen.tsx renamed to src/CryptoSetup/steps/ConfirmIdentity/ConfirmIdentityScreen.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import type {
1414
ConfirmIdentityStepViewSnapshot,
1515
} from "./ConfirmIdentityStepViewModel";
1616
import { IdentityConfirmationAction } from "./ConfirmIdentityStepViewModel";
17-
import type { ScreenProps } from "./screenRegistry.types";
18-
import { SetupScreenLayout, SetupScreenHeader } from "../SetupScreen";
17+
import type { ScreenProps } from "../../../utils/ScreenProps";
18+
import { SetupScreenLayout } from "../../../SetupScreen/SetupScreenLayout";
19+
import { SetupScreenHeader } from "../../../SetupScreen/SetupScreenHeader";
1920

2021
/**
2122
* Screen for confirming user identity.

src/CryptoSetup/ConfirmIdentityStepViewModel.ts renamed to src/CryptoSetup/steps/ConfirmIdentity/ConfirmIdentityStepViewModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Please see LICENSE files in the repository root for full details.
66
*/
77

8-
import { FlowStepViewModel } from "./FlowStepViewModel";
8+
import { FlowStepViewModel } from "../../../utils/FlowStepViewModel";
99

1010
/**
1111
* Available actions on the Confirm Identity screen

src/CryptoSetup/EnablingRecoveryScreen.tsx renamed to src/CryptoSetup/steps/EnablingRecovery/EnablingRecoveryScreen.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import type {
1313
EnablingRecoveryStepViewModel,
1414
EnablingRecoveryStepViewSnapshot,
1515
} from "./EnablingRecoveryStepViewModel";
16-
import type { ScreenProps } from "./screenRegistry.types";
17-
import { SetupScreenLayout, SetupScreenHeader } from "../SetupScreen";
16+
import type { ScreenProps } from "../../../utils/ScreenProps";
17+
import { SetupScreenLayout } from "../../../SetupScreen/SetupScreenLayout";
18+
import { SetupScreenHeader } from "../../../SetupScreen/SetupScreenHeader";
1819

1920
/**
2021
* Screen showing progress while enabling recovery.

src/CryptoSetup/EnablingRecoveryStepViewModel.ts renamed to src/CryptoSetup/steps/EnablingRecovery/EnablingRecoveryStepViewModel.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
* Please see LICENSE files in the repository root for full details.
66
*/
77

8-
import { FlowStepViewModel } from "./FlowStepViewModel";
8+
import { FlowStepViewModel } from "../../../utils/FlowStepViewModel";
99
import type {
1010
EncryptionInterface,
1111
EnableRecoveryProgressListener,
1212
EnableRecoveryProgress,
13-
} from "../index.web";
14-
import { EnableRecoveryProgress_Tags } from "../index.web";
15-
import { printRustError } from "../utils";
13+
} from "../../../index.web";
14+
import { EnableRecoveryProgress_Tags } from "../../../index.web";
15+
import { printRustError } from "../../../utils/printRustError";
1616

1717
/**
1818
* Result from enabling recovery step

0 commit comments

Comments
 (0)