diff --git a/src/app/core/models/microcredit-campaign.model.ts b/src/app/core/models/microcredit-campaign.model.ts index b0003ee..edd994e 100644 --- a/src/app/core/models/microcredit-campaign.model.ts +++ b/src/app/core/models/microcredit-campaign.model.ts @@ -9,11 +9,14 @@ export interface MicrocreditCampaign { //partner_payment: Payments[]; partner_payments: PartnerPayment[]; partner_address: PartnerAddress; + partner_slug: string, + partner_phone:string, + partner_email:string, campaign_id: string, campaign_imageURL: string, title: string, - subtitle:string, + subtitle: string, terms: string, description: string, category: string, diff --git a/src/app/views/pages/event-single/event-single.component.html b/src/app/views/pages/event-single/event-single.component.html index b32fb87..67bd425 100644 --- a/src/app/views/pages/event-single/event-single.component.html +++ b/src/app/views/pages/event-single/event-single.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/app/views/pages/microcredit-single/microcredit-single.component.html b/src/app/views/pages/microcredit-single/microcredit-single.component.html index e4063ec..717d462 100644 --- a/src/app/views/pages/microcredit-single/microcredit-single.component.html +++ b/src/app/views/pages/microcredit-single/microcredit-single.component.html @@ -1,3 +1,89 @@ +
+
+
+
+
+ +
+
+
+
+

{{ campaign.title }}

+
+
+
+ {{campaign.expiresAt | date: 'd.M'}} +
+
+ {{campaign.redeemStarts | date: 'd.M.y'}} - + {{campaign.redeemEnds | date: 'd.M.y'}} +
+
+ +

+
+
+
+
+ + + +
+ + {{campaign.stepAmount | currency:'EUR' }} + + + {{campaign.minAllowed | currency:'EUR' }} + + + {{campaign.minAllowed | currency:'EUR' }} + +
+
+ +
+
+
+
+
+
+
+ +
{{campaign.partner_name}}
+ + + {{campaign.partner_name}} + +
+ {{campaign.partner_address.street}}, {{campaign.partner_address.city}} +
+
+ {{campaign.partner_phone}} +
+
+ {{campaign.partner_email}} +
+
+
+
+
+
+
+ {{ 'SECTIONS.campaigns-link-to-all' | translate }} +
+
+
+
+
+
@@ -83,18 +168,18 @@

{{ 'SINGLE.CAMPAIGN.Support-title' | translate }}
- + - +
- - +
@@ -107,13 +192,13 @@

{{ 'SINGLE.CAMPAIGN.Support-title' | translate }}

- {{ 'AUTH.VALIDATION.REQUIRED_FIELD' | translate }} - {{ 'AUTH.VALIDATION.MIN_VALUE_FIELD' | translate }} + {{ + 'AUTH.VALIDATION.REQUIRED_FIELD' | translate }} + {{ + 'AUTH.VALIDATION.MIN_VALUE_FIELD' | translate }} {{ campaign.minAllowed | currency: 'EUR'}} - {{ 'AUTH.VALIDATION.MAX_VALUE_FIELD' | translate }} + {{ + 'AUTH.VALIDATION.MAX_VALUE_FIELD' | translate }} {{ campaign.maxAllowed | currency: 'EUR'}}
@@ -123,26 +208,27 @@

{{ 'SINGLE.CAMPAIGN.Support-title' | translate }}

- {{ 'AUTH.VALIDATION.REQUIRED_FIELD' | translate }} + {{ + 'AUTH.VALIDATION.REQUIRED_FIELD' | translate }}
- + - + -
@@ -150,4 +236,5 @@

{{ 'SINGLE.CAMPAIGN.Support-title' | translate }}

-
\ No newline at end of file + +--> \ No newline at end of file diff --git a/src/app/views/pages/microcredit-single/microcredit-single.component.scss b/src/app/views/pages/microcredit-single/microcredit-single.component.scss index 950149e..0961f0d 100644 --- a/src/app/views/pages/microcredit-single/microcredit-single.component.scss +++ b/src/app/views/pages/microcredit-single/microcredit-single.component.scss @@ -6,6 +6,34 @@ input::-webkit-inner-spin-button { } /* Firefox */ -input[type=number] { +input[type="number"] { -moz-appearance: textfield; } + +.single-campaign { + &-info { + margin-top: 20px; + .data { + label { + font-weight: bold; + } + &.terms { + margin-left: 20px; + margin-top: 20px; + padding-left: 15px; + border-left: 2px solid var(--tertiary); + } + &.price { + text-align: right; + label { + font-size: 18px; + } + span { + font-size: 40px; + line-height: 40px; + color: var(--primary); + } + } + } + } +} diff --git a/src/app/views/pages/microcredit-single/microcredit-single.component.ts b/src/app/views/pages/microcredit-single/microcredit-single.component.ts index 132206e..18d1baa 100644 --- a/src/app/views/pages/microcredit-single/microcredit-single.component.ts +++ b/src/app/views/pages/microcredit-single/microcredit-single.component.ts @@ -68,7 +68,6 @@ export class MicrocreditSingleComponent implements OnInit { this.routeSubscription = this.route.params.subscribe(params => { this.partner_id = params['partner_id']; this.campaign_id = params['campaign_id']; - console.log(this.campaign_id); this.fetchCampaignData(this.partner_id, this.campaign_id); }); } @@ -82,21 +81,20 @@ export class MicrocreditSingleComponent implements OnInit { fetchCampaignData(partner_id: string, campaign_id: string) { const now = new Date(); const seconds = parseInt(now.getTime().toString()); - this.openDataService.readMicrocreditCampaign(partner_id, campaign_id) .pipe( tap( data => { this.campaign = data; - this.titleService.setTitle(this.campaign.title); + this.titleService.setTitle(this.campaign.title+this.staticDataService.getSiteTitle); this.canSupport = (this.campaign.startsAt < seconds) && (this.campaign.expiresAt > seconds); - //this.canSupport = true; console.log(this.campaign); this.initRegistrationForm(); this.initSupportingForm(); }, error => { - console.log('error'); + console.log("Can't load campaign"); + console.log(error); }), takeUntil(this.unsubscribe), finalize(() => { @@ -113,7 +111,7 @@ export class MicrocreditSingleComponent implements OnInit { Validators.required, Validators.email, Validators.minLength(3), - Validators.maxLength(320) // https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address + Validators.maxLength(320) ]) ], }); @@ -125,7 +123,6 @@ export class MicrocreditSingleComponent implements OnInit { return currentMethodsArray.includes(el.bic); }); this.paymentsList = validatePaymentList; - this.supportingForm = this.fb.group({ amount: ['', Validators.compose([ Validators.required, @@ -138,7 +135,6 @@ export class MicrocreditSingleComponent implements OnInit { ]) ] }); - const controls = this.supportingForm.controls; controls['amount'].setValue(this.campaign.minAllowed); this.showSubStep = false; diff --git a/src/app/views/pages/offer-single/offer-single.component.html b/src/app/views/pages/offer-single/offer-single.component.html index 4749f2c..e2a0e2d 100644 --- a/src/app/views/pages/offer-single/offer-single.component.html +++ b/src/app/views/pages/offer-single/offer-single.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json index 3b8adee..ad176f8 100644 --- a/src/assets/i18n/el.json +++ b/src/assets/i18n/el.json @@ -83,6 +83,13 @@ "EXPIRED": "Έχει Λήξει" } }, + "CAMPAIGN":{ + "Expires":"Ημερομηνία Λήξης", + "RedeemDates":"Περίοδος Εξαργύρωσης", + "Terms":"Τι παίρνω;", + "Price":"Τιμή", + "PriceFrom":"Από" + }, "AUTH": { "INPUT": { "EMAIL": "E-mail" diff --git a/src/assets/styles/myassets.scss b/src/assets/styles/myassets.scss index 6e4e37c..3d5cc7a 100644 --- a/src/assets/styles/myassets.scss +++ b/src/assets/styles/myassets.scss @@ -221,7 +221,7 @@ margin-bottom: 40px; text-align: center; img{ - width: 80%; + width: 90%; border-radius:6px; } }