From c767578e76a18edba0ede255f9b22a1a1d27e472 Mon Sep 17 00:00:00 2001 From: shunjid Date: Sun, 12 Jan 2020 00:48:19 +0600 Subject: [PATCH] fullscreen, dockerfile update --- Dockerfile | 13 ++------ Views/Home/Index.cshtml | 4 +-- wwwroot/app/src/scripts/app.js | 49 +++++++++++++++++++++++++++++- wwwroot/app/src/scripts/app.min.js | 2 +- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3bd495..e62d3ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,5 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build -COPY . /app +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base WORKDIR /app +COPY . . -RUN dotnet restore -RUN dotnet build - -EXPOSE 5000/tcp -ENV ASPNETCORE_URLS http://*:5000 -ENV ASPNETCORE_ENVIRONMENT docker - -ENTRYPOINT [ "dotnet", "watch", "run", "--no-restore", "--urls", "http://0.0.0.0:5000" ] \ No newline at end of file +CMD ASPNETCORE_URLS=http://*:$PORT dotnet routine-explorer.dll diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index 5040085..1689c1a 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -67,11 +67,11 @@
-

Class Schedule

+
Class Schedule
- Close + Close
diff --git a/wwwroot/app/src/scripts/app.js b/wwwroot/app/src/scripts/app.js index 5227956..33f42d0 100644 --- a/wwwroot/app/src/scripts/app.js +++ b/wwwroot/app/src/scripts/app.js @@ -8,7 +8,11 @@ $(document).ready(function() { }, {}) }); }); - + + $('#closeBtn').click(function () { + $('#modal1').modal('close'); + exitFullScreen(); + }); $('#btnStudentRoutine').click(function () { $('.progress').show(); @@ -33,6 +37,8 @@ $(document).ready(function() { }); $('#semesterName').text('Class Schedule : ' + response[0]["status"]["nameOfFilesUploaded"]); $('#modal1').modal('open'); + + toggleFullScreen(document.body); } }).always(function() { $('.progress').hide(); @@ -54,4 +60,45 @@ $(document).ready(function() { function replaceAll(str, find, replace) { return str.replace(new RegExp(find, 'g'), replace); } + + function isInFullScreen() { + const document = window.document; + return (document.fullscreenElement && true) || (document.webkitFullscreenElement && true) || (document.mozFullScreenElement && true) || (document.msFullscreenElement && true); + } + + function requestFullScreen(elem) { + if (elem.requestFullscreen) { + elem.requestFullscreen(); + } else if (elem.mozRequestFullScreen) { + elem.mozRequestFullScreen(); + } else if (elem.webkitRequestFullScreen) { + elem.webkitRequestFullScreen(); + } else if (elem.msRequestFullscreen) { + elem.msRequestFullscreen(); + } else { + console.warn("Did not find a requestFullScreen method on this element", elem); + } + } + + function exitFullScreen() { + const document = window.document; + if (document.exitFullscreen) { + document.exitFullscreen(); + } else if (document.webkitExitFullscreen) { + document.webkitExitFullscreen(); + } else if (document.mozCancelFullScreen) { + document.mozCancelFullScreen(); + } else if (document.msExitFullscreen) { + document.msExitFullscreen(); + } + } + + function toggleFullScreen(elem) { + // based on https://stackoverflow.com/questions/36672561/how-to-exit-fullscreen-onclick-using-javascript + if (isInFullScreen()) { + exitFullScreen(); + } else { + requestFullScreen(elem || document.body); + } + } }); \ No newline at end of file diff --git a/wwwroot/app/src/scripts/app.min.js b/wwwroot/app/src/scripts/app.min.js index def5126..fd03b98 100644 --- a/wwwroot/app/src/scripts/app.min.js +++ b/wwwroot/app/src/scripts/app.min.js @@ -1 +1 @@ -$(document).ready(function(){$.get("Home/GetLatestCodes",function(e){$(".inputCourse").autocomplete({data:e.reduce(function(e,t){return e[t]=null,e},{})})}),$("#btnStudentRoutine").click(function(){$(".progress").show(),$(".routineData").html("");let e={selectedRoutineId:$("#SelectedRoutineId").val(),firstSubject:$("#FirstSubject").val().toUpperCase(),secondSubject:$("#SecondSubject").val().toUpperCase(),thirdSubject:$("#ThirdSubject").val().toUpperCase(),fourthSubject:$("#FourthSubject").val().toUpperCase(),fifthSubject:$("#FifthSubject").val().toUpperCase()};$.post("",{courses:e},function(e){var t,o;0===e.length?(t="Provide at least a course",o="red darken-1",M.toast({html:t,classes:o})):(e.forEach(function(e){let t=e.dayOfWeek+e.timeRange;var o,a;o=":",a="\\:",t=t.replace(new RegExp(o,"g"),a),$("#"+t).append(e.courseCode+"
("+e.roomNumber+") - "+e.teacher+"
")}),$("#semesterName").text("Class Schedule : "+e[0].status.nameOfFilesUploaded),$("#modal1").modal("open"))}).always(function(){$(".progress").hide()})})}); \ No newline at end of file +$(document).ready(function(){function e(){const e=window.document;e.exitFullscreen?e.exitFullscreen():e.webkitExitFullscreen?e.webkitExitFullscreen():e.mozCancelFullScreen?e.mozCancelFullScreen():e.msExitFullscreen&&e.msExitFullscreen()}$.get("Home/GetLatestCodes",function(e){$(".inputCourse").autocomplete({data:e.reduce(function(e,t){return e[t]=null,e},{})})}),$("#closeBtn").click(function(){$("#modal1").modal("close"),e()}),$("#btnStudentRoutine").click(function(){$(".progress").show(),$(".routineData").html("");let t={selectedRoutineId:$("#SelectedRoutineId").val(),firstSubject:$("#FirstSubject").val().toUpperCase(),secondSubject:$("#SecondSubject").val().toUpperCase(),thirdSubject:$("#ThirdSubject").val().toUpperCase(),fourthSubject:$("#FourthSubject").val().toUpperCase(),fifthSubject:$("#FifthSubject").val().toUpperCase()};$.post("",{courses:t},function(t){var n,l,u;0===t.length?(l="Provide at least a course",u="red darken-1",M.toast({html:l,classes:u})):(t.forEach(function(e){let t=e.dayOfWeek+e.timeRange;var n,l;n=":",l="\\:",t=t.replace(new RegExp(n,"g"),l),$("#"+t).append(e.courseCode+"
("+e.roomNumber+") - "+e.teacher+"
")}),$("#semesterName").text("Class Schedule : "+t[0].status.nameOfFilesUploaded),$("#modal1").modal("open"),n=document.body,function(){const e=window.document;return!!e.fullscreenElement||e.webkitFullscreenElement&&!0||e.mozFullScreenElement&&!0||e.msFullscreenElement&&!0}()?e():function(e){e.requestFullscreen?e.requestFullscreen():e.mozRequestFullScreen?e.mozRequestFullScreen():e.webkitRequestFullScreen?e.webkitRequestFullScreen():e.msRequestFullscreen?e.msRequestFullscreen():console.warn("Did not find a requestFullScreen method on this element",e)}(n||document.body))}).always(function(){$(".progress").hide()})})}); \ No newline at end of file