Eric Foster преди 6 години
родител
ревизия
42640cd5c0

+ 153
- 136
.idea/workspace.xml Целия файл

@@ -3,6 +3,25 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="ad381d05-32c5-4ad5-8041-a0cb51a71fd9" 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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/SharedTravelApp.class" beforeDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/DestinationController.class" beforeDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/HomeController.class" beforeDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/LoginController.class" beforeDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/ProfileController.class" beforeDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/UserController.class" beforeDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Destination.class" beforeDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Login.class" beforeDir="false" />
19
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Profile.class" beforeDir="false" />
20
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/User.class" beforeDir="false" />
21
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/DestinationRepository.class" beforeDir="false" />
22
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/LoginRepository.class" beforeDir="false" />
23
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/ProfileRepository.class" beforeDir="false" />
24
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/UserRepository.class" beforeDir="false" />
6 25
     </list>
7 26
     <ignored path="$PROJECT_DIR$/out/" />
8 27
     <ignored path="$PROJECT_DIR$/target/" />
@@ -15,14 +34,11 @@
15 34
   </component>
16 35
   <component name="FileEditorManager">
17 36
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
18
-      <file leaf-file-name="ProfileController.java" pinned="false" current-in-tab="false">
19
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
37
+      <file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
38
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
20 39
           <provider selected="true" editor-type-id="text-editor">
21 40
             <state relative-caret-position="255">
22
-              <caret line="23" selection-start-line="23" selection-end-line="23" />
23
-              <folding>
24
-                <element signature="imports" expanded="true" />
25
-              </folding>
41
+              <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
26 42
             </state>
27 43
           </provider>
28 44
         </entry>
@@ -39,20 +55,23 @@
39 55
           </provider>
40 56
         </entry>
41 57
       </file>
42
-      <file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
43
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
58
+      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
59
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
44 60
           <provider selected="true" editor-type-id="text-editor">
45
-            <state relative-caret-position="255">
46
-              <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
61
+            <state relative-caret-position="195">
62
+              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
63
+              <folding>
64
+                <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
65
+              </folding>
47 66
             </state>
48 67
           </provider>
49 68
         </entry>
50 69
       </file>
51
-      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
52
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
70
+      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="true">
71
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
53 72
           <provider selected="true" editor-type-id="text-editor">
54
-            <state relative-caret-position="180">
55
-              <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
73
+            <state relative-caret-position="390">
74
+              <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
56 75
               <folding>
57 76
                 <element signature="imports" expanded="true" />
58 77
               </folding>
@@ -60,23 +79,20 @@
60 79
           </provider>
61 80
         </entry>
62 81
       </file>
63
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
64
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
82
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
83
+        <entry file="file://$PROJECT_DIR$/pom.xml">
65 84
           <provider selected="true" editor-type-id="text-editor">
66
-            <state relative-caret-position="195">
67
-              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
68
-              <folding>
69
-                <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
70
-              </folding>
85
+            <state relative-caret-position="300">
86
+              <caret line="20" selection-start-line="20" selection-end-line="20" />
71 87
             </state>
72 88
           </provider>
73 89
         </entry>
74 90
       </file>
75
-      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
76
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
91
+      <file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
92
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
77 93
           <provider selected="true" editor-type-id="text-editor">
78
-            <state relative-caret-position="135">
79
-              <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
94
+            <state relative-caret-position="210">
95
+              <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
80 96
               <folding>
81 97
                 <element signature="imports" expanded="true" />
82 98
               </folding>
@@ -84,11 +100,11 @@
84 100
           </provider>
85 101
         </entry>
86 102
       </file>
87
-      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
88
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
103
+      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
104
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
89 105
           <provider selected="true" editor-type-id="text-editor">
90
-            <state relative-caret-position="240">
91
-              <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
106
+            <state relative-caret-position="150">
107
+              <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
92 108
               <folding>
93 109
                 <element signature="imports" expanded="true" />
94 110
               </folding>
@@ -96,11 +112,11 @@
96 112
           </provider>
97 113
         </entry>
98 114
       </file>
99
-      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
100
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
115
+      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
116
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
101 117
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="1740">
103
-              <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
118
+            <state relative-caret-position="225">
119
+              <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
104 120
               <folding>
105 121
                 <element signature="imports" expanded="true" />
106 122
               </folding>
@@ -108,11 +124,11 @@
108 124
           </provider>
109 125
         </entry>
110 126
       </file>
