From 78f386d5631980bd7070aa5b1fefea6159a09e07 Mon Sep 17 00:00:00 2001
From: Tobias Hopp <tobi@gaminggeneration.de>
Date: Sun, 4 Oct 2020 17:45:24 +0200
Subject: [PATCH] Added room_owner and welcome message thingy(server-side)

Took 24 minutes
---
 .idea/workspace.xml                    | 17 +++++++++++++----
 controller/FaqController.class.inc.php | 15 +++++++++++++++
 templates/faq.tmpl.html                |  9 +++------
 vendor/js/faq.js                       |  2 +-
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5858287..fa95b57 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,6 +21,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controller/FaqController.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/controller/FaqController.class.inc.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/faq.tmpl.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/faq.tmpl.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/vendor/js/faq.js" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/js/faq.js" afterDir="false" />
     </list>
@@ -33,7 +34,7 @@
     <execution />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="78719" />
+    <option name="totalTimeSeconds" value="80313" />
     <option name="gitIntegration" value="true" />
     <option name="naggedAbout" value="1" />
   </component>
@@ -79,7 +80,7 @@
       <updated>1601618466935</updated>
       <workItem from="1601618467981" duration="36776000" />
       <workItem from="1601809534320" duration="1558000" />
-      <workItem from="1601811106543" duration="5297000" />
+      <workItem from="1601811106543" duration="7559000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1601618764031</created>
@@ -193,7 +194,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601818395954</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="Added room_owner and welcome message thingy(client-side)">
+      <created>1601824311591</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1601824311591</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -226,7 +234,8 @@
     <MESSAGE value="Done issue #5 and #3" />
     <MESSAGE value="Fix issue #2" />
     <MESSAGE value="Fix issue #4" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix issue #4" />
+    <MESSAGE value="Added room_owner and welcome message thingy(client-side)" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added room_owner and welcome message thingy(client-side)" />
   </component>
   <component name="WindowStateProjectService">
     <state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
diff --git a/controller/FaqController.class.inc.php b/controller/FaqController.class.inc.php
index 677cc95..12ba607 100644
--- a/controller/FaqController.class.inc.php
+++ b/controller/FaqController.class.inc.php
@@ -115,5 +115,20 @@ class FaqController extends DefaultController
         return $view->getResponse();
     }
 
+    public function getWelcomeInfoAction()
+    {
+        $view = new Apitemplate();
+        $FAQModel = new FaqModel();
+        $room = $FAQModel->getRoom();
+
+        $room_owner = $FAQModel->checkUserIsRoomOwner( $room );
+        $sid = session_id();
+        $view->setResponse( array( 'is_owner' => $room_owner, 'sid' => $sid ) );
+
+        $view->setSuccess( true );
+
+        return $view->getResponse();
+    }
+
 
 }
\ No newline at end of file
diff --git a/templates/faq.tmpl.html b/templates/faq.tmpl.html
index b9a4f53..ca1af03 100755
--- a/templates/faq.tmpl.html
+++ b/templates/faq.tmpl.html
@@ -127,14 +127,11 @@
     </div>
 </div>
 
-<div class="modal fade" id="welcomeModal" tabindex="-1" role="dialog" aria-labelledby="welcomeModalLabel" aria-hidden="true">
+<div class="modal fade" id="welcomeModal" tabindex="-1" role="dialog" data-backdrop="static" data-focus="true" data-keyboard="true" aria-labelledby="welcomeModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="welcomeModalLabel">Welcome - Readme first</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                <h5 class="modal-title" id="welcomeModalLabel">Welcome - ReadMe first</h5>
             </div>
             <div class="modal-body">
                 <span>In the following page you can ask unlimited questions.<br>Your question should be contain 10 up to 500 characters.<br>The owner of this room then can answer your question.</span>
@@ -149,7 +146,7 @@
 </div>
 
 <div class="modal fade" id="errorModal" tabindex="-1" role="dialog" aria-labelledby="errorModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title text-danger" id="errorModalLabel">Error</h5>
diff --git a/vendor/js/faq.js b/vendor/js/faq.js
index bac8429..090d629 100644
--- a/vendor/js/faq.js
+++ b/vendor/js/faq.js
@@ -284,4 +284,4 @@ function welcomeMessage()
 
 
 setInterval( function() { getQuestions(); }, 1500 );
-welcomeMessage();
\ No newline at end of file
+setTimeout( function() { welcomeMessage(); getQuestions(); }, 500 );
\ No newline at end of file