diff --git a/.env.production b/.env.production index 83147aa..83f5fab 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ -VITE_API_URL=todo +VITE_API_URL=https://hutopy.azurewebsites.net/ VITE_GOOGLE_CLIENT_ID=468391910875-78sfopq1t12ulrv4f5vj227j45guuj66.apps.googleusercontent.com diff --git a/images/Chevron.png b/images/Chevron.png deleted file mode 100644 index 0a23b01..0000000 Binary files a/images/Chevron.png and /dev/null differ diff --git a/images/ChevronBlanc.png b/images/ChevronBlanc.png deleted file mode 100644 index 9a60443..0000000 Binary files a/images/ChevronBlanc.png and /dev/null differ diff --git a/images/checkprofile.png b/images/checkprofile.png deleted file mode 100644 index f979e5c..0000000 Binary files a/images/checkprofile.png and /dev/null differ diff --git a/images/facebook.svg b/images/facebook.svg deleted file mode 100644 index edf43cf..0000000 --- a/images/facebook.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/homepage/banniere.png b/images/homepage/banniere.png deleted file mode 100644 index 7a04ed9..0000000 Binary files a/images/homepage/banniere.png and /dev/null differ diff --git a/images/homepage/bannierenousjoindre.png b/images/homepage/bannierenousjoindre.png deleted file mode 100644 index 423cc05..0000000 Binary files a/images/homepage/bannierenousjoindre.png and /dev/null differ diff --git a/images/homepage/cestquoihutopy.png b/images/homepage/cestquoihutopy.png deleted file mode 100644 index 3e7b0ea..0000000 Binary files a/images/homepage/cestquoihutopy.png and /dev/null differ diff --git a/images/homepage/love.png b/images/homepage/love.png deleted file mode 100644 index 7f0f2de..0000000 Binary files a/images/homepage/love.png and /dev/null differ diff --git a/images/icons/home.svg b/images/icons/home.svg deleted file mode 100644 index b85fcf9..0000000 --- a/images/icons/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/inspirer.png b/images/inspirer.png deleted file mode 100644 index 6edf7ab..0000000 Binary files a/images/inspirer.png and /dev/null differ diff --git a/images/instablack.png b/images/instablack.png deleted file mode 100644 index 173c319..0000000 Binary files a/images/instablack.png and /dev/null differ diff --git a/images/instagram.svg b/images/instagram.svg deleted file mode 100644 index 15b4568..0000000 --- a/images/instagram.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/likeicon.svg b/images/likeicon.svg deleted file mode 100644 index 2db5aba..0000000 --- a/images/likeicon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/roadmapbanner.png b/images/roadmapbanner.png deleted file mode 100644 index 2689189..0000000 Binary files a/images/roadmapbanner.png and /dev/null differ diff --git a/images/tiktok.svg b/images/tiktok.svg deleted file mode 100644 index 3445dfa..0000000 --- a/images/tiktok.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/x.svg b/images/x.svg deleted file mode 100644 index c40bd3d..0000000 --- a/images/x.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/hutopy.png b/public/images/hutopymedia/banners/hutopy.png similarity index 100% rename from images/hutopy.png rename to public/images/hutopymedia/banners/hutopy.png diff --git a/images/hutopyblack.png b/public/images/hutopymedia/banners/hutopyblack.png similarity index 100% rename from images/hutopyblack.png rename to public/images/hutopymedia/banners/hutopyblack.png diff --git a/images/contactpage/contactpicture.png b/public/images/hutopymedia/contactpage/contactpicture.png similarity index 100% rename from images/contactpage/contactpicture.png rename to public/images/hutopymedia/contactpage/contactpicture.png diff --git a/images/homepage/bannierehomepage.png b/public/images/hutopymedia/homepage/bannierehomepage.png similarity index 100% rename from images/homepage/bannierehomepage.png rename to public/images/hutopymedia/homepage/bannierehomepage.png diff --git a/images/homepage/creer.png b/public/images/hutopymedia/homepage/creer.png similarity index 100% rename from images/homepage/creer.png rename to public/images/hutopymedia/homepage/creer.png diff --git a/images/homepage/girlarmy.png b/public/images/hutopymedia/homepage/girlarmy.png similarity index 100% rename from images/homepage/girlarmy.png rename to public/images/hutopymedia/homepage/girlarmy.png diff --git a/images/homepage/girlvr.png b/public/images/hutopymedia/homepage/girlvr.png similarity index 100% rename from images/homepage/girlvr.png rename to public/images/hutopymedia/homepage/girlvr.png diff --git a/images/homepage/grinding.png b/public/images/hutopymedia/homepage/grinding.png similarity index 100% rename from images/homepage/grinding.png rename to public/images/hutopymedia/homepage/grinding.png diff --git a/images/homepage/inspirer.png b/public/images/hutopymedia/homepage/inspirer.png similarity index 100% rename from images/homepage/inspirer.png rename to public/images/hutopymedia/homepage/inspirer.png diff --git a/images/homepage/microphone.png b/public/images/hutopymedia/homepage/microphone.png similarity index 100% rename from images/homepage/microphone.png rename to public/images/hutopymedia/homepage/microphone.png diff --git a/images/homepage/partager.png b/public/images/hutopymedia/homepage/partager.png similarity index 100% rename from images/homepage/partager.png rename to public/images/hutopymedia/homepage/partager.png diff --git a/images/homepage/votrehutopy.png b/public/images/hutopymedia/homepage/votrehutopy.png similarity index 100% rename from images/homepage/votrehutopy.png rename to public/images/hutopymedia/homepage/votrehutopy.png diff --git a/images/Chevron2.png b/public/images/hutopymedia/hutopymediafiles/mobilemenulogo.png similarity index 100% rename from images/Chevron2.png rename to public/images/hutopymedia/hutopymediafiles/mobilemenulogo.png diff --git a/images/facebookblack.png b/public/images/hutopymedia/icons/black/facebookblack.png similarity index 100% rename from images/facebookblack.png rename to public/images/hutopymedia/icons/black/facebookblack.png diff --git a/images/instaicon.png b/public/images/hutopymedia/icons/black/instagramblack.png similarity index 100% rename from images/instaicon.png rename to public/images/hutopymedia/icons/black/instagramblack.png diff --git a/images/xblack.png b/public/images/hutopymedia/icons/black/xblack.png similarity index 100% rename from images/xblack.png rename to public/images/hutopymedia/icons/black/xblack.png diff --git a/images/facebookiconblackpink.png b/public/images/hutopymedia/icons/pink/facebookpink.png similarity index 100% rename from images/facebookiconblackpink.png rename to public/images/hutopymedia/icons/pink/facebookpink.png diff --git a/images/instagramblackpink.png b/public/images/hutopymedia/icons/pink/instagrampink.png similarity index 100% rename from images/instagramblackpink.png rename to public/images/hutopymedia/icons/pink/instagrampink.png diff --git a/images/xblackpink.png b/public/images/hutopymedia/icons/pink/xpink.png similarity index 100% rename from images/xblackpink.png rename to public/images/hutopymedia/icons/pink/xpink.png diff --git a/images/icons/bookmark.png b/public/images/hutopymedia/icons/white/bookmark.png similarity index 100% rename from images/icons/bookmark.png rename to public/images/hutopymedia/icons/white/bookmark.png diff --git a/images/facebookicon.png b/public/images/hutopymedia/icons/white/facebookwhite.png similarity index 100% rename from images/facebookicon.png rename to public/images/hutopymedia/icons/white/facebookwhite.png diff --git a/images/instawhite.png b/public/images/hutopymedia/icons/white/instagramwhite.png similarity index 100% rename from images/instawhite.png rename to public/images/hutopymedia/icons/white/instagramwhite.png diff --git a/images/icons/messenger.png b/public/images/hutopymedia/icons/white/messenger.png similarity index 100% rename from images/icons/messenger.png rename to public/images/hutopymedia/icons/white/messenger.png diff --git a/images/icons/share.png b/public/images/hutopymedia/icons/white/share.png similarity index 100% rename from images/icons/share.png rename to public/images/hutopymedia/icons/white/share.png diff --git a/images/tiktok.png b/public/images/hutopymedia/icons/white/tiktokwhite.png similarity index 100% rename from images/tiktok.png rename to public/images/hutopymedia/icons/white/tiktokwhite.png diff --git a/images/xicon.png b/public/images/hutopymedia/icons/white/xwhite.png similarity index 100% rename from images/xicon.png rename to public/images/hutopymedia/icons/white/xwhite.png diff --git a/images/loginpage/loginhutopy.png b/public/images/hutopymedia/loginpage/loginhutopy.png similarity index 100% rename from images/loginpage/loginhutopy.png rename to public/images/hutopymedia/loginpage/loginhutopy.png diff --git a/images/tos/headerbackground.png b/public/images/hutopymedia/tospage/headerbackground.png similarity index 100% rename from images/tos/headerbackground.png rename to public/images/hutopymedia/tospage/headerbackground.png diff --git a/public/images/usersmedia/anonyme/profilepictures/profileAnonymeLarge.png b/public/images/usersmedia/anonyme/profilepictures/profileAnonymeLarge.png new file mode 100644 index 0000000..b3f3071 Binary files /dev/null and b/public/images/usersmedia/anonyme/profilepictures/profileAnonymeLarge.png differ diff --git a/images/anonyme.png b/public/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png similarity index 100% rename from images/anonyme.png rename to public/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png diff --git a/images/pascal.jpg b/public/images/usersmedia/anonyme/profilepictures/profilePascal.jpg similarity index 100% rename from images/pascal.jpg rename to public/images/usersmedia/anonyme/profilepictures/profilePascal.jpg diff --git a/images/guillaimeaime.png b/public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime.png similarity index 100% rename from images/guillaimeaime.png rename to public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime.png diff --git a/images/guillaimeaime2x.png b/public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime2x.png similarity index 100% rename from images/guillaimeaime2x.png rename to public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime2x.png diff --git a/images/guillaimeaime3x.png b/public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime3x.png similarity index 100% rename from images/guillaimeaime3x.png rename to public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaimeaime3x.png diff --git a/images/guillaume.png b/public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaume.png similarity index 100% rename from images/guillaume.png rename to public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaume.png diff --git a/images/guillaumepublication.jpg b/public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaumepublication.jpg similarity index 100% rename from images/guillaumepublication.jpg rename to public/images/usersmedia/guillaumeMousseau/backup-pictures/guillaumepublication.jpg diff --git a/public/images/usersmedia/guillaumeMousseau/banners/bannerGuillaumeMousseau01.png b/public/images/usersmedia/guillaumeMousseau/banners/bannerGuillaumeMousseau01.png new file mode 100644 index 0000000..20edfb5 Binary files /dev/null and b/public/images/usersmedia/guillaumeMousseau/banners/bannerGuillaumeMousseau01.png differ diff --git a/public/images/usersmedia/guillaumeMousseau/pictures/posts/cestparti.jpg b/public/images/usersmedia/guillaumeMousseau/pictures/posts/cestparti.jpg new file mode 100644 index 0000000..ecd07a0 Binary files /dev/null and b/public/images/usersmedia/guillaumeMousseau/pictures/posts/cestparti.jpg differ diff --git a/public/images/usersmedia/guillaumeMousseau/pictures/posts/nouvelleboutique.jpg b/public/images/usersmedia/guillaumeMousseau/pictures/posts/nouvelleboutique.jpg new file mode 100644 index 0000000..8cd36d0 Binary files /dev/null and b/public/images/usersmedia/guillaumeMousseau/pictures/posts/nouvelleboutique.jpg differ diff --git a/images/guillaume.jpg b/public/images/usersmedia/guillaumeMousseau/profilepictures/profileGuillaumeMousseau01.jpg similarity index 100% rename from images/guillaume.jpg rename to public/images/usersmedia/guillaumeMousseau/profilepictures/profileGuillaumeMousseau01.jpg diff --git a/public/images/usersmedia/guillaumeMousseau/profilepictures/profileGuillaumeMousseau01.png b/public/images/usersmedia/guillaumeMousseau/profilepictures/profileGuillaumeMousseau01.png new file mode 100644 index 0000000..d4a1075 Binary files /dev/null and b/public/images/usersmedia/guillaumeMousseau/profilepictures/profileGuillaumeMousseau01.png differ diff --git a/src/layouts/CardDonate.vue b/src/layouts/CardDonate.vue deleted file mode 100644 index 123c1a1..0000000 --- a/src/layouts/CardDonate.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue index 83b1759..50a92ed 100644 --- a/src/layouts/DefaultLayout.vue +++ b/src/layouts/DefaultLayout.vue @@ -2,45 +2,64 @@ - - + + + + - - - - - Logo -

