Parcourir la source

got it working

BlackJack il y a 6 ans
Parent
révision
0e7e70cc5a
35 fichiers modifiés avec 464 ajouts et 267 suppressions
  1. BIN
      .DS_Store
  2. 2
    0
      .idea/compiler.xml
  3. 13
    0
      .idea/libraries/Maven__com_h2database_h2_1_4_196.xml
  4. 13
    0
      .idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml
  5. 0
    13
      .idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml
  6. 13
    0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_0_RELEASE.xml
  7. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml
  8. 0
    13
      .idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml
  9. 1
    1
      .idea/modules.xml
  10. 365
    75
      .idea/workspace.xml
  11. BIN
      lib/javaee.jar
  12. 12
    16
      passProj.iml
  13. 23
    31
      pom.xml
  14. 0
    5
      src/main/java/passionproject/controller/MainMenuController.java
  15. 12
    14
      src/main/java/passionproject/controller/QuestionsController.java
  16. 0
    13
      src/main/java/passionproject/model/MainMenu.java
  17. 4
    6
      src/main/java/passionproject/model/Questions.java
  18. 2
    0
      src/main/java/passionproject/repositories/QuestionRepository.java
  19. 2
    3
      src/main/resources/application.properties
  20. 0
    0
      src/main/resources/static/style.css
  21. 0
    13
      src/main/resources/users/index.html
  22. 0
    6
      src/main/resources/users/new.html
  23. 0
    9
      src/main/resources/users/show.html
  24. 0
    5
      src/test/java/Questions.java
  25. 2
    3
      target/classes/application.properties
  26. BIN
      target/classes/passionproject/controller/MainMenuController.class
  27. BIN
      target/classes/passionproject/controller/QuestionsController.class
  28. BIN
      target/classes/passionproject/model/MainMenu.class
  29. BIN
      target/classes/passionproject/model/Questions.class
  30. BIN
      target/classes/passionproject/repositories/QuestionRepository.class
  31. 0
    0
      target/classes/static/style.css
  32. 0
    13
      target/classes/users/index.html
  33. 0
    6
      target/classes/users/new.html
  34. 0
    9
      target/classes/users/show.html
  35. BIN
      target/test-classes/Questions.class

BIN
.DS_Store Voir le fichier


+ 2
- 0
.idea/compiler.xml Voir le fichier

@@ -7,10 +7,12 @@
7 7
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8
         <outputRelativeToContentRoot value="true" />
9 9
         <module name="passionProject" />
10
+        <module name="passProj" />
10 11
       </profile>
11 12
     </annotationProcessing>
12 13
     <bytecodeTargetLevel target="8">
13 14
       <module name="passionProject" target="1.8" />
15
+      <module name="passProj" target="1.8" />
14 16
     </bytecodeTargetLevel>
15 17
   </component>
16 18
 </project>

+ 13
- 0
.idea/libraries/Maven__com_h2database_h2_1_4_196.xml Voir le fichier

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: com.h2database:h2:1.4.196">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.196/h2-1.4.196.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.196/h2-1.4.196-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/h2database/h2/1.4.196/h2-1.4.196-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml Voir le fichier

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: mysql:mysql-connector-java:5.1.45">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.45/mysql-connector-java-5.1.45.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.45/mysql-connector-java-5.1.45-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.45/mysql-connector-java-5.1.45-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 0
- 13
.idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml Voir le fichier

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.postgresql:postgresql:42.2.1">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.1/postgresql-42.2.1.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.1/postgresql-42.2.1-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.1/postgresql-42.2.1-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_0_RELEASE.xml Voir le fichier

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework.boot:spring-boot-devtools:2.0.0.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.0.0.RELEASE/spring-boot-devtools-2.0.0.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.0.0.RELEASE/spring-boot-devtools-2.0.0.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.0.0.RELEASE/spring-boot-devtools-2.0.0.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml Voir le fichier

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-hateoas:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-hateoas/2.0.0.RELEASE/spring-boot-starter-hateoas-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-hateoas/2.0.0.RELEASE/spring-boot-starter-hateoas-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-hateoas/2.0.0.RELEASE/spring-boot-starter-hateoas-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml Voir le fichier

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.data:spring-data-rest-hal-browser:3.0.5.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-hal-browser/3.0.5.RELEASE/spring-data-rest-hal-browser-3.0.5.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-hal-browser/3.0.5.RELEASE/spring-data-rest-hal-browser-3.0.5.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-hal-browser/3.0.5.RELEASE/spring-data-rest-hal-browser-3.0.5.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 1
- 1
.idea/modules.xml Voir le fichier

@@ -2,7 +2,7 @@
2 2
 <project version="4">
3 3
   <component name="ProjectModuleManager">
4 4
     <modules>
5
-      <module fileurl="file://$PROJECT_DIR$/passionProject.iml" filepath="$PROJECT_DIR$/passionProject.iml" />
5
+      <module fileurl="file://$PROJECT_DIR$/passProj.iml" filepath="$PROJECT_DIR$/passProj.iml" />
6 6
     </modules>
7 7
   </component>
8 8
 </project>

+ 365
- 75
.idea/workspace.xml Voir le fichier

