Pārlūkot izejas kodu

Did some stuff and things

Kris Blassingame 6 gadus atpakaļ
vecāks
revīzija
9280e461e5
100 mainītis faili ar 7703 papildinājumiem un 278 dzēšanām
  1. 416
    223
      .idea/workspace.xml
  2. 26
    26
      bikeProject.iml
  3. 17
    0
      cyclingFrontEnd/.editorconfig
  4. 35
    0
      cyclingFrontEnd/.gitignore
  5. 84
    0
      cyclingFrontEnd/config.xml
  6. 8
    0
      cyclingFrontEnd/ionic.config.json
  7. 6504
    0
      cyclingFrontEnd/package-lock.json
  8. 38
    0
      cyclingFrontEnd/package.json
  9. 8
    0
      cyclingFrontEnd/resources/README.md
  10. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-hdpi-icon.png
  11. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-ldpi-icon.png
  12. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-mdpi-icon.png
  13. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-xhdpi-icon.png
  14. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-xxhdpi-icon.png
  15. Binārs
      cyclingFrontEnd/resources/android/icon/drawable-xxxhdpi-icon.png
  16. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-hdpi-screen.png
  17. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-ldpi-screen.png
  18. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-mdpi-screen.png
  19. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-xhdpi-screen.png
  20. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-xxhdpi-screen.png
  21. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-land-xxxhdpi-screen.png
  22. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-hdpi-screen.png
  23. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-ldpi-screen.png
  24. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-mdpi-screen.png
  25. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-xhdpi-screen.png
  26. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-xxhdpi-screen.png
  27. Binārs
      cyclingFrontEnd/resources/android/splash/drawable-port-xxxhdpi-screen.png
  28. Binārs
      cyclingFrontEnd/resources/icon.png
  29. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-1024.png
  30. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-40.png
  31. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-40@2x.png
  32. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-40@3x.png
  33. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-50.png
  34. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-50@2x.png
  35. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-60.png
  36. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-60@2x.png
  37. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-60@3x.png
  38. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-72.png
  39. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-72@2x.png
  40. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-76.png
  41. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-76@2x.png
  42. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-83.5@2x.png
  43. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-small.png
  44. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-small@2x.png
  45. Binārs
      cyclingFrontEnd/resources/ios/icon/icon-small@3x.png
  46. Binārs
      cyclingFrontEnd/resources/ios/icon/icon.png
  47. Binārs
      cyclingFrontEnd/resources/ios/icon/icon@2x.png
  48. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-568h@2x~iphone.png
  49. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-667h.png
  50. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-736h.png
  51. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Landscape-736h.png
  52. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Landscape@2x~ipad.png
  53. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Landscape@~ipadpro.png
  54. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Landscape~ipad.png
  55. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Portrait@2x~ipad.png
  56. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Portrait@~ipadpro.png
  57. Binārs
      cyclingFrontEnd/resources/ios/splash/Default-Portrait~ipad.png
  58. Binārs
      cyclingFrontEnd/resources/ios/splash/Default@2x~iphone.png
  59. Binārs
      cyclingFrontEnd/resources/ios/splash/Default@2x~universal~anyany.png
  60. Binārs
      cyclingFrontEnd/resources/ios/splash/Default~iphone.png
  61. Binārs
      cyclingFrontEnd/resources/splash.png
  62. 22
    0
      cyclingFrontEnd/src/app/app.component.ts
  63. 1
    0
      cyclingFrontEnd/src/app/app.html
  64. 30
    0
      cyclingFrontEnd/src/app/app.module.ts
  65. 16
    0
      cyclingFrontEnd/src/app/app.scss
  66. 5
    0
      cyclingFrontEnd/src/app/main.ts
  67. Binārs
      cyclingFrontEnd/src/assets/icon/favicon.ico
  68. Binārs
      cyclingFrontEnd/src/assets/imgs/logo.png
  69. 49
    0
      cyclingFrontEnd/src/index.html
  70. 13
    0
      cyclingFrontEnd/src/manifest.json
  71. 14
    0
      cyclingFrontEnd/src/pages/home/home.html
  72. 3
    0
      cyclingFrontEnd/src/pages/home/home.scss
  73. 14
    0
      cyclingFrontEnd/src/pages/home/home.ts
  74. 31
    0
      cyclingFrontEnd/src/service-worker.js
  75. 88
    0
      cyclingFrontEnd/src/theme/variables.scss
  76. 28
    0
      cyclingFrontEnd/tsconfig.json
  77. 11
    0
      cyclingFrontEnd/tslint.json
  78. 11
    7
      pom.xml
  79. 2
    0
      src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java
  80. 2
    4
      src/main/java/com/passionProject/bikeProject/Controller/UserController.java
  81. 11
    1
      src/main/java/com/passionProject/bikeProject/Entity/User.java
  82. 2
    5
      src/main/java/com/passionProject/bikeProject/Service/UserService.java
  83. 4
    0
      src/main/resources/application.properties
  84. Binārs
      target/bikeProject-0.0.1-SNAPSHOT.jar
  85. Binārs
      target/bikeProject-0.0.1-SNAPSHOT.jar.original
  86. 4
    0
      target/classes/application.properties
  87. Binārs
      target/classes/com/passionproject/bikeproject/BikeprojectApplication.class
  88. Binārs
      target/classes/com/passionproject/bikeproject/Controller/UserController.class
  89. Binārs
      target/classes/com/passionproject/bikeproject/Entity/User.class
  90. Binārs
      target/classes/com/passionproject/bikeproject/Repository/UserRepository.class
  91. Binārs
      target/classes/com/passionproject/bikeproject/Service/UserService.class
  92. 4
    0
      target/maven-archiver/pom.properties
  93. 5
    5
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  94. 5
    5
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  95. 1
    1
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  96. 1
    1
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  97. 65
    0
      target/surefire-reports/TEST-com.passionProject.bikeProject.BikeProjectApplicationTests.xml
  98. 4
    0
      target/surefire-reports/com.passionProject.bikeProject.BikeProjectApplicationTests.txt
  99. 121
    0
      target/surefire/surefire6405345168791754347tmp
  100. 0
    0
      target/surefire/surefire_03634317598468121135tmp

+ 416
- 223
.idea/workspace.xml Parādīt failu

@@ -2,99 +2,93 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="ce6554f5-e00a-4e58-b446-b816ce9d6671" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
26
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml" afterDir="false" />
27
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
28
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
29
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
30
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
31
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" afterDir="false" />
32
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" afterDir="false" />
33
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml" afterDir="false" />
34
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml" afterDir="false" />
35
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml" afterDir="false" />
36
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" afterDir="false" />
37
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" afterDir="false" />
38
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml" afterDir="false" />
39
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
40
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
41
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml" afterDir="false" />
42
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml" afterDir="false" />
43
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml" afterDir="false" />
44
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" afterDir="false" />
45
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml" afterDir="false" />
46
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml" afterDir="false" />
47
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
48
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" afterDir="false" />
49
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
50
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
51
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
52
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
53
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
54
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" afterDir="false" />
55
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
56
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_3_RELEASE.xml" afterDir="false" />
57
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" afterDir="false" />
58
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" afterDir="false" />
59
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml" afterDir="false" />
60
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_3_RELEASE.xml" afterDir="false" />
61
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" afterDir="false" />
62
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" afterDir="false" />
63
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" afterDir="false" />
64
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" afterDir="false" />
65
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" afterDir="false" />
66
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" afterDir="false" />
67
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" afterDir="false" />
68
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
69
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" afterDir="false" />
70
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml" afterDir="false" />
71
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_8_RELEASE.xml" afterDir="false" />
72
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_8_RELEASE.xml" afterDir="false" />
73
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml" afterDir="false" />
74
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
75
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" afterDir="false" />
76
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml" afterDir="false" />
77
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" afterDir="false" />
78
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" afterDir="false" />
79
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" afterDir="false" />
80
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" afterDir="false" />
81
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" afterDir="false" />
82
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" afterDir="false" />
83
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" afterDir="false" />
84
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" afterDir="false" />
85
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" afterDir="false" />
86
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" afterDir="false" />
87
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" afterDir="false" />
88
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" afterDir="false" />
89
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" afterDir="false" />
90
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
91
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
92
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
93
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
94
-      <change afterPath="$PROJECT_DIR$/bikeproject.iml" afterDir="false" />
95
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Controller/UserController.java" afterDir="false" />
96
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Repository/UserRepository.java" afterDir="false" />
97
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Service/UserService.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" beforeDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" beforeDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" beforeDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" beforeDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" beforeDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml" beforeDir="false" />
19
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />
20
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" />
21
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" />
22
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" />
23
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" />
24
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" />
25
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" />
26
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" />
27
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" />
28
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml" beforeDir="false" />
29
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml" beforeDir="false" />
30
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml" beforeDir="false" />
31
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" beforeDir="false" />
32
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml" beforeDir="false" />
33
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml" beforeDir="false" />
34
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" />
35
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />
36
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" />
37
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" />
38
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" beforeDir="false" />
39
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />
40
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_3_RELEASE.xml" beforeDir="false" />
41
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" beforeDir="false" />
42
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" beforeDir="false" />
43
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml" beforeDir="false" />
44
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_3_RELEASE.xml" beforeDir="false" />
45
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" beforeDir="false" />
46
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" beforeDir="false" />
47
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" beforeDir="false" />
48
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" beforeDir="false" />
49
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" beforeDir="false" />
50
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" beforeDir="false" />
51
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" beforeDir="false" />
52
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />
53
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" beforeDir="false" />
54
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml" beforeDir="false" />
55
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_8_RELEASE.xml" beforeDir="false" />
56
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_8_RELEASE.xml" beforeDir="false" />
57
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml" beforeDir="false" />
58
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" beforeDir="false" />
59
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml" beforeDir="false" />
60
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" beforeDir="false" />
61
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" beforeDir="false" />
62
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" beforeDir="false" />
63
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" beforeDir="false" />
64
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" beforeDir="false" />
65
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" beforeDir="false" />
66
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" beforeDir="false" />
67
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" beforeDir="false" />
68
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" beforeDir="false" />
69
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" beforeDir="false" />
70
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" beforeDir="false" />
71
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" />
72
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" />
73
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
74
+      <change beforePath="$PROJECT_DIR$/bikeProject.iml" beforeDir="false" afterPath="$PROJECT_DIR$/bikeProject.iml" afterDir="false" />
75
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
76
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java" afterDir="false" />
77
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" afterDir="false" />
78
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java" afterDir="false" />
79
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java" afterDir="false" />
80
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
81
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
82
+      <change beforePath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/BikeprojectApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/BikeprojectApplication.class" afterDir="false" />
83
+      <change beforePath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Controller/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Controller/UserController.class" afterDir="false" />
84
+      <change beforePath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Entity/User.class" afterDir="false" />
85
+      <change beforePath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Repository/UserRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Repository/UserRepository.class" afterDir="false" />
86
+      <change beforePath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Service/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/passionproject/bikeproject/Service/UserService.class" afterDir="false" />
87
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
88
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
89
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
90
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
91
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/passionproject/bikeproject/BikeprojectApplicationTests.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/passionproject/bikeproject/BikeprojectApplicationTests.class" afterDir="false" />
98 92
     </list>
