Kaynağa Gözat

RC 1 needs state management

Jared Norris 8 yıl önce
ebeveyn
işleme
0521345cd1

+ 126
- 213
.idea/workspace.xml Dosyayı Görüntüle

@@ -2,7 +2,21 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/VueApp/config/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/config/index.js" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/VueApp/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/package-lock.json" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/VueApp/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/package.json" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/VueApp/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/App.vue" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/VueApp/src/assets/loading.svg" beforeDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/VueApp/src/assets/logo.png" beforeDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/VueApp/src/auth/AuthService.js" beforeDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/Callback.vue" beforeDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" afterDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/Home.vue" beforeDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/Main.vue" afterDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/VueApp/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/main.js" afterDir="false" />
19
+      <change beforePath="$PROJECT_DIR$/VueApp/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/router/index.js" afterDir="false" />
6 20
     </list>
7 21
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 22
     <option name="TRACKING_ENABLED" value="true" />
@@ -12,68 +26,7 @@
12 26
     <option name="LAST_RESOLUTION" value="IGNORE" />
13 27
   </component>
14 28
   <component name="FileEditorManager">
15
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16
-      <file leaf-file-name="App.vue" pinned="false" current-in-tab="false">
17
-        <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
18
-          <provider selected="true" editor-type-id="text-editor">
19
-            <state relative-caret-position="30">
20
-              <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
21
-            </state>
22
-          </provider>
23
-        </entry>
24
-      </file>
25
-      <file leaf-file-name="Home.vue" pinned="false" current-in-tab="false">
26
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
27
-          <provider selected="true" editor-type-id="text-editor">
28
-            <state relative-caret-position="15">
29
-              <caret line="1" column="25" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
30
-            </state>
31
-          </provider>
32
-        </entry>
33
-      </file>
34
-      <file leaf-file-name="AuthService.js" pinned="false" current-in-tab="false">
35
-        <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
36
-          <provider selected="true" editor-type-id="text-editor">
37
-            <state relative-caret-position="765">
38
-              <caret line="51" column="3" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
39
-            </state>
40
-          </provider>
41
-        </entry>
42
-      </file>
43
-      <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
44
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
45
-          <provider selected="true" editor-type-id="text-editor">
46
-            <state relative-caret-position="245">
47
-              <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
48
-              <folding>
49
-                <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
50
-              </folding>
51
-            </state>
52
-          </provider>
53
-        </entry>
54
-      </file>
55
-      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="false">
56
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
57
-          <provider selected="true" editor-type-id="text-editor">
58
-            <state relative-caret-position="525">
59
-              <caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
60
-              <folding>
61
-                <element signature="e#337#376#0" expanded="true" />
62
-              </folding>
63
-            </state>
64
-          </provider>
65
-        </entry>
66
-      </file>
67
-      <file leaf-file-name="ElevationGraph.vue" pinned="false" current-in-tab="true">
68
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
69
-          <provider selected="true" editor-type-id="text-editor">
70
-            <state relative-caret-position="375">
71
-              <caret line="25" column="11" lean-forward="true" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
72
-            </state>
73
-          </provider>
74
-        </entry>
75
-      </file>
76
-    </leaf>
29
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
77 30
   </component>
78 31
   <component name="FileTemplateManagerImpl">
79 32
     <option name="RECENT_TEMPLATES">
@@ -100,16 +53,20 @@
100 53
         <option value="$PROJECT_DIR$/VueApp/src/components/Main" />
101 54
         <option value="$PROJECT_DIR$/VueApp/src/components/Directions.vue" />
102 55
         <option value="$PROJECT_DIR$/VueApp/src/components/Directions.js" />
103
-        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
104 56
         <option value="$PROJECT_DIR$/VueApp/index.html" />
105 57
         <option value="$PROJECT_DIR$/VueApp/node_modules/vue2-google-maps/src/manager.js" />
106
-        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
58
+        <option value="$PROJECT_DIR$/VueApp/src/auth/AuthService.js" />
59
+        <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
107 60
         <option value="$PROJECT_DIR$/VueApp/src/components/Home.vue" />
61
+        <option value="$PROJECT_DIR$/VueApp/src/components/Callback.vue" />
62
+        <option value="$PROJECT_DIR$/VueApp/src/router/index.js" />
63
+        <option value="$PROJECT_DIR$/VueApp/src/main.js" />
64
+        <option value="$PROJECT_DIR$/VueApp/package.json" />
65
+        <option value="$PROJECT_DIR$/VueApp/config/index.js" />
66
+        <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
108 67
         <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
68
+        <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
109 69
         <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
110
-        <option value="$PROJECT_DIR$/VueApp/src/auth/AuthService.js" />
111
-        <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
112
-        <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
113 70
       </list>
114 71
     </option>
115 72
   </component>
@@ -128,10 +85,10 @@
128 85
     </packageJsonPaths>
129 86
   </component>
130 87
   <component name="ProjectFrameBounds" fullScreen="true">
131
-    <option name="x" value="282" />
132
-    <option name="y" value="-709" />
133
-    <option name="width" value="1280" />
134
-    <option name="height" value="709" />
88
+    <option name="x" value="-358" />
89
+    <option name="y" value="-1080" />
90
+    <option name="width" value="1920" />
91
+    <option name="height" value="1080" />
135 92
   </component>
136 93
   <component name="ProjectView">
137 94
     <navigator proportions="" version="1">
@@ -154,14 +111,13 @@
154 111
               <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
155 112
               <item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
156 113
               <item name="VueApp" type="462c0819:PsiDirectoryNode" />
157
-              <item name="src" type="462c0819:PsiDirectoryNode" />
114
+              <item name="config" type="462c0819:PsiDirectoryNode" />
158 115
             </path>
159 116
             <path>
160 117
               <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
161 118
               <item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
162 119
               <item name="VueApp" type="462c0819:PsiDirectoryNode" />
163 120
               <item name="src" type="462c0819:PsiDirectoryNode" />
164
-              <item name="auth" type="462c0819:PsiDirectoryNode" />
165 121
             </path>
166 122
             <path>
167 123
               <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
@@ -170,19 +126,13 @@
170 126
               <item name="src" type="462c0819:PsiDirectoryNode" />
171 127
               <item name="components" type="462c0819:PsiDirectoryNode" />
172 128
             </path>
173
-            <path>
174
-              <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
175
-              <item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
176
-              <item name="VueApp" type="462c0819:PsiDirectoryNode" />
177
-              <item name="static" type="462c0819:PsiDirectoryNode" />
178
-            </path>
179 129
           </expand>
180 130
           <select />
181 131
         </subPane>
182 132
       </pane>
183 133
       <pane id="AndroidView" />
184
-      <pane id="Scope" />
185 134
       <pane id="PackagesPane" />
135
+      <pane id="Scope" />
186 136
     </panes>
187 137
   </component>
188 138
   <component name="PropertiesComponent">