@@ -2,48 +2,48 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="a1659534-018e-4427-a691-d840db4a80bb" 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/inspectionProfiles/Project_Default.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/lib/javaee.jar" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Account.java" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Enemy.java" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/GamePlay.java" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/HumanPlayer.java" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Player.java" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/style.css" afterDir="false" />
26
-      <change afterPath="$PROJECT_DIR$/src/main/resources/users/index.html" afterDir="false" />
27
-      <change afterPath="$PROJECT_DIR$/src/main/resources/users/new.html" afterDir="false" />
28
-      <change afterPath="$PROJECT_DIR$/src/main/resources/users/show.html" afterDir="false" />
29
-      <change afterPath="$PROJECT_DIR$/src/test/java/Questions.java" afterDir="false" />
30
-      <change afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
31
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/GameEngine.class" afterDir="false" />
32
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/controller/MainMenuController.class" afterDir="false" />
33
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" afterDir="false" />
34
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Account.class" afterDir="false" />
35
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Enemy.class" afterDir="false" />
36
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/GamePlay.class" afterDir="false" />
37
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/HumanPlayer.class" afterDir="false" />
38
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/MainMenu.class" afterDir="false" />
39
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Player.class" afterDir="false" />
40
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" afterDir="false" />
41
-      <change afterPath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" afterDir="false" />
42
-      <change afterPath="$PROJECT_DIR$/target/classes/static/style.css" afterDir="false" />
43
-      <change afterPath="$PROJECT_DIR$/target/classes/users/index.html" afterDir="false" />
44
-      <change afterPath="$PROJECT_DIR$/target/classes/users/new.html" afterDir="false" />
45
-      <change afterPath="$PROJECT_DIR$/target/classes/users/show.html" afterDir="false" />
46
-      <change afterPath="$PROJECT_DIR$/target/test-classes/Questions.class" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_0_RELEASE.xml" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/passProj.iml" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml" beforeDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml" beforeDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml" beforeDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/lib/javaee.jar" beforeDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/passionProject.iml" beforeDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java" beforeDir="false" />
19
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" beforeDir="false" />
20
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" beforeDir="false" />
21
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Account.java" beforeDir="false" />
22
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Enemy.java" beforeDir="false" />
23
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/GamePlay.java" beforeDir="false" />
24
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/HumanPlayer.java" beforeDir="false" />
25
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" beforeDir="false" />
26
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Player.java" beforeDir="false" />
27
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" beforeDir="false" />
28
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java" beforeDir="false" />
29
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" beforeDir="false" />
30
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" />
31
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/style.css" beforeDir="false" />
32
+      <change beforePath="$PROJECT_DIR$/src/main/resources/users/index.html" beforeDir="false" />
33
+      <change beforePath="$PROJECT_DIR$/src/main/resources/users/new.html" beforeDir="false" />
34
+      <change beforePath="$PROJECT_DIR$/src/main/resources/users/show.html" beforeDir="false" />
35
+      <change beforePath="$PROJECT_DIR$/src/test/java/Questions.java" beforeDir="false" />
36
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
37
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/MainMenuController.class" beforeDir="false" />
38
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" afterDir="false" />
39
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/MainMenu.class" beforeDir="false" />
40
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" afterDir="false" />
41
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" afterDir="false" />
42
+      <change beforePath="$PROJECT_DIR$/target/classes/static/style.css" beforeDir="false" />
43
+      <change beforePath="$PROJECT_DIR$/target/classes/users/index.html" beforeDir="false" />
44
+      <change beforePath="$PROJECT_DIR$/target/classes/users/new.html" beforeDir="false" />
45
+      <change beforePath="$PROJECT_DIR$/target/classes/users/show.html" beforeDir="false" />
46
+      <change beforePath="$PROJECT_DIR$/target/test-classes/Questions.class" beforeDir="false" />
47 47
     </list>
48 48
     <ignored path="$PROJECT_DIR$/target/" />
49 49
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -53,36 +53,167 @@
53 53
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
54 54
     <option name="LAST_RESOLUTION" value="IGNORE" />
55 55
   </component>
56
+  <component name="DatabaseView">
57
+    <option name="SHOW_INTERMEDIATE" value="true" />
58
+    <option name="GROUP_DATA_SOURCES" value="true" />
59
+    <option name="GROUP_SCHEMA" value="true" />
60
+    <option name="GROUP_CONTENTS" value="false" />
61
+    <option name="SORT_POSITIONED" value="false" />
62
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
63
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
64
+    <option name="HIDDEN_KINDS">
65
+      <set />
66
+    </option>
67
+    <expand />
68
+    <select />
69
+  </component>
70
+  <component name="FileEditorManager">
71
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
72
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
73
+        <entry file="file://$PROJECT_DIR$/README.md">
74
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
75
+            <state split_layout="SPLIT">
76
+              <first_editor />
77
+              <second_editor />
78
+            </state>
79
+          </provider>
80
+        </entry>
81
+      </file>
82
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
83
+        <entry file="file://$PROJECT_DIR$/pom.xml">
84
+          <provider selected="true" editor-type-id="text-editor">
85
+            <state relative-caret-position="225">
86
+              <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
87
+            </state>
88
+          </provider>
89
+        </entry>
90
+      </file>
91
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
92
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
93
+          <provider selected="true" editor-type-id="text-editor" />
94
+        </entry>
95
+      </file>
96
+      <file leaf-file-name="GameEngine.java" pinned="false" current-in-tab="true">
97
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
98
+          <provider selected="true" editor-type-id="text-editor">
99
+            <state relative-caret-position="75">
100
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
101
+            </state>
102
+          </provider>
103
+        </entry>
104
+      </file>
105
+    </leaf>
106
+  </component>
56 107
   <component name="Git.Settings">
