Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B-06172 Host Console update bandwidth to data transfer #116

Merged
merged 3 commits into from
Oct 23, 2023
Merged

B-06172 Host Console update bandwidth to data transfer #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5173aca
rename bandwidth to data trasfer. add kyc mock endpoint
Paterick Oct 19, 2023
ae67690
update ui-common-lib. rename bandwidth to date transfer
Paterick Oct 19, 2023
1acae9f
hide storage pricing
Paterick Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion mock-hpos-api/defaultResponse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,13 @@ const holoNixpkgs = {
}
}

const mockKycData = {
"kyc": 'holo_kyc_2'
}

const mockHostPreferences = {
}

// NB: both /api and /holochain-api calls are mocked here
const data = {
get: {
Expand All @@ -544,7 +551,9 @@ const data = {
'/holochain-api/v1/host_earnings': earnings,
'/holochain-api/v1/core_app_version': coreAppVersion,
'/holochain-api/v1/host_invoices': mockPaidInvoicesData,
'/holochain-api/v1/redemptions': mockRedemptionHistoryData
'/holochain-api/v1/host_preferences': mockHostPreferences,
'/holochain-api/v1/redemptions': mockRedemptionHistoryData,
'/holochain-api/v1/kyc': mockKycData
},
put: {
'/api/v1/config': (args) => args,
Expand Down
8 changes: 6 additions & 2 deletions src/components/dashboard/UsageCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const isError = computed((): boolean => isErrorPredicate(props.data) && !!props.
</span>
</div>

<div class="info-row daily-row inactive">
<div class="info-row daily-row inactive hidden">
<span class="daily-label">
{{ $t('$.storage') }}
</span>
Expand All @@ -78,7 +78,7 @@ const isError = computed((): boolean => isErrorPredicate(props.data) && !!props.
</div>
<div class="info-row daily-row">
<span class="daily-label">
{{ $t('$.bandwidth') }}
{{ $t('$.data_transfer') }}
</span>
<span class="bold">{{ presentBytes(props.data ? props.data.totalUsage?.bandwidth : 0) }}
</span>
Expand Down Expand Up @@ -121,6 +121,10 @@ const isError = computed((): boolean => isErrorPredicate(props.data) && !!props.
margin: 0 0 20px;
}

.hidden {
display: none;
}

@media screen and (max-width: 1050px) {
/* Hiding hosting preferences link in mobile view as dictated in the designs */
.hosting-preferences {
Expand Down
9 changes: 1 addition & 8 deletions src/components/settings/hostingPreferences/PricesSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,7 @@ const prices = computed((): PriceItem[] => [
isDisabled: true
},
{
label: t('$.storage'),
value: props.data.storage ? formatPrice(props.data.storage).value : 0,
unit: props.data.storage ? formatPrice(props.data.storage).unit : '',
prop: 'storage',
isDisabled: true
},
{
label: t('$.bandwidth'),
label: t('$.data_transfer'),
value: props.data.bandwidth ? formatPrice(props.data.bandwidth).value : 0,
unit: props.data.bandwidth ? formatPrice(props.data.bandwidth).unit : '',
prop: 'bandwidth',
Expand Down
2 changes: 1 addition & 1 deletion ui-common-library
Open in desktop
Submodule ui-common-library updated 18 files
+1 −0 package.json
+2 −1 src/components/Dropdown.vue
+94 −0 src/components/GoToSpringboardModal.vue
+6 −4 src/components/HAppCard.vue
+7 −7 src/components/HAppCardUsage.vue
+39 −0 src/components/icons/ChainIcon.vue
+53 −0 src/components/icons/ClockIcon.vue
+36 −0 src/components/icons/LeftChevronIcon.vue
+1 −1 src/locales/en.js
+44 −0 src/services/hbs.js
+10 −2 src/stores/useClientStore.js
+23 −8 src/stores/useHoloStore.js
+116 −21 src/stores/useHolochainStore.js
+8 −0 src/utils/consts.js
+48 −0 src/utils/hbsConfiguration.js
+41 −0 src/utils/httpProvider.js
+7 −0 src/utils/index.js
+16 −0 src/utils/springboardConfiguration.js