diff --git a/src/frontend/components/Layout/PortalNavigationDrawer.vue b/src/frontend/components/Layout/PortalNavigationDrawer.vue index 9d2b092..75d7513 100644 --- a/src/frontend/components/Layout/PortalNavigationDrawer.vue +++ b/src/frontend/components/Layout/PortalNavigationDrawer.vue @@ -26,7 +26,7 @@ > - +
- We are in the process of setting up your dedicated hotline. While it typically takes a few business - days, rest assured you'll be notified via email once your number is primed for use. + We're setting things up on our end.
-
- - Note: Your trial will commence only after the setup is finalized. - + Thanks for showing interest 😃 + + + +
(url: MaybeRef, opts?: Omit & { body?: any }) => { - const config = useRuntimeConfig(); - const csrfToken = useCookie('csrftoken'); - const headers = { - 'X-CSRFToken': csrfToken.value || '', - 'Content-Type': 'application/json', // Maybe dont' want this here? TODO - ...opts?.headers, - }; - const method = (opts?.method?.toUpperCase() || 'GET') as 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'; - - const body = opts?.body ? JSON.stringify(opts.body) : undefined; - - return useFetch(url, { - baseURL: `${config.public.server_url}`, - credentials: 'include', - headers, - // @ts-ignore - method, - body, - ...opts, - }); + // const config = useRuntimeConfig(); + // const csrfToken = useCookie('csrftoken'); + // const headers = { + // 'X-CSRFToken': csrfToken.value || '', + // 'Content-Type': 'application/json', // Maybe dont' want this here? TODO + // ...opts?.headers, + // }; + // const method = (opts?.method?.toUpperCase() || 'GET') as 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'; + // + // const body = opts?.body ? JSON.stringify(opts.body) : undefined; + // + // return useFetch(url, { + // baseURL: `${config.public.server_url}`, + // credentials: 'include', + // headers, + // // @ts-ignore + // method, + // body, + // ...opts, + // }); +// return an empty promise + return new Promise((resolve, reject) => { + resolve({} as T); + }) }; diff --git a/src/frontend/layouts/protected.vue b/src/frontend/layouts/protected.vue index 5c13d53..3bc5c91 100644 --- a/src/frontend/layouts/protected.vue +++ b/src/frontend/layouts/protected.vue @@ -9,10 +9,10 @@ - + + + + route.path, () => { handleSubscriptionCheck() diff --git a/src/frontend/middleware/auth.ts b/src/frontend/middleware/auth.ts index ca58ba9..67540d9 100644 --- a/src/frontend/middleware/auth.ts +++ b/src/frontend/middleware/auth.ts @@ -2,28 +2,28 @@ import {useUserStore} from "~/store/userStore"; import {useSnackbarStore} from "~/store/snackbarStore"; export default defineNuxtRouteMiddleware(async (_to, _from) => { - const csrftoken = useCookie('csrftoken') - if (!csrftoken.value) { - csrftoken.value = null - return navigateTo('/') - } - if (process.client) { - const auth = useUserStore() - - if (!auth.authUser || !auth.isLoggedIn) { - // await auth.fetchUser() - - return navigateTo('/') - } else if (_from.path === '/signup/company-info' && _to.path === '/dashboard' && !auth.authUser.company) { - // allows user to go back from signing up - // await auth.logout() - return navigateTo('/') - } else if ( - auth.authUser && !auth.authUser.company && _to.path !== '/signup/company-info' && _from.path !== '/signup/company-info' - ) { - const snackbar = useSnackbarStore() - snackbar.displaySnackbar('highlight', "Please provide a company first.") - return navigateTo('/signup/company-info') - } - } + // const csrftoken = useCookie('csrftoken') + // if (!csrftoken.value) { + // csrftoken.value = null + // return navigateTo('/') + // } + // if (process.client) { + // const auth = useUserStore() + // + // if (!auth.authUser || !auth.isLoggedIn) { + // // await auth.fetchUser() + // + // return navigateTo('/') + // } else if (_from.path === '/signup/company-info' && _to.path === '/dashboard' && !auth.authUser.company) { + // // allows user to go back from signing up + // // await auth.logout() + // return navigateTo('/') + // } else if ( + // auth.authUser && !auth.authUser.company && _to.path !== '/signup/company-info' && _from.path !== '/signup/company-info' + // ) { + // const snackbar = useSnackbarStore() + // snackbar.displaySnackbar('highlight', "Please provide a company first.") + // return navigateTo('/signup/company-info') + // } + // } }) diff --git a/src/frontend/nuxt.config.ts b/src/frontend/nuxt.config.ts index d048b8e..b0015c1 100644 --- a/src/frontend/nuxt.config.ts +++ b/src/frontend/nuxt.config.ts @@ -11,13 +11,13 @@ const url = "https://propconnect.io"; // https://v3.nuxtjs.org/api/configuration/nuxt.config export default defineNuxtConfig({ // Runtime Config - runtimeConfig: { - public: { - server_url: process.env.API_BASE_URL || 'http://localhost:8000/api', - DEFAULT_TWILIO_NUMBER: process.env.DEFAULT_TWILIO_NUMBER, - STRIPE_PUBLISHABLE_KEY: process.env.STRIPE_PUBLISHABLE_KEY, - }, - }, + // runtimeConfig: { + // public: { + // server_url: process.env.API_BASE_URL || 'http://localhost:8000/api', + // DEFAULT_TWILIO_NUMBER: process.env.DEFAULT_TWILIO_NUMBER, + // STRIPE_PUBLISHABLE_KEY: process.env.STRIPE_PUBLISHABLE_KEY, + // }, + // }, // import styles css: ["@/assets/main.scss", "@/assets/stylus/index.styl"], diff --git a/src/frontend/pages/conversations/[id].vue b/src/frontend/pages/conversations/[id].vue deleted file mode 100644 index 6927f65..0000000 --- a/src/frontend/pages/conversations/[id].vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/src/frontend/pages/conversations/index.vue b/src/frontend/pages/conversations/index.vue deleted file mode 100644 index 119cf66..0000000 --- a/src/frontend/pages/conversations/index.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/frontend/pages/dashboard.vue b/src/frontend/pages/dashboard.vue index e050106..6287541 100644 --- a/src/frontend/pages/dashboard.vue +++ b/src/frontend/pages/dashboard.vue @@ -7,7 +7,7 @@ import { useDisplay } from 'vuetify' import Dashboard from "../sections/portal/dashboard/Dashboard" definePageMeta({ - middleware: ["auth"], + // middleware: ["auth"], layout: 'protected' }) diff --git a/src/frontend/pages/signup/company-info.vue b/src/frontend/pages/signup/company-info.vue index f8d9219..d748c6e 100644 --- a/src/frontend/pages/signup/company-info.vue +++ b/src/frontend/pages/signup/company-info.vue @@ -8,7 +8,7 @@ import CompanyInformation from "~/sections/company-signup/CompanyInformation.vue"; definePageMeta({ - middleware: ["auth"], + // middleware: ["auth"], layout: "signup", }) diff --git a/src/frontend/pages/vendor-onboarding/[token].vue b/src/frontend/pages/vendor-onboarding/[token].vue deleted file mode 100644 index 90b24f1..0000000 --- a/src/frontend/pages/vendor-onboarding/[token].vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/src/frontend/sections/company-signup/CompanyInformation.vue b/src/frontend/sections/company-signup/CompanyInformation.vue index 2a52a98..17d6d3f 100644 --- a/src/frontend/sections/company-signup/CompanyInformation.vue +++ b/src/frontend/sections/company-signup/CompanyInformation.vue @@ -1,89 +1,89 @@