Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ EduRT (education in real time) is a platform for real-time
interaction in the classrooms. Our mission is to support the
work in the active learning classes, using the mobile phones
of the students.

[![Join the chat at https://gitter.im/TelematicaUSM/EduRT](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TelematicaUSM/EduRT?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Binary file added art/favicon/3.ico
Binary file not shown.
Binary file added art/favicon/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions art/favicon/3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/favicon/3logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 14 additions & 11 deletions backend_modules/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,21 @@
# GNU AFFERO GENERAL PUBLIC LICENSE
# Version 3, 19 November 2007
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is free software: you can redistribute it
# and/or modify it under the terms of the GNU Affero General
# Public License as published by the Free Software
# Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU Affero General Public License for
# more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU Affero General
# Public License along with this program. If not, see
# <http://www.gnu.org/licenses/>.

import src
from src.wsclass import subscribe
Expand All @@ -28,7 +31,7 @@
class RouterWSC(src.wsclass.WSClass):
_path = msg.join_path(_path, 'RouterWSC')

@subscribe('toFrontend', channels={'l', 'd'})
@subscribe('toFrontend', channels={'d', 'l', 'w'})
def to_frontend(self, message):
self.redirect_content_to('w', message)

Expand Down
6 changes: 5 additions & 1 deletion conf/__init__example.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

""".. todo:: Describe secret files origin and format."""
"""
.. todo::
* Describe secret files origin and format.
* Change references to EduRT and AA
"""

from os import environ, path

Expand Down
16 changes: 10 additions & 6 deletions controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def get(self, room_code):
except db.NoObjectReturnedFromDB:
self.render(
'boxes.html',
classes=classes,
critical='El código escaneado no está '
'registrado!'
)
Expand Down Expand Up @@ -106,7 +107,8 @@ def get(self):
google_secrets['web']['client_secret'],
scope='openid profile',
redirect_uri=redirect_uri,
state=state)
state=state
)

auth_code = self.get_argument('code', False)

Expand Down Expand Up @@ -143,14 +145,16 @@ def get(self):
token = jwt.encode({'id': user.id,
'exp': self.get_exp()},
user.secret)
msg.code_debug(_path,
'Rendering login.html ...')
msg.code_debug(
_path, 'Rendering login.html ...')
self.render('login.html', token=token)

except oa2_client.FlowExchangeError:
self.render('boxes.html',
classes={'system'},
critical='Error de autenticación!')
self.render(
'boxes.html',
classes={'system'},
critical='Error de autenticación!'
)

def get_scheme(self):
if 'Scheme' in self.request.headers:
Expand Down
35 changes: 34 additions & 1 deletion locking_panels/alternatives/control/alternatives_control.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
<div class="box">
<div class="remote box">
<svg id="graphs" class="alternatives plot">
</svg>
<button id="showhide" class="alternatives-control-button show" type="button">
<svg class="alternatives-control show icon" fill="#000000" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/>
</svg>
<svg class="alternatives-control close icon" fill="#000000" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7zM2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3 2 4.27zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2zm4.31-.78l3.15 3.15.02-.16c0-1.66-1.34-3-3-3l-.17.01z"/>
</svg>
<span>Mostrar Gráficos</span></button>
<button id="terminate" class="alternatives-control-button" type="button">
<svg class="alternatives-control stop icon" fill="#000000" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M6 6h12v12H6z"/>
</svg>
<span>Terminar Pregunta</span></button>

</div>

<template id="presentation_plot">
<div class="alternatives results closed">
<button class="toggle-button">
<svg class="alternatives close icon" fill="#000000" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/>
<path d="M0 0h24v24H0z" fill="none"/>
</svg>
<svg class="alternatives open icon" fill="#000000" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"/>
<path d="M0 0h24v24H0z" fill="none"/>
</svg>
</button>
<div class="alternatives plot-wrapper">
<svg class="alternatives plot" width="300px"></svg>
</div>
</div>
</template>
Loading