Browse Source

cross origin for 8100

Kris Blassingame 6 years ago
parent
commit
00d55470c1

+ 51
- 101
Backend/.idea/workspace.xml View File

@@ -2,7 +2,7 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="c7322421-434b-4b5d-bbb0-6cbb0ec544c2" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6
     </list>
7 7
     <ignored path="$PROJECT_DIR$/target/" />
8 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -26,8 +26,8 @@
26 26
       <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
27 27
         <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
28 28
           <provider selected="true" editor-type-id="text-editor">
29
-            <state relative-caret-position="75">
30
-              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
29
+            <state relative-caret-position="525">
30
+              <caret line="42" column="21" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
31 31
             </state>
32 32
           </provider>
33 33
         </entry>
@@ -48,8 +48,8 @@
48 48
       <file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="false">
49 49
         <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
50 50
           <provider selected="true" editor-type-id="text-editor">
51
-            <state relative-caret-position="75">
52
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
51
+            <state relative-caret-position="165">
52
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
53 53
             </state>
54 54
           </provider>
55 55
         </entry>
@@ -57,8 +57,8 @@
57 57
       <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
58 58
         <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
59 59
           <provider selected="true" editor-type-id="text-editor">
60
-            <state relative-caret-position="373">
61
-              <caret line="144" column="66" lean-forward="true" selection-start-line="144" selection-start-column="66" selection-end-line="144" selection-end-column="66" />
60
+            <state relative-caret-position="1429">
61
+              <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
62 62
             </state>
63 63
           </provider>
64 64
         </entry>
@@ -75,14 +75,30 @@
75 75
       <file leaf-file-name="UserController.java" pinned="false" current-in-tab="true">
76 76
         <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
77 77
           <provider selected="true" editor-type-id="text-editor">
78
-            <state relative-caret-position="570">
79
-              <caret line="44" column="68" selection-start-line="44" selection-start-column="68" selection-end-line="44" selection-end-column="68" />
78
+            <state relative-caret-position="315">
79
+              <caret line="27" selection-start-line="27" selection-end-line="27" />
80
+            </state>
81
+          </provider>
82
+        </entry>
83
+      </file>
84
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
85
+        <entry file="file://$PROJECT_DIR$/pom.xml">
86
+          <provider selected="true" editor-type-id="text-editor">
87
+            <state relative-caret-position="60">
88
+              <caret line="4" selection-start-line="4" selection-end-line="4" />
80 89
             </state>
81 90
           </provider>
82 91
         </entry>
83 92
       </file>
84 93
     </leaf>
85 94
   </component>
95
+  <component name="FindInProjectRecents">
96
+    <findStrings>
97
+      <find>sql</find>
98
+      <find>starter</find>
99
+      <find>dev</find>
100
+    </findStrings>
101
+  </component>
86 102
   <component name="Git.Settings">
87 103
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
88 104
   </component>
@@ -90,9 +106,9 @@
90 106
     <option name="CHANGED_PATHS">
91 107
       <list>
92 108
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
93
-        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" />
94 109
         <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java" />
95 110
         <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java" />
111
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" />
96 112
       </list>
97 113
     </option>
98 114
   </component>
@@ -124,79 +140,6 @@
124 140
               <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
125 141
               <item name="backEnd" type="462c0819:PsiDirectoryNode" />
126 142
             </path>
127
-            <path>
128
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
129
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
130
-              <item name=".idea" type="462c0819:PsiDirectoryNode" />
131
-            </path>
132
-            <path>
133
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
134
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
135
-              <item name="src" type="462c0819:PsiDirectoryNode" />
136
-            </path>
137
-            <path>
138
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
139
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
140
-              <item name="src" type="462c0819:PsiDirectoryNode" />
141
-              <item name="main" type="462c0819:PsiDirectoryNode" />
142
-            </path>
143
-            <path>
144
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
145
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
146
-              <item name="src" type="462c0819:PsiDirectoryNode" />
147
-              <item name="main" type="462c0819:PsiDirectoryNode" />
148
-              <item name="java" type="462c0819:PsiDirectoryNode" />
149
-            </path>
150
-            <path>
151
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
152
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
153
-              <item name="src" type="462c0819:PsiDirectoryNode" />
154
-              <item name="main" type="462c0819:PsiDirectoryNode" />
155
-              <item name="java" type="462c0819:PsiDirectoryNode" />
156
-              <item name="com" type="462c0819:PsiDirectoryNode" />
157
-            </path>
158
-            <path>
159
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
160
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
161
-              <item name="src" type="462c0819:PsiDirectoryNode" />
162
-              <item name="main" type="462c0819:PsiDirectoryNode" />
163
-              <item name="java" type="462c0819:PsiDirectoryNode" />
164
-              <item name="com" type="462c0819:PsiDirectoryNode" />
165
-              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
166
-            </path>
167
-            <path>
168
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
169
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
170
-              <item name="src" type="462c0819:PsiDirectoryNode" />
171
-              <item name="main" type="462c0819:PsiDirectoryNode" />
172
-              <item name="java" type="462c0819:PsiDirectoryNode" />
173
-              <item name="com" type="462c0819:PsiDirectoryNode" />
174
-              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
175
-              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
176
-            </path>
177
-            <path>
178
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
179
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
180
-              <item name="src" type="462c0819:PsiDirectoryNode" />
181
-              <item name="main" type="462c0819:PsiDirectoryNode" />
182
-              <item name="java" type="462c0819:PsiDirectoryNode" />
183
-              <item name="com" type="462c0819:PsiDirectoryNode" />
184
-              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
185
-              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
186
-              <item name="Service" type="462c0819:PsiDirectoryNode" />
187
-            </path>
188
-            <path>
189
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
190
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
191
-              <item name="src" type="462c0819:PsiDirectoryNode" />
192
-              <item name="main" type="462c0819:PsiDirectoryNode" />
193
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
194
-            </path>
195
-            <path>
196
-              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
197
-              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
198
-              <item name="target" type="462c0819:PsiDirectoryNode" />
199
-            </path>
200 143
           </expand>