@@ -272,15 +222,15 @@
272 222
       <workItem from="1532532859490" duration="440000" />
273 223
       <workItem from="1532553474100" duration="225000" />
274 224
       <workItem from="1532696400445" duration="1212000" />
225
+      <workItem from="1533040907385" duration="6459000" />
275 226
     </task>
276 227
     <servers />
277 228
   </component>
278 229
   <component name="TimeTrackingManager">
279
-    <option name="totallyTimeSpent" value="74667000" />
230
+    <option name="totallyTimeSpent" value="82134000" />
280 231
   </component>
281 232
   <component name="ToolWindowManager">
282 233
     <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
283
-    <editor active="true" />
284 234
     <layout>
285 235
       <window_info anchor="right" id="Palette" order="3" />
286 236
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -290,12 +240,12 @@
290 240
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
291 241
       <window_info anchor="right" id="Maven Projects" order="3" />
292 242
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
293
-      <window_info anchor="bottom" id="Version Control" order="7" />
294 243
       <window_info anchor="bottom" id="Run" order="2" />
295
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.19800995" />
244
+      <window_info anchor="bottom" id="Version Control" order="7" />
245
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.29054725" />
296 246
       <window_info id="Capture Tool" order="2" />
297 247
       <window_info id="Designer" order="2" />
298
-      <window_info content_ui="combo" id="Project" order="0" weight="0.20500532" />
248
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
299 249
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
300 250
       <window_info anchor="right" id="Database" order="3" />
301 251
       <window_info id="Learn" order="2" />
@@ -303,37 +253,14 @@
303 253
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
304 254
       <window_info id="UI Designer" order="2" />
305 255
       <window_info anchor="right" id="Theme Preview" order="3" />
306
-      <window_info id="Favorites" order="2" side_tool="true" />
307 256
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
308
-      <window_info anchor="right" id="Palette" order="3" />
309
-      <window_info anchor="right" id="Theme Preview" order="3" />
310
-      <window_info id="Designer" order="2" />
257
+      <window_info id="Favorites" order="2" side_tool="true" />
311 258
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
312
-      <window_info anchor="right" id="Capture Analysis" order="3" />
313
-      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
314 259
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
315
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
316
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30129242" />
317
-      <window_info id="Learn" order="2" />
318 260
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
319
-      <window_info anchor="bottom" id="TODO" order="6" />
320
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
321
-      <window_info anchor="bottom" id="Version Control" order="7" />
322
-      <window_info anchor="bottom" id="Run" order="2" />
323
-      <window_info id="Image Layers" order="2" />
324
-      <window_info id="Capture Tool" order="2" />
325
-      <window_info id="UI Designer" order="2" />
326
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
327
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
328
-      <window_info anchor="right" id="Database" order="3" />
329
-      <window_info anchor="right" id="Palette&#9;" order="3" />
330 261
       <window_info anchor="bottom" id="Message" order="0" />
331
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
332 262
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
333 263
       <window_info anchor="bottom" id="Find" order="1" />
334
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.39052287" />
335
-      <window_info anchor="right" id="Maven Projects" order="3" />
336
-      <window_info id="Favorites" order="2" side_tool="true" />
337 264
     </layout>
338 265
   </component>
339 266
   <component name="TypeScriptGeneratedFilesManager">
@@ -348,59 +275,6 @@
348 275
     <option name="myLimit" value="2678400000" />
349 276
   </component>
350 277
   <component name="editorHistoryManager">
351
-    <entry file="file://$PROJECT_DIR$/VueApp/node_modules/vue2-google-maps/src/manager.js">
352
-      <provider selected="true" editor-type-id="text-editor">
353
-        <state relative-caret-position="853">
354
-          <caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
355
-        </state>
356
-      </provider>
357
-    </entry>
358
-    <entry file="file://$PROJECT_DIR$/VueApp/index.html">
359
-      <provider selected="true" editor-type-id="text-editor">
360
-        <state relative-caret-position="105">
361
-          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
362
-        </state>
363
-      </provider>
364
-    </entry>
365
-    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
366
-      <provider selected="true" editor-type-id="text-editor">
367
-        <state>
368
-          <caret column="18" lean-forward="true" selection-start-column="18" selection-end-column="18" />
369
-        </state>
370
-      </provider>
371
-    </entry>
372
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
373
-      <provider selected="true" editor-type-id="text-editor">
374
-        <state relative-caret-position="105">
375
-          <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
376
-        </state>
377
-      </provider>
378
-    </entry>
379
-    <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
380
-      <provider selected="true" editor-type-id="text-editor">
381
-        <state relative-caret-position="510">
382
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
383
-        </state>
384
-      </provider>
385
-    </entry>
386
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Potential.vue" />
387
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
388
-      <provider selected="true" editor-type-id="text-editor">
389
-        <state relative-caret-position="15">
390
-          <caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
391
-          <folding>
392
-            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
393
-          </folding>
394
-        </state>
395
-      </provider>
396
-    </entry>
397
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
398
-      <provider selected="true" editor-type-id="text-editor">
399
-        <state relative-caret-position="90">
400
-          <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
401
-        </state>
402
-      </provider>
403
-    </entry>
404 278
     <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
405 279
       <provider selected="true" editor-type-id="text-editor">
406 280
         <state relative-caret-position="274">
@@ -507,23 +381,7 @@
507 381
       </provider>
508 382
     </entry>
509 383
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Potential.vue" />
510
-    <entry file="file://$PROJECT_DIR$/README.md">
511
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
512
-        <state split_layout="SECOND">
513
-          <first_editor />
514
-          <second_editor />
515
-        </state>
516
-      </provider>
517
-    </entry>
518 384
     <entry file="file://$PROJECT_DIR$/VueApp/README.md" />
519
-    <entry file="file://$PROJECT_DIR$/VueApp/package-lock.json">
520
-      <provider selected="true" editor-type-id="text-editor">
521
-        <state relative-caret-position="-171716" />
522
-      </provider>
523
-    </entry>
524
-    <entry file="file://$PROJECT_DIR$/VueApp/package.json">
525
-      <provider selected="true" editor-type-id="text-editor" />
526
-    </entry>
527 385
     <entry file="file://$PROJECT_DIR$/VueApp/Dockerfile">
528 386
       <provider selected="true" editor-type-id="text-editor">
529 387
         <state relative-caret-position="180">
@@ -567,84 +425,139 @@
567 425
         </state>
568 426
       </provider>
569 427
     </entry>
570
-    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
428
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Potential.vue" />
429
+    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/loading.svg">
430
+      <provider selected="true" editor-type-id="images" />
431
+    </entry>
432
+    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/logo.png">
433
+      <provider selected="true" editor-type-id="images" />
434
+    </entry>
435
+    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/PotentialEnergy.png">
436
+      <provider selected="true" editor-type-id="images" />
437
+    </entry>
438
+    <entry file="file://$PROJECT_DIR$/VueApp/src/auth/auth0-variables.js">
439
+      <provider selected="true" editor-type-id="text-editor" />
440
+    </entry>
441
+    <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
571 442
       <provider selected="true" editor-type-id="text-editor">
