|
|
@@ -2,21 +2,7 @@
|
|
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 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" />
|
|
|
5
|
+ <change beforePath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" afterDir="false" />
|
|
20
|
6
|
</list>
|
|
21
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
22
|
8
|
<option name="TRACKING_ENABLED" value="true" />
|
|
|
@@ -26,7 +12,38 @@
|
|
26
|
12
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
27
|
13
|
</component>
|
|
28
|
14
|
<component name="FileEditorManager">
|
|
29
|
|
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
|
|
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="480">
|
|
|
20
|
+ <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
|
|
|
21
|
+ </state>
|
|
|
22
|
+ </provider>
|
|
|
23
|
+ </entry>
|
|
|
24
|
+ </file>
|
|
|
25
|
+ <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="true">
|
|
|
26
|
+ <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
|
|
|
27
|
+ <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" />
|
|
|
30
|
+ </state>
|
|
|
31
|
+ </provider>
|
|
|
32
|
+ </entry>
|
|
|
33
|
+ </file>
|
|
|
34
|
+ <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
|
|
|
35
|
+ <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
|
|
|
36
|
+ <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" />
|
|
|
39
|
+ <folding>
|
|
|
40
|
+ <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
|
|
41
|
+ </folding>
|
|
|
42
|
+ </state>
|
|
|
43
|
+ </provider>
|
|
|
44
|
+ </entry>
|
|
|
45
|
+ </file>
|
|
|
46
|
+ </leaf>
|
|
30
|
47
|
</component>
|
|
31
|
48
|
<component name="FileTemplateManagerImpl">
|
|
32
|
49
|
<option name="RECENT_TEMPLATES">
|
|
|
@@ -65,8 +82,8 @@
|
|
65
|
82
|
<option value="$PROJECT_DIR$/VueApp/config/index.js" />
|
|
66
|
83
|
<option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
|
|
67
|
84
|
<option value="$PROJECT_DIR$/VueApp/src/App.vue" />
|
|
68
|
|
- <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
|
|
69
|
85
|
<option value="$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue" />
|
|
|
86
|
+ <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
|
|
70
|
87
|
</list>
|
|
71
|
88
|
</option>
|
|
72
|
89
|
</component>
|
|
|
@@ -111,12 +128,6 @@
|
|
111
|
128
|
<item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
|
|
112
|
129
|
<item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
|
|
113
|
130
|
<item name="VueApp" type="462c0819:PsiDirectoryNode" />
|
|
114
|
|
- <item name="config" type="462c0819:PsiDirectoryNode" />
|
|
115
|
|
- </path>
|
|
116
|
|
- <path>
|
|
117
|
|
- <item name="Potential-Energy" type="b2602c69:ProjectViewProjectNode" />
|
|
118
|
|
- <item name="Potential-Energy" type="462c0819:PsiDirectoryNode" />
|
|
119
|
|
- <item name="VueApp" type="462c0819:PsiDirectoryNode" />
|
|
120
|
131
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
121
|
132
|
</path>
|
|
122
|
133
|
<path>
|
|
|
@@ -222,15 +233,16 @@
|
|
222
|
233
|
<workItem from="1532532859490" duration="440000" />
|
|
223
|
234
|
<workItem from="1532553474100" duration="225000" />
|
|
224
|
235
|
<workItem from="1532696400445" duration="1212000" />
|
|
225
|
|
- <workItem from="1533040907385" duration="6459000" />
|
|
|
236
|
+ <workItem from="1533040907385" duration="8431000" />
|
|
226
|
237
|
</task>
|
|
227
|
238
|
<servers />
|
|
228
|
239
|
</component>
|
|
229
|
240
|
<component name="TimeTrackingManager">
|
|
230
|
|
- <option name="totallyTimeSpent" value="82134000" />
|
|
|
241
|
+ <option name="totallyTimeSpent" value="84106000" />
|
|
231
|
242
|
</component>
|
|
232
|
243
|
<component name="ToolWindowManager">
|
|
233
|
244
|
<frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
|
|
|
245
|
+ <editor active="true" />
|
|
234
|
246
|
<layout>
|
|
235
|
247
|
<window_info anchor="right" id="Palette" order="3" />
|
|
236
|
248
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
@@ -245,7 +257,7 @@
|
|
245
|
257
|
<window_info anchor="bottom" id="Terminal" order="7" weight="0.29054725" />
|
|
246
|
258
|
<window_info id="Capture Tool" order="2" />
|
|
247
|
259
|
<window_info id="Designer" order="2" />
|
|
248
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
|
|
|
260
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
|
|
249
|
261
|
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
|
|
250
|
262
|
<window_info anchor="right" id="Database" order="3" />
|
|
251
|
263
|
<window_info id="Learn" order="2" />
|
|
|
@@ -528,37 +540,37 @@
|
|
528
|
540
|
</state>
|
|
529
|
541
|
</provider>
|
|
530
|
542
|
</entry>
|
|
531
|
|
- <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
|
|
|
543
|
+ <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
|
|
532
|
544
|
<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" />
|
|
|
545
|
+ <state relative-caret-position="420">
|
|
|
546
|
+ <caret line="28" column="7" lean-forward="true" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
|
|
|
547
|
+ <folding>
|
|
|
548
|
+ <element signature="e#253#292#0" expanded="true" />
|
|
|
549
|
+ </folding>
|
|
535
|
550
|
</state>
|
|
536
|
551
|
</provider>
|
|
537
|
552
|
</entry>
|
|
538
|
553
|
<entry file="file://$PROJECT_DIR$/VueApp/src/App.vue">
|
|
539
|
554
|
<provider selected="true" editor-type-id="text-editor">
|
|
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" />
|
|
|
555
|
+ <state relative-caret-position="480">
|
|
|
556
|
+ <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
|
|
542
|
557
|
</state>
|
|
543
|
558
|
</provider>
|
|
544
|
559
|
</entry>
|
|
545
|
560
|
<entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
|
|
546
|
561
|
<provider selected="true" editor-type-id="text-editor">
|
|
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" />
|
|
|
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" />
|
|
549
|
564
|
<folding>
|
|
550
|
565
|
<element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
|
551
|
566
|
</folding>
|
|
552
|
567
|
</state>
|
|
553
|
568
|
</provider>
|
|
554
|
569
|
</entry>
|
|
555
|
|
- <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
|
|
|
570
|
+ <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
|
|
556
|
571
|
<provider selected="true" editor-type-id="text-editor">
|
|
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" />
|
|
559
|
|
- <folding>
|
|
560
|
|
- <element signature="e#253#292#0" expanded="true" />
|
|
561
|
|
- </folding>
|
|
|
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" />
|
|
562
|
574
|
</state>
|
|
563
|
575
|
</provider>
|
|
564
|
576
|
</entry>
|