99 93
     <ignored path="$PROJECT_DIR$/target/" />
100 94
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -105,48 +99,51 @@
105 99
     <option name="LAST_RESOLUTION" value="IGNORE" />
106 100
   </component>
107 101
   <component name="FileEditorManager">
108
-    <leaf>
109
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="true">
110
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Entity/User.java">
102
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
103
+      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
104
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
111 105
           <provider selected="true" editor-type-id="text-editor">
112
-            <state>
113
-              <caret column="15" selection-start-column="15" selection-end-column="15" />
106
+            <state relative-caret-position="209">
107
+              <caret line="34" column="25" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="25" />
114 108
               <folding>
115 109
                 <element signature="imports" expanded="true" />
116
-                <element signature="e#696#697#0" expanded="true" />
117
-                <element signature="e#721#722#0" expanded="true" />
118
-                <element signature="e#755#756#0" expanded="true" />
119
-                <element signature="e#783#784#0" expanded="true" />
120
-                <element signature="e#818#819#0" expanded="true" />
121
-                <element signature="e#849#850#0" expanded="true" />
122
-                <element signature="e#897#898#0" expanded="true" />
123
-                <element signature="e#937#938#0" expanded="true" />
124
-                <element signature="e#973#974#0" expanded="true" />
125
-                <element signature="e#1005#1006#0" expanded="true" />
126
-                <element signature="e#1055#1056#0" expanded="true" />
127
-                <element signature="e#1097#1098#0" expanded="true" />
128
-                <element signature="e#1132#1133#0" expanded="true" />
129
-                <element signature="e#1163#1164#0" expanded="true" />
130
-                <element signature="e#1211#1212#0" expanded="true" />
131
-                <element signature="e#1251#1252#0" expanded="true" />
132
-                <element signature="e#1286#1287#0" expanded="true" />
133
-                <element signature="e#1317#1318#0" expanded="true" />
134
-                <element signature="e#1365#1366#0" expanded="true" />
135
-                <element signature="e#1405#1406#0" expanded="true" />
136
-                <element signature="e#1437#1438#0" expanded="true" />
137
-                <element signature="e#1465#1466#0" expanded="true" />
138
-                <element signature="e#1507#1508#0" expanded="true" />
139
-                <element signature="e#1541#1542#0" expanded="true" />
110
+                <element signature="e#862#863#0" expanded="true" />
111
+                <element signature="e#896#897#0" expanded="true" />
112
+                <element signature="e#924#925#0" expanded="true" />
113
+                <element signature="e#959#960#0" expanded="true" />
114
+                <element signature="e#990#991#0" expanded="true" />
115
+                <element signature="e#1038#1039#0" expanded="true" />
116
+                <element signature="e#1078#1079#0" expanded="true" />
117
+                <element signature="e#1114#1115#0" expanded="true" />
118
+                <element signature="e#1146#1147#0" expanded="true" />
119
+                <element signature="e#1196#1197#0" expanded="true" />
120
+                <element signature="e#1238#1239#0" expanded="true" />
121
+                <element signature="e#1273#1274#0" expanded="true" />
122
+                <element signature="e#1304#1305#0" expanded="true" />
123
+                <element signature="e#1352#1353#0" expanded="true" />
124
+                <element signature="e#1392#1393#0" expanded="true" />
125
+                <element signature="e#1427#1428#0" expanded="true" />
126
+                <element signature="e#1458#1459#0" expanded="true" />
127
+                <element signature="e#1506#1507#0" expanded="true" />
128
+                <element signature="e#1546#1547#0" expanded="true" />
129
+                <element signature="e#1578#1579#0" expanded="true" />
130
+                <element signature="e#1606#1607#0" expanded="true" />
131
+                <element signature="e#1648#1649#0" expanded="true" />
132
+                <element signature="e#1682#1683#0" expanded="true" />
133
+                <element signature="e#1722#1723#0" expanded="true" />
134
+                <element signature="e#1758#1759#0" expanded="true" />
135
+                <element signature="e#1816#1817#0" expanded="true" />
136
+                <element signature="e#1866#1867#0" expanded="true" />
140 137
               </folding>
141 138
             </state>
142 139
           </provider>
143 140
         </entry>
144 141
       </file>
145 142
       <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
146
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Controller/UserController.java">
143
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
147 144
           <provider selected="true" editor-type-id="text-editor">
148
-            <state relative-caret-position="240">
149
-              <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
145
+            <state relative-caret-position="480">
146
+              <caret line="32" column="62" selection-start-line="32" selection-start-column="62" selection-end-line="32" selection-end-column="62" />
150 147
               <folding>
151 148
                 <element signature="imports" expanded="true" />
152 149
               </folding>
@@ -154,33 +151,43 @@
154 151
           </provider>
155 152
         </entry>
156 153
       </file>
157
-      <file leaf-file-name="UserService.java" pinned="false" current-in-tab="false">
158
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Service/UserService.java">
154
+      <file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="true">
155
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
159 156
           <provider selected="true" editor-type-id="text-editor">
160
-            <state relative-caret-position="495">
161
-              <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
157
+            <state relative-caret-position="180">
158
+              <caret line="12" selection-start-line="12" selection-end-line="12" />
162 159
               <folding>
163 160
                 <element signature="imports" expanded="true" />
164
-                <element signature="e#348#349#0" expanded="true" />
165
-                <element signature="e#404#405#0" expanded="true" />
166
-                <element signature="e#445#446#0" expanded="true" />
167
-                <element signature="e#481#482#0" expanded="true" />
168
-                <element signature="e#538#539#0" expanded="true" />
169
-                <element signature="e#574#575#0" expanded="true" />
170
-                <element signature="e#637#638#0" expanded="true" />
171
-                <element signature="e#658#659#0" expanded="true" />
172
-                <element signature="e#740#741#0" expanded="true" />
173
-                <element signature="e#776#777#0" expanded="true" />
161
+                <element signature="e#267#268#0" expanded="true" />
162
+                <element signature="e#340#341#0" expanded="true" />
174 163
               </folding>
175 164
             </state>
176 165
           </provider>
177 166
         </entry>
178 167
       </file>
168
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
169
+        <entry file="file://$PROJECT_DIR$/pom.xml">
170
+          <provider selected="true" editor-type-id="text-editor">
171
+            <state relative-caret-position="120">
172
+              <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="10" selection-end-column="11" />
173
+            </state>
174
+          </provider>
175
+        </entry>
176
+      </file>
177
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
178
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
179
+          <provider selected="true" editor-type-id="text-editor">
180
+            <state relative-caret-position="45">
181
+              <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
182
+            </state>
183
+          </provider>
184
+        </entry>
185
+      </file>
179 186
       <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
180
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Repository/UserRepository.java">
187
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
181 188
           <provider selected="true" editor-type-id="text-editor">
182 189
             <state relative-caret-position="105">
183
-              <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
190
+              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
184 191
               <folding>
185 192
                 <element signature="imports" expanded="true" />
186 193
               </folding>
@@ -198,6 +205,17 @@
198 205
       </list>
199 206
     </option>
200 207
   </component>
208
+  <component name="FindInProjectRecents">
209
+    <findStrings>
210
+      <find>my</find>
211
+      <find>sql</find>
212
+      <find>jpa</find>
213
+      <find>version</find>
214
+      <find>data-</find>
215
+      <find>project</find>
216
+      <find>spring</find>
217
+    </findStrings>
218
+  </component>
201 219
   <component name="Git.Settings">
202 220
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
203 221
   </component>
@@ -208,6 +226,15 @@
208 226
         <option value="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Service/UserService.java" />
209 227
         <option value="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Controller/UserController.java" />
210 228
         <option value="$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Repository/UserRepository.java" />
229
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeproject/BikeprojectApplication.java" />
230
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeprojectApplication.java" />
231
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java" />
232
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java" />
233
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" />
234
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
235
+        <option value="$PROJECT_DIR$/pom.xml" />
236
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java" />
237
+        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java" />
211 238
       </list>
212 239
     </option>
213 240
   </component>
@@ -217,14 +244,24 @@
217 244
     <detection-done>true</detection-done>
218 245
     <sorting>DEFINITION_ORDER</sorting>
219 246
   </component>
247
+  <component name="MavenImportPreferences">
248
+    <option name="importingSettings">
249
+      <MavenImportingSettings>
250
+        <option name="importAutomatically" value="true" />
251
+      </MavenImportingSettings>
252
+    </option>
253
+  </component>
254
+  <component name="NodeModulesDirectoryManager">
255
+    <handled-path value="$PROJECT_DIR$/cyclingFrontEnd/node_modules" />
256
+  </component>
220 257
   <component name="NodePackageJsonFileManager">
221
-    <packageJsonPaths />
258
+    <packageJsonPaths>
259
+      <path value="$PROJECT_DIR$/cyclingFrontEnd/package.json" />
260
+    </packageJsonPaths>
222 261
   </component>
223 262
   <component name="ProjectFrameBounds" fullScreen="true">
224
-    <option name="x" value="-246" />
225
-    <option name="y" value="-1080" />
226
-    <option name="width" value="1920" />
227
-    <option name="height" value="1080" />
263
+    <option name="width" value="1440" />
264
+    <option name="height" value="900" />
228 265
   </component>
229 266
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
230 267
   <component name="ProjectView">
@@ -232,8 +269,6 @@
232 269
       <foldersAlwaysOnTop value="true" />
233 270
     </navigator>
234 271
     <panes>
235
-      <pane id="Scope" />
236
-      <pane id="PackagesPane" />
237 272
       <pane id="ProjectPane">
238 273
         <subPane>
239 274
           <expand>
@@ -274,7 +309,7 @@
274 309
               <item name="main" type="462c0819:PsiDirectoryNode" />
275 310
               <item name="java" type="462c0819:PsiDirectoryNode" />
276 311
               <item name="com" type="462c0819:PsiDirectoryNode" />
277
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
312
+              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
278 313
             </path>
279 314
             <path>
280 315
               <item name="bikeproject" type="b2602c69:ProjectViewProjectNode" />
@@ -283,8 +318,8 @@
283 318
               <item name="main" type="462c0819:PsiDirectoryNode" />
284 319
               <item name="java" type="462c0819:PsiDirectoryNode" />
