ref: components structure

vnurov · vnurov · commit a80c8162a833 · 2019-09-28T22:53:40.000+03:00
diff --git a/client/App.vue b/client/App.vue
@@ -10,8 +10,8 @@
 import { mapGetters, mapActions } from 'vuex';
 
 import LayoutHeader from './components/layout/layout_header/layout_header';
-import Timetracker from './components/timetracker/timetracker';
-import Modals from './components/modals/modals';
+import Modals from './components/layout/modals/modals';
+import Timetracker from './pages/timetracker';
 
 export default {
   components: { LayoutHeader, Timetracker, Modals },
diff --git a/client/components/layout/layout_header/user/user_menu.vue b/client/components/layout/layout_header/user/user_menu.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <div class="buttons">    
+  <div class="buttons">
     <div class="button"
          @click="logout()"
     > Выйти </div>
diff --git a/client/components/layout/layout_header/user/user_stub.vue b/client/components/layout/layout_header/user/user_stub.vue
@@ -7,7 +7,7 @@
 <script>
 import { mapGetters } from 'vuex';
 
-import Loader from '../../../loader';
+import Loader from '../../../shared/loader';
 
 export default {
   components: {
diff --git a/client/components/layout/modals/modals.vue b/client/components/layout/modals/modals.vue
diff --git a/client/components/layout/modals/modals_signin.vue b/client/components/layout/modals/modals_signin.vue
@@ -26,7 +26,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 
-import Loader from '../loader';
+import Loader from '../../shared/loader';
 
 export default {
   components: {
diff --git a/client/components/layout/modals/modals_signup.vue b/client/components/layout/modals/modals_signup.vue
@@ -34,7 +34,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 
-import Loader from '../loader';
+import Loader from '../../shared/loader';
 
 export default {
   components: {
diff --git a/client/components/layout/yield.vue b/client/components/layout/yield.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>
diff --git a/client/components/shared/loader.vue b/client/components/shared/loader.vue
@@ -2,11 +2,6 @@
   <div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div>
 </template>
 
-<script>
-export default {
-}
-</script>
-
 <style lang="css" scoped>
 .lds-ellipsis {
   display: inline-block;
diff --git a/client/pages/timetracker.vue b/client/pages/timetracker.vue
@@ -18,8 +18,8 @@
 
 import { mapGetters } from 'vuex';
 
-import Tasks from './tasks/tasks';
-import Report from './report/report';
+import Tasks from '../components/timetracker/tasks/tasks';
+import Report from '../components/timetracker/report/report';
 
 export default {
   components: {
