From 3c3a18cf6b9da0883b1f00ca1bfe859d827bc40b Mon Sep 17 00:00:00 2001 From: carodej Date: Fri, 10 Jul 2020 17:05:30 +0200 Subject: [PATCH] translations update --- app/FileManagerFile.php | 6 +- app/User.php | 13 ++ public/mix-manifest.json | 56 ++++- .../js/components/Mobile/MenuItemList.vue | 6 + .../components/Others/PlanPricingTables.vue | 5 +- resources/js/i18n/lang/en.json | 204 +++++++++++++++++- resources/js/views/Admin.vue | 12 +- resources/js/views/Admin/Dashboard.vue | 22 +- resources/js/views/Admin/Invoices.vue | 14 +- resources/js/views/Admin/Pages.vue | 6 +- resources/js/views/Admin/Plans.vue | 18 +- resources/js/views/Admin/Users.vue | 8 +- resources/js/views/Admin/Users/User.vue | 4 +- .../views/Admin/Users/UserTabs/UserDetail.vue | 26 +-- .../Admin/Users/UserTabs/UserInvoices.vue | 20 +- .../Admin/Users/UserTabs/UserPassword.vue | 14 +- .../Admin/Users/UserTabs/UserStorage.vue | 16 +- .../Admin/Users/UserTabs/UserSubscription.vue | 37 ++-- resources/js/views/Mobile/AdminMobileMenu.vue | 24 ++- .../js/views/Mobile/UserProfileMobileMenu.vue | 16 +- resources/js/views/Profile.vue | 10 +- resources/js/views/Upgrade/UpgradeBilling.vue | 82 +++---- resources/js/views/Upgrade/UpgradePlan.vue | 4 +- resources/js/views/User/Invoices.vue | 23 +- resources/js/views/User/Password.vue | 2 +- resources/js/views/User/PaymentMethods.vue | 36 ++-- resources/js/views/User/Settings.vue | 40 ++-- resources/js/views/User/Storage.vue | 2 +- resources/js/views/User/Subscription.vue | 44 ++-- 29 files changed, 503 insertions(+), 267 deletions(-) diff --git a/app/FileManagerFile.php b/app/FileManagerFile.php index e16ae48f..ab6f47b4 100644 --- a/app/FileManagerFile.php +++ b/app/FileManagerFile.php @@ -116,8 +116,8 @@ class FileManagerFile extends Model */ public function getThumbnailAttribute() { - // Get thumbnail from s3 - if ($this->attributes['thumbnail'] && is_storage_driver(['s3', 'spaces'])) { + // Get thumbnail from external storage + if ($this->attributes['thumbnail'] && is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) { return Storage::temporaryUrl('file-manager/' . $this->attributes['thumbnail'], now()->addHour()); } @@ -146,7 +146,7 @@ class FileManagerFile extends Model public function getFileUrlAttribute() { // Get file from s3 - if (is_storage_driver(['s3', 'spaces'])) { + if (is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) { $header = [ "ResponseAcceptRanges" => "bytes", diff --git a/app/User.php b/app/User.php index 8c1c78fe..f9cd412f 100644 --- a/app/User.php +++ b/app/User.php @@ -10,6 +10,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Notification; +use Illuminate\Support\Facades\Storage; use Laravel\Cashier\Billable; use Laravel\Passport\HasApiTokens; use Rinvex\Subscriptions\Traits\HasSubscriptions; @@ -151,6 +152,11 @@ class User extends Authenticatable return $user_capacity; } + /** + * Get user full folder tree + * + * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection + */ public function getFolderTreeAttribute() { return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected']) @@ -166,6 +172,13 @@ class User extends Authenticatable */ public function getAvatarAttribute() { + // Get avatar from external storage + if ($this->attributes['avatar'] && is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) { + + return Storage::temporaryUrl($this->attributes['avatar'], now()->addDay()); + } + + // Get avatar from local storage if ($this->attributes['avatar']) { return url('/' . $this->attributes['avatar']); } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 401d23e3..3ab4f63b 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -239,5 +239,59 @@ "/js/main.f7ea32b1bdd7d5893101.hot-update.js": "/js/main.f7ea32b1bdd7d5893101.hot-update.js", "/js/main.bb919bf230ccfd1da5ad.hot-update.js": "/js/main.bb919bf230ccfd1da5ad.hot-update.js", "/js/main.c339a8942aeb56673ce8.hot-update.js": "/js/main.c339a8942aeb56673ce8.hot-update.js", - "/js/main.666b5bd039ecb83ba849.hot-update.js": "/js/main.666b5bd039ecb83ba849.hot-update.js" + "/js/main.666b5bd039ecb83ba849.hot-update.js": "/js/main.666b5bd039ecb83ba849.hot-update.js", + "/js/main.5d6bd6229cad21177b5d.hot-update.js": "/js/main.5d6bd6229cad21177b5d.hot-update.js", + "/js/main.1314bd7b0155050142db.hot-update.js": "/js/main.1314bd7b0155050142db.hot-update.js", + "/js/main.c55d0aaf47449e57f28f.hot-update.js": "/js/main.c55d0aaf47449e57f28f.hot-update.js", + "/js/main.1ebff55b9a709134bdf9.hot-update.js": "/js/main.1ebff55b9a709134bdf9.hot-update.js", + "/js/main.d9e14c4f874d9aae2991.hot-update.js": "/js/main.d9e14c4f874d9aae2991.hot-update.js", + "/js/main.6aad28750a58dc8a1a84.hot-update.js": "/js/main.6aad28750a58dc8a1a84.hot-update.js", + "/js/main.a4a5e491361ca05ac530.hot-update.js": "/js/main.a4a5e491361ca05ac530.hot-update.js", + "/js/main.ab40d76d1114a2a348d9.hot-update.js": "/js/main.ab40d76d1114a2a348d9.hot-update.js", + "/js/main.272e7fc5df78185ef223.hot-update.js": "/js/main.272e7fc5df78185ef223.hot-update.js", + "/js/main.3980c9d6032f6d9893d6.hot-update.js": "/js/main.3980c9d6032f6d9893d6.hot-update.js", + "/js/main.3fd1ae93571bb5fe8493.hot-update.js": "/js/main.3fd1ae93571bb5fe8493.hot-update.js", + "/js/main.c9097f4a153e7fd3e0bd.hot-update.js": "/js/main.c9097f4a153e7fd3e0bd.hot-update.js", + "/js/main.89cbccfdfb280c101229.hot-update.js": "/js/main.89cbccfdfb280c101229.hot-update.js", + "/js/main.3a92cbc41ec25d8e2018.hot-update.js": "/js/main.3a92cbc41ec25d8e2018.hot-update.js", + "/js/main.2a86157426eb177cc6f2.hot-update.js": "/js/main.2a86157426eb177cc6f2.hot-update.js", + "/js/main.411caab58470390ff0bd.hot-update.js": "/js/main.411caab58470390ff0bd.hot-update.js", + "/js/main.d594e00eec3ae4abd751.hot-update.js": "/js/main.d594e00eec3ae4abd751.hot-update.js", + "/js/main.70d17783fe28bf990276.hot-update.js": "/js/main.70d17783fe28bf990276.hot-update.js", + "/js/main.c7bc397e2e421f0141fc.hot-update.js": "/js/main.c7bc397e2e421f0141fc.hot-update.js", + "/js/main.815d02e7f3f9f8841915.hot-update.js": "/js/main.815d02e7f3f9f8841915.hot-update.js", + "/js/main.d40b9abc043ed8480a8a.hot-update.js": "/js/main.d40b9abc043ed8480a8a.hot-update.js", + "/js/main.19a9789de3de21c4b8eb.hot-update.js": "/js/main.19a9789de3de21c4b8eb.hot-update.js", + "/js/main.8be11c6045cb66da58d1.hot-update.js": "/js/main.8be11c6045cb66da58d1.hot-update.js", + "/js/main.1983ca165da1e65707ed.hot-update.js": "/js/main.1983ca165da1e65707ed.hot-update.js", + "/js/main.7a29b122f46980bbd2ef.hot-update.js": "/js/main.7a29b122f46980bbd2ef.hot-update.js", + "/js/main.ddb45dcd7b4091c5ac5f.hot-update.js": "/js/main.ddb45dcd7b4091c5ac5f.hot-update.js", + "/js/main.7d7ac6845f8c792a4476.hot-update.js": "/js/main.7d7ac6845f8c792a4476.hot-update.js", + "/js/main.ae16004d1621864211e7.hot-update.js": "/js/main.ae16004d1621864211e7.hot-update.js", + "/js/main.84b099565f7cb44a5aae.hot-update.js": "/js/main.84b099565f7cb44a5aae.hot-update.js", + "/js/main.61d6dc70f0b4a8d69347.hot-update.js": "/js/main.61d6dc70f0b4a8d69347.hot-update.js", + "/js/main.6d77e25fc48e11872fb5.hot-update.js": "/js/main.6d77e25fc48e11872fb5.hot-update.js", + "/js/main.e52f1368604fe28cad40.hot-update.js": "/js/main.e52f1368604fe28cad40.hot-update.js", + "/js/main.0d074a932a774d85ed24.hot-update.js": "/js/main.0d074a932a774d85ed24.hot-update.js", + "/js/main.9372920546a93ccc4f10.hot-update.js": "/js/main.9372920546a93ccc4f10.hot-update.js", + "/js/main.e865592c8390a29c196a.hot-update.js": "/js/main.e865592c8390a29c196a.hot-update.js", + "/js/main.a405908c3c0bda177afe.hot-update.js": "/js/main.a405908c3c0bda177afe.hot-update.js", + "/js/main.40ee7f6bbbdb4944b217.hot-update.js": "/js/main.40ee7f6bbbdb4944b217.hot-update.js", + "/js/main.0ca213bc260327e5c44c.hot-update.js": "/js/main.0ca213bc260327e5c44c.hot-update.js", + "/js/main.1917f89d4150ee8fa356.hot-update.js": "/js/main.1917f89d4150ee8fa356.hot-update.js", + "/js/main.f61541d93f712f3870ca.hot-update.js": "/js/main.f61541d93f712f3870ca.hot-update.js", + "/js/main.ebf234ddd5de8b436e8c.hot-update.js": "/js/main.ebf234ddd5de8b436e8c.hot-update.js", + "/js/main.fb8288157f51ae2a8545.hot-update.js": "/js/main.fb8288157f51ae2a8545.hot-update.js", + "/js/main.16962ba62f72f7247d29.hot-update.js": "/js/main.16962ba62f72f7247d29.hot-update.js", + "/js/main.039a8cc665108287b217.hot-update.js": "/js/main.039a8cc665108287b217.hot-update.js", + "/js/main.ee47b865bc9872684964.hot-update.js": "/js/main.ee47b865bc9872684964.hot-update.js", + "/js/main.63b6901d1d22c6ac0984.hot-update.js": "/js/main.63b6901d1d22c6ac0984.hot-update.js", + "/js/main.45cbdbd7827041cbf512.hot-update.js": "/js/main.45cbdbd7827041cbf512.hot-update.js", + "/js/main.3e33271a12bfec030777.hot-update.js": "/js/main.3e33271a12bfec030777.hot-update.js", + "/js/main.5dbd0ab9a4c5232667e8.hot-update.js": "/js/main.5dbd0ab9a4c5232667e8.hot-update.js", + "/js/main.04e901a4b402b51a750f.hot-update.js": "/js/main.04e901a4b402b51a750f.hot-update.js", + "/js/main.4558580a594cbc8eff6c.hot-update.js": "/js/main.4558580a594cbc8eff6c.hot-update.js", + "/js/main.dba2bd0ad2b7d3512714.hot-update.js": "/js/main.dba2bd0ad2b7d3512714.hot-update.js", + "/js/main.5a7ca08ce1752a485326.hot-update.js": "/js/main.5a7ca08ce1752a485326.hot-update.js", + "/js/main.1a592bc84a9da2723333.hot-update.js": "/js/main.1a592bc84a9da2723333.hot-update.js" } diff --git a/resources/js/components/Mobile/MenuItemList.vue b/resources/js/components/Mobile/MenuItemList.vue index ad1242e6..6cd68bcc 100644 --- a/resources/js/components/Mobile/MenuItemList.vue +++ b/resources/js/components/Mobile/MenuItemList.vue @@ -15,6 +15,8 @@ + + {{ link.title }} @@ -33,6 +35,7 @@ FileTextIcon, SettingsIcon, DatabaseIcon, + MonitorIcon, Trash2Icon, CloudIcon, PowerIcon, @@ -40,11 +43,14 @@ UsersIcon, UserIcon, LockIcon, + BoxIcon, } from 'vue-feather-icons' export default { name: 'MenuBar', components: { + BoxIcon, + MonitorIcon, ChevronRightIcon, UploadCloudIcon, CreditCardIcon, diff --git a/resources/js/components/Others/PlanPricingTables.vue b/resources/js/components/Others/PlanPricingTables.vue index da65868a..d17ffe58 100644 --- a/resources/js/components/Others/PlanPricingTables.vue +++ b/resources/js/components/Others/PlanPricingTables.vue @@ -15,10 +15,10 @@
- {{ plan.data.attributes.price }}/Mo. + {{ plan.data.attributes.price }}/{{ $t('global.monthly_ac') }}.
@@ -49,7 +49,6 @@ } }, created() { - axios.get('/api/public/pricing') .then(response => { this.plans = response.data diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json index ceb86284..e1fd18f9 100644 --- a/resources/js/i18n/lang/en.json +++ b/resources/js/i18n/lang/en.json @@ -1,4 +1,80 @@ { + "global": { + "premium": "Premium", + "free": "Free", + "default": "Default", + "canceled": "Canceled", + "active": "Active", + "or": "or", + "total": "Total", + "monthly_ac": "Mo.", + "get_it": "Mo.", + "admin": "Admin", + "menu": "Menu", + "subscription": "Subscription", + "upgrade_plan": "Upgrade Plan", + "saas": "Services" + }, + "errors": { + "capacity_digit": "The storage capacity must be lower than 10 digit number." + }, + "user_invoices": { + "title": "Invoices", + "empty": "You don't have any invoices yet." + }, + "user_password": { + "title": "Change Your Password" + }, + "user_payments": { + "title": "Payment Methods", + "set_as_default": "Set as default card", + "delete_card": "Delete card", + "empty": "You don't have any payment cards yet." + }, + "user_subscription": { + "title": "Subscription Plan", + "plan": "Plan", + "billed": "Billed", + "status": "Status", + "created_at": "Created At", + "renews_at": "Renews At", + "canceled_at": "Canceled At", + "ends_at": "Ends At", + "empty": "You don't have any subscription yet.", + "cancel_plan": "Cancel Plan", + "resume_plan": "Resume Plan" + }, + "user_settings": { + "title_account": "Account Information", + "title_billing": "Billing Information", + "name": "Name", + "name_plac": "Type your billing name", + "address": "Address", + "address_plac": "Type your billing address", + "state": "State", + "state_plac": "Type your billing state", + "city": "City", + "city_plac": "Type your billing city", + "postal_code": "Postal Code", + "postal_code_plac": "Type your billing postal code", + "country": "Country", + "country_plac": "Type your billing country", + "phone_number": "Phone Number", + "phone_number_plac": "Type your billing phone number" + }, + "rows": { + "invoice": { + "number": "Invoice Number", + "total": "Total", + "plan": "Plan", + "payed": "Payed" + }, + "card": { + "number": "Card Number", + "status": "Status", + "expiration": "Expiration Date" + } + }, "routes": { "create_new_password": "create-new-password" }, @@ -81,6 +157,30 @@ "registration_text": "Don’t have an account?", "registration_button": "Register account." }, + "page_pricing_tables": { + "title": "Choose Your Plan", + "description": "Choose plan witch perfect fit your needs. All plans is billed monthly automatically via your credit card." + }, + "page_upgrade_account": { + "title": "Choose Payment Method", + "desription": "Choose plan witch perfect fit your needs. All plans is billed monthly automatically via your credit card.", + "section_card": "Payment Card", + "section_billing": "Billing Information", + "section_summary": "Order Summary", + "change_payment": { + "you_can": "Also you can", + "change_payment": "change your default payment method", + "pay_by_new_card": "pay by new credit card" + }, + "errors": { + "pay_by_another_card": "Please pay by another payment card" + }, + "summary": { + "period": "Billed monthly", + "submit_button": "Pay with credit card", + "submit_disclaimer": "By submit form, you agree to save the payment method and billing information in your VueFileManager account." + } + }, "uploading": { "progress": "Uploading files {current}/{total}" }, @@ -122,7 +222,7 @@ "of": "of" }, "storage": { - "sec_capacity": "Storage Capacity", + "sec_capacity": "Your disk Usage", "sec_details": "Capacity Usage Details", "total_used": "Total used {used}", "total_capacity": "Your storage capacity {capacity}", @@ -163,6 +263,9 @@ "move": "Move" }, "menu": { + "payment_cards": "Payment Cards", + "invoices": "Invoices", + "subscription": "Subscription", "files": "Files", "latest": "Recent Uploads", "shared": "Shared Files", @@ -266,6 +369,24 @@ "title": "User was deleted", "message": "Your user was deleted with all user data content." }, + "popup_set_card": { + "title": "Set as default card?", + "message": "Your card will be set as default and will be always charged for the next billings." + }, + "popup_delete_card": { + "title": "Are you sure?", + "message": "This event is irreversible and your payment card will be delete forever" + }, + "popup_subscription_cancel": { + "title": "Subscription Was Resumed", + "message": "You'll continue to have access to the features you've paid for until the end of your billing cycle.", + "button": "I'm done" + }, + "popup_subscription_resumed": { + "title": "Subscription Was Canceled", + "message": "Your subscription was re-activated, and they will be billed on the original billing cycle.", + "button": "That's awesome!" + }, "user_box_storage": { "title": "Change User Storage Capacity", "description": "Change user storage capacity by input bellow. You have to type only number e.g. value '5' means, user will have 5GB of storage capacity." @@ -283,8 +404,67 @@ "description": "You can change role for current user. Admin role can edit or create new users, change storage capacity and any other application settings." }, "admin_menu": { - "admin_label": "Admin", - "users": "Users" + "dashboard": "Dashboard", + "users": "Users", + "settings": "Settings", + "plans": "Plans", + "invoices": "Invoices", + "pages": "Pages" + }, + "admin_pages": { + "table": { + "page": "Page", + "slug": "Slug", + "status": "Status" + } + }, + "admin_page_dashboard": { + "version": "Version", + "license": "License", + "backer_button": "Become a Backer", + "w_total_users": { + "title": "Total Users", + "link": "Show All Users" + }, + "w_total_space": { + "title": "Total Space Used", + "link": "Show All Users" + }, + "w_total_premium": { + "title": "Total Premium Users", + "link": "Show All Plans" + }, + "w_latest_users": { + "title": "Latest Registrations" + } + }, + "admin_page_invoices": { + "empty": { + "title": "You don’t have any invoices yet", + "description": "All customers invoices will be showed here." + }, + "table": { + "number": "Invoice Number", + "total": "Total", + "plan": "Plan", + "payed": "Payed", + "user": "User" + } + }, + "admin_page_plans": { + "create_plan_button": "Create Plan", + "empty": { + "title": "You don’t have any plan yet", + "description": "For create new plan, click on button below.", + "button": "Create New Plan" + }, + "table": { + "status": "Status", + "name": "Plan Name", + "subscribers": "Subscribers", + "price": "Price", + "storage_capacity": "Storage Capacity" + } }, "admin_page_user": { "select_role": "Select user role", @@ -297,13 +477,16 @@ "change_capacity": "Change Capacity", "send_password_link": "Send Password Reset Link", "tabs": { - "detail": "Detail", + "subscription": "Subscription", "storage": "Storage Usage", + "invoices": "Invoices", "password": "Password", - "delete": "Delete User" + "delete": "Delete User", + "detail": "Detail" }, "table": { "name": "User", + "plan": "Sunscription Plan", "role": "Role", "storage_used": "Storage Used", "storage_capacity": "Storage Capacity", @@ -317,13 +500,22 @@ "label_email": "Type E-mail", "label_name": "Type full name", "label_conf_pass": "Confirm password" + }, + "invoices": { + "empty": "User don't have any invoices yet." + }, + "subscription": { + "empty": "User don't have any subscription yet." } }, "toaster": { "changed_user": "You successfully changed user's role!", "sended_password": "You successfully send user email for reset password!", "changed_capacity": "You successfully changed user's storage size!", - "created_user": "User was created successfully!" + "created_user": "User was created successfully!", + "card_deleted": "Your card was successfully deleted.", + "card_set": "Your card was successfully set as default.", + "account_upgraded": "Your account was successfully upgraded." }, "roles": { "admin": "Admin", diff --git a/resources/js/views/Admin.vue b/resources/js/views/Admin.vue index 958e30fe..ef425253 100644 --- a/resources/js/views/Admin.vue +++ b/resources/js/views/Admin.vue @@ -4,14 +4,14 @@ - +
- Dashboard + {{ $t('admin_menu.dashboard') }}
@@ -27,7 +27,7 @@
- Settings + {{ $t('admin_menu.settings') }}
@@ -41,7 +41,7 @@
- Plans + {{ $t('admin_menu.plans') }}
@@ -49,7 +49,7 @@
- Invoices + {{ $t('admin_menu.invoices') }}
@@ -57,7 +57,7 @@
- Pages + {{ $t('admin_menu.pages') }}
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue index 08c5e346..ba51e485 100644 --- a/resources/js/views/Admin/Dashboard.vue +++ b/resources/js/views/Admin/Dashboard.vue @@ -10,15 +10,15 @@
- Version: + {{ $t('admin_page_dashboard.version') }}: {{ data.app_version }} - License: + {{ $t('admin_page_dashboard.license') }}: - Extended + {{ data.license }} @@ -26,7 +26,7 @@
- Become a Backer + {{ $t('admin_page_dashboard.backer_button') }} @@ -35,34 +35,34 @@
diff --git a/resources/js/views/Admin/Invoices.vue b/resources/js/views/Admin/Invoices.vue index 31934eb7..448c821c 100644 --- a/resources/js/views/Admin/Invoices.vue +++ b/resources/js/views/Admin/Invoices.vue @@ -55,8 +55,8 @@
@@ -102,27 +102,27 @@ invoices: undefined, columns: [ { - label: 'Invoice Number', + label: this.$t('admin_page_invoices.table.number'), field: 'data.attributes.order', sortable: true }, { - label: 'Total', + label: this.$t('admin_page_invoices.table.total'), field: 'data.attributes.bag.amount', sortable: true }, { - label: 'Plan', + label: this.$t('admin_page_invoices.table.plan'), field: 'data.attributes.bag.amount', sortable: true }, { - label: 'Payed', + label: this.$t('admin_page_invoices.table.payed'), field: 'data.attributes.created_at', sortable: true }, { - label: 'User', + label: this.$t('admin_page_invoices.table.user'), field: 'relationships.user.data.attributes.name', sortable: true }, diff --git a/resources/js/views/Admin/Pages.vue b/resources/js/views/Admin/Pages.vue index 22f8ea15..0556b083 100644 --- a/resources/js/views/Admin/Pages.vue +++ b/resources/js/views/Admin/Pages.vue @@ -78,17 +78,17 @@ pages: undefined, columns: [ { - label: 'Page', + label: this.$t('admin_pages.table.page'), field: 'data.attributes.title', sortable: true }, { - label: 'Slug', + label: this.$t('admin_pages.table.slug'), field: 'data.attributes.slug', sortable: true }, { - label: 'Status', + label: this.$t('admin_pages.table.status'), field: 'data.attributes.visibility', sortable: true }, diff --git a/resources/js/views/Admin/Plans.vue b/resources/js/views/Admin/Plans.vue index 9fdb4072..11383e91 100644 --- a/resources/js/views/Admin/Plans.vue +++ b/resources/js/views/Admin/Plans.vue @@ -9,7 +9,7 @@
- Create Plan + {{ $t('admin_page_plans.create_plan_button') }}
@@ -65,11 +65,11 @@ - Create New Plan + {{ $t('admin_page_plans.empty.button') }} @@ -115,27 +115,27 @@ plans: undefined, columns: [ { - label: 'Status', + label: this.$t('admin_page_plans.table.status'), field: 'data.attributes.status', sortable: true }, { - label: 'Plan Name', + label: this.$t('admin_page_plans.table.name'), field: 'data.attributes.name', sortable: true }, { - label: 'Subscribers', + label: this.$t('admin_page_plans.table.subscribers'), field: 'data.attributes.subscribers', sortable: true }, { - label: 'Price', + label: this.$t('admin_page_plans.table.price'), field: 'data.attributes.price', sortable: true }, { - label: 'Storage Capacity', + label: this.$t('admin_page_plans.table.storage_capacity'), field: 'data.attributes.capacity', sortable: true }, diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue index eddfda03..ecca1ef3 100644 --- a/resources/js/views/Admin/Users.vue +++ b/resources/js/views/Admin/Users.vue @@ -20,7 +20,7 @@ @@ -66,22 +66,22 @@ invoices: undefined, columns: [ { - label: 'Invoice Number', + label: this.$t('admin_page_invoices.table.number'), field: 'data.attributes.order', sortable: true }, { - label: 'Total', + label: this.$t('admin_page_invoices.table.total'), field: 'data.attributes.bag.amount', sortable: true }, { - label: 'Plan', + label: this.$t('admin_page_invoices.table.plan'), field: 'data.attributes.bag.amount', sortable: true }, { - label: 'Payed', + label: this.$t('admin_page_invoices.table.payed'), field: 'data.attributes.created_at', sortable: true }, @@ -110,14 +110,4 @@ .block-form { max-width: 100%; } - - - @media only screen and (max-width: 960px) { - - } - - @media (prefers-color-scheme: dark) { - - } - diff --git a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue index db66c5e7..acb88bf2 100644 --- a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue +++ b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue @@ -1,7 +1,9 @@