Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Apr 23, 2024
2 parents 93bd7b5 + f04a732 commit 2f32868
Show file tree
Hide file tree
Showing 90 changed files with 790 additions and 213 deletions.
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/VFab.json
@@ -1,6 +1,7 @@
{
"props": {
"app": "If true, attaches to the closest layout and positions according to the value of **location**.",
"layout": "If true, will effect layout dimensions based on size and position.",
"appear": "Used to control the animation of the FAB.",
"extended": "An alternate style for the FAB that expects text.",
"location": "The location of the fab relative to the layout. Only works when using **app**.",
Expand Down
6 changes: 6 additions & 0 deletions packages/api-generator/src/locale/en/VSnackbarQueue.json
@@ -0,0 +1,6 @@
{
"props": {
"closable": "Adds a dismiss button that closes the active snackbar.",
"closeText": "The text used in the close button when using the **closable** prop."
}
}
10 changes: 0 additions & 10 deletions packages/docs/components.d.ts
Expand Up @@ -24,8 +24,6 @@ declare module 'vue' {
ApiSection: typeof import('./src/components/api/Section.vue')['default']
ApiSlotsTable: typeof import('./src/components/api/SlotsTable.vue')['default']
AppBackToTop: typeof import('./src/components/app/BackToTop.vue')['default']
AppBanner: typeof import('./src/components/app/Banner.vue')['default']
AppBarAuthDialog: typeof import('./src/components/app/bar/AuthDialog.vue')['default']
AppBarBar: typeof import('./src/components/app/bar/Bar.vue')['default']
AppBarEcosystemMenu: typeof import('./src/components/app/bar/EcosystemMenu.vue')['default']
AppBarEnterpriseLink: typeof import('./src/components/app/bar/EnterpriseLink.vue')['default']
Expand Down Expand Up @@ -79,12 +77,10 @@ declare module 'vue' {
AppSettingsOptionsQuickbarOption: typeof import('./src/components/app/settings/options/QuickbarOption.vue')['default']
AppSettingsOptionsRailDrawerOption: typeof import('./src/components/app/settings/options/RailDrawerOption.vue')['default']
AppSettingsOptionsSlashSearchOption: typeof import('./src/components/app/settings/options/SlashSearchOption.vue')['default']
AppSettingsOptionsSyncOption: typeof import('./src/components/app/settings/options/SyncOption.vue')['default']
AppSettingsOptionsThemeOption: typeof import('./src/components/app/settings/options/ThemeOption.vue')['default']
AppSettingsPerksOptions: typeof import('./src/components/app/settings/PerksOptions.vue')['default']
AppSettingsSettingsHeader: typeof import('./src/components/app/settings/SettingsHeader.vue')['default']
AppSheet: typeof import('./src/components/app/Sheet.vue')['default']
AppSnackbarQueue: typeof import('./src/components/app/SnackbarQueue.vue')['default']
AppTable: typeof import('./src/components/app/Table.vue')['default']
AppTextField: typeof import('./src/components/app/TextField.vue')['default']
AppTitle: typeof import('./src/components/app/Title.vue')['default']
Expand Down Expand Up @@ -153,16 +149,10 @@ declare module 'vue' {
SponsorCard: typeof import('./src/components/sponsor/Card.vue')['default']
SponsorLink: typeof import('./src/components/sponsor/Link.vue')['default']
SponsorSponsors: typeof import('./src/components/sponsor/Sponsors.vue')['default']
UserAccountConnectedAccounts: typeof import('./src/components/user/account/ConnectedAccounts.vue')['default']
UserAccountOneSubscription: typeof import('./src/components/user/account/OneSubscription.vue')['default']
UserBadgesUserAdminBadge: typeof import('./src/components/user/badges/UserAdminBadge.vue')['default']
UserBadgesUserOneBadge: typeof import('./src/components/user/badges/UserOneBadge.vue')['default']
UserBadgesUserSponsorBadge: typeof import('./src/components/user/badges/UserSponsorBadge.vue')['default']
UserDiscordLogin: typeof import('./src/components/user/DiscordLogin.vue')['default']
UserGithubLogin: typeof import('./src/components/user/GithubLogin.vue')['default']
UserOneSubCard: typeof import('./src/components/user/OneSubCard.vue')['default']
UserUserBadges: typeof import('./src/components/user/UserBadges.vue')['default']
UserUserProfile: typeof import('./src/components/user/UserProfile.vue')['default']
UserUserTabs: typeof import('./src/components/user/UserTabs.vue')['default']
}
}
2 changes: 1 addition & 1 deletion packages/docs/package.json
Expand Up @@ -23,7 +23,7 @@
"@cosmicjs/sdk": "^1.0.11",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vuetify/one": "^1.7.0",
"@vuetify/one": "^1.7.2",
"algoliasearch": "^4.23.2",
"fflate": "^0.8.2",
"isomorphic-fetch": "^3.0.0",
Expand Down
39 changes: 9 additions & 30 deletions packages/docs/src/components/app/BackToTop.vue
@@ -1,25 +1,14 @@
<template>
<v-layout-item
class="text-end pointer-events-none"
position="bottom"
size="88"
model-value
<v-fab
v-model="model"
color="primary"
elevation="8"
icon="mdi-chevron-up"
size="large"
app
v-scroll="onScroll"
>
<div class="ma-4">
<v-fab-transition>
<v-btn
v-show="model"
class="mt-auto pointer-events-initial"
color="primary"
elevation="8"
icon="mdi-chevron-up"
size="large"
@click="goTo(0)"
/>
</v-fab-transition>
</div>
</v-layout-item>
@click="goTo(0)"
/>
</template>

<script setup>
Expand All @@ -31,13 +20,3 @@
model.value = window.scrollY > 200
}
</script>

<style scoped>
.pointer-events-none {
pointer-events: none;
}
.pointer-events-initial {
pointer-events: initial;
}
</style>
47 changes: 0 additions & 47 deletions packages/docs/src/components/app/SnackbarQueue.vue

This file was deleted.

4 changes: 4 additions & 0 deletions packages/docs/src/data/nav.json
Expand Up @@ -243,6 +243,10 @@
"title": "number-inputs",
"subfolder": "components"
},
{
"title": "snackbar-queue",
"subfolder": "components"
},
{
"title": "sparklines",
"subfolder": "components"
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/data/page-to-api.json
Expand Up @@ -125,6 +125,7 @@
"components/slide-groups": ["VSlideGroup", "VSlideGroupItem"],
"components/sliders": ["VRangeSlider", "VSlider"],
"components/snackbars": ["VSnackbar"],
"components/snackbar-queue": ["VSnackbarQueue", "VSnackbar"],
"components/sparklines": ["VSparkline"],
"components/steppers": [
"VStepper",
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/examples/v-card/prop-variant.vue
Expand Up @@ -10,6 +10,7 @@
:variant="variant"
class="mx-auto"
color="surface-variant"
max-width="344"
subtitle="Greyhound divisely hello coldly fonwderfully"
title="Headline"
>
Expand Down
@@ -1,8 +1,6 @@
<template>
<v-card>
<v-layout>
<!-- <v-system-bar color="deep-purple darken-3"></v-system-bar> -->

<v-app-bar
color="primary"
prominent
Expand All @@ -13,16 +11,18 @@

<v-spacer></v-spacer>

<v-btn icon="mdi-magnify" variant="text"></v-btn>
<template v-if="$vuetify.display.mdAndUp">
<v-btn icon="mdi-magnify" variant="text"></v-btn>

<v-btn icon="mdi-filter" variant="text"></v-btn>
<v-btn icon="mdi-filter" variant="text"></v-btn>
</template>

<v-btn icon="mdi-dots-vertical" variant="text"></v-btn>
</v-app-bar>

<v-navigation-drawer
v-model="drawer"
location="bottom"
:location="$vuetify.display.mobile ? 'bottom' : undefined"
temporary
>
<v-list
Expand Down
74 changes: 74 additions & 0 deletions packages/docs/src/examples/v-snackbar-queue/usage.vue
@@ -0,0 +1,74 @@
<template>
<ExamplesUsageExample
v-model="model"
:code="code"
:name="name"
:options="options"
>
<div>
<v-text-field
v-model="text"
label="Queue a message"
hide-details
@keydown.enter="onClick"
>
<template v-slot:append-inner>
<v-btn
:disabled="!text"
append-icon="mdi-arrow-right"
text="Queue"
flat
slim
@click="onClick"
></v-btn>
</template>
</v-text-field>

<v-snackbar-queue v-model="queue" :color="color" :timeout="timeout"></v-snackbar-queue>
</div>

<template v-slot:configuration>
<v-select
v-model="color"
:items="['primary', 'secondary', 'success', 'info', 'warning', 'error']"
label="Color"
clearable
></v-select>

<v-number-input v-model="timeout" min="-1"></v-number-input>
</template>
</ExamplesUsageExample>
</template>

<script setup>
const name = 'v-snackbar-queue'
const model = ref('default')
const options = []
const color = shallowRef()
const timeout = shallowRef(5000)
const queue = ref([])
const text = shallowRef('')
function onClick () {
queue.value.push({
text: text.value,
timeout: timeout.value,
color: color.value,
})
}
const props = computed(() => {
return {
color: color.value,
timeout: timeout.value !== 5000 ? timeout.value : undefined,
}
})
const slots = computed(() => {
return ''
})
const code = computed(() => {
return `<v-snackbar-queue${propsToString(props.value)}>${slots.value}</v-snackbar-queue>`
})
</script>
2 changes: 0 additions & 2 deletions packages/docs/src/layouts/default.vue
Expand Up @@ -12,8 +12,6 @@

<AppBackToTop />

<AppSnackbarQueue />

<v-main>
<slot>
<v-container
Expand Down
2 changes: 0 additions & 2 deletions packages/docs/src/layouts/home.vue
Expand Up @@ -6,8 +6,6 @@

<AppBarBar />

<AppSnackbarQueue />

<v-main class="text-center font-weight-light">
<router-view />
</v-main>
Expand Down
2 changes: 0 additions & 2 deletions packages/docs/src/layouts/user.vue
Expand Up @@ -8,8 +8,6 @@

<AppDrawerDrawer />

<AppSnackbarQueue />

<v-main>
<router-view v-slot="{ Component }">
<v-fade-transition hide-on-leave>
Expand Down

0 comments on commit 2f32868

Please sign in to comment.