285 320
               <item name="com" type="462c0819:PsiDirectoryNode" />
286
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
287
-              <item name="bikeproject" type="462c0819:PsiDirectoryNode" />
321
+              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
322
+              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
288 323
             </path>
289 324
             <path>
290 325
               <item name="bikeproject" type="b2602c69:ProjectViewProjectNode" />
@@ -293,8 +328,8 @@
293 328
               <item name="main" type="462c0819:PsiDirectoryNode" />
294 329
               <item name="java" type="462c0819:PsiDirectoryNode" />
295 330
               <item name="com" type="462c0819:PsiDirectoryNode" />
296
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
297
-              <item name="bikeproject" type="462c0819:PsiDirectoryNode" />
331
+              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
332
+              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
298 333
               <item name="Controller" type="462c0819:PsiDirectoryNode" />
299 334
             </path>
300 335
             <path>
@@ -304,8 +339,8 @@
304 339
               <item name="main" type="462c0819:PsiDirectoryNode" />
305 340
               <item name="java" type="462c0819:PsiDirectoryNode" />
306 341
               <item name="com" type="462c0819:PsiDirectoryNode" />
307
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
308
-              <item name="bikeproject" type="462c0819:PsiDirectoryNode" />
342
+              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
343
+              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
309 344
               <item name="Entity" type="462c0819:PsiDirectoryNode" />
310 345
             </path>
311 346
             <path>
@@ -315,8 +350,8 @@
315 350
               <item name="main" type="462c0819:PsiDirectoryNode" />
316 351
               <item name="java" type="462c0819:PsiDirectoryNode" />
317 352
               <item name="com" type="462c0819:PsiDirectoryNode" />
318
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
319
-              <item name="bikeproject" type="462c0819:PsiDirectoryNode" />
353
+              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
354
+              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
320 355
               <item name="Repository" type="462c0819:PsiDirectoryNode" />
321 356
             </path>
322 357
             <path>
@@ -324,27 +359,31 @@
324 359
               <item name="CyclingApp" type="462c0819:PsiDirectoryNode" />
325 360
               <item name="src" type="462c0819:PsiDirectoryNode" />
326 361
               <item name="main" type="462c0819:PsiDirectoryNode" />
327
-              <item name="java" type="462c0819:PsiDirectoryNode" />
328
-              <item name="com" type="462c0819:PsiDirectoryNode" />
329
-              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
330
-              <item name="bikeproject" type="462c0819:PsiDirectoryNode" />
331
-              <item name="Service" type="462c0819:PsiDirectoryNode" />
362
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
332 363
             </path>
333 364
           </expand>
334 365
           <select />
335 366
         </subPane>
336 367
       </pane>
337 368
       <pane id="AndroidView" />
369
+      <pane id="PackagesPane" />
370
+      <pane id="Scope" />
338 371
     </panes>
339 372
   </component>
340 373
   <component name="PropertiesComponent">
374
+    <property name="RequestMappingsPanelOrder0" value="0" />
375
+    <property name="RequestMappingsPanelOrder1" value="1" />
376
+    <property name="RequestMappingsPanelOrder2" value="2" />
377
+    <property name="RequestMappingsPanelWidth0" value="75" />
378
+    <property name="RequestMappingsPanelWidth1" value="75" />
379
+    <property name="RequestMappingsPanelWidth2" value="15" />
341 380
     <property name="WebServerToolWindowFactoryState" value="false" />
342 381
     <property name="aspect.path.notification.shown" value="true" />
343 382
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
344 383
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
345 384
     <property name="project.structure.last.edited" value="Problems" />
346 385
     <property name="project.structure.proportion" value="0.0" />
347
-    <property name="project.structure.side.proportion" value="0.0" />
386
+    <property name="project.structure.side.proportion" value="0.2" />
348 387
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
349 388
   </component>
350 389
   <component name="RunDashboard">
@@ -416,15 +455,16 @@
416 455
       <option name="number" value="Default" />
417 456
       <option name="presentableId" value="Default" />
418 457
       <updated>1531838523932</updated>
419
-      <workItem from="1531838525545" duration="3850000" />
458
+      <workItem from="1531838525545" duration="9239000" />
459
+      <workItem from="1531940509985" duration="4373000" />
420 460
     </task>
421 461
     <servers />
422 462
   </component>
423 463
   <component name="TimeTrackingManager">
424
-    <option name="totallyTimeSpent" value="3850000" />
464
+    <option name="totallyTimeSpent" value="13612000" />
425 465
   </component>
426 466
   <component name="ToolWindowManager">
427
-    <frame x="-246" y="-1080" width="1920" height="1080" extended-state="0" />
467
+    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
428 468
     <editor active="true" />
429 469
     <layout>
430 470
       <window_info anchor="right" id="Palette" order="6" />
@@ -437,27 +477,28 @@
437 477
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
438 478
       <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
439 479
       <window_info id="UI Designer" order="2" />
440
-      <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
480
+      <window_info anchor="bottom" id="Debug" order="9" weight="0.48727274" />
441 481
       <window_info anchor="bottom" id="TODO" order="12" />
482
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32935324" />
442 483
       <window_info anchor="right" id="Palette&#9;" order="3" />
443 484
       <window_info id="Image Layers" order="1" />
444 485
       <window_info anchor="bottom" id="Java Enterprise" order="2" />
445 486
       <window_info anchor="right" id="Capture Analysis" order="1" />
446
-      <window_info anchor="bottom" id="Run" order="8" />
447
-      <window_info anchor="bottom" id="Version Control" order="4" />
448
-      <window_info anchor="bottom" id="Spring" order="0" />
449
-      <window_info anchor="bottom" id="Terminal" order="1" />
450
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.185836" />
487
+      <window_info anchor="bottom" id="Version Control" order="4" weight="0.32969698" />
488
+      <window_info anchor="bottom" id="Run" order="8" weight="0.32935324" />
489
+      <window_info anchor="bottom" id="Spring" order="0" weight="0.32969698" />
490
+      <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.5224242" />
491
+      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.25178826" />
451 492
       <window_info anchor="right" id="Bean Validation" order="5" />
452 493
       <window_info id="Web" order="4" side_tool="true" />
453 494
       <window_info anchor="right" id="Theme Preview" order="4" />
454 495
       <window_info id="Favorites" order="3" side_tool="true" />
455
-      <window_info anchor="bottom" id="Find" order="6" />
456
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" />
457 496
       <window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
458
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
459
-      <window_info anchor="bottom" id="Message" order="5" />
497
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" />
460 498
       <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
499
+      <window_info anchor="bottom" id="Message" order="5" />
500
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
501
+      <window_info anchor="bottom" id="Find" order="6" weight="0.32935324" />
461 502
     </layout>
462 503
   </component>
463 504
   <component name="TypeScriptGeneratedFilesManager">
@@ -466,80 +507,194 @@
466 507
   <component name="VcsContentAnnotationSettings">
467 508
     <option name="myLimit" value="2678400000" />
468 509
   </component>
510
+  <component name="XDebuggerManager">
511
+    <breakpoint-manager>
512
+      <option name="time" value="1" />
513
+    </breakpoint-manager>
514
+  </component>
469 515
   <component name="editorHistoryManager">
470
-    <entry file="file://$PROJECT_DIR$/bikeproject.iml">
516
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
517
+      <provider selected="true" editor-type-id="text-editor">
518
+        <state relative-caret-position="360">
519
+          <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
520
+          <folding>
521
+            <element signature="imports" expanded="true" />
522
+            <element signature="e#862#863#0" expanded="true" />
523
+            <element signature="e#896#897#0" expanded="true" />
524
+            <element signature="e#924#925#0" expanded="true" />
525
+            <element signature="e#959#960#0" expanded="true" />
526
+            <element signature="e#990#991#0" expanded="true" />
527
+            <element signature="e#1038#1039#0" expanded="true" />
528
+            <element signature="e#1078#1079#0" expanded="true" />
529
+            <element signature="e#1114#1115#0" expanded="true" />
530
+            <element signature="e#1146#1147#0" expanded="true" />
531
+            <element signature="e#1196#1197#0" expanded="true" />
532
+            <element signature="e#1238#1239#0" expanded="true" />
533
+            <element signature="e#1273#1274#0" expanded="true" />
534
+            <element signature="e#1304#1305#0" expanded="true" />
535
+            <element signature="e#1352#1353#0" expanded="true" />
536
+            <element signature="e#1392#1393#0" expanded="true" />
537
+            <element signature="e#1427#1428#0" expanded="true" />
538
+            <element signature="e#1458#1459#0" expanded="true" />
539
+            <element signature="e#1506#1507#0" expanded="true" />
540
+            <element signature="e#1546#1547#0" expanded="true" />
541
+            <element signature="e#1578#1579#0" expanded="true" />
542
+            <element signature="e#1606#1607#0" expanded="true" />
543
+            <element signature="e#1648#1649#0" expanded="true" />
544
+            <element signature="e#1682#1683#0" expanded="true" />
545
+            <element signature="e#1722#1723#0" expanded="true" />
546
+            <element signature="e#1758#1759#0" expanded="true" />
547
+            <element signature="e#1816#1817#0" expanded="true" />
548
+            <element signature="e#1866#1867#0" expanded="true" />
549
+          </folding>
550
+        </state>
551
+      </provider>
552
+    </entry>
553
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
554
+      <provider selected="true" editor-type-id="text-editor">
555
+        <state relative-caret-position="60">
556
+          <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
557
+          <folding>
558
+            <element signature="imports" expanded="true" />
559
+          </folding>
560
+        </state>
561
+      </provider>
562
+    </entry>
563
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java">
564
+      <provider selected="true" editor-type-id="text-editor">
565
+        <state relative-caret-position="210">
566
+          <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
567
+          <folding>
568
+            <element signature="imports" expanded="true" />
569
+            <element signature="e#578#579#0" expanded="true" />
570
+            <element signature="e#640#641#0" expanded="true" />
571
+          </folding>
572
+        </state>
573
+      </provider>
574
+    </entry>
575
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
576
+      <provider selected="true" editor-type-id="text-editor">
577
+        <state relative-caret-position="135">
578
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
579
+          <folding>
580
+            <element signature="imports" expanded="true" />
581
+          </folding>
582
+        </state>
583
+      </provider>
584
+    </entry>
585
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
586
+      <provider selected="true" editor-type-id="text-editor">
587
+        <state relative-caret-position="135">
588
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
589
+          <folding>
590
+            <element signature="imports" expanded="true" />
591
+            <element signature="e#267#268#0" expanded="true" />
592
+            <element signature="e#340#341#0" expanded="true" />
593
+          </folding>
594
+        </state>
595
+      </provider>
596
+    </entry>
597
+    <entry file="file://$PROJECT_DIR$/bikeProject.iml">
471 598
       <provider selected="true" editor-type-id="text-editor" />
