diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 89dad01f..87205a19 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -13,19 +13,19 @@ "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6", "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=917aab9de16d3eb7039a", "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=4bde434e3ed10f3f29b2", - "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=89e6db9790e6f29834c8", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a78d34b8ccc9a5bd9532", "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=afeba4ebd13af7e995be", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6035ca411b2c4239d964", + "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=5e7505fe2f64858109fa", "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~5acee76d.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~5acee76d.js?id=75bbb477bf92edb65799", "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~fa9d08c1.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~fa9d08c1.js?id=741acf06489eac45774e", - "/chunks/app-billings.js": "/chunks/app-billings.js?id=714f7a9f33e15fe89b4a", - "/chunks/app-email.js": "/chunks/app-email.js?id=324ae41d780105c9a9fb", - "/chunks/app-index.js": "/chunks/app-index.js?id=4f1f607c330b916c0090", - "/chunks/app-language.js": "/chunks/app-language.js?id=8be9be7e3a92f7dc8e72", + "/chunks/app-billings.js": "/chunks/app-billings.js?id=6f363efa7ba2f45c9d24", + "/chunks/app-email.js": "/chunks/app-email.js?id=01efc9cc57d65ec7039a", + "/chunks/app-index.js": "/chunks/app-index.js?id=1feec4c18254ca68ad24", + "/chunks/app-language.js": "/chunks/app-language.js?id=1c27770f51ff0bab8b9d", "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5", "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~1a92dd55.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~1a92dd55.js?id=75317652be9e911b6013", - "/chunks/app-others.js": "/chunks/app-others.js?id=2789aac07c894eeb29ea", - "/chunks/app-payments.js": "/chunks/app-payments.js?id=df48b9f5634db900c0ef", + "/chunks/app-others.js": "/chunks/app-others.js?id=1c88b2b580c7c26c1f63", + "/chunks/app-payments.js": "/chunks/app-payments.js?id=c8c0eb1184c18672e461", "/chunks/app-settings.js": "/chunks/app-settings.js?id=2a96295eef59bd6c8921", "/chunks/app-setup.js": "/chunks/app-setup.js?id=5b66d3db248299e404d5", "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js?id=107a78323eef0c1d4c81", @@ -49,22 +49,22 @@ "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b", "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6309319acc583ba0859c", "/chunks/invitation.js": "/chunks/invitation.js?id=c9cd3541ee362ae8d5f7", - "/chunks/invoices.js": "/chunks/invoices.js?id=ce6ca4639d16aa3b53d1", + "/chunks/invoices.js": "/chunks/invoices.js?id=2032e4f8e4f5ed58b8b4", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=4eb4c11f0e574303af7f", "/chunks/not-found.js": "/chunks/not-found.js?id=034287ee0ecb036320d3", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=c327905d0b6d997d402d", + "/chunks/page-edit.js": "/chunks/page-edit.js?id=0207499e869a6d5e0a53", "/chunks/pages.js": "/chunks/pages.js?id=7db66df0453135bf4e51", "/chunks/plan.js": "/chunks/plan.js?id=f62a5bd64fb706b2f0e2", "/chunks/plan-create.js": "/chunks/plan-create.js?id=995a9a5ae9cc43f35d2c", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=2308117f74ce905c1c2a", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=48f57902fbac955c7c99", + "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=ff141898b6eba63425e8", + "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=418f3e90142d3e1f0535", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=afa7c5328893c5d16e3b", "/chunks/plans.js": "/chunks/plans.js?id=854c232c29d88c5b541a", "/chunks/platform.js": "/chunks/platform.js?id=426da7075ef9a88ea088", "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=5734e9333fc67c706853", "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=7d983dfdc91de607d737", "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6", - "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=11a027aca50aa90afb77", + "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=01a89906db04cba117da", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=2eeb31ccee322c06b81c", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=2716127ee2f945a90c0e", "/chunks/settings.js": "/chunks/settings.js?id=d86481764216bbe5e6b2", @@ -73,7 +73,7 @@ "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=13d23c92a535d7c9a4ff", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=76b45c336e8e12b23e81", "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js?id=cd797256cb819aac4d24", - "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=c6582768d097d86a2844", + "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=ec0fb7e19182b8a77f55", "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=743bf9cb1e62af56c04e", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5", "/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87", @@ -95,12 +95,12 @@ "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=8bd237c632018a537d76", "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=7ee9b84ffed9bf544997", "/chunks/user.js": "/chunks/user.js?id=80d4433e6a0f1a2a940d", - "/chunks/user-create.js": "/chunks/user-create.js?id=ff84767e33cdf49fab55", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=d0d3419a35ca27c4226c", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=fab2eae409831e768b0d", + "/chunks/user-create.js": "/chunks/user-create.js?id=4fa9fb390471ad54796c", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=8edabaf92d5ee4856671", + "/chunks/user-detail.js": "/chunks/user-detail.js?id=89952938d95d32a1fac7", "/chunks/user-password.js": "/chunks/user-password.js?id=6aeb19839b38f287953d", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=936f120357a4480e1bd5", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=781e3ce396f5daf7bba4", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=ed05b13deb6acce5e593", + "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=23aaeacfd9d7d9399d2d", "/chunks/users.js": "/chunks/users.js?id=ab7eeac6e8559dc1eb2b", "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~35bc7519.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~35bc7519.js?id=ae06aafc3749254fe4aa", "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~629342a0.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~629342a0.js?id=cdefaa7800d04dafb07b", @@ -390,8 +390,8 @@ "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~d6690165.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~d6690165.js?id=2f03fbbe27b922063d16", "/chunks/app-setup.bfb51d46fe9500c09f69.hot-update.js": "/chunks/app-setup.bfb51d46fe9500c09f69.hot-update.js", "/chunks/plan.bfb51d46fe9500c09f69.hot-update.js": "/chunks/plan.bfb51d46fe9500c09f69.hot-update.js", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=25ad60a594f9e25d7621", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=d41465e6cd6ff830e8c1", + "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=816ccc71d731eee026c5", + "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=db413790256e03fe40ed", "/chunks/settings-storage.bfb51d46fe9500c09f69.hot-update.js": "/chunks/settings-storage.bfb51d46fe9500c09f69.hot-update.js", "/chunks/settings-subscription.bfb51d46fe9500c09f69.hot-update.js": "/chunks/settings-subscription.bfb51d46fe9500c09f69.hot-update.js", "/chunks/user-create.bfb51d46fe9500c09f69.hot-update.js": "/chunks/user-create.bfb51d46fe9500c09f69.hot-update.js", @@ -784,5 +784,44 @@ "/chunks/settings.940fa13b809fa3c16e21.hot-update.js": "/chunks/settings.940fa13b809fa3c16e21.hot-update.js", "/chunks/settings.32597a7de88b206ea095.hot-update.js": "/chunks/settings.32597a7de88b206ea095.hot-update.js", "/chunks/settings.c6818ac2d38140e3ab3e.hot-update.js": "/chunks/settings.c6818ac2d38140e3ab3e.hot-update.js", - "/js/main.f08698fc4f6fd309d44f.hot-update.js": "/js/main.f08698fc4f6fd309d44f.hot-update.js" + "/js/main.f08698fc4f6fd309d44f.hot-update.js": "/js/main.f08698fc4f6fd309d44f.hot-update.js", + "/chunks/user-subscription.c90f0dbdc6acb9ce34b6.hot-update.js": "/chunks/user-subscription.c90f0dbdc6acb9ce34b6.hot-update.js", + "/chunks/user-subscription.26170ca0ac6a5741ef9c.hot-update.js": "/chunks/user-subscription.26170ca0ac6a5741ef9c.hot-update.js", + "/chunks/user-subscription.55114b70dc3355f0c042.hot-update.js": "/chunks/user-subscription.55114b70dc3355f0c042.hot-update.js", + "/js/main.62867a58ffe76a22d5d2.hot-update.js": "/js/main.62867a58ffe76a22d5d2.hot-update.js", + "/js/main.90341cfd902d4bd0b1b8.hot-update.js": "/js/main.90341cfd902d4bd0b1b8.hot-update.js", + "/chunks/user-subscription.c9cd5aba9204da9b7bad.hot-update.js": "/chunks/user-subscription.c9cd5aba9204da9b7bad.hot-update.js", + "/js/main.4c405ce5e76147b6209b.hot-update.js": "/js/main.4c405ce5e76147b6209b.hot-update.js", + "/chunks/user-subscription.d57bbe38645d6119e85d.hot-update.js": "/chunks/user-subscription.d57bbe38645d6119e85d.hot-update.js", + "/chunks/settings-subscription.c054a651ea61dc32206f.hot-update.js": "/chunks/settings-subscription.c054a651ea61dc32206f.hot-update.js", + "/chunks/settings-subscription.33a77dd97ff8263493d8.hot-update.js": "/chunks/settings-subscription.33a77dd97ff8263493d8.hot-update.js", + "/chunks/invoices.c5981199017e6d93f789.hot-update.js": "/chunks/invoices.c5981199017e6d93f789.hot-update.js", + "/js/main.70f117c60de4e883c726.hot-update.js": "/js/main.70f117c60de4e883c726.hot-update.js", + "/js/main.10f7521331d2b15e1f47.hot-update.js": "/js/main.10f7521331d2b15e1f47.hot-update.js", + "/js/main.5e73cf44b72e56741f3e.hot-update.js": "/js/main.5e73cf44b72e56741f3e.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.abfb61e262c635a7d9b5.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-appearance.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-appearance.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-billings.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-billings.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-email.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-email.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-index.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-index.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-language.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-language.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-others.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-others.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/app-payments.abfb61e262c635a7d9b5.hot-update.js": "/chunks/app-payments.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/page-edit.abfb61e262c635a7d9b5.hot-update.js": "/chunks/page-edit.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/plan-create/fixed.abfb61e262c635a7d9b5.hot-update.js": "/chunks/plan-create/fixed.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/plan-create/metered.abfb61e262c635a7d9b5.hot-update.js": "/chunks/plan-create/metered.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/plan-delete.abfb61e262c635a7d9b5.hot-update.js": "/chunks/plan-delete.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/plan-settings.abfb61e262c635a7d9b5.hot-update.js": "/chunks/plan-settings.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/profile~chunks/settings-password.abfb61e262c635a7d9b5.hot-update.js": "/chunks/profile~chunks/settings-password.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/settings-subscription.abfb61e262c635a7d9b5.hot-update.js": "/chunks/settings-subscription.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/user-create.abfb61e262c635a7d9b5.hot-update.js": "/chunks/user-create.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/user-delete.abfb61e262c635a7d9b5.hot-update.js": "/chunks/user-delete.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/user-detail.abfb61e262c635a7d9b5.hot-update.js": "/chunks/user-detail.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/user-storage.abfb61e262c635a7d9b5.hot-update.js": "/chunks/user-storage.abfb61e262c635a7d9b5.hot-update.js", + "/chunks/user-subscription.abfb61e262c635a7d9b5.hot-update.js": "/chunks/user-subscription.abfb61e262c635a7d9b5.hot-update.js", + "/js/main.298d4f773810864e4140.hot-update.js": "/js/main.298d4f773810864e4140.hot-update.js", + "/chunks/plan-delete.a1480cfa1a2dfa7ee6bf.hot-update.js": "/chunks/plan-delete.a1480cfa1a2dfa7ee6bf.hot-update.js", + "/chunks/user-delete.51e78b2771181cebabfe.hot-update.js": "/chunks/user-delete.51e78b2771181cebabfe.hot-update.js", + "/chunks/user-delete.c6122612d55bd000c40a.hot-update.js": "/chunks/user-delete.c6122612d55bd000c40a.hot-update.js", + "/chunks/plan-delete.922527f093679a0f1c12.hot-update.js": "/chunks/plan-delete.922527f093679a0f1c12.hot-update.js" } diff --git a/resources/js/components/Admin/AppInputText.vue b/resources/js/components/Admin/AppInputText.vue index b59e4c48..ca7655cc 100644 --- a/resources/js/components/Admin/AppInputText.vue +++ b/resources/js/components/Admin/AppInputText.vue @@ -13,7 +13,7 @@ - + {{ error }} diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js index 18798425..fe4771d0 100644 --- a/resources/js/helpers/functionHelpers.js +++ b/resources/js/helpers/functionHelpers.js @@ -343,7 +343,6 @@ const FunctionHelpers = { } Vue.prototype.$getTransactionStatusColor = function (status) { - return { 'completed': 'green', 'cancelled': 'yellow', @@ -351,11 +350,19 @@ const FunctionHelpers = { }[status] } + Vue.prototype.$getTransactionTypeColor = function (type) { + return { + 'credit': 'green', + 'charge': 'purple', + 'withdrawal': 'red', + }[type] + } + Vue.prototype.$getTransactionTypeTextColor = function (type) { return { - 'withdrawal': 'text-red-500', - 'credit': 'text-green-500', + 'withdrawal': 'text-red', + 'credit': 'text-green', 'charge': '', }[type] } diff --git a/resources/js/views/Admin/Invoices.vue b/resources/js/views/Admin/Invoices.vue index 646e1020..5fa41b25 100644 --- a/resources/js/views/Admin/Invoices.vue +++ b/resources/js/views/Admin/Invoices.vue @@ -36,9 +36,12 @@ - + {{ row.data.attributes.status }} + + {{ row.data.attributes.type }} + @@ -124,7 +127,7 @@ }, computed: { ...mapGetters([ - 'config' + 'config', ]), }, data() { diff --git a/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue b/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue index d6d8b8cc..46ba1a5f 100644 --- a/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue +++ b/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue @@ -3,15 +3,12 @@ {{ $t('admin_page_plans.form.title_delete') }} - -

