From 06fbb2dac985fca6ccdb094aa4a964c1d6480ca6 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 14 Sep 2023 17:16:55 -0400 Subject: [PATCH 1/4] Fixed missing font-bundle error --- apps/angular/angular.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/angular/angular.json b/apps/angular/angular.json index e34ce149..9424cd11 100644 --- a/apps/angular/angular.json +++ b/apps/angular/angular.json @@ -69,6 +69,11 @@ "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css", "inject": false, "bundleName": "abp-bundle" + }, + { + "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css", + "inject": false, + "bundleName": "abp-bundle.rtl" }, { "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css", @@ -81,14 +86,14 @@ "bundleName": "ng-bundle.rtl" }, { - "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.rtl.css", + "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css", "inject": false, - "bundleName": "layout-bundle.rtl" + "bundleName": "font-bundle.rtl" }, { - "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css", + "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.css", "inject": false, - "bundleName": "abp-bundle.rtl" + "bundleName": "font-bundle" }, "node_modules/bootstrap-icons/font/bootstrap-icons.css", From f6df8fcc0c2ea2b0536be0ff8aab89b76cba827f Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 14 Sep 2023 17:17:25 -0400 Subject: [PATCH 2/4] fixed url used for product images in order details --- apps/angular/src/environments/environment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/angular/src/environments/environment.ts b/apps/angular/src/environments/environment.ts index 293d9acc..4eadbe66 100644 --- a/apps/angular/src/environments/environment.ts +++ b/apps/angular/src/environments/environment.ts @@ -30,7 +30,7 @@ export const environment = { rootNamespace: 'EShopOnAbp.OrderingService', } }, - mediaServerUrl:'https://localhost:44335' + mediaServerUrl:'https://localhost:44373' } as MyEnvironment; From db68ac0e4a1c2068d2776ddb79606333c9a2e86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 26 Sep 2023 14:25:38 +0300 Subject: [PATCH 3/4] Update appsettings.secrets.json --- .../appsettings.secrets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json index aeef8045..ae2c997e 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json @@ -1,3 +1,3 @@ { - "AbpLicenseCode": "PABMAGkAYwBlAG4AcwBlAD4ACgAgACAAPABJAGQAPgA2ADQAYQA1AGEAZQBmADUALQBhADcAMQA5AC0AYwAxADYAMAAtADYAYQAwAGEALQAzADkAZQBmADEANgAzADYAZgAxAGEAZAA8AC8ASQBkAD4ACgAgACAAPABMAGkAYwBlAG4AcwBlAEEAdAB0AHIAaQBiAHUAdABlAHMAPgAKACAAIAAgACAAPABBAHQAdAByAGkAYgB1AHQAZQAgAG4AYQBtAGUAPQAiAE8AcgBnAGEAbgBpAHoAYQB0AGkAbwBuAEkAZAAiAD4ANgA0AGEANQBhAGUAZgA1AC0AYQA3ADEAOQAtAGMAMQA2ADAALQA2AGEAMABhAC0AMwA5AGUAZgAxADYAMwA2AGYAMQBhAGQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBPAHIAZwBhAG4AaQB6AGEAdABpAG8AbgBOAGEAbQBlACIAPgBWAG8AbABvAHMAbwBmAHQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBDAHIAZQBhAHQAaQBvAG4AVABpAG0AZQAiAD4AMgAwADIAMgAtADAAOQAtADEAMgAgADEAMQA6ADQAMQA6ADEAMwA8AC8AQQB0AHQAcgBpAGIAdQB0AGUAPgAKACAAIAA8AC8ATABpAGMAZQBuAHMAZQBBAHQAdAByAGkAYgB1AHQAZQBzAD4ACgAgACAAPABTAGkAZwBuAGEAdAB1AHIAZQA+AE0ARQBVAEMASQBCAFQAQQB3AFUARwBKAFEANAB1AEsAagBVAEgAZgBsADcAMQBjAHUASwBpAHYAYQAvAGUAOAA3AE0AegBEADkAegB4AEUAKwA2AG8AbABQAGQANQBaAEEAaQBFAEEAagA2AGoAWAAyADMAdgBqAEcAQwBoAEkAMgBGAGgARwB6AGwASABzAEYARwBiAEMAZgBRAE0AeQBYAHAAcABDAEsAMwAzAFAAMABCAFkATAA2AEkAWQA9ADwALwBTAGkAZwBuAGEAdAB1AHIAZQA+AAoAPAAvAEwAaQBjAGUAbgBzAGUAPgBNAEYAawB3AEUAdwBZAEgASwBvAFoASQB6AGoAMABDAEEAUQBZAEkASwBvAFoASQB6AGoAMABEAEEAUQBjAEQAUQBnAEEARQByAEkAZwB4ADUARgBvAEsAWABhADgAWQBJAFEAYgBLAGcAOQBMAFEARQBMAFQAeQBoADEAZgAzAEgAUQBPAGEANwBrAEIATQBrAGQARwBLAE0ATwBjADkARAB4AHYAWABZAE0ASAB3AGgASAB4AHIALwB5AGIAdABRAG0AMQBnAG0ASABYAFEAMQB0AFYARgBMAGIAVQBQAHkATABFAGEANQBNAEYAUQBCAEEAPQA9AF8AMQAyADQA" + "AbpLicenseCode": "PABMAGkAYwBlAG4AcwBlAD4ACgAgAC2AAPABJAGQAPgA2ADQAYQA1AGEAZQBmADUALQBhADcAMQA5AC0AYwAxADYAMAAtADYAYQAwAGEALQAzADkAZQBmADEANgAzADYAZgAxAGEAZAA8AC8ASQBkAD4ACgAgACAAPABMAGkAYwBlAG4AcwBlAEEAdAB0AHIAaQBiAHUAdABlAHMAPgAKACAAIAAgACAAPABBAHQAdAByAGkAYgB1AHQAZQAgAG4AYQBtAGUAPQAiAE8AcgBnAGEAbgBpAHoAYQB0AGkAbwBuAEkAZAAiAD4ANgA0AGEANQBhAGUAZgA1AC0AYQA3ADEAOQAtAGMAMQA2ADAALQA2AGEAMABhAC0AMwA5AGUAZgAxADYAMwA2AGYAMQBhAGQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBPAHIAZwBhAG4AaQB6AGEAdABpAG8AbgBOAGEAbQBlACIAPgBWAG8AbABvAHMAbwBmAHQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBDAHIAZQBhAHQAaQBvAG4AVABpAG0AZQAiAD4AMgAwADIAMgAtADAAOQAtADEAMgAgADEAMQA6ADQAMQA6ADEAMwA8AC8AQQB0AHQAcgBpAGIAdQB0AGUAPgAKACAAIAA8AC8ATABpAGMAZQBuAHMAZQBBAHQAdAByAGkAYgB1AHQAZQBzAD4ACgAgACAAPABTAGkAZwBuAGEAdAB1AHIAZQA+AE0ARQBVAEMASQBCAFQAQQB3AFUARwBKAFEANAB1AEsAagBVAEgAZgBsADcAMQBjAHUASwBpAHYAYQAvAGUAOAA3AE0AegBEADkAegB4AEUAKwA2AG8AbABQAGQANQBaAEEAaQBFAEEAagA2AGoAWAAyADMAdgBqAEcAQwBoAEkAMgBGAGgARwB6AGwASABzAEYARwBiAEMAZgBRAE0AeQBYAHAAcABDAEsAMwAzAFAAMABCAFkATAA2AEkAWQA9ADwALwBTAGkAZwBuAGEAdAB1AHIAZQA+AAoAPAAvAEwAaQBjAGUAbgBzAGUAPgBNAEYAawB3AEUAdwBZAEgASwBvAFoASQB6AGoAMABDAEEAUQBZAEkASwBvAFoASQB6AGoAMABEAEEAUQBjAEQAUQBnAEEARQByAEkAZwB4ADUARgBvAEsAWABhADgAWQBJAFEAYgBLAGcAOQBMAFEARQBMAFQAeQBoADEAZgAzAEgAUQBPAGEANwBrAEIATQBrAGQARwBLAE0ATwBjADkARAB4AHYAWABZAE0ASAB3AGgASAB4AHIALwB5AGIAdABRAG0AMQBnAG0ASABYAFEAMQB0AFYARgBMAGIAVQBQAHkATABFAGEANQBNAEYAUQBCAEEAPQA9AF8AMQAyADQA" } \ No newline at end of file From ec6515bf21747e5b426155a947ca8d22b8fa0362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 26 Sep 2023 14:25:57 +0300 Subject: [PATCH 4/4] Delete unnecessary code part --- .../appsettings.secrets.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json deleted file mode 100644 index ae2c997e..00000000 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "AbpLicenseCode": "PABMAGkAYwBlAG4AcwBlAD4ACgAgAC2AAPABJAGQAPgA2ADQAYQA1AGEAZQBmADUALQBhADcAMQA5AC0AYwAxADYAMAAtADYAYQAwAGEALQAzADkAZQBmADEANgAzADYAZgAxAGEAZAA8AC8ASQBkAD4ACgAgACAAPABMAGkAYwBlAG4AcwBlAEEAdAB0AHIAaQBiAHUAdABlAHMAPgAKACAAIAAgACAAPABBAHQAdAByAGkAYgB1AHQAZQAgAG4AYQBtAGUAPQAiAE8AcgBnAGEAbgBpAHoAYQB0AGkAbwBuAEkAZAAiAD4ANgA0AGEANQBhAGUAZgA1AC0AYQA3ADEAOQAtAGMAMQA2ADAALQA2AGEAMABhAC0AMwA5AGUAZgAxADYAMwA2AGYAMQBhAGQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBPAHIAZwBhAG4AaQB6AGEAdABpAG8AbgBOAGEAbQBlACIAPgBWAG8AbABvAHMAbwBmAHQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBDAHIAZQBhAHQAaQBvAG4AVABpAG0AZQAiAD4AMgAwADIAMgAtADAAOQAtADEAMgAgADEAMQA6ADQAMQA6ADEAMwA8AC8AQQB0AHQAcgBpAGIAdQB0AGUAPgAKACAAIAA8AC8ATABpAGMAZQBuAHMAZQBBAHQAdAByAGkAYgB1AHQAZQBzAD4ACgAgACAAPABTAGkAZwBuAGEAdAB1AHIAZQA+AE0ARQBVAEMASQBCAFQAQQB3AFUARwBKAFEANAB1AEsAagBVAEgAZgBsADcAMQBjAHUASwBpAHYAYQAvAGUAOAA3AE0AegBEADkAegB4AEUAKwA2AG8AbABQAGQANQBaAEEAaQBFAEEAagA2AGoAWAAyADMAdgBqAEcAQwBoAEkAMgBGAGgARwB6AGwASABzAEYARwBiAEMAZgBRAE0AeQBYAHAAcABDAEsAMwAzAFAAMABCAFkATAA2AEkAWQA9ADwALwBTAGkAZwBuAGEAdAB1AHIAZQA+AAoAPAAvAEwAaQBjAGUAbgBzAGUAPgBNAEYAawB3AEUAdwBZAEgASwBvAFoASQB6AGoAMABDAEEAUQBZAEkASwBvAFoASQB6AGoAMABEAEEAUQBjAEQAUQBnAEEARQByAEkAZwB4ADUARgBvAEsAWABhADgAWQBJAFEAYgBLAGcAOQBMAFEARQBMAFQAeQBoADEAZgAzAEgAUQBPAGEANwBrAEIATQBrAGQARwBLAE0ATwBjADkARAB4AHYAWABZAE0ASAB3AGgASAB4AHIALwB5AGIAdABRAG0AMQBnAG0ASABYAFEAMQB0AFYARgBMAGIAVQBQAHkATABFAGEANQBNAEYAUQBCAEEAPQA9AF8AMQAyADQA" -} \ No newline at end of file