From 51bb22366334eb6be3b4d57a7fc7c8ec58c01686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Mon, 19 Mar 2018 12:21:32 +0100 Subject: [PATCH 1/9] Ignored MFractor's stuff --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a8d5986bc..6e46dd41b 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ pub/ /src/Web/WebMVC/wwwroot/lib /src/Web/WebMVC/wwwroot/css/site.min.css **/.kube/** +.mfractor From 1f27bcb5642473318af83f2a5ddd3f17e878decd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Mon, 19 Mar 2018 12:24:37 +0100 Subject: [PATCH 2/9] WIP endpoint update --- .../eShopOnContainers.Core/GlobalSettings.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs index d501a5d46..4714725af 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs @@ -4,7 +4,7 @@ { public const string AzureTag = "Azure"; public const string MockTag = "Mock"; - public const string DefaultEndpoint = "http://13.88.8.119"; + public const string DefaultEndpoint = "http://52.170.199.82"; private string _baseEndpoint; private static readonly GlobalSetting _instance = new GlobalSetting(); @@ -62,16 +62,21 @@ private void UpdateEndpoint(string baseEndpoint) { - RegisterWebsite = $"{baseEndpoint}:5105/Account/Register"; + var identityBaseEndpoint = $"{baseEndpoint}/identity"; + RegisterWebsite = $"{identityBaseEndpoint}/Account/Register"; + LogoutCallback = $"{identityBaseEndpoint}/Account/Redirecting"; + + var connectBaseEndpoint = $"{identityBaseEndpoint}/connect"; + IdentityEndpoint = $"{connectBaseEndpoint}/authorize"; + UserInfoEndpoint = $"{connectBaseEndpoint}/userinfo"; + TokenEndpoint = $"{connectBaseEndpoint}/token"; + LogoutEndpoint = $"{connectBaseEndpoint}/endsession"; + + IdentityCallback = $"{baseEndpoint}/xamarincallback"; + CatalogEndpoint = $"{baseEndpoint}:5101"; OrdersEndpoint = $"{baseEndpoint}:5102"; BasketEndpoint = $"{baseEndpoint}:5103"; - IdentityEndpoint = $"{baseEndpoint}:5105/connect/authorize"; - UserInfoEndpoint = $"{baseEndpoint}:5105/connect/userinfo"; - TokenEndpoint = $"{baseEndpoint}:5105/connect/token"; - LogoutEndpoint = $"{baseEndpoint}:5105/connect/endsession"; - IdentityCallback = $"{baseEndpoint}:5105/xamarincallback"; - LogoutCallback = $"{baseEndpoint}:5105/Account/Redirecting"; LocationEndpoint = $"{baseEndpoint}:5109"; MarketingEndpoint = $"{baseEndpoint}:5110"; } From 0f725666c0928adb611ee8c55524ccc9d8af9141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Wed, 21 Mar 2018 12:50:08 +0100 Subject: [PATCH 3/9] Updated endpoints --- .../eShopOnContainers.Core/GlobalSettings.cs | 16 -------------- .../Services/Basket/BasketService.cs | 22 +++++++++++++------ .../Services/Catalog/CatalogService.cs | 18 ++++++++------- .../Services/Location/LocationService.cs | 4 ++-- .../Services/Marketing/CampaignService.cs | 10 +++++---- .../Services/Order/OrderService.cs | 14 +++++++----- 6 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs index 4714725af..9b2b22b72 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs @@ -38,18 +38,8 @@ public string RegisterWebsite { get; set; } - public string CatalogEndpoint { get; set; } - - public string OrdersEndpoint { get; set; } - - public string BasketEndpoint { get; set; } - public string IdentityEndpoint { get; set; } - public string LocationEndpoint { get; set; } - - public string MarketingEndpoint { get; set; } - public string UserInfoEndpoint { get; set; } public string TokenEndpoint { get; set; } @@ -73,12 +63,6 @@ LogoutEndpoint = $"{connectBaseEndpoint}/endsession"; IdentityCallback = $"{baseEndpoint}/xamarincallback"; - - CatalogEndpoint = $"{baseEndpoint}:5101"; - OrdersEndpoint = $"{baseEndpoint}:5102"; - BasketEndpoint = $"{baseEndpoint}:5103"; - LocationEndpoint = $"{baseEndpoint}:5109"; - MarketingEndpoint = $"{baseEndpoint}:5110"; } } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs index 54f3a03bc..b36488f24 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs @@ -11,7 +11,7 @@ namespace eShopOnContainers.Core.Services.Basket private readonly IRequestProvider _requestProvider; private readonly IFixUriService _fixUriService; - private const string ApiUrlBase = "api/v1/basket"; + private const string ApiUrlBase = "mobileshoppingapigw/api/v1/b/basket"; public BasketService(IRequestProvider requestProvider, IFixUriService fixUriService) { @@ -21,15 +21,23 @@ namespace eShopOnContainers.Core.Services.Basket public async Task GetBasketAsync(string guidUser, string token) { - var builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint) + var builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint) { Path = $"{ApiUrlBase}/{guidUser}" }; var uri = builder.ToString(); - CustomerBasket basket = - await _requestProvider.GetAsync(uri, token); + CustomerBasket basket; + + try + { + basket = await _requestProvider.GetAsync(uri, token); + } + catch (HttpRequestExceptionEx exception) when (exception.HttpCode == System.Net.HttpStatusCode.NotFound) + { + basket = null; + } _fixUriService.FixBasketItemPictureUri(basket?.Items); return basket; @@ -37,7 +45,7 @@ namespace eShopOnContainers.Core.Services.Basket public async Task UpdateBasketAsync(CustomerBasket customerBasket, string token) { - var builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint) + var builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint) { Path = ApiUrlBase }; @@ -49,7 +57,7 @@ namespace eShopOnContainers.Core.Services.Basket public async Task CheckoutAsync(BasketCheckout basketCheckout, string token) { - var builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint) + var builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint) { Path = $"{ApiUrlBase}/checkout" }; @@ -60,7 +68,7 @@ namespace eShopOnContainers.Core.Services.Basket public async Task ClearBasketAsync(string guidUser, string token) { - var builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint) + var builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint) { Path = $"{ApiUrlBase}/{guidUser}" }; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs index 2e63e9516..dd7cfe732 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs @@ -13,6 +13,8 @@ namespace eShopOnContainers.Core.Services.Catalog { private readonly IRequestProvider _requestProvider; private readonly IFixUriService _fixUriService; + + private const string ApiUrlBase = "mobileshoppingapigw/api/v1/c/catalog"; public CatalogService(IRequestProvider requestProvider, IFixUriService fixUriService) { @@ -22,8 +24,8 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> FilterAsync(int catalogBrandId, int catalogTypeId) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = string.Format($"{ApiUrlBase}/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); string uri = builder.ToString(); CatalogRoot catalog = await _requestProvider.GetAsync(uri); @@ -36,8 +38,8 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> GetCatalogAsync() { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = "api/v1/catalog/items"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = $"{ApiUrlBase}/items"; string uri = builder.ToString(); CatalogRoot catalog = await _requestProvider.GetAsync(uri); @@ -53,8 +55,8 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> GetCatalogBrandAsync() { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = "api/v1/catalog/catalogbrands"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = $"{ApiUrlBase}/catalogbrands"; string uri = builder.ToString(); IEnumerable brands = await _requestProvider.GetAsync>(uri); @@ -67,8 +69,8 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> GetCatalogTypeAsync() { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = "api/v1/catalog/catalogtypes"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = $"{ApiUrlBase}/catalogtypes"; string uri = builder.ToString(); IEnumerable types = await _requestProvider.GetAsync>(uri); diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs index f20ae6339..e18d335c0 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs @@ -15,8 +15,8 @@ namespace eShopOnContainers.Core.Services.Location public async Task UpdateUserLocation(eShopOnContainers.Core.Models.Location.Location newLocReq, string token) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.LocationEndpoint); - builder.Path = "api/v1/locations"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = "/mobilemarketingapigw/api/v1/l/locations"; string uri = builder.ToString(); await _requestProvider.PostAsync(uri, newLocReq, token); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs index cb74f11b0..2fa5eaa9e 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs @@ -13,6 +13,8 @@ namespace eShopOnContainers.Core.Services.Marketing private readonly IRequestProvider _requestProvider; private readonly IFixUriService _fixUriService; + private const string ApiUrlBase = "mobilemarketingapigw/api/v1/m/campaigns"; + public CampaignService(IRequestProvider requestProvider, IFixUriService fixUriService) { _requestProvider = requestProvider; @@ -21,8 +23,8 @@ namespace eShopOnContainers.Core.Services.Marketing public async Task> GetAllCampaignsAsync(string token) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.MarketingEndpoint); - builder.Path = "api/v1/campaigns/user"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = $"{ApiUrlBase}/user"; string uri = builder.ToString(); CampaignRoot campaign = await _requestProvider.GetAsync(uri, token); @@ -38,8 +40,8 @@ namespace eShopOnContainers.Core.Services.Marketing public async Task GetCampaignByIdAsync(int campaignId, string token) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.MarketingEndpoint); - builder.Path = $"api/v1/campaigns/{campaignId}"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); + builder.Path = $"{ApiUrlBase}/{campaignId}"; string uri = builder.ToString(); return await _requestProvider.GetAsync(uri, token); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs index f242971fb..0da0942ad 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs @@ -11,6 +11,8 @@ namespace eShopOnContainers.Core.Services.Order { private readonly IRequestProvider _requestProvider; + private const string ApiUrlBase = "mobileshoppingapigw/api/v1/o/orders"; + public OrderService(IRequestProvider requestProvider) { _requestProvider = requestProvider; @@ -23,9 +25,9 @@ namespace eShopOnContainers.Core.Services.Order public async Task> GetOrdersAsync(string token) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); - builder.Path = "api/v1/orders"; + builder.Path = ApiUrlBase; string uri = builder.ToString(); @@ -40,9 +42,9 @@ namespace eShopOnContainers.Core.Services.Order { try { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); - builder.Path = string.Format("api/v1/orders/{0}", orderId); + builder.Path = string.Format($"{ApiUrlBase}/{0}", orderId); string uri = builder.ToString(); @@ -76,9 +78,9 @@ namespace eShopOnContainers.Core.Services.Order public async Task CancelOrderAsync(int orderId, string token) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); - builder.Path = "api/v1/orders/cancel"; + builder.Path = $"{ApiUrlBase}/cancel"; var cancelOrderCommand = new CancelOrderCommand(orderId); From 811f9a027ac75303dcf1d41623dc9192e51895e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Cobe=C3=B1a=20Mori=C3=A1n?= Date: Wed, 21 Mar 2018 15:53:52 +0100 Subject: [PATCH 4/9] Removed back-up file --- .../eShopOnContainers.Droid.csproj.bak | 429 ------------------ 1 file changed, 429 deletions(-) delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak deleted file mode 100644 index 8a2babd2e..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak +++ /dev/null @@ -1,429 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {62DBB163-9CA9-4818-B48B-13233DF37C24} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - eShopOnContainers.Droid - eShopOnContainers.Droid - 512 - true - Resources\Resource.Designer.cs - Off - Properties\AndroidManifest.xml - true - v8.0 - armeabi,armeabi-v7a,x86 - - - 1G - - - - - - true - - - True - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - 1G - Xamarin - armeabi;armeabi-v7a;x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - False - SdkOnly - - - - ..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll - True - - - ..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll - True - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll - - - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll - True - - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll - True - - - - - ..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll - True - - - ..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll - - - ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll - - - ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll - - - ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll - - - ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll - - - ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll - - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll - - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll - True - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll - True - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll - True - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll - True - - - ..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll - True - - - - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll - True - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll - True - - - - - ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - - - - ..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.dll - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll - - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - - - - - - - - - - - - - - - - - - - - - Assets\Montserrat-Bold.ttf - - - Assets\Montserrat-Regular.ttf - - - Assets\SourceSansPro-Regular.ttf - - - - - - - - - Designer - - - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ba96a12c-4ee3-46c4-bb3f-f811b554cd01} - eShopOnContainers.Core - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 77f11330ae6977c5e13e6342ce17a205d8144e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Cobe=C3=B1a=20Mori=C3=A1n?= Date: Wed, 21 Mar 2018 16:24:36 +0100 Subject: [PATCH 5/9] Fixed login lifecycle in UWP --- .../Views/LoginView.xaml | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml index f6b9bd72c..2bccd06d6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml @@ -337,28 +337,14 @@ Grid.RowSpan="2" IsVisible="{Binding IsLogin}"> + Source="{Binding LoginUrl}" + AbsoluteLayout.LayoutBounds="0, 0, 1, 1" + AbsoluteLayout.LayoutFlags="All"> - - - - - - - - - - - - + From f910e48c37fb73f156b19bc7e54525e9fba72761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Wed, 21 Mar 2018 16:56:27 +0100 Subject: [PATCH 6/9] Replaced endpoint with copy --- .../eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs index 9b2b22b72..4c277d81b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs @@ -4,7 +4,7 @@ { public const string AzureTag = "Azure"; public const string MockTag = "Mock"; - public const string DefaultEndpoint = "http://52.170.199.82"; + public const string DefaultEndpoint = "INSERT YOUR ENDPOINT HERE"; private string _baseEndpoint; private static readonly GlobalSetting _instance = new GlobalSetting(); From 9ba004187dedc0482be8c93b867cca9db90990d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Thu, 22 Mar 2018 09:29:16 +0100 Subject: [PATCH 7/9] Clarified endpoint URI --- .../eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs index 4c277d81b..492dc1ca6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs @@ -4,7 +4,7 @@ { public const string AzureTag = "Azure"; public const string MockTag = "Mock"; - public const string DefaultEndpoint = "INSERT YOUR ENDPOINT HERE"; + public const string DefaultEndpoint = "http://YOUR_IP_OR_DNS_NAME"; private string _baseEndpoint; private static readonly GlobalSetting _instance = new GlobalSetting(); From 4791be9298f3e319887c52e64e41d7c2eadbfb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Fri, 23 Mar 2018 10:26:02 +0100 Subject: [PATCH 8/9] Removed string.Format()s --- .../eShopOnContainers.Core/Services/Catalog/CatalogService.cs | 2 +- .../eShopOnContainers.Core/Services/Order/OrderService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs index dd7cfe732..2811416ad 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs @@ -25,7 +25,7 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> FilterAsync(int catalogBrandId, int catalogTypeId) { UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); - builder.Path = string.Format($"{ApiUrlBase}/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); + builder.Path = $"{ApiUrlBase}/items/type/{catalogTypeId}/brand/{catalogBrandId}"; string uri = builder.ToString(); CatalogRoot catalog = await _requestProvider.GetAsync(uri); diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs index 0da0942ad..fb9a0c627 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs @@ -44,7 +44,7 @@ namespace eShopOnContainers.Core.Services.Order { UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BaseEndpoint); - builder.Path = string.Format($"{ApiUrlBase}/{0}", orderId); + builder.Path = $"{ApiUrlBase}/{orderId}"; string uri = builder.ToString(); From adf46ff83749bea845127bccc460674bb1a9d2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Coben=CC=83a=20Moria=CC=81n?= Date: Fri, 23 Mar 2018 10:28:30 +0100 Subject: [PATCH 9/9] Clarified endpoint style --- .../eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs index 492dc1ca6..e1637d7be 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs @@ -4,7 +4,7 @@ { public const string AzureTag = "Azure"; public const string MockTag = "Mock"; - public const string DefaultEndpoint = "http://YOUR_IP_OR_DNS_NAME"; + public const string DefaultEndpoint = "http://YOUR_IP_OR_DNS_NAME"; // i.e.: "http://YOUR_IP" or "http://YOUR_DNS_NAME" private string _baseEndpoint; private static readonly GlobalSetting _instance = new GlobalSetting();