472 599
     </entry>
473
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Controller/UserController.java">
600
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Service/UserService.java">
474 601
       <provider selected="true" editor-type-id="text-editor">
475
-        <state relative-caret-position="240">
476
-          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
602
+        <state relative-caret-position="210">
603
+          <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
477 604
           <folding>
478 605
             <element signature="imports" expanded="true" />
606
+            <element signature="e#578#579#0" expanded="true" />
607
+            <element signature="e#640#641#0" expanded="true" />
479 608
           </folding>
480 609
         </state>
481 610
       </provider>
482 611
     </entry>
483
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Repository/UserRepository.java">
612
+    <entry file="file://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-dependencies/2.0.3.RELEASE/spring-boot-dependencies-2.0.3.RELEASE.pom">
484 613
       <provider selected="true" editor-type-id="text-editor">
485
-        <state relative-caret-position="105">
486
-          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
614
+        <state relative-caret-position="40">
615
+          <caret line="985" column="46" selection-start-line="985" selection-start-column="46" selection-end-line="985" selection-end-column="46" />
616
+        </state>
617
+      </provider>
618
+    </entry>
619
+    <entry file="file://$PROJECT_DIR$/pom.xml">
620
+      <provider selected="true" editor-type-id="text-editor">
621
+        <state relative-caret-position="120">
622
+          <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="10" selection-end-column="11" />
623
+        </state>
624
+      </provider>
625
+    </entry>
626
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
627
+      <provider selected="true" editor-type-id="text-editor">
628
+        <state relative-caret-position="45">
629
+          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
630
+        </state>
631
+      </provider>
632
+    </entry>
633
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
634
+      <provider selected="true" editor-type-id="text-editor">
635
+        <state relative-caret-position="209">
636
+          <caret line="34" column="25" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="25" />
637
+          <folding>
638
+            <element signature="imports" expanded="true" />
639
+            <element signature="e#862#863#0" expanded="true" />
640
+            <element signature="e#896#897#0" expanded="true" />
641
+            <element signature="e#924#925#0" expanded="true" />
642
+            <element signature="e#959#960#0" expanded="true" />
643
+            <element signature="e#990#991#0" expanded="true" />
644
+            <element signature="e#1038#1039#0" expanded="true" />
645
+            <element signature="e#1078#1079#0" expanded="true" />
646
+            <element signature="e#1114#1115#0" expanded="true" />
647
+            <element signature="e#1146#1147#0" expanded="true" />
648
+            <element signature="e#1196#1197#0" expanded="true" />
649
+            <element signature="e#1238#1239#0" expanded="true" />
650
+            <element signature="e#1273#1274#0" expanded="true" />
651
+            <element signature="e#1304#1305#0" expanded="true" />
652
+            <element signature="e#1352#1353#0" expanded="true" />
653
+            <element signature="e#1392#1393#0" expanded="true" />
654
+            <element signature="e#1427#1428#0" expanded="true" />
655
+            <element signature="e#1458#1459#0" expanded="true" />
656
+            <element signature="e#1506#1507#0" expanded="true" />
657
+            <element signature="e#1546#1547#0" expanded="true" />
658
+            <element signature="e#1578#1579#0" expanded="true" />
659
+            <element signature="e#1606#1607#0" expanded="true" />
660
+            <element signature="e#1648#1649#0" expanded="true" />
661
+            <element signature="e#1682#1683#0" expanded="true" />
662
+            <element signature="e#1722#1723#0" expanded="true" />
663
+            <element signature="e#1758#1759#0" expanded="true" />
664
+            <element signature="e#1816#1817#0" expanded="true" />
665
+            <element signature="e#1866#1867#0" expanded="true" />
666
+          </folding>
667
+        </state>
668
+      </provider>
669
+    </entry>
670
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
671
+      <provider selected="true" editor-type-id="text-editor">
672
+        <state relative-caret-position="480">
673
+          <caret line="32" column="62" selection-start-line="32" selection-start-column="62" selection-end-line="32" selection-end-column="62" />
487 674
           <folding>
488 675
             <element signature="imports" expanded="true" />
489 676
           </folding>
490 677
         </state>
491 678
       </provider>
492 679
     </entry>
493
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Service/UserService.java">
680
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
494 681
       <provider selected="true" editor-type-id="text-editor">
495
-        <state relative-caret-position="495">
496
-          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
682
+        <state relative-caret-position="105">
683
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
497 684
           <folding>
498 685
             <element signature="imports" expanded="true" />
499
-            <element signature="e#348#349#0" expanded="true" />
500
-            <element signature="e#404#405#0" expanded="true" />
501
-            <element signature="e#445#446#0" expanded="true" />
502
-            <element signature="e#481#482#0" expanded="true" />
503
-            <element signature="e#538#539#0" expanded="true" />
504
-            <element signature="e#574#575#0" expanded="true" />
505
-            <element signature="e#637#638#0" expanded="true" />
506
-            <element signature="e#658#659#0" expanded="true" />
507
-            <element signature="e#740#741#0" expanded="true" />
508
-            <element signature="e#776#777#0" expanded="true" />
509 686
           </folding>
510 687
         </state>
511 688
       </provider>
512 689
     </entry>
513
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionproject/bikeproject/Entity/User.java">
690
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
514 691
       <provider selected="true" editor-type-id="text-editor">
515
-        <state>
516
-          <caret column="15" selection-start-column="15" selection-end-column="15" />
692
+        <state relative-caret-position="180">
693
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
517 694
           <folding>
518 695
             <element signature="imports" expanded="true" />
519
-            <element signature="e#696#697#0" expanded="true" />
520
-            <element signature="e#721#722#0" expanded="true" />
521
-            <element signature="e#755#756#0" expanded="true" />
522
-            <element signature="e#783#784#0" expanded="true" />
523
-            <element signature="e#818#819#0" expanded="true" />
524
-            <element signature="e#849#850#0" expanded="true" />
525
-            <element signature="e#897#898#0" expanded="true" />
526
-            <element signature="e#937#938#0" expanded="true" />
527
-            <element signature="e#973#974#0" expanded="true" />
528
-            <element signature="e#1005#1006#0" expanded="true" />
529
-            <element signature="e#1055#1056#0" expanded="true" />
530
-            <element signature="e#1097#1098#0" expanded="true" />
531
-            <element signature="e#1132#1133#0" expanded="true" />
532
-            <element signature="e#1163#1164#0" expanded="true" />
533
-            <element signature="e#1211#1212#0" expanded="true" />
534
-            <element signature="e#1251#1252#0" expanded="true" />
535
-            <element signature="e#1286#1287#0" expanded="true" />
536
-            <element signature="e#1317#1318#0" expanded="true" />
537
-            <element signature="e#1365#1366#0" expanded="true" />
538
-            <element signature="e#1405#1406#0" expanded="true" />
539
-            <element signature="e#1437#1438#0" expanded="true" />
540
-            <element signature="e#1465#1466#0" expanded="true" />
541
-            <element signature="e#1507#1508#0" expanded="true" />
542
-            <element signature="e#1541#1542#0" expanded="true" />
696
+            <element signature="e#267#268#0" expanded="true" />
697
+            <element signature="e#340#341#0" expanded="true" />
543 698
           </folding>
544 699
         </state>
545 700
       </provider>
@@ -547,6 +702,30 @@
547 702
   </component>
548 703
   <component name="masterDetails">
549 704
     <states>
705
+      <state key="ArtifactsStructureConfigurable.UI">
706
+        <settings>
707
+          <artifact-editor />
708
+          <splitter-proportions>
709
+            <option name="proportions">
710
+              <list>
711
+                <option value="0.2" />
712
+              </list>
713
+            </option>
714
+          </splitter-proportions>
715
+        </settings>
716
+      </state>
717
+      <state key="FacetStructureConfigurable.UI">
718
+        <settings>
719
+          <last-edited>Spring</last-edited>
720
+          <splitter-proportions>
721
+            <option name="proportions">
722
+              <list>
723
+                <option value="0.2" />
724
+              </list>
725
+            </option>
726
+          </splitter-proportions>
727
+        </settings>
728
+      </state>
550 729
       <state key="GlobalLibrariesConfigurable.UI">
551 730
         <settings>
552 731
           <splitter-proportions>
@@ -570,8 +749,22 @@
570 749
           </splitter-proportions>
571 750
         </settings>
572 751
       </state>
752
+      <state key="ModuleStructureConfigurable.UI">
753
+        <settings>
754
+          <last-edited>bikeProject</last-edited>
755
+          <splitter-proportions>
756
+            <option name="proportions">
757
+              <list>
758
+                <option value="0.2" />
759
+                <option value="0.6" />
760
+              </list>
761
+            </option>
762
+          </splitter-proportions>
763
+        </settings>
764
+      </state>
573 765
       <state key="ProjectLibrariesConfigurable.UI">
574 766
         <settings>
767
+          <last-edited />
575 768
           <splitter-proportions>
576 769
             <option name="proportions">
577 770
               <list>

+ 26
- 26
bikeProject.iml Parādīt failu

@@ -25,7 +25,7 @@
25 25
     </content>
26 26
     <orderEntry type="inheritedJdk" />
27 27
     <orderEntry type="sourceFolder" forTests="false" />
28
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.3.RELEASE" level="project" />
28
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:2.0.3.RELEASE" level="project" />
29 29
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
30 30
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE" level="project" />
31 31
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
@@ -35,31 +35,6 @@
35 35
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
36 36
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
37 37
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
38
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.3.RELEASE" level="project" />
39
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
40
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
41
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
42
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
43
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
44
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.17.Final" level="project" />
45
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
46
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final" level="project" />
47
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.22.0-GA" level="project" />
48
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
49
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
50
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
51
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
52
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
53
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
54
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.0.8.RELEASE" level="project" />
55
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
56
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.7.RELEASE" level="project" />
57
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.7.RELEASE" level="project" />
58
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
59
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
60
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
61
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.7.RELEASE" level="project" />
62
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:2.0.3.RELEASE" level="project" />
63 38
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.3.RELEASE" level="project" />
64 39
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
65 40
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
@@ -72,6 +47,7 @@
72 47
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
73 48
     <orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
74 49
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
50
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
75 51
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
76 52
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.3.RELEASE" level="project" />
77 53
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.31" level="project" />
@@ -79,8 +55,13 @@
79 55
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.31" level="project" />
80 56
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.10.Final" level="project" />
81 57
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
58
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
59
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
82 60
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.7.RELEASE" level="project" />
61
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
83 62
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.7.RELEASE" level="project" />
63
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
64
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.7.RELEASE" level="project" />
84 65
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
85 66
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.3.RELEASE" level="project" />
86 67
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
@@ -107,5 +88,24 @@
107 88
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
108 89
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.7.RELEASE" level="project" />
109 90
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
91
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.3.RELEASE" level="project" />
92
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.3.RELEASE" level="project" />
93
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
94
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
95
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
96
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
97
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.17.Final" level="project" />
98
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final" level="project" />
99
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.22.0-GA" level="project" />
100
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
101
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
102
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
103
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
104
+    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
105
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.0.8.RELEASE" level="project" />
106
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
107
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.7.RELEASE" level="project" />
108
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
109
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.7.RELEASE" level="project" />
110 110
   </component>
