-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fde66c7
commit b655efd
Showing
11 changed files
with
310 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
| import QtQuick | ||
|
|
||
| import "../" | ||
| import QtQuick.Controls | ||
| import lc 1.0 | ||
|
|
||
| /** | ||
| * Show accept invitation page directly without onboarding | ||
| * e.g. on app start | ||
| */ | ||
| Item { | ||
| id: controller | ||
|
|
||
| required property bool enabled | ||
| required property var stackView | ||
|
|
||
| property bool showInvitationList: false // TODO merge with enabled ? | ||
|
|
||
| Connections { | ||
| id: openInvitationsListener | ||
|
|
||
| target: __merginApi | ||
| enabled: root.enabled && root.showInvitationList | ||
|
|
||
| function onUserInfoReplyFinished() { | ||
| // controller.showInvitationsList = false; | ||
|
|
||
| /* | ||
| it should be enabled = false in this case from parent! | ||
| // let's not show invitations when registration finish page is opened | ||
| if ( stackView.containsPage("registrationFinishPanel") ) { | ||
| return; | ||
| } | ||
| */ | ||
|
|
||
| if ( !__merginApi.userAuth.hasAuthData() ) { | ||
| return; | ||
| } | ||
|
|
||
| if ( __merginApi.userInfo.hasInvitations ) { | ||
| stackView.push( acceptInvitationsPanelComponent ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Connections { | ||
| target: __merginApi | ||
| enabled: root.enabled && root.showInvitationList | ||
|
|
||
| function onProcessInvitationFinished( accepted ) { | ||
| stackView.pop(null) | ||
| } | ||
| } | ||
|
|
||
| Component { | ||
| id: acceptInvitationsPanelComponent | ||
|
|
||
| MMAcceptInvitation { | ||
| objectName: "acceptInvitationsPanelDirect" | ||
| haveBack: true | ||
| showCreate: false | ||
|
|
||
| onBackClicked: { | ||
| stackView.popOnePageOrClose() | ||
| } | ||
|
|
||
| onJoinWorkspaceClicked: function (workspaceUuid) { | ||
| __merginApi.processInvitation( workspaceUuid, true ) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
| import QtQuick | ||
|
|
||
| import "../" | ||
| import QtQuick.Controls | ||
| import lc 1.0 | ||
|
|
||
| /** | ||
| * Directly create workspace but without onboarding questions | ||
| * e.g. from account page or projects panel | ||
| */ | ||
| Item { | ||
| id: controller | ||
|
|
||
| required property var stackView | ||
| required property bool enabled | ||
|
|
||
| Connections { | ||
| target: __merginApi | ||
| enabled: controller.enabled | ||
|
|
||
| function onWorkspaceCreated(workspace, result) { | ||
| if (result) { | ||
| stackView.pop("createWorkspaceDirectPanel") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Component { | ||
| id: createWorkspaceComponent | ||
|
|
||
| MMCreateWorkspace { | ||
| id: createWorkspacePanel | ||
|
|
||
| objectName: "createWorkspaceDirectPanel" | ||
|
|
||
| onCreateWorkspaceClicked: function (workspaceName) { | ||
| __merginApi.createWorkspace(workspaceName) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
b655efdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iOS - version 23.12.501511 just submitted!