{{ $t('admin_page_plans.disclaimer_delete_plan') }}

- - -
+ +
- + {{ $t('admin_page_plans.delete_plan_button') }}
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue index a025dab4..e12fc033 100644 --- a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue +++ b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue @@ -3,20 +3,17 @@ {{ $t('user_box_delete.title') }} - -

{{ $t('user_box_delete.description') }}

- - -
+ +
- + {{ $t('admin_page_user.delete_user') }}
diff --git a/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue b/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue index 0f3819ae..01b5a904 100644 --- a/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue +++ b/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue @@ -33,9 +33,12 @@ - + {{ row.data.attributes.status }} + + {{ row.data.attributes.type }} + diff --git a/resources/js/views/User/MeteredSubscription.vue b/resources/js/views/User/MeteredSubscription.vue index d6d10acf..43065f60 100644 --- a/resources/js/views/User/MeteredSubscription.vue +++ b/resources/js/views/User/MeteredSubscription.vue @@ -149,9 +149,12 @@ - + {{ row.data.attributes.status }} + + {{ row.data.attributes.type }} + @@ -220,6 +223,7 @@ }, computed: { ...mapGetters([ + 'config', 'user', ]), }, diff --git a/tailwind.config.js b/tailwind.config.js index 9b8f932d..c4df07bc 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -5,6 +5,13 @@ module.exports = { debugScreens: { position: ['bottom', 'right'], }, + textColor: { + 'green': '#0ABB87', + 'red': '#fd397a', + 'yellow': '#ffb822', + 'purple': '#9d66fe', + 'blue': '#5578eb', + }, extend: { scale: { '97': '.97',