From 535bd9dab5174893dcdc566c9ccb8d6204841427 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 1 Aug 2017 11:10:36 +0100 Subject: [PATCH] better organization --- assets/src/router/index.js | 20 +++++++------------ .../src/{components/files => views}/Files.vue | 6 +++--- .../Global.vue => views/GlobalSettings.vue} | 0 .../{components/Main.vue => views/Layout.vue} | 10 +++++----- .../Profile.vue => views/ProfileSettings.vue} | 0 .../{components/settings => views}/User.vue | 0 .../{components/settings => views}/Users.vue | 0 7 files changed, 15 insertions(+), 21 deletions(-) rename assets/src/{components/files => views}/Files.vue (97%) rename assets/src/{components/settings/Global.vue => views/GlobalSettings.vue} (100%) rename assets/src/{components/Main.vue => views/Layout.vue} (84%) rename assets/src/{components/settings/Profile.vue => views/ProfileSettings.vue} (100%) rename assets/src/{components/settings => views}/User.vue (100%) rename assets/src/{components/settings => views}/Users.vue (100%) diff --git a/assets/src/router/index.js b/assets/src/router/index.js index a9b61cba..b1565952 100644 --- a/assets/src/router/index.js +++ b/assets/src/router/index.js @@ -1,12 +1,12 @@ import Vue from 'vue' import Router from 'vue-router' import Login from '@/views/Login' -import Main from '@/components/Main' -import Files from '@/components/files/Files' -import Users from '@/components/settings/Users' -import User from '@/components/settings/User' -import GlobalSettings from '@/components/settings/Global' -import ProfileSettings from '@/components/settings/Profile' +import Layout from '@/views/Layout' +import Files from '@/views/Files' +import Users from '@/views/Users' +import User from '@/views/User' +import GlobalSettings from '@/views/GlobalSettings' +import ProfileSettings from '@/views/ProfileSettings' import error403 from '@/components/errors/403' import error404 from '@/components/errors/404' import error500 from '@/components/errors/500' @@ -34,15 +34,9 @@ const router = new Router({ }) } }, - { - path: '/', - redirect: { - path: '/files/' - } - }, { path: '/*', - component: Main, + component: Layout, meta: { requiresAuth: true }, diff --git a/assets/src/components/files/Files.vue b/assets/src/views/Files.vue similarity index 97% rename from assets/src/components/files/Files.vue rename to assets/src/views/Files.vue index 203afa82..ea605b74 100644 --- a/assets/src/components/files/Files.vue +++ b/assets/src/views/Files.vue @@ -30,9 +30,9 @@ import Forbidden from '@/components/errors/403' import NotFound from '@/components/errors/404' import InternalError from '@/components/errors/500' -import Preview from './Preview' -import Listing from './Listing' -import Editor from './Editor' +import Preview from '@/components/files/Preview' +import Listing from '@/components/files/Listing' +import Editor from '@/components/files/Editor' import api from '@/utils/api' import { mapGetters, mapState, mapMutations } from 'vuex' diff --git a/assets/src/components/settings/Global.vue b/assets/src/views/GlobalSettings.vue similarity index 100% rename from assets/src/components/settings/Global.vue rename to assets/src/views/GlobalSettings.vue diff --git a/assets/src/components/Main.vue b/assets/src/views/Layout.vue similarity index 84% rename from assets/src/components/Main.vue rename to assets/src/views/Layout.vue index b09a5598..dc0af7a6 100644 --- a/assets/src/components/Main.vue +++ b/assets/src/views/Layout.vue @@ -10,13 +10,13 @@