57 108
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
58 109
   </component>
110
+  <component name="IdeDocumentHistory">
111
+    <option name="CHANGED_PATHS">
112
+      <list>
113
+        <option value="$PROJECT_DIR$/pom.xml" />
114
+      </list>
115
+    </option>
116
+  </component>
59 117
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
60 118
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
61 119
   <component name="JsGulpfileManager">
62 120
     <detection-done>true</detection-done>
63 121
     <sorting>DEFINITION_ORDER</sorting>
64 122
   </component>
123
+  <component name="MavenImportPreferences">
124
+    <option name="importingSettings">
125
+      <MavenImportingSettings>
126
+        <option name="importAutomatically" value="true" />
127
+      </MavenImportingSettings>
128
+    </option>
129
+  </component>
65 130
   <component name="NodePackageJsonFileManager">
66 131
     <packageJsonPaths />
67 132
   </component>
68 133
   <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
134
+    <option name="x" value="436" />
69 135
     <option name="y" value="23" />
70
-    <option name="width" value="1280" />
71
-    <option name="height" value="729" />
136
+    <option name="width" value="844" />
137
+    <option name="height" value="722" />
138
+  </component>
139
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
140
+    <ConfirmationsSetting value="2" id="Add" />
72 141
   </component>
73
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
74 142
   <component name="ProjectView">
75 143
     <navigator proportions="" version="1">
76 144
       <foldersAlwaysOnTop value="true" />
77 145
     </navigator>
78 146
     <panes>
79
-      <pane id="ProjectPane" />
80
-      <pane id="Scope" />
147
+      <pane id="ProjectPane">
148
+        <subPane>
149
+          <expand>
150
+            <path>
151
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
152
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
153
+            </path>
154
+            <path>
155
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
156
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
157
+              <item name="src" type="462c0819:PsiDirectoryNode" />
158
+            </path>
159
+            <path>
160
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
161
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
162
+              <item name="src" type="462c0819:PsiDirectoryNode" />
163
+              <item name="main" type="462c0819:PsiDirectoryNode" />
164
+            </path>
165
+            <path>
166
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
167
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
168
+              <item name="src" type="462c0819:PsiDirectoryNode" />
169
+              <item name="main" type="462c0819:PsiDirectoryNode" />
170
+              <item name="java" type="462c0819:PsiDirectoryNode" />
171
+            </path>
172
+            <path>
173
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
174
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
175
+              <item name="src" type="462c0819:PsiDirectoryNode" />
176
+              <item name="main" type="462c0819:PsiDirectoryNode" />
177
+              <item name="java" type="462c0819:PsiDirectoryNode" />
178
+              <item name="passionproject" type="462c0819:PsiDirectoryNode" />
179
+            </path>
180
+            <path>
181
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
182
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
183
+              <item name="src" type="462c0819:PsiDirectoryNode" />
184
+              <item name="main" type="462c0819:PsiDirectoryNode" />
185
+              <item name="java" type="462c0819:PsiDirectoryNode" />
186
+              <item name="model" type="462c0819:PsiDirectoryNode" />
187
+            </path>
188
+            <path>
189
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
190
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
191
+              <item name="src" type="462c0819:PsiDirectoryNode" />
192
+              <item name="main" type="462c0819:PsiDirectoryNode" />
193
+              <item name="java" type="462c0819:PsiDirectoryNode" />
194
+              <item name="repositories" type="462c0819:PsiDirectoryNode" />
195
+            </path>
196
+            <path>
197
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
198
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
199
+              <item name="src" type="462c0819:PsiDirectoryNode" />
200
+              <item name="main" type="462c0819:PsiDirectoryNode" />
201
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
202
+            </path>
203
+          </expand>
204
+          <select />
205
+        </subPane>
206
+      </pane>
81 207
       <pane id="PackagesPane" />
82 208
       <pane id="AndroidView" />
209
+      <pane id="Scope" />
83 210
     </panes>
84 211
   </component>
85 212
   <component name="PropertiesComponent">
213
+    <property name="RequestMappingsPanelOrder0" value="0" />
214
+    <property name="RequestMappingsPanelOrder1" value="1" />
215
+    <property name="RequestMappingsPanelWidth0" value="75" />
216
+    <property name="RequestMappingsPanelWidth1" value="75" />
86 217
     <property name="WebServerToolWindowFactoryState" value="false" />
87 218
     <property name="aspect.path.notification.shown" value="true" />
88 219
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -92,6 +223,9 @@
92 223
     <property name="node.js.selected.package.standard" value="" />
93 224
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
94 225
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
226
+    <property name="project.structure.last.edited" value="Modules" />
227
+    <property name="project.structure.proportion" value="0.0" />
228
+    <property name="project.structure.side.proportion" value="0.0" />
95 229
     <property name="settings.editor.selected.configurable" value="terminal" />
96 230
   </component>
97 231
   <component name="RunDashboard">
@@ -106,7 +240,7 @@
106 240
       </list>
107 241
     </option>
108 242
   </component>
109
-  <component name="RunManager">
243
+  <component name="RunManager" selected="Spring Boot.GameEngine (1)">
110 244
     <configuration default="true" type="Application" factoryName="Application">
