diff --git a/src/app/app.component.css b/src/app/app.component.css index 463d9bcb..e69de29b 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -1,8 +0,0 @@ - - -.bae-content { - width: 100%; - min-height: calc(100vh - 100px) !important; - padding-top: 75px !important; - padding-bottom: 25px !important; -} diff --git a/src/app/app.component.html b/src/app/app.component.html index 53d8dfcd..c714a878 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,11 +1,13 @@ - + @if(providerThemeName=='DOME') { - + } - + + + @if(isProduction){ } \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 5e569362..991a4490 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -77,7 +77,7 @@ export class AppComponent implements OnInit { console.log(((info.expire - moment().unix()) - 4)) this.refreshApi.startInterval(((info.expire - moment().unix())-4)*1000, ev); - + initFlowbite(); //this.refreshApi.startInterval(3000, ev.value); } }) @@ -92,6 +92,7 @@ export class AppComponent implements OnInit { this.refreshApi.startInterval(((aux.expire - moment().unix())-4)*1000, aux); console.log('token') console.log(aux.token) + initFlowbite(); } this.router.events.subscribe(event => { if (event instanceof NavigationEnd) { diff --git a/src/app/chatbot-widget/chatbot-widget.component.html b/src/app/chatbot-widget/chatbot-widget.component.html index 494dd6dd..bed89750 100644 --- a/src/app/chatbot-widget/chatbot-widget.component.html +++ b/src/app/chatbot-widget/chatbot-widget.component.html @@ -32,7 +32,7 @@ DOME support } - + {{ 'CONTACTUS._fill' | translate }} - {{ 'CONTACTUS._email' | translate }} + {{ 'CONTACTUS._email' | translate }} (*) {{ 'CONTACTUS._fil } - {{ 'CONTACTUS._firstname' | translate }} + {{ 'CONTACTUS._firstname' | translate }} (*) {{ 'CONTACTUS._fil } - {{ 'CONTACTUS._lastname' | translate }} + {{ 'CONTACTUS._lastname' | translate }} (*) {{ 'CONTACTUS._fil - {{ 'CONTACTUS._organization' | translate }} + {{ 'CONTACTUS._organization' | translate }} (*) {{ 'CONTACTUS._fil } - {{ 'CONTACTUS._role' | translate }} + {{ 'CONTACTUS._role' | translate }} (*) {{ 'CONTACTUS._fil - {{ 'CONTACTUS._message' | translate }} + {{ 'CONTACTUS._message' | translate }} (*) --> - - - - - Distributed Open Marketplace for Europe (DOME) Project has received funding from - European Union’s Digital Europe Programme under the Grant Agreement No 101084071. - + @if(providerThemeName=='DOME'){ + + + + + + Distributed Open Marketplace for Europe (DOME) Project has received funding from + European Union’s Digital Europe Programme under the Grant Agreement No 101084071. + + + - + + } diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts index 23dedbd3..d89bd139 100644 --- a/src/app/pages/dashboard/dashboard.component.ts +++ b/src/app/pages/dashboard/dashboard.component.ts @@ -36,6 +36,7 @@ export class DashboardComponent implements OnInit, OnDestroy { delay: number = 2000; currentTheme: ThemeConfig | null = null; private themeSubscription: Subscription = new Subscription(); + providerThemeName=environment.providerThemeName; //loginSubscription: Subscription = new Subscription();; constructor(private localStorage: LocalStorageService, @@ -111,6 +112,7 @@ export class DashboardComponent implements OnInit, OnDestroy { this.localStorage.addLoginInfo(info); this.eventMessage.emitLogin(info); + initFlowbite(); console.log('----') //this.refreshApi.stopInterval(); //this.refreshApi.startInterval(((data.expire - moment().unix())-4)*1000, data); diff --git a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html index 4c600c14..d731ab40 100644 --- a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html +++ b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html @@ -120,7 +120,7 @@ {{inv.product?.name}} @if(inv.status == 'active'){ - + diff --git a/src/app/pages/search-catalog/search-catalog.component.html b/src/app/pages/search-catalog/search-catalog.component.html index a92cfee1..e10555b5 100644 --- a/src/app/pages/search-catalog/search-catalog.component.html +++ b/src/app/pages/search-catalog/search-catalog.component.html @@ -73,10 +73,10 @@ } @else { - + diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html index 1a7853a1..09e79603 100644 --- a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html +++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html @@ -577,7 +577,7 @@ There's no char {{ 'CREATE_PROD_SPEC._product_description' | translate }} - diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts index df5c7384..71d5dd87 100644 --- a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts +++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts @@ -84,7 +84,7 @@ export class CreateProductSpecComponent implements OnInit { //CHARS INFO charsForm = new FormGroup({ name: new FormControl('', [Validators.required, Validators.maxLength(100), noWhitespaceValidator]), - description: new FormControl('') + description: new FormControl('', [Validators.maxLength(500)]) }); stringCharSelected:boolean=true; numberCharSelected:boolean=false; diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html index 540070be..b8aaf27b 100644 --- a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html +++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html @@ -688,7 +688,7 @@ There's no char {{ 'UPDATE_PROD_SPEC._product_description' | translate }} - diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts index b99a0232..5c163bf7 100644 --- a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts +++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts @@ -79,7 +79,7 @@ export class UpdateProductSpecComponent implements OnInit { //CHARS INFO charsForm = new FormGroup({ name: new FormControl('', [Validators.required, Validators.maxLength(100), noWhitespaceValidator]), - description: new FormControl('') + description: new FormControl('', [Validators.maxLength(500)]) }); stringCharSelected:boolean=true; numberCharSelected:boolean=false; diff --git a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts index 3eaf0c4e..9b6b3819 100644 --- a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts +++ b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts @@ -240,8 +240,9 @@ export class OrgInfoComponent implements OnInit { this.getProfile(); this.successVisibility = true; setTimeout(() => { - this.successVisibility = false - }, 2000); + this.successVisibility = false; + }, 2000); + this.mediumForm.reset(); }, error: error => { console.error('There was an error while updating!', error); diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html index 7b419673..1f238973 100644 --- a/src/app/shared/footer/footer.component.html +++ b/src/app/shared/footer/footer.component.html @@ -1,7 +1,7 @@ -
- Distributed Open Marketplace for Europe (DOME) Project has received funding from - European Union’s Digital Europe Programme under the Grant Agreement No 101084071. -
+ Distributed Open Marketplace for Europe (DOME) Project has received funding from + European Union’s Digital Europe Programme under the Grant Agreement No 101084071. +