Merge pull request #16 from Ruby-Network/iframe-exit

Fullscreen exit, version management

Author: MotorTruck1221

main.rb

@@ -46,11 +46,10 @@
 uvPath()
 
 # Other routes
-get '/?:unlock?' do
+get '/:unlock?' do
   erb :index, :layout => :"layouts/index"
 end
 
-
 #Auth to login to the site
 post '/auth' do 
   if params[:password] == Settings.password && params[:username] == Settings.username
@@ -60,4 +59,4 @@
   else
     redirect '/'
   end
-end
+end

node-server/server.js

@@ -12,9 +12,11 @@ const __dirname = path.resolve();
 const settings = YAML.parse(fs.readFileSync(path.join(__dirname, '/config/settings.yml'), 'utf8'));
 import chalk from 'chalk';
 import compile from './compile.js';
+import getLatestRelease from './version.js';
 let rubyPort = process.argv.find((arg) => arg.startsWith('--ruby-port')).split('=')[1] || 9292;
 let nodePort = process.argv.find((arg) => arg.startsWith('--node-port')).split('=')[1] || 9293;
 
+const latestRelease = await getLatestRelease();
 const bare = createBareServer('/bare/');
 const rh = createRammerhead();
 const rammerheadScopes = [ "/rammerhead.js", "/hammerhead.js", "/transport-worker.js", "/task.js", "/iframe-task.js", "/worker-hammerhead.js", "/messaging", "/sessionexists", "/deletesession", "/newsession", "/editsession", "/needpassword", "/syncLocalStorage", "/api/shuffleDict", "/mainport" ];
@@ -80,6 +82,9 @@ app.get('/search=:query', async (req, res) => {
         reply.code(500).send({ error: "Internal Server Error" });
     }
 });
+app.get('/version', async (req, res) => {
+    res.send({ version: latestRelease });
+});
 
 app.listen({ port: nodePort, host: '0.0.0.0' });
 console.log(chalk.green(`Server listening on port ${chalk.red(nodePort)}`));

node-server/version.js

@@ -0,0 +1,8 @@
+async function getLatestRelease() {
+    console.log('Fetching latest release...')
+    let version = await fetch('https://api.github.com/repos/Ruby-Network/ruby/releases/latest').then((res) => res.json());
+    console.log('Latest release fetched.')
+    return version.tag_name;
+}
+
+export default getLatestRelease;

require.rb

@@ -13,4 +13,4 @@
 require './ruby/utils.rb'
 require './ruby/uv.rb'
 require './ruby/auth.rb'
-require './ruby/yamlValidator.rb'
+require './ruby/yamlValidator.rb'

ruby/auth.rb

@@ -24,6 +24,6 @@ def call(env)
 end
 def auth 
   if session[:auth] != true
-    halt erb :'edu/v1/index'
+    halt erb :'edu/v1/index', :layout => :"layouts/index"
   end
 end

src/public/css/style.css

@@ -90,27 +90,11 @@ function fullscreen() {
             iframe.style.zIndex = '9998';
             //add a transition
             iframe.style.transition = 'all 0.5s ease-in-out';
+            document.getElementById('exit-iframe').classList.remove('dnone');
             //listen for escape key
             document.addEventListener('keydown', function(e) {
                 if (e.key === 'Escape') {
-                    //reset all styles
-                    iframe.style.position = '';
-                    iframe.style.top = '';
-                    iframe.style.left = '';
-                    iframe.style.width = '';
-                    iframe.style.height = '';
-                    iframe.style.zIndex = '';
-                    iframe.style.transition = '';
-                }
-                else if (e.key === 'Escape' && e.altKey) {
-                    //reset all styles
-                    iframe.style.position = '';
-                    iframe.style.top = '';
-                    iframe.style.left = '';
-                    iframe.style.width = '';
-                    iframe.style.height = '';
-                    iframe.style.zIndex = '';
-                    iframe.style.transition = '';
+                    exitIframe();
                 }
             });
         }
@@ -137,3 +121,13 @@ function isIframeLoaded() {
         updateURLBar(iframe.contentWindow.location.href);
     });
 }
+function exitIframe() {
+    iframe.style.position = '';
+    iframe.style.top = '';
+    iframe.style.left = '';
+    iframe.style.width = '';
+    iframe.style.height = '';
+    iframe.style.zIndex = '';
+    iframe.style.transition = '';
+    document.getElementById('exit-iframe').classList.add('dnone');
+}

src/public/js/controls.js

@@ -0,0 +1,15 @@
+//This file is here to handle updated of the website.
+function getLatestRelease() {
+    let xhr = new XMLHttpRequest();
+    xhr.open('GET', '/version', false);
+    xhr.send();
+    let textResp = xhr.responseText;
+    return JSON.parse(textResp)
+}
+const userVersion = localStorage.getItem('version');
+let latestRelease = getLatestRelease();
+if (userVersion != latestRelease.version || userVersion == null || userVersion == undefined) {
+    localStorage.setItem('updated', true);
+    localStorage.setItem('version', latestRelease.version);
+    uninstallAllSW();
+}