diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7b19dbe..9dedfca 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -32,8 +32,7 @@ "eslint-plugin-vue": "^9.22.0", "postcss": "^8.4.35", "tailwindcss": "^3.4.1", - "vite": "^5.2.11", - "vite-svg-loader": "^5.1.0" + "vite": "^5.2.11" } }, "node_modules/@alloc/quick-lru": { @@ -1015,6 +1014,16 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz", + "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==", + "dev": true, + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "engines": { + "node": ">=6" + } + }, "node_modules/@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 33a3ff8..bc85f07 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -33,7 +33,6 @@ "eslint-plugin-vue": "^9.22.0", "postcss": "^8.4.35", "tailwindcss": "^3.4.1", - "vite": "^5.2.11", - "vite-svg-loader": "^5.1.0" + "vite": "^5.2.11" } } diff --git a/frontend/src/assets/icons/facebook.svg b/frontend/src/assets/icons/facebook.svg deleted file mode 100644 index 80d23e8..0000000 --- a/frontend/src/assets/icons/facebook.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/assets/icons/hutopy.svg b/frontend/src/assets/icons/hutopy.svg deleted file mode 100644 index 534cc97..0000000 --- a/frontend/src/assets/icons/hutopy.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/frontend/src/assets/icons/instagram.svg b/frontend/src/assets/icons/instagram.svg deleted file mode 100644 index 59d4e1d..0000000 --- a/frontend/src/assets/icons/instagram.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/assets/icons/tiktok.svg b/frontend/src/assets/icons/tiktok.svg deleted file mode 100644 index e83f460..0000000 --- a/frontend/src/assets/icons/tiktok.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/frontend/src/assets/icons/x.svg b/frontend/src/assets/icons/x.svg deleted file mode 100644 index 693a7cb..0000000 --- a/frontend/src/assets/icons/x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index a41e81d..bf7673e 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -13,7 +13,7 @@ --h-surface: #252829; --h-on-surface: #e2e5e9; --h-primary: #1B1B1F; - --h-on-primary: #c5c8c8; + --h-on-primary: #e2e5e9; --h-secondary: #e7e5ea; --h-on-secondary: #000000; --h-tertiary: #272A44; @@ -45,7 +45,7 @@ } div.card { - @apply w-[800px]; + @apply w-[1024px]; @apply rounded-xl p-10 m-4; @apply bg-hSurface text-hOnSurface; } diff --git a/frontend/src/main.js b/frontend/src/main.js index 2069bf5..e1a520e 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -1,7 +1,6 @@ import {createApp} from 'vue' import App from './App.vue' import router from './router/router.js' -import './assets/main.css' import {createPinia} from 'pinia' import '@mdi/font/css/materialdesignicons.css' import 'vuetify/styles' @@ -13,6 +12,7 @@ import {useAuthStore} from "@/stores/authStore.js"; import i18n from './i18n.js'; import {useUserProfileStore} from "@/stores/userProfileStore.js"; import {useCreatorProfileStore} from "@/stores/creatorProfileStore.js"; +import './assets/main.css' const vuetify = createVuetify({ components, diff --git a/frontend/src/views/creators/ActualBanner.vue b/frontend/src/views/creators/ActualBanner.vue index 27c11ac..909787d 100644 --- a/frontend/src/views/creators/ActualBanner.vue +++ b/frontend/src/views/creators/ActualBanner.vue @@ -9,7 +9,7 @@ @click="isCurrentCreator && openBannerEditor()" > Profile Banner @@ -30,11 +30,9 @@ diff --git a/frontend/src/views/creators/BannerActions.vue b/frontend/src/views/creators/BannerActions.vue index 05036f3..6bafed2 100644 --- a/frontend/src/views/creators/BannerActions.vue +++ b/frontend/src/views/creators/BannerActions.vue @@ -5,6 +5,14 @@ import DonationButtonBanner from '@/views/creators/DonationButtonBanner.vue'; import {onBeforeUnmount, onMounted, ref} from 'vue'; import CreatorLogo from "@/views/creators/CreatorLogo.vue"; import NameTitle from "@/views/creators/NameTitle.vue"; +import Linkedin from "@/views/svg/Linkedin.vue"; +import X from "@/views/svg/X.vue"; +import Facebook from "@/views/svg/Facebook.vue"; +import Instagram from "@/views/svg/Instagram.vue"; +import Tiktok from "@/views/svg/Tiktok.vue"; +import Reddit from "@/views/svg/Reddit.vue"; +import Youtube from "@/views/svg/Youtube.vue"; +import Web from "@/views/svg/Web.vue"; const brandingStore = useBrandingStore(); const isMobile = ref(false); @@ -16,70 +24,6 @@ function updateIsMobile() { isMobile.value = window.innerWidth <= 640; } -// Récupération des URLs des réseaux sociaux -function GetSocialsUrls() { - const socials = []; - const brandingSocials = brandingStore.value.socials; - - if (brandingSocials?.facebookUrl) { - socials.push({ - icon: 'mdi-facebook', - url: brandingSocials.facebookUrl, - }); - } - - if (brandingSocials?.instagramUrl) { - socials.push({ - icon: 'mdi-instagram', - url: brandingSocials.instagramUrl, - }); - } - - if (brandingSocials?.xUrl) { - socials.push({ - icon: 'mdi-twitter', - url: brandingSocials.xUrl, - }); - } - - if (brandingSocials?.linkedInUrl) { - socials.push({ - icon: 'mdi-linkedin', - url: brandingSocials.linkedInUrl, - }); - } - - if (brandingSocials?.tikTokUrl) { - socials.push({ - icon: '/images/socials/tiktok-white.png', - url: brandingSocials.tikTokUrl, - }); - } - - if (brandingSocials?.youtubeUrl) { - socials.push({ - icon: 'mdi-youtube', - url: brandingSocials.youtubeUrl, - }); - } - - if (brandingSocials?.redditUrl) { - socials.push({ - icon: 'mdi-reddit', - url: brandingSocials.redditUrl, - }); - } - - if (brandingSocials?.websiteUrl) { - socials.push({ - icon: 'mdi-web', - url: brandingSocials.websiteUrl, - }); - } - - return socials; -} - const isSticky = ref(false); const mainContainer = ref(null); @@ -130,7 +74,7 @@ onBeforeUnmount(() => { -
+
@@ -149,33 +93,69 @@ onBeforeUnmount(() => {
-
-
- - - {{ socialNetwork.icon }} - - - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ \ No newline at end of file diff --git a/frontend/src/views/creators/BannerEditor.vue b/frontend/src/views/creators/BannerEditor.vue index e0936a2..9cad02b 100644 --- a/frontend/src/views/creators/BannerEditor.vue +++ b/frontend/src/views/creators/BannerEditor.vue @@ -1,25 +1,36 @@  diff --git a/frontend/src/views/creators/CreatorLogo.vue b/frontend/src/views/creators/CreatorLogo.vue index ef881b9..4eeb22a 100644 --- a/frontend/src/views/creators/CreatorLogo.vue +++ b/frontend/src/views/creators/CreatorLogo.vue @@ -6,12 +6,9 @@ > Profile Picture @@ -31,12 +28,10 @@ diff --git a/frontend/src/views/creators/CreatorLogoEditor.vue b/frontend/src/views/creators/CreatorLogoEditor.vue index e44020d..c19875c 100644 --- a/frontend/src/views/creators/CreatorLogoEditor.vue +++ b/frontend/src/views/creators/CreatorLogoEditor.vue @@ -1,27 +1,36 @@  diff --git a/frontend/src/views/creators/DonationButton.vue b/frontend/src/views/creators/DonationButton.vue deleted file mode 100644 index 87c7077..0000000 --- a/frontend/src/views/creators/DonationButton.vue +++ /dev/null @@ -1,164 +0,0 @@ - - - diff --git a/frontend/src/views/creators/DonationButtonBanner.vue b/frontend/src/views/creators/DonationButtonBanner.vue index 0d12efb..7978025 100644 --- a/frontend/src/views/creators/DonationButtonBanner.vue +++ b/frontend/src/views/creators/DonationButtonBanner.vue @@ -1,40 +1,19 @@