111 111
 </module>

+ 17
- 0
cyclingFrontEnd/.editorconfig Parādīt failu

@@ -0,0 +1,17 @@
1
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
2
+# editorconfig.org
3
+
4
+root = true
5
+
6
+[*]
7
+indent_style = space
8
+indent_size = 2
9
+
10
+# We recommend you to keep these unchanged
11
+end_of_line = lf
12
+charset = utf-8
13
+trim_trailing_whitespace = true
14
+insert_final_newline = true
15
+
16
+[*.md]
17
+trim_trailing_whitespace = false

+ 35
- 0
cyclingFrontEnd/.gitignore Parādīt failu

@@ -0,0 +1,35 @@
1
+# Specifies intentionally untracked files to ignore when using Git
2
+# http://git-scm.com/docs/gitignore
3
+
4
+*~
5
+*.sw[mnpcod]
6
+*.log
7
+*.tmp
8
+*.tmp.*
9
+log.txt
10
+*.sublime-project
11
+*.sublime-workspace
12
+.vscode/
13
+npm-debug.log*
14
+
15
+.idea/
16
+.sourcemaps/
17
+.sass-cache/
18
+.tmp/
19
+.versions/
20
+coverage/
21
+dist/
22
+node_modules/
23
+tmp/
24
+temp/
25
+hooks/
26
+platforms/
27
+plugins/
28
+plugins/android.json
29
+plugins/ios.json
30
+www/
31
+$RECYCLE.BIN/
32
+
33
+.DS_Store
34
+Thumbs.db
35
+UserInterfaceState.xcuserstate

+ 84
- 0
cyclingFrontEnd/config.xml Parādīt failu

@@ -0,0 +1,84 @@
1
+<?xml version='1.0' encoding='utf-8'?>
2
+<widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3
+    <name>cyclingFrontEnd</name>
4
+    <description>An awesome Ionic/Cordova app.</description>
5
+    <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
6
+    <content src="index.html" />
7
+    <access origin="*" />
8
+    <allow-intent href="http://*/*" />
9
+    <allow-intent href="https://*/*" />
10
+    <allow-intent href="tel:*" />
11
+    <allow-intent href="sms:*" />
12
+    <allow-intent href="mailto:*" />
13
+    <allow-intent href="geo:*" />
14
+    <preference name="ScrollEnabled" value="false" />
15
+    <preference name="android-minSdkVersion" value="19" />
16
+    <preference name="BackupWebStorage" value="none" />
17
+    <preference name="SplashMaintainAspectRatio" value="true" />
18
+    <preference name="FadeSplashScreenDuration" value="300" />
19
+    <preference name="SplashShowOnlyFirstTime" value="false" />
20
+    <preference name="SplashScreen" value="screen" />
21
+    <preference name="SplashScreenDelay" value="3000" />
22
+    <platform name="android">
23
+        <allow-intent href="market:*" />
24
+        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
25
+        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
26
+        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
27
+        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
28
+        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
29
+        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
30
+        <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
31
+        <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
32
+        <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
33
+        <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
34
+        <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
35
+        <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
36
+        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
37
+        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
38
+        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
39
+        <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
40
+        <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
41
+        <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
42
+    </platform>
43
+    <platform name="ios">
44
+        <allow-intent href="itms:*" />
45
+        <allow-intent href="itms-apps:*" />
46
+        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
47
+        <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
48
+        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
49
+        <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
50
+        <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
51
+        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
52
+        <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
53
+        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
54
+        <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
55
+        <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
56
+        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
57
+        <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
58
+        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
59
+        <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
60
+        <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
61
+        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
62
+        <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
63
+        <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
64
+        <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
65
+        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
66
+        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
67
+        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
68
+        <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
69
+        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
70
+        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
71
+        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
72
+        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
73
+        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
74
+        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
75
+        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
76
+        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
77
+        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
78
+    </platform>
79
+    <plugin name="cordova-plugin-whitelist" spec="1.3.3" />
80
+    <plugin name="cordova-plugin-device" spec="2.0.2" />
81
+    <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
82
+    <plugin name="cordova-plugin-ionic-webview" spec="1.1.19" />
83
+    <plugin name="cordova-plugin-ionic-keyboard" spec="2.0.5" />
84
+</widget>

+ 8
- 0
cyclingFrontEnd/ionic.config.json Parādīt failu

@@ -0,0 +1,8 @@
1
+{
2
+  "name": "cyclingFrontEnd",
3
+  "app_id": "",
4
+  "type": "ionic-angular",
5
+  "integrations": {
6
+    "cordova": {}
7
+  }
8
+}

+ 6504
- 0
cyclingFrontEnd/package-lock.json
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 38
- 0
cyclingFrontEnd/package.json Parādīt failu

@@ -0,0 +1,38 @@
1
+{
2
+  "name": "cyclingFrontEnd",
3
+  "version": "0.0.1",
4
+  "author": "Ionic Framework",
5
+  "homepage": "http://ionicframework.com/",
6
+  "private": true,
7
+  "scripts": {
8
+    "start": "ionic-app-scripts serve",
9
+    "clean": "ionic-app-scripts clean",
10
+    "build": "ionic-app-scripts build",
11
+    "lint": "ionic-app-scripts lint"
12
+  },
13
+  "dependencies": {
14
+    "@angular/animations": "5.2.11",
15
+    "@angular/common": "5.2.11",
16
+    "@angular/compiler": "5.2.11",
17
+    "@angular/compiler-cli": "5.2.11",
18
+    "@angular/core": "5.2.11",
19
+    "@angular/forms": "5.2.11",
20
+    "@angular/http": "5.2.11",
21
+    "@angular/platform-browser": "5.2.11",
22
+    "@angular/platform-browser-dynamic": "5.2.11",
23
+    "@ionic-native/core": "~4.9.2",
24
+    "@ionic-native/splash-screen": "~4.9.2",
25
+    "@ionic-native/status-bar": "~4.9.2",
26
+    "@ionic/storage": "2.1.3",
27
+    "ionic-angular": "3.9.2",
28
+    "ionicons": "3.0.0",
29
+    "rxjs": "5.5.11",
30
+    "sw-toolbox": "3.6.0",
31
+    "zone.js": "0.8.26"
32
+  },
33
+  "devDependencies": {
34
+    "@ionic/app-scripts": "3.1.11",
35
+    "typescript": "~2.6.2"
36
+  },
37
+  "description": "An Ionic project"
38
+}

+ 8
- 0
cyclingFrontEnd/resources/README.md Parādīt failu

@@ -0,0 +1,8 @@
1
+These are Cordova resources. You can replace icon.png and splash.png and run
2
+`ionic cordova resources` to generate custom icons and splash screens for your
3
+app. See `ionic cordova resources --help` for details.
4
+
5
+Cordova reference documentation:
6
+
7
+- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html
8
+- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/

Binārs
cyclingFrontEnd/resources/android/icon/drawable-hdpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/icon/drawable-ldpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/icon/drawable-mdpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/icon/drawable-xhdpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/icon/drawable-xxhdpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/icon/drawable-xxxhdpi-icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-hdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-ldpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-mdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-xhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-xxhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-land-xxxhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-hdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-ldpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-mdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-xhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-xxhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/android/splash/drawable-port-xxxhdpi-screen.png Parādīt failu


Binārs
cyclingFrontEnd/resources/icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-1024.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-40.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-40@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-40@3x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-50.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-50@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-60.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-60@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-60@3x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-72.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-72@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-76.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-76@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-83.5@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-small.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-small@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon-small@3x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/icon/icon@2x.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-568h@2x~iphone.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-667h.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-736h.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Landscape-736h.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Landscape@2x~ipad.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Landscape@~ipadpro.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Landscape~ipad.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Portrait@2x~ipad.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Portrait@~ipadpro.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default-Portrait~ipad.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default@2x~iphone.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default@2x~universal~anyany.png Parādīt failu


Binārs
cyclingFrontEnd/resources/ios/splash/Default~iphone.png Parādīt failu


Binārs
cyclingFrontEnd/resources/splash.png Parādīt failu


+ 22
- 0
cyclingFrontEnd/src/app/app.component.ts Parādīt failu

@@ -0,0 +1,22 @@
1
+import { Component } from '@angular/core';
2
+import { Platform } from 'ionic-angular';
3
+import { StatusBar } from '@ionic-native/status-bar';
4
+import { SplashScreen } from '@ionic-native/splash-screen';
5
+
6
+import { HomePage } from '../pages/home/home';
7
+@Component({
8
+  templateUrl: 'app.html'
9
+})
10
+export class MyApp {
11
+  rootPage:any = HomePage;
12
+
13
+  constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
14
+    platform.ready().then(() => {
15
+      // Okay, so the platform is ready and our plugins are available.
16
+      // Here you can do any higher level native things you might need.
17
+      statusBar.styleDefault();
18
+      splashScreen.hide();
19
+    });
20
+  }
21
+}
22
+

+ 1
- 0
cyclingFrontEnd/src/app/app.html Parādīt failu

@@ -0,0 +1 @@
1
+<ion-nav [root]="rootPage"></ion-nav>

+ 30
- 0
cyclingFrontEnd/src/app/app.module.ts Parādīt failu

@@ -0,0 +1,30 @@
1
+import { BrowserModule } from '@angular/platform-browser';
2
+import { ErrorHandler, NgModule } from '@angular/core';
3
+import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
4
+import { SplashScreen } from '@ionic-native/splash-screen';
5
+import { StatusBar } from '@ionic-native/status-bar';
6
+
7
+import { MyApp } from './app.component';
8
+import { HomePage } from '../pages/home/home';
9
+
10
+@NgModule({
11
+  declarations: [
12
+    MyApp,
13
+    HomePage
14
+  ],
15
+  imports: [
16
+    BrowserModule,
17
+    IonicModule.forRoot(MyApp)
18
+  ],
19
+  bootstrap: [IonicApp],
20
+  entryComponents: [
21
+    MyApp,
22
+    HomePage
23
+  ],
24
+  providers: [
25
+    StatusBar,
26
+    SplashScreen,
27
+    {provide: ErrorHandler, useClass: IonicErrorHandler}
28
+  ]
29
+})
30
+export class AppModule {}

+ 16
- 0
cyclingFrontEnd/src/app/app.scss Parādīt failu

