keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

move all dialogs to a subfolder

Browse Source
pull/1833/head
audric 4 years ago
parent 61b48dd06b
commit 79c8fada6e
19 changed files with 69 additions and 79 deletions
Show Stats Download Patch File Download Diff File

0
ts/components/conversation/AdminLeaveClosedGroupDialog.tsx → ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
Unescape Escape View File

28
ts/components/EditProfileDialog.tsx → ts/components/dialog/EditProfileDialog.tsx
Unescape Escape View File

@ -2,24 +2,24 @@ import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import { QRCode } from 'react-qr-svg'; import { QRCode } from 'react-qr-svg';
import { Avatar, AvatarSize } from './Avatar'; import { Avatar, AvatarSize } from '../Avatar';
import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../session/SessionButton';
import { SessionIconButton, SessionIconSize, SessionIconType } from './session/icon'; import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
import { PillDivider } from './session/PillDivider'; import { PillDivider } from '../session/PillDivider';
import { SyncUtils, ToastUtils, UserUtils } from '../session/utils'; import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
import { MAX_USERNAME_LENGTH } from './session/registration/RegistrationTabs'; import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationTabs';
import { SessionSpinner } from './session/SessionSpinner'; import { SessionSpinner } from '../session/SessionSpinner';
import { ConversationModel, ConversationTypeEnum } from '../models/conversation'; import { ConversationModel, ConversationTypeEnum } from '../../models/conversation';
import { SessionWrapperModal } from './session/SessionWrapperModal'; import { SessionWrapperModal } from '../session/SessionWrapperModal';
import { AttachmentUtil } from '../util'; import { AttachmentUtil } from '../../util';
import { getConversationController } from '../session/conversations'; import { getConversationController } from '../../session/conversations';
import { SpacerLG, SpacerMD } from './basic/Text'; import { SpacerLG, SpacerMD } from '../basic/Text';
import autoBind from 'auto-bind'; import autoBind from 'auto-bind';
import { editProfileModal } from '../state/ducks/modalDialog'; import { editProfileModal } from '../../state/ducks/modalDialog';
import { uploadOurAvatar } from '../interactions/conversationInteractions'; import { uploadOurAvatar } from '../../interactions/conversationInteractions';
interface State { interface State {
profileName: string; profileName: string;

0
ts/components/conversation/InviteContactsDialog.tsx → ts/components/dialog/InviteContactsDialog.tsx
Unescape Escape View File

26
ts/components/session/ModalContainer.tsx → ts/components/dialog/ModalContainer.tsx
Unescape Escape View File

@ -16,20 +16,20 @@ import {
getUpdateGroupNameModal, getUpdateGroupNameModal,
getUserDetailsModal, getUserDetailsModal,
} from '../../state/selectors/modal'; } from '../../state/selectors/modal';
import { AdminLeaveClosedGroupDialog } from '../conversation/AdminLeaveClosedGroupDialog'; import { AdminLeaveClosedGroupDialog } from './AdminLeaveClosedGroupDialog';
import { InviteContactsDialog } from '../conversation/InviteContactsDialog'; import { InviteContactsDialog } from './InviteContactsDialog';
import { AddModeratorsDialog } from '../conversation/ModeratorsAddDialog'; import { DeleteAccountModal } from './DeleteAccountModal';
import { RemoveModeratorsDialog } from '../conversation/ModeratorsRemoveDialog'; import { EditProfileDialog } from './EditProfileDialog';
import { UpdateGroupMembersDialog } from '../conversation/UpdateGroupMembersDialog'; import { OnionPathModal } from './OnionStatusPathDialog';
import { UpdateGroupNameDialog } from '../conversation/UpdateGroupNameDialog'; import { UserDetailsDialog } from './UserDetailsDialog';
import { DeleteAccountModal } from '../dialog/DeleteAccountModal';
import { EditProfileDialog } from '../EditProfileDialog';
import { OnionPathModal } from '../OnionStatusPathDialog';
import { UserDetailsDialog } from '../UserDetailsDialog';
import { SessionConfirm } from './SessionConfirm'; import { SessionConfirm } from './SessionConfirm';
import { SessionNicknameDialog } from './SessionNicknameDialog'; import { SessionPasswordDialog } from './SessionPasswordDialog';
import { SessionPasswordModal } from './SessionPasswordModal';
import { SessionSeedModal } from './SessionSeedModal'; import { SessionSeedModal } from './SessionSeedModal';
import { AddModeratorsDialog } from './ModeratorsAddDialog';
import { RemoveModeratorsDialog } from './ModeratorsRemoveDialog';
import { UpdateGroupMembersDialog } from './UpdateGroupMembersDialog';
import { UpdateGroupNameDialog } from './UpdateGroupNameDialog';
import { SessionNicknameDialog } from './SessionNicknameDialog';
export const ModalContainer = () => { export const ModalContainer = () => {
const confirmModalState = useSelector(getConfirmModal); const confirmModalState = useSelector(getConfirmModal);
@ -65,7 +65,7 @@ export const ModalContainer = () => {
{adminLeaveClosedGroupModalState && ( {adminLeaveClosedGroupModalState && (
<AdminLeaveClosedGroupDialog {...adminLeaveClosedGroupModalState} /> <AdminLeaveClosedGroupDialog {...adminLeaveClosedGroupModalState} />
)} )}
{sessionPasswordModalState && <SessionPasswordModal {...sessionPasswordModalState} />} {sessionPasswordModalState && <SessionPasswordDialog {...sessionPasswordModalState} />}
{deleteAccountModalState && <DeleteAccountModal {...deleteAccountModalState} />} {deleteAccountModalState && <DeleteAccountModal {...deleteAccountModalState} />}
</> </>
); );

0
ts/components/conversation/ModeratorsAddDialog.tsx → ts/components/dialog/ModeratorsAddDialog.tsx
Unescape Escape View File

0
ts/components/conversation/ModeratorsRemoveDialog.tsx → ts/components/dialog/ModeratorsRemoveDialog.tsx
Unescape Escape View File

19
ts/components/OnionStatusPathDialog.tsx → ts/components/dialog/OnionStatusPathDialog.tsx
Unescape Escape View File

@ -2,30 +2,27 @@ import React from 'react';
import _ from 'lodash'; import _ from 'lodash';
import { getTheme } from '../state/selectors/theme';
import Electron from 'electron'; import Electron from 'electron';
const { shell } = Electron; const { shell } = Electron;
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { SessionIcon, SessionIconButton, SessionIconSize, SessionIconType } from './session/icon';
import { SessionWrapperModal } from './session/SessionWrapperModal';
import ip2country from 'ip2country'; import ip2country from 'ip2country';
import countryLookup from 'country-code-lookup'; import countryLookup from 'country-code-lookup';
import { useTheme } from 'styled-components'; import { useTheme } from 'styled-components';
import { Snode } from '../data/data'; import { Snode } from '../../data/data';
import { onionPathModal } from '../state/ducks/modalDialog'; import { onionPathModal } from '../../state/ducks/modalDialog';
import { import {
getFirstOnionPath, getFirstOnionPath,
getFirstOnionPathLength, getFirstOnionPathLength,
getIsOnline, getIsOnline,
getOnionPathsCount, getOnionPathsCount,
} from '../state/selectors/onions'; } from '../../state/selectors/onions';
import { getTheme } from '../../state/selectors/theme';
import { SessionSpinner } from './session/SessionSpinner'; import { Flex } from '../basic/Flex';
import { Flex } from './basic/Flex'; import { SessionIcon, SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
import { SessionSpinner } from '../session/SessionSpinner';
import { SessionWrapperModal } from '../session/SessionWrapperModal';
export type StatusLightType = { export type StatusLightType = {
glowStartDelay: number; glowStartDelay: number;

10
ts/components/session/SessionConfirm.tsx → ts/components/dialog/SessionConfirm.tsx
Unescape Escape View File

@ -1,12 +1,12 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { SessionButton, SessionButtonColor } from './SessionButton'; import { SessionButton, SessionButtonColor } from '../session/SessionButton';
import { SessionHtmlRenderer } from './SessionHTMLRenderer'; import { SessionHtmlRenderer } from '../session/SessionHTMLRenderer';
import { SessionIcon, SessionIconSize, SessionIconType } from './icon'; import { SessionIcon, SessionIconSize, SessionIconType } from '../session/icon';
import { DefaultTheme, useTheme, withTheme } from 'styled-components'; import { DefaultTheme, useTheme, withTheme } from 'styled-components';
import { SessionWrapperModal } from './SessionWrapperModal'; import { SessionWrapperModal } from '../session/SessionWrapperModal';
import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { updateConfirmModal } from '../../state/ducks/modalDialog';
import { SpacerLG } from '../basic/Text'; import { SpacerLG } from '../basic/Text';
import { SessionSpinner } from './SessionSpinner'; import { SessionSpinner } from '../session/SessionSpinner';
export interface SessionConfirmDialogProps { export interface SessionConfirmDialogProps {
message?: string; message?: string;

4
ts/components/session/SessionModal.tsx → ts/components/dialog/SessionModal.tsx
Unescape Escape View File

@ -1,9 +1,9 @@
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import { SessionIconButton, SessionIconSize, SessionIconType } from './icon/';
import { SessionButtonColor, SessionButtonType } from './SessionButton';
import { DefaultTheme } from 'styled-components'; import { DefaultTheme } from 'styled-components';
import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
import { SessionButtonColor, SessionButtonType } from '../session/SessionButton';
interface Props { interface Props {
title: string; title: string;

4
ts/components/session/SessionNicknameDialog.tsx → ts/components/dialog/SessionNicknameDialog.tsx
Unescape Escape View File

@ -1,12 +1,12 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { getConversationController } from '../../session/conversations'; import { getConversationController } from '../../session/conversations';
import { SessionButton } from './SessionButton';
import _ from 'lodash'; import _ from 'lodash';
import { SessionWrapperModal } from './SessionWrapperModal';
import { SpacerLG } from '../basic/Text'; import { SpacerLG } from '../basic/Text';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { changeNickNameModal } from '../../state/ducks/modalDialog'; import { changeNickNameModal } from '../../state/ducks/modalDialog';
import { SessionButton } from '../session/SessionButton';
import { SessionWrapperModal } from '../session/SessionWrapperModal';
type Props = { type Props = {
conversationId: string; conversationId: string;

10
ts/components/session/SessionPasswordModal.tsx → ts/components/dialog/SessionPasswordDialog.tsx
Unescape Escape View File

@ -1,11 +1,11 @@
import React from 'react'; import React from 'react';
import { SessionButton, SessionButtonColor } from './SessionButton'; import { SessionButton, SessionButtonColor } from '../session/SessionButton';
import { missingCaseError, PasswordUtil } from '../../util/'; import { missingCaseError, PasswordUtil } from '../../util';
import { ToastUtils } from '../../session/utils'; import { ToastUtils } from '../../session/utils';
import { SessionIconType } from './icon'; import { SessionIconType } from '../session/icon';
import { getPasswordHash } from '../../data/data'; import { getPasswordHash } from '../../data/data';
import { SessionWrapperModal } from './SessionWrapperModal'; import { SessionWrapperModal } from '../session/SessionWrapperModal';
import { SpacerLG, SpacerSM } from '../basic/Text'; import { SpacerLG, SpacerSM } from '../basic/Text';
import autoBind from 'auto-bind'; import autoBind from 'auto-bind';
import { sessionPassword } from '../../state/ducks/modalDialog'; import { sessionPassword } from '../../state/ducks/modalDialog';
@ -23,7 +23,7 @@ interface State {
currentPasswordRetypeEntered: string | null; currentPasswordRetypeEntered: string | null;
} }
export class SessionPasswordModal extends React.Component<Props, State> { export class SessionPasswordDialog extends React.Component<Props, State> {
private passportInput: HTMLInputElement | null = null; private passportInput: HTMLInputElement | null = null;
constructor(props: any) { constructor(props: any) {

4
ts/components/session/SessionSeedModal.tsx → ts/components/dialog/SessionSeedModal.tsx
Unescape Escape View File

@ -1,13 +1,13 @@
import React from 'react'; import React from 'react';
import { SessionButton } from './SessionButton'; import { SessionButton } from '../session/SessionButton';
import { ToastUtils, UserUtils } from '../../session/utils'; import { ToastUtils, UserUtils } from '../../session/utils';
import { withTheme } from 'styled-components'; import { withTheme } from 'styled-components';
import { PasswordUtil } from '../../util'; import { PasswordUtil } from '../../util';
import { getPasswordHash } from '../../data/data'; import { getPasswordHash } from '../../data/data';
import { QRCode } from 'react-qr-svg'; import { QRCode } from 'react-qr-svg';
import { mn_decode } from '../../session/crypto/mnemonic'; import { mn_decode } from '../../session/crypto/mnemonic';
import { SessionWrapperModal } from './SessionWrapperModal'; import { SessionWrapperModal } from '../session/SessionWrapperModal';
import { SpacerLG, SpacerSM, SpacerXS } from '../basic/Text'; import { SpacerLG, SpacerSM, SpacerXS } from '../basic/Text';
import autoBind from 'auto-bind'; import autoBind from 'auto-bind';
import { recoveryPhraseModal } from '../../state/ducks/modalDialog'; import { recoveryPhraseModal } from '../../state/ducks/modalDialog';

0
ts/components/conversation/UpdateGroupMembersDialog.tsx → ts/components/dialog/UpdateGroupMembersDialog.tsx
Unescape Escape View File

0
ts/components/conversation/UpdateGroupNameDialog.tsx → ts/components/dialog/UpdateGroupNameDialog.tsx
Unescape Escape View File

19
ts/components/UserDetailsDialog.tsx → ts/components/dialog/UserDetailsDialog.tsx
Unescape Escape View File

@ -1,17 +1,16 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Avatar, AvatarSize } from './Avatar';
import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton';
import { SessionIdEditable } from './session/SessionIdEditable';
import { getConversationController } from '../session/conversations';
import { ConversationTypeEnum } from '../models/conversation';
import { SessionWrapperModal } from './session/SessionWrapperModal';
import { SpacerMD } from './basic/Text';
import { updateUserDetailsModal } from '../state/ducks/modalDialog';
import { openConversationWithMessages } from '../state/ducks/conversations';
// tslint:disable-next-line: no-submodule-imports // tslint:disable-next-line: no-submodule-imports
import useKey from 'react-use/lib/useKey'; import useKey from 'react-use/lib/useKey';
import { getFirstUnreadMessageIdInConversation } from '../data/data'; import { ConversationTypeEnum } from '../../models/conversation';
import { getConversationController } from '../../session/conversations';
import { openConversationWithMessages } from '../../state/ducks/conversations';
import { updateUserDetailsModal } from '../../state/ducks/modalDialog';
import { Avatar, AvatarSize } from '../Avatar';
import { SpacerMD } from '../basic/Text';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../session/SessionButton';
import { SessionIdEditable } from '../session/SessionIdEditable';
import { SessionWrapperModal } from '../session/SessionWrapperModal';
type Props = { type Props = {
conversationId: string; conversationId: string;
authorAvatarPath: string | null; authorAvatarPath: string | null;

10
ts/components/session/ActionsPanel.tsx
Unescape Escape View File

@ -37,20 +37,16 @@ import { getOpenGroupManager } from '../../opengroup/opengroupV2/OpenGroupManage
import { forceRefreshRandomSnodePool } from '../../session/snode_api/snodePool'; import { forceRefreshRandomSnodePool } from '../../session/snode_api/snodePool';
import { getSwarmPollingInstance } from '../../session/snode_api'; import { getSwarmPollingInstance } from '../../session/snode_api';
import { DURATION } from '../../session/constants'; import { DURATION } from '../../session/constants';
import { import { conversationChanged, conversationRemoved } from '../../state/ducks/conversations';
actions as conversationActions,
conversationChanged,
conversationRemoved,
} from '../../state/ducks/conversations';
import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog'; import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
import { uploadOurAvatar } from '../../interactions/conversationInteractions'; import { uploadOurAvatar } from '../../interactions/conversationInteractions';
import { ModalContainer } from './ModalContainer'; import { ModalContainer } from '../dialog/ModalContainer';
import { debounce } from 'underscore'; import { debounce } from 'underscore';
import { loadDefaultRooms } from '../../opengroup/opengroupV2/ApiUtil'; import { loadDefaultRooms } from '../../opengroup/opengroupV2/ApiUtil';
import { ActionPanelOnionStatusLight } from '../OnionStatusPathDialog';
// tslint:disable-next-line: no-import-side-effect no-submodule-imports // tslint:disable-next-line: no-import-side-effect no-submodule-imports
import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
const Section = (props: { type: SectionType; avatarPath?: string }) => { const Section = (props: { type: SectionType; avatarPath?: string }) => {
const ourNumber = useSelector(getOurNumber); const ourNumber = useSelector(getOurNumber);
const unreadMessageCount = useSelector(getUnreadMessageCount); const unreadMessageCount = useSelector(getUnreadMessageCount);

2
ts/components/session/settings/SessionSettingListItem.tsx
Unescape Escape View File

@ -7,7 +7,7 @@ import { SessionToggle } from '../SessionToggle';
import { SessionButton } from '../SessionButton'; import { SessionButton } from '../SessionButton';
import { SessionSettingType } from './SessionSettings'; import { SessionSettingType } from './SessionSettings';
import { SessionRadioGroup } from '../SessionRadioGroup'; import { SessionRadioGroup } from '../SessionRadioGroup';
import { SessionConfirmDialogProps } from '../SessionConfirm'; import { SessionConfirmDialogProps } from '../../dialog/SessionConfirm';
type Props = { type Props = {
title?: string; title?: string;

8
ts/components/session/settings/SessionSettings.tsx
Unescape Escape View File

@ -8,22 +8,20 @@ import { ConversationLookupType } from '../../../state/ducks/conversations';
import { StateType } from '../../../state/reducer'; import { StateType } from '../../../state/reducer';
import { getConversationController } from '../../../session/conversations'; import { getConversationController } from '../../../session/conversations';
import { getConversationLookup } from '../../../state/selectors/conversations'; import { getConversationLookup } from '../../../state/selectors/conversations';
import { connect, useSelector } from 'react-redux'; import { connect } from 'react-redux';
import { import {
createOrUpdateItem, createOrUpdateItem,
getPasswordHash, getPasswordHash,
hasLinkPreviewPopupBeenDisplayed, hasLinkPreviewPopupBeenDisplayed,
} from '../../../../ts/data/data'; } from '../../../../ts/data/data';
import { SpacerLG, SpacerXS } from '../../basic/Text';
import { shell } from 'electron'; import { shell } from 'electron';
import { SessionConfirmDialogProps } from '../SessionConfirm'; import { SessionConfirmDialogProps } from '../../dialog/SessionConfirm';
import { mapDispatchToProps } from '../../../state/actions'; import { mapDispatchToProps } from '../../../state/actions';
import { unblockConvoById } from '../../../interactions/conversationInteractions'; import { unblockConvoById } from '../../../interactions/conversationInteractions';
import { toggleAudioAutoplay } from '../../../state/ducks/userConfig'; import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
import { sessionPassword } from '../../../state/ducks/modalDialog'; import { sessionPassword } from '../../../state/ducks/modalDialog';
import { PasswordAction } from '../SessionPasswordModal'; import { PasswordAction } from '../../dialog/SessionPasswordDialog';
import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon'; import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon';
import { withTheme } from 'styled-components';
export enum SessionSettingCategory { export enum SessionSettingCategory {
Appearance = 'appearance', Appearance = 'appearance',

4
ts/state/ducks/modalDialog.tsx
Unescape Escape View File

@ -1,6 +1,6 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { SessionConfirmDialogProps } from '../../components/session/SessionConfirm'; import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
import { PasswordAction } from '../../components/session/SessionPasswordModal'; import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
export type ConfirmModalState = SessionConfirmDialogProps | null; export type ConfirmModalState = SessionConfirmDialogProps | null;
export type InviteContactModalState = { conversationId: string } | null; export type InviteContactModalState = { conversationId: string } | null;

Write Preview
Loading…
Cancel
Save