diff --git a/README.md b/README.md index 911fcd10b3c80a2df301b0c43bd00498c2c7e39b..224b53ed756e4caeb4d804b7c54834ebf164fd37 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,35 @@ # Dojo Hepia +## RUN TAG - DojoHepia-v1.0.3 + +### prerequisites + +MAVEN +DOCKER +ANGULAR CLI + +#### Client + +>./client/ +``` +npm install +ng serve --open +``` + +#### Gateway +>./gateway/ +``` +mvn package +mvn exec:java +``` + +#### Compilateur +>./compilation/ +``` +mvn package +mvn exec:java +``` + ## Vocabulaire | Art - Martial | Dojo Hepia | |---------------|------------------| diff --git a/compilation/.idea/workspace.xml b/compilation/.idea/workspace.xml index b278eee7d31c5faec896e5c5e5f11c0b0cd89209..6434958d6fddeb1ee9cdb2c309b0ea401beb3bb4 100644 --- a/compilation/.idea/workspace.xml +++ b/compilation/.idea/workspace.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> - </list> + <list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment="" /> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -18,11 +15,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" /> + <state> + <caret column="22" selection-start-column="22" selection-end-column="22" /> </state> </provider> </entry> @@ -36,11 +33,11 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" /> + <state relative-caret-position="255"> + <caret line="20" column="127" selection-start-line="20" selection-start-column="127" selection-end-line="20" selection-end-column="127" /> </state> </provider> </entry> @@ -100,18 +97,36 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <expand> <path> - <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> - <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> + <item name="compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="compilation" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="compilation" type="b2602c69:ProjectViewProjectNode" /> + <item name="compilation" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> </subPane> </pane> + <pane id="PackagesPane" /> <pane id="Scope" /> </panes> </component> @@ -209,7 +224,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="30225000" /> + <option name="totallyTimeSpent" value="30231000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -221,10 +236,10 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1920" height="1121" extended-state="0" /> + <frame x="0" y="0" width="1920" height="1200" extended-state="6" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30191693" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30830672" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -335,8 +350,8 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" /> + <state relative-caret-position="255"> + <caret line="20" column="127" selection-start-line="20" selection-start-column="127" selection-end-line="20" selection-end-column="127" /> </state> </provider> </entry> @@ -349,8 +364,8 @@ </entry> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" /> + <state> + <caret column="22" selection-start-column="22" selection-end-column="22" /> </state> </provider> </entry> diff --git a/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc b/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc index 33e5cc370319eb6c340f87ad47ab89fad1a2cfa1..1f9fb93a98994d2cf9dd087eeec1a316a67cab64 100644 Binary files a/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc and b/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc differ diff --git a/compilation/src/main/java/DockerCompilation.java b/compilation/src/main/java/DockerCompilation.java index 912d0ad34ce33db065b25355b69b03bae5e297a2..5f5c597792d69bf550faff5c79b7695c3eb75cf0 100644 --- a/compilation/src/main/java/DockerCompilation.java +++ b/compilation/src/main/java/DockerCompilation.java @@ -7,18 +7,18 @@ public class DockerCompilation { public HashMap<String, Object> execute_kata(JSONObject input) { - String filename = "", filename_test="todeleteifitstayslikethis", cmd = "", line, output = "", error = ""; + String filename = "", filename_test = "todeleteifitstayslikethis", cmd = "", line, output = "", error = "", dir = System.getProperty("user.dir"); switch (input.get("language").toString()) { case "python": filename = "share_docker_file/sample.py"; filename_test = "share_docker_file/assert.py"; - cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/compilation/share_docker_file,dst=/env/ hey:1.1 python3 assert.py"; + cmd = "docker run --rm --mount type=bind,source=" + dir + "/share_docker_file,dst=/env/ hey:1.1 python3 assert.py"; break; case "java": filename = "share_docker_file/kata.java"; filename_test = "share_docker_file/Main.java"; - cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/compilation/share_docker_file,dst=/env/ java:4.0 ./java_test.sh"; + cmd = "docker run --rm --mount type=bind,source=" + dir + "/share_docker_file,dst=/env/ java:4.0 ./java_test.sh"; break; } @@ -30,7 +30,7 @@ public class DockerCompilation { e.printStackTrace(); } - try(PrintWriter writer = new PrintWriter(filename_test,"UTF-8")){ + try (PrintWriter writer = new PrintWriter(filename_test, "UTF-8")) { writer.println(input.get("assert")); } catch (FileNotFoundException e) { e.printStackTrace(); diff --git a/compilation/target/classes/DockerCompilation.class b/compilation/target/classes/DockerCompilation.class index bd1b5426e62763ffa986a8644beefa3cfc242cdb..add662ae449422bced5ecbabbea96ad7d9c00271 100644 Binary files a/compilation/target/classes/DockerCompilation.class and b/compilation/target/classes/DockerCompilation.class differ diff --git a/gateway/.idea/workspace.xml b/gateway/.idea/workspace.xml index 219af3341564cea4733b8da6747198be445ca95a..c1cd7a767657ad4bddd34b2edf488de627dc3b76 100644 --- a/gateway/.idea/workspace.xml +++ b/gateway/.idea/workspace.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - </list> + <list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment="" /> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -20,8 +18,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="555"> - <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" /> + <state relative-caret-position="945"> + <caret line="63" column="4" selection-start-line="63" selection-start-column="4" selection-end-line="63" selection-end-column="4" /> </state> </provider> </entry> @@ -29,8 +27,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="277"> - <caret line="60" column="34" selection-start-line="60" selection-start-column="34" selection-end-line="60" selection-end-column="34" /> + <state relative-caret-position="840"> + <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -38,35 +36,11 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/LiveDB.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="585"> - <caret line="41" column="39" selection-start-line="41" selection-start-column="39" selection-end-line="41" selection-end-column="39" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/Kata.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="1" column="86" selection-start-line="1" selection-start-column="86" selection-end-line="1" selection-end-column="86" /> - <folding> - <element signature="e#1681#1682#0" expanded="true" /> - <element signature="e#1712#1713#0" expanded="true" /> - <element signature="e#1760#1761#0" expanded="true" /> - <element signature="e#1800#1801#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/ProgramsDataBase.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="43" /> + <state relative-caret-position="150"> + <caret line="10" selection-start-line="10" selection-end-line="10" /> </state> </provider> </entry> @@ -139,7 +113,35 @@ </navigator> <panes> <pane id="PackagesPane" /> - <pane id="ProjectPane" /> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="gateway" type="b2602c69:ProjectViewProjectNode" /> + <item name="gateway" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="gateway" type="b2602c69:ProjectViewProjectNode" /> + <item name="gateway" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="gateway" type="b2602c69:ProjectViewProjectNode" /> + <item name="gateway" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="gateway" type="b2602c69:ProjectViewProjectNode" /> + <item name="gateway" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> <pane id="Scope" /> </panes> </component> @@ -215,7 +217,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="48489000" /> + <option name="totallyTimeSpent" value="48495000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -227,10 +229,10 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1920" height="1121" extended-state="0" /> + <frame x="0" y="0" width="1920" height="1200" extended-state="0" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19914803" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.157082" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -438,8 +440,8 @@ </entry> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="555"> - <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" /> + <state relative-caret-position="945"> + <caret line="63" column="4" selection-start-line="63" selection-start-column="4" selection-end-line="63" selection-end-column="4" /> </state> </provider> </entry> @@ -465,15 +467,15 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/ProgramsDataBase.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="43" /> + <state relative-caret-position="150"> + <caret line="10" selection-start-line="10" selection-end-line="10" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="277"> - <caret line="60" column="34" selection-start-line="60" selection-start-column="34" selection-end-line="60" selection-end-column="34" /> + <state relative-caret-position="840"> + <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" /> <folding> <element signature="imports" expanded="true" /> </folding> diff --git a/gateway/target/classes/META-INF/09.kotlin_module b/gateway/target/classes/META-INF/09.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c Binary files /dev/null and b/gateway/target/classes/META-INF/09.kotlin_module differ