From 14c97c35dca864c1a730f7bf13f7a4affc7ff28f Mon Sep 17 00:00:00 2001 From: Jonathan Bourdon Date: Tue, 22 Oct 2024 16:40:50 -0400 Subject: [PATCH] WIP --- src/router/router.js | 19 - src/stores/subscriptionStore.js | 43 +- src/views/SignupView.vue | 66 -- src/views/creators/CreatorHome.vue | 34 +- src/views/creators/DonationButton.vue | 42 +- src/views/creators/FollowButton.vue | 94 --- src/views/creators/SubscribeButton.vue | 29 +- src/views/creators/SubscriptionList.vue | 2 +- src/views/creators/SubscriptionMenu.vue | 118 +-- .../banner/bannerlower/BannerActionsXl.vue | 2 - src/views/main/Join.vue | 673 ------------------ src/views/main/Register.vue | 19 - src/views/main/RegisterForm.vue | 219 ------ 13 files changed, 141 insertions(+), 1219 deletions(-) delete mode 100644 src/views/SignupView.vue delete mode 100644 src/views/creators/FollowButton.vue delete mode 100644 src/views/main/Join.vue delete mode 100644 src/views/main/Register.vue delete mode 100644 src/views/main/RegisterForm.vue diff --git a/src/router/router.js b/src/router/router.js index a4b2361..d2a0d71 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -8,9 +8,6 @@ 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 Join from '../views/main/Join.vue' -import Register from '../views/main/Register.vue' import Home from '../views/main/Home.vue' import Wallet from '../views/main/Wallet.vue' import ProfilePage from '@/views/profile/ProfilePage.vue' @@ -118,22 +115,6 @@ const routes = [ path: '/content/post', component: PostContent, }, - - { - path: '/join', - name: 'join', - component: Join - }, - { - path: '/register', - name: 'register', - component: Register - }, - { - path: '/signup', - name: 'signup', - component: SignupView - }, { path: '/login', name: 'login', diff --git a/src/stores/subscriptionStore.js b/src/stores/subscriptionStore.js index 225ea60..05f1a9f 100644 --- a/src/stores/subscriptionStore.js +++ b/src/stores/subscriptionStore.js @@ -2,18 +2,15 @@ import {useSessionStorage} from "@vueuse/core"; import {useClient} from "@/plugins/api.js"; import {useAuthStore} from "@/stores/authStore.js"; -import {watch} from "vue"; +import {watch, onMounted} from "vue"; export const useSubscriptionStore = defineStore( 'subscription', () => { - const subscriptions = useSessionStorage( - 'subscription-subscriptions', - {}) - const authStore = useAuthStore() - const authWatcher = watch( + + watch( () => authStore.isAuthenticated, async (newValue) => { if (newValue) { @@ -23,42 +20,22 @@ export const useSubscriptionStore = defineStore( } }) + const subscriptions = useSessionStorage( + 'subscription-subscriptions', + {}) + function isSubscribeTo(creatorId) { return !!subscriptions.value[creatorId]; } - async function subscribeTo(creatorId) { - try { - const client = useClient() - const response = await client.post( - `/api/creators/${creatorId}/subscribe` - ); - subscriptions.value[creatorId] = response.data; - } catch (error) { - console.error("Error subscribing to creator", error); - } - } - - async function unsubscribeFrom(creatorId) { - try { - const client = useClient() - const response = await client.post( - `/api/creators/${creatorId}/unsubscribe` - ); - delete subscriptions.value[creatorId]; - } catch (error) { - console.error("Error unsubscribing from creator", error); - } - } - async function loadSubscriptions() { try { const client = useClient() - const response = await client.get(`/api/subscriptions`); + const response = await client.get(`/api/membership/active`); subscriptions.value = response.data.reduce( (acc, sub) => { - acc[sub.creatorId] = sub; + acc[sub.creatorId] = sub; return acc; }, {}); @@ -67,5 +44,5 @@ export const useSubscriptionStore = defineStore( } } - return {subscriptions, isSubscribeTo, subscribeTo, unsubscribeFrom} + return {subscriptions, isSubscribeTo} }); \ No newline at end of file diff --git a/src/views/SignupView.vue b/src/views/SignupView.vue deleted file mode 100644 index e51ba78..0000000 --- a/src/views/SignupView.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/creators/CreatorHome.vue b/src/views/creators/CreatorHome.vue index b37f55d..c8e1abf 100644 --- a/src/views/creators/CreatorHome.vue +++ b/src/views/creators/CreatorHome.vue @@ -1,12 +1,21 @@  @@ -14,9 +23,24 @@ diff --git a/src/views/creators/banner/bannerlower/BannerActionsXl.vue b/src/views/creators/banner/bannerlower/BannerActionsXl.vue index fae9f38..42d1c4d 100644 --- a/src/views/creators/banner/bannerlower/BannerActionsXl.vue +++ b/src/views/creators/banner/bannerlower/BannerActionsXl.vue @@ -50,7 +50,6 @@
-
@@ -150,7 +149,6 @@ - - - diff --git a/src/views/main/Register.vue b/src/views/main/Register.vue deleted file mode 100644 index 95a2c0c..0000000 --- a/src/views/main/Register.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/views/main/RegisterForm.vue b/src/views/main/RegisterForm.vue deleted file mode 100644 index c347663..0000000 --- a/src/views/main/RegisterForm.vue +++ /dev/null @@ -1,219 +0,0 @@ - - -