572
-        <state>
573
-          <caret column="18" lean-forward="true" selection-start-column="18" selection-end-column="18" />
443
+        <state relative-caret-position="720">
444
+          <caret line="51" column="3" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
574 445
         </state>
575 446
       </provider>
576 447
     </entry>
577
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Potential.vue" />
448
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
449
+      <provider selected="true" editor-type-id="text-editor" />
450
+    </entry>
578 451
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Callback.vue">
579 452
       <provider selected="true" editor-type-id="text-editor">
580 453
         <state relative-caret-position="165">
581
-          <caret line="11" column="38" lean-forward="true" selection-start-line="11" selection-start-column="38" selection-end-line="11" selection-end-column="38" />
454
+          <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
582 455
         </state>
583 456
       </provider>
584 457
     </entry>
585
-    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/loading.svg">
586
-      <provider selected="true" editor-type-id="images" />
458
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
459
+      <provider selected="true" editor-type-id="text-editor">
460
+        <state relative-caret-position="375">
461
+          <caret line="25" column="11" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
462
+        </state>
463
+      </provider>
587 464
     </entry>
588
-    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/logo.png">
589
-      <provider selected="true" editor-type-id="images" />
465
+    <entry file="file://$PROJECT_DIR$/VueApp/config/test.env.js">
466
+      <provider selected="true" editor-type-id="text-editor" />
590 467
     </entry>
591
-    <entry file="file://$PROJECT_DIR$/VueApp/src/assets/PotentialEnergy.png">
592
-      <provider selected="true" editor-type-id="images" />
468
+    <entry file="file://$PROJECT_DIR$/VueApp/config/prod.env.js">
469
+      <provider selected="true" editor-type-id="text-editor" />
470
+    </entry>
471
+    <entry file="file://$PROJECT_DIR$/VueApp/build/webpack.base.conf.js">
472
+      <provider selected="true" editor-type-id="text-editor" />
473
+    </entry>
474
+    <entry file="file://$PROJECT_DIR$/VueApp/config/dev.env.js">
475
+      <provider selected="true" editor-type-id="text-editor" />
593 476
     </entry>
594 477
     <entry file="file://$PROJECT_DIR$/VueApp/src/router/index.js">
595 478
       <provider selected="true" editor-type-id="text-editor">
596
-        <state relative-caret-position="450">
597
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
479
+        <state relative-caret-position="120">
480
+          <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
481
+          <folding>
482
+            <element signature="e#0#21#0" expanded="true" />
483
+          </folding>
598 484
         </state>
599 485
       </provider>
600 486
     </entry>
601
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
487
+    <entry file="file://$PROJECT_DIR$/VueApp/src/main.js">
602 488
       <provider selected="true" editor-type-id="text-editor">
603
-        <state relative-caret-position="245">
604
-          <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
489
+        <state relative-caret-position="450">
490
+          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
605 491
           <folding>
606
-            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
492
+            <element signature="n#!!doc" expanded="true" />
493
+            <element signature="e#140#161#0" expanded="true" />
607 494
           </folding>
608 495
         </state>
609 496
       </provider>
610 497
     </entry>
611
-    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
498
+    <entry file="file://$PROJECT_DIR$/VueApp/build/vue-loader.conf.js">
499
+      <provider selected="true" editor-type-id="text-editor" />
500
+    </entry>
501
+    <entry file="file://$PROJECT_DIR$/VueApp/.vscode/settings.json">
502
+      <provider selected="true" editor-type-id="text-editor" />
503
+    </entry>
504
+    <entry file="file://$PROJECT_DIR$/README.md">
505
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
506
+        <state split_layout="SECOND">
507
+          <first_editor />
508
+          <second_editor />
509
+        </state>
510
+      </provider>
511
+    </entry>
512
+    <entry file="file://$PROJECT_DIR$/VueApp/package-lock.json">
612 513
       <provider selected="true" editor-type-id="text-editor">
613
-        <state relative-caret-position="30">
614
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
514
+        <state relative-caret-position="-3016" />
515
+      </provider>
516
+    </entry>
517
+    <entry file="file://$PROJECT_DIR$/VueApp/package.json">
518
+      <provider selected="true" editor-type-id="text-editor">
519
+        <state relative-caret-position="465">
520
+          <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
615 521
         </state>
616 522
       </provider>
617 523
     </entry>
618
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
524
+    <entry file="file://$PROJECT_DIR$/VueApp/config/index.js">
619 525
       <provider selected="true" editor-type-id="text-editor">
620
-        <state relative-caret-position="375">
621
-          <caret line="25" column="11" lean-forward="true" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
526
+        <state relative-caret-position="495">
527
+          <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
622 528
         </state>
623 529
       </provider>
624 530
     </entry>
625
-    <entry file="file://$PROJECT_DIR$/VueApp/src/auth/auth0-variables.js">
626
-      <provider selected="true" editor-type-id="text-editor" />
531
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
532
+      <provider selected="true" editor-type-id="text-editor">
533
+        <state relative-caret-position="195">
534
+          <caret line="13" column="21" lean-forward="true" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
535
+        </state>
536
+      </provider>
627 537
     </entry>
628
-    <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
538
+    <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
629 539
       <provider selected="true" editor-type-id="text-editor">
630
-        <state relative-caret-position="15">
631
-          <caret line="1" column="25" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
540
+        <state relative-caret-position="30">
541
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
632 542
         </state>
633 543
       </provider>
634 544
     </entry>
635
-    <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
545
+    <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
636 546
       <provider selected="true" editor-type-id="text-editor">
637
-        <state relative-caret-position="765">
638
-          <caret line="51" column="3" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
547
+        <state relative-caret-position="150">
548
+          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
549
+          <folding>
550
+            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
551
+          </folding>
639 552
         </state>
640 553
       </provider>
641 554
     </entry>
642 555
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
643 556
       <provider selected="true" editor-type-id="text-editor">
644
-        <state relative-caret-position="525">
645
-          <caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
557
+        <state relative-caret-position="420">
558
+          <caret line="28" column="7" lean-forward="true" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
646 559
           <folding>
647
-            <element signature="e#337#376#0" expanded="true" />
560
+            <element signature="e#253#292#0" expanded="true" />
648 561
           </folding>
649 562
         </state>
650 563
       </provider>

+ 14
- 17
VueApp/config/index.js Dosyayı Görüntüle

@@ -1,5 +1,4 @@
1
-// see http://vuejs-templates.github.io/webpack for documentation.
2
-var path = require('path')
1
+const path = require('path')
3 2
 