111 245
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
112 246
     </configuration>
@@ -126,6 +260,26 @@
126 260
       </option>
127 261
       <patterns />
128 262
     </configuration>
263
+    <configuration name="GameEngine (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
264
+      <module name="passProj" />
265
+      <extension name="coverage">
266
+        <pattern>
267
+          <option name="PATTERN" value="passionproject.*" />
268
+          <option name="ENABLED" value="true" />
269
+        </pattern>
270
+      </extension>
271
+      <option name="SPRING_BOOT_MAIN_CLASS" value="passionproject.GameEngine" />
272
+    </configuration>
273
+    <configuration name="GameEngine" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
274
+      <module name="passionProject" />
275
+      <extension name="coverage">
276
+        <pattern>
277
+          <option name="PATTERN" value="passionproject.*" />
278
+          <option name="ENABLED" value="true" />
279
+        </pattern>
280
+      </extension>
281
+      <option name="SPRING_BOOT_MAIN_CLASS" value="passionproject.GameEngine" />
282
+    </configuration>
129 283
     <configuration default="true" type="TestNG" factoryName="TestNG">
130 284
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
131 285
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -148,6 +302,16 @@
148 302
       <properties />
149 303
       <listeners />
150 304
     </configuration>
305
+    <list>
306
+      <item itemvalue="Spring Boot.GameEngine" />
307
+      <item itemvalue="Spring Boot.GameEngine (1)" />
308
+    </list>
309
+    <recent_temporary>
310
+      <list>
311
+        <item itemvalue="Spring Boot.GameEngine (1)" />
312
+        <item itemvalue="Spring Boot.GameEngine" />
313
+      </list>
314
+    </recent_temporary>
151 315
   </component>
152 316
   <component name="SvnConfiguration">
153 317
     <configuration>$USER_HOME$/.subversion</configuration>
@@ -160,46 +324,50 @@
160 324
       <option name="presentableId" value="Default" />
161 325
       <updated>1531487848837</updated>
162 326
       <workItem from="1531487851169" duration="335000" />
327
+      <workItem from="1531488336520" duration="3134000" />
328
+      <workItem from="1531754362604" duration="257000" />
163 329
     </task>
164 330
     <servers />
165 331
   </component>
166 332
   <component name="TimeTrackingManager">
167
-    <option name="totallyTimeSpent" value="335000" />
333
+    <option name="totallyTimeSpent" value="3726000" />
168 334
   </component>
169 335
   <component name="ToolWindowManager">
170
-    <frame x="436" y="23" width="844" height="722" extended-state="0" />
336
+    <frame x="508" y="0" width="772" height="800" extended-state="6" />
337
+    <editor active="true" />
171 338
     <layout>
172
-      <window_info anchor="right" id="Palette" />
173
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
174
-      <window_info anchor="right" id="Maven Projects" />
175
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
176
-      <window_info id="Capture Tool" />
177
-      <window_info id="Designer" />
178
-      <window_info anchor="right" id="Database" />
339
+      <window_info anchor="right" id="Palette" order="3" />
340
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
341
+      <window_info anchor="right" id="Maven Projects" order="3" />
342
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
343
+      <window_info id="Capture Tool" order="2" />
344
+      <window_info id="Designer" order="2" />
345
+      <window_info anchor="right" id="Database" order="3" weight="0.32956383" />
179 346
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
180 347
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
181
-      <window_info id="UI Designer" />
348
+      <window_info id="UI Designer" order="2" />
182 349
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
183 350
       <window_info anchor="bottom" id="TODO" order="6" />
184
-      <window_info anchor="right" id="Palette&#9;" />
185
-      <window_info id="Image Layers" />
186
-      <window_info anchor="bottom" id="Java Enterprise" weight="0.3296" />
187
-      <window_info anchor="right" id="Capture Analysis" />
188
-      <window_info anchor="bottom" id="Run" order="2" />
189
-      <window_info anchor="bottom" id="Version Control" />
190
-      <window_info anchor="bottom" id="Spring" />
191
-      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.3296" />
192
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.38528678" />
193
-      <window_info anchor="right" id="Bean Validation" />
194
-      <window_info id="Web" side_tool="true" />
195
-      <window_info anchor="right" id="Theme Preview" />
196
-      <window_info id="Favorites" side_tool="true" />
197
-      <window_info anchor="bottom" id="Find" order="1" />
198
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
199
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
351
+      <window_info anchor="bottom" id="Messages" order="8" />
352
+      <window_info anchor="right" id="Palette&#9;" order="3" />
353
+      <window_info id="Image Layers" order="2" />
354
+      <window_info anchor="bottom" id="Java Enterprise" order="7" weight="0.3296" />
355
+      <window_info anchor="right" id="Capture Analysis" order="3" />
356
+      <window_info anchor="bottom" id="Run" order="2" weight="0.56" />
357
+      <window_info anchor="bottom" id="Version Control" order="7" />
358
+      <window_info anchor="bottom" id="Spring" order="7" />
359
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.41379312" />
360
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16027397" />
361
+      <window_info anchor="right" id="Bean Validation" order="3" />
362
+      <window_info id="Web" order="2" side_tool="true" />
363
+      <window_info anchor="right" id="Theme Preview" order="3" />
364
+      <window_info id="Favorites" order="2" side_tool="true" />
200 365
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
201
-      <window_info anchor="bottom" id="Message" order="0" />
366
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
202 367
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
368
+      <window_info anchor="bottom" id="Message" order="0" />
369
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
370
+      <window_info anchor="bottom" id="Find" order="1" />
203 371
     </layout>
