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

Demos section in the README #98

Merged
merged 2 commits into from
Aug 1, 2017
Merged

Demos section in the README #98

merged 2 commits into from
Aug 1, 2017

Conversation

mauroservienti
Copy link
Member

No description provided.

@mauroservienti mauroservienti requested review from adamralph, weralabaj and a team August 1, 2017 14:18
@weralabaj
Copy link
Contributor

would you mind moving it up? as a first section?

@mauroservienti
Copy link
Member Author

done

@mauroservienti
Copy link
Member Author

reworded the first commit message and force pushed

Copy link
Contributor

@adamralph adamralph left a comment

Choose a reason for hiding this comment

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

What we should do with the README from from demos folder? I think, at the least, we shouldn't duplicate anything. Shall we remove that file completely?

README.md Outdated
@@ -6,6 +6,7 @@ If you have any difficulty preparing your machine, or following this document, p

- [Preparing your machine for the workshop](#preparing-your-machine-for-the-workshop)
- [Running the exercise solutions](#running-the-exercise-solutions)
- [Demos](#demos)
Copy link
Contributor

Choose a reason for hiding this comment

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

Exactly the place I was going to add it! 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

I moved it to the top now

README.md Outdated
- [Preparing your machine for the workshop](#preparing-your-machine-for-the-workshop)
- [Running the exercise solutions](#running-the-exercise-solutions)
- [FAQ](#faq)

## Demos

The [demos](tree/master/demos) folder contains demos used during the workshop by you trainer.
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe the relative URL should be just demos.

README.md Outdated
- [Preparing your machine for the workshop](#preparing-your-machine-for-the-workshop)
- [Running the exercise solutions](#running-the-exercise-solutions)
- [FAQ](#faq)

## Demos

The [demos](tree/master/demos) folder contains demos used during the workshop by you trainer.
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo: "you trainer"

README.md Outdated

### Services UI Composition demo

The [ASP.Net MVC Service UI Composition](tree/master/demos/asp-net-mvc) demoes how to compose data coming from different Microservices when using ASP.Net MVC 5
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest:

The [`asp-net-mvc` solution](demos/asp-net-mvc) demonstrates the use of ASP.NET MVC 5 to compose a UI with data from several microservices.

@mauroservienti
Copy link
Member Author

@adamralph given that #59 completely replaces the actual MVC demo I vote to leave the demo README unchanged and instead work on the one in #59

weralabaj
weralabaj previously approved these changes Aug 1, 2017
Copy link
Contributor

@adamralph adamralph left a comment

Choose a reason for hiding this comment

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

@mauroservienti I added a commit to move all the stuff specific to the old demo (the list of start up projects) into the solution folder. Does that look OK?

BTW - I also squashed your commits into one. I can squash mine too if you want.

@mauroservienti
Copy link
Member Author

no, looks fine. Merging.

@mauroservienti mauroservienti merged commit fafc815 into master Aug 1, 2017
@mauroservienti mauroservienti deleted the demo-section branch August 1, 2017 15:50
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.

3 participants