Applying new redesign.

This commit is contained in:
PascalMarchesseault
2024-09-18 16:34:41 -04:00
parent 72ee0fed4e
commit 66dadb3cd2
5 changed files with 313 additions and 179 deletions

View File

@@ -1,33 +1,11 @@
<template> <template>
<!-- Bannière--> <div class="shadow-lg rounded-2xl" :style="{ backgroundColor: creator.colors.bannerBottom}">
<div class="shadow-lg rounded-2xl"> <div class="relative z-20">
<div class="relative z-20 -mt-2 md:mt-2"> <div class="py-4 min-h-9 md:rounded-t-2xl"
<div> :style="{ backgroundColor: creator.colors.bannerTop || '#6B0065' }">
<!-- Social Network UpperPart-->
<div class="py-4 min-h-14 md:rounded-t-2xl"
:style="{ backgroundColor: creator.colors.bannerTop || '#6B0065' }">
<div class=" flex w-full justify-evenly max-h-8">
<a
v-for="socialNetwork in GetSocialsUrls()"
:href="socialNetwork.url"
target="_blank"
class="text-white text-2xl transform transition-transform duration-200 hover:scale-125 hover:text-blue-500">
<v-icon v-if="socialNetwork.icon.includes('mdi')">{{ socialNetwork.icon }}</v-icon>
<img v-if="socialNetwork.icon.includes('tiktok')"
:src="socialNetwork.icon"
class="w-9 h-9"
alt="Tiktok">
<img v-if="socialNetwork.icon.includes('websiteIcon')"
:src="socialNetwork.icon"
class="w-5 h-5"
alt="Website">
</a>
</div>
</div>
</div> </div>
<div class="h-1.5" :style="{ backgroundColor: creator.colors.accent || '#6B0065' }"> ></div> <div class="h-1" :style="{ backgroundColor: creator.colors.accent || '#6B0065' }"> ></div>
<!--Banner--> <!--Banner-->
<div class="relative"> <div class="relative">
<div> <div>
@@ -41,11 +19,10 @@
</div> </div>
</div> </div>
<div class="h-1.5" :style="{ backgroundColor: creator.colors.accent || '#6B0065' }"> </div> <div class="h-1" :style="{ backgroundColor: creator.colors.accent || '#6B0065' }"></div>
<!--actions - Lowerpart--> <!--actions - Lowerpart-->
<banner-actions :creator="creator" @content-posted="addContent"></banner-actions> <banner-actions :creator="creator" @content-posted="addContent"></banner-actions>
</div> </div>
</template> </template>
<script setup> <script setup>
@@ -61,60 +38,5 @@ function addContent(content) {
emits('content-posted', content) emits('content-posted', content)
} }
function GetSocialsUrls() {
const socials = [];
if (props.creator.socials.facebookUrl !== null) {
socials.push({
icon: "mdi-facebook",
url: props.creator.socials.facebookUrl
})
}
if (props.creator.socials.instagramUrl !== null) {
socials.push({
icon: "mdi-instagram",
url: props.creator.socials.instagramUrl
})
}
if (props.creator.socials.xUrl !== null) {
socials.push({
icon: "mdi-twitter",
url: props.creator.socials.xUrl
})
}
if (props.creator.socials.linkedInUrl !== null) {
socials.push({
icon: 'mdi-linkedin',
url: props.creator.socials.linkedInUrl
})
}
if (props.creator.socials.tikTokUrl !== null) {
socials.push({
icon: '/images/socials/tiktok-white.png',
url: props.creator.socials.tikTokUrl
})
}
if (props.creator.socials.youtubeUrl !== null) {
socials.push({
icon: 'mdi-youtube',
url: props.creator.socials.youtubeUrl
})
}
if (props.creator.socials.redditUrl !== null) {
socials.push({
icon: 'mdi-reddit',
url: props.creator.socials.redditUrl
})
}
if (props.creator.socials.websiteUrl !== null) {
socials.push({
icon: 'mdi-web',
url: props.creator.socials.websiteUrl
})
}
return socials;
}
</script> </script>

View File