204 372
   </component>
205 373
   <component name="TypeScriptGeneratedFilesManager">
@@ -208,6 +376,56 @@
208 376
   <component name="VcsContentAnnotationSettings">
209 377
     <option name="myLimit" value="2678400000" />
210 378
   </component>
379
+  <component name="editorHistoryManager">
380
+    <entry file="file://$PROJECT_DIR$/README.md">
381
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
382
+        <state split_layout="SPLIT">
383
+          <first_editor />
384
+          <second_editor />
385
+        </state>
386
+      </provider>
387
+    </entry>
388
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/style.css">
389
+      <provider selected="true" editor-type-id="text-editor" />
390
+    </entry>
391
+    <entry file="file://$PROJECT_DIR$/pom.xml">
392
+      <provider selected="true" editor-type-id="text-editor">
393
+        <state relative-caret-position="225">
394
+          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
395
+        </state>
396
+      </provider>
397
+    </entry>
398
+    <entry file="file://$PROJECT_DIR$/README.md">
399
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
400
+        <state split_layout="SPLIT">
401
+          <first_editor />
402
+          <second_editor />
403
+        </state>
404
+      </provider>
405
+    </entry>
406
+    <entry file="file://$USER_HOME$/Labs/passProj/src/main/java/passionproject/GameEngine.java" />
407
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/style.css">
408
+      <provider selected="true" editor-type-id="text-editor" />
409
+    </entry>
410
+    <entry file="file://$USER_HOME$/Labs/passProj/src/main/resources/application.properties" />
411
+    <entry file="file://$PROJECT_DIR$/pom.xml">
412
+      <provider selected="true" editor-type-id="text-editor">
413
+        <state relative-caret-position="225">
414
+          <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
415
+        </state>
416
+      </provider>
417
+    </entry>
418
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
419
+      <provider selected="true" editor-type-id="text-editor" />
420
+    </entry>
421
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
422
+      <provider selected="true" editor-type-id="text-editor">
423
+        <state relative-caret-position="75">
424
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
425
+        </state>
426
+      </provider>
427
+    </entry>
428
+  </component>
211 429
   <component name="masterDetails">
212 430
     <states>
213 431
       <state key="ArquillianSettingsConfigurable.UI">
@@ -221,6 +439,66 @@
221 439
           </splitter-proportions>
222 440
         </settings>
223 441
       </state>
442
+      <state key="ArtifactsStructureConfigurable.UI">
443
+        <settings>
444
+          <artifact-editor />
445
+          <splitter-proportions>
446
+            <option name="proportions">
447
+              <list>
448
+                <option value="0.2" />
449
+              </list>
450
+            </option>
451
+          </splitter-proportions>
452
+        </settings>
453
+      </state>
454
+      <state key="FacetStructureConfigurable.UI">
455
+        <settings>
456
+          <last-edited>Spring</last-edited>
457
+          <splitter-proportions>
458
+            <option name="proportions">
459
+              <list>
460
+                <option value="0.2" />
461
+              </list>
462
+            </option>
463
+          </splitter-proportions>
464
+        </settings>
465
+      </state>
466
+      <state key="GlobalLibrariesConfigurable.UI">
467
+        <settings>
468
+          <splitter-proportions>
469
+            <option name="proportions">
470
+              <list>
471
+                <option value="0.2" />
472
+              </list>
473
+            </option>
474
+          </splitter-proportions>
475
+        </settings>
476
+      </state>
477
+      <state key="JdkListConfigurable.UI">
478
+        <settings>
479
+          <last-edited>1.8</last-edited>
480
+          <splitter-proportions>
481
+            <option name="proportions">
482
+              <list>
483
+                <option value="0.2" />
484
+              </list>
485
+            </option>
486
+          </splitter-proportions>
487
+        </settings>
488
+      </state>
489
+      <state key="ModuleStructureConfigurable.UI">
490
+        <settings>
491
+          <last-edited>passionProject</last-edited>
492
+          <splitter-proportions>
493
+            <option name="proportions">
494
+              <list>
495
+                <option value="0.2" />
496
+                <option value="0.6" />
497
+              </list>
498
+            </option>
499
+          </splitter-proportions>
500
+        </settings>
501
+      </state>
224 502
       <state key="ProjectJDKs.UI">
225 503
         <settings>
226 504
           <last-edited>1.8</last-edited>
@@ -233,6 +511,18 @@
233 511
           </splitter-proportions>
234 512
         </settings>
235 513
       </state>
514
+      <state key="ProjectLibrariesConfigurable.UI">
515
+        <settings>
516
+          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
517
+          <splitter-proportions>
518
+            <option name="proportions">
519
+              <list>
520
+                <option value="0.2" />
521
+              </list>
522
+            </option>
523
+          </splitter-proportions>
524
+        </settings>
525
+      </state>
236 526
     </states>
237 527
   </component>
238 528
 </project>

BIN
lib/javaee.jar Voir le fichier


passionProject.iml → passProj.iml Voir le fichier

@@ -2,11 +2,7 @@
2 2
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3 3
   <component name="FacetManager">
