diff --git a/src/app/auth/terms/synergy_terms.component.html b/src/app/auth/terms/synergy_terms.component.html index 838918dc..0c84b09f 100644 --- a/src/app/auth/terms/synergy_terms.component.html +++ b/src/app/auth/terms/synergy_terms.component.html @@ -1,36 +1,4 @@ -
-
- - -

Terms and Conditions

-

Welcome to Synergy Web App!

-

These terms and conditions outline the rules and regulations for the use of Synergy's Website, - located at app.synergatika.gr.

-

By accessing this website we assume you accept these terms and conditions. Do not continue to use - Synergy Web App if you do not agree to take all of the terms and conditions stated on this page. -

-

The following terminology applies to these Terms and Conditions, Privacy Statement and Disclaimer - Notice and all Agreements: "Client", "You" and "Your" refers to you, the person log on this - website and compliant to the Company’s terms and conditions. "The Company", "Ourselves", "We", - "Our" and "Us", refers to our Company. "Party", "Parties", or "Us", refers to both the Client - and ourselves. All terms refer to the offer, acceptance and consideration of payment necessary - to undertake the process of our assistance to the Client in the most appropriate manner for the - express purpose of meeting the Client’s needs in respect of provision of the Company’s stated - services, in accordance with and subject to, prevailing law of Netherlands. Any use of the above - terminology or other words in the singular, plural, capitalization and/or he/she or they, are - taken as interchangeable and therefore as referring to same.

-

Cookies

-

We employ the use of cookies. By accessing Synergy Web App, you agreed to use cookies in - agreement with the Synergy's Privacy Policy.

-

Most interactive websites use cookies to let us retrieve the user’s details for each visit. - Cookies are used by our website to enable the functionality of certain areas to make it easier - for people visiting our website. Some of our affiliate/advertising partners may also use - cookies.

