Fix all exports

dhoko · dhoko · commit 88ddc129bfb3 · 2019-03-20T18:05:30.000+01:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -26,6 +26,7 @@
         "ttag",
         "react-components",
         "react-router-dom",
+        "react-router",
         "react-redux",
         "react-test-renderer",
         "enzyme",
diff --git a/Containers/domain/AddressCatchAll.js b/Containers/domain/AddressCatchAll.js
diff --git a/Containers/domain/AddressStatus.js b/Containers/domain/AddressStatus.js
diff --git a/Containers/domain/AddressesSection.js b/Containers/domain/AddressesSection.js
diff --git a/Containers/domain/AddressesTable.js b/Containers/domain/AddressesTable.js
@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Table, TableHeader, TableBody, TableRow, Info } from 'react-components';
 
-import AddressStatus from './AddressStatus';
-import AddressCatchAll from './AddressCatchAll';
+import AddressStatus from '../domain/AddressStatus';
+import AddressCatchAll from '../domain/AddressCatchAll';
 
 const AddressesTable = ({ domain, members }) => {
     const getMemberName = (memberID) => {
diff --git a/Containers/domain/actions.js b/Containers/domain/actions.js
@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import { Alert, SmallButton, ConfirmModal, useModal, useApiWithoutResult, useNotifications } from 'react-components';
 import { deleteDomain } from 'proton-shared/lib/api/domains';
 
-import DomainModal from './DomainModal';
-import CatchAllModal from './CatchAllModal';
+import DomainModal from './modal';
+import CatchAllModal from './modal/catchAll';
 
 const DomainActions = ({ domain }) => {
     const { request, loading } = useApiWithoutResult(deleteDomain);
diff --git a/Containers/domain/modal/catchAll.js b/Containers/domain/modal/catchAll.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { c } from 'ttag';
 import { Modal, ContentModal, FooterModal, ResetButton } from 'react-components';
 
-import AddressesTable from './AddressesTable';
+import AddressesTable from '../AddressesTable';
 
 const CatchAllModal = ({ domain, show, onClose }) => {
     return (
diff --git a/Containers/domain/modal/index.js b/Containers/domain/modal/index.js
@@ -15,13 +15,13 @@ import {
 import { addDomain, getDomain } from 'proton-shared/lib/api/domains';
 import { VERIFY_STATE } from 'proton-shared/lib/constants';
 
-import DomainSection from './DomainSection';
-import VerifySection from './VerifySection';
-import AddressesSection from './AddressesSection';
-import SPFSection from './SPFSection';
-import DKIMSection from './DKIMSection';
-import MXSection from './MXSection';
-import DMARCSection from './DMARCSection';
+import DomainSection from '../section';
+import VerifySection from '../verifySection';
+import AddressesSection from '../AddressesSection';
+import SPFSection from '../SPFSection';
+import DKIMSection from '../DKIMSection';
+import MXSection from '../MXSection';
+import DMARCSection from '../DMARCSection';
 
 const { VERIFY_STATE_DEFAULT, VERIFY_STATE_EXIST, VERIFY_STATE_GOOD } = VERIFY_STATE;
 const DOMAIN_STEP = 0;
diff --git a/Containers/domains/section.js b/Containers/domains/section.js
@@ -5,8 +5,8 @@ import PropTypes from 'prop-types';
 import { SubTitle, Alert, PrimaryButton, Button, Block, useModal } from 'react-components';
 import { fetchDomains } from 'proton-shared/lib/state/domains/actions';
 
-import DomainModal from './DomainModal';
-import DomainsTable from './DomainsTable';
+import DomainModal from '../domain/modal';
+import DomainsTable from './table';
 
 const DomainsSection = ({ organization, domains, fetchDomains }) => {
     const { isOpen, open, close } = useModal();
diff --git a/Containers/domains/table.js b/Containers/domains/table.js
@@ -5,9 +5,9 @@ import PropTypes from 'prop-types';
 import { Table, TableHeader, TableBody, TableRow, Alert } from 'react-components';
 import { fetchMembers } from 'proton-shared/lib/state/members/actions';
 
-import DomainStatus from './DomainStatus';
-import DomainActions from './DomainActions';
-import DomainName from './DomainName';
+import DomainStatus from '../domain/status';
+import DomainActions from '../domain/actions';
+import DomainName from '../domain/name';
 
 const DomainsTable = ({ domains, loading, fetchMembers }) => {
     useEffect(() => {
diff --git a/Containers/invoices/actions.js b/Containers/invoices/actions.js
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { INVOICE_STATE } from 'proton-shared/lib/constants';
 
-import DownloadInvoiceButton from './DownloadInvoiceButton';
-import PayButton from './PayButton';
+import DownloadInvoiceButton from './downloadButton';
+import PayButton from './payButton';
 
 const InvoiceActions = ({ invoice, fetchInvoices }) => {
     return (
diff --git a/Containers/invoices/modal/pay.js b/Containers/invoices/modal/pay.js
@@ -15,8 +15,8 @@ import {
 } from 'react-components';
 import { checkInvoice, payInvoice } from 'proton-shared/lib/api/payments';
 
-import Payment from '../payments/Payment';
-import usePayment from '../payments/usePayment';
+import Payment from '../../payments';
+import usePayment from '../../payments/hooks/usePayment';
 
 const PayInvoiceModal = ({ show, invoice, onClose, fetchInvoices }) => {
     const { request, loading: loadingPay } = useApiWithoutResult(payInvoice);
diff --git a/Containers/invoices/payButton.js b/Containers/invoices/payButton.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { SmallButton, useApiWithoutResult, useModal, useNotifications } from 'react-components';
 import { getPaymentMethodStatus } from 'proton-shared/lib/api/payments';
 
-import PayInvoiceModal from './PayInvoiceModal';
+import PayInvoiceModal from './modal/pay';
 
 const PayButton = ({ invoice, fetchInvoices }) => {
     const { createNotification } = useNotifications();
diff --git a/Containers/invoices/section.js b/Containers/invoices/section.js
@@ -20,11 +20,11 @@ import { queryInvoices } from 'proton-shared/lib/api/payments';
 import { ELEMENTS_PER_PAGE, INVOICE_OWNER, INVOICE_STATE } from 'proton-shared/lib/constants';
 
 import useApiResult from '../../hooks/useApiResult';
-import InvoiceAmount from './InvoiceAmount';
-import InvoiceType from './InvoiceType';
-import InvoiceState from './InvoiceState';
-import InvoiceActions from './InvoiceActions';
-import InvoiceTextModal from './InvoiceTextModal';
+import InvoiceAmount from './amount';
+import InvoiceType from './type';
+import InvoiceState from './state';
+import InvoiceActions from './actions';
+import InvoiceTextModal from './modal/text';
 
 const InvoicesSection = () => {
     const { ORGANIZATION, USER } = INVOICE_OWNER;
diff --git a/Containers/keys/AddressKeysSectionModel.js b/Containers/keys/AddressKeysSectionModel.js
@@ -1,7 +1,7 @@
 import { MAIN_USER_KEY } from 'proton-shared/lib/constants';
 import { describe } from 'proton-shared/lib/state/keys/keysAlgorithm';
 
-import { STATUSES } from './KeysStatus';
+import { STATUSES } from './status';
 
 const convertKey = (address) => ({ decryptedPrivateKey, Key, info }, i) => {
     const getStatus = () => {
diff --git a/Containers/keys/addressSection.js b/Containers/keys/addressSection.js
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import AddressKeysHeader from './AddressKeysHeader';
-import ContactKeysHeader from './ContactKeysHeader';
-import AddressKeysTable from './AddressKeysTable';
+import AddressKeysHeader from './addressHeader';
+import ContactKeysHeader from './contactHeader';
+import AddressKeysTable from './addressTable';
 import { getAddressesKeys, getUserAddressKeys } from './AddressKeysSectionModel';
 
 const AddressKeysSection = ({ userModel, addressesModel, keysModel }) => {
diff --git a/Containers/keys/addressTable.js b/Containers/keys/addressTable.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { c } from 'ttag';
 import { Table, TableHeader, TableBody } from 'react-components';
 
-import KeysTable from './KeysTable';
-import AddressKeysRow from './AddressKeysRow';
+import KeysTable from './table';
+import AddressKeysRow from './addressRow';
 
 const AddressKeysTable = ({
     addressKeys,
diff --git a/Containers/keys/table.js b/Containers/keys/table.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { c } from 'ttag';
 import { Table, TableHeader, TableBody } from 'react-components';
 
-import KeysRow from './KeysRow';
-import KeysActions from './KeysActions';
-import KeysStatus from './KeysStatus';
+import KeysRow from './row';
+import KeysActions from './actions';
+import KeysStatus from './status';
 
 const KeysTable = ({
     email,
diff --git a/Containers/login/container.js b/Containers/login/container.js
@@ -4,7 +4,7 @@ import { c } from 'ttag';
 import { SubTitle, useNotifications } from 'react-components';
 import { FORM } from 'proton-shared/lib/authentication/loginReducer';
 
-import LoginForm from './LoginForm';
+import LoginForm from './form';
 import TOTPForm from './TOTPForm';
 import UnlockForm from './UnlockForm';
 import useLogin from './useLogin';
diff --git a/Containers/logs/section.js b/Containers/logs/section.js
@@ -19,8 +19,8 @@ import downloadFile from 'proton-shared/lib/helpers/downloadFile';
 import { ELEMENTS_PER_PAGE, LOGS_STATE } from 'proton-shared/lib/constants';
 import useApi from '../../hooks/useApi';
 
-import LogsTable from './LogsTable';
-import WipeLogsButton from './WipeLogsButton';
+import LogsTable from './table';
+import WipeLogsButton from './wipeButton';
 
 const EVENTS = {
     0: c('Log event').t`Login password failure`,
diff --git a/Containers/members/actions.js b/Containers/members/actions.js
@@ -14,7 +14,7 @@ import { c } from 'ttag';
 import { removeMember, updateRole, privatizeMember } from 'proton-shared/lib/api/members';
 import { MEMBER_PRIVATE, MEMBER_ROLE } from 'proton-shared/lib/constants';
 
-import EditMemberModal from './EditMemberModal';
+import EditMemberModal from './modal/edit';
 
 const MemberActions = ({ member, organization }) => {
     const { call } = useEventManager();
diff --git a/Containers/members/addButton.js b/Containers/members/addButton.js
@@ -6,7 +6,7 @@ import { PrimaryButton, useModal, useNotifications } from 'react-components';
 import { fetchDomains } from 'proton-shared/lib/state/domains/actions';
 import { DOMAIN_STATE } from 'proton-shared/lib/constants';
 
-import MemberModal from './MemberModal';
+import MemberModal from './modal';
 
 const { DOMAIN_STATE_ACTIVE } = DOMAIN_STATE;
 
diff --git a/Containers/members/addresses.js b/Containers/members/addresses.js
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { ngettext, msgid, c } from 'ttag';
 import { Dropdown, DropdownMenu, SmallButton, useModal } from 'react-components';
 
-import AddressModal from '../addresses/AddressModal';
+import AddressModal from '../addresses/modal';
 
 const MemberAddresses = ({ member }) => {
     const title = member.addresses.map(({ Email }) => Email).join(', ');
diff --git a/Containers/members/modal/edit.js b/Containers/members/modal/edit.js
@@ -15,11 +15,11 @@ import {
     useNotifications,
     useEventManager
 } from 'react-components';
-
-import MemberStorageSelector from './MemberStorageSelector';
-import MemberVPNSelector from './MemberVPNSelector';
 import { updateName, updateQuota, updateVPN } from 'proton-shared/lib/api/members';
 
+import MemberStorageSelector from '../storageSelector';
+import MemberVPNSelector from '../VPNSelector';
+
 const EditMemberModal = ({ show, onClose, member, organization }) => {
     const { call } = useEventManager();
     const [model, updateModel] = useState({ name: member.Name, storage: member.MaxSpace, vpn: member.MaxVPN });
diff --git a/Containers/members/modal/index.js b/Containers/members/modal/index.js
@@ -18,9 +18,9 @@ import {
     useEventManager
 } from 'react-components';
 
-import MemberStorageSelector from './MemberStorageSelector';
-import MemberVPNSelector from './MemberVPNSelector';
-import useMemberModal from './useMemberModal';
+import MemberStorageSelector from '../storageSelector';
+import MemberVPNSelector from '../VPNSelector';
+import useMemberModal from '../useMemberModal';
 
 const MemberModal = ({ show, onClose, organization, domains }) => {
     const { createNotification } = useNotifications();
diff --git a/Containers/members/section.js b/Containers/members/section.js
@@ -7,12 +7,12 @@ import { Link } from 'react-router-dom';
 import { fetchMembers } from 'proton-shared/lib/state/members/actions';
 import { normalize } from 'proton-shared/lib/helpers/string';
 
-import MemberActions from './MemberActions';
-import MemberAddresses from './MemberAddresses';
-import AddMemberButton from './AddMemberButton';
-import MemberOptions from './MemberOptions';
-import MemberRole from './MemberRole';
-import MemberPrivate from './MemberPrivate';
+import MemberActions from './actions';
+import MemberAddresses from './addresses';
+import AddMemberButton from './addButton';
+import MemberOptions from './options';
+import MemberRole from './role';
+import MemberPrivate from './private';
 
 const MembersSection = ({ organization, members, fetchMembers }) => {
     const [keywords, setKeywords] = useState('');
diff --git a/Containers/members/storageSelector.js b/Containers/members/storageSelector.js
diff --git a/Containers/notification/DailyToggle.js b/Containers/notification/DailyToggle.js
diff --git a/Containers/notification/DesktopPanel.js b/Containers/notification/DesktopPanel.js
diff --git a/Containers/notification/section.js b/Containers/notification/section.js
@@ -2,11 +2,11 @@ import React from 'react';
 import { c } from 'ttag';
 import { SubTitle, Label, Row, Info } from 'react-components';
 
-import PasswordResetToggle from './PasswordResetToggle';
-import DailyNotificationsToggle from './DailyNotificationsToggle';
-import DesktopNotificationPanel from './DesktopNotificationPanel';
+import PasswordResetToggle from '../password/resetToggle';
+import DailyNotificationsToggle from './DailyToggle';
+import DesktopNotificationPanel from './DesktopPanel';
 import NewsCheckboxes from './NewsCheckboxes';
-import RecoveryEmailButton from './RecoveryEmailButton';
+import RecoveryEmailButton from '../password/RecoveryEmailButton';
 
 const NotificationSection = () => {
     return (
diff --git a/Containers/password/RecoveryEmailButton.js b/Containers/password/RecoveryEmailButton.js
diff --git a/Containers/password/resetToggle.js b/Containers/password/resetToggle.js
diff --git a/README.md b/README.md
@@ -164,10 +164,10 @@ ex:
 
 ### TL;DR
 
-`<componentName>/index.js` => `export { default as ComponentName }`
-`<componentName>/<flavor>.js` => `export { default as FlavorComponentName }`
+- `<componentName>/index.js` => `export { default as ComponentName }`
+- `<componentName>/<flavor>.js` => `export { default as FlavorComponentName }`
 
 ex:
 
-`button/index.js` => `export { default as Button }`
-`button/small.js` => `export { default as SmallButton }`
+- `button/index.js` => `export { default as Button }`
+- `button/small.js` => `export { default as SmallButton }`
diff --git a/index.js b/index.js
diff --git a/makeExport b/makeExport