201 144
           <select />
202 145
         </subPane>
@@ -295,12 +238,12 @@
295 238
       <updated>1532203450565</updated>
296 239
       <workItem from="1532203456370" duration="186000" />
297 240
       <workItem from="1532203659637" duration="1286000" />
298
-      <workItem from="1532355673222" duration="239000" />
241
+      <workItem from="1532355673222" duration="1631000" />
299 242
     </task>
300 243
     <servers />
301 244
   </component>
302 245
   <component name="TimeTrackingManager">
303
-    <option name="totallyTimeSpent" value="1711000" />
246
+    <option name="totallyTimeSpent" value="3103000" />
304 247
   </component>
305 248
   <component name="ToolWindowManager">
306 249
     <frame x="-246" y="-1057" width="1920" height="1057" extended-state="0" />
@@ -318,6 +261,7 @@
318 261
       <window_info id="UI Designer" order="2" />
319 262
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
320 263
       <window_info anchor="bottom" id="TODO" order="6" />
264
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32916668" />
321 265
       <window_info anchor="right" id="Palette&#9;" order="3" />
322 266
       <window_info id="Image Layers" order="2" />
323 267
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
@@ -329,15 +273,14 @@
329 273
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2550586" />
330 274
       <window_info anchor="right" id="Bean Validation" order="3" />
331 275
       <window_info id="Web" order="2" side_tool="true" />
276
+      <window_info anchor="bottom" id="Find" order="1" />
332 277
       <window_info anchor="right" id="Theme Preview" order="3" />
333 278
       <window_info id="Favorites" order="2" side_tool="true" />
334 279
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
335 280
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
336 281
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
337
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.32916668" />
338 282
       <window_info anchor="bottom" id="Message" order="0" />
339 283
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
340
-      <window_info anchor="bottom" id="Find" order="1" />
341 284
     </layout>
342 285
   </component>
343 286
   <component name="TypeScriptGeneratedFilesManager">
@@ -396,31 +339,31 @@
396 339
         </state>
397 340
       </provider>
398 341
     </entry>
399
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
342
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
400 343
       <provider selected="true" editor-type-id="text-editor">
401
-        <state relative-caret-position="75">
402
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
344
+        <state relative-caret-position="135">
345
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
403 346
         </state>
404 347
       </provider>
405 348
     </entry>
406 349
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
407 350
       <provider selected="true" editor-type-id="text-editor">
408
-        <state relative-caret-position="373">
409
-          <caret line="144" column="66" lean-forward="true" selection-start-line="144" selection-start-column="66" selection-end-line="144" selection-end-column="66" />
351
+        <state relative-caret-position="1429">
352
+          <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
410 353
         </state>
411 354
       </provider>
412 355
     </entry>
413
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
356
+    <entry file="file://$PROJECT_DIR$/pom.xml">
414 357
       <provider selected="true" editor-type-id="text-editor">
415 358
         <state relative-caret-position="60">
416 359
           <caret line="4" selection-start-line="4" selection-end-line="4" />
417 360
         </state>
418 361
       </provider>
419 362
     </entry>
420
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
363
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
421 364
       <provider selected="true" editor-type-id="text-editor">
422
-        <state relative-caret-position="75">
423
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
365
+        <state relative-caret-position="60">
366
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
424 367
         </state>
425 368
       </provider>
426 369
     </entry>
@@ -435,17 +378,24 @@
435 378
         </state>
436 379
       </provider>
437 380
     </entry>
438
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
381
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
439 382
       <provider selected="true" editor-type-id="text-editor">
440
-        <state relative-caret-position="135">
441
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
383
+        <state relative-caret-position="525">
384
+          <caret line="42" column="21" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
385
+        </state>
386
+      </provider>
387
+    </entry>
388
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
389
+      <provider selected="true" editor-type-id="text-editor">
390
+        <state relative-caret-position="165">
391
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
442 392
         </state>
443 393
       </provider>
444 394
     </entry>
445 395
     <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
446 396
       <provider selected="true" editor-type-id="text-editor">
447
-        <state relative-caret-position="570">
448
-          <caret line="44" column="68" selection-start-line="44" selection-start-column="68" selection-end-line="44" selection-end-column="68" />
397
+        <state relative-caret-position="315">
398
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
449 399
         </state>
450 400
       </provider>
451 401
     </entry>

+ 1
- 1
Backend/src/main/java/com/passionProject/bikeProject/Controller/UserController.java View File

@@ -8,7 +8,7 @@ import org.springframework.http.HttpStatus;
8 8
 import org.springframework.http.ResponseEntity;
9 9
 import org.springframework.web.bind.annotation.*;
10 10
 
11
-@CrossOrigin(origins = "http://localhost:8080")
11
+@CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
12 12
 @RestController
13 13
 public class UserController {
14 14