@@ -1,7 +1,6 @@
<template> <template>
<div v-if="creator && creator.id"> <div v-if="creator && creator.id">
<div class="max-w-[1350px] mx-auto">
<div class="max-w-[1250px] mx-auto">
<creator-banner :creator="creator" <creator-banner :creator="creator"
@content-posted="contentPosted" @content-posted="contentPosted"
></creator-banner> ></creator-banner>
@@ -16,7 +15,6 @@
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="loading"> <div v-if="loading">
<v-progress-linear indeterminate></v-progress-linear> <v-progress-linear indeterminate></v-progress-linear>
@@ -32,7 +30,6 @@
</template> </template>
<script async setup> <script async setup>
import {watch, ref, onBeforeMount} from 'vue'; import {watch, ref, onBeforeMount} from 'vue';
import {useRoute} from 'vue-router'; import {useRoute} from 'vue-router';
import {useClient} from "@/plugins/api.js"; import {useClient} from "@/plugins/api.js";

View File

@@ -0,0 +1,98 @@
<script setup>
import {useSubscriptionStore} from "@/stores/subscriptionStore.js";
import {computed, ref} from "vue";
const props = defineProps({
creator: {type: Object, required: true},
colorBorder: {required: true},
});
const colorBorder = computed(() => props.colorBorder);
const subscriptionStore = useSubscriptionStore();
const isSubscribe = computed(() => !subscriptionStore.isSubscribeTo(props.creator.id));
function subscribeToCreator() {
subscriptionStore.subscribeTo(props.creator.id);
}
// Référence pour contrôler l'affichage du modal
const showUnsubscribeModal = ref(false);
function unsubscribeFromCreator() {
subscriptionStore.unsubscribeFrom(props.creator.id);
// Fermer le modal après désabonnement
showUnsubscribeModal.value = false;
}
</script>
<template>
<template v-if="isSubscribe">
<v-btn
:style="{
width: '150px',
height: '32px',
backgroundColor: colorBorder,
color: 'white',
borderRadius: '8px 0 0 8px',
padding: '10px 24px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
transition: 'background-color 0.3s ease'
}"
@click="subscribeToCreator"
>
<div class="font-bold">Follow</div>
</v-btn>
</template>
<template v-else>
<v-btn
:style="{
width: '150px',
height: '32px',
backgroundColor: colorBorder,
color: 'white',
borderRadius: '8px 0 0 8px',
padding: '10px 24px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
transition: 'background-color 0.3s ease'
}"
@click="showUnsubscribeModal = true"
>
<div class="font-bold">{{ $t('subscribebutton.unsubscribe') }}</div>
</v-btn>
</template>
<v-dialog v-model="showUnsubscribeModal" max-width="500">
<v-card class="text-center rounded-xl"
:style="{ border: `3px solid ${creator.colors.menu}` }">
<div class="flex items-center justify-between py-4 text-2xl font-bold border-b mb-2">
<div class="flex-1 text-center">
Déabonnement
</div>
</div>
<v-card-title>Confirmation</v-card-title>
<v-card-text>Êtes-vous sûr de vouloir vous désabonner ?</v-card-text>
<v-card-actions class="justify-center px-4 pb-4">
<v-btn text class="flex-grow-1" variant="outlined"
:style="{ backgroundColor: 'rgba(255, 255, 255, 0.1)', color: 'rgba(0, 0, 0, 0.4)' }"
@click="unsubscribeFromCreator">Oui
</v-btn>
<v-btn class="flex-grow-1"
:style="{ borderColor: creator.colors.menu, color: creator.colors.menu }" variant="outlined"
@click="showUnsubscribeModal = false">
<div :style="{ color: creator.colors.menu }">Non</div>
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>

View File

