Merge remote-tracking branch 'origin/main' into I18N

# Conflicts:
#	src/views/main/Header.vue
This commit is contained in:
Dominic Villemure
2024-08-25 10:55:06 -04:00
10 changed files with 371 additions and 42 deletions

View File

@@ -64,12 +64,8 @@
<div class="px-4">
<div class="flex justify-around py-2">
<v-btn variant="plain" icon @click="likeContent">
<v-icon>mdi-thumb-up-outline</v-icon>
</v-btn>
<v-btn variant="plain" icon @click="dislikeContent">
<v-icon>mdi-thumb-down-outline</v-icon>
</v-btn>
<Reaction :content="content"></Reaction>
<v-btn
:class="{'comment-active': hasMessages}"
variant="plain"
@@ -152,6 +148,7 @@ import YoutubePlayer from '../YoutubePlayer.vue';
import ImageViewer from '../ImageViewer.vue';
import {useClient} from "@/plugins/api.js";
import {useAuthStore} from "@/stores/authStore.js";
import Reaction from "@/views/contents/Reaction.vue";
const props = defineProps({
content: {

View File

@@ -64,12 +64,8 @@
<div class="px-1">
<div class="flex justify-around ">
<v-btn variant="plain" icon @click="likeContent">
<v-icon>mdi-thumb-up-outline</v-icon>
</v-btn>
<v-btn variant="plain" icon @click="dislikeContent">
<v-icon>mdi-thumb-down-outline</v-icon>
</v-btn>
<Reaction :content="content"></Reaction>
<v-btn
:class="{'comment-active': hasMessages}"
variant="plain"
@@ -152,6 +148,7 @@ import YoutubePlayer from '../YoutubePlayer.vue';
import ImageViewer from '../ImageViewer.vue';
import {useClient} from "@/plugins/api.js";
import {useAuthStore} from "@/stores/authStore.js";
import Reaction from "@/views/contents/Reaction.vue";
const props = defineProps({
content: {