Jared Norris пре 8 година
родитељ
комит
5131d633b6
2 измењених фајлова са 135 додато и 50 уклоњено
  1. 95
    35
      .idea/workspace.xml
  2. 40
    15
      VueApp/src/components/ElevationGraph.vue

+ 95
- 35
.idea/workspace.xml Прегледај датотеку

@@ -3,8 +3,7 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
5 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/auth/AuthService.js" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/auth/AuthService.js" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/VueApp/src/components/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/Main.vue" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" afterDir="false" />
8 7
     </list>
9 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 9
     <option name="TRACKING_ENABLED" value="true" />
@@ -15,11 +14,11 @@
15 14
   </component>
16 15
   <component name="FileEditorManager">
17 16
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
18
-      <file leaf-file-name="AuthService.js" pinned="false" current-in-tab="false">
19
-        <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
17
+      <file leaf-file-name="App.vue" pinned="false" current-in-tab="false">
18
+        <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
20 19
           <provider selected="true" editor-type-id="text-editor">
21
-            <state relative-caret-position="673">
22
-              <caret line="51" column="3" lean-forward="true" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
20
+            <state relative-caret-position="30">
21
+              <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
23 22
             </state>
24 23
           </provider>
25 24
         </entry>
@@ -27,24 +26,52 @@
27 26
       <file leaf-file-name="Home.vue" pinned="false" current-in-tab="false">
28 27
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
29 28
           <provider selected="true" editor-type-id="text-editor">
30
-            <state relative-caret-position="255">
31
-              <caret line="17" column="36" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="36" />
29
+            <state relative-caret-position="15">
30
+              <caret line="1" column="25" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
32 31
             </state>
33 32
           </provider>
34 33
         </entry>
35 34
       </file>
36
-      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="true">
35
+      <file leaf-file-name="AuthService.js" pinned="false" current-in-tab="false">
36
+        <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
37
+          <provider selected="true" editor-type-id="text-editor">
38
+            <state relative-caret-position="765">
39
+              <caret line="51" column="3" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
40
+            </state>
41
+          </provider>
42
+        </entry>
43
+      </file>
44
+      <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
45
+        <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
46
+          <provider selected="true" editor-type-id="text-editor">
47
+            <state relative-caret-position="245">
48
+              <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
49
+              <folding>
50
+                <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
51
+              </folding>
52
+            </state>
53
+          </provider>
54
+        </entry>
55
+      </file>
56
+      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="false">
37 57
         <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
38 58
           <provider selected="true" editor-type-id="text-editor">
39
-            <state relative-caret-position="150">
40
-              <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
59
+            <state relative-caret-position="525">
60
+              <caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
61
+              <folding>
62
+                <element signature="e#337#376#0" expanded="true" />
63
+              </folding>
41 64
             </state>
42 65
           </provider>
43 66
         </entry>
44 67
       </file>
45
-      <file leaf-file-name="auth0-variables.js" pinned="false" current-in-tab="false">
46
-        <entry file="file://$PROJECT_DIR$/VueApp/src/auth/auth0-variables.js">
47
-          <provider selected="true" editor-type-id="text-editor" />
68
+      <file leaf-file-name="ElevationGraph.vue" pinned="false" current-in-tab="true">
69
+        <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
70
+          <provider selected="true" editor-type-id="text-editor">
71
+            <state relative-caret-position="429">
72
+              <caret line="155" column="19" lean-forward="true" selection-start-line="155" selection-start-column="19" selection-end-line="155" selection-end-column="19" />
73
+            </state>
74
+          </provider>
48 75
         </entry>
49 76
       </file>
50 77
     </leaf>
@@ -81,9 +108,9 @@
81 108
         <option value="$PROJECT_DIR$/VueApp/src/components/Home.vue" />
82 109
         <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
83 110
         <option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
84
-        <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
85 111
         <option value="$PROJECT_DIR$/VueApp/src/auth/AuthService.js" />
86 112
         <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
113
+        <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
87 114
       </list>
88 115
     </option>
89 116
   </component>
@@ -101,8 +128,9 @@
101 128
       <path value="$PROJECT_DIR$/VueApp/package.json" />
102 129
     </packageJsonPaths>
103 130
   </component>
104
-  <component name="ProjectFrameBounds">
105
-    <option name="y" value="23" />
131
+  <component name="ProjectFrameBounds" fullScreen="true">
132
+    <option name="x" value="282" />
133
+    <option name="y" value="-709" />
106 134
     <option name="width" value="1280" />
107 135
     <option name="height" value="709" />
108 136
   </component>
@@ -111,7 +139,6 @@
111 139
       <foldersAlwaysOnTop value="true" />
112 140
     </navigator>
113 141
     <panes>
114
-      <pane id="PackagesPane" />
115 142
       <pane id="ProjectPane">
116 143
         <subPane>
