diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 000a0f177..1d6d58e2b 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -15,7 +15,6 @@ import { TermsOfServiceComponent } from './components/terms-of-service/terms-of- import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; import { TrademarkPolicyComponent } from './components/trademark-policy/trademark-policy.component'; import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-master-page.component'; -import { SponsorComponent } from './components/sponsor/sponsor.component'; import { PushTransactionComponent } from './components/push-transaction/push-transaction.component'; import { BlocksList } from './components/blocks-list/blocks-list.component'; import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component'; @@ -373,10 +372,6 @@ let routes: Routes = [ path: 'status', component: StatusViewComponent }, - { - path: 'sponsor', - component: SponsorComponent, - }, { path: '', loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule) @@ -642,10 +637,6 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') { path: 'status', component: StatusViewComponent }, - { - path: 'sponsor', - component: SponsorComponent, - }, { path: '', loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e09eddc78..e4736cc9e 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -27,8 +27,8 @@

diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index a373683c6..8ede1406f 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -65,6 +65,10 @@ height: 45px; width: 100%; } + img { + width: 67px; + height: 67px; + } } .alliances { diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 4f348fbbf..693be2d34 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -61,9 +61,9 @@ export class AboutComponent implements OnInit { ); } - sponsor() { + sponsor(): void { if (this.officialMempoolSpace && this.stateService.env.BASE_MODULE === 'mempool') { - this.router.navigateByUrl('/sponsor'); + this.router.navigateByUrl('/enterprise'); } else { this.showNavigateToSponsor = true; } diff --git a/frontend/src/app/components/sponsor/sponsor.component.html b/frontend/src/app/components/sponsor/sponsor.component.html deleted file mode 100644 index 2e1dae48e..000000000 --- a/frontend/src/app/components/sponsor/sponsor.component.html +++ /dev/null @@ -1,157 +0,0 @@ -
- - - - -
diff --git a/frontend/src/app/components/sponsor/sponsor.component.scss b/frontend/src/app/components/sponsor/sponsor.component.scss deleted file mode 100644 index e485a97d9..000000000 --- a/frontend/src/app/components/sponsor/sponsor.component.scss +++ /dev/null @@ -1,133 +0,0 @@ -.sponsor-page { - text-align: center; -} - -.qr-wrapper { - background-color: #FFF; - padding: 10px; - display: inline-block; - padding-bottom: 5px; - margin: 20px auto 0px; -} - -.info-group { - max-width: 400px; -} - -.card { - width: 240px; - height: 220px; - background-color: #1d1f31; - border: 2px solid #1d1f31; - cursor: pointer; - position: relative; - transition: 100ms all; - margin: 30px 30px 20px 30px; - @media(min-width: 476px) { - margin: 30px 100px 20px 100px; - } - @media(min-width: 851px) { - margin: 60px 20px 40px 20px; - } - - .card-title { - font-weight: bold; - span { - font-weight: 100; - } - } - - &.bigger { - height: 220px; - width: 240px; - margin-top: 40px; - } - - &:hover { - background-color: #5058926b; - border: 2px solid #505892; - transform: scale(1.1) translateY(-10px); - margin-top: 70px; - - .card-header { - background-color: #505892; - } - } -} - -.donation-form { - max-width: 280px; - margin: auto; - button { - width: 100%; - } -} - -.card-header { - background-color: #171929; -} - -.flex-container { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; -} - -.middle-card { - width: 280px; - height: 260px; - margin-top: 40px; - &:hover { - margin-top: 50px; - } -} - -.shiny-border { - background-color: #5058926b; - border: 2px solid #505892; - transform: scale(1.1) translateY(-10px); - margin-top: 70px; - box-shadow: 0px 0px 100px #9858ff52; - .card-header { - background-color: #505892; - } - - &.middle-card { - margin-top: 50px; - } -} - -.input-group { - margin: 20px auto; -} - -.donation-confirmed { - h2 { - margin-top: 50px; - span { - display: block; - &:last-child { - color: #9858ff; - font-weight: bold; - font-size: 2rem; - } - } - } - - .order-details { - margin-top: 50px; - span { - color: #d81b60; - margin-left: 10px; - } - } -} - -.card-body { - align-items: center; - display: flex; - justify-content: center; - flex-direction: column; - height: 100%; -} \ No newline at end of file diff --git a/frontend/src/app/components/sponsor/sponsor.component.ts b/frontend/src/app/components/sponsor/sponsor.component.ts deleted file mode 100644 index f5f95debc..000000000 --- a/frontend/src/app/components/sponsor/sponsor.component.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; -import { Subscription } from 'rxjs'; -import { delay, retryWhen, switchMap, tap } from 'rxjs/operators'; -import { ApiService } from 'src/app/services/api.service'; -import { SeoService } from 'src/app/services/seo.service'; -import { StateService } from 'src/app/services/state.service'; -import { WebsocketService } from 'src/app/services/websocket.service'; - -@Component({ - selector: 'app-sponsor', - templateUrl: './sponsor.component.html', - styleUrls: ['./sponsor.component.scss'] -}) -export class SponsorComponent implements OnInit, OnDestroy { - sponsorsEnabled = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; - donationForm: FormGroup; - paymentForm: FormGroup; - requestSubscription: Subscription | undefined; - donationObj: any; - donationStatus = 1; - - constructor( - private formBuilder: FormBuilder, - private apiService: ApiService, - private sanitizer: DomSanitizer, - private stateService: StateService, - private websocketService: WebsocketService, - private seoService: SeoService, - ) { } - - ngOnInit(): void { - this.seoService.setTitle($localize`:@@dfd99c62b5b308fc5b1ad7adbbf9d526d2b31516:Sponsor`); - this.websocketService.want(['blocks']); - - this.paymentForm = this.formBuilder.group({ - 'method': 'chain' - }); - - this.donationForm = this.formBuilder.group({ - selection: [0.01], - handle: [''], - }); - } - - submitDonation() { - if (this.donationForm.invalid) { - return; - } - this.requestSubscription = this.apiService.requestDonation$( - this.donationForm.get('selection').value, - this.donationForm.get('handle').value - ) - .pipe( - tap((response) => { - this.donationObj = response; - this.donationStatus = 2; - }), - switchMap(() => this.apiService.checkDonation$(this.donationObj.id) - .pipe( - retryWhen((errors) => errors.pipe(delay(2000))) - ) - ) - ).subscribe(() => { - this.donationStatus = 3; - /* - if (this.donationForm.get('handle').value) { - this.sponsors.unshift({ handle: this.donationForm.get('handle').value }); - } - */ - }); - } - - setSelection(amount: number): void { - this.donationForm.get('selection').setValue(amount); - } - - bypassSecurityTrustUrl(text: string): SafeUrl { - return this.sanitizer.bypassSecurityTrustUrl(text); - } - - ngOnDestroy() { - if (this.requestSubscription) { - this.requestSubscription.unsubscribe(); - } - } -} diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index ac9de747e..ce131bb02 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -64,7 +64,6 @@ import { DifficultyComponent } from '../components/difficulty/difficulty.compone import { TermsOfServiceComponent } from '../components/terms-of-service/terms-of-service.component'; import { PrivacyPolicyComponent } from '../components/privacy-policy/privacy-policy.component'; import { TrademarkPolicyComponent } from '../components/trademark-policy/trademark-policy.component'; -import { SponsorComponent } from '../components/sponsor/sponsor.component'; import { PushTransactionComponent } from '../components/push-transaction/push-transaction.component'; import { AssetsFeaturedComponent } from '../components/assets/assets-featured/assets-featured.component'; import { AssetGroupComponent } from '../components/assets/asset-group/asset-group.component'; @@ -139,7 +138,6 @@ import { ToggleComponent } from './components/toggle/toggle.component'; TermsOfServiceComponent, PrivacyPolicyComponent, TrademarkPolicyComponent, - SponsorComponent, PushTransactionComponent, AssetsNavComponent, AssetsFeaturedComponent, @@ -242,7 +240,6 @@ import { ToggleComponent } from './components/toggle/toggle.component'; TermsOfServiceComponent, PrivacyPolicyComponent, TrademarkPolicyComponent, - SponsorComponent, PushTransactionComponent, AssetsNavComponent, AssetsFeaturedComponent,