Jared Norris 8 年 前
コミット
ad3dd9cd12
共有4 個のファイルを変更した80 個の追加71 個の削除を含む
  1. 76
    45
      .idea/workspace.xml
  2. 4
    2
      VueApp/src/App.vue
  3. 0
    2
      VueApp/src/main.js
  4. 0
    22
      VueApp/src/router/index.js

+ 76
- 45
.idea/workspace.xml ファイルの表示

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
4
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/VueApp/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/App.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/VueApp/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/main.js" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/VueApp/src/router/index.js" beforeDir="false" />
6
     </list>
9
     </list>
7
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8
     <option name="TRACKING_ENABLED" value="true" />
11
     <option name="TRACKING_ENABLED" value="true" />
13
   </component>
16
   </component>
14
   <component name="FileEditorManager">
17
   <component name="FileEditorManager">
15
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
18
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16
-      <file leaf-file-name="App.vue" pinned="false" current-in-tab="false">
19
+      <file leaf-file-name="App.vue" pinned="false" current-in-tab="true">
17
         <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
20
         <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
18
           <provider selected="true" editor-type-id="text-editor">
21
           <provider selected="true" editor-type-id="text-editor">
19
-            <state relative-caret-position="480">
20
-              <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
22
+            <state relative-caret-position="30">
23
+              <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
24
+              <folding>
25
+                <element signature="e#130#174#0" expanded="true" />
26
+              </folding>
27
+            </state>
28
+          </provider>
29
+        </entry>
30
+      </file>
31
+      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
32
+        <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
33
+          <provider selected="true" editor-type-id="text-editor">
34
+            <state relative-caret-position="300">
35
+              <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
36
+              <folding>
37
+                <element signature="n#!!doc" expanded="true" />
38
+                <element signature="e#140#161#0" expanded="true" />
39
+              </folding>
21
             </state>
40
             </state>
22
           </provider>
41
           </provider>
23
         </entry>
42
         </entry>
24
       </file>
43
       </file>
25
-      <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="true">
44
+      <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="false">
26
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
45
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
27
           <provider selected="true" editor-type-id="text-editor">
46
           <provider selected="true" editor-type-id="text-editor">
28
-            <state relative-caret-position="390">
29
-              <caret line="26" column="75" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="75" />
47
+            <state relative-caret-position="480">
48
+              <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
30
             </state>
49
             </state>
31
           </provider>
50
           </provider>
32
         </entry>
51
         </entry>
34
       <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
53
       <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
35
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
54
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
36
           <provider selected="true" editor-type-id="text-editor">
55
           <provider selected="true" editor-type-id="text-editor">
37
-            <state relative-caret-position="1605">
38
-              <caret line="107" column="3" lean-forward="true" selection-start-line="107" selection-start-column="3" selection-end-line="107" selection-end-column="3" />
56
+            <state relative-caret-position="13">
57
+              <caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
39
               <folding>
58
               <folding>
40
                 <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
59
                 <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
41
               </folding>
60
               </folding>
43
           </provider>
62
           </provider>
44
         </entry>
63
         </entry>
45
       </file>
64
       </file>
65
+      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="false">
66
+        <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
67
+          <provider selected="true" editor-type-id="text-editor">
68
+            <state relative-caret-position="420">
69
+              <caret line="28" column="7" lean-forward="true" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
70
+              <folding>
71
+                <element signature="e#253#292#0" expanded="true" />
72
+              </folding>
73
+            </state>
74
+          </provider>
75
+        </entry>
76
+      </file>
46
     </leaf>
77
     </leaf>
47
   </component>
78
   </component>
48
   <component name="FileTemplateManagerImpl">
79
   <component name="FileTemplateManagerImpl">
76
         <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
107
         <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
77
         <option value="$PROJECT_DIR$/VueApp/src/components/Home.vue" />
108
         <option value="$PROJECT_DIR$/VueApp/src/components/Home.vue" />
78
         <option value="$PROJECT_DIR$/VueApp/src/components/Callback.vue" />
109
         <option value="$PROJECT_DIR$/VueApp/src/components/Callback.vue" />
79
-        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
80
-        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
81
         <option value="$PROJECT_DIR$/VueApp/package.json" />