117 144
           <expand>
@@ -144,12 +171,19 @@
144 171
               <item name="src" type="462c0819:PsiDirectoryNode" />
145 172
               <item name="components" type="462c0819:PsiDirectoryNode" />
146 173
             </path>
174
+            <path>
175
+              <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
176
+              <item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
177
+              <item name="VueApp" type="462c0819:PsiDirectoryNode" />
178
+              <item name="static" type="462c0819:PsiDirectoryNode" />
179
+            </path>
147 180
           </expand>
148 181
           <select />
149 182
         </subPane>
150 183
       </pane>
151
-      <pane id="Scope" />
152 184
       <pane id="AndroidView" />
185
+      <pane id="Scope" />
186
+      <pane id="PackagesPane" />
153 187
     </panes>
154 188
   </component>
155 189
   <component name="PropertiesComponent">
@@ -243,10 +277,10 @@
243 277
     <servers />
244 278
   </component>
245 279
   <component name="TimeTrackingManager">
246
-    <option name="totallyTimeSpent" value="65793000" />
280
+    <option name="totallyTimeSpent" value="74204000" />
247 281
   </component>
248 282
   <component name="ToolWindowManager">
249
-    <frame x="0" y="23" width="1280" height="709" extended-state="0" />
283
+    <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
250 284
     <editor active="true" />
251 285
     <layout>
252 286
       <window_info anchor="right" id="Palette" order="3" />
@@ -259,10 +293,10 @@
259 293
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
260 294
       <window_info anchor="bottom" id="Version Control" order="7" />
261 295
       <window_info anchor="bottom" id="Run" order="2" />
262
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.39052287" />
296
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.19800995" />
263 297
       <window_info id="Capture Tool" order="2" />
264 298
       <window_info id="Designer" order="2" />
265
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30129242" />
299
+      <window_info content_ui="combo" id="Project" order="0" weight="0.20500532" />
266 300
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
267 301
       <window_info anchor="right" id="Database" order="3" />
268 302
       <window_info id="Learn" order="2" />
@@ -272,12 +306,35 @@
272 306
       <window_info anchor="right" id="Theme Preview" order="3" />
273 307
       <window_info id="Favorites" order="2" side_tool="true" />
274 308
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
309
+      <window_info anchor="right" id="Palette" order="3" />
310
+      <window_info anchor="right" id="Theme Preview" order="3" />
311
+      <window_info id="Designer" order="2" />
275 312
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
313
+      <window_info anchor="right" id="Capture Analysis" order="3" />
314
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
276 315
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
316
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
317
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30129242" />
318
+      <window_info id="Learn" order="2" />
277 319
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
320
+      <window_info anchor="bottom" id="TODO" order="6" />
321
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
322
+      <window_info anchor="bottom" id="Version Control" order="7" />
323
+      <window_info anchor="bottom" id="Run" order="2" />
324
+      <window_info id="Image Layers" order="2" />
325
+      <window_info id="Capture Tool" order="2" />
326
+      <window_info id="UI Designer" order="2" />
327
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
328
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
329
+      <window_info anchor="right" id="Database" order="3" />
330
+      <window_info anchor="right" id="Palette&#9;" order="3" />
278 331
       <window_info anchor="bottom" id="Message" order="0" />
332
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
279 333
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
280 334
       <window_info anchor="bottom" id="Find" order="1" />
335
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.39052287" />
336
+      <window_info anchor="right" id="Maven Projects" order="3" />
337
+      <window_info id="Favorites" order="2" side_tool="true" />
281 338
     </layout>
282 339
   </component>
283 340
   <component name="TypeScriptGeneratedFilesManager">
@@ -544,8 +601,8 @@
544 601
     </entry>
545 602
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
546 603
       <provider selected="true" editor-type-id="text-editor">
547
-        <state relative-caret-position="210">
548
-          <caret line="14" column="16" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="16" />
604
+        <state relative-caret-position="245">
605
+          <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
549 606
           <folding>
550 607
             <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
551 608
           </folding>
@@ -554,15 +611,15 @@
554 611
     </entry>
555 612
     <entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
556 613
       <provider selected="true" editor-type-id="text-editor">
557
-        <state relative-caret-position="385">
558
-          <caret line="63" column="29" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="29" />
614
+        <state relative-caret-position="30">
615
+          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
559 616
         </state>
560 617
       </provider>
561 618
     </entry>
562 619
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
563 620
       <provider selected="true" editor-type-id="text-editor">
564
-        <state relative-caret-position="535">
565
-          <caret line="41" column="6" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
621
+        <state relative-caret-position="429">
622
+          <caret line="155" column="19" lean-forward="true" selection-start-line="155" selection-start-column="19" selection-end-line="155" selection-end-column="19" />
566 623
         </state>
567 624
       </provider>
568 625
     </entry>
@@ -571,22 +628,25 @@
571 628
     </entry>
