Skip to content

Add missing interaction to trial tag #366

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

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Add missing interaction to trial tag #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753c8c2
Add missing interaction to trial tag
joanagmaia Dec 19, 2022
5f13aee
Refactor trial badge to use router-link
joanagmaia Dec 19, 2022
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
4 changes: 4 additions & 0 deletions frontend/src/assets/scss/badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,9 @@

&--light-yellow {
@apply bg-yellow-50 text-yellow-600;

&:hover {
@apply bg-yellow-100;
}
}
}
22 changes: 15 additions & 7 deletions frontend/src/modules/layout/components/workspace-dropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,21 @@
</div>
<div class="text-gray-500 text-2xs">
{{ getPlan(currentTenant.plan) }}
<span
v-if="getTrialDate(currentTenant)"
class="badge badge--xs badge--light-yellow ml-1"
>{{
getTrialDate(currentTenant)
}}</span
<router-link
:to="{
name: 'settings',
query: { activeTab: 'plans' }
}"
@click.stop
>
<span
v-if="getTrialDate(currentTenant)"
class="badge badge--xs badge--light-yellow ml-1 hover:cursor-pointer"
>{{
getTrialDate(currentTenant)
}}</span
>
</router-link>
</div>
</div>
</div>
Expand Down Expand Up @@ -129,7 +137,7 @@ export default {
<script setup>
import { useStore } from 'vuex'
import { computed, onMounted, ref, watch } from 'vue'
import AppTenantListDrawer from '@/modules/tenant/components/tenant-list-drawer'
import AppTenantListDrawer from '@/modules/tenant/components/tenant-list-drawer.vue'
import config from '@/config'
import { getTrialDate } from '@/utils/date'

Expand Down