110
         <option value="$PROJECT_DIR$/VueApp/package.json" />
82
         <option value="$PROJECT_DIR$/VueApp/config/index.js" />
111
         <option value="$PROJECT_DIR$/VueApp/config/index.js" />
83
         <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
112
         <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
84
-        <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
85
-        <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
86
         <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
113
         <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
114
+        <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
115
+        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
116
+        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
117
+        <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
87
       </list>
118
       </list>
88
     </option>
119
     </option>
89
   </component>
120
   </component>
233
       <workItem from="1532532859490" duration="440000" />
264
       <workItem from="1532532859490" duration="440000" />
234
       <workItem from="1532553474100" duration="225000" />
265
       <workItem from="1532553474100" duration="225000" />
235
       <workItem from="1532696400445" duration="1212000" />
266
       <workItem from="1532696400445" duration="1212000" />
236
-      <workItem from="1533040907385" duration="8431000" />
267
+      <workItem from="1533040907385" duration="8662000" />
237
     </task>
268
     </task>
238
     <servers />
269
     <servers />
239
   </component>
270
   </component>
240
   <component name="TimeTrackingManager">
271
   <component name="TimeTrackingManager">
241
-    <option name="totallyTimeSpent" value="84106000" />
272
+    <option name="totallyTimeSpent" value="84337000" />
242
   </component>
273
   </component>
243
   <component name="ToolWindowManager">
274
   <component name="ToolWindowManager">
244
     <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
275
     <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
254
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
285
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
255
       <window_info anchor="bottom" id="Run" order="2" />
286
       <window_info anchor="bottom" id="Run" order="2" />
256
       <window_info anchor="bottom" id="Version Control" order="7" />
287
       <window_info anchor="bottom" id="Version Control" order="7" />
257
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.29054725" />
288
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.29054725" />
258
       <window_info id="Capture Tool" order="2" />
289
       <window_info id="Capture Tool" order="2" />
259
       <window_info id="Designer" order="2" />
290
       <window_info id="Designer" order="2" />
260
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
291
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
486
     <entry file="file://$PROJECT_DIR$/VueApp/config/dev.env.js">
517
     <entry file="file://$PROJECT_DIR$/VueApp/config/dev.env.js">
487
       <provider selected="true" editor-type-id="text-editor" />
518
       <provider selected="true" editor-type-id="text-editor" />
488
     </entry>
519
     </entry>
489
-    <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
490
-      <provider selected="true" editor-type-id="text-editor">
491
-        <state relative-caret-position="120">
492
-          <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
493
-          <folding>
494
-            <element signature="e#0#21#0" expanded="true" />
495
-          </folding>
496
-        </state>
497
-      </provider>
498
-    </entry>
499
-    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
500
-      <provider selected="true" editor-type-id="text-editor">
501
-        <state relative-caret-position="450">
502
-          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
503
-          <folding>
504
-            <element signature="n#!!doc" expanded="true" />
505
-            <element signature="e#140#161#0" expanded="true" />
506
-          </folding>
507
-        </state>
508
-      </provider>
509
-    </entry>
510
     <entry file="file://$PROJECT_DIR$/VueApp/build/vue-loader.conf.js">
520
     <entry file="file://$PROJECT_DIR$/VueApp/build/vue-loader.conf.js">
511
       <provider selected="true" editor-type-id="text-editor" />
521
       <provider selected="true" editor-type-id="text-editor" />
512
     </entry>
522
     </entry>
540
         </state>
550
         </state>
541
       </provider>
551
       </provider>
542
     </entry>
552
     </entry>
553
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
554
+      <provider selected="true" editor-type-id="text-editor">
555
+        <state relative-caret-position="13">
556
+          <caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
557
+          <folding>
558
+            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
559
+          </folding>
560
+        </state>
561
+      </provider>
562
+    </entry>
543
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
563
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
544
       <provider selected="true" editor-type-id="text-editor">
564
       <provider selected="true" editor-type-id="text-editor">
545
         <state relative-caret-position="420">
565
         <state relative-caret-position="420">
550
         </state>
570
         </state>
551
       </provider>
571
       </provider>
