Skip to content

Commit c91962d

Browse files
authored
FIX QA Tickets + Improvements (#139)
* FIX price simulator's chars placing + add restrictions to char's description length * FIX organization form reset contact medium if not saved when profile updated + DELETE provider header's background header * ADD UX tasks
1 parent 0e2911e commit c91962d

File tree

22 files changed

+75
-60
lines changed

22 files changed

+75
-60
lines changed

src/app/app.component.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
2-
3-
.bae-content {
4-
width: 100%;
5-
min-height: calc(100vh - 100px) !important;
6-
padding-top: 75px !important;
7-
padding-bottom: 25px !important;
8-
}

src/app/app.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<bae-header class="fixed w-full z-50 top-0 start-0"></bae-header>
2-
<main class="bg-fixed bg-no-repeat bg-right pb-[60px] pt-[75px]">
2+
<main class="bg-no-repeat bg-right pb-[60px] pt-[75px]">
33
<router-outlet></router-outlet>
44
</main>
55
@if(providerThemeName=='DOME') {
6-
<app-chatbot-widget class="relative"></app-chatbot-widget>
6+
<app-chatbot-widget class="relative z-50"></app-chatbot-widget>
77
}
8-
<bae-footer class="hidden md:block"></bae-footer>
8+
9+
<bae-footer class="fixed w-full z-50 bottom-0 start-0"></bae-footer>
10+
911
@if(isProduction){
1012
<script type="text/javascript"> _linkedin_partner_id = "8700705"; window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || []; window._linkedin_data_partner_ids.push(_linkedin_partner_id); </script><script type="text/javascript"> (function(l) { if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])}; window.lintrk.q=[]} var s = document.getElementsByTagName("script")[0]; var b = document.createElement("script"); b.type = "text/javascript";b.async = true; b.src = "https://snap.licdn.com/li.lms-analytics/insight.min.js"; s.parentNode.insertBefore(b, s);})(window.lintrk); </script> <noscript> <img height="1" width="1" style="display:none;" alt="" src="https://px.ads.linkedin.com/collect/?pid=8700705&fmt=gif" /> </noscript>
1113
}

