145 Commits

Author SHA1 Message Date
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Ramón Tomás
fa048c22c1 Merge from Dev 2017-05-04 11:57:49 +02:00
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
Ramón Tomás
6c6532c0f4 Merge from Dev 2017-04-21 15:46:15 +02:00
Eduard Tomas
101fc58418 Solves error building SPA on linux host due to case error 2017-04-19 15:45:32 +02:00
Eduard Tomas
6ea2e1ed8b Merge branch 'reviews/uzorrilla' into dev
# Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
2017-04-18 15:34:31 +02:00
André Passos
676ba796ae
Changes to make SPA compatible with angular-cli AOT
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 10:00:51 -03:00
André Passos
fe1216d5d8
fix controller routes
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 09:11:43 -03:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Ramón Tomás
f48a503885 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02:00
dsanz
97d0283db1 Merge branch 'master' into dev
# Conflicts:
#	src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml
#	src/Web/WebSPA/Client/modules/basket/basket.component.html
2017-04-13 09:54:12 +02:00
Charles Lowell
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Cesar De la Torre
3ef6846fe0 Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
345e275a0e Minor change in label 2017-04-08 12:05:25 -07:00
Cesar De la Torre
63eed87292 Merge pull request #142 from chlowell/hosting-changes
Set application discriminators, work around Redis client issue
2017-04-08 11:15:28 -07:00
Eduard Tomas
97d8e80294 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
Ramón Tomás
6803781bf8 Merge from Dev 2017-04-05 11:12:49 +02:00
Ramón Tomás
00f7226f30 Rename OrderingIntegrationEvent service methods
Remove clean basket instruction from SPA client
2017-04-05 11:07:26 +02:00
Eduard Tomas
202882aa7c Fixed healthcheck errors 2017-03-31 12:47:56 +02:00
dsanz
35cc2f9d7b Merge branch 'dev'
# Conflicts:
#	src/Services/Basket/Basket.API/Model/IBasketRepository.cs
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
#	src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
#	test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
2017-03-29 11:43:30 +02:00
Ramón Tomás
fd0a30d62a Merge from Dev 2017-03-28 16:37:36 +02:00
Ramón Tomás
e08fe895a3 Added MVC and SPA Apps to healthChecker
Added styles to view
2017-03-28 16:16:01 +02:00
dsanz
53bdf6de04 Add error message in WebSPA when create order returns exception 2017-03-28 11:03:59 +02:00
Charles Lowell
2f3df2715d Set data protection application discriminators
This prevents cookie confusion when applications are hosted at the same domain and path. For example, under default settings, WebMVC may attempt to decrypt Identity's antiforgery cookie rather than its own.
2017-03-27 09:53:35 -07:00
Ramón Tomás
782a2e40d5 Fix issue no cardtpyeid submitted in SPA
Fix issue multiple order creation. Now the create order button is disabled until the request is processed
2017-03-27 17:21:50 +02:00
Cesar De la Torre
313976da80 Fixed bugs related to the Product Update and PriceChangedIntegrationEvent. It was updating only when the price was changing... additional refactoring performed, too. 2017-03-25 14:47:23 -07:00
Eduard Tomas
5b9b92397d Updates to dockerfile / docker-compose for windows containers 2017-03-24 13:15:40 +01:00
Eduard Tomas
45499808b9 Merge remote-tracking branch 'origin/windows-containers-test' into dev 2017-03-24 09:35:57 +01:00
Ramón Tomás
6f8512f434 Increased circuit breaker threshold
Fix lifescope issue with IHttpClient
Adapt circuit breaker to trigger its counter for no success http response
2017-03-22 12:24:55 +01:00
Charles Lowell
e5cc7cd944 Workaround for WebSPA publish issue
Due to aspnet/websdk #114, dotnet publish only copies to the output directory files which existed before the command was run.
2017-03-21 13:57:42 -07:00
Charles Lowell
ed87b6b845 Use <base> to enable relative paths in WebSPA 2017-03-21 13:57:42 -07:00
Charles Lowell
68c3ebaf46 Set data protection application discriminators
This prevents cookie confusion when applications are hosted at the same domain and path. For example, under default settings, WebMVC may attempt to decrypt Identity's antiforgery cookie rather than its own.
2017-03-21 10:42:37 -07:00
Ramón Tomás
66d612a826 Resolved SPA incompatibilities with dependencies when installing a newer node version 2017-03-20 16:46:57 +01:00
etomas
3ec61e0df6 Tried patch proposed by Sandeep Bansal 2017-03-18 11:13:20 +01:00
DESKTOP-V1VLQ15\dsanz
0c4f8a49dd WebMVC and WebSPA show now a changed price in the basket list 2017-03-15 14:57:08 +01:00
etomas
12ecc78a18 Solves #112 2017-03-10 21:51:48 +01:00
etomas
c38e078265 Deleting windows container files as they are not still supported 2017-03-06 15:00:41 +01:00
etomas
29473b455f Merge branch 'vs2017' 2017-03-03 19:40:55 +01:00
etomas
f9b15481d1 Idempotent updates based on requestid 2017-03-03 12:03:31 +01:00
etomas
32bb724d80 Simplifying use of windows containers 2017-03-02 15:54:30 +01:00
etomas
faa24c757c Docker files added again
docker-use-platform creates mark file
2017-03-01 12:03:37 +01:00
Charles Lowell
3df4f3a206 Configure service URLs via environment variables 2017-02-28 14:54:21 -08:00
etomas
92daab8fae Unwanted files (now Dockerfiles are autogenerated) 2017-02-24 18:09:08 +01:00
etomas
79615664cf Dockerfiles for win and linux containers 2017-02-24 18:07:52 +01:00
etomas
5b97c7329b Infrastructure to support Dockerfiles for both Windows & Linux 2017-02-23 16:39:18 +01:00
Cesar De la Torre
d5cd24a3b9 Fixed another bug related to the change of the SPA project name/path tp just WebSPA.dll at the dockerfile 2017-02-22 19:45:32 -08:00
etomas
dc8ae55c7a Renaming WebSpa
Fixes #51
2017-02-22 09:16:31 +01:00
Bill Wagner
bb5d48735d update build script for Mac
Until adding these, the project would not build correctly on a Mac.

script working for SPA

Add execute permissions to build-bits.sh on macOS

fix a rebase / automatic merge issue.

Somehow, the MVC image got in there twice.

update content nodes

Bug workaround for for the CLI. It turns out that the CLI does not
handle content nodes that have multiple paths. Instead, multiple nodes
are needed.

use the standard names for the web docker images.

fix a typo and update the csproj content listings.

Also, execute nom install as part of publishing  the spa application.
2017-02-21 14:04:35 -05:00
etomas
20523925e5 SPA now works succesfully.
Solves #47
2017-02-17 13:26:42 +01:00