Skip to content

Commit

Permalink
Revert removing billing
Browse files Browse the repository at this point in the history
  • Loading branch information
TatianaFomina committed Oct 29, 2024
1 parent a19d84b commit 4aa96a9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
4 changes: 3 additions & 1 deletion src/components/aside/WorkspaceInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
<router-link
v-if="isAdmin"
:to="{
name: 'workspace-settings-used-volume', params: {workspaceId: workspace.id} }"
name: 'workspace-settings-billing',
params: { workspaceId: workspace.id },
}"
>
<CircleProgress
ref="events-count-circle"
Expand Down
8 changes: 8 additions & 0 deletions src/components/workspace/settings/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
<!-- >-->
<!-- {{ $t('workspaces.settings.billing.title') }}-->
<!-- </router-link>-->
<router-link
v-if="isAdmin"
class="settings-window__menu-item workspace-settings__menu-item"
:to="{ name: 'workspace-settings-billing', params: {workspaceId: workspace.id} }"
>
{{ $t('workspaces.settings.billing.title') }}
</router-link>

<router-link
v-if="isAdmin"
class="settings-window__menu-item workspace-settings__menu-item"
Expand Down
16 changes: 8 additions & 8 deletions src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ const router = new Router({
name: 'account-notifications',
component: () => import(/* webpackChunkName: 'settings' */'./components/account/settings/Notifications.vue'),
},
// {
// path: 'billing',
// name: 'account-billing',
// component: () => import(/* webpackChunkName: 'settings' */'./components/account/settings/Billing.vue'),
// },
{
path: 'billing',
name: 'account-billing',
component: () => import(/* webpackChunkName: 'settings' */'./components/account/settings/Billing.vue'),
},
],
},
/**
Expand Down Expand Up @@ -92,7 +92,7 @@ const router = new Router({
{
path: 'billing',
name: 'workspace-settings-billing',
component: () => import(/* webpackChunkName: 'workspace-billing' */ './components/workspace/settings/UsedVolume.vue'),
component: () => import(/* webpackChunkName: 'workspace-billing' */ './components/workspace/settings/Billing.vue'),
},
],
},
Expand Down Expand Up @@ -235,7 +235,7 @@ router.beforeEach((to, from, next) => {
* Try to get user id
*/
if (store.state.user && store.state.user.data && store.state.user.data.id) {
Analytics.setUserId(store.state.user.data.id);
Analytics?.setUserId(store.state.user.data.id);
}

/**
Expand All @@ -248,7 +248,7 @@ router.beforeEach((to, from, next) => {
/**
* Track event
*/
Analytics.track(AnalyticsEventType.PageVisited, eventProperties);
Analytics?.track(AnalyticsEventType.PageVisited, eventProperties);
} catch (e) {
console.error(e);
}
Expand Down

0 comments on commit 4aa96a9

Please sign in to comment.