src/app/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class AppComponent implements OnInit {
7777
console.log(((info.expire - moment().unix()) - 4))
7878

7979
this.refreshApi.startInterval(((info.expire - moment().unix())-4)*1000, ev);
80-
80+
initFlowbite();
8181
//this.refreshApi.startInterval(3000, ev.value);
8282
}
8383
})
@@ -92,6 +92,7 @@ export class AppComponent implements OnInit {
9292
this.refreshApi.startInterval(((aux.expire - moment().unix())-4)*1000, aux);
9393
console.log('token')
9494
console.log(aux.token)
95+
initFlowbite();
9596
}
9697
this.router.events.subscribe(event => {
9798
if (event instanceof NavigationEnd) {

src/app/chatbot-widget/chatbot-widget.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h4 class="chatbox__heading--header">DOME support</h4>
3232
}
3333

3434
<!-- Wrapper -->
35-
<div class="fixed bottom-5 md:bottom-[55px] right-5 z-[999]" (click)="toggleState()">
35+
<div class="fixed bottom-9 md:bottom-[55px] right-5 z-[999]" (click)="toggleState()">
3636
<!-- Button -->
3737
<button
3838
class="w-[60px] h-[60px] bg-[var(--secondary-dark-blue)] border-none rounded-full shadow-[0_2px_10px_rgba(0,0,0,0.3)] cursor-pointer transition-transform duration-300 flex items-center justify-center hover:scale-105 p-0"

src/app/pages/contact-us/contact-us-form.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="mb-4 text-left text-4xl font-extrabold tracking-tight md:text-5xl lg:
1919
<h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fill' | translate }}</h2>
2020
<div class="grid grid-cols-3 gap-4">
2121
<div>
22-
<label for="email" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._email' | translate }}</label>
22+
<label for="email" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._email' | translate }} (*)</label>
2323
<input formControlName="email" type="text" id="email"
2424
[ngClass]="contactForm.get('email')?.touched && contactForm.get('email')?.invalid
2525
? 'border-red-600'
@@ -36,7 +36,7 @@ <h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fil
3636
}
3737
</div>
3838
<div>
39-
<label for="name" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._firstname' | translate }}</label>
39+
<label for="name" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._firstname' | translate }} (*)</label>
4040
<input formControlName="name" type="text" id="name"
4141
[ngClass]="contactForm.get('name')?.touched && contactForm.get('name')?.invalid
4242
? 'border-red-600'
@@ -50,7 +50,7 @@ <h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fil
5050
}
5151
</div>
5252
<div>
53-
<label for="lastname" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._lastname' | translate }}</label>
53+
<label for="lastname" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._lastname' | translate }} (*)</label>
5454
<input formControlName="lastname" type="text" id="lastname"
5555
[ngClass]="contactForm.get('lastname')?.touched && contactForm.get('lastname')?.invalid
5656
? 'border-red-600'
@@ -66,7 +66,7 @@ <h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fil
6666
</div>
6767
<div class="grid grid-cols-2 gap-4">
6868
<div>
69-
<label for="organization" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._organization' | translate }}</label>
69+
<label for="organization" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._organization' | translate }} (*)</label>
7070
<input formControlName="organization" type="text" id="organization"
7171
[ngClass]="contactForm.get('organization')?.touched && contactForm.get('organization')?.invalid
7272
? 'border-red-600'
@@ -80,7 +80,7 @@ <h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fil
8080
}
8181
</div>
8282
<div>
83-
<label for="role" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._role' | translate }}</label>
83+
<label for="role" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._role' | translate }} (*)</label>
8484
<input formControlName="role" type="text" id="role"
8585
[ngClass]="contactForm.get('role')?.touched && contactForm.get('role')?.invalid
8686
? 'border-red-600'
@@ -95,7 +95,7 @@ <h2 class="text-left text-2xl mb-2 font-bold dark:text-white">{{ 'CONTACTUS._fil
9595
</div>
9696
</div>
9797
<div>
98-
<label for="organization" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._message' | translate }}</label>
98+
<label for="organization" class="font-bold text-lg dark:text-white">{{ 'CONTACTUS._message' | translate }} (*)</label>
9999
<textarea id="editor" formControlName="message" rows="8"
100100
[ngClass]="contactForm.get('message')?.touched && contactForm.get('message')?.invalid
101101
? 'border-red-600'

src/app/pages/dashboard/dashboard.component.html

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,24 @@ <h1 class="mb-4 text-left text-4xl font-extrabold tracking-tight md:text-5xl lg:
8484
<!--<bae-off-gallery *ngIf="currentTheme?.dashboard?.showFeaturedOfferings">
8585
</bae-off-gallery>-->
8686
<app-platform-benefits *ngIf="currentTheme?.dashboard?.showPlatformBenefits"></app-platform-benefits>
87-
<div class="border-t border-gray-200 dark:border-gray-600">
88-
<div class="flex flex-row items-center py-8 px-4 mb-4">
89-
<img
90-
class="h-12 w-auto"
91-
src="assets/logos/euflag.png"
92-
alt="EU flag image"
93-
>
94-
<p class="ml-4 text-base font-normal text-gray-500 dark:text-gray-400 text-start">
95-
Distributed Open Marketplace for Europe (DOME) Project has received funding from
96-
European Union’s Digital Europe Programme under the Grant Agreement No 101084071.
97-
</p>
87+
@if(providerThemeName=='DOME'){
88+
<div >
89+
<div class="border-t border-gray-200 dark:border-gray-600 w-full">
90+
<div class="flex flex-row items-center pt-4">
91+
<img
92+
class="h-12 w-auto ml-4"
93+
src="assets/logos/euflag.png"
94+
alt="EU flag image"
95+
>
96+
<p class="ml-4 text-base font-normal text-gray-500 dark:text-gray-400 text-start">
97+
Distributed Open Marketplace for Europe (DOME) Project has received funding from
98+
European Union’s Digital Europe Programme under the Grant Agreement No 101084071.
99+
</p>
100+
</div>
101+
</div>
98102
</div>
99-
</div>
103+
104+
}
100105
<!--<app-explore-dome></app-explore-dome>-->
101106
<!--<app-faq></app-faq>-->
102107

src/app/pages/dashboard/dashboard.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
3636
delay: number = 2000;
3737
currentTheme: ThemeConfig | null = null;
3838
private themeSubscription: Subscription = new Subscription();
39+
providerThemeName=environment.providerThemeName;
3940

4041
//loginSubscription: Subscription = new Subscription();;
4142
constructor(private localStorage: LocalStorageService,
@@ -111,6 +112,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
111112

112113
this.localStorage.addLoginInfo(info);
113114
this.eventMessage.emitLogin(info);
115+
initFlowbite();
114116
console.log('----')
115117
//this.refreshApi.stopInterval();
116118
//this.refreshApi.startInterval(((data.expire - moment().unix())-4)*1000, data);

src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ <h6 class="mb-3 text-sm font-medium text-gray-900 dark:text-white">
120120
<h5 class="text-xl font-semibold tracking-tight text-primary-100 dark:text-white">{{inv.product?.name}}</h5>
121121
</a>
122122
@if(inv.status == 'active'){
123-
<button type="button" data-tooltip-target="unsubscribe-default" (click)="showUnsubscribeModal(inv);$event.stopPropagation();" class="flex text-red-600 border border-red-600 hover:bg-red-600 hover:text-white focus:ring-4 focus:outline-none focus:ring-red-400 font-medium rounded-full text-sm p-2 text-center inline-flex items-center">
123+
<button type="button" data-tooltip-target="unsubscribe-default" (click)="showUnsubscribeModal(inv);$event.stopPropagation();" class="flex h-fit text-red-600 border border-red-600 hover:bg-red-600 hover:text-white focus:ring-4 focus:outline-none focus:ring-red-400 font-medium rounded-full text-sm p-2 text-center inline-flex items-center">
124124
<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
125125
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18 17.94 6M18 18 6.06 6"/>
126126
</svg>

src/app/pages/search-catalog/search-catalog.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
} @else {
7474
<div class="flex items-center mx-auto max-w-screen-xl w-full items-center bg-white dark:bg-secondary-100 rounded-lg shadow-lg ml-4 mb-4">
7575
<div class="relative w-full">
76-
<!-- Background image layer -->
76+
<!-- Background image layer
7777
<div class="absolute inset-0 bg-no-repeat bg-cover opacity-40 z-0 rounded-lg"
7878
style="background-image: url('{{ logo }}');">
79-
</div>
79+
</div> -->
8080

8181
<!-- Content layer -->
8282
<div class="relative flex flex-row justify-between items-start w-full p-8">

src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ <h3 class="text-sm italic text-gray-600 ml-4 dark:text-gray-200">There's no char
577577
</div>
578578
<div class="col-span-2">
579579
<label for="description" class="font-bold text-lg dark:text-white">{{ 'CREATE_PROD_SPEC._product_description' | translate }}</label>
580-
<textarea id="description" formControlName="description" rows="4"
580+
<textarea id="description" formControlName="description" rows="4" maxLength="500"
581581
class="mb-2 min-h-fit bg-gray-50 dark:bg-secondary-300 border border-gray-300 dark:border-secondary-200 dark:text-white text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5"></textarea>
582582
</div>
583583
</form>

0 commit comments

Comments
 (0)