diff --git a/client/src/app/kata-displayer/kata-displayer.component.scss b/client/src/app/kata-displayer/kata-displayer.component.scss
index ddf2430cd9b9001eb02b626d894afe4f46dd33b9..6c91ebe5e0375f540e93a616aba11d88a1c84d93 100644
--- a/client/src/app/kata-displayer/kata-displayer.component.scss
+++ b/client/src/app/kata-displayer/kata-displayer.component.scss
@@ -32,4 +32,5 @@ a {
.card:hover{
background-color: var(--color-electro);
border:1px solid var(--color-electro);
+ cursor: pointer;
}
diff --git a/client/src/app/program-displayer/program-displayer.component.html b/client/src/app/program-displayer/program-displayer.component.html
index d2bff4e64993fcad7aa142fb89080685147258b9..d88d0c387a3414c3b681e81ba3fc55376df4c2de 100644
--- a/client/src/app/program-displayer/program-displayer.component.html
+++ b/client/src/app/program-displayer/program-displayer.component.html
@@ -1,4 +1,4 @@
-<div style="margin:5rem 10rem 0 10rem" *ngIf="programs">
+<div class="program-container" *ngIf="programs">
<h1 style="margin:2rem 0 0 2rem;text-align: center">All available programs</h1>
<div class="d-flex flex-wrap justify-content-start">
<div *ngFor="let program of programs">
diff --git a/client/src/app/program-displayer/program-displayer.component.scss b/client/src/app/program-displayer/program-displayer.component.scss
index b6e9607df1a41e18264f56650c0d27ad0f349959..52831518e45c2a96321b985d294adc276f7fcf17 100644
--- a/client/src/app/program-displayer/program-displayer.component.scss
+++ b/client/src/app/program-displayer/program-displayer.component.scss
@@ -7,6 +7,10 @@
float: right;
}
+.program-container{
+ margin:5rem 10rem 0 10rem;
+}
+
.language:hover {
color: var(--color-language-hover);
}
@@ -45,4 +49,5 @@ a {
.card:hover{
background-color: var(--color-electro);
border:1px solid var(--color-electro);
+ cursor: pointer;
}
diff --git a/serveur_compilation/.idea/compiler.xml b/compilation/.idea/compiler.xml
similarity index 100%
rename from serveur_compilation/.idea/compiler.xml
rename to compilation/.idea/compiler.xml
diff --git a/server_rest/.idea/misc.xml b/compilation/.idea/misc.xml
similarity index 100%
rename from server_rest/.idea/misc.xml
rename to compilation/.idea/misc.xml
diff --git a/server_rest/.idea/sbt.xml b/compilation/.idea/sbt.xml
similarity index 100%
rename from server_rest/.idea/sbt.xml
rename to compilation/.idea/sbt.xml
diff --git a/server_rest/.idea/uiDesigner.xml b/compilation/.idea/uiDesigner.xml
similarity index 100%
rename from server_rest/.idea/uiDesigner.xml
rename to compilation/.idea/uiDesigner.xml
diff --git a/server_rest/.idea/vcs.xml b/compilation/.idea/vcs.xml
similarity index 100%
rename from server_rest/.idea/vcs.xml
rename to compilation/.idea/vcs.xml
diff --git a/serveur_compilation/.idea/workspace.xml b/compilation/.idea/workspace.xml
similarity index 77%
rename from serveur_compilation/.idea/workspace.xml
rename to compilation/.idea/workspace.xml
index 5e727c3e502c6709f5e1278f0b45eba6fae63f68..b278eee7d31c5faec896e5c5e5f11c0b0cd89209 100644
--- a/serveur_compilation/.idea/workspace.xml
+++ b/compilation/.idea/workspace.xml
@@ -2,26 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/../client/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../client/package-lock.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../client/package.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/app.module.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/languages_canvas.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/languages_canvas.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/styles.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/styles.scss" afterDir="false" />
+ <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>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -36,11 +18,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<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="75">
+ <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
@@ -54,11 +36,11 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<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" lean-forward="true" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
+ <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
</state>
</provider>
</entry>
@@ -87,7 +69,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/share_docker_file/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/compilation.java" />
<option value="$PROJECT_DIR$/src/main/java/Docker_compilation.java" />
@@ -97,6 +78,7 @@
<option value="$PROJECT_DIR$/docker/java/dockerfile" />
<option value="$PROJECT_DIR$/src/main/java/HostCompilation.java" />
<option value="$PROJECT_DIR$/src/main/java/DockerCompilation.java" />
+ <option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
@@ -118,9 +100,19 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="PackagesPane" />
- <pane id="ProjectPane" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
+ <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -212,11 +204,12 @@
<workItem from="1557298034418" duration="470000" />
<workItem from="1557322368264" duration="285000" />
<workItem from="1557323560383" duration="425000" />
+ <workItem from="1557391593502" duration="685000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="29540000" />
+ <option name="totallyTimeSpent" value="30225000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -231,7 +224,7 @@
<frame x="0" y="23" width="1920" height="1121" extended-state="0" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.29872206" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30191693" />
<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" />
@@ -333,31 +326,31 @@
</entry>
<entry file="file://$PROJECT_DIR$/share_docker_file/sample.py" />
<entry file="file://$PROJECT_DIR$/share_docker_file/assert.py" />
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/docker/python/dockerfile">
<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>
+ <caret column="17" selection-start-column="17" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
+ <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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/docker/python/dockerfile">
+ <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="17" selection-start-column="17" selection-end-column="17" />
+ <state relative-caret-position="135">
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="6" column="11" lean-forward="true" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
+ <state relative-caret-position="75">
+ <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
diff --git a/serveur_compilation/__pycache__/sample.cpython-37.pyc b/compilation/__pycache__/sample.cpython-37.pyc
similarity index 100%
rename from serveur_compilation/__pycache__/sample.cpython-37.pyc
rename to compilation/__pycache__/sample.cpython-37.pyc
diff --git a/serveur_compilation/docker/java/.bashrc b/compilation/docker/java/.bashrc
similarity index 100%
rename from serveur_compilation/docker/java/.bashrc
rename to compilation/docker/java/.bashrc
diff --git a/serveur_compilation/docker/java/dockerfile b/compilation/docker/java/dockerfile
similarity index 100%
rename from serveur_compilation/docker/java/dockerfile
rename to compilation/docker/java/dockerfile
diff --git a/serveur_compilation/docker/java/files.tar b/compilation/docker/java/files.tar
similarity index 100%
rename from serveur_compilation/docker/java/files.tar
rename to compilation/docker/java/files.tar
diff --git a/serveur_compilation/docker/python/dockerfile b/compilation/docker/python/dockerfile
similarity index 100%
rename from serveur_compilation/docker/python/dockerfile
rename to compilation/docker/python/dockerfile
diff --git a/serveur_compilation/pom.xml b/compilation/pom.xml
similarity index 74%
rename from serveur_compilation/pom.xml
rename to compilation/pom.xml
index f9b5a7c0bb814964ddfda0efeb076a3565b8136a..960bbc00e035a30a5715839d9275ad381013f721 100644
--- a/serveur_compilation/pom.xml
+++ b/compilation/pom.xml
@@ -9,6 +9,24 @@
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>app</mainClass>
+ <cleanupDaemonThreads>false</cleanupDaemonThreads>
+ </configuration>
+ </plugin>
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/serveur_compilation/serveur_compilation_new.iml b/compilation/serveur_compilation_new.iml
similarity index 100%
rename from serveur_compilation/serveur_compilation_new.iml
rename to compilation/serveur_compilation_new.iml
diff --git a/serveur_compilation/share_docker_file/Kata.class b/compilation/share_docker_file/Kata.class
similarity index 100%
rename from serveur_compilation/share_docker_file/Kata.class
rename to compilation/share_docker_file/Kata.class
diff --git a/serveur_compilation/share_docker_file/Main.class b/compilation/share_docker_file/Main.class
similarity index 100%
rename from serveur_compilation/share_docker_file/Main.class
rename to compilation/share_docker_file/Main.class
diff --git a/serveur_compilation/share_docker_file/__pycache__/sample.cpython-34.pyc b/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc
similarity index 100%
rename from serveur_compilation/share_docker_file/__pycache__/sample.cpython-34.pyc
rename to compilation/share_docker_file/__pycache__/sample.cpython-34.pyc
diff --git a/serveur_compilation/share_docker_file/java_test.sh b/compilation/share_docker_file/java_test.sh
similarity index 100%
rename from serveur_compilation/share_docker_file/java_test.sh
rename to compilation/share_docker_file/java_test.sh
diff --git a/serveur_compilation/share_docker_file/junit-4.10.jar b/compilation/share_docker_file/junit-4.10.jar
similarity index 100%
rename from serveur_compilation/share_docker_file/junit-4.10.jar
rename to compilation/share_docker_file/junit-4.10.jar
diff --git a/serveur_compilation/src/main/java/DockerCompilation.java b/compilation/src/main/java/DockerCompilation.java
similarity index 100%
rename from serveur_compilation/src/main/java/DockerCompilation.java
rename to compilation/src/main/java/DockerCompilation.java
diff --git a/serveur_compilation/src/main/java/HostCompilation.java b/compilation/src/main/java/HostCompilation.java
similarity index 100%
rename from serveur_compilation/src/main/java/HostCompilation.java
rename to compilation/src/main/java/HostCompilation.java
diff --git a/serveur_compilation/src/main/java/app.java b/compilation/src/main/java/app.java
similarity index 100%
rename from serveur_compilation/src/main/java/app.java
rename to compilation/src/main/java/app.java
diff --git a/compilation/target/05-1.0-SNAPSHOT.jar b/compilation/target/05-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..70e608e3c291ebbc74fcf869294a52c6c30f587c
Binary files /dev/null and b/compilation/target/05-1.0-SNAPSHOT.jar differ
diff --git a/serveur_compilation/target/classes/DockerCompilation.class b/compilation/target/classes/DockerCompilation.class
similarity index 100%
rename from serveur_compilation/target/classes/DockerCompilation.class
rename to compilation/target/classes/DockerCompilation.class
diff --git a/serveur_compilation/target/classes/HostCompilation.class b/compilation/target/classes/HostCompilation.class
similarity index 100%
rename from serveur_compilation/target/classes/HostCompilation.class
rename to compilation/target/classes/HostCompilation.class
diff --git a/serveur_compilation/target/classes/app.class b/compilation/target/classes/app.class
similarity index 100%
rename from serveur_compilation/target/classes/app.class
rename to compilation/target/classes/app.class
diff --git a/compilation/target/maven-archiver/pom.properties b/compilation/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5f6ddc19ad7d2fbb1848bc2affeb6f0be0b531a8
--- /dev/null
+++ b/compilation/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu May 09 10:37:19 CEST 2019
+groupId=05
+artifactId=05
+version=1.0-SNAPSHOT
diff --git a/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..671eb213e52ca20e888f0ec70b4e301ce786fb0f
--- /dev/null
+++ b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,3 @@
+DockerCompilation.class
+HostCompilation.class
+app.class
diff --git a/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..fe006693a63312ec0d4bc11d213651ed4891c1c7
--- /dev/null
+++ b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,3 @@
+/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/HostCompilation.java
+/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/app.java
+/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/DockerCompilation.java
diff --git a/compilation/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/compilation/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/server_rest/.idea/compiler.xml b/gateway/.idea/compiler.xml
similarity index 100%
rename from server_rest/.idea/compiler.xml
rename to gateway/.idea/compiler.xml
diff --git a/serveur_compilation/.idea/misc.xml b/gateway/.idea/misc.xml
similarity index 100%
rename from serveur_compilation/.idea/misc.xml
rename to gateway/.idea/misc.xml
diff --git a/serveur_compilation/.idea/sbt.xml b/gateway/.idea/sbt.xml
similarity index 100%
rename from serveur_compilation/.idea/sbt.xml
rename to gateway/.idea/sbt.xml
diff --git a/serveur_compilation/.idea/uiDesigner.xml b/gateway/.idea/uiDesigner.xml
similarity index 100%
rename from serveur_compilation/.idea/uiDesigner.xml
rename to gateway/.idea/uiDesigner.xml
diff --git a/serveur_compilation/.idea/vcs.xml b/gateway/.idea/vcs.xml
similarity index 100%
rename from serveur_compilation/.idea/vcs.xml
rename to gateway/.idea/vcs.xml
diff --git a/server_rest/.idea/workspace.xml b/gateway/.idea/workspace.xml
similarity index 82%
rename from server_rest/.idea/workspace.xml
rename to gateway/.idea/workspace.xml
index ee65090bc03369f5f927b1a1b2867b6b0e19f1a4..219af3341564cea4733b8da6747198be445ca95a 100644
--- a/server_rest/.idea/workspace.xml
+++ b/gateway/.idea/workspace.xml
@@ -2,26 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/../client/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../client/package-lock.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../client/package.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/app.module.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-create/kata-create.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata-displayer/kata-displayer.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/kata/kata.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/kata/kata.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/languages_canvas.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/languages_canvas.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/main-left-side-nav/main-left-side-nav.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-create/program-create.component.ts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/app/program-displayer/program-displayer.component.scss" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../client/src/styles.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../client/src/styles.scss" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -48,8 +29,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="243">
- <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+ <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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -157,9 +138,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -229,11 +210,12 @@
<workItem from="1557298032818" duration="4720000" />
<workItem from="1557322451462" duration="202000" />
<workItem from="1557327228313" duration="707000" />
+ <workItem from="1557391556472" duration="31000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="48450000" />
+ <option name="totallyTimeSpent" value="48489000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -248,7 +230,7 @@
<frame x="0" y="23" width="1920" height="1121" extended-state="0" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2736954" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19914803" />
<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" />
@@ -490,8 +472,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+ <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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
diff --git a/server_rest/pom.xml b/gateway/pom.xml
similarity index 74%
rename from server_rest/pom.xml
rename to gateway/pom.xml
index c5be4794edffccfd186a19e6f5e75d4ea4fc3a2c..c7fa7011a667b85d7db3ef8194967adb7285c6da 100644
--- a/server_rest/pom.xml
+++ b/gateway/pom.xml
@@ -9,6 +9,21 @@
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>app</mainClass>
+ <cleanupDaemonThreads>false</cleanupDaemonThreads>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/server_rest/server_rest_new.iml b/gateway/server_rest_new.iml
similarity index 100%
rename from server_rest/server_rest_new.iml
rename to gateway/server_rest_new.iml
diff --git a/server_rest/src/main/java/Kata.java b/gateway/src/main/java/Kata.java
similarity index 100%
rename from server_rest/src/main/java/Kata.java
rename to gateway/src/main/java/Kata.java
diff --git a/server_rest/src/main/java/KataShowCase.java b/gateway/src/main/java/KataShowCase.java
similarity index 100%
rename from server_rest/src/main/java/KataShowCase.java
rename to gateway/src/main/java/KataShowCase.java
diff --git a/server_rest/src/main/java/LiveDB.java b/gateway/src/main/java/LiveDB.java
similarity index 100%
rename from server_rest/src/main/java/LiveDB.java
rename to gateway/src/main/java/LiveDB.java
diff --git a/server_rest/src/main/java/Program.java b/gateway/src/main/java/Program.java
similarity index 100%
rename from server_rest/src/main/java/Program.java
rename to gateway/src/main/java/Program.java
diff --git a/server_rest/src/main/java/ProgramShowCase.java b/gateway/src/main/java/ProgramShowCase.java
similarity index 100%
rename from server_rest/src/main/java/ProgramShowCase.java
rename to gateway/src/main/java/ProgramShowCase.java
diff --git a/server_rest/src/main/java/ProgramsDataBase.java b/gateway/src/main/java/ProgramsDataBase.java
similarity index 100%
rename from server_rest/src/main/java/ProgramsDataBase.java
rename to gateway/src/main/java/ProgramsDataBase.java
diff --git a/server_rest/src/main/java/app.java b/gateway/src/main/java/app.java
similarity index 100%
rename from server_rest/src/main/java/app.java
rename to gateway/src/main/java/app.java
diff --git a/gateway/target/09-1.0-SNAPSHOT.jar b/gateway/target/09-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..eeeac7f88df93fa4d5187d7e95c5662d03021648
Binary files /dev/null and b/gateway/target/09-1.0-SNAPSHOT.jar differ
diff --git a/server_rest/target/classes/Kata.class b/gateway/target/classes/Kata.class
similarity index 100%
rename from server_rest/target/classes/Kata.class
rename to gateway/target/classes/Kata.class
diff --git a/server_rest/target/classes/KataShowCase.class b/gateway/target/classes/KataShowCase.class
similarity index 100%
rename from server_rest/target/classes/KataShowCase.class
rename to gateway/target/classes/KataShowCase.class
diff --git a/server_rest/target/classes/LiveDB.class b/gateway/target/classes/LiveDB.class
similarity index 100%
rename from server_rest/target/classes/LiveDB.class
rename to gateway/target/classes/LiveDB.class
diff --git a/server_rest/target/classes/Program.class b/gateway/target/classes/Program.class
similarity index 100%
rename from server_rest/target/classes/Program.class
rename to gateway/target/classes/Program.class
diff --git a/server_rest/target/classes/ProgramShowCase.class b/gateway/target/classes/ProgramShowCase.class
similarity index 100%
rename from server_rest/target/classes/ProgramShowCase.class
rename to gateway/target/classes/ProgramShowCase.class
diff --git a/server_rest/target/classes/ProgramsDataBase.class b/gateway/target/classes/ProgramsDataBase.class
similarity index 100%
rename from server_rest/target/classes/ProgramsDataBase.class
rename to gateway/target/classes/ProgramsDataBase.class
diff --git a/gateway/target/classes/app.class b/gateway/target/classes/app.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c9802a0ba2547a05908d5756ebce45a16bfac3e
Binary files /dev/null and b/gateway/target/classes/app.class differ
diff --git a/gateway/target/maven-archiver/pom.properties b/gateway/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000000000000000000000000000000000..2c5c7655b9b01bd73bd26dca773942bdd8324dcc
--- /dev/null
+++ b/gateway/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu May 09 11:01:21 CEST 2019
+groupId=09
+artifactId=09
+version=1.0-SNAPSHOT
diff --git a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..7cd36fcf2ffe06afcb0fc41aaf3606bfaa87551d
--- /dev/null
+++ b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,7 @@
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/app.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/Program.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/Kata.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/LiveDB.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/KataShowCase.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/ProgramsDataBase.java
+/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/ProgramShowCase.java
diff --git a/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/launch.sh b/launch.sh
deleted file mode 100755
index 673bf2c6915c5d1dc33ccad9a5fb3913707c1a37..0000000000000000000000000000000000000000
--- a/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd client
-ng serve --open
\ No newline at end of file
diff --git a/server_rest/target/classes/app.class b/server_rest/target/classes/app.class
deleted file mode 100644
index 4330328ec39ca3c488dd2ea4f9dae24083eb77d9..0000000000000000000000000000000000000000
Binary files a/server_rest/target/classes/app.class and /dev/null differ