4 3
 module.exports = {
5 4
   build: {
@@ -9,16 +8,8 @@ module.exports = {
9 8
     assetsSubDirectory: 'static',
10 9
     assetsPublicPath: '/',
11 10
     productionSourceMap: true,
12
-    // Gzip off by default as many popular static hosts such as
13
-    // Surge or Netlify already gzip all static assets for you.
14
-    // Before setting to `true`, make sure to:
15
-    // npm install --save-dev compression-webpack-plugin
16 11
     productionGzip: false,
17 12
     productionGzipExtensions: ['js', 'css'],
18
-    // Run the build command with an extra argument to
19
-    // View the bundle analyzer report after build finishes:
20
-    // `npm run build --report`
21
-    // Set to `true` or `false` to always turn it on or off
22 13
     bundleAnalyzerReport: process.env.npm_config_report
23 14
   },
24 15
   dev: {
@@ -28,11 +19,17 @@ module.exports = {
28 19
     assetsSubDirectory: 'static',
29 20
     assetsPublicPath: '/',
30 21
     proxyTable: {},
31
-    // CSS Sourcemaps off by default because relative paths are "buggy"
32
-    // with this option, according to the CSS-Loader README
33
-    // (https://github.com/webpack/css-loader#sourcemaps)
34
-    // In our experience, they generally work as expected,
35
-    // just be aware of this issue when enabling this option.
36
-    cssSourceMap: false
37
-  }
22
+    cssSourceMap: true
23
+  },
24
+  module: {
25
+       rules: [
26
+         {
27
+           test: /\.css$/,
28
+           use: [
29
+             'style-loader',
30
+             'css-loader'
31
+           ]
32
+       }
33
+     ]
34
+   }
38 35
 }

+ 170
- 49
VueApp/package-lock.json Dosyayı Görüntüle

@@ -156,8 +156,7 @@
156 156
     "ansi-regex": {
157 157
       "version": "2.1.1",
158 158
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
159
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
160
-      "dev": true
159
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
161 160
     },
162 161
     "ansi-styles": {
163 162
       "version": "3.2.1",
@@ -1200,6 +1199,23 @@
1200 1199
         "babel-types": "6.26.0"
1201 1200
       }
1202 1201
     },
