Max Estefan Mahr · Max Estefan Mahr · 6ccc2d31 · 6ccc2d31 · 6ccc2d31 · 6ccc2d31
--- a/Max/Übung 1/.idea/codeStyles/Project.xml
+++ b/Max/Übung 1/.idea/codeStyles/Project.xml
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
--- a/Max/Übung 1/.idea/misc.xml
+++ b/Max/Übung 1/.idea/misc.xml
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/webP2-SS18-Mahr-Max-Vu.iml" filepath="$PROJECT_DIR$/.idea/webP2-SS18-Mahr-Max-Vu.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
--- a/Max/Übung 1/.idea/vorlage.iml
+++ b/Max/Übung 1/.idea/vorlage.iml
--- a/Max Mahr/Übung 1/.idea/codeStyles/Project.xml
+++ b/Max Mahr/Übung 1/.idea/codeStyles/Project.xml
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <DBN-PSQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
+  </code_scheme>
+</component>
\ No newline at end of file
--- a/Max/Übung 1/.idea/dbnavigator.xml
+++ b/Max/Übung 1/.idea/dbnavigator.xml
--- a/Max/Übung 2/.idea/misc.xml
+++ b/Max/Übung 2/.idea/misc.xml
--- a/Max/Übung 1/.idea/modules.xml
+++ b/Max/Übung 1/.idea/modules.xml
--- a/Max/Übung 1/.idea/typescript-compiler.xml
+++ b/Max/Übung 1/.idea/typescript-compiler.xml
--- a/Max/Übung 1/.idea/vcs.xml
+++ b/Max/Übung 1/.idea/vcs.xml
--- a/Max/Übung 2/.idea/ueabung2_vorlage.iml
+++ b/Max/Übung 2/.idea/ueabung2_vorlage.iml
--- a/Max/Übung 1/.idea/workspace.xml
+++ b/Max/Übung 1/.idea/workspace.xml
@@ -17,8 +17,8 @@
      <file leaf-file-name="server.ts" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/server.ts">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
+            <state relative-caret-position="62">
+              <caret line="27" column="21" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
            </state>
          </provider>
        </entry>
@@ -124,6 +124,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -140,12 +141,11 @@
          <select />
        </subPane>
      </pane>
-      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../.." />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="node.js.detected.package.prettier" value="true" />
    <property name="node.js.path.for.package.prettier" value="project" />
    <property name="node.js.selected.package.prettier" value="" />
@@ -203,18 +203,22 @@
      <workItem from="1523982380088" duration="1262000" />
      <workItem from="1524044270704" duration="54000" />
      <workItem from="1524045409875" duration="1121000" />
-      <workItem from="1524046924938" duration="815000" />
+      <workItem from="1524046924938" duration="1235000" />
+      <workItem from="1524048207944" duration="269000" />
+      <workItem from="1524065094332" duration="613000" />
+      <workItem from="1524077723063" duration="335000" />
+      <workItem from="1526910918878" duration="137000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5783000" />
+    <option name="totallyTimeSpent" value="7557000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
    <layout>
      <window_info anchor="bottom" id="TypeScript" order="0" weight="0.32909605" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.7050473" visible="true" weight="0.21610738" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7050473" visible="true" weight="0.22885907" />
      <window_info anchor="bottom" id="TODO" order="10" />
      <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
      <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
@@ -253,6 +257,62 @@
    <option name="myLimit" value="2678400000" />
  </component>
  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/server.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tsconfig.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tsconfig.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tsconfig.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tsconfig.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/server.ts">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="442">
@@ -438,8 +498,8 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/server.ts">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        <state relative-caret-position="62">
+          <caret line="27" column="21" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
        </state>
      </provider>
    </entry>

--- a/Max/Übung 1/name.html
+++ b/Max/Übung 1/name.html
--- a/Max/Übung 1/node_modules/.bin/mime
+++ b/Max/Übung 1/node_modules/.bin/mime
--- a/Max/Übung 1/node_modules/@types/body-parser/LICENSE
+++ b/Max/Übung 1/node_modules/@types/body-parser/LICENSE
--- a/Max/Übung 1/node_modules/@types/body-parser/README.md
+++ b/Max/Übung 1/node_modules/@types/body-parser/README.md
--- a/Max/Übung 1/node_modules/@types/body-parser/index.d.ts
+++ b/Max/Übung 1/node_modules/@types/body-parser/index.d.ts
--- a/Max/Übung 1/node_modules/@types/body-parser/package.json
+++ b/Max/Übung 1/node_modules/@types/body-parser/package.json