diff --git a/index.html b/index.html index 7846ff0..f5eff92 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + diff --git a/package-lock.json b/package-lock.json index 0cb8264..596a93a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1286,11 +1286,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2013,9 +2013,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2060,9 +2060,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", diff --git a/public/images/hutopymedia/icons/logohutopy.png b/public/images/hutopymedia/icons/logohutopy.png new file mode 100644 index 0000000..4935df6 Binary files /dev/null and b/public/images/hutopymedia/icons/logohutopy.png differ 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..a6937b7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,101 @@ + + diff --git a/src/eventBus.js b/src/eventBus.js new file mode 100644 index 0000000..024f9c3 --- /dev/null +++ b/src/eventBus.js @@ -0,0 +1,3 @@ +import { ref } from 'vue'; + +export const eventBus = ref({}); \ No newline at end of file diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue deleted file mode 100644 index 2bee566..0000000 --- a/src/layouts/DefaultLayout.vue +++ /dev/null @@ -1,265 +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 ab2d6ce..6aca19e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,158 +1,143 @@ +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/documentation/About.vue' +import ContentPolicy from '@/views/documentation/ContentPolicy.vue' +import FAQ from '@/views/documentation/FAQ.vue' +import Pricing from '@/views/documentation/Pricing.vue' +import CreatorGuide from '@/views/documentation/CreatorGuide.vue' +import HelpAndContact from '@/views/documentation/HelpAndContact.vue' +import TermsAndConditions from '@/views/documentation/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 CreatorFolio from '../views/main/CreatorFolio.vue' -import HomeView from '../views/main/HomeView.vue' -import UserBrowser from '../views/main/UsersBrowser.vue' -import YourProfile from '../views/main/YourProfile.vue' +import Join from '../views/main/Join.vue' +import Home from '../views/main/Home.vue' +import Browse from '../views/main/Browse.vue' +import Wallet from '../views/main/Wallet.vue' +import Profile from '../views/main/Profile.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: '/profile', + name: 'profile', + component: Profile + }, + { + path: '/signup', + name: 'signup', + component: SignupView + }, + { + path: '/login', + name: 'login', + component: LoginView + }, + { + path: '/wallet', + name: 'wallet', + component: Wallet + }, + - { - path: '/creatorFolio', - name: 'creatorFolio', - component: CreatorFolio - } ] 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/stores/auth.js b/src/stores/auth.js index 976fdb1..9973860 100644 --- a/src/stores/auth.js +++ b/src/stores/auth.js @@ -15,12 +15,13 @@ export const auth = defineStore({ async login(client, email, password) { const requestBody = { - emailAddress: email, + email: email, password: password }; const response = await client.post(`${baseUrl}/users/login`, requestBody) this.user = { - accessToken: response.data, + accessToken: response.data.accessToken, + refreshToken: response.data.refreshToken, } localStorage.setItem('jwt', this.user.accessToken); diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index a9966cc..e282c2d 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -1,111 +1,113 @@ - - - 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/documentation/About.vue b/src/views/documentation/About.vue new file mode 100644 index 0000000..2c53397 --- /dev/null +++ b/src/views/documentation/About.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/ContentPolicy.vue b/src/views/documentation/ContentPolicy.vue new file mode 100644 index 0000000..085c4cc --- /dev/null +++ b/src/views/documentation/ContentPolicy.vue @@ -0,0 +1,324 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/CreatorGuide.vue b/src/views/documentation/CreatorGuide.vue new file mode 100644 index 0000000..999c8b5 --- /dev/null +++ b/src/views/documentation/CreatorGuide.vue @@ -0,0 +1,108 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/FAQ.vue b/src/views/documentation/FAQ.vue new file mode 100644 index 0000000..9b58f48 --- /dev/null +++ b/src/views/documentation/FAQ.vue @@ -0,0 +1,193 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/HelpAndContact.vue b/src/views/documentation/HelpAndContact.vue new file mode 100644 index 0000000..8914b2f --- /dev/null +++ b/src/views/documentation/HelpAndContact.vue @@ -0,0 +1,86 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/Pricing.vue b/src/views/documentation/Pricing.vue new file mode 100644 index 0000000..6d7f12f --- /dev/null +++ b/src/views/documentation/Pricing.vue @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/src/views/documentation/TermsAndConditions.vue b/src/views/documentation/TermsAndConditions.vue new file mode 100644 index 0000000..3456413 --- /dev/null +++ b/src/views/documentation/TermsAndConditions.vue @@ -0,0 +1,151 @@ + + + + \ No newline at end of file diff --git a/src/views/main/Aboutyou.vue b/src/views/main/Aboutyou.vue new file mode 100644 index 0000000..dd00f83 --- /dev/null +++ b/src/views/main/Aboutyou.vue @@ -0,0 +1,111 @@ + + + + + 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..7984b51 --- /dev/null +++ b/src/views/main/Creator.vue @@ -0,0 +1,43 @@ + + + + + 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/CreatorFeed.vue b/src/views/main/CreatorFeed.vue new file mode 100644 index 0000000..62cc596 --- /dev/null +++ b/src/views/main/CreatorFeed.vue @@ -0,0 +1,50 @@ + + \ 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 3a29576..0000000 --- a/src/views/main/CreatorFolio.vue +++ /dev/null @@ -1,941 +0,0 @@ - - - - - diff --git a/src/views/main/DonationPopup.vue b/src/views/main/DonationPopup.vue new file mode 100644 index 0000000..5861d39 --- /dev/null +++ b/src/views/main/DonationPopup.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/views/main/Footer.vue b/src/views/main/Footer.vue new file mode 100644 index 0000000..a368891 --- /dev/null +++ b/src/views/main/Footer.vue @@ -0,0 +1,10 @@ + + + diff --git a/src/views/main/Header.vue b/src/views/main/Header.vue new file mode 100644 index 0000000..c816fe8 --- /dev/null +++ b/src/views/main/Header.vue @@ -0,0 +1,181 @@ + + + + + + diff --git a/src/views/main/Home.vue b/src/views/main/Home.vue new file mode 100644 index 0000000..4722aba --- /dev/null +++ b/src/views/main/Home.vue @@ -0,0 +1,104 @@ + + + + + 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 @@