mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-04-20 10:57:28 +08:00
Merge remote-tracking branch 'origin/main' into codex/add-lottery-post-type-and-api
This commit is contained in:
@@ -24,13 +24,10 @@ import GlobalPopups from '~/components/GlobalPopups.vue'
|
|||||||
export default {
|
export default {
|
||||||
name: 'App',
|
name: 'App',
|
||||||
components: { HeaderComponent, MenuComponent, GlobalPopups },
|
components: { HeaderComponent, MenuComponent, GlobalPopups },
|
||||||
data() {
|
setup() {
|
||||||
return {
|
const isMobile = useIsMobile()
|
||||||
menuVisible: true
|
const menuVisible = ref(!isMobile.value)
|
||||||
}
|
const hideMenu = computed(() => {
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
hideMenu() {
|
|
||||||
return [
|
return [
|
||||||
'/login',
|
'/login',
|
||||||
'/signup',
|
'/signup',
|
||||||
@@ -41,15 +38,17 @@ export default {
|
|||||||
'/discord-callback',
|
'/discord-callback',
|
||||||
'/forgot-password',
|
'/forgot-password',
|
||||||
'/google-callback'
|
'/google-callback'
|
||||||
].includes(this.$route.path)
|
].includes(useRoute().path)
|
||||||
}
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
menuVisible.value = window.innerWidth > 768
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return { menuVisible, hideMenu }
|
||||||
},
|
},
|
||||||
async mounted() {
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
this.menuVisible = window.innerWidth > 768
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style src="~/assets/global.css"></style>
|
<style src="~/assets/global.css"></style>
|
||||||
|
|||||||
@@ -71,7 +71,7 @@
|
|||||||
<div class="article-member-avatars-container">
|
<div class="article-member-avatars-container">
|
||||||
<NuxtLink
|
<NuxtLink
|
||||||
v-for="member in article.members"
|
v-for="member in article.members"
|
||||||
:key="member.id"
|
:key="`${article.id}-${member.id}`"
|
||||||
class="article-member-avatar-item"
|
class="article-member-avatar-item"
|
||||||
:to="`/users/${member.id}`"
|
:to="`/users/${member.id}`"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<CommentEditor @submit="postComment" :loading="isWaitingPostingComment" :disabled="!loggedIn"
|
<CommentEditor @submit="postComment" :loading="isWaitingPostingComment" :disabled="!loggedIn"
|
||||||
:show-login-overlay="!loggedIn" />
|
:show-login-overlay="!loggedIn" :parent-user-name="author.username" />
|
||||||
|
|
||||||
<div class="comment-config-container">
|
<div class="comment-config-container">
|
||||||
<div class="comment-sort-container">
|
<div class="comment-sort-container">
|
||||||
@@ -387,7 +387,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const postComment = async (text, clear) => {
|
const postComment = async (parentUserName, text, clear) => {
|
||||||
if (!text.trim()) return
|
if (!text.trim()) return
|
||||||
console.debug('Posting comment', { postId, text })
|
console.debug('Posting comment', { postId, text })
|
||||||
isWaitingPostingComment.value = true
|
isWaitingPostingComment.value = true
|
||||||
|
|||||||
Reference in New Issue
Block a user