572 629
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Home.vue">
573 630
       <provider selected="true" editor-type-id="text-editor">
574
-        <state relative-caret-position="255">
575
-          <caret line="17" column="36" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="36" />
631
+        <state relative-caret-position="15">
632
+          <caret line="1" column="25" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
576 633
         </state>
577 634
       </provider>
578 635
     </entry>
579 636
     <entry file="file://$PROJECT_DIR$/VueApp/src/auth/AuthService.js">
580 637
       <provider selected="true" editor-type-id="text-editor">
581
-        <state relative-caret-position="673">
582
-          <caret line="51" column="3" lean-forward="true" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
638
+        <state relative-caret-position="765">
639
+          <caret line="51" column="3" selection-start-line="43" selection-start-column="2" selection-end-line="51" selection-end-column="3" />
583 640
         </state>
584 641
       </provider>
585 642
     </entry>
586 643
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
587 644
       <provider selected="true" editor-type-id="text-editor">
588
-        <state relative-caret-position="150">
589
-          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
645
+        <state relative-caret-position="525">
646
+          <caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
647
+          <folding>
648
+            <element signature="e#337#376#0" expanded="true" />
649
+          </folding>
590 650
         </state>
591 651
       </provider>
592 652
     </entry>

+ 40
- 15
VueApp/src/components/ElevationGraph.vue Прегледај датотеку

@@ -7,6 +7,11 @@
7 7
       :data="chartData"
8 8
       :options="chartOptions"
9 9
     />
10
+    <div class="legendContainer">
11
+      <div class="brightBlueBox"> >= 10% </div>
12
+      <div class="lightBlueBox"> >= 5% </div>
13
+      <div class="darkBlueBox"> < 5% </div>
14
+    </div>
10 15
     <div class="gradeContainer">
11 16
       <div class="miles">
12 17
         Distance: {{ distance }} {{ unit }}
@@ -49,7 +54,7 @@
49 54
         chartData: null,
50 55
         chartOptions: {
51 56
           backgroundColor: { fill: 'transparent' },
52
-          vAxis: { textStyle: { color: '#FFF' } },
57
+          vAxis: { textStyle: { color: '#CAE9FF' } },
53 58
           bar: { groupWidth: '100%' },
54 59
           chartArea: { top: 20 },
55 60
           legend: 'none'
@@ -107,7 +112,7 @@
107 112
           } else if (this.gradeReport[i] >= 0.05) {
108 113
             this.chartData.push(['', this.elevations[i].elevation, '#2E9FE1'])
109 114
           } else {
110
-            this.chartData.push(['', this.elevations[i].elevation, '#004E64'])
115
+            this.chartData.push(['', this.elevations[i].elevation, '#016481'])
111 116
           }
112 117
         }
113 118
       }
@@ -118,30 +123,50 @@
118 123
 <style scoped>
119 124
   .chartContainer {
120 125
     display: grid;
121
-    grid-template-columns: 1fr 1fr 1fr 1fr;
126
+    grid-template-columns: 1fr 2fr 2fr 1fr;
122 127
     grid-template-rows: 1fr 8fr;
123 128
     grid-template-areas:
124
-                        "..... grade grade ....."
129
+                        ".... legend grade ....."
125 130
                         "chart chart chart chart";
126 131
     align-items: center;
127 132
   }
128
-  .chart {
129
-    padding-left: 20px;
130
-    grid-area: chart;
133
+  .legendContainer {
134
+    grid-area: legend;
135
+    display: flex;
136
+    justify-content: space-evenly;
137
+    font-size: 1em;
138
+    color: #CAE9FF;
131 139
   }
132 140
   .gradeContainer {
133 141
     grid-area: grade;
134 142
     display: flex;
135
-    justify-content: space-around;
136
-    font-size: 1.15em;
143
+    justify-content: space-between;
144
+    font-size: 1.1em;
145
+    color: #CAE9FF;
146
+  }
147
+  .chart {
148
+    margin-left: 4em;
149
+    grid-area: chart;
137 150
   }
138
-  .miles {
139
-    color: white;
151
+  .brightBlueBox {
152
+    text-align: center;
153
+    width: 4em;
154
+    height: 1.2em;
155
+    background-color: #CAE9FF;
156
+    color: #062831;
140 157
   }
141
-  .avgGrade {
142
-    color: white;
158
+  .lightBlueBox {
159
+    text-align: center;
160
+    width: 4em;
161
+    height: 1.2em;
162
+    background-color: #2E9FE1;
163
+    color: #062831;
143 164
   }
144
-  .peakGrade {
145
-    color: white;
165
+  .darkBlueBox {
166
+    text-align: center;
167
+    width: 4em;
168
+    height: 1.2em;
169
+    background-color: #016481;
170
+    color: #062831;
146 171
   }
147 172
 </style>