552
     </entry>
572
     </entry>
553
-    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
573
+    <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
574
+      <provider selected="true" editor-type-id="text-editor">
575
+        <state>
576
+          <caret lean-forward="true" />
577
+        </state>
578
+      </provider>
579
+    </entry>
580
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
554
       <provider selected="true" editor-type-id="text-editor">
581
       <provider selected="true" editor-type-id="text-editor">
555
         <state relative-caret-position="480">
582
         <state relative-caret-position="480">
556
           <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
583
           <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
557
         </state>
584
         </state>
558
       </provider>
585
       </provider>
559
     </entry>
586
     </entry>
560
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
587
+    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
561
       <provider selected="true" editor-type-id="text-editor">
588
       <provider selected="true" editor-type-id="text-editor">
562
-        <state relative-caret-position="1605">
563
-          <caret line="107" column="3" lean-forward="true" selection-start-line="107" selection-start-column="3" selection-end-line="107" selection-end-column="3" />
589
+        <state relative-caret-position="300">
590
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
564
           <folding>
591
           <folding>
565
-            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
592
+            <element signature="n#!!doc" expanded="true" />
593
+            <element signature="e#140#161#0" expanded="true" />
566
           </folding>
594
           </folding>
567
         </state>
595
         </state>
568
       </provider>
596
       </provider>
569
     </entry>
597
     </entry>
570
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
598
+    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
571
       <provider selected="true" editor-type-id="text-editor">
599
       <provider selected="true" editor-type-id="text-editor">
572
-        <state relative-caret-position="390">
573
-          <caret line="26" column="75" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="75" />
600
+        <state relative-caret-position="30">
601
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
602
+          <folding>
603
+            <element signature="e#130#174#0" expanded="true" />
604
+          </folding>
574
         </state>
605
         </state>
575
       </provider>
606
       </provider>
576
     </entry>
607
     </entry>

+ 4
- 2
VueApp/src/App.vue ファイルの表示

2
   <div class="master">
2
   <div class="master">
3
     <NavBar></NavBar>
3
     <NavBar></NavBar>
4
     <div class="container">
4
     <div class="container">
5
-        <router-view></router-view>
5
+        <Main></Main>
6
       </div>
6
       </div>
7
   </div>
7
   </div>
8
 </template>
8
 </template>
9
 
9
 
10
 <script>
10
 <script>
11
   import NavBar from './components/NavBar.vue'
11
   import NavBar from './components/NavBar.vue'
12
+  import Main from './components/Main.vue'
12
   export default {
13
   export default {
13
     name: 'app',
14
     name: 'app',
14
     components: {
15
     components: {
15
-      NavBar
16
+      NavBar,
17
+      Main
16
     }
18
     }
17
   }
19
   }
18
 </script>
20
 </script>

+ 0
- 2
VueApp/src/main.js ファイルの表示

7
 import 'bootstrap/dist/css/bootstrap.css'
7
 import 'bootstrap/dist/css/bootstrap.css'
8
 import 'bootstrap-vue/dist/bootstrap-vue.css'
8
 import 'bootstrap-vue/dist/bootstrap-vue.css'
9
 import App from './App'
9
 import App from './App'
10
-import router from './router'
11
 
10
 
12
 Vue.config.productionTip = false
11
 Vue.config.productionTip = false
13
 
12
 
25
 
24
 
26
 new Vue({ // eslint-disable-line no-new
25
 new Vue({ // eslint-disable-line no-new
27
   el: '#app',
26
   el: '#app',
28
-  router,
29
   render: h => h(App)
27
   render: h => h(App)
30
 })
28
 })

+ 0
- 22
VueApp/src/router/index.js ファイルの表示

1
-import Vue from 'vue'
2
-import Router from 'vue-router'
3
-import Main from '@/components/Main'
4
-
5
-Vue.use(Router)
6
-
7
-const router = new Router({
8
-  mode: 'history',
9
-  routes: [
10
-    {
11
-      path: '/main',
12
-      name: 'Main',
13
-      component: Main
14
-    },
15
-    {
16
-      path: '*',
17
-      redirect: '/main'
18
-    }
19
-  ]
20
-})
21
-
22
-export default router