4 4
     <facet type="Spring" name="Spring">
5
-      <configuration>
6
-        <fileset id="fileset" name="Spring Application Context" removed="false">
7
-          <file>file://$MODULE_DIR$/src/main/java/passionproject/GameEngine.java</file>
8
-        </fileset>
9
-      </configuration>
5
+      <configuration />
10 6
     </facet>
11 7
     <facet type="web" name="Web">
12 8
       <configuration>
@@ -31,8 +27,6 @@
31 27
     <orderEntry type="sourceFolder" forTests="false" />
32 28
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.0.RELEASE" level="project" />
33 29
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.0.RELEASE" level="project" />
34
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.0.RELEASE" level="project" />
35
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.0.RELEASE" level="project" />
36 30
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.0.RELEASE" level="project" />
37 31
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
38 32
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
@@ -60,6 +54,7 @@
60 54
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.4.RELEASE" level="project" />
61 55
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.4.RELEASE" level="project" />
62 56
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.4.RELEASE" level="project" />
57
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
63 58
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.4.RELEASE" level="project" />
64 59
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:2.0.0.RELEASE" level="project" />
65 60
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.0.RELEASE" level="project" />
@@ -70,11 +65,10 @@
70 65
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.4" level="project" />
71 66
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-webmvc:3.0.5.RELEASE" level="project" />
72 67
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-core:3.0.5.RELEASE" level="project" />
73
-    <orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
74
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
75
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-hateoas:2.0.0.RELEASE" level="project" />
76 68
     <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE" level="project" />
77 69
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
70
+    <orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
71
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
78 72
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.0.RELEASE" level="project" />
79 73
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.0.RELEASE" level="project" />
80 74
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.28" level="project" />
@@ -85,9 +79,14 @@
85 79
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.4.RELEASE" level="project" />
86 80
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.4.RELEASE" level="project" />
87 81
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.4.RELEASE" level="project" />
88
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-hal-browser:3.0.5.RELEASE" level="project" />
89
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
90
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.1" level="project" />
82
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.0.RELEASE" level="project" />
83
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.8" level="project" />
84
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.4.RELEASE" level="project" />
85
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.0.RELEASE" level="project" />
86
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.0.RELEASE" level="project" />
87
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.0.RELEASE" level="project" />
88
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.h2database:h2:1.4.196" level="project" />
89
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.45" level="project" />
91 90
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE" level="project" />
92 91
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.0.RELEASE" level="project" />
93 92
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.0.RELEASE" level="project" />
@@ -109,8 +108,5 @@
109 108
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.4.RELEASE" level="project" />
110 109
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.4.RELEASE" level="project" />
111 110
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
112
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.0.RELEASE" level="project" />
113
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.8" level="project" />
114
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.4.RELEASE" level="project" />
115 111
   </component>
116 112
 </module>

+ 23
- 31
pom.xml Voir le fichier

@@ -1,15 +1,16 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
+<project xmlns="http://maven.apache.org/POM/4.0.0"
3
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 5
     <modelVersion>4.0.0</modelVersion>
5 6
 
6
-    <groupId>com.example</groupId>
7
-    <artifactId>passionProject</artifactId>
8
-    <version>0.0.1-SNAPSHOT</version>
7
+    <groupId>groupId</groupId>
8
+    <artifactId>passProj</artifactId>
9
+    <version>1.0-SNAPSHOT</version>
9 10
     <packaging>jar</packaging>
10 11
 
11
-    <name>throwup-thursday</name>
12
-    <description>DAOs project for Spring Boot</description>
12
+    <name>passion-project</name>
13
+    <description>Passion Project</description>
13 14
 
14 15
     <parent>
15 16
         <groupId>org.springframework.boot</groupId>
@@ -35,52 +36,43 @@
35 36
         </dependency>
36 37
         <dependency>
37 38
             <groupId>org.springframework.boot</groupId>
38
-            <artifactId>spring-boot-starter-hateoas</artifactId>
39
-        </dependency>
40
-        <dependency>
41
-            <groupId>org.springframework.boot</groupId>
42 39
             <artifactId>spring-boot-starter-web</artifactId>
43 40
         </dependency>
44 41
         <dependency>
45
-            <groupId>org.springframework.data</groupId>
46
-            <artifactId>spring-data-rest-hal-browser</artifactId>
42
+            <groupId>org.springframework.boot</groupId>
43
+            <artifactId>spring-boot-starter-jdbc</artifactId>
47 44
         </dependency>
48 45
 
49 46
         <dependency>
50
-            <groupId>org.postgresql</groupId>
51
-            <artifactId>postgresql</artifactId>
47
+            <groupId>org.springframework.boot</groupId>
48
+            <artifactId>spring-boot-devtools</artifactId>
49
+            <scope>runtime</scope>
52 50
         </dependency>
53 51
         <dependency>
54
-            <groupId>org.springframework.boot</groupId>
55
-            <artifactId>spring-boot-starter-test</artifactId>
56
-            <scope>test</scope>
52
+            <groupId>com.h2database</groupId>
53
+            <artifactId>h2</artifactId>
54
+            <scope>runtime</scope>
57 55
         </dependency>
56
+        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
58 57
         <dependency>
59
-            <groupId>org.springframework.boot</groupId>
60
-            <artifactId>spring-boot-starter-jdbc</artifactId>
58
+            <groupId>mysql</groupId>
59
+            <artifactId>mysql-connector-java</artifactId>
61 60
         </dependency>
