diff --git a/public/medias/hutopy.png b/public/medias/hutopy.png new file mode 100644 index 0000000..4b71848 Binary files /dev/null and b/public/medias/hutopy.png differ diff --git a/src/App.vue b/src/App.vue index 7e1f5b6..3f26cbc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,95 @@ diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue deleted file mode 100644 index 5ba3c0b..0000000 --- a/src/layouts/DefaultLayout.vue +++ /dev/null @@ -1,242 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/layouts/FooterLayout.vue b/src/layouts/FooterLayout.vue deleted file mode 100644 index 8d7c16b..0000000 --- a/src/layouts/FooterLayout.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/layouts/MainPage.vue b/src/layouts/MainPage.vue deleted file mode 100644 index 077bd39..0000000 --- a/src/layouts/MainPage.vue +++ /dev/null @@ -1,964 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/layouts/postcomponents/postimagecomponents b/src/layouts/postcomponents/postimagecomponents deleted file mode 100644 index e69de29..0000000 diff --git a/src/main.js b/src/main.js index e0578b6..f2e3024 100644 --- a/src/main.js +++ b/src/main.js @@ -1,32 +1,27 @@ -import './assets/main.css' -import { createApp } from 'vue' -import { createPinia } from 'pinia' +import {createApp} from 'vue' import App from './App.vue' import router from './router' +import './assets/main.css' +import {createPinia} from 'pinia' import '@mdi/font/css/materialdesignicons.css' import 'vuetify/styles' -import { createVuetify } from 'vuetify' +import {createVuetify} from 'vuetify' import * as components from 'vuetify/components' import * as directives from 'vuetify/directives' import clientPlugin from './plugins/api.js' import vueGoogleOauth from 'vue3-google-login' const vuetify = createVuetify({ - components, - directives + components, + directives }); -const app = createApp(App); - -// Create an axios client preconfigured to the Hutopy API. -app.use(clientPlugin); - -app.use(vueGoogleOauth, { - clientId: import.meta.env.VITE_GOOGLE_CLIENT_ID, -}); - -app.use(createPinia()); -app.use(vuetify); -app.use(router); - -app.mount('#app') +createApp(App) + .use(clientPlugin) + .use(createPinia()) + .use(vuetify) + .use(router) + .use(vueGoogleOauth, { + clientId: import.meta.env.VITE_GOOGLE_CLIENT_ID, + }) + .mount('#app'); diff --git a/src/router/index.js b/src/router/index.js index 5414f70..cb603d2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,164 +1,137 @@ +import {createRouter, createWebHistory} from 'vue-router' import ARPS from '@/views/manualusers/ARPS.vue' import GuillaumeAime from '@/views/manualusers/GuillaumeAime.vue' -import About from '@/views/tos/About.vue' -import ContentPolicy from '@/views/tos/ContentPolicy.vue' -import FAQ from '@/views/tos/FAQ.vue' -import Frais from '@/views/tos/Frais.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' -import MainPage from '../layouts/MainPage.vue' +import About from '@/views/pages/About.vue' +import ContentPolicy from '@/views/pages/ContentPolicy.vue' +import FAQ from '@/views/pages/FAQ.vue' +import Pricing from '@/views/pages/Pricing.vue' +import CreatorGuide from '@/views/pages/CreatorGuide.vue' +import HelpAndContact from '@/views/pages/HelpAndContact.vue' +import TermsAndConditions from '@/views/pages/TermsAndConditions.vue' import LoginView from '../views/LoginView.vue' import PaymentCompleted from '../views/PayementCompleted.vue' import SignupView from '../views/SignupView.vue' -import ContactView from '../views/main/ContactView.vue' -import CreatorMainPage from '../views/main/CreatorMainPage.vue' -import CreatorFolio from '../views/main/CreatorFolio.vue' -import HomeView from '../views/main/HomeView.vue' -import UserBrowser from '../views/main/UsersBrowser.vue' +import Join from '../views/main/Join.vue' +import Home from '../views/main/Home.vue' +import Browse from '../views/main/Browse.vue' import YourProfile from '../views/main/YourProfile.vue' import ChloeBeaugrand from '../views/manualusers/ChloeProfile.vue' -import Hutopy from '../views/manualusers/HutopyProfile.vue' import Leffet from '../views/manualusers/LeffetProfile.vue' import MathieuCaron from '../views/manualusers/MathieuCaron.vue' +import Creator from "@/views/main/Creator.vue"; const routes = [ - { - path: '/', - name: 'main', - component: HomeView - }, - { - path: '/creatorfolio', - name: 'creatorfolio', - component: CreatorFolio - }, - { - path: '/paymentcompleted', - name: 'PayementCompleted', - component: PaymentCompleted - }, - { - path: '/yourprofile', - name: 'yourprofile', - component: YourProfile - }, - { - path: '/contact', - name: 'contact', - component: ContactView - }, - { - path: '/signup', - name: 'signup', - component: SignupView - }, - { - path: '/login', - name: 'login', - component: LoginView - }, - { - path: '/home', - name: 'home', - component: HomeView - }, - { - path: '/helpandcontact', - name: 'helpandcontact', - component: HelpAndContact - }, - { - path: '/termsandconditions', - name: 'termsandconditions', - component: TermsAndConditions - }, - { - path: '/contentpolicy', - name: 'contentpolicy', - component: ContentPolicy - }, - { - path: '/faq', - name: 'FAQ', - component: FAQ - }, - { - path: '/guideforcreators', - name: 'guideforcreators', - component: GuideForCreators - }, - { - path: '/about', - name: 'about', - component: About - }, - { - path: '/frais', - name: 'frais', - component: Frais - }, - { - path: '/Hutopy', - name: 'Hutopy', - component: Hutopy - }, - { - path: '/Leffet', - name: 'Leffet', - component: Leffet - }, - { - path: '/userbrowser', - name: 'userbrowser', - component: UserBrowser - }, - { - path: '/chloebeaugrand', - name: 'chloebeaugrand', - component: ChloeBeaugrand - }, - { - path: '/guillaumeaime', - name: 'guillaumeaime', - component: GuillaumeAime - }, - { - path: '/mathieucaron', - name: 'mathieucaron', - component: MathieuCaron - }, - { - path: '/arps', - name: 'arps', - component: ARPS - }, - { - path: '/:username', - name: 'user-profile', - component: MainPage - }, + { + path: '/', + component: Home, + meta: {hideSideBar: true} + }, + { + path: '/browse', + component: Browse + }, + + { + path: '/@leffet', + component: Leffet + }, + { + path: '/@chloebeaugrand', + component: ChloeBeaugrand + }, + { + path: '/@guillaumeaime', + component: GuillaumeAime + }, + { + path: '/@mathieucaron', + component: MathieuCaron + }, + { + path: '/@arps', + component: ARPS + }, + + { + path: '/@:creator', + component: Creator + }, + + { + path: '/helpandcontact', + component: HelpAndContact, + meta: {hideSideBar: true} + }, + { + path: '/termsandconditions', + name: 'termsandconditions', + component: TermsAndConditions, + meta: {hideSideBar: true} + }, + { + path: '/contentpolicy', + name: 'contentpolicy', + component: ContentPolicy, + meta: {hideSideBar: true} + }, + { + path: '/faq', + name: 'FAQ', + component: FAQ, + meta: {hideSideBar: true} + }, + { + path: '/guideforcreators', + name: 'guideforcreators', + component: CreatorGuide, + meta: {hideSideBar: true} + }, + { + path: '/about', + name: 'about', + component: About, + meta: {hideSideBar: true} + }, + { + path: '/pricing', + name: 'pricing', + component: Pricing, + meta: {hideSideBar: true} + }, + { + path: '/join', + name: 'join', + component: Join, + meta: {hideSideBar: true} + }, + + { + path: '/paymentcompleted', + name: 'PayementCompleted', + component: PaymentCompleted + }, + { + path: '/yourprofile', + name: 'yourprofile', + component: YourProfile + }, + { + path: '/signup', + name: 'signup', + component: SignupView + }, + { + path: '/login', + name: 'login', + component: LoginView + }, + - { - path: '/creatorFolio', - name: 'creatorFolio', - component: CreatorFolio - }, - { - path: '/creatormainpage', - name: 'creatormainpage', - component: CreatorMainPage - } ] const router = createRouter({ - history: createWebHistory(import.meta.env.BASE_URL), - routes, - scrollBehavior(to, from, savedPosition) { - return { top: 0 }; - } - + history: createWebHistory(import.meta.env.BASE_URL), + routes }) export default router diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 81136df..84f2b21 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -1,112 +1,109 @@ diff --git a/src/views/PayementCompleted.vue b/src/views/PayementCompleted.vue index 8af6c9f..e02c937 100644 --- a/src/views/PayementCompleted.vue +++ b/src/views/PayementCompleted.vue @@ -1,8 +1,5 @@ - - - + diff --git a/src/views/main/Browse.vue b/src/views/main/Browse.vue new file mode 100644 index 0000000..8f242a2 --- /dev/null +++ b/src/views/main/Browse.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/src/views/main/Creator.vue b/src/views/main/Creator.vue new file mode 100644 index 0000000..25b6ad2 --- /dev/null +++ b/src/views/main/Creator.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/main/CreatorCard.vue b/src/views/main/CreatorCard.vue new file mode 100644 index 0000000..d6e5128 --- /dev/null +++ b/src/views/main/CreatorCard.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/src/views/main/CreatorFolio.vue b/src/views/main/CreatorFolio.vue deleted file mode 100644 index 2f7eb67..0000000 --- a/src/views/main/CreatorFolio.vue +++ /dev/null @@ -1,951 +0,0 @@ - - - - - diff --git a/src/views/main/CreatorMainPage.vue b/src/views/main/CreatorMainPage.vue deleted file mode 100644 index ebabdbe..0000000 --- a/src/views/main/CreatorMainPage.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/main/CreatorViewComponents/Banner.vue b/src/views/main/CreatorViewComponents/Banner.vue deleted file mode 100644 index 4032a45..0000000 --- a/src/views/main/CreatorViewComponents/Banner.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/main/Footer.vue b/src/views/main/Footer.vue new file mode 100644 index 0000000..2b166b6 --- /dev/null +++ b/src/views/main/Footer.vue @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/src/views/main/Header.vue b/src/views/main/Header.vue new file mode 100644 index 0000000..a60ef7c --- /dev/null +++ b/src/views/main/Header.vue @@ -0,0 +1,127 @@ + + + + diff --git a/src/views/main/Home.vue b/src/views/main/Home.vue new file mode 100644 index 0000000..7d8f606 --- /dev/null +++ b/src/views/main/Home.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/src/views/main/HomeView.vue b/src/views/main/HomeView.vue deleted file mode 100644 index ef8824b..0000000 --- a/src/views/main/HomeView.vue +++ /dev/null @@ -1,672 +0,0 @@ - - - - - diff --git a/src/views/main/ContactView.vue b/src/views/main/Join.vue similarity index 94% rename from src/views/main/ContactView.vue rename to src/views/main/Join.vue index 7ec4227..5f12227 100644 --- a/src/views/main/ContactView.vue +++ b/src/views/main/Join.vue @@ -1,24 +1,12 @@