diff --git a/.env.development b/.env.development index d823d9f..9c0a503 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VITE_API_URL=http://localhost:5001/api/v1 +VITE_API_URL=https://localhost:5001/ diff --git a/images/instawhite.png b/images/instawhite.png index 5853b50..54c1b95 100644 Binary files a/images/instawhite.png and b/images/instawhite.png differ diff --git a/images/tiktok.png b/images/tiktok.png index ad4ed3c..5971013 100644 Binary files a/images/tiktok.png and b/images/tiktok.png differ diff --git a/images/xicon.png b/images/xicon.png index d6e6aa4..fa153b5 100644 Binary files a/images/xicon.png and b/images/xicon.png differ diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue index 7690bad..b44472d 100644 --- a/src/layouts/DefaultLayout.vue +++ b/src/layouts/DefaultLayout.vue @@ -2,112 +2,61 @@ - - - + -
- + + + - - - - - - - + + Logo - - - - - Logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Hello, {{ user.email }} -
- Logout - - - -
+ + + + + + + + + +

Navigation

+ + + + + + + + +

Outils

+ + - -
- - - - - + + +
@@ -122,7 +71,7 @@ import { auth } from '@/stores/auth.js'; import { useRouter } from 'vue-router'; const store = auth(); -const router = useRouter() +const router = useRouter(); const logout = () => { store.logout(); @@ -130,6 +79,78 @@ const logout = () => { } const user = store.user; + - + + + \ No newline at end of file diff --git a/src/layouts/FooterLayout.vue b/src/layouts/FooterLayout.vue index 86f07e9..9fc4c83 100644 --- a/src/layouts/FooterLayout.vue +++ b/src/layouts/FooterLayout.vue @@ -1,56 +1,57 @@ diff --git a/src/router/index.js b/src/router/index.js index 90adce9..4c2fa65 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,17 +1,18 @@ +import ProjectRoadmap from '@/views/main/ProjectRoadmap.vue' import { createRouter, createWebHistory } from 'vue-router' -import HomeView from '../views/main/HomeView.vue' -import SignupView from '../views/SignupView.vue' 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 HomeView from '../views/main/HomeView.vue' import YourProfile from '../views/main/YourProfile.vue' -import ProjectRoadmap from '@/views/main/ProjectRoadmap.vue' + const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ { path: '/', - name: 'home', + name: 'main', component: HomeView }, { @@ -44,9 +45,15 @@ const router = createRouter({ name: 'roadmap', component: ProjectRoadmap }, - - - ] + { + path: '/home', + name: 'home', + component: HomeView + }, + ], + scrollBehavior(to, from, savedPosition) { + return { top: 0 }; + } }) export default router diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index a214eda..d62c6d6 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -8,7 +8,7 @@ - + @@ -58,7 +58,7 @@
+ src="../../images/loginpage/loginhutopy.png">

Connexion