@@ -0,0 +1,16 @@
1
+// http://ionicframework.com/docs/theming/
2
+
3
+
4
+// App Global Sass
5
+// --------------------------------------------------
6
+// Put style rules here that you want to apply globally. These
7
+// styles are for the entire app and not just one component.
8
+// Additionally, this file can be also used as an entry point
9
+// to import other Sass files to be included in the output CSS.
10
+//
11
+// Shared Sass variables, which can be used to adjust Ionic's
12
+// default Sass variables, belong in "theme/variables.scss".
13
+//
14
+// To declare rules for a specific mode, create a child rule
15
+// for the .md, .ios, or .wp mode classes. The mode class is
16
+// automatically applied to the <body> element in the app.

+ 5
- 0
cyclingFrontEnd/src/app/main.ts Parādīt failu

@@ -0,0 +1,5 @@
1
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
2
+
3
+import { AppModule } from './app.module';
4
+
5
+platformBrowserDynamic().bootstrapModule(AppModule);

Binārs
cyclingFrontEnd/src/assets/icon/favicon.ico Parādīt failu


Binārs
cyclingFrontEnd/src/assets/imgs/logo.png Parādīt failu


+ 49
- 0
cyclingFrontEnd/src/index.html Parādīt failu

@@ -0,0 +1,49 @@
1
+<!DOCTYPE html>
2
+<html lang="en" dir="ltr">
3
+<head>
4
+  <meta charset="UTF-8">
5
+  <title>Ionic App</title>
6
+  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
7
+  <meta name="format-detection" content="telephone=no">
8
+  <meta name="msapplication-tap-highlight" content="no">
9
+
10
+  <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
11
+  <link rel="manifest" href="manifest.json">
12
+  <meta name="theme-color" content="#4e8ef7">
13
+
14
+  <!-- add to homescreen for ios -->
15
+  <meta name="apple-mobile-web-app-capable" content="yes">
16
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
17
+
18
+  <!-- cordova.js required for cordova apps (remove if not needed) -->
19
+  <script src="cordova.js"></script>
20
+
21
+  <!-- un-comment this code to enable service worker
22
+  <script>
23
+    if ('serviceWorker' in navigator) {
24
+      navigator.serviceWorker.register('service-worker.js')
25
+        .then(() => console.log('service worker installed'))
26
+        .catch(err => console.error('Error', err));
27
+    }
28
+  </script>-->
29
+
30
+  <link href="build/main.css" rel="stylesheet">
31
+
32
+</head>
33
+<body>
34
+
35
+  <!-- Ionic's root component and where the app will load -->
36
+  <ion-app></ion-app>
37
+
38
+  <!-- The polyfills js is generated during the build process -->
39
+  <script src="build/polyfills.js"></script>
40
+
41
+  <!-- The vendor js is generated during the build process
42
+       It contains all of the dependencies in node_modules -->
43
+  <script src="build/vendor.js"></script>
44
+
45
+  <!-- The main bundle js is generated during the build process -->
46
+  <script src="build/main.js"></script>
47
+
48
+</body>
49
+</html>

+ 13
- 0
cyclingFrontEnd/src/manifest.json Parādīt failu

@@ -0,0 +1,13 @@
1
+{
2
+  "name": "Ionic",
3
+  "short_name": "Ionic",
4
+  "start_url": "index.html",
5
+  "display": "standalone",
6
+  "icons": [{
7
+    "src": "assets/imgs/logo.png",
8
+    "sizes": "512x512",
9
+    "type": "image/png"
10
+  }],
11
+  "background_color": "#4e8ef7",
12
+  "theme_color": "#4e8ef7"
13
+}

+ 14
- 0
cyclingFrontEnd/src/pages/home/home.html Parādīt failu

@@ -0,0 +1,14 @@
1
+<ion-header>
2
+  <ion-navbar>
3
+    <ion-title>
4
+      Ionic Blank
5
+    </ion-title>
6
+  </ion-navbar>
7
+</ion-header>
8
+
9
+<ion-content padding>
10
+  The world is your oyster.
11
+  <p>
12
+    If you get lost, the <a href="http://ionicframework.com/docs/v2">docs</a> will be your guide.
13
+  </p>
14
+</ion-content>

+ 3
- 0
cyclingFrontEnd/src/pages/home/home.scss Parādīt failu

@@ -0,0 +1,3 @@
1
+page-home {
2
+
3
+}

+ 14
- 0
cyclingFrontEnd/src/pages/home/home.ts Parādīt failu

@@ -0,0 +1,14 @@
1
+import { Component } from '@angular/core';
2
+import { NavController } from 'ionic-angular';
3
+
4
+@Component({
5
+  selector: 'page-home',
6
+  templateUrl: 'home.html'
7
+})
8
+export class HomePage {
9
+
10
+  constructor(public navCtrl: NavController) {
11
+
12
+  }
13
+
14
+}

+ 31
- 0
cyclingFrontEnd/src/service-worker.js Parādīt failu

@@ -0,0 +1,31 @@
1
+/**
2
+ * Check out https://googlechromelabs.github.io/sw-toolbox/ for
3
+ * more info on how to use sw-toolbox to custom configure your service worker.
4
+ */
5
+
6
+
7
+'use strict';
8
+importScripts('./build/sw-toolbox.js');
9
+
10
+self.toolbox.options.cache = {
11
+  name: 'ionic-cache'
12
+};
13
+
14
+// pre-cache our key assets
15
+self.toolbox.precache(
16
+  [
17
+    './build/main.js',
18
+    './build/vendor.js',
19
+    './build/main.css',
20
+    './build/polyfills.js',
21
+    'index.html',
22
+    'manifest.json'
23
+  ]
24
+);
25
+
26
+// dynamically cache any other local assets
27
+self.toolbox.router.any('/*', self.toolbox.fastest);
28
+
29
+// for any other requests go to the network, cache,
30
+// and then only use that cached resource if your user goes offline
31
+self.toolbox.router.default = self.toolbox.networkFirst;

+ 88
- 0
cyclingFrontEnd/src/theme/variables.scss Parādīt failu

@@ -0,0 +1,88 @@
1
+// Ionic Variables and Theming. For more info, please see:
2
+// http://ionicframework.com/docs/theming/
3
+
4
+// Font path is used to include ionicons,
5
+// roboto, and noto sans fonts
6
+$font-path: "../assets/fonts";
7
+
8
+
9
+// The app direction is used to include
10
+// rtl styles in your app. For more info, please see:
11
+// http://ionicframework.com/docs/theming/rtl-support/
12
+$app-direction: ltr;
13
+
14
+
15
+@import "ionic.globals";
16
+
17
+
18
+// Shared Variables
19
+// --------------------------------------------------
20
+// To customize the look and feel of this app, you can override
21
+// the Sass variables found in Ionic's source scss files.
22
+// To view all the possible Ionic variables, see:
23
+// http://ionicframework.com/docs/theming/overriding-ionic-variables/
24
+
25
+
26
+
27
+
28
+// Named Color Variables
29
+// --------------------------------------------------
30
+// Named colors makes it easy to reuse colors on various components.
31
+// It's highly recommended to change the default colors
32
+// to match your app's branding. Ionic uses a Sass map of
33
+// colors so you can add, rename and remove colors as needed.
34
+// The "primary" color is the only required color in the map.
35
+
36
+$colors: (
37
+  primary:    #488aff,
38
+  secondary:  #32db64,
39
+  danger:     #f53d3d,
40
+  light:      #f4f4f4,
41
+  dark:       #222
42
+);
43
+
44
+
45
+// App iOS Variables
46
+// --------------------------------------------------
47
+// iOS only Sass variables can go here
48
+
49
+
50
+
51
+
52
+// App Material Design Variables
53
+// --------------------------------------------------
54
+// Material Design only Sass variables can go here
55
+
56
+
57
+
58
+
59
+// App Windows Variables
60
+// --------------------------------------------------
61
+// Windows only Sass variables can go here
62
+
63
+
64
+
65
+
66
+// App Theme
67
+// --------------------------------------------------
68
+// Ionic apps can have different themes applied, which can
69
+// then be future customized. This import comes last
70
+// so that the above variables are used and Ionic's
71
+// default are overridden.
72
+
73
+@import "ionic.theme.default";
74
+
75
+
76
+// Ionicons
77
+// --------------------------------------------------
78
+// The premium icon font for Ionic. For more info, please see:
79
+// http://ionicframework.com/docs/ionicons/
80
+
81
+@import "ionic.ionicons";
82
+
83
+
84
+// Fonts
85
+// --------------------------------------------------
86
+
87
+@import "roboto";
88
+@import "noto-sans";

+ 28
- 0
cyclingFrontEnd/tsconfig.json Parādīt failu

@@ -0,0 +1,28 @@
1
+{
2
+  "compilerOptions": {
3
+    "allowSyntheticDefaultImports": true,
4
+    "declaration": false,
5
+    "emitDecoratorMetadata": true,
6
+    "experimentalDecorators": true,
7
+    "lib": [
8
+      "dom",
9
+      "es2015"
10
+    ],
11
+    "module": "es2015",
12
+    "moduleResolution": "node",
13
+    "sourceMap": true,
14
+    "target": "es5"
15
+  },
16
+  "include": [
17
+    "src/**/*.ts"
18
+  ],
19
+  "exclude": [
20
+    "node_modules",
21
+    "src/**/*.spec.ts",
22
+    "src/**/__tests__/*.ts"
23
+  ],
24
+  "compileOnSave": false,
25
+  "atom": {
26
+    "rewriteTsconfig": false
27
+  }
28
+}

+ 11
- 0
cyclingFrontEnd/tslint.json Parādīt failu

@@ -0,0 +1,11 @@
1
+{
2
+  "rules": {
3
+    "no-duplicate-variable": true,
4
+    "no-unused-variable": [
5
+      true
6
+    ]
7
+  },
8
+  "rulesDirectory": [
9
+    "node_modules/tslint-eslint-rules/dist/rules"
10
+  ]
11
+}

+ 11
- 7
pom.xml Parādīt failu

@@ -4,11 +4,11 @@
4 4
     <modelVersion>4.0.0</modelVersion>
5 5
 
6 6
     <groupId>com.passionProject</groupId>
7
-    <artifactId>bikeproject</artifactId>
7
+    <artifactId>bikeProject</artifactId>
8 8
     <version>0.0.1-SNAPSHOT</version>
9 9
     <packaging>jar</packaging>
10 10
 
11
-    <name>bikeproject</name>
11
+    <name>bikeProject</name>
12 12
     <description>Bike Passion Project</description>
13 13
 
14 14
     <parent>
@@ -27,17 +27,17 @@
27 27
     <dependencies>
28 28
         <dependency>
29 29
             <groupId>org.springframework.boot</groupId>
