diff --git a/assets/images/external/tremendous.svg b/assets/images/external/tremendous.svg new file mode 100644 index 000000000..fb50c702a --- /dev/null +++ b/assets/images/external/tremendous.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/external/venmo-small.svg b/assets/images/external/venmo-small.svg new file mode 100644 index 000000000..32b4efd7d --- /dev/null +++ b/assets/images/external/venmo-small.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/external/venmo.svg b/assets/images/external/venmo.svg new file mode 100644 index 000000000..11c5091c6 --- /dev/null +++ b/assets/images/external/venmo.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/assets/styles/components.scss b/assets/styles/components.scss index fac5e60ba..f4e89b6f5 100644 --- a/assets/styles/components.scss +++ b/assets/styles/components.scss @@ -268,7 +268,7 @@ @media screen and (max-width: 750px) { &:not(&.small) { flex-direction: column; - align-items: start; + align-items: flex-start; .stylized-toggle { flex-basis: 0; @@ -339,7 +339,7 @@ .adjacent-input, &.adjacent-input &:not(&.small) { flex-direction: column; - align-items: start; + align-items: flex-start; } } } diff --git a/components/ui/ModalTransfer.vue b/components/ui/ModalTransfer.vue deleted file mode 100644 index 84ce624e5..000000000 --- a/components/ui/ModalTransfer.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - - diff --git a/composables/auth.js b/composables/auth.js index 29080edf8..30b131dca 100644 --- a/composables/auth.js +++ b/composables/auth.js @@ -103,3 +103,27 @@ export const getAuthUrl = (provider, redirect = '') => { return `${config.public.apiBaseUrl}auth/init?url=${fullURL}&provider=${provider}` } + +export const removeAuthProvider = async (provider) => { + startLoading() + try { + const auth = await useAuth() + + await useBaseFetch('auth/provider', { + method: 'DELETE', + body: { + provider, + }, + }) + await useAuth(auth.value.token) + } catch (err) { + const data = useNuxtApp() + data.$notify({ + group: 'main', + title: 'An error occurred', + text: err.data.description, + type: 'error', + }) + } + stopLoading() +} diff --git a/package.json b/package.json index 40942f5db..fb98944fb 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "floating-vue": "^2.0.0-beta.20", "fuse.js": "^6.6.2", "highlight.js": "^11.7.0", + "iso-3166-1": "^2.1.1", "js-yaml": "^4.1.0", "jszip": "^3.10.1", "markdown-it": "^13.0.1", diff --git a/pages/dashboard/index.vue b/pages/dashboard/index.vue index f56663d8a..d4be50214 100644 --- a/pages/dashboard/index.vue +++ b/pages/dashboard/index.vue @@ -87,13 +87,6 @@ > -
-
Total revenue
-
- {{ $formatMoney(payouts.all_time, true) }} -
- {{ $formatMoney(payouts.last_month, true) }} in the last month -
Current balance
@@ -127,13 +120,10 @@ useHead({ const auth = await useAuth() -const [{ data: projects }, { data: payouts }] = await Promise.all([ +const [{ data: projects }] = await Promise.all([ useAsyncData(`user/${auth.value.user.id}/projects`, () => useBaseFetch(`user/${auth.value.user.id}/projects`) ), - useAsyncData(`user/${auth.value.user.id}/payouts`, () => - useBaseFetch(`user/${auth.value.user.id}/payouts`) - ), ]) const minWithdraw = ref(0.26) diff --git a/pages/dashboard/revenue/index.vue b/pages/dashboard/revenue/index.vue index 45f4e3418..701ab1f61 100644 --- a/pages/dashboard/revenue/index.vue +++ b/pages/dashboard/revenue/index.vue @@ -1,132 +1,109 @@ - diff --git a/pages/dashboard/revenue/withdraw.vue b/pages/dashboard/revenue/withdraw.vue new file mode 100644 index 000000000..b74363b3d --- /dev/null +++ b/pages/dashboard/revenue/withdraw.vue @@ -0,0 +1,442 @@ + + + + + diff --git a/pages/settings.vue b/pages/settings.vue index 294c11acb..9d1039392 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -21,9 +21,6 @@ - - -