TobiasH/online-faq
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Update room options menu #8 and #7

Browse Source 
Took 15 minutes
This commit is contained in:
Tobias Hopp 2020-10-05 22:35:27 +02:00
parent c553843b18
commit d04e90f2cd
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/workspace.xml generated
View File

@ -20,7 +20,9 @@
</component>
<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$/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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -31,7 +33,7 @@
<execution />
</component>
<component name="DarkyenusTimeTracker">
<option name="totalTimeSeconds" value="95806" />
<option name="totalTimeSeconds" value="96666" />
<option name="gitIntegration" value="true" />
<option name="naggedAbout" value="1" />
</component>
@ -77,7 +79,7 @@
<updated>1601618466935</updated>
<workItem from="1601618467981" duration="36776000" />
<workItem from="1601809534320" duration="1558000" />
<workItem from="1601811106543" duration="32045000" />
<workItem from="1601811106543" duration="33361000" />
</task>
<task id="LOCAL-00001" summary="Initial commit">
<created>1601618764031</created>
@ -359,7 +361,14 @@
<option name="project" value="LOCAL" />
<updated>1601927982214</updated>
</task>
<option name="localTasksCounter" value="41" />
<task id="LOCAL-00041" summary="Update copy system of url">
<created>1601928707724</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1601928707724</updated>
</task>
<option name="localTasksCounter" value="42" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -378,7 +387,6 @@
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Fix issue #2" />
<MESSAGE value="Fix issue #4" />
<MESSAGE value="Added room_owner and welcome message thingy(client-side)" />
<MESSAGE value="Added room_owner and welcome message thingy(server-side)" />
@ -403,7 +411,8 @@
<MESSAGE value="fix room lock msgs" />
<MESSAGE value="Update options menu" />
<MESSAGE value="Fixing 500 server error #12" />
<option name="LAST_COMMIT_MESSAGE" value="Fixing 500 server error #12" />
<MESSAGE value="Update copy system of url" />
<option name="LAST_COMMIT_MESSAGE" value="Update copy system of url" />
</component>
<component name="WindowStateProjectService">
<state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
@ -462,9 +471,9 @@
<screen x="0" y="34" width="1920" height="1046" />
</state>
<state x="624" y="254" key="run.anything.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601922739895" />
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup" timestamp="1601893370899">
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup" timestamp="1601929801067">
<screen x="0" y="34" width="1920" height="1046" />
</state>
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601893370899" />
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601929801067" />
</component>
</project>

21
templates/faq.tmpl.html
View File

@ -113,21 +113,24 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="optionsModalLabel">Room-Options(not finished yet)</h5>
<h5 class="modal-title text-info" id="optionsModalLabel">Room-Options</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<span class="text-danger" id="optionsErrorMsg"></span>
<div class="form-group">
Not finished yet! - Options not working.
<label for="lock_room">Lock Room?</label>
<input type="checkbox" class="form-control" [[LOCKED]] id="lock_room">
<label for="secret_url">Admin-URL</label>
<input type="text" readonly class="form-control" value="https://faq.hw-table.de/?code=XXXX&secret=XXXXXXXXXXXXX" id="secret_url">
</div>
<form>
<div class="form-check">
<input type="checkbox" class="form-check-input" [[LOCKED]] id="lock_room">
<label for="lock_room" class="form-check-label">Lock Room</label>
</div>
<br>
<div class="form-group">
<label for="secret_url">Admin-URL</label>
<input type="text" readonly class="form-control" value="https://faq.hw-table.de/?code=XXXX&secret=XXXXXXXXXXXXX" onclick="this.select();" id="secret_url">
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Discard</button>

11
vendor/js/faq.js vendored
View File

@ -18,6 +18,8 @@ const question = $('#question' );
const askButton = $('#askBtn' );
const nickname = $('#nickname' );
let is_owner = false;
let room_code = '00AA';
let q_interval = '';
function request( a_uri, a_data, a_successhandler, a_errorhandler )
{
@ -212,7 +214,7 @@ function answer()
function getQuestions()
{
request( 'getQuestions', {}, function (result)
request( 'getQuestions', {"room_code":room_code}, function (result)
{
let questions_list = [];
@ -260,7 +262,12 @@ function getQuestions()
},
function ( result )
{
setTimeout( function(){
errorMsg.html( "Oopsie! We can't refresh the questions.<br>Please check your internet connection and reload your page!" );
errorModal.modal( 'show' );
}, 100 );
clearInterval( q_interval );
}
);
}
@ -303,7 +310,7 @@ function closeWelcome() {
if (refresh_rate < 2 || refresh_rate > 122) {
refresh_rate = 2;
}
let q_interval = setInterval(function () {
q_interval = setInterval(function () {
getQuestions();
}, refresh_rate * 1000);