30
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
31
-        </dependency>
32
-        <dependency>
33
-            <groupId>org.springframework.boot</groupId>
34 30
             <artifactId>spring-boot-starter-data-rest</artifactId>
35 31
         </dependency>
36 32
         <dependency>
37 33
             <groupId>org.springframework.boot</groupId>
38 34
             <artifactId>spring-boot-starter-web</artifactId>
39 35
         </dependency>
40
-
36
+        <!--<dependency>-->
37
+            <!--<groupId>com.h2database</groupId>-->
38
+            <!--<artifactId>h2</artifactId>-->
39
+            <!--<scope>runtime</scope>-->
40
+        <!--</dependency>-->
41 41
         <dependency>
42 42
             <groupId>org.springframework.boot</groupId>
43 43
             <artifactId>spring-boot-devtools</artifactId>
@@ -53,6 +53,10 @@
53 53
             <artifactId>spring-boot-starter-test</artifactId>
54 54
             <scope>test</scope>
55 55
         </dependency>
56
+        <dependency>
57
+            <groupId>org.springframework.boot</groupId>
58
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
59
+        </dependency>
56 60
     </dependencies>
57 61
 
58 62
     <build>

+ 2
- 0
src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java Parādīt failu

@@ -9,4 +9,6 @@ public class BikeProjectApplication {
9 9
     public static void main(String[] args) {
10 10
         SpringApplication.run(BikeProjectApplication.class, args);
11 11
     }
12
+
13
+
12 14
 }

+ 2
- 4
src/main/java/com/passionProject/bikeProject/Controller/UserController.java Parādīt failu

@@ -6,11 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
6 6
 import org.springframework.http.HttpHeaders;
7 7
 import org.springframework.http.HttpStatus;
8 8
 import org.springframework.http.ResponseEntity;
9
-import org.springframework.web.bind.annotation.RequestBody;
10
-import org.springframework.web.bind.annotation.RequestMapping;
11
-import org.springframework.web.bind.annotation.RequestMethod;
12
-import org.springframework.web.bind.annotation.RestController;
9
+import org.springframework.web.bind.annotation.*;
13 10
 
11
+@CrossOrigin(origins = "http://localhost:8080")
14 12
 @RestController
