|
@@ -1,7 +1,84 @@
|
1
|
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
|
- <list default="true" id="1b2fc6ac-3191-4a3c-89bc-d9c070a44074" name="Default" comment="" />
|
|
4
|
+ <list default="true" id="1b2fc6ac-3191-4a3c-89bc-d9c070a44074" name="Default" comment="">
|
|
5
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/.editorconfig" beforeDir="false" />
|
|
7
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/.gitignore" beforeDir="false" />
|
|
8
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/config.xml" beforeDir="false" />
|
|
9
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/ionic.config.json" beforeDir="false" />
|
|
10
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/package-lock.json" beforeDir="false" />
|
|
11
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/package.json" beforeDir="false" />
|
|
12
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/README.md" beforeDir="false" />
|
|
13
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-hdpi-icon.png" beforeDir="false" />
|
|
14
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-ldpi-icon.png" beforeDir="false" />
|
|
15
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-mdpi-icon.png" beforeDir="false" />
|
|
16
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xhdpi-icon.png" beforeDir="false" />
|
|
17
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xxhdpi-icon.png" beforeDir="false" />
|
|
18
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xxxhdpi-icon.png" beforeDir="false" />
|
|
19
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-hdpi-screen.png" beforeDir="false" />
|
|
20
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-ldpi-screen.png" beforeDir="false" />
|
|
21
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-mdpi-screen.png" beforeDir="false" />
|
|
22
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xhdpi-screen.png" beforeDir="false" />
|
|
23
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xxhdpi-screen.png" beforeDir="false" />
|
|
24
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xxxhdpi-screen.png" beforeDir="false" />
|
|
25
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-hdpi-screen.png" beforeDir="false" />
|
|
26
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-ldpi-screen.png" beforeDir="false" />
|
|
27
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-mdpi-screen.png" beforeDir="false" />
|
|
28
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xhdpi-screen.png" beforeDir="false" />
|
|
29
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xxhdpi-screen.png" beforeDir="false" />
|
|
30
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xxxhdpi-screen.png" beforeDir="false" />
|
|
31
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/icon.png" beforeDir="false" />
|
|
32
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-1024.png" beforeDir="false" />
|
|
33
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40.png" beforeDir="false" />
|
|
34
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40@2x.png" beforeDir="false" />
|
|
35
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40@3x.png" beforeDir="false" />
|
|
36
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-50.png" beforeDir="false" />
|
|
37
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-50@2x.png" beforeDir="false" />
|
|
38
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60.png" beforeDir="false" />
|
|
39
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60@2x.png" beforeDir="false" />
|
|
40
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60@3x.png" beforeDir="false" />
|
|
41
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-72.png" beforeDir="false" />
|
|
42
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-72@2x.png" beforeDir="false" />
|
|
43
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-76.png" beforeDir="false" />
|
|
44
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-76@2x.png" beforeDir="false" />
|
|
45
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-83.5@2x.png" beforeDir="false" />
|
|
46
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small.png" beforeDir="false" />
|
|
47
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small@2x.png" beforeDir="false" />
|
|
48
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small@3x.png" beforeDir="false" />
|
|
49
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon.png" beforeDir="false" />
|
|
50
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon@2x.png" beforeDir="false" />
|
|
51
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-568h@2x~iphone.png" beforeDir="false" />
|
|
52
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-667h.png" beforeDir="false" />
|
|
53
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-736h.png" beforeDir="false" />
|
|
54
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape-736h.png" beforeDir="false" />
|
|
55
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape@2x~ipad.png" beforeDir="false" />
|
|
56
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape@~ipadpro.png" beforeDir="false" />
|
|
57
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape~ipad.png" beforeDir="false" />
|
|
58
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait@2x~ipad.png" beforeDir="false" />
|
|
59
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait@~ipadpro.png" beforeDir="false" />
|
|
60
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait~ipad.png" beforeDir="false" />
|
|
61
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default@2x~iphone.png" beforeDir="false" />
|
|
62
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default@2x~universal~anyany.png" beforeDir="false" />
|
|
63
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default~iphone.png" beforeDir="false" />
|
|
64
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/splash.png" beforeDir="false" />
|
|
65
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.component.ts" beforeDir="false" />
|
|
66
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.html" beforeDir="false" />
|
|
67
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.module.ts" beforeDir="false" />
|
|
68
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.scss" beforeDir="false" />
|
|
69
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/main.ts" beforeDir="false" />
|
|
70
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/assets/icon/favicon.ico" beforeDir="false" />
|
|
71
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/assets/imgs/logo.png" beforeDir="false" />
|
|
72
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/index.html" beforeDir="false" />
|
|
73
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/manifest.json" beforeDir="false" />
|
|
74
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.html" beforeDir="false" />
|
|
75
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.scss" beforeDir="false" />
|
|
76
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.ts" beforeDir="false" />
|
|
77
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/service-worker.js" beforeDir="false" />
|
|
78
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/theme/variables.scss" beforeDir="false" />
|
|
79
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/tsconfig.json" beforeDir="false" />
|
|
80
|
+ <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/tslint.json" beforeDir="false" />
|
|
81
|
+ </list>
|
5
|
82
|
<ignored path="$PROJECT_DIR$/target/" />
|
6
|
83
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
7
|
84
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -11,12 +88,73 @@
|
11
|
88
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
12
|
89
|
</component>
|
13
|
90
|
<component name="FileEditorManager">
|
|
91
|
+<<<<<<< HEAD
|
14
|
92
|
<leaf>
|
15
|
93
|
<file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="true">
|
16
|
94
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
|
17
|
95
|
<provider selected="true" editor-type-id="text-editor">
|
18
|
96
|
<state relative-caret-position="165">
|
19
|
97
|
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
98
|
+=======
|
|
99
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
100
|
+ <file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="false">
|
|
101
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
|
|
102
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
103
|
+ <state relative-caret-position="90">
|
|
104
|
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
|
105
|
+ <folding>
|
|
106
|
+ <element signature="imports" expanded="true" />
|
|
107
|
+ </folding>
|
|
108
|
+ </state>
|
|
109
|
+ </provider>
|
|
110
|
+ </entry>
|
|
111
|
+ </file>
|
|
112
|
+ <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
|
|
113
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
|
|
114
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
115
|
+ <state relative-caret-position="705">
|
|
116
|
+ <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
|
|
117
|
+ <folding>
|
|
118
|
+ <element signature="imports" expanded="true" />
|
|
119
|
+ </folding>
|
|
120
|
+ </state>
|
|
121
|
+ </provider>
|
|
122
|
+ </entry>
|
|
123
|
+ </file>
|
|
124
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
125
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
126
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
127
|
+ <state relative-caret-position="60">
|
|
128
|
+ <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
|
|
129
|
+ </state>
|
|
130
|
+ </provider>
|
|
131
|
+ </entry>
|
|
132
|
+ </file>
|
|
133
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
|
|
134
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
135
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
136
|
+ <state relative-caret-position="-112" />
|
|
137
|
+ </provider>
|
|
138
|
+ </entry>
|
|
139
|
+ </file>
|
|
140
|
+ <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
|
|
141
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
|
|
142
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
143
|
+ <state relative-caret-position="58">
|
|
144
|
+ <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
145
|
+ </state>
|
|
146
|
+ </provider>
|
|
147
|
+ </entry>
|
|
148
|
+ </file>
|
|
149
|
+ <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
|
|
150
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
|
|
151
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
152
|
+ <state relative-caret-position="30">
|
|
153
|
+ <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
|
|
154
|
+ <folding>
|
|
155
|
+ <element signature="imports" expanded="true" />
|
|
156
|
+ </folding>
|
|
157
|
+>>>>>>> whatBranch
|
20
|
158
|
</state>
|
21
|
159
|
</provider>
|
22
|
160
|
</entry>
|
|
@@ -26,6 +164,16 @@
|
26
|
164
|
<component name="Git.Settings">
|
27
|
165
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
|
28
|
166
|
</component>
|
|
167
|
+<<<<<<< HEAD
|
|
168
|
+=======
|
|
169
|
+ <component name="IdeDocumentHistory">
|
|
170
|
+ <option name="CHANGED_PATHS">
|
|
171
|
+ <list>
|
|
172
|
+ <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" />
|
|
173
|
+ </list>
|
|
174
|
+ </option>
|
|
175
|
+ </component>
|
|
176
|
+>>>>>>> whatBranch
|
29
|
177
|
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
|
30
|
178
|
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
|
31
|
179
|
<component name="JsGulpfileManager">
|
|
@@ -35,10 +183,11 @@
|
35
|
183
|
<component name="NodePackageJsonFileManager">
|
36
|
184
|
<packageJsonPaths />
|
37
|
185
|
</component>
|
38
|
|
- <component name="ProjectFrameBounds">
|
39
|
|
- <option name="y" value="23" />
|
40
|
|
- <option name="width" value="1440" />
|
41
|
|
- <option name="height" value="817" />
|
|
186
|
+ <component name="ProjectFrameBounds" fullScreen="true">
|
|
187
|
+ <option name="x" value="-246" />
|
|
188
|
+ <option name="y" value="-1080" />
|
|
189
|
+ <option name="width" value="1920" />
|
|
190
|
+ <option name="height" value="1080" />
|
42
|
191
|
</component>
|
43
|
192
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
44
|
193
|
<component name="ProjectView">
|
|
@@ -53,29 +202,49 @@
|
53
|
202
|
<expand>
|
54
|
203
|
<path>
|
55
|
204
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
205
|
+<<<<<<< HEAD
|
56
|
206
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
57
|
207
|
</path>
|
58
|
208
|
<path>
|
59
|
209
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
60
|
210
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
211
|
+=======
|
|
212
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
213
|
+ </path>
|
|
214
|
+ <path>
|
|
215
|
+ <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
216
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
217
|
+>>>>>>> whatBranch
|
61
|
218
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
62
|
219
|
</path>
|
63
|
220
|
<path>
|
64
|
221
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
222
|
+<<<<<<< HEAD
|
65
|
223
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
224
|
+=======
|
|
225
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
226
|
+>>>>>>> whatBranch
|
66
|
227
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
67
|
228
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
68
|
229
|
</path>
|
69
|
230
|
<path>
|
70
|
231
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
232
|
+<<<<<<< HEAD
|
71
|
233
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
234
|
+=======
|
|
235
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
236
|
+>>>>>>> whatBranch
|
72
|
237
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
73
|
238
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
74
|
239
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
75
|
240
|
</path>
|
76
|
241
|
<path>
|
77
|
242
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
243
|
+<<<<<<< HEAD
|
78
|
244
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
245
|
+=======
|
|
246
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
247
|
+>>>>>>> whatBranch
|
79
|
248
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
80
|
249
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
81
|
250
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
@@ -83,7 +252,11 @@
|
83
|
252
|
</path>
|
84
|
253
|
<path>
|
85
|
254
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
255
|
+<<<<<<< HEAD
|
86
|
256
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
257
|
+=======
|
|
258
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
259
|
+>>>>>>> whatBranch
|
87
|
260
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
88
|
261
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
89
|
262
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
@@ -92,14 +265,61 @@
|
92
|
265
|
</path>
|
93
|
266
|
<path>
|
94
|
267
|
<item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
268
|
+<<<<<<< HEAD
|
95
|
269
|
<item name="Backend" type="462c0819:PsiDirectoryNode" />
|
|
270
|
+=======
|
|
271
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
272
|
+>>>>>>> whatBranch
|
|
273
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
274
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
275
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
276
|
+ <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
277
|
+ <item name="passionProject" type="462c0819:PsiDirectoryNode" />
|
|
278
|
+ <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
|
|
279
|
+ </path>
|
|
280
|
+<<<<<<< HEAD
|
|
281
|
+=======
|
|
282
|
+ <path>
|
|
283
|
+ <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
284
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
96
|
285
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
97
|
286
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
98
|
287
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
99
|
288
|
<item name="com" type="462c0819:PsiDirectoryNode" />
|
100
|
289
|
<item name="passionProject" type="462c0819:PsiDirectoryNode" />
|
101
|
290
|
<item name="bikeProject" type="462c0819:PsiDirectoryNode" />
|
|
291
|
+ <item name="Controller" type="462c0819:PsiDirectoryNode" />
|
102
|
292
|
</path>
|
|
293
|
+ <path>
|
|
294
|
+ <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
295
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
296
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
297
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
298
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
299
|
+ <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
300
|
+ <item name="passionProject" type="462c0819:PsiDirectoryNode" />
|
|
301
|
+ <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
|
|
302
|
+ <item name="Entity" type="462c0819:PsiDirectoryNode" />
|
|
303
|
+ </path>
|
|
304
|
+ <path>
|
|
305
|
+ <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
306
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
307
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
308
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
309
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
310
|
+ <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
311
|
+ <item name="passionProject" type="462c0819:PsiDirectoryNode" />
|
|
312
|
+ <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
|
|
313
|
+ <item name="Repository" type="462c0819:PsiDirectoryNode" />
|
|
314
|
+ </path>
|
|
315
|
+ <path>
|
|
316
|
+ <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
|
|
317
|
+ <item name="backEnd" type="462c0819:PsiDirectoryNode" />
|
|
318
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
319
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
320
|
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
321
|
+ </path>
|
|
322
|
+>>>>>>> whatBranch
|
103
|
323
|
</expand>
|
104
|
324
|
<select />
|
105
|
325
|
</subPane>
|
|
@@ -108,14 +328,18 @@
|
108
|
328
|
</panes>
|
109
|
329
|
</component>
|
110
|
330
|
<component name="PropertiesComponent">
|
|
331
|
+ <property name="RequestMappingsPanelOrder0" value="0" />
|
|
332
|
+ <property name="RequestMappingsPanelOrder1" value="1" />
|
|
333
|
+ <property name="RequestMappingsPanelWidth0" value="75" />
|
|
334
|
+ <property name="RequestMappingsPanelWidth1" value="75" />
|
111
|
335
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
112
|
336
|
<property name="aspect.path.notification.shown" value="true" />
|
113
|
337
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
114
|
338
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
115
|
|
- <property name="project.structure.last.edited" value="Modules" />
|
|
339
|
+ <property name="project.structure.last.edited" value="Global Libraries" />
|
116
|
340
|
<property name="project.structure.proportion" value="0.0" />
|
117
|
|
- <property name="project.structure.side.proportion" value="0.0" />
|
118
|
|
- <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
|
|
341
|
+ <property name="project.structure.side.proportion" value="0.2" />
|
|
342
|
+ <property name="settings.editor.selected.configurable" value="configurable.group.build" />
|
119
|
343
|
</component>
|
120
|
344
|
<component name="RunDashboard">
|
121
|
345
|
<option name="ruleStates">
|
|
@@ -186,28 +410,39 @@
|
186
|
410
|
<option name="number" value="Default" />
|
187
|
411
|
<option name="presentableId" value="Default" />
|
188
|
412
|
<updated>1531948550601</updated>
|
|
413
|
+<<<<<<< HEAD
|
189
|
414
|
<workItem from="1531948552317" duration="211000" />
|
|
415
|
+=======
|
|
416
|
+ <workItem from="1531948552317" duration="43000" />
|
|
417
|
+ <workItem from="1532100900888" duration="513000" />
|
|
418
|
+>>>>>>> whatBranch
|
190
|
419
|
</task>
|
191
|
420
|
<servers />
|
192
|
421
|
</component>
|
193
|
422
|
<component name="TimeTrackingManager">
|
|
423
|
+<<<<<<< HEAD
|
194
|
424
|
<option name="totallyTimeSpent" value="211000" />
|
|
425
|
+=======
|
|
426
|
+ <option name="totallyTimeSpent" value="557000" />
|
|
427
|
+>>>>>>> whatBranch
|
195
|
428
|
</component>
|
196
|
429
|
<component name="ToolWindowManager">
|
197
|
|
- <frame x="0" y="23" width="1440" height="817" extended-state="6" />
|
|
430
|
+ <frame x="-246" y="-1080" width="1920" height="1080" extended-state="0" />
|
|
431
|
+ <editor active="true" />
|
198
|
432
|
<layout>
|
199
|
|
- <window_info anchor="right" id="Palette" />
|
200
|
|
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
|
201
|
|
- <window_info anchor="right" id="Maven Projects" />
|
202
|
|
- <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
|
203
|
|
- <window_info id="Capture Tool" />
|
204
|
|
- <window_info id="Designer" />
|
205
|
|
- <window_info anchor="right" id="Database" />
|
|
433
|
+ <window_info anchor="right" id="Palette" order="3" />
|
|
434
|
+ <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
435
|
+ <window_info anchor="right" id="Maven Projects" order="3" />
|
|
436
|
+ <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
437
|
+ <window_info id="Capture Tool" order="2" />
|
|
438
|
+ <window_info id="Designer" order="2" />
|
|
439
|
+ <window_info anchor="right" id="Database" order="3" />
|
206
|
440
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
207
|
441
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
208
|
|
- <window_info id="UI Designer" />
|
|
442
|
+ <window_info id="UI Designer" order="2" />
|
209
|
443
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
210
|
444
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
445
|
+<<<<<<< HEAD
|
211
|
446
|
<window_info anchor="right" id="Palette	" />
|
212
|
447
|
<window_info id="Image Layers" />
|
213
|
448
|
<window_info anchor="bottom" id="Java Enterprise" />
|
|
@@ -224,9 +459,28 @@
|
224
|
459
|
<window_info anchor="bottom" id="Find" order="1" />
|
225
|
460
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
226
|
461
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
462
|
+=======
|
|
463
|
+ <window_info anchor="bottom" id="Messages" order="8" />
|
|
464
|
+ <window_info anchor="right" id="Palette	" order="3" />
|
|
465
|
+ <window_info id="Image Layers" order="2" />
|
|
466
|
+ <window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
467
|
+ <window_info anchor="right" id="Capture Analysis" order="3" />
|
|
468
|
+ <window_info anchor="bottom" id="Version Control" order="7" />
|
|
469
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.600995" />
|
|
470
|
+ <window_info anchor="bottom" id="Spring" order="7" />
|
|
471
|
+ <window_info anchor="bottom" id="Terminal" order="7" />
|
|
472
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19116081" />
|
|
473
|
+ <window_info anchor="right" id="Bean Validation" order="3" />
|
|
474
|
+ <window_info id="Web" order="2" side_tool="true" />
|
|
475
|
+ <window_info anchor="right" id="Theme Preview" order="3" />
|
|
476
|
+ <window_info id="Favorites" order="2" side_tool="true" />
|
|
477
|
+>>>>>>> whatBranch
|
227
|
478
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
228
|
|
- <window_info anchor="bottom" id="Message" order="0" />
|
|
479
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
229
|
480
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
481
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
482
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
483
|
+ <window_info anchor="bottom" id="Find" order="1" />
|
230
|
484
|
</layout>
|
231
|
485
|
</component>
|
232
|
486
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -238,11 +492,104 @@
|
238
|
492
|
<component name="editorHistoryManager">
|
239
|
493
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
|
240
|
494
|
<provider selected="true" editor-type-id="text-editor">
|
|
495
|
+<<<<<<< HEAD
|
241
|
496
|
<state relative-caret-position="165">
|
|
497
|
+=======
|
|
498
|
+ <state relative-caret-position="75">
|
|
499
|
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
|
500
|
+ <folding>
|
|
501
|
+ <element signature="imports" expanded="true" />
|
|
502
|
+ </folding>
|
|
503
|
+ </state>
|
|
504
|
+ </provider>
|
|
505
|
+ </entry>
|
|
506
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
|
|
507
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
508
|
+ <state relative-caret-position="90">
|
|
509
|
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
|
510
|
+ <folding>
|
|
511
|
+ <element signature="imports" expanded="true" />
|
|
512
|
+ </folding>
|
|
513
|
+ </state>
|
|
514
|
+ </provider>
|
|
515
|
+ </entry>
|
|
516
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
|
|
517
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
518
|
+ <state relative-caret-position="75">
|
|
519
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
520
|
+ <folding>
|
|
521
|
+ <element signature="imports" expanded="true" />
|
|
522
|
+ </folding>
|
|
523
|
+ </state>
|
|
524
|
+ </provider>
|
|
525
|
+ </entry>
|
|
526
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
|
|
527
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
528
|
+ <state relative-caret-position="75">
|
|
529
|
+ <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
530
|
+ </state>
|
|
531
|
+ </provider>
|
|
532
|
+ </entry>
|
|
533
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
|
|
534
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
535
|
+ <state relative-caret-position="210">
|
|
536
|
+>>>>>>> whatBranch
|
242
|
537
|
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
243
|
538
|
</state>
|
244
|
539
|
</provider>
|
245
|
540
|
</entry>
|
|
541
|
+<<<<<<< HEAD
|
|
542
|
+=======
|
|
543
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
|
|
544
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
545
|
+ <state relative-caret-position="58">
|
|
546
|
+ <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
547
|
+ </state>
|
|
548
|
+ </provider>
|
|
549
|
+ </entry>
|
|
550
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
|
|
551
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
552
|
+ <state relative-caret-position="30">
|
|
553
|
+ <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
|
|
554
|
+ <folding>
|
|
555
|
+ <element signature="imports" expanded="true" />
|
|
556
|
+ </folding>
|
|
557
|
+ </state>
|
|
558
|
+ </provider>
|
|
559
|
+ </entry>
|
|
560
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
|
|
561
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
562
|
+ <state relative-caret-position="90">
|
|
563
|
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
|
564
|
+ <folding>
|
|
565
|
+ <element signature="imports" expanded="true" />
|
|
566
|
+ </folding>
|
|
567
|
+ </state>
|
|
568
|
+ </provider>
|
|
569
|
+ </entry>
|
|
570
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
|
|
571
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
572
|
+ <state relative-caret-position="705">
|
|
573
|
+ <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
|
|
574
|
+ <folding>
|
|
575
|
+ <element signature="imports" expanded="true" />
|
|
576
|
+ </folding>
|
|
577
|
+ </state>
|
|
578
|
+ </provider>
|
|
579
|
+ </entry>
|
|
580
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
581
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
582
|
+ <state relative-caret-position="60">
|
|
583
|
+ <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
|
|
584
|
+ </state>
|
|
585
|
+ </provider>
|
|
586
|
+ </entry>
|
|
587
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
588
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
589
|
+ <state relative-caret-position="-112" />
|
|
590
|
+ </provider>
|
|
591
|
+ </entry>
|
|
592
|
+>>>>>>> whatBranch
|
246
|
593
|
</component>
|
247
|
594
|
<component name="masterDetails">
|
248
|
595
|
<states>
|
|
@@ -295,11 +642,19 @@
|
295
|
642
|
</state>
|
296
|
643
|
<state key="ModuleStructureConfigurable.UI">
|
297
|
644
|
<settings>
|
|
645
|
+<<<<<<< HEAD
|
298
|
646
|
<last-edited>Web|bikeProject</last-edited>
|
|
647
|
+=======
|
|
648
|
+ <last-edited>bikeProject</last-edited>
|
|
649
|
+>>>>>>> whatBranch
|
299
|
650
|
<splitter-proportions>
|
300
|
651
|
<option name="proportions">
|
301
|
652
|
<list>
|
302
|
653
|
<option value="0.2" />
|
|
654
|
+<<<<<<< HEAD
|
|
655
|
+=======
|
|
656
|
+ <option value="0.6" />
|
|
657
|
+>>>>>>> whatBranch
|
303
|
658
|
</list>
|
304
|
659
|
</option>
|
305
|
660
|
</splitter-proportions>
|