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.

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

Cards manipulation #114

Merged
merged 17 commits into from
May 29, 2018
Merged

Cards manipulation #114

merged 17 commits into from
May 29, 2018

Conversation

ml7715
Copy link
Collaborator

@ml7715 ml7715 commented May 28, 2018

Cards are now synchronised between the backend and frontend.
Custom markdown cards are fully supported and are exportable.
Fixes #2, Fixes #5, Fixes #25, Fixes #95, Fixes #105

}
}

exportToJupyter() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This may need to be changed later in the newFeaturesUI branch to allow for exporting selected cards required for #108

new CardOutput('text/html', '<div id="66f3f87d-6ec3-46a5-81b7-0d78b189a25f" style="height: 525px; width: 100%;" class="plotly-graph-div"></div><script type="text/javascript">require(["plotly"], function(Plotly) { window.PLOTLYENV=window.PLOTLYENV || {};window.PLOTLYENV.BASE_URL="https://plot.ly";Plotly.newPlot("66f3f87d-6ec3-46a5-81b7-0d78b189a25f", [{"x": [1, 2, 3], "y": [3, 1, 6]}], {}, {"showLink": true, "linkText": "Export to plot.ly"})});</script>'),
], {}, 'python3')
];
cards: Card[] = [];
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe at some point we can have s starter card that explains functions, a "Tutorial Card"

@@ -15,7 +15,7 @@
<button class="react toolbar-icon right">
<i class="ms-Icon ms-Icon--MiniExpand" aria-label="Open in Browser"></i>
</button>
<button class="react toolbar-icon right" (click)="card.collapsed = !card.collapsed; editingTitle = false">
<button class="react toolbar-icon right" (click)="card.collapsed = !card.collapsed; editingTitle = false; collapseCard(card.collapsed)">
Copy link
Collaborator

Choose a reason for hiding this comment

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

It would be nice to put all these functions inside the collapseCard function.

 <button class="react toolbar-icon right" (click)="collapseCard()">
collapseCard(value: boolean){
    card.collapsed = !card.collapsed; 
    editingTitle = false;
    this.onCollapseCard.emit({card.collapsed});
}

Although this would be a lot of changes and would cause a lot more merge conflicts with other branches like newFeatureUI so maybe should be done later in that branch?

@@ -57,4 +62,23 @@ export class CardComponent {
this.onDelete.emit();
}

collapseOutput(value: boolean){
Copy link
Collaborator

Choose a reason for hiding this comment

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

Read Above comment

Copy link
Collaborator

@LukeyQ1 LukeyQ1 left a comment

Choose a reason for hiding this comment

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

Some possible changes but maybe should be done in another branch

Copy link
Collaborator

@lorenzo2897 lorenzo2897 left a comment

Choose a reason for hiding this comment

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

squashing bugs, please hold...

@lorenzo2897 lorenzo2897 merged commit 28e77a6 into master May 29, 2018
@lorenzo2897 lorenzo2897 deleted the cards-manipulation branch May 29, 2018 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants