-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #59 from synergatika/feature/display
Feature/display
- Loading branch information
Showing
11 changed files
with
142 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,4 @@ | ||
| <div class="col-xl-12"> | ||
| <div class="col-xl-12"> | ||
| <!-- <h1 mat-dialog-title>Favorite Animal</h1> | ||
| <h2 mat-dialog-title>Install Angular</h2> --> | ||
| <!-- <mat-dialog-content> --> | ||
| <h2><strong>Terms and Conditions</strong></h2> | ||
| <p>Welcome to Synergy Web App!</p> | ||
| <p>These terms and conditions outline the rules and regulations for the use of Synergy's Website, | ||
| located at app.synergatika.gr.</p> | ||
| <p>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. | ||
| </p> | ||
| <p>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.</p> | ||
| <h3><strong>Cookies</strong></h3> | ||
| <p>We employ the use of cookies. By accessing Synergy Web App, you agreed to use cookies in | ||
| agreement with the Synergy's Privacy Policy.</p> | ||
| <p>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.</p> | ||
| <!-- </mat-dialog-content> --> | ||
| <!-- <mat-dialog-actions> | ||
| <button mat-button mat-dialog-close>Cancel</button> | ||
| <button mat-button [mat-dialog-close]="true" cdkFocusInitial>Agree</button> | ||
| </mat-dialog-actions> --> | ||
| <div class="terms-container" *ngIf="content"> | ||
| <div class="col-xl-12" [innerHTML]="content"> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<any>; | ||
| 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() { | ||
|
|
||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 59 additions & 12 deletions
71
src/app/member-menu/member-dashboard/member-dashboard.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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'); }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters