diff --git a/web/satellite/src/api/payments.ts b/web/satellite/src/api/payments.ts index a484507c6..681c92640 100644 --- a/web/satellite/src/api/payments.ts +++ b/web/satellite/src/api/payments.ts @@ -269,7 +269,7 @@ export class PaymentsHttpApi implements PaymentsApi { throw new ErrorUnauthorized(); } - throw new Error('can not process coin payment'); + throw new Error('can not get paywall status'); } return await response.json(); diff --git a/web/satellite/src/components/navigation/navigationArea.scss b/web/satellite/src/components/navigation/navigationArea.scss index 8b296b9e9..f0e736f4c 100644 --- a/web/satellite/src/components/navigation/navigationArea.scss +++ b/web/satellite/src/components/navigation/navigationArea.scss @@ -180,11 +180,3 @@ a { height: calc(100vh - 70px); } } - -@media screen and (max-height: 700px) { - - .navigation-area { - padding: 20px 0; - height: calc(100vh - 40px); - } -} diff --git a/web/satellite/src/components/noPaywallInfoBar/NoPaywallInfoBar.vue b/web/satellite/src/components/noPaywallInfoBar/NoPaywallInfoBar.vue new file mode 100644 index 000000000..56d177d24 --- /dev/null +++ b/web/satellite/src/components/noPaywallInfoBar/NoPaywallInfoBar.vue @@ -0,0 +1,53 @@ +// Copyright (C) 2020 Storj Labs, Inc. +// See LICENSE for copying information. + + + + + + diff --git a/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.html b/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.html new file mode 100644 index 000000000..b62c31656 --- /dev/null +++ b/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.html @@ -0,0 +1,18 @@ + + + +
diff --git a/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.scss b/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.scss new file mode 100644 index 000000000..d1f87baa6 --- /dev/null +++ b/web/satellite/src/components/noPaywallInfoBar/noPaywallInfoBar.scss @@ -0,0 +1,39 @@ +// Copyright (C) 2020 Storj Labs, Inc. +// See LICENSE for copying information. + +.no-paywall-bar { + width: calc(100% - 60px); + padding: 0 30px; + display: flex; + align-items: center; + justify-content: space-between; + font-family: 'font_regular', sans-serif; + + &__message, + &__link { + font-weight: normal; + font-size: 14px; + line-height: 12px; + color: #fff; + + &__bold { + margin-right: 5px; + } + } + + &__link { + font-family: 'font_medium', sans-serif; + } +} + +.blue { + background-color: #2582ff; +} + +.orange { + background-color: #e67c00; +} + +.red { + background-color: #e43e3e; +} diff --git a/web/satellite/src/components/onboardingTour/OnboardingTourArea.vue b/web/satellite/src/components/onboardingTour/OnboardingTourArea.vue index 8a9c404da..a8662a995 100644 --- a/web/satellite/src/components/onboardingTour/OnboardingTourArea.vue +++ b/web/satellite/src/components/onboardingTour/OnboardingTourArea.vue @@ -65,7 +65,6 @@ import CloseImage from '@/../static/images/onboardingTour/close.svg'; import { RouteConfig } from '@/router'; import { TourState } from '@/utils/constants/onboardingTourEnums'; -import { MetaUtils } from '@/utils/meta'; @Component({ components: { @@ -123,7 +122,7 @@ export default class OnboardingTourArea extends Vue { * Indicates if paywall is enabled. */ public get isPaywallEnabled(): boolean { - return this.$store.state.paymentsModule.paywallEnabled; + return this.$store.state.paymentsModule.isPaywallEnabled; } /** diff --git a/web/satellite/src/store/modules/payments.ts b/web/satellite/src/store/modules/payments.ts index 5ce6d0de9..ac3887f9b 100644 --- a/web/satellite/src/store/modules/payments.ts +++ b/web/satellite/src/store/modules/payments.ts @@ -88,7 +88,7 @@ export class PaymentsState { public priceSummary: number = 0; public startDate: Date = new Date(); public endDate: Date = new Date(); - public paywallEnabled: boolean = true; + public isPaywallEnabled: boolean = true; } /** @@ -154,7 +154,7 @@ export function makePaymentsModule(api: PaymentsApi): StoreModule