Merge branch 'main' of https://github.com/BigJIU/MarioWeb

.idea/workspace.xml

@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/GameTutorial.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameTutorial.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -38,12 +40,16 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
+  <component name="PropertiesComponent">{
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+  &quot;keyToString&quot;: {
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    <property name="WebServerToolWindowFactoryState" value="false" />
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-  </component>
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/duaho/Projects/website materials/MarioWeb/Mario-AI-Interface&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
+  }
+}</component>
   <component name="RunManager" selected="Flask server.Flask (main.py)">
     <configuration name="MarioWeb" type="PythonConfigurationType" factoryName="Python">
       <module name="MarioWeb" />
@@ -154,7 +160,8 @@
       <workItem from="1667998268807" duration="2593000" />
       <workItem from="1668064138807" duration="9019000" />
       <workItem from="1668486144158" duration="499000" />
-      <workItem from="1668580997687" duration="473000" />
+      <workItem from="1668492153120" duration="654000" />
+      <workItem from="1668520247886" duration="913000" />
     </task>
     <servers />
   </component>
@@ -171,11 +178,10 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1668520582987" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) (1) Coverage Results" MODIFIED="1668079945407" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1668581358674" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>

data/questionare.csv

@@ -65,3 +65,6 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,,,,,
 127.0.0.1,,,,,
 127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,

templates/GameTutorial.html

@@ -128,7 +128,14 @@
 
         <div class="col-md-12">
           <div align="center">
-            <h3>Mario Game User Test</h3>
+            <h3>Mario Game Tutorial</h3>
+          </div>
+            <div align="center">
+                <p>
+                    Further description of Tutorial can be done here<br>
+                    Use the way of Play That you selected
+                </p>
+
             </div>
           <div align="center" id = "GameWindow">
             
@@ -136,13 +143,13 @@
           
         </div>
         
-        <div class="col-md-6" align="center" style="visibility: visible;" id = "next">
+        <div class="col-md-6" align="center" style="visibility: hidden;" id = "next">
           <br>
           <button onclick="
           window.location.href = window.location.href;
           "><h3>Play Next Tutorial</h3></button>
         </div>
-        <div class="col-md-6" align="center" style="visibility: visible;" id = "game">
+        <div class="col-md-6" align="center" style="visibility: hidden;" id = "game">
           <br>
           <button onclick="
           window.location.href = window.location.href+'/data'