1202
+    "babel-polyfill": {
1203
+      "version": "6.23.0",
1204
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
1205
+      "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
1206
+      "requires": {
1207
+        "babel-runtime": "6.26.0",
1208
+        "core-js": "2.5.7",
1209
+        "regenerator-runtime": "0.10.5"
1210
+      },
1211
+      "dependencies": {
1212
+        "regenerator-runtime": {
1213
+          "version": "0.10.5",
1214
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
1215
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
1216
+        }
1217
+      }
1218
+    },
1203 1219
     "babel-preset-env": {
1204 1220
       "version": "1.7.0",
1205 1221
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
@@ -1294,7 +1310,6 @@
1294 1310
       "version": "6.26.0",
1295 1311
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
1296 1312
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
1297
-      "dev": true,
1298 1313
       "requires": {
1299 1314
         "core-js": "2.5.7",
1300 1315
         "regenerator-runtime": "0.11.1"
@@ -1549,10 +1564,25 @@
1549 1564
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
1550 1565
       "dev": true
1551 1566
     },
1552
-    "bootstrap": {
1553
-      "version": "3.3.7",
1554
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
1555
-      "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
1567
+    "bootstrap-vue": {
1568
+      "version": "2.0.0-rc.11",
1569
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.11.tgz",
1570
+      "integrity": "sha512-LxR+oL8yKr1DVoWUWTX+XhiT0xaTMH6142u2VSFDm4tewTH8HIrzN2YIl7HLZrw2DIuE9bRMIdWJqqn3aQe7Hw==",
1571
+      "requires": {
1572
+        "bootstrap": "4.1.3",
1573
+        "lodash.get": "4.4.2",
1574
+        "lodash.startcase": "4.4.0",
1575
+        "opencollective": "1.0.3",
1576
+        "popper.js": "1.14.3",
1577
+        "vue-functional-data-merge": "2.0.6"
1578
+      },
1579
+      "dependencies": {
1580
+        "bootstrap": {
1581
+          "version": "4.1.3",
1582
+          "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
1583
+          "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
1584
+        }
1585
+      }
1556 1586
     },
1557 1587
     "brace-expansion": {
1558 1588
       "version": "1.1.11",
@@ -1944,8 +1974,7 @@
1944 1974
     "chardet": {
1945 1975
       "version": "0.4.2",
1946 1976
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
1947
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
1948
-      "dev": true
1977
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
1949 1978
     },
1950 1979
     "check-error": {
1951 1980
       "version": "1.0.2",
@@ -2108,7 +2137,6 @@
2108 2137
       "version": "2.1.0",
2109 2138
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
2110 2139
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
2111
-      "dev": true,
2112 2140
       "requires": {
2113 2141
         "restore-cursor": "2.0.0"
2114 2142
       }
@@ -2122,8 +2150,7 @@
2122 2150
     "cli-width": {
2123 2151
       "version": "2.2.0",
2124 2152
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
2125
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
2126
-      "dev": true
2153
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
2127 2154
     },
2128 2155
     "cliui": {
2129 2156
       "version": "2.1.0",
@@ -2485,8 +2512,7 @@
2485 2512
     "core-js": {
2486 2513
       "version": "2.5.7",
2487 2514
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
2488
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
2489
-      "dev": true
2515
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
2490 2516
     },
2491 2517
     "core-util-is": {
2492 2518
       "version": "1.0.2",
@@ -3355,6 +3381,14 @@
3355 3381
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
3356 3382
       "dev": true
3357 3383
     },
3384
+    "encoding": {
3385
+      "version": "0.1.12",
3386
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
3387
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
3388
+      "requires": {
3389
+        "iconv-lite": "0.4.23"
3390
+      }
3391
+    },
3358 3392
     "end-of-stream": {
3359 3393
       "version": "1.4.1",
3360 3394
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -3592,8 +3626,7 @@
3592 3626
     "escape-string-regexp": {
3593 3627
       "version": "1.0.5",
3594 3628
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
3595
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
3596
-      "dev": true
3629
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
3597 3630
     },
3598 3631
     "escodegen": {
3599 3632
       "version": "1.8.1",
@@ -4257,7 +4290,6 @@
4257 4290
       "version": "2.2.0",
4258 4291
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
4259 4292
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
4260
-      "dev": true,
4261 4293
       "requires": {
4262 4294
         "chardet": "0.4.2",
4263 4295
         "iconv-lite": "0.4.23",
@@ -4407,7 +4439,6 @@
4407 4439
       "version": "2.0.0",
4408 4440
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
4409 4441
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
4410
-      "dev": true,
4411 4442
       "requires": {
4412 4443
         "escape-string-regexp": "1.0.5"
4413 4444
       }
@@ -5617,7 +5648,6 @@
5617 5648
       "version": "2.0.0",
5618 5649
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
5619 5650
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
5620
-      "dev": true,
5621 5651
       "requires": {
5622 5652
         "ansi-regex": "2.1.1"
5623 5653
       }
@@ -6056,7 +6086,6 @@
6056 6086
       "version": "0.4.23",
6057 6087
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
6058 6088
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
6059
-      "dev": true,
6060 6089
       "requires": {
6061 6090
         "safer-buffer": "2.1.2"
6062 6091
       }
@@ -6375,8 +6404,7 @@
6375 6404
     "is-fullwidth-code-point": {
6376 6405
       "version": "2.0.0",
6377 6406
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
6378
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
6379
-      "dev": true
6407
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
6380 6408
     },
6381 6409
     "is-glob": {
6382 6410
       "version": "4.0.0",
@@ -6465,8 +6493,7 @@
6465 6493
     "is-promise": {
6466 6494
       "version": "2.1.0",
6467 6495
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
6468
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
6469
-      "dev": true
6496
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
6470 6497
     },
6471 6498
     "is-resolvable": {
6472 6499
       "version": "1.1.0",
@@ -6482,8 +6509,7 @@
6482 6509
     "is-stream": {
6483 6510
       "version": "1.1.0",
6484 6511
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
6485
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
6486
-      "dev": true
6512
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
6487 6513
     },
6488 6514
     "is-svg": {
6489 6515
       "version": "2.1.0",
@@ -7167,6 +7193,11 @@
7167 7193
         }
7168 7194
       }
7169 7195
     },
7196
+    "lodash.get": {
7197
+      "version": "4.4.2",
7198
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
7199
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
7200
+    },
7170 7201
     "lodash.isarguments": {
7171 7202
       "version": "3.1.0",
7172 7203
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -7220,6 +7251,11 @@
7220 7251
       "integrity": "sha1-lU73UEkmIDjJbR/Jiyj9r58Hcqo=",
7221 7252
       "dev": true
7222 7253
     },
7254
+    "lodash.startcase": {
7255
+      "version": "4.4.0",
7256
+      "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
7257
+      "integrity": "sha1-lDbjTtJgk+1/+uGTYUQ1CRXZrdg="
7258
+    },
7223 7259
     "lodash.uniq": {
7224 7260
       "version": "4.5.0",
7225 7261
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -7562,8 +7598,7 @@
7562 7598
     "mimic-fn": {
7563 7599
       "version": "1.2.0",
7564 7600
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
7565
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
7566
-      "dev": true
7601
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
7567 7602
     },
7568 7603
     "mimic-response": {
7569 7604
       "version": "1.0.1",
@@ -7821,8 +7856,7 @@
7821 7856
     "mute-stream": {
7822 7857
       "version": "0.0.7",
7823 7858
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
7824
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
7825
-      "dev": true
7859
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
7826 7860
     },
7827 7861
     "nan": {
7828 7862
       "version": "2.10.0",
@@ -7936,6 +7970,15 @@
7936 7970
         "lower-case": "1.1.4"
7937 7971
       }
7938 7972
     },
7973
+    "node-fetch": {
7974
+      "version": "1.6.3",
7975
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz",
7976
+      "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
7977
+      "requires": {
7978
+        "encoding": "0.1.12",
7979
+        "is-stream": "1.1.0"
7980
+      }
7981
+    },
7939 7982
     "node-libs-browser": {
7940 7983
       "version": "2.1.0",
7941 7984
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
@@ -8146,11 +8189,86 @@
8146 8189
       "version": "2.0.1",
8147 8190
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
8148 8191
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
8149
-      "dev": true,
8150 8192
       "requires": {
8151 8193
         "mimic-fn": "1.2.0"
8152 8194
       }
8153 8195
     },
8196
+    "opencollective": {
8197
+      "version": "1.0.3",
8198
+      "resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz",
8199
+      "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
8200
+      "requires": {
8201
+        "babel-polyfill": "6.23.0",
8202
+        "chalk": "1.1.3",
8203
+        "inquirer": "3.0.6",
8204
+        "minimist": "1.2.0",
8205
+        "node-fetch": "1.6.3",
8206
+        "opn": "4.0.2"
8207
+      },
8208
+      "dependencies": {
8209
+        "ansi-escapes": {
8210
+          "version": "1.4.0",
8211
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
8212
+          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
8213
+        },
8214
+        "ansi-styles": {
8215
+          "version": "2.2.1",
8216
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
8217
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
8218
+        },
8219
+        "chalk": {
8220
+          "version": "1.1.3",
8221
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
8222
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
8223
+          "requires": {
8224
+            "ansi-styles": "2.2.1",
8225
+            "escape-string-regexp": "1.0.5",
8226
+            "has-ansi": "2.0.0",
8227
+            "strip-ansi": "3.0.1",
8228
+            "supports-color": "2.0.0"
8229
+          }
8230
+        },
8231
+        "inquirer": {
8232
+          "version": "3.0.6",
8233
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
8234
+          "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
8235
+          "requires": {
8236
+            "ansi-escapes": "1.4.0",
8237
+            "chalk": "1.1.3",
8238
+            "cli-cursor": "2.1.0",
8239
+            "cli-width": "2.2.0",
8240
+            "external-editor": "2.2.0",
8241
+            "figures": "2.0.0",
8242
+            "lodash": "4.17.10",
8243
+            "mute-stream": "0.0.7",
8244
+            "run-async": "2.3.0",
8245
+            "rx": "4.1.0",
8246
+            "string-width": "2.1.1",
8247
+            "strip-ansi": "3.0.1",
8248
+            "through": "2.3.8"
8249
+          }
8250
+        },
8251
+        "minimist": {
8252
+          "version": "1.2.0",
8253
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
8254
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
8255
+        },
8256
+        "opn": {
8257
+          "version": "4.0.2",
8258
+          "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
8259
+          "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
8260
+          "requires": {
8261
+            "object-assign": "4.1.1",
8262
+            "pinkie-promise": "2.0.1"
8263
+          }
8264
+        },
8265
+        "supports-color": {
8266
+          "version": "2.0.0",
8267
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
8268
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
8269
+        }
8270
+      }
8271
+    },
8154 8272
     "opener": {
8155 8273
       "version": "1.4.3",
8156 8274
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz",
@@ -8276,8 +8394,7 @@
8276 8394
     "os-tmpdir": {
8277 8395
       "version": "1.0.2",
8278 8396
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
8279
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
8280
-      "dev": true
8397
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
8281 8398
     },
8282 8399
     "p-cancelable": {
8283 8400
       "version": "0.4.1",
@@ -8638,6 +8755,11 @@
8638 8755
       "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
8639 8756
       "dev": true
8640 8757
     },
8758
+    "popper.js": {
8759
+      "version": "1.14.3",
8760
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz",
8761
+      "integrity": "sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU="
8762
+    },
8641 8763
     "posix-character-classes": {
8642 8764
       "version": "0.1.1",
8643 8765
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -11000,8 +11122,7 @@
11000 11122
     "regenerator-runtime": {
11001 11123
       "version": "0.11.1",
11002 11124
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
11003
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
11004
-      "dev": true
11125
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
11005 11126
     },
11006 11127
     "regenerator-transform": {
11007 11128
       "version": "0.10.1",
@@ -11284,7 +11405,6 @@
11284 11405
       "version": "2.0.0",
11285 11406
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
11286 11407
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
11287
-      "dev": true,
11288 11408
       "requires": {
11289 11409
         "onetime": "2.0.1",
11290 11410
         "signal-exit": "3.0.2"
@@ -11328,7 +11448,6 @@
11328 11448
       "version": "2.3.0",
11329 11449
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
11330 11450
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
11331
-      "dev": true,
11332 11451
       "requires": {
11333 11452
         "is-promise": "2.1.0"
11334 11453
       }
@@ -11342,6 +11461,11 @@
11342 11461
         "aproba": "1.2.0"
11343 11462
       }
11344 11463
     },
11464
+    "rx": {
11465
+      "version": "4.1.0",
11466
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
11467
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I="
11468
+    },
11345 11469
     "rx-lite": {
11346 11470
       "version": "4.0.8",
11347 11471
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
@@ -11374,8 +11498,7 @@
11374 11498
     "safer-buffer": {
11375 11499
       "version": "2.1.2",
11376 11500
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
11377
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
11378
-      "dev": true
11501
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
11379 11502
     },
11380 11503
     "samsam": {
11381 11504
       "version": "1.3.0",
@@ -11540,8 +11663,7 @@
11540 11663
     "signal-exit": {
11541 11664
       "version": "3.0.2",
11542 11665
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
11543
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
11544
-      "dev": true
11666
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
11545 11667
     },
11546 11668
     "sinon": {
11547 11669
       "version": "2.4.1",
@@ -12102,7 +12224,6 @@
12102 12224
       "version": "2.1.1",
12103 12225
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
12104 12226
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
12105
-      "dev": true,
12106 12227
       "requires": {
12107 12228
         "is-fullwidth-code-point": "2.0.0",
12108 12229
         "strip-ansi": "4.0.0"
@@ -12111,14 +12232,12 @@
12111 12232
         "ansi-regex": {
12112 12233
           "version": "3.0.0",
12113 12234
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
12114
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
12115
-          "dev": true
12235
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
12116 12236
         },
12117 12237
         "strip-ansi": {
12118 12238
           "version": "4.0.0",
12119 12239
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
12120 12240
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
12121
-          "dev": true,
12122 12241
           "requires": {
12123 12242
             "ansi-regex": "3.0.0"
12124 12243
           }
@@ -12137,7 +12256,6 @@
12137 12256
       "version": "3.0.1",
12138 12257
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
12139 12258
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
12140
-      "dev": true,
12141 12259
       "requires": {
12142 12260
         "ansi-regex": "2.1.1"
12143 12261
       }
@@ -12319,8 +12437,7 @@
12319 12437
     "through": {
12320 12438
       "version": "2.3.8",
12321 12439
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
12322
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
12323
-      "dev": true
12440
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
12324 12441
     },
12325 12442
     "through2": {
12326 12443
       "version": "2.0.3",
@@ -12362,7 +12479,6 @@
12362 12479
       "version": "0.0.33",
12363 12480
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
12364 12481
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
12365
-      "dev": true,
12366 12482
       "requires": {
12367 12483
         "os-tmpdir": "1.0.2"
12368 12484
       }
@@ -12872,6 +12988,11 @@
12872 12988
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
12873 12989
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
12874 12990
     },
12991
+    "vue-functional-data-merge": {
12992
+      "version": "2.0.6",
12993
+      "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-2.0.6.tgz",
12994
+      "integrity": "sha512-eivElFOJwhXJopKlq71/8onDxOKK4quPwWGFF9yIVjpU2sNzxISRpufu18bh674ivSADuEAPU2OhT+vrH0E9Mg=="
12995
+    },
12875 12996
     "vue-google-charts": {
12876 12997
       "version": "0.2.2",
12877 12998
       "resolved": "https://registry.npmjs.org/vue-google-charts/-/vue-google-charts-0.2.2.tgz",

+ 1
- 1
VueApp/package.json Dosyayı Görüntüle

@@ -15,7 +15,7 @@
15 15
   },
16 16
   "dependencies": {
17 17
     "auth0-js": "^9.2.2",
18
-    "bootstrap": "^3.3.7",
18
+    "bootstrap-vue": "^2.0.0-rc.11",
19 19
     "eslint-plugin-import": "^2.6.1",
20 20
     "eslint-plugin-node": "^5.1.0",
21 21
     "eventemitter3": "^2.0.3",

+ 13
- 56
VueApp/src/App.vue Dosyayı Görüntüle

@@ -1,71 +1,28 @@
1 1
 <template>
2
-  <div>
3
-    <nav class="navbar navbar-default">
4
-      <div class="container-fluid">
5
-        <div class="navbar-header">
6
-          <button
7
-            id="qsLoginBtn"
8
-            class="btn btn-primary btn-margin"
9
-            v-if="!authenticated"
10
-            @click="login()"
11
-          >
12
-            Log In
13
-          </button>
14
-          <button
15
-            id="qsLogoutBtn"
16
-            class="btn btn-primary btn-margin btn-success"
17
-            v-if="authenticated"
18
-            @click="logout()"
19
-          >
20
-            Log Out
21
-          </button>
22
-          <div class="navbar-brand">Potential Energy</div>
23
-        </div>
24
-      </div>
25
-    </nav>
2
+  <div class="master">
3
+    <NavBar></NavBar>
26 4
     <div class="container">
27
-      <router-view
28
-        :auth="auth"
29
-        :authenticated="authenticated">
30
-      </router-view>
31
-    </div>
5
+        <router-view></router-view>
6
+      </div>
32 7
   </div>
33 8
 </template>
34 9
 
35 10
 <script>
36
-import AuthService from './auth/AuthService'
37
-
38
-const auth = new AuthService()
39
-
40
-const { login, logout, authenticated, authNotifier } = auth
41
-
42
-export default {
43
-  name: 'app',
44
-  data () {
45
-    authNotifier.on('authChange', authState => {
46
-      this.authenticated = authState.authenticated
47
-    })
48
-    return {
49
-      auth,
50
-      authenticated,
51
-      imageUrl: ''
11
+  import NavBar from './components/NavBar.vue'
12
+  export default {
13
+    name: 'app',
14
+    components: {
15
+      NavBar
52 16
     }
53
-  },
54
-  methods: {
55
-    login,
56
-    logout
57 17
   }
58
-}
59 18
 </script>
60 19
 
61 20
 <style>
62
-@import '../node_modules/bootstrap/dist/css/bootstrap.css';
63
-  .navbar {
64
-    background-color: #D0CFCF;
65
-    position: sticky;
21
+  .master {
22
+    position: relative;
66 23
   }
67
-  .btn-margin {
68
-    margin-top: 8px
24
+  .container {
25
+    margin-top: 30px;
69 26
   }
70 27
   body {
71 28
     background-image: url('../static/Mountains.png');

+ 0
- 1
VueApp/src/assets/loading.svg Dosyayı Görüntüle

@@ -1 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?><svg width='120px' height='120px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-ring"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><defs><filter id="uil-ring-shadow" x="-100%" y="-100%" width="300%" height="300%"><feOffset result="offOut" in="SourceGraphic" dx="0" dy="0"></feOffset><feGaussianBlur result="blurOut" in="offOut" stdDeviation="0"></feGaussianBlur><feBlend in="SourceGraphic" in2="blurOut" mode="normal"></feBlend></filter></defs><path d="M10,50c0,0,0,0.5,0.1,1.4c0,0.5,0.1,1,0.2,1.7c0,0.3,0.1,0.7,0.1,1.1c0.1,0.4,0.1,0.8,0.2,1.2c0.2,0.8,0.3,1.8,0.5,2.8 c0.3,1,0.6,2.1,0.9,3.2c0.3,1.1,0.9,2.3,1.4,3.5c0.5,1.2,1.2,2.4,1.8,3.7c0.3,0.6,0.8,1.2,1.2,1.9c0.4,0.6,0.8,1.3,1.3,1.9 c1,1.2,1.9,2.6,3.1,3.7c2.2,2.5,5,4.7,7.9,6.7c3,2,6.5,3.4,10.1,4.6c3.6,1.1,7.5,1.5,11.2,1.6c4-0.1,7.7-0.6,11.3-1.6 c3.6-1.2,7-2.6,10-4.6c3-2,5.8-4.2,7.9-6.7c1.2-1.2,2.1-2.5,3.1-3.7c0.5-0.6,0.9-1.3,1.3-1.9c0.4-0.6,0.8-1.3,1.2-1.9 c0.6-1.3,1.3-2.5,1.8-3.7c0.5-1.2,1-2.4,1.4-3.5c0.3-1.1,0.6-2.2,0.9-3.2c0.2-1,0.4-1.9,0.5-2.8c0.1-0.4,0.1-0.8,0.2-1.2 c0-0.4,0.1-0.7,0.1-1.1c0.1-0.7,0.1-1.2,0.2-1.7C90,50.5,90,50,90,50s0,0.5,0,1.4c0,0.5,0,1,0,1.7c0,0.3,0,0.7,0,1.1 c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.9-0.2,1.8-0.4,2.8c-0.2,1-0.5,2.1-0.7,3.3c-0.3,1.2-0.8,2.4-1.2,3.7c-0.2,0.7-0.5,1.3-0.8,1.9 c-0.3,0.7-0.6,1.3-0.9,2c-0.3,0.7-0.7,1.3-1.1,2c-0.4,0.7-0.7,1.4-1.2,2c-1,1.3-1.9,2.7-3.1,4c-2.2,2.7-5,5-8.1,7.1 c-0.8,0.5-1.6,1-2.4,1.5c-0.8,0.5-1.7,0.9-2.6,1.3L66,87.7l-1.4,0.5c-0.9,0.3-1.8,0.7-2.8,1c-3.8,1.1-7.9,1.7-11.8,1.8L47,90.8 c-1,0-2-0.2-3-0.3l-1.5-0.2l-0.7-0.1L41.1,90c-1-0.3-1.9-0.5-2.9-0.7c-0.9-0.3-1.9-0.7-2.8-1L34,87.7l-1.3-0.6 c-0.9-0.4-1.8-0.8-2.6-1.3c-0.8-0.5-1.6-1-2.4-1.5c-3.1-2.1-5.9-4.5-8.1-7.1c-1.2-1.2-2.1-2.7-3.1-4c-0.5-0.6-0.8-1.4-1.2-2 c-0.4-0.7-0.8-1.3-1.1-2c-0.3-0.7-0.6-1.3-0.9-2c-0.3-0.7-0.6-1.3-0.8-1.9c-0.4-1.3-0.9-2.5-1.2-3.7c-0.3-1.2-0.5-2.3-0.7-3.3 c-0.2-1-0.3-2-0.4-2.8c-0.1-0.4-0.1-0.8-0.1-1.2c0-0.4,0-0.7,0-1.1c0-0.7,0-1.2,0-1.7C10,50.5,10,50,10,50z" fill="#337ab7" filter="url(#uil-ring-shadow)"><animateTransform attributeName="transform" type="rotate" from="0 50 50" to="360 50 50" repeatCount="indefinite" dur="1s"></animateTransform></path></svg>

BIN
VueApp/src/assets/logo.png Dosyayı Görüntüle


+ 0
- 66
VueApp/src/auth/AuthService.js Dosyayı Görüntüle

@@ -1,66 +0,0 @@
1
-import auth0 from 'auth0-js'
2
-import { AUTH_CONFIG } from './auth0-variables'
3
-import EventEmitter from 'eventemitter3'
4
-import router from './../router'
5
-
6
-export default class AuthService {
7
-  authenticated = this.isAuthenticated()
8
-  authNotifier = new EventEmitter()
9
-
10
-  constructor () {
11
-    this.login = this.login.bind(this)
12
-    this.setSession = this.setSession.bind(this)
13
-    this.logout = this.logout.bind(this)
14
-    this.isAuthenticated = this.isAuthenticated.bind(this)
15
-  }
16
-
17
-  auth0 = new auth0.WebAuth({
18
-    domain: AUTH_CONFIG.domain,
19
-    clientID: AUTH_CONFIG.clientId,
20
-    redirectUri: AUTH_CONFIG.callbackUrl,
21
-    audience: `https://${AUTH_CONFIG.domain}/userinfo`,
22
-    responseType: 'token id_token',
23
-    scope: 'openid'
24
-  })
25
-
26
-  login () {
27
-    if (this.isAuthenticated()) router.replace('main')
28
-    else this.auth0.authorize()
29
-  }
30
-
31
-  handleAuthentication () {
32
-    this.auth0.parseHash((err, authResult) => {
33
-      if (authResult && authResult.accessToken && authResult.idToken) {
34
-        this.setSession(authResult)
35
-        router.replace('main')
36
-      } else if (err) {
37
-        router.replace('home')
38
-        console.log(err)
39
-        alert(`Error: ${err.error}. Please try again`)
40
-      }
41
-    })
42
-  }
43
-
44
-  setSession (authResult) {
45
-    let expiresAt = JSON.stringify(
46
-      authResult.expiresIn * 1000 + new Date().getTime()
47
-    )
48
-    localStorage.setItem('access_token', authResult.accessToken)
49
-    localStorage.setItem('id_token', authResult.idToken)
50
-    localStorage.setItem('expires_at', expiresAt)
51
-    this.authNotifier.emit('authChange', { authenticated: true })
52
-  }
53
-
54
-  logout () {
55
-    localStorage.removeItem('access_token')
56
-    localStorage.removeItem('id_token')
57
-    localStorage.removeItem('expires_at')
58
-    this.authNotifier.emit('authChange', false)
59
-    router.replace('home')
60
-  }
61
-
62
-  isAuthenticated () {
63
-    let expiresAt = JSON.parse(localStorage.getItem('expires_at'))
64
-    return new Date().getTime() < expiresAt
65
-  }
66
-}

+ 0
- 31
VueApp/src/components/Callback.vue Dosyayı Görüntüle

@@ -1,31 +0,0 @@
1
-<template>
2
-  <div class="spinner">
3
-    <img src="../assets/loading.svg" alt="loading"/>
4
-  </div>
5
-</template>
6
-
7
-<script>
8
-  export default {
9
-    name: 'callback',
10
-    props: ['auth'],
11
-    data () {
12
-      this.auth.handleAuthentication()
13
-      return {}
14
-    }
15
-  }
16
-</script>
17
-
18
-<style>
19
-  .spinner {
20
-    position: absolute;
21
-    display: flex;
22
-    justify-content: center;
23
-    height: 100vh;
24
-    width: 100vw;
25
-    background-color: white;
26
-    top: 0;
27
-    bottom: 0;
28
-    left: 0;
29
-    right: 0;
30
-  }
31
-</style>

+ 3
- 3
VueApp/src/components/GoogleMap.vue Dosyayı Görüntüle

@@ -3,9 +3,9 @@
3 3
     <div>
4 4
       <label>
5 5
         <gmap-autocomplete @place_changed="setPlace"></gmap-autocomplete>
6
-        <button @click="gotoPlace(currentPlace)">scroll to location</button>
7
-        <button @click="removeMarkers">clear route</button>
8
-        <button @click="locateUser">geolocate</button>
6
+        <b-button size="sm" @click="gotoPlace(currentPlace)">scroll to location</b-button>
7
+        <b-button size="sm" @click="removeMarkers">clear route</b-button>
8
+        <b-button size="sm" @click="locateUser">geolocate</b-button>
9 9
       </label>
10 10
       <br/>
11 11
     </div>

+ 0
- 27
VueApp/src/components/Home.vue Dosyayı Görüntüle

@@ -1,27 +0,0 @@
1
-<template>
2
-  <div class="text-center">
3
-    <h1 class="welcome">Welcome!</h1>
4
-    <h4 v-if="!authenticated">
5
-        Please log in to continue.
6
-    </h4>
7
-    <div v-else class="logged-in">
8
-      <router-link to="/main">
9
-        <a>Continue to Main Application?</a>
10
-      </router-link>
11
-    </div>
12
-  </div>
13
-</template>
14
-
15
-<script>
16
-  export default {
17
-    name: 'home',
18
-    props: ['auth', 'authenticated']
19
-  }
20
-</script>
21
-
22
-<style scoped>
23
-  a {
24
-    cursor: pointer
25
-  }
26
-</style>
27
-

+ 1
- 5
VueApp/src/components/Main.vue Dosyayı Görüntüle

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <div v-if="authenticated" class="main-container">
2
+  <div class="main-container">
3 3
     <div class="mainMap">
4 4
       <GoogleMap v-on:updateRoute="updateElevation"/>
5 5
     </div>
@@ -7,9 +7,6 @@
7 7
       <ElevationGraph :currentRoute="route"/>
8 8
     </div>
9 9
   </div>
10
-  <div v-else>
11
-    <h2 class="text-center">No really, please log in.</h2>
12
-  </div>
13 10
 </template>
14 11
 
15 12
 <script>
@@ -17,7 +14,6 @@
17 14
   import ElevationGraph from './ElevationGraph.vue'
18 15
   export default {
19 16
     name: 'main',
20
-    props: ['auth', 'authenticated'],
21 17
     data () {
22 18
       return {
23 19
         route: null

+ 28
- 0
VueApp/src/components/NavBar.vue Dosyayı Görüntüle

@@ -0,0 +1,28 @@
1
+<template>
2
+  <b-navbar toggleable="md" type="dark" variant="dark" sticky="true">
3
+
4
+    <b-navbar-toggle target="nav_collapse"></b-navbar-toggle>
5
+
6
+    <b-navbar-brand href="#">Potential Energy</b-navbar-brand>
7
+
8
+    <b-collapse is-nav id="nav_collapse">
9
+      <!-- right aligned nav items -->
10
+      <b-navbar-nav class="ml-auto">
11
+        <b-nav-form>
12
+          <b-form-input size="sm" class="mr-sm-2" type="text" placeholder="Enter a name"/>
13
+          <b-button size="sm" class="my-2 my-sm-0" type="submit">Name and Save location</b-button>
14
+        </b-nav-form>
15
+      </b-navbar-nav>
16
+    </b-collapse>
17
+  </b-navbar>
18
+</template>
19
+
20
+<script>
21
+    export default {
22
+      name: 'NavBar.vue'
23
+    }
24
+</script>
25
+
26
+<style scoped>
27
+
28
+</style>

+ 4
- 0
VueApp/src/main.js Dosyayı Görüntüle

@@ -3,6 +3,9 @@
3 3
 import Vue from 'vue'
4 4
 import * as VueGoogleMaps from 'vue2-google-maps'
5 5
 import VueGoogleCharts from 'vue-google-charts'
6
+import BootstrapVue from 'bootstrap-vue'
7
+import 'bootstrap/dist/css/bootstrap.css'
8
+import 'bootstrap-vue/dist/bootstrap-vue.css'
6 9
 import App from './App'
7 10
 import router from './router'
8 11
 
@@ -18,6 +21,7 @@ Vue.use(VueGoogleMaps, {
18 21
 })
19 22
 
20 23
 Vue.use(VueGoogleCharts)
24
+Vue.use(BootstrapVue)
21 25
 
22 26
 new Vue({ // eslint-disable-line no-new
23 27
   el: '#app',

+ 1
- 13
VueApp/src/router/index.js Dosyayı Görüntüle

@@ -1,7 +1,5 @@
1 1
 import Vue from 'vue'
2 2
 import Router from 'vue-router'
3
-import Home from '@/components/Home'
4
-import Callback from '@/components/Callback'
5 3
 import Main from '@/components/Main'
6 4
 
7 5
 Vue.use(Router)
@@ -10,23 +8,13 @@ const router = new Router({
10 8
   mode: 'history',
11 9
   routes: [
12 10
     {
13
-      path: '/home',
14
-      name: 'Home',
15
-      component: Home
16
-    },
17
-    {
18
-      path: '/callback',
19
-      name: 'Callback',
20
-      component: Callback
21
-    },
22
-    {
23 11
       path: '/main',
24 12
       name: 'Main',
25 13
       component: Main
26 14
     },
27 15
     {
28 16
       path: '*',
29
-      redirect: '/home'
17
+      redirect: '/main'
30 18
     }
31 19
   ]
32 20
 })