- - +
+
-
\ No newline at end of file +
diff --git a/src/app/auth/terms/synergy_terms.component.ts b/src/app/auth/terms/synergy_terms.component.ts index e6abba38..82d86b22 100644 --- a/src/app/auth/terms/synergy_terms.component.ts +++ b/src/app/auth/terms/synergy_terms.component.ts @@ -1,27 +1,47 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; +import { Subject } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; +import { StaticContentService } from '../../core/services/static_content.service'; @Component({ - selector: 'app-terms', - templateUrl: './synergy_terms.component.html', + selector: 'app-terms', + templateUrl: './synergy_terms.component.html', }) export class TermsComponent implements OnInit, OnDestroy { + private unsubscribe: Subject; + content: any; + /** * Component Constructor * * @param dialog: MatDialog */ - constructor( - public dialog: MatDialog, - ) { - } + constructor( + public dialog: MatDialog, + private cdr: ChangeDetectorRef, + private StaticContentService : StaticContentService , + ) { + } + + ngOnInit() { + this.unsubscribe = new Subject(); + this.content = null; + this.fetchContent('126'); + } + + fetchContent(page_id) { + this.StaticContentService.getWPContent(page_id).subscribe((data) => { + this.content = data.content.rendered; + console.log(this.content); + }); + } - ngOnInit() { - } + ngOnDestroy() { + this.unsubscribe.next(); + this.unsubscribe.complete(); + } - ngOnDestroy() { - } -} \ No newline at end of file +} diff --git a/src/app/core/config/i18n/el.ts b/src/app/core/config/i18n/el.ts index f47e231b..6aec62ee 100644 --- a/src/app/core/config/i18n/el.ts +++ b/src/app/core/config/i18n/el.ts @@ -58,7 +58,7 @@ export const locale = { AUTH: { MESSAGES: { WELCOME_TITLE: 'Καλώς ήρθες', - WELCOME_SUBTITLE: 'Έλα στην παρέα του synergatika.gr για να στηρίξεις τα συνεργατικά καταστήματα και να κερδίσεις εκπτώσεις και προσφορές!', + WELCOME_SUBTITLE: 'Έλα στην παρέα του synergatika.gr για να μας γνωρίσεις και να μας στηρίξεις!', HAVE_ACCOUNT: 'Έχεις ήδη Λογαριασμό;', NOT_HAVE_ACCOUNT: 'Ακόμα δεν έχεις Λογαριασμό;', ALREADY_VALIDATED: 'Έχεις ήδη επαληθεύσει το email σου;', @@ -754,10 +754,15 @@ export const locale = { PUBLISH_CONFIRM_B: 'Μέτα τη δημοσίευση δεν θα είναι διαθέσιμη η επεξεργασία της', DRAFT: 'πρόχειρο', CANCEL: 'Ακύρωση', - + NOT_REDEEMABLE :{ + DESC: 'Η καμπάνια δεν είναι εξαργυρώσιμη. Ευχαριστούμε για την προσφορά σας!', + DONATED: 'ΔΩΡΕΑ' + }, + UNPAID_TITLE:"Στοιχεία πληρωμής", + UNPAID_MSSG:"Η πληρωμή σου στην καμπάνια δεν έχει επιβεβαιωθεί. Αν δεν έχεις κάνει την πληρωμή κάνε την άμεσα. Αν πληρώσεις τραπεζικά, χρησιμοποιήσε την ταυτότητα πληρωμής στην αιτιολογία της κατάθεσης.", SUPPORT_PERIOD: 'Περίοδος Υποστήριξης', SUPPORT_PERIOD_SUB: 'Αυτή είναι η περίοδος που μπορείτε να προπληρώσετε τα προϊόντα που επιθυμείτε', - REDEEM_PERIOD: 'Περίοδος εξαργύρωσης', + REDEEM_PERIOD: 'Περίοδος Εξαργύρωσης', REDEEM_PERIOD_SUB: 'Αυτή είναι η περίοδος που μπορείτε να εξαργυρώσετε τα προϊόντα για τα οποία έχετε προπληρώσει', PRICE: 'Τιμή', PRICE_PER_ITEM: 'Τιμή ανα ποσότητα', @@ -867,6 +872,8 @@ export const locale = { QR_CODE: 'Ο QR Κωδικός σου', WALLET_TITLE: 'Το πορτοφόλι μου', WALLET_SUBTITLE: 'σε όλο το δίκτυο', + WALLET_DESC:'Εδώ βλέπεις τους πόντους σου και τις καμπάνιες που συμμετέχεις.', + BADGE_READ:'Μάθε περισσότερα για το σήμα σου εδώ.' }, WIZARD: { NEXT_STEP: 'Επόμενο Βήμα', diff --git a/src/app/core/services/static_content.service.ts b/src/app/core/services/static_content.service.ts index a4edcfe4..fd5776e1 100644 --- a/src/app/core/services/static_content.service.ts +++ b/src/app/core/services/static_content.service.ts @@ -54,6 +54,10 @@ export class StaticContentService {//extends IStaticContentService { }) } + getWPContent(pageId): Observable { + return this.http.get(environment.staticUrl + "/pages/" + pageId); + } + // return new Promise((resolve) => { // // this.http.get(`${environment.apiUrl}/content`).subscribe((response) => { // // this.content$ = response['data']; diff --git a/src/app/member-menu/member-dashboard/member-dashboard.component.html b/src/app/member-menu/member-dashboard/member-dashboard.component.html index 6dc7cf6c..3cfc4ea6 100644 --- a/src/app/member-menu/member-dashboard/member-dashboard.component.html +++ b/src/app/member-menu/member-dashboard/member-dashboard.component.html @@ -6,10 +6,26 @@ + + {{'MEMBER.DASHBOARD.BADGE_READ' | translate}} + +
+ +
+

+
+
+
+ + + +
@@ -17,7 +33,10 @@ - {{'MEMBER.DASHBOARD.WALLET_TITLE' | translate}} + +

{{'MEMBER.DASHBOARD.WALLET_TITLE' | translate}}

+ {{'MEMBER.DASHBOARD.WALLET_DESC' | translate}} +
diff --git a/src/app/member-menu/member-dashboard/member-dashboard.component.scss b/src/app/member-menu/member-dashboard/member-dashboard.component.scss index 5f794ac9..57c6d38a 100644 --- a/src/app/member-menu/member-dashboard/member-dashboard.component.scss +++ b/src/app/member-menu/member-dashboard/member-dashboard.component.scss @@ -24,10 +24,22 @@ } } +.badge-more{ + text-decoration: underline; + cursor: pointer; + &:hover{ + color:$primary; + } +} + .wallet-card { &-header { border-bottom: 2px solid #eee; margin-bottom: 10px; + span{ + font-size: 15px; + color:#707070; + } } &-icon { diff --git a/src/app/member-menu/member-dashboard/member-dashboard.component.ts b/src/app/member-menu/member-dashboard/member-dashboard.component.ts index 5a470fe1..dea327b3 100644 --- a/src/app/member-menu/member-dashboard/member-dashboard.component.ts +++ b/src/app/member-menu/member-dashboard/member-dashboard.component.ts @@ -1,38 +1,85 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; - +import { Component, OnInit, OnDestroy, ViewChild, HostListener } from '@angular/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; /** * Environment */ import { environment } from '../../../environments/environment'; @Component({ - selector: 'app-member-dashboard', - templateUrl: './member-dashboard.component.html', - styleUrls: ['./member-dashboard.component.scss'] + selector: 'app-member-dashboard', + templateUrl: './member-dashboard.component.html', + styleUrls: ['./member-dashboard.component.scss'] }) export class MemberDashboardComponent implements OnInit, OnDestroy { + /** + * Children Modals + */ + @ViewChild('badgeModal') badgeModal: NgbModalRef; + + + /** * Configuration and Static Data */ - public configAccess: Boolean[] = environment.access; + public configAccess: Boolean[] = environment.access; /** * Component Constructor - * + * @param modalService: NgbModal */ - constructor() { } + constructor( + private modalService: NgbModal, + ) { } /** * On Init */ - ngOnInit() { - } + ngOnInit() { + } /** * On Destroy */ - ngOnDestroy() { + ngOnDestroy() { + } + + /** + * Close Modal on Browser Back Button + */ + controlModalState(state: boolean): void { + if (state) { + const modalState = { + modal: true, + desc: 'MemberDashboardModals' + }; + history.pushState(modalState, null); + } else { + if (window.history.state.modal) { + history.back(); + } + } + } + + @HostListener('window:popstate') + dismissModal(): void { + if (this.modalService.hasOpenModals()) { + this.modalService.dismissAll(); + this.controlModalState(false); + } + } + + /** + * Open Badge Modal + */ + openBadgeExplainer(): void { + this.controlModalState(true); + this.modalService.open(this.badgeModal) + .result.then( + () => { this.controlModalState(false); console.log('closed'); }, + () => { this.controlModalState(false); console.log('dismissed'); }); } -} \ No newline at end of file + + +} diff --git a/src/assets/media/images/ranking-1.png b/src/assets/media/images/ranking-1.png index 69096442..6eb5bcd3 100644 Binary files a/src/assets/media/images/ranking-1.png and b/src/assets/media/images/ranking-1.png differ diff --git a/src/assets/media/images/ranking-2.png b/src/assets/media/images/ranking-2.png index 7e1eadf7..35b72e1b 100644 Binary files a/src/assets/media/images/ranking-2.png and b/src/assets/media/images/ranking-2.png differ diff --git a/src/assets/media/images/ranking-3.png b/src/assets/media/images/ranking-3.png index a4f1eeab..9d5368e2 100644 Binary files a/src/assets/media/images/ranking-3.png and b/src/assets/media/images/ranking-3.png differ diff --git a/src/index.html b/src/index.html index 4596d9a7..fc3f26b2 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - Synergy Wallet + App -Synergatika.gr | Εμπορική Κοινότητα Συνεργατικών @@ -23,4 +23,4 @@ if (global === undefined) { var global = window; } - \ No newline at end of file +