ANONYME

-
-
-
+ + + + + Inscription + + + + +
- + - Logo - + + Logo + + + - + - + +

Navigation

@@ -50,64 +69,31 @@ - - -

Outils

- - - + + +
- - -
- -
- - \ No newline at end of file diff --git a/src/layouts/FormInscriptionBeta.vue b/src/layouts/FormInscriptionBeta.vue deleted file mode 100644 index 5264e90..0000000 --- a/src/layouts/FormInscriptionBeta.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/src/layouts/SimpleVideoCard.vue b/src/layouts/SimpleVideoCard.vue deleted file mode 100644 index 703ad58..0000000 --- a/src/layouts/SimpleVideoCard.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/src/plugins/api.js b/src/plugins/api.js index ee75e5b..41e9469 100644 --- a/src/plugins/api.js +++ b/src/plugins/api.js @@ -10,7 +10,7 @@ export default function(app) { // depending on the environment, the correct file will be used const api = axios.create({ baseURL: import.meta.env.VITE_API_URL, - timeout: 2000, + timeout: 10000, }); const requestInterceptor = (config) => { diff --git a/src/router/index.js b/src/router/index.js index 5be0543..5141903 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,8 +1,7 @@ -import ProjectRoadmap from '@/views/main/ProjectRoadmap.vue' -import AmbassadorProgram from '@/views/tos/AmbassadorProgram.vue' -import AntiExploitation from '@/views/tos/AntiExploitation.vue' -import ConditionsOfUse from '@/views/tos/ConditionsOfUse.vue' +import About from '@/views/tos/About.vue' import ContentPolicy from '@/views/tos/ContentPolicy.vue' +import FAQ from '@/views/tos/FAQ.vue' +import GuideForCreators from '@/views/tos/GuideForCreators.vue' import HelpAndContact from '@/views/tos/HelpAndContact.vue' import TermsAndConditions from '@/views/tos/TermsAndConditions.vue' import { createRouter, createWebHistory } from 'vue-router' @@ -10,9 +9,11 @@ import LoginView from '../views/LoginView.vue' import SignupView from '../views/SignupView.vue' import ContactView from '../views/main/ContactView.vue' import CreatorFolio from '../views/main/CreatorFolio.vue' +import PaymentCompleted from '../views/PayementCompleted.vue' import HomeView from '../views/main/HomeView.vue' import YourProfile from '../views/main/YourProfile.vue' + const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ @@ -22,10 +23,16 @@ const router = createRouter({ component: HomeView }, { - path: '/creatorfolio', + path: '/guillaumeaime', name: 'creatorfolio', component: CreatorFolio }, + + { + path: '/paymentcompleted', + name: 'PayementCompleted', + component: PaymentCompleted + }, { path: '/yourprofile', name: 'yourprofile', @@ -46,11 +53,6 @@ const router = createRouter({ name: 'login', component: LoginView }, - { - path: '/roadmap', - name: 'roadmap', - component: ProjectRoadmap - }, { path: '/home', name: 'home', @@ -72,19 +74,20 @@ const router = createRouter({ component: ContentPolicy }, { - path: '/ambassadorprogram', - name: 'ambassadorprogram', - component: AmbassadorProgram + path: '/faq', + name: 'FAQ', + component: FAQ }, { - path: '/conditionofuse', - name: 'conditionofuse', - component: ConditionsOfUse + path: '/guideforcreators', + name: 'guideforcreators', + component: GuideForCreators }, + { - path: '/antiexploitation', - name: 'antiexploitation', - component: AntiExploitation + path: '/about', + name: 'about', + component: About }, ], scrollBehavior(to, from, savedPosition) { diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 2596bec..2ef11c5 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -13,14 +13,14 @@ - +

Connexion

-

Comment souhaitez-vous - vous connecter à votre compte?

+

Comment souhaitez-vous vous connecter à votre + compte?

Login
-

- Pas encore - inscrit?

+

Pas encore inscrit?

Inscriptions @@ -63,7 +61,7 @@
+ src="/images/hutopymedia/loginpage/loginhutopy.png">

Connexion

Comment souhaitez-vous @@ -93,10 +91,7 @@

- - - @@ -119,8 +114,8 @@ let errorSnackBar = ref(false); async function login() { // TODO: Make the store handle errors try { - await store.login(api, user.value.email, user.value.password) - router.push('/'); + await store.login(api, user.value.email, user.value.password) + router.push('/'); } catch (error) { errorSnackBar.value = true; } @@ -146,7 +141,6 @@ const googleCallback = (response) => { } - @media (min-width: 300px) { .h1-connexion { font-size: 2em; diff --git a/src/views/PayementCompleted.vue b/src/views/PayementCompleted.vue new file mode 100644 index 0000000..ad02f0d --- /dev/null +++ b/src/views/PayementCompleted.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/src/views/SignupView.vue b/src/views/SignupView.vue index 5ef6108..9c45b1f 100644 --- a/src/views/SignupView.vue +++ b/src/views/SignupView.vue @@ -1,65 +1,73 @@ + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/StripePayment.vue b/src/views/StripePayment.vue index 3c5d9f0..5346ef0 100644 --- a/src/views/StripePayment.vue +++ b/src/views/StripePayment.vue @@ -2,7 +2,7 @@ - @@ -54,6 +54,7 @@ import { onMounted, ref } from "vue"; let stripe = null; const client = useClient(); const price = ref(0); +const tipMessage = ref(""); const isPaymentDialogActive = ref(false); var checkout; @@ -69,7 +70,9 @@ const fetchClientSecret = async () => { async function createCheckoutSession() { let clientSecret = await client.post('/api/Stripe', { - price: price.value * 100 + amount: (price.value * 100), + tipMessage: tipMessage.value, + creatorId: "5b122430-442a-4967-98b6-6c7787c70c91" }); let secret = clientSecret["data"]; diff --git a/src/views/main/ContactView.vue b/src/views/main/ContactView.vue index 3108e71..738f19a 100644 --- a/src/views/main/ContactView.vue +++ b/src/views/main/ContactView.vue @@ -4,14 +4,13 @@
+ +
+ + - + +

PARTICIPEZ AU DÉVELOPPEMENT

- - - + + + + - - - - Envoyez - - + + Envoyez + + +

Rejoignez l'aventure Hutopy : une invitation à façonner l'avenir de la création. @@ -143,15 +148,72 @@

- + +
+ + + + + + + +

INFORMATIONS REÇU

+
+ mdi-emoticon-happy + + Merci de vous intéresser à notre projet. Lorsque nous serons prêts, nous vous contacterons afin que vous + puissiez vous inscrire en primeur sur la plateforme pour nous aider à la développer. Chaque étape du + développement est importante, et nous voulons construire cette plateforme avec vous, pour vous. + + + Fermer + + +
+
+ + + diff --git a/src/views/main/CreatorFeed.vue b/src/views/main/CreatorFeed.vue deleted file mode 100644 index 877fbe5..0000000 --- a/src/views/main/CreatorFeed.vue +++ /dev/null @@ -1,16 +0,0 @@ - - -
- -
- - - - - - - - -
-
\ No newline at end of file diff --git a/src/views/main/CreatorFolio copy.vue b/src/views/main/CreatorFolio copy.vue deleted file mode 100644 index 06fc8a3..0000000 --- a/src/views/main/CreatorFolio copy.vue +++ /dev/null @@ -1,776 +0,0 @@ - - - - - - - diff --git a/src/views/main/CreatorFolio.vue b/src/views/main/CreatorFolio.vue index f2660b6..718807b 100644 --- a/src/views/main/CreatorFolio.vue +++ b/src/views/main/CreatorFolio.vue @@ -1,7 +1,6 @@