diff --git a/backend/src/api/donations.ts b/backend/src/api/donations.ts index efde7116a..7d7b81b0d 100644 --- a/backend/src/api/donations.ts +++ b/backend/src/api/donations.ts @@ -93,7 +93,7 @@ class Donations { async $getDonationsFromDatabase() { try { const connection = await DB.pool.getConnection(); - const query = `SELECT handle, imageUrl FROM donations WHERE handle != '' ORDER BY id ASC`; + const query = `SELECT handle, imageUrl FROM donations WHERE handle != '' ORDER BY id DESC`; const [rows] = await connection.query(query); connection.release(); return rows; diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 6e57b0bd9..e616fd379 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -1,11 +1,9 @@

- +

-

Mempool Open Source Project

-
@@ -31,25 +29,26 @@

Maintainers

-
-
-
- -
@softsimon_ +
+
+ +
+ @softsimon_ +

Development
-
-
- - @wiz +
+ +
+ @wiz +

Operations
-

Sponsors

@@ -58,10 +57,15 @@
-
+ + + +
+
+


- +

Navigate to https://mempool.space/about to sponsor

@@ -94,7 +98,9 @@
- + + +

{{ donationObj.address }}

diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index 1917fd536..fb95e701c 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -9,7 +9,6 @@ height: 80px; background-size: 100%, 100%; border-radius: 50%; - cursor: pointer; margin: 10px; } diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 7e8eaefca..a239adf46 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -6,6 +6,7 @@ import { Observable } from 'rxjs'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ApiService } from 'src/app/services/api.service'; import { env } from '../../app.constants'; +import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; @Component({ selector: 'app-about', @@ -20,6 +21,7 @@ export class AboutComponent implements OnInit { donationObj: any; sponsorsEnabled = env.SPONSORS_ENABLED; sponsors = null; + bitcoinUrl: SafeUrl; constructor( private websocketService: WebsocketService, @@ -27,6 +29,7 @@ export class AboutComponent implements OnInit { private stateService: StateService, private formBuilder: FormBuilder, private apiService: ApiService, + private sanitizer: DomSanitizer, ) { } ngOnInit() { @@ -59,11 +62,8 @@ export class AboutComponent implements OnInit { .subscribe((response) => { this.websocketService.trackDonation(response.id); this.donationObj = response; + this.bitcoinUrl = this.sanitizer.bypassSecurityTrustUrl('bitcoin:' + this.donationObj.address + '?amount=' + this.donationObj.amount); this.donationStatus = 3; }); } - - openTwitterProfile(handle: string) { - window.open('https://twitter.com/' + handle, '_blank'); - } } diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 65809e329..80ecd9e96 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -52,7 +52,7 @@ -