diff --git a/storybook/pages/AddressesInputListPage.qml b/storybook/pages/AddressesInputListPage.qml index bb392e374c..bf95bc641e 100644 --- a/storybook/pages/AddressesInputListPage.qml +++ b/storybook/pages/AddressesInputListPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/AddressesSelectorPanelPage.qml b/storybook/pages/AddressesSelectorPanelPage.qml index f70f9c6bf2..40b4155a1b 100644 --- a/storybook/pages/AddressesSelectorPanelPage.qml +++ b/storybook/pages/AddressesSelectorPanelPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/AirdropRecipientsSelectorPage.qml b/storybook/pages/AirdropRecipientsSelectorPage.qml index bf6d09f30f..ec98743a6e 100644 --- a/storybook/pages/AirdropRecipientsSelectorPage.qml +++ b/storybook/pages/AirdropRecipientsSelectorPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import Models 1.0 import Storybook 1.0 diff --git a/storybook/pages/AirdropTokensSelectorPage.qml b/storybook/pages/AirdropTokensSelectorPage.qml index d42cf2c734..474a8467e3 100644 --- a/storybook/pages/AirdropTokensSelectorPage.qml +++ b/storybook/pages/AirdropTokensSelectorPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import utils 1.0 diff --git a/storybook/pages/AlertPopupPage.qml b/storybook/pages/AlertPopupPage.qml index 33ab96bc9d..53cc9807d5 100644 --- a/storybook/pages/AlertPopupPage.qml +++ b/storybook/pages/AlertPopupPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/BurnTokensPopupPage.qml b/storybook/pages/BurnTokensPopupPage.qml index 0277749f0c..12424f5d4b 100644 --- a/storybook/pages/BurnTokensPopupPage.qml +++ b/storybook/pages/BurnTokensPopupPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/ChatPermissionQualificationPanelPage.qml b/storybook/pages/ChatPermissionQualificationPanelPage.qml index 93e7ce71db..520683ba9a 100644 --- a/storybook/pages/ChatPermissionQualificationPanelPage.qml +++ b/storybook/pages/ChatPermissionQualificationPanelPage.qml @@ -6,8 +6,8 @@ import Models 1.0 import Storybook 1.0 import utils 1.0 -import AppLayouts.Chat.popups.community 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.panels 1.0 SplitView { id: root diff --git a/storybook/pages/CommunitiesPortalLayoutPage.qml b/storybook/pages/CommunitiesPortalLayoutPage.qml index 26fc0c2b68..993c7deabe 100644 --- a/storybook/pages/CommunitiesPortalLayoutPage.qml +++ b/storybook/pages/CommunitiesPortalLayoutPage.qml @@ -1,8 +1,8 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import AppLayouts.CommunitiesPortal 1.0 -import AppLayouts.CommunitiesPortal.stores 1.0 +import AppLayouts.Communities 1.0 +import AppLayouts.Communities.stores 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/pages/CommunityAirdropsSettingsPanelPage.qml b/storybook/pages/CommunityAirdropsSettingsPanelPage.qml index da58bd29c3..d4530358ac 100644 --- a/storybook/pages/CommunityAirdropsSettingsPanelPage.qml +++ b/storybook/pages/CommunityAirdropsSettingsPanelPage.qml @@ -3,8 +3,8 @@ import QtQuick.Controls 2.15 import StatusQ.Core.Theme 0.1 -import AppLayouts.Chat.panels.communities 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.panels 1.0 +import AppLayouts.Communities.controls 1.0 import utils 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/pages/CommunityColumnHeaderPanelPage.qml b/storybook/pages/CommunityColumnHeaderPanelPage.qml index 21b2d7d0d8..27dad0140d 100644 --- a/storybook/pages/CommunityColumnHeaderPanelPage.qml +++ b/storybook/pages/CommunityColumnHeaderPanelPage.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import StatusQ.Core.Theme 0.1 import utils 1.0 diff --git a/storybook/pages/CommunityMintTokensSettingsPanelPage.qml b/storybook/pages/CommunityMintTokensSettingsPanelPage.qml index c1efa140dd..1542358311 100644 --- a/storybook/pages/CommunityMintTokensSettingsPanelPage.qml +++ b/storybook/pages/CommunityMintTokensSettingsPanelPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import AppLayouts.Chat.stores 1.0 import StatusQ.Core.Theme 0.1 diff --git a/storybook/pages/CommunityMintedTokensViewPage.qml b/storybook/pages/CommunityMintedTokensViewPage.qml index bc5dc24537..4af9cd2137 100644 --- a/storybook/pages/CommunityMintedTokensViewPage.qml +++ b/storybook/pages/CommunityMintedTokensViewPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/CommunityNewAirdropViewPage.qml b/storybook/pages/CommunityNewAirdropViewPage.qml index 03bc96ef05..fa889b29ba 100644 --- a/storybook/pages/CommunityNewAirdropViewPage.qml +++ b/storybook/pages/CommunityNewAirdropViewPage.qml @@ -2,8 +2,8 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.views.communities 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.views 1.0 +import AppLayouts.Communities.controls 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/CommunityNewPermissionViewPage.qml b/storybook/pages/CommunityNewPermissionViewPage.qml index d9307c85c5..9706c3ae9d 100644 --- a/storybook/pages/CommunityNewPermissionViewPage.qml +++ b/storybook/pages/CommunityNewPermissionViewPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Storybook 1.0 import Models 1.0 @@ -27,8 +27,6 @@ SplitView { permissionDuplicated: isPermissionDuplicatedCheckBox.checked permissionTypeLimitReached: isLimitReachedCheckBox.checked - showWhoHoldsSwitch: true - assetsModel: AssetsModel {} collectiblesModel: CollectiblesModel {} channelsModel: ChannelsModel {} diff --git a/storybook/pages/CommunityNewTokenViewPage.qml b/storybook/pages/CommunityNewTokenViewPage.qml index 6ad48d5e01..25f672a8e6 100644 --- a/storybook/pages/CommunityNewTokenViewPage.qml +++ b/storybook/pages/CommunityNewTokenViewPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/CommunityPermissionsHoldingItemEditor.qml b/storybook/pages/CommunityPermissionsHoldingItemEditor.qml index 491023fe77..ed3f74a7f9 100644 --- a/storybook/pages/CommunityPermissionsHoldingItemEditor.qml +++ b/storybook/pages/CommunityPermissionsHoldingItemEditor.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 ColumnLayout { id: root diff --git a/storybook/pages/CommunityPermissionsRowPage.qml b/storybook/pages/CommunityPermissionsRowPage.qml index cfdf9dbc6b..bfc07ea77f 100644 --- a/storybook/pages/CommunityPermissionsRowPage.qml +++ b/storybook/pages/CommunityPermissionsRowPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 SplitView { id: root diff --git a/storybook/pages/CommunityPermissionsSettingsPanelEditor.qml b/storybook/pages/CommunityPermissionsSettingsPanelEditor.qml index a5fbcaa350..108a613d79 100644 --- a/storybook/pages/CommunityPermissionsSettingsPanelEditor.qml +++ b/storybook/pages/CommunityPermissionsSettingsPanelEditor.qml @@ -4,8 +4,6 @@ import QtQuick.Layouts 1.14 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.controls.community 1.0 - Flickable { id: root diff --git a/storybook/pages/CommunityPermissionsSettingsPanelPage.qml b/storybook/pages/CommunityPermissionsSettingsPanelPage.qml index 4f48aa8a0c..d215bce8d3 100644 --- a/storybook/pages/CommunityPermissionsSettingsPanelPage.qml +++ b/storybook/pages/CommunityPermissionsSettingsPanelPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import StatusQ.Core.Theme 0.1 import StatusQ.Core.Utils 0.1 @@ -77,10 +77,6 @@ SplitView { collectiblesModel: CollectiblesModel {} channelsModel: ChannelsModel {} - isOwner: isOwnerCheckBox.checked - - showWhoHoldsSwitch: true - onCreatePermissionRequested: { permissionsStoreMock.createPermission(holdings, permissionType, isPrivate, channels) diff --git a/storybook/pages/CommunityPermissionsViewPage.qml b/storybook/pages/CommunityPermissionsViewPage.qml index 708f89d97f..2514899f19 100644 --- a/storybook/pages/CommunityPermissionsViewPage.qml +++ b/storybook/pages/CommunityPermissionsViewPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.15 import StatusQ.Core.Theme 0.1 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Models 1.0 import Storybook 1.0 diff --git a/storybook/pages/CommunityProfilePopupInviteFriendsPanelPage.qml b/storybook/pages/CommunityProfilePopupInviteFriendsPanelPage.qml index 6b91fe3eff..e5055c301a 100644 --- a/storybook/pages/CommunityProfilePopupInviteFriendsPanelPage.qml +++ b/storybook/pages/CommunityProfilePopupInviteFriendsPanelPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 Item { diff --git a/storybook/pages/CommunityProfilePopupInviteMessagePanelPage.qml b/storybook/pages/CommunityProfilePopupInviteMessagePanelPage.qml index f88461ae1e..7e054325d6 100644 --- a/storybook/pages/CommunityProfilePopupInviteMessagePanelPage.qml +++ b/storybook/pages/CommunityProfilePopupInviteMessagePanelPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 Item { diff --git a/storybook/pages/CommunityTokenPermissionsPopupPage.qml b/storybook/pages/CommunityTokenPermissionsPopupPage.qml index 83e89c5047..f7969696a2 100644 --- a/storybook/pages/CommunityTokenPermissionsPopupPage.qml +++ b/storybook/pages/CommunityTokenPermissionsPopupPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { SplitView { diff --git a/storybook/pages/CommunityTokenViewPage.qml b/storybook/pages/CommunityTokenViewPage.qml index b6363cc9b9..e00fba8d41 100644 --- a/storybook/pages/CommunityTokenViewPage.qml +++ b/storybook/pages/CommunityTokenViewPage.qml @@ -2,8 +2,8 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import AppLayouts.Chat.views.communities 1.0 -import AppLayouts.Chat.helpers 1.0 +import AppLayouts.Communities.views 1.0 +import AppLayouts.Communities.helpers 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/CreateChannelPopupPage.qml b/storybook/pages/CreateChannelPopupPage.qml index 9dc993f1c4..b3f7486c1c 100644 --- a/storybook/pages/CreateChannelPopupPage.qml +++ b/storybook/pages/CreateChannelPopupPage.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { id: root diff --git a/storybook/pages/FeesPanelPage.qml b/storybook/pages/FeesPanelPage.qml index 0af4824afc..081e119612 100644 --- a/storybook/pages/FeesPanelPage.qml +++ b/storybook/pages/FeesPanelPage.qml @@ -4,8 +4,7 @@ import QtQuick.Layouts 1.15 import Storybook 1.0 -import AppLayouts.Chat.panels.communities 1.0 - +import AppLayouts.Communities.panels 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/HoldingsDropdownPage.qml b/storybook/pages/HoldingsDropdownPage.qml index 29049247d4..379cac2654 100644 --- a/storybook/pages/HoldingsDropdownPage.qml +++ b/storybook/pages/HoldingsDropdownPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/pages/InDropdownPage.qml b/storybook/pages/InDropdownPage.qml index 50faaa8c5e..1375da4364 100644 --- a/storybook/pages/InDropdownPage.qml +++ b/storybook/pages/InDropdownPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/InlineNetworksComboBoxPage.qml b/storybook/pages/InlineNetworksComboBoxPage.qml index 07f56c6bb0..654f0387ae 100644 --- a/storybook/pages/InlineNetworksComboBoxPage.qml +++ b/storybook/pages/InlineNetworksComboBoxPage.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.15 import Models 1.0 import utils 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 Item { id: root diff --git a/storybook/pages/InviteFriendsToCommunityPopupPage.qml b/storybook/pages/InviteFriendsToCommunityPopupPage.qml index b80c9e0a84..7737c12bb8 100644 --- a/storybook/pages/InviteFriendsToCommunityPopupPage.qml +++ b/storybook/pages/InviteFriendsToCommunityPopupPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import AppLayouts.Chat.popups 1.0 +import AppLayouts.Communities.popups 1.0 import utils 1.0 import Storybook 1.0 diff --git a/storybook/pages/JoinCommunityViewPage.qml b/storybook/pages/JoinCommunityViewPage.qml index 549bf5d5fc..94fa449788 100644 --- a/storybook/pages/JoinCommunityViewPage.qml +++ b/storybook/pages/JoinCommunityViewPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Storybook 1.0 import Models 1.0 @@ -152,8 +152,6 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, openJoinCommunityDialog() } onInvitationPendingClicked: logs.logEvent("JoinCommunityView::onInvitationPendingClicked()") - onJoined: logs.logEvent("JoinCommunityView::onJoined()") - onCancelMembershipRequest: logs.logEvent("JoinCommunityView::onCancelMembershipRequest()") } } diff --git a/storybook/pages/JoinPermissionsOverlayPanelPage.qml b/storybook/pages/JoinPermissionsOverlayPanelPage.qml index 7f0a6c6488..fc01cdc0c9 100644 --- a/storybook/pages/JoinPermissionsOverlayPanelPage.qml +++ b/storybook/pages/JoinPermissionsOverlayPanelPage.qml @@ -8,8 +8,7 @@ import StatusQ.Core 0.1 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.panels.communities 1.0 - +import AppLayouts.Communities.panels 1.0 import utils 1.0 diff --git a/storybook/pages/MembersDropdownPage.qml b/storybook/pages/MembersDropdownPage.qml index 9180848753..cb29df5b71 100644 --- a/storybook/pages/MembersDropdownPage.qml +++ b/storybook/pages/MembersDropdownPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtQml 2.15 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import utils 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/pages/MessageContextMenuPage.qml b/storybook/pages/MessageContextMenuPage.qml index 8367e1bb75..316123f8ee 100644 --- a/storybook/pages/MessageContextMenuPage.qml +++ b/storybook/pages/MessageContextMenuPage.qml @@ -6,7 +6,7 @@ import StatusQ.Controls 0.1 import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/PermissionConflictWarningPanelPage.qml b/storybook/pages/PermissionConflictWarningPanelPage.qml index 43d32f365d..aada0859c3 100644 --- a/storybook/pages/PermissionConflictWarningPanelPage.qml +++ b/storybook/pages/PermissionConflictWarningPanelPage.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 SplitView { orientation: Qt.Vertical diff --git a/storybook/pages/PermissionQualificationPanelPage.qml b/storybook/pages/PermissionQualificationPanelPage.qml index b3853925eb..1b8e3c098d 100644 --- a/storybook/pages/PermissionQualificationPanelPage.qml +++ b/storybook/pages/PermissionQualificationPanelPage.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 SplitView { orientation: Qt.Vertical diff --git a/storybook/pages/RemotelyDestructPopupPage.qml b/storybook/pages/RemotelyDestructPopupPage.qml index 8a49a30629..f0546d10e3 100644 --- a/storybook/pages/RemotelyDestructPopupPage.qml +++ b/storybook/pages/RemotelyDestructPopupPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/SignMultiTokenTransactionsPopupPage.qml b/storybook/pages/SignMultiTokenTransactionsPopupPage.qml index b9589c2aca..f3a144071f 100644 --- a/storybook/pages/SignMultiTokenTransactionsPopupPage.qml +++ b/storybook/pages/SignMultiTokenTransactionsPopupPage.qml @@ -4,8 +4,7 @@ import QtQuick.Layouts 1.15 import Storybook 1.0 -import AppLayouts.Chat.popups.community 1.0 - +import AppLayouts.Communities.popups 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/SignTokenTransactionsPopupPage.qml b/storybook/pages/SignTokenTransactionsPopupPage.qml index 3fb8f00b64..f449e8cd2e 100644 --- a/storybook/pages/SignTokenTransactionsPopupPage.qml +++ b/storybook/pages/SignTokenTransactionsPopupPage.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 SplitView { Logs { id: logs } diff --git a/storybook/pages/SortableTokenHoldersListPage.qml b/storybook/pages/SortableTokenHoldersListPage.qml index cc0b389a1f..662a631706 100644 --- a/storybook/pages/SortableTokenHoldersListPage.qml +++ b/storybook/pages/SortableTokenHoldersListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/SortableTokenHoldersPanelPage.qml b/storybook/pages/SortableTokenHoldersPanelPage.qml index cfb73d7a38..7c103e0769 100644 --- a/storybook/pages/SortableTokenHoldersPanelPage.qml +++ b/storybook/pages/SortableTokenHoldersPanelPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/TokenHoldersPanelPage.qml b/storybook/pages/TokenHoldersPanelPage.qml index 9c1e4ab017..1ac4d55dfc 100644 --- a/storybook/pages/TokenHoldersPanelPage.qml +++ b/storybook/pages/TokenHoldersPanelPage.qml @@ -5,7 +5,7 @@ import StatusQ.Core 0.1 import mainui 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/TokenItemPage.qml b/storybook/pages/TokenItemPage.qml index 5e4762b008..5b95bc8094 100644 --- a/storybook/pages/TokenItemPage.qml +++ b/storybook/pages/TokenItemPage.qml @@ -6,7 +6,7 @@ import Models 1.0 import Storybook 1.0 import utils 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 SplitView { id: root diff --git a/storybook/pages/TokenPanelPage.qml b/storybook/pages/TokenPanelPage.qml index 0c39b1e6f3..81b4a45ad9 100644 --- a/storybook/pages/TokenPanelPage.qml +++ b/storybook/pages/TokenPanelPage.qml @@ -6,7 +6,7 @@ import Models 1.0 import Storybook 1.0 import utils 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 SplitView { id: root diff --git a/storybook/src/Models/AssetsModel.qml b/storybook/src/Models/AssetsModel.qml index 931f0f31db..9f4278883b 100644 --- a/storybook/src/Models/AssetsModel.qml +++ b/storybook/src/Models/AssetsModel.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 ListModel { readonly property var data: [ diff --git a/storybook/src/Models/CollectiblesModel.qml b/storybook/src/Models/CollectiblesModel.qml index 228785a292..640a1c2e02 100644 --- a/storybook/src/Models/CollectiblesModel.qml +++ b/storybook/src/Models/CollectiblesModel.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 ListModel { readonly property var data: [ diff --git a/storybook/src/Models/PermissionsModel.qml b/storybook/src/Models/PermissionsModel.qml index e8abbb16d9..172938ead8 100644 --- a/storybook/src/Models/PermissionsModel.qml +++ b/storybook/src/Models/PermissionsModel.qml @@ -4,7 +4,7 @@ import QtQuick 2.14 import Models 1.0 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 QtObject { id: root diff --git a/storybook/stubs/AppLayouts/Chat/stores/CommunitiesStore.qml b/storybook/stubs/AppLayouts/Chat/stores/CommunitiesStore.qml deleted file mode 100644 index c1b71cdad1..0000000000 --- a/storybook/stubs/AppLayouts/Chat/stores/CommunitiesStore.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.15 - -QtObject {} diff --git a/storybook/stubs/AppLayouts/Chat/stores/qmldir b/storybook/stubs/AppLayouts/Chat/stores/qmldir index 340194c3f7..881c77968a 100644 --- a/storybook/stubs/AppLayouts/Chat/stores/qmldir +++ b/storybook/stubs/AppLayouts/Chat/stores/qmldir @@ -1,3 +1,2 @@ -CommunitiesStore 1.0 CommunitiesStore.qml RootStore 1.0 RootStore.qml StickersStore 1.0 StickersStore.qml diff --git a/storybook/stubs/AppLayouts/CommunitiesPortal/stores/CommunitiesStore.qml b/storybook/stubs/AppLayouts/Communities/stores/CommunitiesStore.qml similarity index 100% rename from storybook/stubs/AppLayouts/CommunitiesPortal/stores/CommunitiesStore.qml rename to storybook/stubs/AppLayouts/Communities/stores/CommunitiesStore.qml diff --git a/storybook/stubs/AppLayouts/CommunitiesPortal/stores/qmldir b/storybook/stubs/AppLayouts/Communities/stores/qmldir similarity index 100% rename from storybook/stubs/AppLayouts/CommunitiesPortal/stores/qmldir rename to storybook/stubs/AppLayouts/Communities/stores/qmldir diff --git a/ui/app/AppLayouts/Chat/ChatLayout.qml b/ui/app/AppLayouts/Chat/ChatLayout.qml index be1e849196..67eb5d3c80 100644 --- a/ui/app/AppLayouts/Chat/ChatLayout.qml +++ b/ui/app/AppLayouts/Chat/ChatLayout.qml @@ -6,9 +6,9 @@ import utils 1.0 import shared.popups 1.0 import "views" -import "views/communities" +import AppLayouts.Communities.views 1.0 import "stores" -import "popups/community" +import AppLayouts.Communities.popups 1.0 import AppLayouts.Chat.stores 1.0 diff --git a/ui/app/AppLayouts/Chat/popups/qmldir b/ui/app/AppLayouts/Chat/popups/qmldir index 8aeceb4612..a443f4e6b7 100644 --- a/ui/app/AppLayouts/Chat/popups/qmldir +++ b/ui/app/AppLayouts/Chat/popups/qmldir @@ -1,4 +1,2 @@ PinnedMessagesPopup 1.0 PinnedMessagesPopup.qml ChooseBrowserPopup 1.0 ChooseBrowserPopup.qml -InviteFriendsToCommunityPopup 1.0 community/InviteFriendsToCommunityPopup.qml -CommunityProfilePopup 1.0 community/CommunityProfilePopup.qml diff --git a/ui/app/AppLayouts/Chat/stores/qmldir b/ui/app/AppLayouts/Chat/stores/qmldir index f43d7b9020..bd91dc697b 100644 --- a/ui/app/AppLayouts/Chat/stores/qmldir +++ b/ui/app/AppLayouts/Chat/stores/qmldir @@ -1,6 +1,5 @@ CommunitiesStore 1.0 CommunitiesStore.qml CreateChatPropertiesStore 1.0 CreateChatPropertiesStore.qml -PermissionsStore 1.0 PermissionsStore.qml RootStore 1.0 RootStore.qml StickerData 1.0 StickerData.qml StickerPackData 1.0 StickerPackData.qml diff --git a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml index 81987959de..7c0d49bb34 100644 --- a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml @@ -16,7 +16,7 @@ import shared.controls 1.0 import shared.views.chat 1.0 import SortFilterProxyModel 0.2 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.popups 1.0 import "../helpers" import "../controls" @@ -24,7 +24,7 @@ import "../popups" import "../panels" import "../../Wallet" import "../stores" -import "../panels/communities" +import AppLayouts.Communities.panels 1.0 Item { id: root diff --git a/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml b/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml index db8e437a8d..70f0b48c1f 100644 --- a/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml @@ -9,6 +9,8 @@ import StatusQ.Core.Utils 0.1 as SQUtils import utils 1.0 +import shared.views.chat 1.0 + import "../panels" import "../stores" diff --git a/ui/app/AppLayouts/Chat/views/ChatView.qml b/ui/app/AppLayouts/Chat/views/ChatView.qml index 4b4ad5c908..400bad887d 100644 --- a/ui/app/AppLayouts/Chat/views/ChatView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatView.qml @@ -15,7 +15,8 @@ import StatusQ.Controls 0.1 import "." import "../panels" -import "../panels/communities" +import AppLayouts.Communities.panels 1.0 +import AppLayouts.Communities.views 1.0 import "../popups" import "../helpers" import "../controls" diff --git a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml index 2189e8875b..282519f8f2 100644 --- a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml @@ -12,12 +12,14 @@ import utils 1.0 import shared 1.0 import shared.controls 1.0 import shared.popups 1.0 +import shared.views.chat 1.0 +import shared.panels 1.0 import SortFilterProxyModel 0.2 import "../panels" import "../popups" -import "../popups/community" +import AppLayouts.Communities.popups 1.0 Item { id: root diff --git a/ui/app/AppLayouts/CommunitiesPortal/CommunitiesPortalLayout.qml b/ui/app/AppLayouts/Communities/CommunitiesPortalLayout.qml similarity index 97% rename from ui/app/AppLayouts/CommunitiesPortal/CommunitiesPortalLayout.qml rename to ui/app/AppLayouts/Communities/CommunitiesPortalLayout.qml index e31a3ca006..fe61d05179 100644 --- a/ui/app/AppLayouts/CommunitiesPortal/CommunitiesPortalLayout.qml +++ b/ui/app/AppLayouts/Communities/CommunitiesPortalLayout.qml @@ -12,13 +12,13 @@ import StatusQ.Layout 0.1 import utils 1.0 import shared.controls 1.0 import shared.popups 1.0 -import shared.panels 1.0 import SortFilterProxyModel 0.2 -import "controls" -import "popups" -import "views" +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.views 1.0 +import AppLayouts.Communities.panels 1.0 StatusSectionLayout { id: root diff --git a/ui/app/AppLayouts/Chat/controls/community/AddressesInputList.qml b/ui/app/AppLayouts/Communities/controls/AddressesInputList.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/AddressesInputList.qml rename to ui/app/AppLayouts/Communities/controls/AddressesInputList.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/AddressesSelectorPanel.qml b/ui/app/AppLayouts/Communities/controls/AddressesSelectorPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/AddressesSelectorPanel.qml rename to ui/app/AppLayouts/Communities/controls/AddressesSelectorPanel.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/AirdropRecipientsSelector.qml b/ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/AirdropRecipientsSelector.qml rename to ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/AirdropTokensSelector.qml b/ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/AirdropTokensSelector.qml rename to ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityBannerPicker.qml b/ui/app/AppLayouts/Communities/controls/CommunityBannerPicker.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityBannerPicker.qml rename to ui/app/AppLayouts/Communities/controls/CommunityBannerPicker.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityCategoryListItem.qml b/ui/app/AppLayouts/Communities/controls/CommunityCategoryListItem.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityCategoryListItem.qml rename to ui/app/AppLayouts/Communities/controls/CommunityCategoryListItem.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/controls/CommunityColorPicker.qml b/ui/app/AppLayouts/Communities/controls/CommunityColorPicker.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/controls/CommunityColorPicker.qml rename to ui/app/AppLayouts/Communities/controls/CommunityColorPicker.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityDescriptionInput.qml b/ui/app/AppLayouts/Communities/controls/CommunityDescriptionInput.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityDescriptionInput.qml rename to ui/app/AppLayouts/Communities/controls/CommunityDescriptionInput.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityIntroMessageInput.qml b/ui/app/AppLayouts/Communities/controls/CommunityIntroMessageInput.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityIntroMessageInput.qml rename to ui/app/AppLayouts/Communities/controls/CommunityIntroMessageInput.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityListItem.qml b/ui/app/AppLayouts/Communities/controls/CommunityListItem.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityListItem.qml rename to ui/app/AppLayouts/Communities/controls/CommunityListItem.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityLogoPicker.qml b/ui/app/AppLayouts/Communities/controls/CommunityLogoPicker.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityLogoPicker.qml rename to ui/app/AppLayouts/Communities/controls/CommunityLogoPicker.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityNameInput.qml b/ui/app/AppLayouts/Communities/controls/CommunityNameInput.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityNameInput.qml rename to ui/app/AppLayouts/Communities/controls/CommunityNameInput.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityOptions.qml b/ui/app/AppLayouts/Communities/controls/CommunityOptions.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityOptions.qml rename to ui/app/AppLayouts/Communities/controls/CommunityOptions.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityOutroMessageInput.qml b/ui/app/AppLayouts/Communities/controls/CommunityOutroMessageInput.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/CommunityOutroMessageInput.qml rename to ui/app/AppLayouts/Communities/controls/CommunityOutroMessageInput.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/CommunityPermissionsRow.qml b/ui/app/AppLayouts/Communities/controls/CommunityPermissionsRow.qml similarity index 99% rename from ui/app/AppLayouts/Chat/controls/community/CommunityPermissionsRow.qml rename to ui/app/AppLayouts/Communities/controls/CommunityPermissionsRow.qml index 8d226aef25..307883dd32 100644 --- a/ui/app/AppLayouts/Chat/controls/community/CommunityPermissionsRow.qml +++ b/ui/app/AppLayouts/Communities/controls/CommunityPermissionsRow.qml @@ -8,12 +8,12 @@ import StatusQ.Core.Utils 0.1 import StatusQ.Components 0.1 import StatusQ.Controls 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 /*! \qmltype CommunityPermissionsRow \inherits Control - \inqmlmodule AppLayouts.Chat.controls.community 1.0 + \inqmlmodule AppLayouts.Communities.controls 1.0 \brief It is a permissions row control that provides information about community tokens permissions. Inherits \l{https://doc.qt.io/qt-5/qml-qtquick-controls2-control.html}{Control}. The \c CommunityPermissionsRow is the token permissions representation row component. diff --git a/ui/app/AppLayouts/CommunitiesPortal/controls/CommunityTagsPicker.qml b/ui/app/AppLayouts/Communities/controls/CommunityTagsPicker.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/controls/CommunityTagsPicker.qml rename to ui/app/AppLayouts/Communities/controls/CommunityTagsPicker.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/controls/CommunityTagsRow.qml b/ui/app/AppLayouts/Communities/controls/CommunityTagsRow.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/controls/CommunityTagsRow.qml rename to ui/app/AppLayouts/Communities/controls/CommunityTagsRow.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/EnsPanel.qml b/ui/app/AppLayouts/Communities/controls/EnsPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/EnsPanel.qml rename to ui/app/AppLayouts/Communities/controls/EnsPanel.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/ExtendedDropdownContent.qml b/ui/app/AppLayouts/Communities/controls/ExtendedDropdownContent.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/ExtendedDropdownContent.qml rename to ui/app/AppLayouts/Communities/controls/ExtendedDropdownContent.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/HoldingTypes.qml b/ui/app/AppLayouts/Communities/controls/HoldingTypes.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/HoldingTypes.qml rename to ui/app/AppLayouts/Communities/controls/HoldingTypes.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/HoldingsDropdown.qml b/ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml similarity index 99% rename from ui/app/AppLayouts/Chat/controls/community/HoldingsDropdown.qml rename to ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml index ee6344fbfe..993bd091c5 100644 --- a/ui/app/AppLayouts/Chat/controls/community/HoldingsDropdown.qml +++ b/ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml @@ -8,7 +8,7 @@ import StatusQ.Components 0.1 import StatusQ.Controls 0.1 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.helpers 1.0 +import AppLayouts.Communities.helpers 1.0 import utils 1.0 StatusDropdown { diff --git a/ui/app/AppLayouts/Chat/controls/community/InDropdown.qml b/ui/app/AppLayouts/Communities/controls/InDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/InDropdown.qml rename to ui/app/AppLayouts/Communities/controls/InDropdown.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/InlineNetworksComboBox.qml b/ui/app/AppLayouts/Communities/controls/InlineNetworksComboBox.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/InlineNetworksComboBox.qml rename to ui/app/AppLayouts/Communities/controls/InlineNetworksComboBox.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/controls/IssuePill.qml b/ui/app/AppLayouts/Communities/controls/IssuePill.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/controls/IssuePill.qml rename to ui/app/AppLayouts/Communities/controls/IssuePill.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml b/ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/ListDropdownContent.qml rename to ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/MembersDropdown.qml b/ui/app/AppLayouts/Communities/controls/MembersDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/MembersDropdown.qml rename to ui/app/AppLayouts/Communities/controls/MembersDropdown.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/MembersSelectorPanel.qml b/ui/app/AppLayouts/Communities/controls/MembersSelectorPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/MembersSelectorPanel.qml rename to ui/app/AppLayouts/Communities/controls/MembersSelectorPanel.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/PermissionItem.qml b/ui/app/AppLayouts/Communities/controls/PermissionItem.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/PermissionItem.qml rename to ui/app/AppLayouts/Communities/controls/PermissionItem.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/PermissionListItem.qml b/ui/app/AppLayouts/Communities/controls/PermissionListItem.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/PermissionListItem.qml rename to ui/app/AppLayouts/Communities/controls/PermissionListItem.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/PermissionTypes.qml b/ui/app/AppLayouts/Communities/controls/PermissionTypes.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/PermissionTypes.qml rename to ui/app/AppLayouts/Communities/controls/PermissionTypes.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/PermissionsDropdown.qml b/ui/app/AppLayouts/Communities/controls/PermissionsDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/PermissionsDropdown.qml rename to ui/app/AppLayouts/Communities/controls/PermissionsDropdown.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/RecipientTypeSelectionDropdown.qml b/ui/app/AppLayouts/Communities/controls/RecipientTypeSelectionDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/RecipientTypeSelectionDropdown.qml rename to ui/app/AppLayouts/Communities/controls/RecipientTypeSelectionDropdown.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/ThumbnailsDropdownContent.qml b/ui/app/AppLayouts/Communities/controls/ThumbnailsDropdownContent.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/ThumbnailsDropdownContent.qml rename to ui/app/AppLayouts/Communities/controls/ThumbnailsDropdownContent.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/TokenCategories.qml b/ui/app/AppLayouts/Communities/controls/TokenCategories.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/TokenCategories.qml rename to ui/app/AppLayouts/Communities/controls/TokenCategories.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/TokenItem.qml b/ui/app/AppLayouts/Communities/controls/TokenItem.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/TokenItem.qml rename to ui/app/AppLayouts/Communities/controls/TokenItem.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/TokenPanel.qml b/ui/app/AppLayouts/Communities/controls/TokenPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/controls/community/TokenPanel.qml rename to ui/app/AppLayouts/Communities/controls/TokenPanel.qml diff --git a/ui/app/AppLayouts/Chat/controls/community/qmldir b/ui/app/AppLayouts/Communities/controls/qmldir similarity index 64% rename from ui/app/AppLayouts/Chat/controls/community/qmldir rename to ui/app/AppLayouts/Communities/controls/qmldir index 1ee7cd697f..e1b8db8e9f 100644 --- a/ui/app/AppLayouts/Chat/controls/community/qmldir +++ b/ui/app/AppLayouts/Communities/controls/qmldir @@ -2,9 +2,19 @@ AddressesInputList 1.0 AddressesInputList.qml AddressesSelectorPanel 1.0 AddressesSelectorPanel.qml AirdropRecipientsSelector 1.0 AirdropRecipientsSelector.qml AirdropTokensSelector 1.0 AirdropTokensSelector.qml +CommunityBannerPicker 1.0 CommunityBannerPicker.qml CommunityCategoryListItem 1.0 CommunityCategoryListItem.qml +CommunityColorPicker 1.0 CommunityColorPicker.qml +CommunityDescriptionInput 1.0 CommunityDescriptionInput.qml +CommunityIntroMessageInput 1.0 CommunityIntroMessageInput.qml CommunityListItem 1.0 CommunityListItem.qml +CommunityLogoPicker 1.0 CommunityLogoPicker.qml +CommunityNameInput 1.0 CommunityNameInput.qml +CommunityOptions 1.0 CommunityOptions.qml +CommunityOutroMessageInput 1.0 CommunityOutroMessageInput.qml CommunityPermissionsRow 1.0 CommunityPermissionsRow.qml +CommunityTagsPicker 1.0 CommunityTagsPicker.qml +CommunityTagsRow 1.0 CommunityTagsRow.qml HoldingTypes 1.0 HoldingTypes.qml HoldingsDropdown 1.0 HoldingsDropdown.qml InDropdown 1.0 InDropdown.qml diff --git a/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml b/ui/app/AppLayouts/Communities/helpers/CommunityPermissionsHelpers.qml similarity index 97% rename from ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml rename to ui/app/AppLayouts/Communities/helpers/CommunityPermissionsHelpers.qml index e941ce544b..aaa6b2b318 100644 --- a/ui/app/AppLayouts/Chat/helpers/CommunityPermissionsHelpers.qml +++ b/ui/app/AppLayouts/Communities/helpers/CommunityPermissionsHelpers.qml @@ -5,7 +5,7 @@ import QtQml 2.14 import StatusQ.Core 0.1 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 QtObject { function getTokenByKey(model, key) { diff --git a/ui/app/AppLayouts/Chat/helpers/TokenObject.qml b/ui/app/AppLayouts/Communities/helpers/TokenObject.qml similarity index 100% rename from ui/app/AppLayouts/Chat/helpers/TokenObject.qml rename to ui/app/AppLayouts/Communities/helpers/TokenObject.qml diff --git a/ui/app/AppLayouts/Chat/helpers/qmldir b/ui/app/AppLayouts/Communities/helpers/qmldir similarity index 100% rename from ui/app/AppLayouts/Chat/helpers/qmldir rename to ui/app/AppLayouts/Communities/helpers/qmldir diff --git a/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml b/ui/app/AppLayouts/Communities/layouts/SettingsPageLayout.qml similarity index 100% rename from ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml rename to ui/app/AppLayouts/Communities/layouts/SettingsPageLayout.qml diff --git a/ui/app/AppLayouts/Chat/layouts/qmldir b/ui/app/AppLayouts/Communities/layouts/qmldir similarity index 100% rename from ui/app/AppLayouts/Chat/layouts/qmldir rename to ui/app/AppLayouts/Communities/layouts/qmldir diff --git a/ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml b/ui/app/AppLayouts/Communities/panels/BackUpCommuntyBannerPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml rename to ui/app/AppLayouts/Communities/panels/BackUpCommuntyBannerPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/ChatPermissionQualificationPanel.qml b/ui/app/AppLayouts/Communities/panels/ChatPermissionQualificationPanel.qml similarity index 98% rename from ui/app/AppLayouts/Chat/panels/communities/ChatPermissionQualificationPanel.qml rename to ui/app/AppLayouts/Communities/panels/ChatPermissionQualificationPanel.qml index ff9c280ad5..25797d05bf 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/ChatPermissionQualificationPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/ChatPermissionQualificationPanel.qml @@ -7,7 +7,7 @@ import StatusQ.Core 0.1 import StatusQ.Components 0.1 import StatusQ.Core.Theme 0.1 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 Item { id: root diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityAirdropsSettingsPanel.qml similarity index 98% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityAirdropsSettingsPanel.qml index db70c8404e..df90ed8239 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityAirdropsSettingsPanel.qml @@ -5,8 +5,8 @@ import QtQuick.Layouts 1.14 import StatusQ.Controls 0.1 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.layouts 1.0 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.layouts 1.0 +import AppLayouts.Communities.views 1.0 import utils 1.0 diff --git a/ui/imports/shared/panels/CommunityBanner.qml b/ui/app/AppLayouts/Communities/panels/CommunityBanner.qml similarity index 100% rename from ui/imports/shared/panels/CommunityBanner.qml rename to ui/app/AppLayouts/Communities/panels/CommunityBanner.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityChannelsAndCategoriesBannerPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityChannelsAndCategoriesBannerPanel.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/panels/CommunityColorPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityColorPanel.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/panels/CommunityColorPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityColorPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityColumnHeaderPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityColumnHeaderPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityColumnHeaderPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityColumnHeaderPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityEditSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityEditSettingsPanel.qml similarity index 97% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityEditSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityEditSettingsPanel.qml index 69b22ae9ca..bfc1363cf8 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityEditSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityEditSettingsPanel.qml @@ -16,10 +16,8 @@ import StatusQ.Popups 0.1 import StatusQ.Controls 0.1 import StatusQ.Controls.Validators 0.1 -import "../../controls/community" - -import "../../../CommunitiesPortal/controls" -import "../../../CommunitiesPortal/panels" +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.panels 1.0 StatusScrollView { id: root diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityMembersSettingsPanel.qml similarity index 99% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityMembersSettingsPanel.qml index d62c7dea97..22da756e84 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityMembersSettingsPanel.qml @@ -11,7 +11,7 @@ import StatusQ.Popups 0.1 import utils 1.0 import shared.controls.chat 1.0 -import "../../layouts" +import AppLayouts.Communities.layouts 1.0 SettingsPageLayout { id: root diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityMembersTabPanel.qml similarity index 99% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityMembersTabPanel.qml index a958ff4241..c1f355964d 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityMembersTabPanel.qml @@ -12,7 +12,7 @@ import utils 1.0 import shared.views.chat 1.0 import shared.controls.chat 1.0 -import "../../layouts" +import AppLayouts.Communities.layouts 1.0 Item { id: root diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityMintTokensSettingsPanel.qml similarity index 99% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityMintTokensSettingsPanel.qml index 81ca36c3a1..11b13ada5f 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityMintTokensSettingsPanel.qml @@ -7,10 +7,10 @@ import StatusQ.Core.Theme 0.1 import StatusQ.Core.Utils 0.1 import StatusQ.Controls 0.1 -import AppLayouts.Chat.layouts 1.0 -import AppLayouts.Chat.views.communities 1.0 -import AppLayouts.Chat.popups.community 1.0 -import AppLayouts.Chat.helpers 1.0 +import AppLayouts.Communities.layouts 1.0 +import AppLayouts.Communities.views 1.0 +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.helpers 1.0 import utils 1.0 import SortFilterProxyModel 0.2 diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityOverviewSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityOverviewSettingsPanel.qml similarity index 98% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityOverviewSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityOverviewSettingsPanel.qml index e10f44affe..e1445c372b 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityOverviewSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityOverviewSettingsPanel.qml @@ -7,10 +7,10 @@ import StatusQ.Core.Theme 0.1 import StatusQ.Controls 0.1 import StatusQ.Components 0.1 -import "../../layouts" +import AppLayouts.Communities.layouts 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 -import shared.panels 1.0 StackLayout { id: root diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityPermissionsSettingsPanel.qml similarity index 99% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityPermissionsSettingsPanel.qml index f9484702ef..0ddd4077c7 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/CommunityPermissionsSettingsPanel.qml @@ -1,9 +1,9 @@ import QtQuick 2.14 -import AppLayouts.Chat.controls.community 1.0 -import AppLayouts.Chat.layouts 1.0 +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.layouts 1.0 import AppLayouts.Chat.stores 1.0 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.views 1.0 import StatusQ.Core.Utils 0.1 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityProfilePopupInviteFriendsPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityProfilePopupInviteFriendsPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteMessagePanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityProfilePopupInviteMessagePanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteMessagePanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityProfilePopupInviteMessagePanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityProfilePopupOverviewPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityProfilePopupOverviewPanel.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/panels/CommunityTagsPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityTagsPanel.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/panels/CommunityTagsPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityTagsPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml b/ui/app/AppLayouts/Communities/panels/CommunityWelcomeBannerPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml rename to ui/app/AppLayouts/Communities/panels/CommunityWelcomeBannerPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/FeesPanel.qml b/ui/app/AppLayouts/Communities/panels/FeesPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/FeesPanel.qml rename to ui/app/AppLayouts/Communities/panels/FeesPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/HidePermissionPanel.qml b/ui/app/AppLayouts/Communities/panels/HidePermissionPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/HidePermissionPanel.qml rename to ui/app/AppLayouts/Communities/panels/HidePermissionPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/HoldingsListPanel.qml b/ui/app/AppLayouts/Communities/panels/HoldingsListPanel.qml similarity index 96% rename from ui/app/AppLayouts/Chat/panels/communities/HoldingsListPanel.qml rename to ui/app/AppLayouts/Communities/panels/HoldingsListPanel.qml index 50cf3e51ac..21a6865351 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/HoldingsListPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/HoldingsListPanel.qml @@ -7,9 +7,9 @@ import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 import StatusQ.Controls 0.1 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.controls.community 1.0 -import AppLayouts.Chat.views.communities 1.0 +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.views 1.0 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/panels/communities/JoinCommunityCenterPanel.qml b/ui/app/AppLayouts/Communities/panels/JoinCommunityCenterPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/JoinCommunityCenterPanel.qml rename to ui/app/AppLayouts/Communities/panels/JoinCommunityCenterPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/JoinCommunityHeaderPanel.qml b/ui/app/AppLayouts/Communities/panels/JoinCommunityHeaderPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/JoinCommunityHeaderPanel.qml rename to ui/app/AppLayouts/Communities/panels/JoinCommunityHeaderPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/JoinPermissionsOverlayPanel.qml b/ui/app/AppLayouts/Communities/panels/JoinPermissionsOverlayPanel.qml similarity index 98% rename from ui/app/AppLayouts/Chat/panels/communities/JoinPermissionsOverlayPanel.qml rename to ui/app/AppLayouts/Communities/panels/JoinPermissionsOverlayPanel.qml index 920be552b8..29b95987f7 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/JoinPermissionsOverlayPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/JoinPermissionsOverlayPanel.qml @@ -7,8 +7,8 @@ import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 import StatusQ.Controls 0.1 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.controls 1.0 import SortFilterProxyModel 0.2 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/panels/communities/MintTokensFooterPanel.qml b/ui/app/AppLayouts/Communities/panels/MintTokensFooterPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/MintTokensFooterPanel.qml rename to ui/app/AppLayouts/Communities/panels/MintTokensFooterPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/NoHoldersPanel.qml b/ui/app/AppLayouts/Communities/panels/NoHoldersPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/NoHoldersPanel.qml rename to ui/app/AppLayouts/Communities/panels/NoHoldersPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/PermissionConflictWarningPanel.qml b/ui/app/AppLayouts/Communities/panels/PermissionConflictWarningPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/PermissionConflictWarningPanel.qml rename to ui/app/AppLayouts/Communities/panels/PermissionConflictWarningPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/PermissionQualificationPanel.qml b/ui/app/AppLayouts/Communities/panels/PermissionQualificationPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/PermissionQualificationPanel.qml rename to ui/app/AppLayouts/Communities/panels/PermissionQualificationPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/SortableTokenHoldersList.qml b/ui/app/AppLayouts/Communities/panels/SortableTokenHoldersList.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/SortableTokenHoldersList.qml rename to ui/app/AppLayouts/Communities/panels/SortableTokenHoldersList.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/SortableTokenHoldersPanel.qml b/ui/app/AppLayouts/Communities/panels/SortableTokenHoldersPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/SortableTokenHoldersPanel.qml rename to ui/app/AppLayouts/Communities/panels/SortableTokenHoldersPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/TokenHoldersPanel.qml b/ui/app/AppLayouts/Communities/panels/TokenHoldersPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/TokenHoldersPanel.qml rename to ui/app/AppLayouts/Communities/panels/TokenHoldersPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/TokenHoldersProxyModel.qml b/ui/app/AppLayouts/Communities/panels/TokenHoldersProxyModel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/TokenHoldersProxyModel.qml rename to ui/app/AppLayouts/Communities/panels/TokenHoldersProxyModel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/WarningPanel.qml b/ui/app/AppLayouts/Communities/panels/WarningPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/communities/WarningPanel.qml rename to ui/app/AppLayouts/Communities/panels/WarningPanel.qml diff --git a/ui/app/AppLayouts/Chat/panels/communities/qmldir b/ui/app/AppLayouts/Communities/panels/qmldir similarity index 72% rename from ui/app/AppLayouts/Chat/panels/communities/qmldir rename to ui/app/AppLayouts/Communities/panels/qmldir index 7a6b3cc576..669abde4af 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/qmldir +++ b/ui/app/AppLayouts/Communities/panels/qmldir @@ -1,9 +1,16 @@ +BackUpCommuntyBannerPanel 1.0 BackUpCommuntyBannerPanel.qml CommunityAirdropsSettingsPanel 1.0 CommunityAirdropsSettingsPanel.qml +CommunityBanner 1.0 CommunityBanner.qml +CommunityChannelsAndCategoriesBannerPanel 1.0 CommunityChannelsAndCategoriesBannerPanel.qml CommunityColumnHeaderPanel 1.0 CommunityColumnHeaderPanel.qml +CommunityMembersSettingsPanel 1.0 CommunityMembersSettingsPanel.qml CommunityMintTokensSettingsPanel 1.0 CommunityMintTokensSettingsPanel.qml +CommunityOverviewSettingsPanel 1.0 CommunityOverviewSettingsPanel.qml CommunityPermissionsSettingsPanel 1.0 CommunityPermissionsSettingsPanel.qml +CommunityProfilePopupOverviewPanel 1.0 CommunityProfilePopupOverviewPanel.qml CommunityProfilePopupInviteFriendsPanel 1.0 CommunityProfilePopupInviteFriendsPanel.qml CommunityProfilePopupInviteMessagePanel 1.0 CommunityProfilePopupInviteMessagePanel.qml +CommunityWelcomeBannerPanel 1.0 CommunityWelcomeBannerPanel.qml FeesPanel 1.0 FeesPanel.qml HidePermissionPanel 1.0 HidePermissionPanel.qml JoinPermissionsOverlayPanel 1.0 JoinPermissionsOverlayPanel.qml diff --git a/ui/app/AppLayouts/Chat/popups/community/AlertPopup.qml b/ui/app/AppLayouts/Communities/popups/AlertPopup.qml similarity index 96% rename from ui/app/AppLayouts/Chat/popups/community/AlertPopup.qml rename to ui/app/AppLayouts/Communities/popups/AlertPopup.qml index 55550dea7e..21cc2b588c 100644 --- a/ui/app/AppLayouts/Chat/popups/community/AlertPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/AlertPopup.qml @@ -8,7 +8,7 @@ import StatusQ.Controls 0.1 import StatusQ.Popups.Dialog 0.1 import StatusQ.Core.Theme 0.1 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/popups/community/BurnTokensPopup.qml b/ui/app/AppLayouts/Communities/popups/BurnTokensPopup.qml similarity index 99% rename from ui/app/AppLayouts/Chat/popups/community/BurnTokensPopup.qml rename to ui/app/AppLayouts/Communities/popups/BurnTokensPopup.qml index 48635ccc07..aa8e6edff4 100644 --- a/ui/app/AppLayouts/Chat/popups/community/BurnTokensPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/BurnTokensPopup.qml @@ -12,7 +12,7 @@ import StatusQ.Core.Utils 0.1 import StatusQ.Controls.Validators 0.1 import StatusQ.Components 0.1 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml b/ui/app/AppLayouts/Communities/popups/CommunityProfilePopup.qml similarity index 98% rename from ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml rename to ui/app/AppLayouts/Communities/popups/CommunityProfilePopup.qml index 599f7d3c3a..95d7a0acab 100644 --- a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml +++ b/ui/app/AppLayouts/Communities/popups/CommunityProfilePopup.qml @@ -7,7 +7,7 @@ import StatusQ.Popups 0.1 import utils 1.0 -import "../../panels/communities" +import AppLayouts.Communities.panels 1.0 StatusModal { id: root diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunityTokenPermissionsPopup.qml b/ui/app/AppLayouts/Communities/popups/CommunityTokenPermissionsPopup.qml similarity index 95% rename from ui/app/AppLayouts/Chat/popups/community/CommunityTokenPermissionsPopup.qml rename to ui/app/AppLayouts/Communities/popups/CommunityTokenPermissionsPopup.qml index e8340220b5..8601ebabeb 100644 --- a/ui/app/AppLayouts/Chat/popups/community/CommunityTokenPermissionsPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/CommunityTokenPermissionsPopup.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.14 import StatusQ.Core 0.1 import StatusQ.Popups.Dialog 0.1 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 StatusDialog { id: root diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml b/ui/app/AppLayouts/Communities/popups/CreateCategoryPopup.qml similarity index 100% rename from ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml rename to ui/app/AppLayouts/Communities/popups/CreateCategoryPopup.qml diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml b/ui/app/AppLayouts/Communities/popups/CreateChannelPopup.qml similarity index 100% rename from ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml rename to ui/app/AppLayouts/Communities/popups/CreateChannelPopup.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/popups/CreateCommunityPopup.qml b/ui/app/AppLayouts/Communities/popups/CreateCommunityPopup.qml similarity index 99% rename from ui/app/AppLayouts/CommunitiesPortal/popups/CreateCommunityPopup.qml rename to ui/app/AppLayouts/Communities/popups/CreateCommunityPopup.qml index 383949c269..4e8060887a 100644 --- a/ui/app/AppLayouts/CommunitiesPortal/popups/CreateCommunityPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/CreateCommunityPopup.qml @@ -15,7 +15,7 @@ import StatusQ.Controls 0.1 import StatusQ.Controls.Validators 0.1 import StatusQ.Popups 0.1 -import "../../Chat/controls/community" +import AppLayouts.Communities.controls 1.0 import "../controls" import "../panels" diff --git a/ui/app/AppLayouts/CommunitiesPortal/popups/DiscordImportProgressContents.qml b/ui/app/AppLayouts/Communities/popups/DiscordImportProgressContents.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/popups/DiscordImportProgressContents.qml rename to ui/app/AppLayouts/Communities/popups/DiscordImportProgressContents.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/popups/DiscordImportProgressDialog.qml b/ui/app/AppLayouts/Communities/popups/DiscordImportProgressDialog.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/popups/DiscordImportProgressDialog.qml rename to ui/app/AppLayouts/Communities/popups/DiscordImportProgressDialog.qml diff --git a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml b/ui/app/AppLayouts/Communities/popups/InviteFriendsToCommunityPopup.qml similarity index 98% rename from ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml rename to ui/app/AppLayouts/Communities/popups/InviteFriendsToCommunityPopup.qml index f8d30141d3..17e28611b7 100644 --- a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/InviteFriendsToCommunityPopup.qml @@ -8,8 +8,7 @@ import StatusQ.Popups 0.1 import utils 1.0 import shared.panels 1.0 -import "../../views" -import "../../panels/communities" +import AppLayouts.Communities.panels 1.0 StatusStackModal { id: root diff --git a/ui/app/AppLayouts/Chat/popups/community/RemotelyDestructPopup.qml b/ui/app/AppLayouts/Communities/popups/RemotelyDestructPopup.qml similarity index 98% rename from ui/app/AppLayouts/Chat/popups/community/RemotelyDestructPopup.qml rename to ui/app/AppLayouts/Communities/popups/RemotelyDestructPopup.qml index 5c4e49ada2..ef22b93b2e 100644 --- a/ui/app/AppLayouts/Chat/popups/community/RemotelyDestructPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/RemotelyDestructPopup.qml @@ -9,7 +9,7 @@ import StatusQ.Popups.Dialog 0.1 import StatusQ.Core.Theme 0.1 import StatusQ.Core.Utils 0.1 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/popups/community/SignMultiTokenTransactionsPopup.qml b/ui/app/AppLayouts/Communities/popups/SignMultiTokenTransactionsPopup.qml similarity index 97% rename from ui/app/AppLayouts/Chat/popups/community/SignMultiTokenTransactionsPopup.qml rename to ui/app/AppLayouts/Communities/popups/SignMultiTokenTransactionsPopup.qml index 334d026a9e..1a09c347f4 100644 --- a/ui/app/AppLayouts/Chat/popups/community/SignMultiTokenTransactionsPopup.qml +++ b/ui/app/AppLayouts/Communities/popups/SignMultiTokenTransactionsPopup.qml @@ -6,7 +6,7 @@ import StatusQ.Popups.Dialog 0.1 import utils 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 StatusDialog { id: root diff --git a/ui/app/AppLayouts/Chat/popups/community/SignTokenTransactionsPopup.qml b/ui/app/AppLayouts/Communities/popups/SignTokenTransactionsPopup.qml similarity index 100% rename from ui/app/AppLayouts/Chat/popups/community/SignTokenTransactionsPopup.qml rename to ui/app/AppLayouts/Communities/popups/SignTokenTransactionsPopup.qml diff --git a/ui/app/AppLayouts/Chat/popups/community/TransferOwnershipPopup.qml b/ui/app/AppLayouts/Communities/popups/TransferOwnershipPopup.qml similarity index 100% rename from ui/app/AppLayouts/Chat/popups/community/TransferOwnershipPopup.qml rename to ui/app/AppLayouts/Communities/popups/TransferOwnershipPopup.qml diff --git a/ui/app/AppLayouts/Chat/popups/community/qmldir b/ui/app/AppLayouts/Communities/popups/qmldir similarity index 52% rename from ui/app/AppLayouts/Chat/popups/community/qmldir rename to ui/app/AppLayouts/Communities/popups/qmldir index 5f7628a046..4486c22f33 100644 --- a/ui/app/AppLayouts/Chat/popups/community/qmldir +++ b/ui/app/AppLayouts/Communities/popups/qmldir @@ -1,7 +1,13 @@ AlertPopup 1.0 AlertPopup.qml BurnTokensPopup 1.0 BurnTokensPopup.qml +CommunityProfilePopup 1.0 CommunityProfilePopup.qml CommunityTokenPermissionsPopup 1.0 CommunityTokenPermissionsPopup.qml +CreateCategoryPopup 1.0 CreateCategoryPopup.qml CreateChannelPopup 1.0 CreateChannelPopup.qml +CreateCommunityPopup 1.0 CreateCommunityPopup.qml +DiscordImportProgressDialog 1.0 DiscordImportProgressDialog.qml +InviteFriendsToCommunityPopup 1.0 InviteFriendsToCommunityPopup.qml RemotelyDestructPopup 1.0 RemotelyDestructPopup.qml SignMultiTokenTransactionsPopup 1.0 SignMultiTokenTransactionsPopup.qml SignTokenTransactionsPopup 1.0 SignTokenTransactionsPopup.qml +TransferOwnershipPopup 1.0 TransferOwnershipPopup.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/qmldir b/ui/app/AppLayouts/Communities/qmldir similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/qmldir rename to ui/app/AppLayouts/Communities/qmldir diff --git a/ui/app/AppLayouts/CommunitiesPortal/stores/CommunitiesStore.qml b/ui/app/AppLayouts/Communities/stores/CommunitiesStore.qml similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/stores/CommunitiesStore.qml rename to ui/app/AppLayouts/Communities/stores/CommunitiesStore.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/stores/qmldir b/ui/app/AppLayouts/Communities/stores/qmldir similarity index 100% rename from ui/app/AppLayouts/CommunitiesPortal/stores/qmldir rename to ui/app/AppLayouts/Communities/stores/qmldir diff --git a/ui/app/AppLayouts/Chat/views/communities/ChannelsSelectionModel.qml b/ui/app/AppLayouts/Communities/views/ChannelsSelectionModel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/views/communities/ChannelsSelectionModel.qml rename to ui/app/AppLayouts/Communities/views/ChannelsSelectionModel.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/views/CommunitiesGridView.qml b/ui/app/AppLayouts/Communities/views/CommunitiesGridView.qml similarity index 98% rename from ui/app/AppLayouts/CommunitiesPortal/views/CommunitiesGridView.qml rename to ui/app/AppLayouts/Communities/views/CommunitiesGridView.qml index 749dd86c12..270d3d543c 100644 --- a/ui/app/AppLayouts/CommunitiesPortal/views/CommunitiesGridView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunitiesGridView.qml @@ -10,7 +10,7 @@ import utils 1.0 import SortFilterProxyModel 0.2 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 StatusScrollView { id: root diff --git a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml b/ui/app/AppLayouts/Communities/views/CommunityColumnView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/CommunityColumnView.qml rename to ui/app/AppLayouts/Communities/views/CommunityColumnView.qml index 84c5834ff3..9e12ca6298 100644 --- a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityColumnView.qml @@ -15,10 +15,11 @@ import shared 1.0 import shared.popups 1.0 import shared.status 1.0 import shared.controls.chat.menuItems 1.0 +import shared.panels 1.0 +import shared.views.chat 1.0 -import "../popups/community" -import "../panels" -import "../panels/communities" +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.panels 1.0 // FIXME: Rework me to use ColumnLayout instead of anchors!! Item { diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityMintedTokensView.qml b/ui/app/AppLayouts/Communities/views/CommunityMintedTokensView.qml similarity index 100% rename from ui/app/AppLayouts/Chat/views/communities/CommunityMintedTokensView.qml rename to ui/app/AppLayouts/Communities/views/CommunityMintedTokensView.qml diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml b/ui/app/AppLayouts/Communities/views/CommunityNewAirdropView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml rename to ui/app/AppLayouts/Communities/views/CommunityNewAirdropView.qml index 4baed26a88..8daeb158f8 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityNewAirdropView.qml @@ -11,10 +11,10 @@ import StatusQ.Core.Utils 0.1 import utils 1.0 import shared.panels 1.0 -import AppLayouts.Chat.controls.community 1.0 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.panels.communities 1.0 -import AppLayouts.Chat.popups.community 1.0 +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.panels 1.0 +import AppLayouts.Communities.popups 1.0 import SortFilterProxyModel 0.2 diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml b/ui/app/AppLayouts/Communities/views/CommunityNewPermissionView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml rename to ui/app/AppLayouts/Communities/views/CommunityNewPermissionView.qml index 816120e1f7..a0ba79feae 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityNewPermissionView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityNewPermissionView.qml @@ -11,10 +11,9 @@ import StatusQ.Core.Utils 0.1 import utils 1.0 import shared.panels 1.0 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.controls.community 1.0 -import AppLayouts.Chat.panels.communities 1.0 - +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.panels 1.0 StatusScrollView { id: root diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityNewTokenView.qml b/ui/app/AppLayouts/Communities/views/CommunityNewTokenView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/communities/CommunityNewTokenView.qml rename to ui/app/AppLayouts/Communities/views/CommunityNewTokenView.qml index ceb67f6fc9..df698e11af 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityNewTokenView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityNewTokenView.qml @@ -10,7 +10,7 @@ import StatusQ.Core.Utils 0.1 as SQUtils import utils 1.0 -import AppLayouts.Chat.helpers 1.0 +import AppLayouts.Communities.helpers 1.0 import AppLayouts.Wallet.controls 1.0 import shared.panels 1.0 import shared.popups 1.0 diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml b/ui/app/AppLayouts/Communities/views/CommunityPermissionsView.qml similarity index 98% rename from ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml rename to ui/app/AppLayouts/Communities/views/CommunityPermissionsView.qml index c59a3a8b32..7ae72ab1f4 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityPermissionsView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityPermissionsView.qml @@ -6,7 +6,7 @@ import StatusQ.Core 0.1 import SortFilterProxyModel 0.2 import shared.popups 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 StatusScrollView { id: root diff --git a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml b/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml rename to ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml index 423c78ff27..0f51b4b976 100644 --- a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml @@ -18,15 +18,14 @@ import StatusQ.Components 0.1 import StatusQ.Controls 0.1 import StatusQ.Controls.Validators 0.1 -import AppLayouts.Chat.stores 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.controls 1.0 import shared.stores 1.0 import shared.views.chat 1.0 -import "../panels/communities" -import "../popups/community" -import "../layouts" +import AppLayouts.Communities.panels 1.0 +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.layouts 1.0 StatusSectionLayout { id: root diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityTokenView.qml b/ui/app/AppLayouts/Communities/views/CommunityTokenView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/communities/CommunityTokenView.qml rename to ui/app/AppLayouts/Communities/views/CommunityTokenView.qml index 66486c4a95..59afa48acf 100644 --- a/ui/app/AppLayouts/Chat/views/communities/CommunityTokenView.qml +++ b/ui/app/AppLayouts/Communities/views/CommunityTokenView.qml @@ -11,8 +11,8 @@ import StatusQ.Core.Utils 0.1 as StatusQUtils import utils 1.0 import shared.panels 1.0 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.panels 1.0 StatusScrollView { id: root diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityWelcomeSettingsView.qml b/ui/app/AppLayouts/Communities/views/CommunityWelcomeSettingsView.qml similarity index 100% rename from ui/app/AppLayouts/Chat/views/communities/CommunityWelcomeSettingsView.qml rename to ui/app/AppLayouts/Communities/views/CommunityWelcomeSettingsView.qml diff --git a/ui/app/AppLayouts/Chat/views/communities/HoldingsSelectionModel.qml b/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml similarity index 94% rename from ui/app/AppLayouts/Chat/views/communities/HoldingsSelectionModel.qml rename to ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml index 28d280487b..881394f7a7 100644 --- a/ui/app/AppLayouts/Chat/views/communities/HoldingsSelectionModel.qml +++ b/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml @@ -1,8 +1,8 @@ import SortFilterProxyModel 0.2 -import AppLayouts.Chat.helpers 1.0 -import AppLayouts.Chat.panels.communities 1.0 -import AppLayouts.Chat.controls.community 1.0 +import AppLayouts.Communities.helpers 1.0 +import AppLayouts.Communities.panels 1.0 +import AppLayouts.Communities.controls 1.0 import StatusQ.Core.Utils 0.1 diff --git a/ui/app/AppLayouts/Chat/views/communities/JoinCommunityView.qml b/ui/app/AppLayouts/Communities/views/JoinCommunityView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/communities/JoinCommunityView.qml rename to ui/app/AppLayouts/Communities/views/JoinCommunityView.qml index 9c0beed7e1..9904ca360a 100644 --- a/ui/app/AppLayouts/Chat/views/communities/JoinCommunityView.qml +++ b/ui/app/AppLayouts/Communities/views/JoinCommunityView.qml @@ -8,7 +8,7 @@ import StatusQ.Core.Theme 0.1 import StatusQ.Components 0.1 import StatusQ.Controls 0.1 -import AppLayouts.Chat.panels.communities 1.0 +import AppLayouts.Communities.panels 1.0 import AppLayouts.Chat.views 1.0 import StatusQ.Layout 0.1 diff --git a/ui/app/AppLayouts/Chat/views/communities/qmldir b/ui/app/AppLayouts/Communities/views/qmldir similarity index 78% rename from ui/app/AppLayouts/Chat/views/communities/qmldir rename to ui/app/AppLayouts/Communities/views/qmldir index c6c129be1a..817170a940 100644 --- a/ui/app/AppLayouts/Chat/views/communities/qmldir +++ b/ui/app/AppLayouts/Communities/views/qmldir @@ -1,9 +1,12 @@ ChannelsSelectionModel 1.0 ChannelsSelectionModel.qml +CommunityColumnView 1.0 CommunityColumnView.qml +CommunitiesGridView 1.0 CommunitiesGridView.qml CommunityNewAirdropView 1.0 CommunityNewAirdropView.qml CommunityMintedTokensView 1.0 CommunityMintedTokensView.qml CommunityNewPermissionView 1.0 CommunityNewPermissionView.qml CommunityNewTokenView 1.0 CommunityNewTokenView.qml CommunityPermissionsView 1.0 CommunityPermissionsView.qml +CommunitySettingsView 1.0 CommunitySettingsView.qml CommunityTokenView 1.0 CommunityTokenView.qml CommunityWelcomeSettingsView 1.0 CommunityWelcomeSettingsView.qml HoldingsSelectionModel 1.0 HoldingsSelectionModel.qml diff --git a/ui/app/AppLayouts/CommunitiesPortal/popups/qmldir b/ui/app/AppLayouts/CommunitiesPortal/popups/qmldir deleted file mode 100644 index ecfed50ab0..0000000000 --- a/ui/app/AppLayouts/CommunitiesPortal/popups/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -CreateCommunityPopup 1.0 CreateCommunityPopup.qml -DiscordImportProgressDialog 1.0 DiscordImportProgressDialog.qml diff --git a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml index b00fc1b571..a194cc3d4f 100644 --- a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml +++ b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml @@ -16,7 +16,8 @@ import shared.popups 1.0 import SortFilterProxyModel 0.2 import "../panels" -import "../../Chat/popups/community" +import AppLayouts.Communities.popups 1.0 +import AppLayouts.Communities.panels 1.0 SettingsContentBase { id: root diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 3730ceb881..b45c6372c3 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -12,7 +12,7 @@ import AppLayouts.Browser 1.0 import AppLayouts.Chat 1.0 import AppLayouts.Chat.views 1.0 import AppLayouts.Profile 1.0 -import AppLayouts.CommunitiesPortal 1.0 +import AppLayouts.Communities 1.0 import utils 1.0 import shared 1.0 @@ -35,7 +35,7 @@ import StatusQ.Core 0.1 import AppLayouts.Browser.stores 1.0 as BrowserStores import AppLayouts.stores 1.0 import AppLayouts.Chat.stores 1.0 as ChatStores -import AppLayouts.CommunitiesPortal.stores 1.0 +import AppLayouts.Communities.stores 1.0 import mainui.activitycenter.stores 1.0 import mainui.activitycenter.popups 1.0 diff --git a/ui/app/mainui/Popups.qml b/ui/app/mainui/Popups.qml index 64c19fed74..a1e02fe1fd 100644 --- a/ui/app/mainui/Popups.qml +++ b/ui/app/mainui/Popups.qml @@ -11,7 +11,7 @@ import StatusQ.Popups 0.1 import AppLayouts.Chat.popups 1.0 import AppLayouts.Profile.popups 1.0 -import AppLayouts.CommunitiesPortal.popups 1.0 +import AppLayouts.Communities.popups 1.0 import shared.popups 1.0 import shared.status 1.0 diff --git a/ui/app/AppLayouts/Chat/panels/ChatsLoadingPanel.qml b/ui/imports/shared/panels/ChatsLoadingPanel.qml similarity index 100% rename from ui/app/AppLayouts/Chat/panels/ChatsLoadingPanel.qml rename to ui/imports/shared/panels/ChatsLoadingPanel.qml diff --git a/ui/imports/shared/panels/qmldir b/ui/imports/shared/panels/qmldir index ebb44bb5df..6f05e1fa2c 100644 --- a/ui/imports/shared/panels/qmldir +++ b/ui/imports/shared/panels/qmldir @@ -2,7 +2,7 @@ AcceptRejectOptionsButtonsPanel 1.0 AcceptRejectOptionsButtonsPanel.qml Address 1.0 Address.qml AddressRequiredValidator 1.0 AddressRequiredValidator.qml BalanceValidator 1.0 BalanceValidator.qml -CommunityBanner 1.0 CommunityBanner.qml +ChatsLoadingPanel 1.0 ChatsLoadingPanel.qml ConnectionWarnings 1.0 ConnectionWarnings.qml DidYouKnowSplashScreen 1.0 DidYouKnowSplashScreen.qml EditCroppedImagePanel 1.0 EditCroppedImagePanel.qml diff --git a/ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml b/ui/imports/shared/popups/RenameGroupPopup.qml similarity index 100% rename from ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml rename to ui/imports/shared/popups/RenameGroupPopup.qml diff --git a/ui/imports/shared/popups/qmldir b/ui/imports/shared/popups/qmldir index 45bf1fcf67..da48356261 100644 --- a/ui/imports/shared/popups/qmldir +++ b/ui/imports/shared/popups/qmldir @@ -26,5 +26,6 @@ AccountsModalHeader 1.0 AccountsModalHeader.qml GetSyncCodeInstructionsPopup 1.0 GetSyncCodeInstructionsPopup.qml NoPermissionsToJoinPopup 1.0 NoPermissionsToJoinPopup.qml RemoveAccountConfirmationPopup 1.0 RemoveAccountConfirmationPopup.qml +RenameGroupPopup 1.0 RenameGroupPopup.qml DeleteMessageConfirmationPopup 1.0 DeleteMessageConfirmationPopup.qml UserAgreementPopup 1.0 UserAgreementPopup.qml diff --git a/ui/app/AppLayouts/Chat/stores/PermissionsStore.qml b/ui/imports/shared/stores/PermissionsStore.qml similarity index 100% rename from ui/app/AppLayouts/Chat/stores/PermissionsStore.qml rename to ui/imports/shared/stores/PermissionsStore.qml diff --git a/ui/imports/shared/stores/qmldir b/ui/imports/shared/stores/qmldir index 4ad71f4a37..bd4ea8fe02 100644 --- a/ui/imports/shared/stores/qmldir +++ b/ui/imports/shared/stores/qmldir @@ -4,6 +4,7 @@ TransactionStore 1.0 TransactionStore.qml CommunityTokensStore 1.0 CommunityTokensStore.qml BIP39_en 1.0 BIP39_en.qml ChartStoreBase 1.0 ChartStoreBase.qml +PermissionsStore 1.0 PermissionsStore.qml TokenBalanceHistoryStore 1.0 TokenBalanceHistoryStore.qml TokenMarketValuesStore 1.0 TokenMarketValuesStore.qml NetworkConnectionStore 1.0 NetworkConnectionStore.qml diff --git a/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml b/ui/imports/shared/views/chat/ChatContextMenuView.qml similarity index 99% rename from ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml rename to ui/imports/shared/views/chat/ChatContextMenuView.qml index 525fffc0b7..ecf025ff39 100644 --- a/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml +++ b/ui/imports/shared/views/chat/ChatContextMenuView.qml @@ -8,8 +8,7 @@ import StatusQ.Popups 0.1 import shared.popups 1.0 import shared.controls.chat.menuItems 1.0 -import "../popups" -import "../popups/community" +import AppLayouts.Communities.popups 1.0 StatusMenu { id: root diff --git a/ui/imports/shared/views/chat/qmldir b/ui/imports/shared/views/chat/qmldir index 33ca38ba9e..74a8d6b205 100644 --- a/ui/imports/shared/views/chat/qmldir +++ b/ui/imports/shared/views/chat/qmldir @@ -1,5 +1,6 @@ AcceptTransactionView 1.0 AcceptTransactionView.qml ChannelIdentifierView 1.0 ChannelIdentifierView.qml +ChatContextMenuView 1.0 ChatContextMenuView.qml CompactMessageView 1.0 CompactMessageView.qml InvitationBubbleView 1.0 InvitationBubbleView.qml LinksMessageView 1.0 LinksMessageView.qml