15 13
 public class UserController {
16 14
 

+ 11
- 1
src/main/java/com/passionProject/bikeProject/Entity/User.java Parādīt failu

@@ -18,16 +18,18 @@ public class User {
18 18
     private String lastName;
19 19
     private String password;
20 20
     private String email;
21
+    private String favoriteTrail;
21 22
 
22 23
     public User() {
23 24
     }
24 25
 
25
-    public User(String username, String firstName, String lastName, String password, String email) {
26
+    public User(String username, String firstName, String lastName, String password, String email, String favoriteTrail) {
26 27
         this.username = username;
27 28
         this.firstName = firstName;
28 29
         this.lastName = lastName;
29 30
         this.password = password;
30 31
         this.email = email;
32
+        this.favoriteTrail = favoriteTrail;
31 33
     }
32 34
 
33 35
     public Long getId() {
@@ -77,4 +79,12 @@ public class User {
77 79
     public void setEmail(String email) {
78 80
         this.email = email;
79 81
     }
82
+
83
+    public String getFavoriteTrail() {
84
+        return favoriteTrail;
85
+    }
86
+
87
+    public void setFavoriteTrail(String favoriteTrail) {
88
+        this.favoriteTrail = favoriteTrail;
89
+    }
80 90
 }

+ 2
- 5
src/main/java/com/passionProject/bikeProject/Service/UserService.java Parādīt failu

@@ -23,11 +23,8 @@ public class UserService {
23 23
         return userRepository.findByUsername(username);
24 24
     }
25 25
 
26
-    public User find(Long id) {
27
-        return userRepository.findById(id).get();
28
-    }
29
-
30 26
     public Iterable<User> getAllUsers() {
31 27
         return userRepository.findAll();
32 28
     }
33
-}
29
+
30
+}

+ 4
- 0
src/main/resources/application.properties Parādīt failu

@@ -0,0 +1,4 @@
1
+spring.jpa.hibernate.ddl-auto=update
2
+spring.datasource.url=jdbc:mysql://localhost:3306/cycleUsers?useSSL=false
3
+spring.datasource.username=root
4
+spring.datasource.password=

Binārs
target/bikeProject-0.0.1-SNAPSHOT.jar Parādīt failu


Binārs
target/bikeProject-0.0.1-SNAPSHOT.jar.original Parādīt failu


+ 4
- 0
target/classes/application.properties Parādīt failu

@@ -0,0 +1,4 @@
1
+spring.jpa.hibernate.ddl-auto=update
2
+spring.datasource.url=jdbc:mysql://localhost:3306/cycleUsers?useSSL=false
3
+spring.datasource.username=root
4
+spring.datasource.password=

Binārs
target/classes/com/passionproject/bikeproject/BikeprojectApplication.class Parādīt failu


Binārs
target/classes/com/passionproject/bikeproject/Controller/UserController.class Parādīt failu


Binārs
target/classes/com/passionproject/bikeproject/Entity/User.class Parādīt failu


Binārs
target/classes/com/passionproject/bikeproject/Repository/UserRepository.class Parādīt failu


Binārs
target/classes/com/passionproject/bikeproject/Service/UserService.class Parādīt failu


+ 4
- 0
target/maven-archiver/pom.properties Parādīt failu

@@ -0,0 +1,4 @@
1
+#Created by Apache Maven 3.5.3
2
+version=0.0.1-SNAPSHOT
3
+groupId=com.passionProject
4
+artifactId=bikeProject

+ 5
- 5
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst Parādīt failu

@@ -1,5 +1,5 @@
1
-com/passionproject/bikeproject/Repository/UserRepository.class
2
-com/passionproject/bikeproject/Entity/User.class
3
-com/passionproject/bikeproject/BikeprojectApplication.class
4
-com/passionproject/bikeproject/Controller/UserController.class
5
-com/passionproject/bikeproject/Service/UserService.class
1
+com/passionProject/bikeProject/Controller/UserController.class
2
+com/passionProject/bikeProject/BikeProjectApplication.class
3
+com/passionProject/bikeProject/Entity/User.class
4
+com/passionProject/bikeProject/Repository/UserRepository.class
5
+com/passionProject/bikeProject/Service/UserService.class

+ 5
- 5
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst Parādīt failu

@@ -1,5 +1,5 @@
1
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionproject/bikeproject/Entity/User.java
2
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionproject/bikeproject/BikeprojectApplication.java
3
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionproject/bikeproject/Repository/UserRepository.java
4
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionproject/bikeproject/Service/UserService.java
5
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionproject/bikeproject/Controller/UserController.java
1
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java
2
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionProject/bikeProject/Controller/UserController.java
3
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java
4
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionProject/bikeProject/Entity/User.java
5
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/main/java/com/passionProject/bikeProject/Service/UserService.java

+ 1
- 1
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst Parādīt failu

@@ -1 +1 @@
1
-com/passionproject/bikeproject/BikeprojectApplicationTests.class
1
+com/passionProject/bikeProject/BikeProjectApplicationTests.class

+ 1
- 1
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst Parādīt failu

@@ -1 +1 @@
1
-/Users/krisbl/Desktop/passionProject/CyclingApp/src/test/java/com/passionproject/bikeproject/BikeprojectApplicationTests.java
1
+/Users/krisbl/Desktop/passionProject/CyclingApp/src/test/java/com/passionProject/bikeProject/BikeProjectApplicationTests.java

+ 65
- 0
target/surefire-reports/TEST-com.passionProject.bikeProject.BikeProjectApplicationTests.xml
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 4
- 0
target/surefire-reports/com.passionProject.bikeProject.BikeProjectApplicationTests.txt Parādīt failu

@@ -0,0 +1,4 @@
1
+-------------------------------------------------------------------------------
2
+Test set: com.passionProject.bikeProject.BikeProjectApplicationTests
3
+-------------------------------------------------------------------------------
4
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.308 s - in com.passionProject.bikeProject.BikeProjectApplicationTests

+ 121
- 0
target/surefire/surefire6405345168791754347tmp Parādīt failu

@@ -0,0 +1,121 @@
1
+#surefire
2
+#Wed Jul 18 15:03:28 EDT 2018
3
+tc.0=com.passionProject.bikeProject.BikeProjectApplicationTests
4
+pluginPid=72235
5
+classPathUrl.0=/Users/krisbl/Desktop/passionProject/CyclingApp/target/test-classes
6
+classPathUrl.1=/Users/krisbl/Desktop/passionProject/CyclingApp/target/classes
7
+classPathUrl.2=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-data-rest/2.0.3.RELEASE/spring-boot-starter-data-rest-2.0.3.RELEASE.jar
8
+classPathUrl.3=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter/2.0.3.RELEASE/spring-boot-starter-2.0.3.RELEASE.jar
9
+classPathUrl.4=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-logging/2.0.3.RELEASE/spring-boot-starter-logging-2.0.3.RELEASE.jar
10
+classPathUrl.5=/Users/krisbl/.m2/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar
11
+classPathUrl.6=/Users/krisbl/.m2/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar
12
+classPathUrl.7=/Users/krisbl/.m2/repository/org/apache/logging/log4j/log4j-to-slf4j/2.10.0/log4j-to-slf4j-2.10.0.jar
13
+classPathUrl.8=/Users/krisbl/.m2/repository/org/apache/logging/log4j/log4j-api/2.10.0/log4j-api-2.10.0.jar
14
+classPathUrl.9=/Users/krisbl/.m2/repository/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25.jar
15
+classPathUrl.10=/Users/krisbl/.m2/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar
16
+classPathUrl.11=/Users/krisbl/.m2/repository/org/yaml/snakeyaml/1.19/snakeyaml-1.19.jar
17
+classPathUrl.12=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-json/2.0.3.RELEASE/spring-boot-starter-json-2.0.3.RELEASE.jar
18
+classPathUrl.13=/Users/krisbl/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.9.6/jackson-databind-2.9.6.jar
19
+classPathUrl.14=/Users/krisbl/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.9.6/jackson-core-2.9.6.jar
20
+classPathUrl.15=/Users/krisbl/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.6/jackson-datatype-jdk8-2.9.6.jar
21
+classPathUrl.16=/Users/krisbl/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.6/jackson-datatype-jsr310-2.9.6.jar
22
+classPathUrl.17=/Users/krisbl/.m2/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.6/jackson-module-parameter-names-2.9.6.jar
23
+classPathUrl.18=/Users/krisbl/.m2/repository/org/springframework/data/spring-data-rest-webmvc/3.0.8.RELEASE/spring-data-rest-webmvc-3.0.8.RELEASE.jar
24
+classPathUrl.19=/Users/krisbl/.m2/repository/org/springframework/data/spring-data-rest-core/3.0.8.RELEASE/spring-data-rest-core-3.0.8.RELEASE.jar
25
+classPathUrl.20=/Users/krisbl/.m2/repository/org/springframework/hateoas/spring-hateoas/0.24.0.RELEASE/spring-hateoas-0.24.0.RELEASE.jar
26
+classPathUrl.21=/Users/krisbl/.m2/repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar
27
+classPathUrl.22=/Users/krisbl/.m2/repository/org/atteo/evo-inflector/1.2.2/evo-inflector-1.2.2.jar
28
+classPathUrl.23=/Users/krisbl/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar
29
+classPathUrl.24=/Users/krisbl/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
30
+classPathUrl.25=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-web/2.0.3.RELEASE/spring-boot-starter-web-2.0.3.RELEASE.jar
31
+classPathUrl.26=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-tomcat/2.0.3.RELEASE/spring-boot-starter-tomcat-2.0.3.RELEASE.jar
32
+classPathUrl.27=/Users/krisbl/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/8.5.31/tomcat-embed-core-8.5.31.jar
33
+classPathUrl.28=/Users/krisbl/.m2/repository/org/apache/tomcat/embed/tomcat-embed-el/8.5.31/tomcat-embed-el-8.5.31.jar
34
+classPathUrl.29=/Users/krisbl/.m2/repository/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.31/tomcat-embed-websocket-8.5.31.jar
35
+classPathUrl.30=/Users/krisbl/.m2/repository/org/hibernate/validator/hibernate-validator/6.0.10.Final/hibernate-validator-6.0.10.Final.jar
36
+classPathUrl.31=/Users/krisbl/.m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar
37
+classPathUrl.32=/Users/krisbl/.m2/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar
38
+classPathUrl.33=/Users/krisbl/.m2/repository/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar
39
+classPathUrl.34=/Users/krisbl/.m2/repository/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE.jar
40
+classPathUrl.35=/Users/krisbl/.m2/repository/org/springframework/spring-beans/5.0.7.RELEASE/spring-beans-5.0.7.RELEASE.jar
41
+classPathUrl.36=/Users/krisbl/.m2/repository/org/springframework/spring-webmvc/5.0.7.RELEASE/spring-webmvc-5.0.7.RELEASE.jar
42
+classPathUrl.37=/Users/krisbl/.m2/repository/org/springframework/spring-aop/5.0.7.RELEASE/spring-aop-5.0.7.RELEASE.jar
43
+classPathUrl.38=/Users/krisbl/.m2/repository/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE.jar
44
+classPathUrl.39=/Users/krisbl/.m2/repository/org/springframework/spring-expression/5.0.7.RELEASE/spring-expression-5.0.7.RELEASE.jar
45
+classPathUrl.40=/Users/krisbl/.m2/repository/com/h2database/h2/1.4.197/h2-1.4.197.jar
46
+classPathUrl.41=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-devtools/2.0.3.RELEASE/spring-boot-devtools-2.0.3.RELEASE.jar
47
+classPathUrl.42=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot/2.0.3.RELEASE/spring-boot-2.0.3.RELEASE.jar
48
+classPathUrl.43=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/2.0.3.RELEASE/spring-boot-autoconfigure-2.0.3.RELEASE.jar
49
+classPathUrl.44=/Users/krisbl/.m2/repository/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar
50
+classPathUrl.45=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-test/2.0.3.RELEASE/spring-boot-starter-test-2.0.3.RELEASE.jar
51
+classPathUrl.46=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-test/2.0.3.RELEASE/spring-boot-test-2.0.3.RELEASE.jar
52
+classPathUrl.47=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.0.3.RELEASE/spring-boot-test-autoconfigure-2.0.3.RELEASE.jar
53
+classPathUrl.48=/Users/krisbl/.m2/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar
54
+classPathUrl.49=/Users/krisbl/.m2/repository/net/minidev/json-smart/2.3/json-smart-2.3.jar
55
+classPathUrl.50=/Users/krisbl/.m2/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar
56
+classPathUrl.51=/Users/krisbl/.m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar
57
+classPathUrl.52=/Users/krisbl/.m2/repository/junit/junit/4.12/junit-4.12.jar
58
+classPathUrl.53=/Users/krisbl/.m2/repository/org/assertj/assertj-core/3.9.1/assertj-core-3.9.1.jar
59
+classPathUrl.54=/Users/krisbl/.m2/repository/org/mockito/mockito-core/2.15.0/mockito-core-2.15.0.jar
60
+classPathUrl.55=/Users/krisbl/.m2/repository/net/bytebuddy/byte-buddy/1.7.11/byte-buddy-1.7.11.jar
61
+classPathUrl.56=/Users/krisbl/.m2/repository/net/bytebuddy/byte-buddy-agent/1.7.11/byte-buddy-agent-1.7.11.jar
62
+classPathUrl.57=/Users/krisbl/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar
63
+classPathUrl.58=/Users/krisbl/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
64
+classPathUrl.59=/Users/krisbl/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar
65
+classPathUrl.60=/Users/krisbl/.m2/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar
66
+classPathUrl.61=/Users/krisbl/.m2/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar
67
+classPathUrl.62=/Users/krisbl/.m2/repository/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar
68
+classPathUrl.63=/Users/krisbl/.m2/repository/org/springframework/spring-jcl/5.0.7.RELEASE/spring-jcl-5.0.7.RELEASE.jar
69
+classPathUrl.64=/Users/krisbl/.m2/repository/org/springframework/spring-test/5.0.7.RELEASE/spring-test-5.0.7.RELEASE.jar
70
+classPathUrl.65=/Users/krisbl/.m2/repository/org/xmlunit/xmlunit-core/2.5.1/xmlunit-core-2.5.1.jar
71
+classPathUrl.66=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-data-jpa/2.0.3.RELEASE/spring-boot-starter-data-jpa-2.0.3.RELEASE.jar
72
+classPathUrl.67=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-aop/2.0.3.RELEASE/spring-boot-starter-aop-2.0.3.RELEASE.jar
73
+classPathUrl.68=/Users/krisbl/.m2/repository/org/aspectj/aspectjweaver/1.8.13/aspectjweaver-1.8.13.jar
74
+classPathUrl.69=/Users/krisbl/.m2/repository/org/springframework/boot/spring-boot-starter-jdbc/2.0.3.RELEASE/spring-boot-starter-jdbc-2.0.3.RELEASE.jar
75
+classPathUrl.70=/Users/krisbl/.m2/repository/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9.jar
76
+classPathUrl.71=/Users/krisbl/.m2/repository/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE.jar
77
+classPathUrl.72=/Users/krisbl/.m2/repository/org/hibernate/hibernate-core/5.2.17.Final/hibernate-core-5.2.17.Final.jar
78
+classPathUrl.73=/Users/krisbl/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.2.Final/hibernate-jpa-2.1-api-1.0.2.Final.jar
79
+classPathUrl.74=/Users/krisbl/.m2/repository/org/javassist/javassist/3.22.0-GA/javassist-3.22.0-GA.jar
80
+classPathUrl.75=/Users/krisbl/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar
81
+classPathUrl.76=/Users/krisbl/.m2/repository/org/jboss/jandex/2.0.3.Final/jandex-2.0.3.Final.jar
82
+classPathUrl.77=/Users/krisbl/.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
83
+classPathUrl.78=/Users/krisbl/.m2/repository/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final.jar
84
+classPathUrl.79=/Users/krisbl/.m2/repository/javax/transaction/javax.transaction-api/1.2/javax.transaction-api-1.2.jar
85
+classPathUrl.80=/Users/krisbl/.m2/repository/org/springframework/data/spring-data-jpa/2.0.8.RELEASE/spring-data-jpa-2.0.8.RELEASE.jar
86
+classPathUrl.81=/Users/krisbl/.m2/repository/org/springframework/data/spring-data-commons/2.0.8.RELEASE/spring-data-commons-2.0.8.RELEASE.jar
87
+classPathUrl.82=/Users/krisbl/.m2/repository/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE.jar
88
+classPathUrl.83=/Users/krisbl/.m2/repository/org/springframework/spring-tx/5.0.7.RELEASE/spring-tx-5.0.7.RELEASE.jar
89
+classPathUrl.84=/Users/krisbl/.m2/repository/org/springframework/spring-aspects/5.0.7.RELEASE/spring-aspects-5.0.7.RELEASE.jar
90
+surefireClassPathUrl.0=/Users/krisbl/.m2/repository/org/apache/maven/surefire/surefire-junit4/2.21.0/surefire-junit4-2.21.0.jar
91
+surefireClassPathUrl.1=/Users/krisbl/.m2/repository/org/apache/maven/surefire/surefire-api/2.21.0/surefire-api-2.21.0.jar
92
+surefireClassPathUrl.2=/Users/krisbl/.m2/repository/org/apache/maven/surefire/surefire-logger-api/2.21.0/surefire-logger-api-2.21.0.jar
93
+enableAssertions=true
94
+childDelegation=false
95
+preferTestsFromInStream=false
96
+testSuiteDefinitionTestSourceDirectory=/Users/krisbl/Desktop/passionProject/CyclingApp/src/test/java
97
+requestedTest=
98
+rerunFailingTestsCount=0
99
+failIfNoTests=false
100
+includes0=**/Test*.java
101
+includes1=**/*Test.java
102
+includes2=**/*Tests.java
103
+includes3=**/*TestCase.java
104
+excludes0=**/*$*
105
+testClassesDirectory=/Users/krisbl/Desktop/passionProject/CyclingApp/target/test-classes
106
+runOrder=filesystem
107
+runStatisticsFile=/Users/krisbl/Desktop/passionProject/CyclingApp/.surefire-6F420095001D383F93C97209FC030A49DFE9535B
108
+isTrimStackTrace=true
109
+reportsDirectory=/Users/krisbl/Desktop/passionProject/CyclingApp/target/surefire-reports
110
+useSystemClassLoader=true
111
+useManifestOnlyJar=true
112
+providerConfiguration=org.apache.maven.surefire.junit4.JUnit4Provider
113
+failFastCount=0
114
+shutdown=DEFAULT
115
+mainCliOptions0=LOGGING_LEVEL_ERROR
116
+mainCliOptions1=LOGGING_LEVEL_WARN
117
+mainCliOptions2=LOGGING_LEVEL_INFO
118
+mainCliOptions3=LOGGING_LEVEL_DEBUG
119
+mainCliOptions4=SHOW_ERRORS
120
+mainCliOptions5=REACTOR_FAIL_FAST
121
+systemExitTimeout=30

+ 0
- 0
target/surefire/surefire_03634317598468121135tmp Parādīt failu


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels