nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-27 02:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2' into oasis

Browse Source 
# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php
This commit is contained in:
Peter Papp
2021-04-01 10:45:10 +02:00
parent 6d5a43da72 7772ef6b40
commit 5d0348e2d0
124 changed files with 3745 additions and 3576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/router.js
Vendored
+44 -35
View File
@@ -119,7 +119,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/dashboard" */ './views/Admin/Dashboard'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.dashboard')
title: 'routes_title.dashboard'
},
},
{
@@ -129,7 +129,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/invoices" */ './views/Admin/Invoices'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.invoices')
title: 'routes_title.invoices'
},
},
{
@@ -139,7 +139,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/pages" */ './views/Admin/Pages'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.pages')
title: 'routes_title.pages'
},
},
{
@@ -149,7 +149,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/page-edit" */ './views/Admin/Pages/PageEdit'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.page_edit')
title: 'routes_title.page_edit'
},
},
{
@@ -159,7 +159,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plans" */ './views/Admin/Plans'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.pricing_plans')
title: 'routes_title.pricing_plans'
},
},
{
@@ -169,7 +169,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/users" */ './views/Admin/Users'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_list')
title: 'routes_title.users_list'
},
},
{
@@ -179,7 +179,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-create" */ './views/Admin/Users/UserCreate'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.user_create')
title: 'routes_title.user_create'
},
},
{
@@ -189,7 +189,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plan-create" */ './views/Admin/Plans/PlanCreate'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.plan_create')
title: 'routes_title.plan_create'
},
},
{
@@ -199,7 +199,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user" */ './views/Admin/Users/User'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_user')
title: 'routes_title.users_user'
},
children: [
{
@@ -209,7 +209,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-detail" */ './views/Admin/Users/UserTabs/UserDetail'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_detail')
title: 'routes_title.users_detail'
},
},
{
@@ -219,7 +219,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-storage" */ './views/Admin/Users/UserTabs/UserStorage'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_storage_usage')
title: 'routes_title.users_storage_usage'
},
},
{
@@ -229,7 +229,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-subscription" */ './views/Admin/Users/UserTabs/UserSubscription'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.subscription')
title: 'routes_title.subscription'
},
},
{
@@ -239,7 +239,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-invoices" */ './views/Admin/Users/UserTabs/UserInvoices'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.invoices')
title: 'routes_title.invoices'
},
},
{
@@ -249,7 +249,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-password" */ './views/Admin/Users/UserTabs/UserPassword'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_password')
title: 'routes_title.users_password'
},
},
{
@@ -259,7 +259,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/user-delete" */ './views/Admin/Users/UserTabs/UserDelete'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.users_delete')
title: 'routes_title.users_delete'
},
},
]
@@ -271,7 +271,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plan" */ './views/Admin/Plans/Plan'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.plan')
title: 'routes_title.plan'
},
children: [
{
@@ -281,7 +281,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plan-subscribers" */ './views/Admin/Plans/PlanTabs/PlanSubscribers'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.subscribers')
title: 'routes_title.subscribers'
},
},
{
@@ -291,7 +291,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plan-settings" */ './views/Admin/Plans/PlanTabs/PlanSettings'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.plan_settings'),
title: 'routes_title.plan_settings',
},
},
{
@@ -301,7 +301,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/plan-delete" */ './views/Admin/Plans/PlanTabs/PlanDelete'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.plan_delete'),
title: 'routes_title.plan_delete',
},
},
]
@@ -313,7 +313,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-settings" */ './views/Admin/AppSettings/AppSettings'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.settings')
title: 'routes_title.settings'
},
children: [
{
@@ -323,7 +323,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-appearance" */ './views/Admin/AppSettings/AppSettingsTabs/Appearance'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.appearance')
title: 'routes_title.appearance'
},
},
{
@@ -343,7 +343,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-billings" */ './views/Admin/AppSettings/AppSettingsTabs/Billings'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.billings')
title: 'routes_title.billings'
},
},
{
@@ -353,7 +353,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-email" */ './views/Admin/AppSettings/AppSettingsTabs/Email'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.email')
title: 'routes_title.email'
},
},
{
@@ -363,7 +363,7 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-payments" */ './views/Admin/AppSettings/AppSettingsTabs/Payments'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.payments')
title: 'routes_title.payments'
},
},
{
@@ -373,11 +373,20 @@ const routesAdmin = [
import(/* webpackChunkName: "chunks/app-others" */ './views/Admin/AppSettings/AppSettingsTabs/Others'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.others')
title: 'routes_title.others'
},
},
]
},
{
name: 'Language',
path: '/admin/language',
component: () =>
import(/* webpackChunkName: "chunks/app-language" */ './views/Admin/Languages/Language'),
meta: {
requiresAuth: true,
},
}
]
},
{
@@ -386,7 +395,7 @@ const routesAdmin = [
component: AdminMobileMenu,
meta: {
requiresAuth: true,
title: i18n.t('routes_title.settings_mobile')
title: 'routes_title.settings_mobile'
},
},
{
@@ -395,7 +404,7 @@ const routesAdmin = [
component: UserProfileMobileMenu,
meta: {
requiresAuth: true,
title: i18n.t('routes_title.profile_settings')
title: 'routes_title.profile_settings'
},
},
]
@@ -518,7 +527,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/profile" */ './views/User/Settings'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.profile')
title: 'routes_title.profile'
},
},
{
@@ -528,7 +537,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/settings-password" */ './views/User/Password'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.settings_password')
title: 'routes_title.settings_password'
},
},
{
@@ -538,7 +547,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/settings-storage" */ './views/User/Storage'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.settings_storage')
title: 'routes_title.settings_storage'
},
},
{
@@ -548,7 +557,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/settings-invoices" */ './views/User/Invoices'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.invoices')
title: 'routes_title.invoices'
},
},
{
@@ -558,7 +567,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/settings-subscription" */ './views/User/Subscription'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.subscription')
title: 'routes_title.subscription'
},
},
{
@@ -568,7 +577,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/settings-payment-methods" */ './views/User/PaymentMethods'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.payment_methods')
title: 'routes_title.payment_methods'
},
},
{
@@ -590,7 +599,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/upgrade-plan" */ './views/Upgrade/UpgradePlan'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.upgrade_plan')
title: 'routes_title.upgrade_plan'
},
},
{
@@ -600,7 +609,7 @@ const routesUser = [
import(/* webpackChunkName: "chunks/upgrade-billing" */ './views/Upgrade/UpgradeBilling'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.upgrade_billing')
title: 'routes_title.upgrade_billing'
},
},
]