111
-      <file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
112
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
127
+      <file leaf-file-name="ProfileController.java" pinned="false" current-in-tab="false">
128
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
113 129
           <provider selected="true" editor-type-id="text-editor">
114
-            <state relative-caret-position="210">
115
-              <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
130
+            <state relative-caret-position="255">
131
+              <caret line="23" selection-start-line="23" selection-end-line="23" />
116 132
               <folding>
117 133
                 <element signature="imports" expanded="true" />
118 134
               </folding>
@@ -120,11 +136,14 @@
120 136
           </provider>
121 137
         </entry>
122 138
       </file>
123
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="true">
124
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
139
+      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
140
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
125 141
           <provider selected="true" editor-type-id="text-editor">
126
-            <state relative-caret-position="75">
127
-              <caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
142
+            <state relative-caret-position="1740">
143
+              <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
144
+              <folding>
145
+                <element signature="imports" expanded="true" />
146
+              </folding>
128 147
             </state>
129 148
           </provider>
130 149
         </entry>
@@ -150,7 +169,6 @@
150 169
   <component name="IdeDocumentHistory">
151 170
     <option name="CHANGED_PATHS">
152 171
       <list>
153
-        <option value="$PROJECT_DIR$/src/main/java/alidade/alidade.java" />
154 172
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/DestinationState.java" />
155 173
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FutureDestination.java" />
156 174
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Feed.java" />
@@ -158,7 +176,6 @@
158 176
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/MessageRepository.java" />
159 177
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/FriendController.java" />
160 178
         <option value="$PROJECT_DIR$/src/test/java/UserControllerClass.java" />
161
-        <option value="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" />
162 179
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" />
163 180
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Message.java" />
164 181
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/MessageController.java" />
@@ -174,7 +191,6 @@
174 191
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/MessageBoardController.java" />
175 192
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserLoginController.java" />
176 193
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/MessageBoard.java" />
177
-        <option value="$PROJECT_DIR$/pom.xml" />
178 194
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" />
179 195
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationRepository.java" />
180 196
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/user/DestinationType.java" />
@@ -194,13 +210,16 @@
194 210
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" />
195 211
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" />
196 212
         <option value="$PROJECT_DIR$/src/test/java/AppTest.java" />
197
-        <option value="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" />
198
-        <option value="$PROJECT_DIR$/src/test/java/UserControllerTest.java" />
199 213
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" />
200 214
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java" />
201 215
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java" />
202 216
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
203 217
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
218
+        <option value="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" />
219
+        <option value="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" />
220
+        <option value="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" />
221
+        <option value="$PROJECT_DIR$/src/test/java/UserControllerTest.java" />
222
+        <option value="$PROJECT_DIR$/pom.xml" />
204 223
       </list>
205 224
     </option>
206 225
   </component>
@@ -220,10 +239,10 @@
220 239
   <component name="NodePackageJsonFileManager">
221 240
     <packageJsonPaths />
222 241
   </component>
223
-  <component name="ProjectFrameBounds">
224
-    <option name="y" value="23" />
225
-    <option name="width" value="1280" />
226
-    <option name="height" value="713" />
242
+  <component name="ProjectFrameBounds" fullScreen="true">
243
+    <option name="x" value="1280" />
244
+    <option name="width" value="1680" />
245
+    <option name="height" value="1050" />
227 246
   </component>
228 247
   <component name="ProjectLevelVcsManager">
229 248
     <ConfirmationsSetting value="2" id="Add" />
@@ -233,9 +252,8 @@
233 252
       <foldersAlwaysOnTop value="true" />
234 253
     </navigator>
235 254
     <panes>
236
-      <pane id="AndroidView" />
237 255
       <pane id="Scope" />
238
-      <pane id="PackagesPane" />
256
+      <pane id="AndroidView" />
239 257
       <pane id="ProjectPane">
240 258
         <subPane>
241 259
           <expand>
@@ -320,6 +338,7 @@
320 338
           <select />
321 339
         </subPane>
322 340
       </pane>
341
+      <pane id="PackagesPane" />
323 342
     </panes>
324 343
   </component>
325 344
   <component name="PropertiesComponent">
@@ -506,7 +525,8 @@
506 525
       <workItem from="1532433170959" duration="10477000" />
507 526
       <workItem from="1532517881023" duration="1129000" />
508 527
       <workItem from="1532541641694" duration="615000" />
509
-      <workItem from="1532635085154" duration="625000" />
528
+      <workItem from="1532635085154" duration="2289000" />
529
+      <workItem from="1532786194419" duration="318000" />
510 530
     </task>
