jbourdon/social-media
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/main/Header.vue
This commit is contained in:
Dominic Villemure
2024-08-25 10:55:06 -04:00
parent d3f253f9ed 3d7b0380bd
commit df1ae861e2
10 changed files with 371 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/contents/contentfullscreen/FullScreenContentMd.vue
View File

@@ -49,12 +49,7 @@
</div>
<div class="flex justify-around py-2">
<v-btn variant="plain" icon @click="likeContent">
<v-icon :color="'#313131'">mdi-thumb-up-outline</v-icon>
</v-btn>
<v-btn variant="plain" icon @click="dislikeContent">
<v-icon :color="'#000000'">mdi-thumb-down-outline</v-icon>
</v-btn>
<Reaction v-if="data" :content="data"></Reaction>
<donation-button v-if="data"
:color-border="data.colorMenu"
@@ -89,6 +84,7 @@ import MessageList from "@/views/messages/MessageList.vue";
import DonationButton from "@/views/creators/DonationButton.vue";
import {useClient} from "@/plugins/api.js";
import {useRoute} from 'vue-router';
import Reaction from "@/views/contents/Reaction.vue";
const data = ref(null);
const currentImageIndex = ref(0);
@@ -119,7 +115,6 @@ const fetchContentData = async (contentId) => {
try {
const response = await client.get(`/api/contents/${contentId}`);
data.value = response.data;
console.table(data.value)
} catch (error) {
console.error(`Error fetching content: ${error}`);
}

9
src/views/contents/contentfullscreen/FullScreenContentSm.vue
View File

@@ -53,12 +53,7 @@
</div>
<div class="flex justify-around py-2">
<v-btn variant="plain" icon @click="likeContent">
<v-icon :color="'#313131'">mdi-thumb-up-outline</v-icon>
</v-btn>
<v-btn variant="plain" icon @click="dislikeContent">
<v-icon :color="'#000000'">mdi-thumb-down-outline</v-icon>
</v-btn>
<Reaction v-if="data" :content="data"></Reaction>
<donation-button v-if="data"
:color-border="data.colorMenu"
@@ -93,6 +88,7 @@ import MessageList from "@/views/messages/MessageList.vue";
import DonationButton from "@/views/creators/DonationButton.vue";
import {useClient} from "@/plugins/api.js";
import {useRoute} from 'vue-router';
import Reaction from "@/views/contents/Reaction.vue";
const data = ref(null);
const currentImageIndex = ref(0);
@@ -123,7 +119,6 @@ const fetchContentData = async (contentId) => {
try {
const response = await client.get(`/api/contents/${contentId}`);
data.value = response.data;
console.table(data.value)
} catch (error) {
console.error(`Error fetching content: ${error}`);
}