62 61
         <dependency>
63
-            <groupId>com.example</groupId>
64
-            <artifactId>passionProject</artifactId>
65
-            <version>0.0.1-SNAPSHOT</version>
62
+            <groupId>org.springframework.boot</groupId>
63
+            <artifactId>spring-boot-starter-test</artifactId>
64
+            <scope>test</scope>
66 65
         </dependency>
67
-
68
-
69 66
     </dependencies>
70 67
 
71 68
     <build>
72 69
         <plugins>
73 70
             <plugin>
74
-            <groupId>org.apache.tomcat.maven</groupId>
75
-            <artifactId>tomcat8-maven-plugin</artifactId>
76
-            <version>3.0-r1756463</version>
77
-            </plugin>
78
-            <plugin>
79 71
                 <groupId>org.springframework.boot</groupId>
80 72
                 <artifactId>spring-boot-maven-plugin</artifactId>
81 73
             </plugin>
82 74
         </plugins>
83 75
     </build>
84 76
 
85
-
86
-</project>
77
+    
78
+</project>

+ 0
- 5
src/main/java/passionproject/controller/MainMenuController.java Voir le fichier

@@ -1,5 +0,0 @@
1
-package passionproject.controller;
2
-
3
-
4
-public class MainMenuController {
5
-}

+ 12
- 14
src/main/java/passionproject/controller/QuestionsController.java Voir le fichier

@@ -1,7 +1,6 @@
1 1
 package passionproject.controller;
2 2
 
3 3
 import org.springframework.beans.factory.annotation.Autowired;
4
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
5 4
 import org.springframework.http.HttpStatus;
6 5
 import org.springframework.http.ResponseEntity;
7 6
 import org.springframework.web.bind.annotation.*;
@@ -11,34 +10,33 @@ import passionproject.repositories.QuestionRepository;
11 10
 import java.util.Optional;
12 11
 
13 12
 @CrossOrigin
14
-@EnableAutoConfiguration
15 13
 @RestController