511 531
     <servers />
512 532
   </component>
@@ -537,7 +557,7 @@
537 557
     </history-entry>
538 558
   </component>
539 559
   <component name="TimeTrackingManager">
540
-    <option name="totallyTimeSpent" value="77338000" />
560
+    <option name="totallyTimeSpent" value="79320000" />
541 561
   </component>
542 562
   <component name="TodoView">
543 563
     <todo-panel id="selected-file">
@@ -549,7 +569,7 @@
549 569
     </todo-panel>
550 570
   </component>
551 571
   <component name="ToolWindowManager">
552
-    <frame x="0" y="23" width="1280" height="713" extended-state="0" />
572
+    <frame x="1280" y="0" width="1680" height="1050" extended-state="0" />
553 573
     <editor active="true" />
554 574
     <layout>
555 575
       <window_info anchor="right" id="Palette" order="3" />
@@ -568,19 +588,19 @@
568 588
       <window_info id="Image Layers" order="2" />
569 589
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
570 590
       <window_info anchor="right" id="Capture Analysis" order="3" />
571
-      <window_info anchor="bottom" id="Run" order="2" weight="0.39310345" />
572 591
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
592
+      <window_info anchor="bottom" id="Run" order="2" weight="0.39310345" />
573 593
       <window_info anchor="bottom" id="Spring" order="8" weight="0.32935324" />
574
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.37012988" />
575
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2907916" />
594
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.23384616" />
595
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22344323" />
576 596
       <window_info anchor="right" id="Bean Validation" order="4" />
577 597
       <window_info id="Web" order="3" side_tool="true" />
578 598
       <window_info anchor="right" id="Theme Preview" order="3" />
579 599
       <window_info id="Favorites" order="2" side_tool="true" />
580
-      <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
581 600
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
582 601
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
583 602
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
603
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
584 604
       <window_info anchor="bottom" id="Message" order="0" />
585 605
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
586 606
       <window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
@@ -679,178 +699,175 @@
679 699
       </provider>
680 700
     </entry>
681 701
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationState.java" />
682
-    <entry file="file://$PROJECT_DIR$/pom.xml">
702
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
703
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
704
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
683 705
       <provider selected="true" editor-type-id="text-editor">
684
-        <state relative-caret-position="315">
685
-          <caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
706
+        <state relative-caret-position="75">
707
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
686 708
         </state>
687 709
       </provider>
688 710
     </entry>
689
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
690
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
691
-    <entry file="file://$PROJECT_DIR$/src/test/java/AppTest.java">
711
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java">
692 712
       <provider selected="true" editor-type-id="text-editor">
693
-        <state relative-caret-position="120">
694
-          <caret line="11" column="75" selection-start-line="11" selection-start-column="75" selection-end-line="11" selection-end-column="75" />
713
+        <state relative-caret-position="75">
714
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
695 715
         </state>
696 716
       </provider>
697 717
     </entry>
698
-    <entry file="file://$PROJECT_DIR$/src/test/java/DestinationControllerTest.java">
718
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
699 719
       <provider selected="true" editor-type-id="text-editor">
700
-        <state relative-caret-position="450">
701
-          <caret line="42" column="5" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="42" selection-end-column="5" />
720
+        <state relative-caret-position="75">
721
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
702 722
         </state>
703 723
       </provider>
704 724
     </entry>
705
-    <entry file="file://$PROJECT_DIR$/src/test/java/LoginControllerTest.java">
725
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
706 726
       <provider selected="true" editor-type-id="text-editor">
707
-        <state relative-caret-position="345">
708
-          <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
709
-          <folding>
710
-            <element signature="imports" expanded="true" />
711
-          </folding>
727
+        <state relative-caret-position="75">
728
+          <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
712 729
         </state>
713 730
       </provider>
714 731
     </entry>
715
-    <entry file="file://$PROJECT_DIR$/src/test/java/ProfileControllerTest.java">
732
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
716 733
       <provider selected="true" editor-type-id="text-editor">
717
-        <state relative-caret-position="450">
718
-          <caret line="42" column="5" lean-forward="true" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
734
+        <state relative-caret-position="75">
735
+          <caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
719 736
         </state>
720 737
       </provider>
721 738
     </entry>
722
-    <entry file="file://$PROJECT_DIR$/src/test/java/UserControllerTest.java">
739
+    <entry file="file://$PROJECT_DIR$/src/test/java/DestinationControllerTest.java">
723 740
       <provider selected="true" editor-type-id="text-editor">
724
-        <state relative-caret-position="615">
725
-          <caret line="41" column="27" selection-start-line="41" selection-start-column="27" selection-end-line="41" selection-end-column="27" />
741
+        <state relative-caret-position="480">
742
+          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
743
+        </state>
744
+      </provider>
745
+    </entry>
746
+    <entry file="file://$PROJECT_DIR$/src/test/java/LoginControllerTest.java">
747
+      <provider selected="true" editor-type-id="text-editor">
748
+        <state relative-caret-position="210">
749
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
726 750
           <folding>
727 751
             <element signature="imports" expanded="true" />
728 752
           </folding>
729 753
         </state>
730 754
       </provider>
731 755
     </entry>
732
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
756
+    <entry file="file://$PROJECT_DIR$/src/test/java/ProfileControllerTest.java">
733 757
       <provider selected="true" editor-type-id="text-editor">
734
-        <state relative-caret-position="75">
735
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
758
+        <state relative-caret-position="195">
759
+          <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
736 760
         </state>
737 761
       </provider>
738 762
     </entry>
739
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java">
763
+    <entry file="file://$PROJECT_DIR$/src/test/java/UserControllerTest.java">
740 764
       <provider selected="true" editor-type-id="text-editor">
741
-        <state relative-caret-position="75">
742
-          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
765
+        <state relative-caret-position="195">
766
+          <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
767
+          <folding>
768
+            <element signature="imports" expanded="true" />
769
+          </folding>
743 770
         </state>
744 771
       </provider>
745 772
     </entry>
746
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
773
+    <entry file="file://$PROJECT_DIR$/src/test/java/AppTest.java">
747 774
       <provider selected="true" editor-type-id="text-editor">
748
-        <state relative-caret-position="75">
749
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
775
+        <state relative-caret-position="120">
776
+          <caret line="11" column="75" selection-start-line="11" selection-start-column="75" selection-end-line="11" selection-end-column="75" />
750 777
         </state>
751 778
       </provider>
752 779
     </entry>
753
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
780
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
754 781
       <provider selected="true" editor-type-id="text-editor">
755
-        <state relative-caret-position="75">
756
-          <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
782
+        <state relative-caret-position="1740">
783
+          <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
757 784
           <folding>
758 785
             <element signature="imports" expanded="true" />
759 786
           </folding>
760 787
         </state>
761 788
       </provider>
762 789
     </entry>
763
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
790
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
764 791
       <provider selected="true" editor-type-id="text-editor">
765
-        <state relative-caret-position="180">
766
-          <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
767
-          <folding>
768
-            <element signature="imports" expanded="true" />
769
-          </folding>
792
+        <state relative-caret-position="255">
793
+          <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
770 794
         </state>
771 795
       </provider>
772 796
     </entry>
773
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
797
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
774 798
       <provider selected="true" editor-type-id="text-editor">
775
-        <state relative-caret-position="135">
776
-          <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
799
+        <state relative-caret-position="120">
800
+          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
777 801
           <folding>
778 802
             <element signature="imports" expanded="true" />
779 803
           </folding>
780 804
         </state>
781 805
       </provider>
782 806
     </entry>
783
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
807
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
784 808
       <provider selected="true" editor-type-id="text-editor">
785
-        <state relative-caret-position="240">
786
-          <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
809
+        <state relative-caret-position="195">
810
+          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
787 811
           <folding>
788
-            <element signature="imports" expanded="true" />
812
+            <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
789 813
           </folding>
790 814
         </state>
791 815
       </provider>
792 816
     </entry>
793
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
817
+    <entry file="file://$PROJECT_DIR$/pom.xml">
794 818
       <provider selected="true" editor-type-id="text-editor">
795
-        <state relative-caret-position="255">
796
-          <caret line="23" selection-start-line="23" selection-end-line="23" />
797
-          <folding>
798
-            <element signature="imports" expanded="true" />
799
-          </folding>
819
+        <state relative-caret-position="300">
820
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
800 821
         </state>
801 822
       </provider>
802 823
     </entry>
803
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
824
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
804 825
       <provider selected="true" editor-type-id="text-editor">
805
-        <state relative-caret-position="1740">
806
-          <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
826
+        <state relative-caret-position="210">
827
+          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
807 828
           <folding>
808 829
             <element signature="imports" expanded="true" />
809 830
           </folding>
810 831
         </state>
811 832
       </provider>
812 833
     </entry>
813
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
834
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
814 835
       <provider selected="true" editor-type-id="text-editor">