@@ -30,12 +30,13 @@ function unsubscribeFromCreator() {
<template> <template>
<template v-if="isSubscribe"> <template v-if="isSubscribe">
<v-btn <v-btn
class="mr-4"
:style="{ :style="{
width: '150px',
height: '32px',
backgroundColor: colorBorder, backgroundColor: colorBorder,
color: 'white', color: 'white',
borderRadius: '8px', borderRadius: '0 8px 8px 0',
padding: '20px 24px', padding: '10px 24px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
@@ -45,16 +46,17 @@ function unsubscribeFromCreator() {
> >
<div class="font-bold">{{ $t('subscribebutton.subscribe') }}</div> <div class="font-bold">{{ $t('subscribebutton.subscribe') }}</div>
</v-btn> </v-btn>
</template> </template>
<template v-else> <template v-else>
<v-btn <v-btn
class="mr-4"
:style="{ :style="{
width: '150px',
height: '32px',
backgroundColor: colorBorder, backgroundColor: colorBorder,
color: 'white', color: 'white',
borderRadius: '8px', borderRadius: '0 8px 8px 0',
padding: '20px 24px', padding: '10px 24px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',

View File

@@ -1,110 +1,225 @@
<template> <template>
<div class="relative w-full"> <div class="flex flex-column w-full">
<div ref="mainContainer" class="rounded-b-2xl pt-2 pb-1"
:style="{ backgroundColor: creator.colors.bannerBottom || '#A30E79', borderBottom: '5px inset' + (creator.colors.menu || '#000') }">
<!-- Logo & User Info --> <div class="relative w-full shadow-xl rounded-2xl">
<div class="relative z-20"> <div ref="mainContainer" class="rounded-b-2xl shadow-2xl"
<div class="flex flex-row items-center py-2"> :style="{ backgroundColor: creator.colors.bannerTop || '#A30E79', boxShadow: '0 5px 10px rgba(0, 0, 0, 0.3)' }">
<div>
<img <div class="relative">
class="shadow-2xl rounded-full border-solid border-4 absolute z-20 max-w-[190px] ml-15 -mt-32" <div class="flex flex-row items-center py-2">
:src="creator.images.logo ? creator.images.logo : '/images/placeholders/logo.png'" <!-- Profile Image -->
alt="Profile Picture" <div>
:style="{ borderColor: creator.colors.accent || '#A30E79', height: '190px'}" <img
/> class="shadow-2xl rounded-full border-solid border-2 absolute z-20 max-w-[190px] ml-15 -mt-20"
</div> :src="creator.images.logo ? creator.images.logo : '/images/placeholders/logo.png'"
<div class="ml-72 text-white mr-10"> alt="Profile Picture"
<p class="capitalize text-4xl font-bold">{{ creator.name }}</p> :style="{ borderColor: creator.colors.accent || '#A30E79', height: '190px'}"
<div class="text-2xl text-white flex flex-row align-center"> />
{{ creator.about.title }}
<creator-about class="px-2" :creator="creator"></creator-about>
</div> </div>
</div>
<div class="flex flex-row ml-auto space-x-2.5"> <!-- Creator Information -->
<donation-button-banner <div class="ml-72 text-white w-25">
:color-border="creator.colors.menu" <p class="capitalize text-2xl">{{ creator.name }}</p>
:color-accent="creator.colors.accent" <div class="text-md py-1">
:creator-id="creator.id" {{ creator.about.title }}
:creator-name="creator.name" </div>
:creator-logo="creator.images.logo" <div class="text-xs">
iconColorClass="text-white"> 105 Followers . {{ creator.subscriberCount }} {{ $t('banner.subscription') }}
</donation-button-banner>
<div class="flex flex-column">
<!-- Bouton abonnement affiché seulement si non abonné -->
<subscribe-button
:creator="creator"
:color-border="creator.colors.menu">
</subscribe-button>
<div class="font-bold text-white flex justify-end mr-5 py-1.5">
{{ creator.subscriberCount }} {{ $t('banner.subscription') }}
</div> </div>
</div> </div>
<div class="flex-grow"></div>
<div class="flex flex-col items-center justify-center w-full">
<!-- Social Media Icons -->
<div class="flex flex-row space-x-6 justify-center">
<a
v-for="socialNetwork in GetSocialsUrls()"
:href="socialNetwork.url"
target="_blank"
class="text-white text-md transform transition-transform duration-200 hover:scale-125 hover:text-blue-500">
<v-icon v-if="socialNetwork.icon.includes('mdi')">{{ socialNetwork.icon }}</v-icon>
<img v-if="socialNetwork.icon.includes('tiktok')"
:src="socialNetwork.icon"
class="w-6 h-6 mt-0.5"
alt="Tiktok">
<img v-if="socialNetwork.icon.includes('websiteIcon')"
:src="socialNetwork.icon"
class="w-6 h-6 mt-0.5"
alt="Website">
</a>
</div>
<!-- Follow and Subscribe Buttons -->
<div class="flex flex-row space-x-1 justify-center mt-4">
<follow-button
:creator="creator"
:color-border="creator.colors.menu">
</follow-button>
<subscribe-button
:creator="creator"
:color-border="creator.colors.menu">
</subscribe-button>
</div>
</div>
<div class="flex-grow w-50">
</div>
</div> </div>
</div> </div>
</div>
<!-- <div class="flex flex-row ml-auto space-x-2.5">-->
<!-- <donation-button-banner-->
<!-- :color-border="creator.colors.menu"-->
<!-- :color-accent="creator.colors.accent"-->
<!-- :creator-id="creator.id"-->
<!-- :creator-name="creator.name"-->
<!-- :creator-logo="creator.images.logo"-->
<!-- iconColorClass="text-white">-->
<!-- </donation-button-banner>-->
<!-- <div class="flex flex-column">-->
<!-- &lt;!&ndash; Bouton abonnement affiché seulement si non abonné &ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- -->
<!-- &lt;!&ndash; Conteneur sticky &ndash;&gt;-->
<!-- <div v-show="isSticky" class=" sticky-header fixed top-14 left-0 right-0 w-full z-20"-->
<!-- :style="{ backgroundColor: creator.colors.bannerBottom || '#A30E79', borderBottom: '5px inset' + (creator.colors.menu || '#000') }">-->
<!-- <div class="shadow-3xl flex flex-row items-center py-2 px-2">-->
<!-- <div>-->
<!-- <img-->
<!-- class="max-w-[40px] max-h-[40px] ml-5 rounded-full"-->
<!-- :src="creator.images.logo ? creator.images.logo : '/images/placeholders/logo.png'"-->
<!-- alt="Profile Picture"-->
<!-- :style="{ borderColor: creator.colors.accent || '#A30E79', height: '190px'}"-->
<!-- />-->
<!-- </div>-->
<!-- <div class="ml-5 text-white">-->
<!-- <p class="capitalize text-2xl font-bold">{{ creator.name }}</p>-->
<!-- </div>-->
<!-- <div class="ml-auto flex flex-row space-x-2.5 mr-3 ">-->
<!-- -->
<!-- <donation-button-banner-slim -->
<!-- class=""-->
<!-- :color-border="creator.colors.menu"-->
<!-- :color-accent="creator.colors.accent"-->
<!-- :creator-id="creator.id"-->
<!-- :creator-name="creator.name"-->
<!-- :creator-logo="creator.images.logo"-->
<!-- >-->
<!-- </donation-button-banner-slim>-->
<!-- &lt;!&ndash; Afficher le bouton d'abonnement seulement si l'utilisateur n'est pas abonné &ndash;&gt;-->
<!-- <subscribe-button-slim-->
<!-- v-if="!isSubscribed"-->
<!-- :creator="creator"-->
<!-- :color-border="creator.colors.menu">-->
<!-- </subscribe-button-slim>-->
<!-- -->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="rounded-b-2xl min-h-10 px-36 flex flex-col items-center justify-center"
:style="{ backgroundColor: creator.colors.bannerBottom, boxShadow: '0 5px 20px rgba(0, 0, 0, 0.3)' }">
<div class="flex justify-evenly w-full">
<v-btn variant="text" class="text-white">Présentation</v-btn>
<v-btn variant="text" class="text-white">Actualité</v-btn>
<v-btn variant="text" class="text-white">Exclusivité</v-btn>
</div> </div>
</div> </div>
<!-- Conteneur sticky -->
<div v-show="isSticky" class=" sticky-header fixed top-14 left-0 right-0 w-full z-20"
:style="{ backgroundColor: creator.colors.bannerBottom || '#A30E79', borderBottom: '5px inset' + (creator.colors.menu || '#000') }">
<div class="shadow-3xl flex flex-row items-center py-2 px-2">
<div>
<img
class="max-w-[40px] max-h-[40px] ml-5 rounded-full"
:src="creator.images.logo ? creator.images.logo : '/images/placeholders/logo.png'"
alt="Profile Picture"
:style="{ borderColor: creator.colors.accent || '#A30E79', height: '190px'}"
/>
</div>
<div class="ml-5 text-white">
<p class="capitalize text-2xl font-bold">{{ creator.name }}</p>
</div>
<div class="ml-auto flex flex-row space-x-2.5 mr-3 ">
<donation-button-banner-slim
class=""
:color-border="creator.colors.menu"
:color-accent="creator.colors.accent"
:creator-id="creator.id"
:creator-name="creator.name"
:creator-logo="creator.images.logo"
>
</donation-button-banner-slim>
<!-- Afficher le bouton d'abonnement seulement si l'utilisateur n'est pas abonné -->
<subscribe-button-slim
v-if="!isSubscribed"
:creator="creator"
:color-border="creator.colors.menu">
</subscribe-button-slim>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, onMounted, computed } from 'vue'; import {ref, onMounted, computed} from 'vue';
import { useSubscriptionStore } from "@/stores/subscriptionStore.js"; import {useSubscriptionStore} from "@/stores/subscriptionStore.js";
import SubscribeButton from "@/views/creators/SubscribeButton.vue"; import SubscribeButton from "@/views/creators/SubscribeButton.vue";
import DonationButtonBanner from "@/views/creators/DonationButtonBanner.vue"; import DonationButtonBanner from "@/views/creators/DonationButtonBanner.vue";
import CreatorAbout from "@/views/creators/CreatorAbout.vue"; import CreatorAbout from "@/views/creators/CreatorAbout.vue";
import SubscribeButtonSlim from "@/views/creators/SubscribeButtonSlim.vue"; import SubscribeButtonSlim from "@/views/creators/SubscribeButtonSlim.vue";
import DonationButtonBannerSlim from "@/views/creators/DonationButtonBannerSlim.vue"; import DonationButtonBannerSlim from "@/views/creators/DonationButtonBannerSlim.vue";
import FollowButton from "@/views/creators/FollowButton.vue";
function GetSocialsUrls() {
const socials = [];
if (props.creator.socials.facebookUrl !== null) {
socials.push({
icon: "mdi-facebook",
url: props.creator.socials.facebookUrl
})
}
if (props.creator.socials.instagramUrl !== null) {
socials.push({
icon: "mdi-instagram",
url: props.creator.socials.instagramUrl
})
}
if (props.creator.socials.xUrl !== null) {
socials.push({
icon: "mdi-twitter",
url: props.creator.socials.xUrl
})
}
if (props.creator.socials.linkedInUrl !== null) {
socials.push({
icon: 'mdi-linkedin',
url: props.creator.socials.linkedInUrl
})
}
if (props.creator.socials.tikTokUrl !== null) {
socials.push({
icon: '/images/socials/tiktok-white.png',
url: props.creator.socials.tikTokUrl
})
}
if (props.creator.socials.youtubeUrl !== null) {
socials.push({
icon: 'mdi-youtube',
url: props.creator.socials.youtubeUrl
})
}
if (props.creator.socials.redditUrl !== null) {
socials.push({
icon: 'mdi-reddit',
url: props.creator.socials.redditUrl
})
}
if (props.creator.socials.websiteUrl !== null) {
socials.push({
icon: 'mdi-web',
url: props.creator.socials.websiteUrl
})
}
return socials;
}
const props = defineProps({ const props = defineProps({
creator: { type: Object, required: true } creator: {type: Object, required: true}
}); });
const subscriptionStore = useSubscriptionStore(); const subscriptionStore = useSubscriptionStore();
// Calculer si l'utilisateur est abonné // Calculer si l'utilisateur est abonné
const isSubscribed = computed(() => subscriptionStore.isSubscribeTo(props.creator.id)); const isSubscribed = computed(() => subscriptionStore.isSubscribeTo(props.creator.id));
const isSticky = ref(false); const isSticky = ref(false);
const mainContainer = ref(null); const mainContainer = ref(null);
@@ -113,7 +228,7 @@ onMounted(() => {
([entry]) => { ([entry]) => {
isSticky.value = !entry.isIntersecting; isSticky.value = !entry.isIntersecting;
}, },
{ threshold: 0 } {threshold: 0}
); );
if (mainContainer.value) { if (mainContainer.value) {