Browse Source

Merge branch 'main' into gterdem/public_web_ui_fixes

pull/205/head
Galip Tolga Erdem 3 years ago
parent
commit
bc7d544c42
  1. 13
      apps/angular/angular.json
  2. 2
      apps/angular/src/environments/environment.ts
  3. 3
      services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json

13
apps/angular/angular.json

@ -69,6 +69,11 @@
"input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css", "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css",
"inject": false, "inject": false,
"bundleName": "abp-bundle" "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", "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css",
@ -81,14 +86,14 @@
"bundleName": "ng-bundle.rtl" "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, "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, "inject": false,
"bundleName": "abp-bundle.rtl" "bundleName": "font-bundle"
}, },
"node_modules/bootstrap-icons/font/bootstrap-icons.css", "node_modules/bootstrap-icons/font/bootstrap-icons.css",

2
apps/angular/src/environments/environment.ts

@ -30,7 +30,7 @@ export const environment = {
rootNamespace: 'EShopOnAbp.OrderingService', rootNamespace: 'EShopOnAbp.OrderingService',
} }
}, },
mediaServerUrl:'https://localhost:44335' mediaServerUrl:'https://localhost:44373'
} as MyEnvironment; } as MyEnvironment;

3
services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.secrets.json

@ -1,3 +0,0 @@
{
"AbpLicenseCode": "PABMAGkAYwBlAG4AcwBlAD4ACgAgACAAPABJAGQAPgA2ADQAYQA1AGEAZQBmADUALQBhADcAMQA5AC0AYwAxADYAMAAtADYAYQAwAGEALQAzADkAZQBmADEANgAzADYAZgAxAGEAZAA8AC8ASQBkAD4ACgAgACAAPABMAGkAYwBlAG4AcwBlAEEAdAB0AHIAaQBiAHUAdABlAHMAPgAKACAAIAAgACAAPABBAHQAdAByAGkAYgB1AHQAZQAgAG4AYQBtAGUAPQAiAE8AcgBnAGEAbgBpAHoAYQB0AGkAbwBuAEkAZAAiAD4ANgA0AGEANQBhAGUAZgA1AC0AYQA3ADEAOQAtAGMAMQA2ADAALQA2AGEAMABhAC0AMwA5AGUAZgAxADYAMwA2AGYAMQBhAGQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBPAHIAZwBhAG4AaQB6AGEAdABpAG8AbgBOAGEAbQBlACIAPgBWAG8AbABvAHMAbwBmAHQAPAAvAEEAdAB0AHIAaQBiAHUAdABlAD4ACgAgACAAIAAgADwAQQB0AHQAcgBpAGIAdQB0AGUAIABuAGEAbQBlAD0AIgBDAHIAZQBhAHQAaQBvAG4AVABpAG0AZQAiAD4AMgAwADIAMgAtADAAOQAtADEAMgAgADEAMQA6ADQAMQA6ADEAMwA8AC8AQQB0AHQAcgBpAGIAdQB0AGUAPgAKACAAIAA8AC8ATABpAGMAZQBuAHMAZQBBAHQAdAByAGkAYgB1AHQAZQBzAD4ACgAgACAAPABTAGkAZwBuAGEAdAB1AHIAZQA+AE0ARQBVAEMASQBCAFQAQQB3AFUARwBKAFEANAB1AEsAagBVAEgAZgBsADcAMQBjAHUASwBpAHYAYQAvAGUAOAA3AE0AegBEADkAegB4AEUAKwA2AG8AbABQAGQANQBaAEEAaQBFAEEAagA2AGoAWAAyADMAdgBqAEcAQwBoAEkAMgBGAGgARwB6AGwASABzAEYARwBiAEMAZgBRAE0AeQBYAHAAcABDAEsAMwAzAFAAMABCAFkATAA2AEkAWQA9ADwALwBTAGkAZwBuAGEAdAB1AHIAZQA+AAoAPAAvAEwAaQBjAGUAbgBzAGUAPgBNAEYAawB3AEUAdwBZAEgASwBvAFoASQB6AGoAMABDAEEAUQBZAEkASwBvAFoASQB6AGoAMABEAEEAUQBjAEQAUQBnAEEARQByAEkAZwB4ADUARgBvAEsAWABhADgAWQBJAFEAYgBLAGcAOQBMAFEARQBMAFQAeQBoADEAZgAzAEgAUQBPAGEANwBrAEIATQBrAGQARwBLAE0ATwBjADkARAB4AHYAWABZAE0ASAB3AGgASAB4AHIALwB5AGIAdABRAG0AMQBnAG0ASABYAFEAMQB0AFYARgBMAGIAVQBQAHkATABFAGEANQBNAEYAUQBCAEEAPQA9AF8AMQAyADQA"
}
Loading…
Cancel
Save