Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NEW] Marketplace integration with Rocket.Chat Cloud #13809

Merged
merged 27 commits into from
Mar 28, 2019
Merged

[NEW] Marketplace integration with Rocket.Chat Cloud #13809

merged 27 commits into from
Mar 28, 2019

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Mar 20, 2019 •
edited
Loading

Rebased version of #13774

  • Implement new buttons and design
  • Get price and purchase status for app detail screen
  • Download directly (do not open modal) when app was already puchased
  • Download with purchase flow is not working
  • Fix layout for app detail screen
  • Improve layout for app logs screen
  • Add a loading to the cloud modal
  • Add a setting to only be able to install apps manually in development mode

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 20, 2019 13:18 Inactive
@rodrigok rodrigok mentioned this pull request Mar 20, 2019
Closed
@rodrigok rodrigok added this to the 1.0.0 milestone Mar 20, 2019
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 21, 2019 00:19 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 21, 2019 21:00 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 21, 2019 21:12 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 22, 2019 14:18 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 22, 2019 20:32 Inactive
@rodrigok rodrigok marked this pull request as ready for review March 25, 2019 12:54
@rodrigok rodrigok requested review from ggazzo and engelgabriel March 25, 2019 12:54
@graywolf336
Copy link
Contributor

Not sure if it was any changes done here, but the details page looks bad when on a small screen and it is not scrollable.
Screen Shot 2019-03-25 at 11 56 57 AM

@rodrigok
Copy link
Member Author

@graywolf336 probably nothing from these changes, but I'll try to fix it.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 25, 2019 19:17 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 26, 2019 19:14 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 26, 2019 22:03 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 26, 2019 23:54 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 27, 2019 14:19 Inactive
@rodrigok
Copy link
Member Author

Not sure if it was any changes done here, but the details page looks bad when on a small screen and it is not scrollable.
Screen Shot 2019-03-25 at 11 56 57 AM

This only happens in Chrome 72 and Safari 12, can't reproduce in Chrome 73 or in Firefox. Trying to fix it.

@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 27, 2019 17:23 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 27, 2019 17:51 Inactive
@rodrigok
Copy link
Member Author

@geekgonecrazy @graywolf336 Just pushed some changes fixing the weird layout and adding a setting for a development mode bringing back the button to install apps locally.

graywolf336
graywolf336 reviewed Mar 27, 2019
View reviewed changes
app/apps/server/orchestrator.js
@@ -122,6 +122,16 @@ settings.addGroup('General', function() {
hidden: false,
});

this.add('Apps_Framework_Development_Mode', false, {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this added, let's also change the logging so that it uses this setting instead of the NODE_ENV

@geekgonecrazy
Copy link
Contributor

Can we also make it so clicking outside the box closes? Kinda annoying to be stuck with no way to close it.

That or add an x on the window its self

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13809 March 27, 2019 20:22 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 27, 2019 20:28 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-13809 March 27, 2019 21:10 Inactive
@rodrigok rodrigok merged commit fd817b2 into develop Mar 28, 2019
@rodrigok rodrigok deleted the marketplace-and-cloud-rebased branch March 28, 2019 01:41
@rodrigok rodrigok mentioned this pull request Apr 28, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@d-gubert d-gubert d-gubert left review comments

@graywolf336 graywolf336 graywolf336 left review comments

@geekgonecrazy geekgonecrazy geekgonecrazy left review comments

@ggazzo ggazzo Awaiting requested review from ggazzo

@engelgabriel engelgabriel Awaiting requested review from engelgabriel

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0
Development

Successfully merging this pull request may close these issues.
5 participants
@rodrigok @graywolf336 @geekgonecrazy @d-gubert @engelgabriel