restructure

.idea/workspace.xml

@@ -2,7 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/VueApp/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/VueApp/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/VueApp/src/router/index.js" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,20 +16,36 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="App.vue" pinned="false" current-in-tab="false">
+      <file leaf-file-name="App.vue" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
+            <state relative-caret-position="30">
+              <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+              <folding>
+                <element signature="e#130#174#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#140#161#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="true">
+      <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="26" column="75" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="75" />
+            <state relative-caret-position="480">
+              <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
             </state>
           </provider>
         </entry>
@@ -34,8 +53,8 @@
       <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1605">
-              <caret line="107" column="3" lean-forward="true" selection-start-line="107" selection-start-column="3" selection-end-line="107" selection-end-column="3" />
+            <state relative-caret-position="13">
+              <caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
               <folding>
                 <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
               </folding>
@@ -43,6 +62,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="28" column="7" lean-forward="true" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
+              <folding>
+                <element signature="e#253#292#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -76,14 +107,14 @@
         <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
         <option value="$PROJECT_DIR$/VueApp/src/components/Home.vue" />
         <option value="$PROJECT_DIR$/VueApp/src/components/Callback.vue" />
-        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
-        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
         <option value="$PROJECT_DIR$/VueApp/package.json" />
         <option value="$PROJECT_DIR$/VueApp/config/index.js" />
         <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
-        <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
-        <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
         <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
+        <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
+        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
+        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
+        <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
       </list>
     </option>
   </component>
@@ -233,12 +264,12 @@
       <workItem from="1532532859490" duration="440000" />
       <workItem from="1532553474100" duration="225000" />
       <workItem from="1532696400445" duration="1212000" />
-      <workItem from="1533040907385" duration="8431000" />
+      <workItem from="1533040907385" duration="8662000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="84106000" />
+    <option name="totallyTimeSpent" value="84337000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
@@ -254,7 +285,7 @@
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.29054725" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.29054725" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
@@ -486,27 +517,6 @@
     <entry file="file://$PROJECT_DIR$/VueApp/config/dev.env.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#140#161#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/VueApp/build/vue-loader.conf.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -540,6 +550,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="13">
+          <caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+          <folding>
+            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -550,27 +570,38 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
+    <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret lean-forward="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="480">
           <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
+    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1605">
-          <caret line="107" column="3" lean-forward="true" selection-start-line="107" selection-start-column="3" selection-end-line="107" selection-end-column="3" />
+        <state relative-caret-position="300">
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
           <folding>
-            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#140#161#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
+    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="75" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="75" />
+        <state relative-caret-position="30">
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+          <folding>
+            <element signature="e#130#174#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

VueApp/src/App.vue

@@ -2,17 +2,19 @@
   <div class="master">
     <NavBar></NavBar>
     <div class="container">
-        <router-view></router-view>
+        <Main></Main>
       </div>
   </div>
 </template>
 
 <script>
   import NavBar from './components/NavBar.vue'
+  import Main from './components/Main.vue'
   export default {
     name: 'app',
     components: {
-      NavBar
+      NavBar,
+      Main
     }
   }
 </script>

VueApp/src/main.js

@@ -7,7 +7,6 @@ import BootstrapVue from 'bootstrap-vue'
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css'
 import App from './App'
-import router from './router'
 
 Vue.config.productionTip = false
 
@@ -25,6 +24,5 @@ Vue.use(BootstrapVue)
 
 new Vue({ // eslint-disable-line no-new
   el: '#app',
-  router,
   render: h => h(App)
 })

VueApp/src/router/index.js

@@ -1,22 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import Main from '@/components/Main'
-
-Vue.use(Router)
-
-const router = new Router({
-  mode: 'history',
-  routes: [
-    {
-      path: '/main',
-      name: 'Main',
-      component: Main
-    },
-    {
-      path: '*',
-      redirect: '/main'
-    }
-  ]
-})
-
-export default router