16 14
 public class QuestionsController extends Questions {
17 15
 
18 16
     @Autowired
19 17
     QuestionRepository questionsRepository;
20 18
 
21
-    @RequestMapping(value = "/questions", method = RequestMethod.POST)
22
-    public ResponseEntity<?> createQuestion(@RequestBody Questions questions) {
23
-        questions = questionsRepository.save(questions);
24
-        return new ResponseEntity<>(questions, HttpStatus.CREATED);
19
+    @RequestMapping(value = "/game_questions", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody Questions question) {
21
+        question = questionsRepository.save(question);
22
+        return new ResponseEntity<>(question, HttpStatus.CREATED);
25 23
     }
26 24
 
27
-    @RequestMapping(value = "/questions/{questionId}", method = RequestMethod.GET)
28
-    public ResponseEntity<?> getQuestion(@RequestBody Long questionId) {
29
-        Optional<Questions> q = questionsRepository.findById(questionId);
30
-        return new ResponseEntity<>(q, HttpStatus.CREATED);
25
+    @RequestMapping(value = "/game_questions/{questionId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long questionId) {
27
+       Optional<Questions> question = questionsRepository.findById(questionId);
28
+        return new ResponseEntity<>(question, HttpStatus.OK);
31 29
 
32 30
     }
33 31
 
34
-    @RequestMapping(value = "/questions/{questionId}", method = RequestMethod.PUT)
35
-    public ResponseEntity<?> updateQuestion(@RequestBody Questions questions) {
32
+    @RequestMapping(value = "/game_questions/{questionId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody Questions questions, PathVariable questionId) {
36 34
         Questions q = questionsRepository.save(questions);
37 35
         return new ResponseEntity<>(HttpStatus.OK);
38 36
     }
39 37
 
40
-    @RequestMapping(value = "/questions/{questionId}", method = RequestMethod.DELETE)
41
-    public ResponseEntity<?> deleteQuestion(@RequestBody Long questionId) {
38
+    @RequestMapping(value = "/game_questions/{questionId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable Long questionId) {
42 40
         questionsRepository.deleteById(questionId);
43 41
         return  new ResponseEntity<>(HttpStatus.OK);
44 42
     }

+ 0
- 13
src/main/java/passionproject/model/MainMenu.java Voir le fichier

@@ -1,13 +0,0 @@
1
-package passionproject.model;
2
-
3
-import passionproject.GameEngine;
4
-
5
-public class MainMenu {
6
-    //protected Account account;
7
-    //protected GamePlay;
8
-    GameEngine engine;
9
-
10
-    public void setEngine(GameEngine engine) {
11
-        this.engine = engine;
12
-    }
13
-}

+ 4
- 6
src/main/java/passionproject/model/Questions.java Voir le fichier

@@ -1,7 +1,5 @@
1 1
 package passionproject.model;
2 2
 
3
-import passionproject.GameEngine;
4
-import java.sql.*;
5 3
 import javax.persistence.*;
6 4
 import java.util.ArrayList;
7 5
 
@@ -13,19 +11,19 @@ public class Questions{
13 11
     @Column(name = "QUESTION_ID")
14 12
     private Long id;
15 13
 
16
-    @OneToMany
14
+
17 15
     @Column(name = "EASY_QUESTIONS")
18 16
     private String easyQuestions;
19 17
 
20
-    @OneToMany
18
+
21 19
     @Column(name = "INTERMEDIATE_QUESTIONS")
22 20
     private String intermediateQuestions;
23 21
 
24
-    @OneToMany
22
+
25 23
     @Column(name = "HARD_QUESTIONS")
26 24
     private String hardQuestions;
27 25
 
28
-    @OneToMany
26
+
29 27
     @Column(name = "MYSTERY_QUESTIONS")
30 28
     private ArrayList<String> mysteryQuestions;
31 29
 

+ 2
- 0
src/main/java/passionproject/repositories/QuestionRepository.java Voir le fichier

@@ -2,7 +2,9 @@ package passionproject.repositories;
2 2
 
3 3
 
4 4
 import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.stereotype.Repository;
5 6
 import passionproject.model.Questions;
6 7
 
8
+@Repository
7 9
 public interface QuestionRepository extends CrudRepository<Questions, Long> {
8 10
 }

+ 2
- 3
src/main/resources/application.properties Voir le fichier

@@ -1,4 +1,3 @@
1 1
 spring.jpa.hibernate.ddl-auto=update
2
-spring.datasource.url=jdbc:mysql://localhost:3306/QUESTIONS?useSSL=false
3
-spring.datasource.username= root
4
-spring.datasource.password=
2
+spring.h2.console.enabled=true
3
+spring.h2.console.path=/h2-console

+ 0
- 0
src/main/resources/static/style.css Voir le fichier


+ 0
- 13
src/main/resources/users/index.html Voir le fichier

@@ -1,13 +0,0 @@
1
-<h2>Users</h2>
2
-
3
-<ul>
4
-<li th:each="user: ${allUsers}">
5
-    <a th:href="@{'/users/' + ${user.id}}">
6
-
7
-        <span th:text="${user.id}"></span>
8
-        <span th:text="${user.name}"></span>
9
-    </a>
10
-</li>
11
-</ul>
12
-
13
-<a href="/users/new">New User</a>

+ 0
- 6
src/main/resources/users/new.html Voir le fichier

@@ -1,6 +0,0 @@
1
-<h2>New User</h2>
2
-
3
-<form action="#" th:action="@{/users}" th:object="${user}" method="post">
4
-    <p>Name: <input type="text" th:field="*{name}" /></p>
5
-    <p><input type="submit" value="Submit" /> <input type="reset" value="Reset" /></p>
6
-</form>

+ 0
- 9
src/main/resources/users/show.html Voir le fichier

@@ -1,9 +0,0 @@
1
-<h2>User details</h2>
2
-<div>
3
-    <label>ID:</label><span th:text="${user.id}"></span>
4
-</div>
5
-<div>
6
-    <label>ID:</label><span th:text="${user.name}"></span>
7
-</div>
8
-
9
-<a href="/users">All Users</a>

+ 0
- 5
src/test/java/Questions.java Voir le fichier

@@ -1,5 +0,0 @@
1
-import static org.junit.Assert.*;
2
-
3
-public class Questions {
4
-
5
-}

+ 2
- 3
target/classes/application.properties Voir le fichier

@@ -1,4 +1,3 @@
1 1
 spring.jpa.hibernate.ddl-auto=update
2
-spring.datasource.url=jdbc:mysql://localhost:3306/QUESTIONS?useSSL=false
3
-spring.datasource.username= root
4
-spring.datasource.password=
2
+spring.h2.console.enabled=true
3
+spring.h2.console.path=/h2-console

BIN
target/classes/passionproject/controller/MainMenuController.class Voir le fichier


BIN
target/classes/passionproject/controller/QuestionsController.class Voir le fichier


BIN
target/classes/passionproject/model/MainMenu.class Voir le fichier


BIN
target/classes/passionproject/model/Questions.class Voir le fichier


BIN
target/classes/passionproject/repositories/QuestionRepository.class Voir le fichier


+ 0
- 0
target/classes/static/style.css Voir le fichier


+ 0
- 13
target/classes/users/index.html Voir le fichier

@@ -1,13 +0,0 @@
1
-<h2>Users</h2>
2
-
3
-<ul>
4
-<li th:each="user: ${allUsers}">
5
-    <a th:href="@{'/users/' + ${user.id}}">
6
-
7
-        <span th:text="${user.id}"></span>
8
-        <span th:text="${user.name}"></span>
9
-    </a>
10
-</li>
11
-</ul>
12
-
13
-<a href="/users/new">New User</a>

+ 0
- 6
target/classes/users/new.html Voir le fichier

@@ -1,6 +0,0 @@
1
-<h2>New User</h2>
2
-
3
-<form action="#" th:action="@{/users}" th:object="${user}" method="post">
4
-    <p>Name: <input type="text" th:field="*{name}" /></p>
5
-    <p><input type="submit" value="Submit" /> <input type="reset" value="Reset" /></p>
6
-</form>

+ 0
- 9
target/classes/users/show.html Voir le fichier

@@ -1,9 +0,0 @@
1
-<h2>User details</h2>
2
-<div>
3
-    <label>ID:</label><span th:text="${user.id}"></span>
4
-</div>
5
-<div>
6
-    <label>ID:</label><span th:text="${user.name}"></span>
7
-</div>
8
-
9
-<a href="/users">All Users</a>

BIN
target/test-classes/Questions.class Voir le fichier