Merge branch 'version-2' into version-2-tabletop

This commit is contained in:
Stefan Zermatten
2022-10-22 19:29:31 +02:00
437 changed files with 18762 additions and 8849 deletions

View File

@@ -6,9 +6,7 @@
>
<Sidebar />
</v-navigation-drawer>
<router-view
name="toolbar"
/>
<router-view name="toolbar" />
<v-app-bar
v-if="!$route.matched[0] || !$route.matched[0].components.toolbar"
app
@@ -19,22 +17,16 @@
>
<v-app-bar-nav-icon @click="toggleDrawer" />
<v-toolbar-title>
<v-fade-transition
mode="out-in"
>
<v-fade-transition mode="out-in">
<div :key="$store.state.pageTitle">
{{ $store.state.pageTitle }}
</div>
</v-fade-transition>
</v-toolbar-title>
<v-spacer />
<v-fade-transition
mode="out-in"
>
<v-fade-transition mode="out-in">
<div :key="$route.meta.title">
<router-view
name="toolbarItems"
/>
<router-view name="toolbarItems" />
</div>
</v-fade-transition>
<v-fade-transition
@@ -45,83 +37,80 @@
:key="$route.meta.title"
style="width: 100%"
>
<router-view
name="toolbarExtension"
/>
<router-view name="toolbarExtension" />
</div>
</v-fade-transition>
</v-app-bar>
<v-main>
<v-fade-transition
mode="out-in"
>
<v-fade-transition mode="out-in">
<router-view />
</v-fade-transition>
</v-main>
<router-view
name="rightDrawer"
/>
<router-view name="rightDrawer" />
<dialog-stack />
<snackbar-queue />
</v-app>
</template>
<script lang="js">
import '/imports/api/users/Users.js';
import Sidebar from '/imports/ui/layouts/Sidebar.vue';
import DialogStack from '/imports/ui/dialogStack/DialogStack.vue';
import { mapMutations } from 'vuex';
import SnackbarQueue from '/imports/ui/components/snackbars/SnackbarQueue.vue';
import { getUserTier } from '/imports/api/users/patreon/tiers.js';
import '/imports/api/users/Users.js';
import Sidebar from '/imports/ui/layouts/Sidebar.vue';
import DialogStack from '/imports/ui/dialogStack/DialogStack.vue';
import { mapMutations } from 'vuex';
import SnackbarQueue from '/imports/ui/components/snackbars/SnackbarQueue.vue';
import { getUserTier } from '/imports/api/users/patreon/tiers.js';
export default {
components: {
Sidebar,
DialogStack,
SnackbarQueue,
},
data(){return {
export default {
components: {
Sidebar,
DialogStack,
SnackbarQueue,
},
data() {
return {
name: 'Home',
tabs: 0,
}},
computed: {
drawer: {
get () {
return this.$store.state.drawer;
},
set (value) {
this.$store.commit('setDrawer', value);
},
}
},
computed: {
drawer: {
get() {
return this.$store.state.drawer;
},
set(value) {
this.$store.commit('setDrawer', value);
},
},
meteor: {
darkMode(){
let user = Meteor.user();
if (!user) return;
let tier = getUserTier(user);
return tier.paidBenefits && user.darkMode;
},
},
watch: {
darkMode: {
immediate: true,
handler(newDarkModeValue){
if (typeof newDarkModeValue === 'boolean'){
this.$vuetify.theme.dark = newDarkModeValue;
}
},
},
'$route' (to) {
this.$store.commit('setPageTitle', to.meta && to.meta.title || 'DiceCloud');
}
},
methods: {
...mapMutations([
'toggleDrawer',
]),
},
meteor: {
darkMode() {
let user = Meteor.user();
if (!user) return;
let tier = getUserTier(user);
return tier.paidBenefits && user.darkMode;
},
};
},
watch: {
darkMode: {
immediate: true,
handler(newDarkModeValue) {
if (typeof newDarkModeValue === 'boolean') {
this.$vuetify.theme.dark = newDarkModeValue;
}
},
},
'$route'(to) {
this.$store.commit('setPageTitle', to.meta && to.meta.title || 'DiceCloud');
}
},
methods: {
...mapMutations([
'toggleDrawer',
]),
},
};
</script>
<style>
</style>

View File

@@ -100,6 +100,7 @@
{title: 'Tabletops', icon: 'mdi-table', to: '/tabletops'},
{title: 'Feedback', icon: 'mdi-bug', to: '/feedback'},
{title: 'About', icon: 'mdi-sign-text', to: '/about'},
{title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs'},
{title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'},
{title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'},
];