815
-        <state relative-caret-position="120">
816
-          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
836
+        <state relative-caret-position="150">
837
+          <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
817 838
           <folding>
818 839
             <element signature="imports" expanded="true" />
819 840
           </folding>
820 841
         </state>
821 842
       </provider>
822 843
     </entry>
823
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
824
-      <provider selected="true" editor-type-id="text-editor">
825
-        <state relative-caret-position="255">
826
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
827
-        </state>
828
-      </provider>
829
-    </entry>
830
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
844
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
831 845
       <provider selected="true" editor-type-id="text-editor">
832
-        <state relative-caret-position="195">
833
-          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
846
+        <state relative-caret-position="225">
847
+          <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
834 848
           <folding>
835
-            <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
849
+            <element signature="imports" expanded="true" />
836 850
           </folding>
837 851
         </state>
838 852
       </provider>
839 853
     </entry>
840
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
854
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
841 855
       <provider selected="true" editor-type-id="text-editor">
842
-        <state relative-caret-position="210">
843
-          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
856
+        <state relative-caret-position="255">
857
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
844 858
           <folding>
845 859
             <element signature="imports" expanded="true" />
846 860
           </folding>
847 861
         </state>
848 862
       </provider>
849 863
     </entry>
850
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
864
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
851 865
       <provider selected="true" editor-type-id="text-editor">
852
-        <state relative-caret-position="75">
853
-          <caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
866
+        <state relative-caret-position="390">
867
+          <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
868
+          <folding>
869
+            <element signature="imports" expanded="true" />
870
+          </folding>
854 871
         </state>
855 872
       </provider>
856 873
     </entry>

+ 4
- 0
pom.xml Целия файл

@@ -21,6 +21,10 @@
21 21
 
22 22
     <dependencies>
23 23
         <dependency>
24
+            <groupId>org.springframework.cloud</groupId>
25
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
26
+        </dependency>
27
+        <dependency>
24 28
             <groupId>org.springframework.boot</groupId>
25 29
             <artifactId>spring-boot-starter-web</artifactId>
26 30
         </dependency>

+ 0
- 1
src/test/java/DestinationControllerTest.java Целия файл

@@ -25,7 +25,6 @@ public class DestinationControllerTest {
25 25
         MockitoAnnotations.initMocks(this);
26 26
     }
27 27
 
28
-
29 28
     @Test
30 29
     public void testUserCreate() {
31 30
         Destination destination = new Destination();

+ 0
- 1
src/test/java/LoginControllerTest.java Целия файл

@@ -25,7 +25,6 @@ public class LoginControllerTest {
25 25
         MockitoAnnotations.initMocks(this);
26 26
     }
27 27
 
28
-
29 28
     @Test
30 29
     public void testUserCreate() {
31 30
         Login login = new Login();

+ 0
- 1
src/test/java/ProfileControllerTest.java Целия файл

@@ -25,7 +25,6 @@ public class ProfileControllerTest {
25 25
         MockitoAnnotations.initMocks(this);
26 26
     }
27 27
 
28
-
29 28
     @Test
30 29
     public void testUserCreate(){
31 30
         Profile profile = new Profile();

+ 0
- 1
src/test/java/UserControllerTest.java Целия файл

@@ -25,7 +25,6 @@ public class UserControllerTest {
25 25
         MockitoAnnotations.initMocks(this);
26 26
     }
27 27
 
28
-
29 28
     @Test
30 29
     public void testUserCreate() {
31 30
         User user = new User();

BIN
target/classes/com/alidade/SharedTravelApp.class Целия файл


BIN
target/classes/com/alidade/controller/DestinationController.class Целия файл


BIN
target/classes/com/alidade/controller/HomeController.class Целия файл


BIN
target/classes/com/alidade/controller/LoginController.class Целия файл


BIN
target/classes/com/alidade/controller/ProfileController.class Целия файл


BIN
target/classes/com/alidade/controller/UserController.class Целия файл


BIN
target/classes/com/alidade/model/Destination.class Целия файл


BIN
target/classes/com/alidade/model/Login.class Целия файл


BIN
target/classes/com/alidade/model/Profile.class Целия файл


BIN
target/classes/com/alidade/model/User.class Целия файл


BIN
target/classes/com/alidade/repository/DestinationRepository.class Целия файл


BIN
target/classes/com/alidade/repository/LoginRepository.class Целия файл


BIN
target/classes/com/alidade/repository/ProfileRepository.class Целия файл


BIN
target/classes/com/alidade/repository/UserRepository.class Целия файл