Comment souhaitez-vous @@ -112,12 +112,13 @@ let errorSnackBar = ref(false); async function login() { 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; } } + diff --git a/src/views/main/ContactView.vue b/src/views/main/ContactView.vue index 8fc42b8..3108e71 100644 --- a/src/views/main/ContactView.vue +++ b/src/views/main/ContactView.vue @@ -1,4 +1,5 @@ - - @@ -185,7 +160,16 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; background-color: #f4f4f4; } +.Scale-80 { + transform: translateY(-30%); +} + @media (min-width: 150px) and (max-width: 598px) { + + .labelgroup { + margin-top: -50%; + } + .contact-image { width: auto; @@ -204,10 +188,11 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .h2-Participez-au-développement { - font-size: 1.8rem; - margin-top: 3%; + font-size: 1.4rem; + margin-top: 5%; margin-bottom: 6%; margin-left: 5%; + font-weight: 600; } .home-btn { @@ -243,20 +228,22 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; box-shadow: 0 8px 12px rgba(0, 0, 0, 0.5); max-width: 100%; margin-top: 4%; + height: 103%; } .home-btn { - margin-top: 5%; + margin-top: 20%; border-radius: 30px; - width: 180px; - min-width: 175px; - margin-left: 70%; + width: 140px; + + min-width: 140px; + margin-left: 55%; } .h2-Participez-au-développement { - font-size: 2rem; - margin-top: -3%; + font-size: 1.6rem; + margin-top: 10%; margin-bottom: 6%; } @@ -270,6 +257,11 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; } + .hutopy-header-image { + margin-top: 6%; + width: 400px; + margin-left: 2%; + } } @@ -284,17 +276,20 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; } .home-btn { - margin-top: 5%; + margin-top: 35%; border-radius: 30px; - width: 180px; - min-width: 175px; - margin-left: 74%; + width: auto; + min-width: 160px; + max-width: 180px; + margin-left: 40%; + + } .h2-Participez-au-développement { font-size: 2rem; - margin-top: -3%; + margin-top: 10%; margin-bottom: 6%; } @@ -307,7 +302,11 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; margin-top: 3%; } - + .hutopy-header-image { + margin-top: 6%; + width: 500px; + margin-left: 1%; + } } @@ -316,7 +315,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .hutopy-header-image { margin: 0 auto; height: 120px; - margin-left: -0%; + margin-left: 1%; } @@ -326,7 +325,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; border-radius: 30px; width: 180px; min-width: 175px; - margin-left: 22%; + margin-left: 30%; margin-top: 37%; @@ -370,7 +369,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .hutopy-header-image { margin: 0 auto; height: 165px; - margin-left: -4%; + margin-left: -2.8%; } .home-btn { @@ -379,7 +378,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; border-radius: 30px; width: 180px; min-width: 175px; - margin-left: 50%; + margin-left: 53%; margin-top: 45%; @@ -436,7 +435,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .hutopy-header-image { margin: 0 auto; height: 165px; - margin-left: -5%; + margin-left: -3%; } .home-btn { @@ -445,7 +444,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; border-radius: 30px; width: 180px; min-width: 175px; - margin-left: 75%; + margin-left: 82%; margin-top: 40%; @@ -501,7 +500,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .hutopy-header-image { margin: 0 auto; height: 160px; - margin-left: -8%; + margin-left: -4.6%; } .contact-image { @@ -512,7 +511,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .home-btn { margin-top: 5%; - margin-left: 47%; + margin-left: 53%; border-radius: 30px; width: 180px; min-width: 175px; @@ -571,7 +570,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .hutopy-header-image { margin: 0 auto; height: 180px; - margin-left: 7%; + margin-left: 3.5%; } .contact-image { @@ -583,7 +582,7 @@ import FooterLayout from '@/layouts/FooterLayout.vue'; .home-btn { margin-top: 5%; - margin-left: 33%; + margin-left: 30%; border-radius: 30px; width: 180px; min-width: 175px; diff --git a/src/views/main/CreatorFolio copy.vue b/src/views/main/CreatorFolio copy.vue new file mode 100644 index 0000000..06fc8a3 --- /dev/null +++ b/src/views/main/CreatorFolio copy.vue @@ -0,0 +1,776 @@ + + + + + + + diff --git a/src/views/main/CreatorFolio.vue b/src/views/main/CreatorFolio.vue index 396fb8e..c1dac89 100644 --- a/src/views/main/CreatorFolio.vue +++ b/src/views/main/CreatorFolio.vue @@ -1,317 +1,294 @@ + + + diff --git a/src/views/main/HomeView.vue b/src/views/main/HomeView.vue index 099c1f3..ac26e1c 100644 --- a/src/views/main/HomeView.vue +++ b/src/views/main/HomeView.vue @@ -1,142 +1,140 @@ - @@ -640,8 +648,6 @@ body { .votre_hutopy_fontsize { font-size: 0.9em; } - - } @media (min-width: 1537px) and (max-width: 1920px) {