diff --git a/satellite/satellitedb/migrate.go b/satellite/satellitedb/migrate.go index ed8dc9a3c4df..faa18b088193 100644 --- a/satellite/satellitedb/migrate.go +++ b/satellite/satellitedb/migrate.go @@ -2652,7 +2652,8 @@ func (db *satelliteDB) ProductionMigration() *migrate.Migration { Description: "update storjscan payments table to use chain_id in primary key", Version: 261, Action: migrate.SQL{ - `ALTER TABLE storjscan_payments DROP CONSTRAINT storjscan_payments_pkey;`, + `ALTER TABLE storjscan_payments DROP CONSTRAINT IF EXISTS "primary";`, + `ALTER TABLE storjscan_payments DROP CONSTRAINT IF EXISTS storjscan_payments_pkey;`, `ALTER TABLE storjscan_payments ADD CONSTRAINT storjscan_payments_pkey PRIMARY KEY ( chain_id, block_hash, log_index );`, }, }, diff --git a/web/satellite/src/components/AddCreditCardComponent.vue b/web/satellite/src/components/AddCreditCardComponent.vue index 31229d4f19fb..d102ca405a90 100644 --- a/web/satellite/src/components/AddCreditCardComponent.vue +++ b/web/satellite/src/components/AddCreditCardComponent.vue @@ -2,9 +2,9 @@ // See LICENSE for copying information. - + Shared Projects diff --git a/web/satellite/src/plugins/theme.ts b/web/satellite/src/plugins/theme.ts index 8745af4277d7..efde115da0c9 100644 --- a/web/satellite/src/plugins/theme.ts +++ b/web/satellite/src/plugins/theme.ts @@ -9,8 +9,8 @@ export const THEME_OPTIONS: ThemeOptions = { themes: { light: { colors: { - primary: '#0149FF', - secondary: '#0218A7', + primary: '#0052FF', + secondary: '#091C45', background: '#FFF', surface: '#FFF', info: '#0059D0', @@ -19,39 +19,41 @@ export const THEME_OPTIONS: ThemeOptions = { warning: '#FF7F00', error: '#FF0149', purple: '#7B61FF', + purple2: '#502EFF', blue7: '#090920', blue6: '#091c45', blue5: '#0218A7', blue4: '#0059D0', blue2: '#003ACD', yellow: '#FFC600', - yellow2: '#FFB701', + yellow2: '#FFB018', orange: '#FFA800', - green: '#00B150', - purple2: '#502EFF', + green: '#00E366', + paragraph: '#283968', + }, }, dark: { colors: { - primary: '#0149FF', + primary: '#0052FF', secondary: '#537CFF', - background: '#090920', + background: '#090927', success: '#00AC26', help: '#FFC600', error: '#FF0149', - surface: '#090920', + surface: '#090927', purple: '#A18EFF', + purple2: '#A18EFF', blue7: '#090920', blue6: '#091c45', blue5: '#2196f3', blue4: '#0059D0', blue2: '#003ACD', yellow: '#FFC600', - yellow2: '#FFB701', + yellow2: '#FFB018', orange: '#FFA800', warning: '#FF8A00', - green: '#00e366', - purple2: '#A18EFF', + green: '#00E366', }, }, }, diff --git a/web/satellite/src/styles/styles.scss b/web/satellite/src/styles/styles.scss index 6543cc1ad609..6915315891f2 100644 --- a/web/satellite/src/styles/styles.scss +++ b/web/satellite/src/styles/styles.scss @@ -1,4 +1,4 @@ -// Copyright (C) 2023 Storj Labs, Inc. +// Copyright (C) 2024 Storj Labs, Inc. // See LICENSE for copying information. @import './variables'; @@ -22,9 +22,9 @@ body { --v-border-color: 0, 0, 0; --v-theme-overlay-multiplier: 0.75 !important; --v-border-opacity: 0.09 !important; - // --v-theme-on-background: var(--v-theme-blue6) !important; - --v-theme-on-background: var(--v-theme-blue7) !important; - --v-theme-on-surface: var(--v-theme-blue7) !important; + --v-theme-on-background: var(--v-theme-secondary) !important; + --v-theme-on-surface: var(--v-theme-secondary) !important; + --v-theme-surface-variant: var(--v-theme-secondary) !important; } // Dark Theme @@ -34,6 +34,18 @@ body { --v-theme-on-surface-variant: 70,70,70 !important; } +h1,h2,h3,h4,h5,h6 { + font-weight: 800 !important; +} + +.v-theme--light p { + color: var(--v-theme-paragraph) !important; +} + +.font-weight-bold { + font-weight: 800 !important; +} + // Nav .v-app-bar.v-toolbar { border-bottom: 1px solid rgba(var(--v-border-color), var(--v-border-opacity)); @@ -119,7 +131,10 @@ body { // Menu list item .v-list-item--active .v-list-item-title { - font-weight: 700 !important; + font-weight: 800 !important; +} +.v-list-item-subtitle { + opacity: 1 !important; } // Select Input Menu @@ -161,11 +176,15 @@ body { // Cards Title .v-card-item .v-card-title { - font-weight: 700; + font-weight: 800; font-size: 1.1rem; letter-spacing: 0; } +.v-card-subtitle { + opacity: 1; +} + // Cards Hover .v-card--hover:hover { box-shadow: 0 5px 5px -3px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, .1)), 0 8px 10px 1px var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, .07)), 0 3px 14px 2px var(--v-shadow-key-ambient-opacity, rgba(0, 0, 0, .05)); @@ -306,7 +325,7 @@ table { color: rgb(var(--v-theme-secondary)); } .v-theme--dark .link:hover { - color: rgb(var(--v-theme-info)); + color: rgb(var(--v-theme-on-background)); } @@ -347,7 +366,7 @@ table { // Alerts .v-alert-title { - font-weight: bold !important; + font-weight: 800 !important; letter-spacing: 0 !important; } .v-alert__prepend { diff --git a/web/satellite/src/types/projects.ts b/web/satellite/src/types/projects.ts index 6c14d62a1e5b..9c124d005953 100644 --- a/web/satellite/src/types/projects.ts +++ b/web/satellite/src/types/projects.ts @@ -370,7 +370,7 @@ export type ProjectItemRole = Exclude; * PROJECT_ROLE_COLORS defines what colors project role tags should use. */ export const PROJECT_ROLE_COLORS: Record = { - [ProjectRole.Member]: 'green', + [ProjectRole.Member]: 'success', [ProjectRole.Owner]: 'secondary', [ProjectRole.Invited]: 'warning', [ProjectRole.InviteExpired]: 'error', diff --git a/web/satellite/src/views/Billing.vue b/web/satellite/src/views/Billing.vue index 124b01b44619..de97aeada21d 100644 --- a/web/satellite/src/views/Billing.vue +++ b/web/satellite/src/views/Billing.vue @@ -53,7 +53,7 @@ - + {{ centsToDollars(priceSummary) }} @@ -68,7 +68,7 @@ - + {{ formattedAccountBalance }} @@ -101,7 +101,7 @@ > { }); function onAddTokensClicked(): void { + if (!usersStore.state.user.paidTier) { + appStore.toggleUpgradeFlow(true); + return; + } + tab.value = TABS['payment-methods']; tokenCardComponent.value?.onAddTokens(); } diff --git a/web/satellite/src/views/Dashboard.vue b/web/satellite/src/views/Dashboard.vue index e72bc9a8d765..0641460103f4 100644 --- a/web/satellite/src/views/Dashboard.vue +++ b/web/satellite/src/views/Dashboard.vue @@ -38,16 +38,16 @@ - + - + - + @@ -75,7 +75,7 @@ > Click to learn more - + @@ -105,7 +105,7 @@ :limit="`Limit: ${usedLimitFormatted(limits.bandwidthLimit)} per month`" :available="`${usedLimitFormatted(availableEgress)} Available`" :cta="getCTALabel(egressUsedPercent)" - extra-info="Your download usage limit is applied only for the current billing period." + extra-info="The download usage is only for the current billing period of one month." @cta-click="onNeedMoreClicked(LimitToChange.Bandwidth)" /> diff --git a/web/satellite/src/views/Signup.vue b/web/satellite/src/views/Signup.vue index 46c336c79f5a..d5e98dbb75d5 100644 --- a/web/satellite/src/views/Signup.vue +++ b/web/satellite/src/views/Signup.vue @@ -143,7 +143,7 @@