@@ -64,6 +64,9 @@ export default {
metaKeyIcon() {
return this.$isApple() ? '⌘' : '⊞'
},
+ isEmptyQuery() {
+ return this.query !== ''
+ }
},
watch: {
query(val) {
@@ -76,16 +79,16 @@ export default {
},
data() {
return {
- index: 0,
- query: '',
isVisible: false,
isLoading: false,
results: [],
+ query: '',
+ index: 0,
}
},
methods: {
proceedToSelect(e) {
- // Preserve select and reload shortcut
+ // Preserve select and reload native shortcut
if (! ['a', 'r'].includes(e.key)) {
e.preventDefault()
}
@@ -103,12 +106,7 @@ export default {
// Show folder
if (file.type === 'folder') {
- // todo: fixnut reload na Files stranke
- if (this.$route.name !== 'Files') {
- this.$router.push({name: 'Files'})
- }
-
- this.$store.dispatch('getFolder', this.results[this.index].id)
+ this.$router.push({name: 'Files', params: {id: this.results[this.index].id}})
} else {
// Show file
@@ -128,7 +126,6 @@ export default {
this.index++
},
onPageUp() {
-
if (this.index > 0) this.index--
},
searchFiles: debounce(function (value) {
diff --git a/resources/js/router.js b/resources/js/router.js
index bb88de45..eda51279 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -5,6 +5,7 @@ import routesAdmin from './routes/routesAdmin'
import routesIndex from './routes/routesIndex'
import routesAuth from './routes/routesAuth'
import routesUser from './routes/routesUser'
+import routesFile from './routes/routesFile'
import store from './store/index'
import Router from 'vue-router'
import Vue from 'vue'
@@ -21,6 +22,7 @@ const router = new Router({
...routesIndex,
...routesAuth,
...routesUser,
+ ...routesFile,
],
scrollBehavior(to, from, savedPosition) {
if (savedPosition) {
diff --git a/resources/js/routes/routesFile.js b/resources/js/routes/routesFile.js
new file mode 100644
index 00000000..2e10566b
--- /dev/null
+++ b/resources/js/routes/routesFile.js
@@ -0,0 +1,66 @@
+const routesFile = [
+ {
+ name: 'Platform',
+ path: '/platform',
+ component: () =>
+ import(/* webpackChunkName: "chunks/platform" */ '../views/Platform'),
+ children: [
+ {
+ name: 'Files',
+ path: '/platform/files/:id?',
+ component: () =>
+ import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Files'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ {
+ name: 'RecentUploads',
+ path: '/platform/recent-uploads',
+ component: () =>
+ import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/RecentUploads'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ {
+ name: 'MySharedItems',
+ path: '/platform/my-shared-items',
+ component: () =>
+ import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/MySharedItems'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ {
+ name: 'Trash',
+ path: '/platform/trash/:id?',
+ component: () =>
+ import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Trash'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ {
+ name: 'TeamFolders',
+ path: '/platform/team-folder/:id?',
+ component: () =>
+ import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/Trash'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ {
+ name: 'SharedWithMe',
+ path: '/platform/shared-with-me/:id?',
+ component: () =>
+ import(/* webpackChunkName: "chunks/shared-with-me" */ '../views/FileView/Trash'),
+ meta: {
+ requiresAuth: true
+ },
+ },
+ ]
+ }
+]
+
+export default routesFile
\ No newline at end of file
diff --git a/resources/js/routes/routesUser.js b/resources/js/routes/routesUser.js
index cfd29505..7b4c08e7 100644
--- a/resources/js/routes/routesUser.js
+++ b/resources/js/routes/routesUser.js
@@ -1,167 +1,105 @@
const routesUser = [
{
- path: '/platform',
- name: 'Platform',
+ name: 'User',
+ path: '/user',
component: () =>
- import(/* webpackChunkName: "chunks/platform" */ '../views/Platform'),
+ import(/* webpackChunkName: "chunks/settings" */ '../views/Profile'),
+ meta: {
+ requiresAuth: true
+ },
children: [
{
- name: 'Files',
- path: '/platform/files/:id?',
+ name: 'Profile',
+ path: '/user/profile',
component: () =>
- import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Files'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'RecentUploads',
- path: '/platform/recent-uploads',
- component: () =>
- import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/RecentUploads'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'MySharedItems',
- path: '/platform/my-shared-items',
- component: () =>
- import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/MySharedItems'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'Trash',
- path: '/platform/trash/:id?',
- component: () =>
- import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Trash'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'TeamFolders',
- path: '/platform/team-folder/:id?',
- component: () =>
- import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/Trash'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'SharedWithMe',
- path: '/platform/shared-with-me/:id?',
- component: () =>
- import(/* webpackChunkName: "chunks/shared-with-me" */ '../views/FileView/Trash'),
- meta: {
- requiresAuth: true
- },
- },
- {
- name: 'Settings',
- path: '/platform/settings',
- component: () =>
- import(/* webpackChunkName: "chunks/settings" */ '../views/Profile'),
- meta: {
- requiresAuth: true
- },
- children: [
- {
- name: 'Profile',
- path: '/platform/profile',
- component: () =>
- import(/* webpackChunkName: "chunks/profile" */ '../views/User/Settings'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.profile'
- },
- },
- {
- name: 'Password',
- path: '/platform/settings/password',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-password" */ '../views/User/Password'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.settings_password'
- },
- },
- {
- name: 'Storage',
- path: '/platform/settings/storage',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-storage" */ '../views/User/Storage'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.settings_storage'
- },
- },
- {
- name: 'Invoice',
- path: '/platform/settings/invoices',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-invoices" */ '../views/User/Invoices'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.invoices'
- },
- },
- {
- name: 'Subscription',
- path: '/platform/settings/subscription',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-subscription" */ '../views/User/Subscription'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.subscription'
- },
- },
- {
- name: 'PaymentMethods',
- path: '/platform/settings/payment-methods',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-payment-methods" */ '../views/User/PaymentMethods'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.payment_methods'
- },
- },
- {
- name: 'CreatePaymentMethod',
- path: '/platform/settings/create-payment-method',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-create-payment-methods" */ '../views/User/CreatePaymentMethod'),
- meta: {
- requiresAuth: true,
- title: 'Create Payment Method'
- },
- },
- ]
- },
- {
- name: 'UpgradePlan',
- path: '/platform/upgrade/plan',
- component: () =>
- import(/* webpackChunkName: "chunks/upgrade-plan" */ '../views/Upgrade/UpgradePlan'),
+ import(/* webpackChunkName: "chunks/profile" */ '../views/User/Settings'),
meta: {
requiresAuth: true,
- title: 'routes_title.upgrade_plan'
+ title: 'routes_title.profile'
},
},
{
- name: 'UpgradeBilling',
- path: '/platform/upgrade/billing',
+ name: 'Password',
+ path: '/user/settings/password',
component: () =>
- import(/* webpackChunkName: "chunks/upgrade-billing" */ '../views/Upgrade/UpgradeBilling'),
+ import(/* webpackChunkName: "chunks/settings-password" */ '../views/User/Password'),
meta: {
requiresAuth: true,
- title: 'routes_title.upgrade_billing'
+ title: 'routes_title.settings_password'
+ },
+ },
+ {
+ name: 'Storage',
+ path: '/user/settings/storage',
+ component: () =>
+ import(/* webpackChunkName: "chunks/settings-storage" */ '../views/User/Storage'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.settings_storage'
+ },
+ },
+ {
+ name: 'Invoice',
+ path: '/user/settings/invoices',
+ component: () =>
+ import(/* webpackChunkName: "chunks/settings-invoices" */ '../views/User/Invoices'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.invoices'
+ },
+ },
+ {
+ name: 'Subscription',
+ path: '/user/settings/subscription',
+ component: () =>
+ import(/* webpackChunkName: "chunks/settings-subscription" */ '../views/User/Subscription'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.subscription'
+ },
+ },
+ {
+ name: 'PaymentMethods',
+ path: '/user/settings/payment-methods',
+ component: () =>
+ import(/* webpackChunkName: "chunks/settings-payment-methods" */ '../views/User/PaymentMethods'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.payment_methods'
+ },
+ },
+ {
+ name: 'CreatePaymentMethod',
+ path: '/user/settings/create-payment-method',
+ component: () =>
+ import(/* webpackChunkName: "chunks/settings-create-payment-methods" */ '../views/User/CreatePaymentMethod'),
+ meta: {
+ requiresAuth: true,
+ title: 'Create Payment Method'
},
},
]
- }
+ },
+ {
+ name: 'UpgradePlan',
+ path: '/user/upgrade/plan',
+ component: () =>
+ import(/* webpackChunkName: "chunks/upgrade-plan" */ '../views/Upgrade/UpgradePlan'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.upgrade_plan'
+ },
+ },
+ {
+ name: 'UpgradeBilling',
+ path: '/user/upgrade/billing',
+ component: () =>
+ import(/* webpackChunkName: "chunks/upgrade-billing" */ '../views/Upgrade/UpgradeBilling'),
+ meta: {
+ requiresAuth: true,
+ title: 'routes_title.upgrade_billing'
+ },
+ },
]
export default routesUser
\ No newline at end of file
diff --git a/resources/js/views/Admin.vue b/resources/js/views/Admin.vue
index b1ca973a..1fd8a212 100644
--- a/resources/js/views/Admin.vue
+++ b/resources/js/views/Admin.vue
@@ -1,5 +1,8 @@