removes npm and node dependency.

update looks and documentation. include freebsd configuration files. remove delay on POST answers since animations already have delay.

removes npm and node dependency.
update looks and documentation. include freebsd configuration files. remove delay on POST answers since animations already have delay.
Miguel Barão
1 parent d5cecbcf
Showing 16 changed files with 182 additions and 194 deletions Show diff stats
BUGS.md
README.md
aprendizations/__init__.py
aprendizations/learnapp.py
aprendizations/questions.py
aprendizations/serve.py
aprendizations/static/codemirror
aprendizations/static/fontawesome-free
aprendizations/templates/courses.html
aprendizations/templates/maintopics-table.html
aprendizations/templates/rankings.html
aprendizations/templates/topic.html
freebsd/pf.conf
freebsd/rc.conf
package-lock.json
package.json
-
 # BUGS
-- se na especificacao de um curso, a referencia do topico nao existir como directorio, rebenta.
+- nao esta a respeitar o numero de tentativas `max_tries`.
+- se na especificacao de um curso, a referencia do topico nao existir como
+  directorio, rebenta.
 - internal server error ao fazer logout no macos python3.8
 - GET can get filtered by browser cache
 - topicos chapter devem ser automaticamente completos assim que as dependencias
 # Getting Started
-Latest review: 2021-07-08
+Latest review: 2021-11-08
 ## Installation
 To complete the installation we will need to perform the following steps:
-1. install python3, pip and npm
-2. download aprendizations from the repository
-3. install javascript libraries (with npm)
-4. install aprendizations (with pip)
-5. generate SSL certificates
-6. configure the firewall (optional)
+1. install python3 and pip
+2. install aprendizations
+3. generate SSL certificates
+4. configure the firewall (optional)
 To use the software we need to:
-1. initialize database
+1. initialize a database
 2. go to the demo directory (or an existing course)
-3. run `aprendizations demo.yaml`
+3. run `aprendizations courses.yaml`
 Each of these steps is explained below.
-### Install python3 with sqlite3 support and npm
+### Install python3 with sqlite3 support
-Python can be installed either from the system package management or compiled
-from sources.
-
-#### Installing from the system package manager
-
-```sh
-sudo pkg install python3 npm        # FreeBSD
-sudo apt install python3 npm        # Linux (Ubuntu)
-sudo port install python38 npm7     # MacOS
-```
-
-In FreeBSD also install `py3X-sqlite3` where `X` is the python version.
-
-#### Installing from source (outdated)
-
-Make sure that the build tools and libraries are installed:
+Minimum supported version is python3.8. The installed versions depend on the
+operating system default.
 ```sh
-# Ubuntu:
-sudo apt install build-essential libssl-dev zlib1g-dev libncurses5-dev \
-  libncursesw5-dev libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev \
-  libbz2-dev libexpat1-dev liblzma-dev tk-dev libffi-dev
+sudo pkg install python3 py38-sqlite3   # FreeBSD
+sudo apt install python3                # Linux (Ubuntu)
+sudo port install python39              # MacOS
 ```
-Download [python](http://www.python.org) and
-
-```sh
-tar xvfJ Python-3.7.tar.xz
-cd Python-3.7
-./configure --prefix=$HOME/.local --enable-optimizations
-make && make install
-```
-
-This will install python locally under `~/.local/bin`. Make sure to add it to
-your `PATH` in `~/.profile`. If `~/bin` is already in the path, just make a
-symbolic link `ln -s ~/.local/bin ~/bin`.
-
 ### Install pip
 Install `pip` from the system package manager:
 ```sh
-sudo apt install python3-pip       # Ubuntu
-sudo pkg py38-pip                  # FreeBSD
+sudo pkg install py38-pip          # FreeBSD
+sudo apt install python3-pip       # Linux (Ubuntu)
 sudo port install py39-pip         # MacOS
 ```
-Then run `python3 -m pip install -U pip` to install latest version into your
-user account under `~/.local/bin`.
 In the end you should be able to run `pip --version` and `python3 -c "import
 sqlite3"` without errors.
-In some systems, `pip` can be named `pip3`, `pip3.8` or `pip-3.8`.
+In some systems, `pip` can be named `pip3`, `pip3.8` or `pip-3.8`, etc.
-Edit the configuration file `~/.config/pip/pip.conf` (FreeBSD, Linux) or
+Packages should **not** be installed system-wide. To install locally in the user
+area, edit the configuration file `~/.config/pip/pip.conf` (FreeBSD, Linux) or
 `Library/Application Support/pip/pip.conf` (MacOS) and add the lines
 ```ini
@@ -84,30 +53,22 @@ Edit the configuration file `~/.config/pip/pip.conf` (FreeBSD, Linux) or
 user = yes
 ```
-This will set pip to install modules in the user area (recommended).
-
-### Download and install aprendizations
+### Install aprendizations
 ```sh
-git clone https://git.xdi.uevora.pt/mjsb/aprendizations.git
-cd aprendizations
-npm install             # install javascript libraries
-pip install .           # install aprendizations and dependencies
+pip install git+https://git.xdi.uevora.pt/mjsb/aprendizations.git
 ```
-Javascript libraries are installed in `aprendizations/node_modules` and are
-linked from `aprendizations/aprendizations/static`.
-
 Python packages are usually installed in:
 * `~/.local/lib/python3.8/site-packages/` in Linux/FreeBSD.
 * `~/Library/python/3.9/lib/python/site-packages/` in MacOS.
 When aprendizations is installed with pip, all the dependencies are also
-installed. The javascript libraries previously installed with npm are copied to
-the above directory and the cloned repository is no longer needed.
+installed.
-At this point `aprendizations` is installed in
+At this point, the commands `aprendizations` and `initdb-aprendizations` are
+installed in
 ```sh
 ~/.local/bin                          # Linux/FreeBSD
@@ -119,6 +80,7 @@ and can be run from the terminal:
 ```sh
 aprendizations --version
 aprendizations --help
+initdb-aprendizations --help
 ```
 ### SSL Certificates
@@ -172,7 +134,7 @@ chmod 400 cert.pem privkey.pem
 User data is maintained in a sqlite3 database which has to be created manually
 using the `initdb-aprendizations` command.  The database file should be located
-in the same directory as the main YAML configuration file.
+in the same directory as the main YAML configuration file (`courses.yaml`).
 For example, to run the included demo do:
@@ -190,12 +152,12 @@ The default password is equal to the user name, if left undefined.
 ### Running the demo
-The application includes a small example in `demo/demo.yaml` that can be used
+The application includes a small example in `demo/courses.yaml` that can be used
 for initial testing. Run it with
 ```sh
 cd demo
-aprendizations demo.yaml
+aprendizations courses.yaml
 ```
 Open the browser at [https://127.0.0.1:8443](https://127.0.0.1:8443).
@@ -237,28 +199,25 @@ pflog_logfile=&quot;/var/log/pflog&quot;
 Reboot or `sudo service pf start`.
+Example configuration files are in the `freebsd` directory.
+
 ### Testing the system
 Make sure the following steps have been done:
-* installed python3, pip and npm
-* git-cloned the aprendizations from the main repository
-* installed javascript libraries with npm
-* installed aprendizations with pip
+* installed python3 and pip
+* installed aprendizations using pip
 * initialized database with at least 1 user
 * generate and copy certificates to the appropriate place
 * (optional) configure the firewall to do port forwarding
-* run `aprendizations demo.yaml --check`
+* run `aprendizations courses.yaml --check`
 ## Keeping aprendizations updated
 To update aprendizations to the latest version do:
 ```sh
-cd aprendizations
-git pull                # get latest version
-npm update              # update javascript libraries
-pip install -U .        # updates installed version
+pip install -U git+https://git.xdi.uevora.pt/mjsb/aprendizations.git
 ```
 ## Troubleshooting
@@ -304,22 +263,6 @@ To fix this issue you need to allow animations in the Operating System:
 * On MacOS or iOS search for reduced motion and switch it **OFF**
   (Preferences -> Acessibility -> Display -> Reduce motion).
-
-#### The application runs but questions do not show up
-
-Some operating systems have an option to disable animations to try to avoid
-motion sickness in some people. Browsers will check this option with the OS and
-prevent animate.css library to work. Since questions have several animations,
-these will will not work and nothing is shown on the page.
-
-To fix this issue you need to allow animations in the Operating System:
-
-- On windows 10, go to System Preferences, search for "Show animations in
-  windows" and turn it **ON**.
-- On MacOS or iOS search for reduced motion and switch it **OFF**
-  (Preferences -> Acessibility -> Display -> Reduce motion).
-
-
 ## FAQ
 Common database manipulations:
@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.
 '''
 APP_NAME = 'aprendizations'
-APP_VERSION = '2021.08.dev1'
+APP_VERSION = '2021.11.dev1'
 APP_DESCRIPTION = __doc__
 __author__ = 'Miguel Barão'
@@ -86,7 +86,7 @@ class LearnApp():
         for course_file in config.get('topics_from', []):
             course_conf = load_yaml(course_file)    # course configuration
             # FIXME set defaults??
-            logger.info('%6d topics imported from %s',
+            logger.info('%6d topics from %s',
                         len(course_conf["topics"]), course_file)
             self._populate_graph(course_conf)
         logger.info('Graph has %d topics', len(self.deps))
@@ -327,7 +327,7 @@ class LearnApp():
             logger.warning('"%s" could not start course "%s"', uid, course_id)
             raise LearnException() from exc
         else:
-            logger.info('User "%s" started course "%s"', uid, course_id)
+            logger.info('User "%s" course "%s"', uid, course_id)
     # ------------------------------------------------------------------------
     #
@@ -609,15 +609,17 @@ class LearnApp():
         This should be modified to have a "visible" flag
         '''
-        logger.info('User "%s" get rankings for %s', uid, course_id)
-        query_students = select(Student.id, Student.name)
-        query_student_topics = select(StudentTopic.student_id,
-                                      StudentTopic.topic_id,
-                                      StudentTopic.level,
-                                      StudentTopic.date)
-        query_total = select(Answer.student_id, func.count(Answer.ref))
-        query_right = select(Answer.student_id, func.count(Answer.ref)).where(Answer.grade == 1.0)
+        logger.info('User "%s" rankings for "%s"', uid, course_id)
         with Session(self._engine, future=True) as session:
+            query_students = select(Student.id, Student.name)
+            query_student_topics = select(StudentTopic.student_id,
+                                        StudentTopic.topic_id,
+                                        StudentTopic.level,
+                                        StudentTopic.date)
+            query_total = select(Answer.student_id, func.count(Answer.ref))
+            query_right = select(Answer.student_id, func.count(Answer.ref)) \
+                          .where(Answer.grade == 1.0)
+
             # all students in the database  FIXME only with answers of this course
             students = session.execute(query_students).all()
@@ -625,6 +627,9 @@ class LearnApp():
             student_topics = session.execute(query_student_topics).all()
             # answer performance
+
+            # FIXME this does not work when nobody has done anything...
+            # FIXME row to dict seems to be deprecated in 1.4+
             total = dict(session.execute(query_total).all())
             right = dict(session.execute(query_right).all())
 '''
-Classes the implement several types of questions.
+File:           aprendizations/questions.py
+Description:    Classes the implement several types of questions.
 '''
@@ -84,6 +85,7 @@ class QuestionRadio(Question):
         choose (int)  # only used if shuffle=True
     '''
+    # ------------------------------------------------------------------------
     def gen(self) -> None:
         '''
         Sets defaults, performs checks and generates the actual question
@@ -692,4 +694,4 @@ class QFactory():
     # ------------------------------------------------------------------------
     def generate(self) -> Question:
         '''generate question (synchronous version)'''
 -        return asyncio.get_event_loop().run_until_complete(self.gen_async())
+        return asyncio.get_event_loop().run_until_complete(self.gen_async())
 \ No newline at end of file
@@ -411,7 +411,7 @@ class QuestionHandler(BaseHandler):
             return
         # --- brain hacking ;)
-        await asyncio.sleep(1.5)
+        # await asyncio.sleep(1.5)
         # --- answers are in a list. fix depending on question type
         qtype = self.learn.get_student_question_type(user)
@@ -1 +0,0 @@
-../../node_modules/codemirror/
 \ No newline at end of file
@@ -1 +0,0 @@
-../../node_modules/@fortawesome/fontawesome-free/
 \ No newline at end of file
@@ -8,13 +8,17 @@
     <meta name="author" content="Miguel Barão">
     <link rel="icon" href="favicon.ico">
     <!-- Styles -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+
     <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
     <link rel="stylesheet" href="{{static_url('css/sticky-footer-navbar.css')}}">
     <!-- Scripts -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
-    <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
+      integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
+      integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
+
     <script defer src="{{static_url('js/maintopics.js')}}"></script>
     <title>{{appname}}</title>
@@ -22,14 +26,14 @@
   <body>
     <!-- ===== navbar ======================================================== -->
-    <nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top shadow">
+    <nav class="navbar navbar-expand-sm navbar-dark bg-secondary fixed-top shadow">
       <div class="container-fluid">
         <img src="{{static_url('logo_horizontal.png')}}" height="48" width="120" class="navbar-brand" alt="UEvora">
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
-        <div class="collapse navbar-collapse" id="navbarNavText">
+        <div class="collapse navbar-collapse" id="navbarText">
           <ul class="navbar-nav">
             <li class="nav-item"><a class="nav-link active" aria-current="page" href="/courses">Cursos</a></li>
             <li class="nav-item"><a class="nav-link disabled" href="#">Tópicos</a></li>
@@ -9,28 +9,29 @@
   <link rel="icon" href="/static/favicon.ico">
 <!-- Styles -->
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+
   <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
 <!-- Scripts -->
   <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-  <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script>
   <script defer src="{{static_url('js/maintopics.js')}}"></script>
   <title>{{appname}}</title>
 </head>
 <!-- ===================================================================== -->
 <body>
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top shadow">
+<nav class="navbar navbar-expand-sm navbar-dark bg-secondary fixed-top shadow">
   <div class="container-fluid">
     <img src="{{static_url('logo_horizontal.png')}}" height="48" width="120" class="navbar-brand" alt="UEvora">
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="collapse navbar-collapse" id="navbarNavText">
+    <div class="collapse navbar-collapse" id="navbarText">
       <ul class="navbar-nav">
         <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li>
         <li class="nav-item"><a class="nav-link active" aria-current="page" href="#">Tópicos</a></li>
@@ -8,25 +8,27 @@
   <meta name="author" content="Miguel Barão">
   <link rel="icon" href="/static/favicon.ico">
   <!-- Styles -->
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+
   <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}">
   <!-- Scripts -->
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
-  <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
+
   <script defer src="{{static_url('js/maintopics.js')}}"></script>
   <title>{{appname}}</title>
 </head>
 <!-- ===================================================================== -->
 <body>
-<nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top">
+<nav class="navbar navbar-expand-sm navbar-dark bg-secondary fixed-top shadow">
   <div class="container-fluid">
     <img src="{{static_url('logo_horizontal.png')}}" height="48" width="120" class="navbar-brand" alt="UEvora">
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="collapse navbar-collapse" id="navbarNavText">
+    <div class="collapse navbar-collapse" id="navbarText">
       <ul class="navbar-nav">
         <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li>
         <li class="nav-item"><a class="nav-link" href="/course/{{course_id}}">Tópicos</a></li>
@@ -53,8 +55,8 @@
 <div class="container">
   <h1 class="display-6">{{ course_title }}</h1>
-<table class="table table-hover">
-  <col width="100">
+<table class="table table-sm table-hover">
+  <!-- <col width="100"> -->
   <thead>
     <tr>
       <th scope="col" class="text-center">Posição</th>
@@ -65,7 +67,7 @@
   </thead>
   <tbody>
     {% for i,r in enumerate(rankings) %}
-    <tr class="{{ 'table-primary' if r[0] == uid else '' }}">
+    <tr class="{{ 'table-secondary' if r[0] == uid else '' }}">
       <td class="text-center"> <!-- rank -->
         <strong>
           {{ '<i class="fas fa-crown fa-lg text-warning"></i>' if i==0 else i+1 }}
@@ -6,18 +6,17 @@
     <meta name="author" content="Miguel Barão" />
     <link rel="icon" href="/static/favicon.ico">
-    <!-- Styles -->
-    <!-- <link rel="stylesheet" href="{{static_url('mdbootstrap/css/bootstrap.min.css')}}"> -->
-    <!-- <link rel="stylesheet" href="{{static_url('mdbootstrap/css/mdb.min.css')}}"> -->
-
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous">
+    <!-- Styles ---------------------------------------------------------- -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
+          integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/codemirror.min.css" />
+    <!-- local styles -->
+    <link rel="stylesheet" href="{{static_url('css/github.css')}}" />
+    <link rel="stylesheet" href="{{static_url('css/topic.css')}}" />
-    <link rel="stylesheet" href="{{static_url('codemirror/lib/codemirror.css')}}">
-    <link rel="stylesheet" href="{{static_url('css/github.css')}}">
-    <link rel="stylesheet" href="{{static_url('css/topic.css')}}">
-
-    <!-- MathJax3 -->
+    <!-- Scripts --------------------------------------------------------- -->
     <script>
       MathJax = {
         tex: {
@@ -28,14 +27,14 @@
         }
       };
     </script>
-    <!-- Scripts -->
     <script async type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+    <script defer src="https://code.jquery.com/jquery-3.6.0.min.js"
+          integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
+          integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
+    <script defer src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/codemirror.min.js"></script>
-    <script defer src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
-
-    <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script>
-    <script defer src="{{static_url('codemirror/lib/codemirror.js')}}"></script>
+    <!-- local scripts -->
     <script defer src="{{static_url('js/topic.js')}}"></script>
     <title>{{appname}}</title>
@@ -44,18 +43,18 @@
   <body>
     <!-- Progress bar -->
     <div class="progress fixed-top" style="height: 70px; border-radius: 0px;">
-      <div class="progress-bar bg-warning" id="topic_progress" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 1em;width: 0%"></div>
+      <div class="progress-bar bg-secondary" id="topic_progress" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 1em;width: 0%"></div>
     </div>
     <!-- Navbar -->
-    <nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top shadow">
+    <nav class="navbar navbar-expand-sm navbar-dark bg-secondary fixed-top shadow">
       <div class="container-fluid">
         <img src="{{static_url('logo_horizontal.png')}}" height="48" width="120" class="navbar-brand" alt="UEvora">
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
-        <div class="collapse navbar-collapse" id="navbarNavText">
+        <div class="collapse navbar-collapse" id="navbarText">
           <ul class="navbar-nav">
             <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li>
             <li class="nav-item"><a class="nav-link active" aria-current="page" href="/course/{{course_id}}">Tópicos</a></li>
@@ -0,0 +1,60 @@
+
+# Public interface
+ext_if="em0"
+
+table <bruteforce> persist
+
+# Set and drop these IP ranges on public interface
+martians = "{ 0.0.0.0/8, 127.0.0.0/8 }"
+
+# 192.168.0.0/16, 172.16.0.0/12, \
+#	      10.0.0.0/8, 169.254.0.0/16, 192.0.2.0/24, \
+#	      240.0.0.0/4 }"
+
+webports = "{ 8080, 8443 }"
+
+tcp_services = "{ domain, ntp, smtp, www, https, ssh }"
+udp_services = "{ domain, ntp }"
+
+# Skip all PF processing on loopback interface
+set skip on lo
+
+# Log statistics on interface
+set loginterface $ext_if
+
+# Packet normalization
+scrub in all
+
+# Redirect http and https ports to 8080 and 8443, resp.
+no rdr on $ext_if proto tcp from <bruteforce> to any
+rdr on $ext_if proto tcp from any to any port 80 -> 127.0.0.1 port 8080
+rdr on $ext_if proto tcp from any to any port 443 -> 127.0.0.1 port 8443
+
+# Default policy
+#block return in log all
+#block out all
+
+# Protect against spoofed or forget IP addresses
+antispoof quick for $ext_if
+
+# Drop all Non-Routable Addresses 
+block drop in quick on $ext_if from $martians to any
+block drop out quick on $ext_if from any to $martians
+
+# Protect against SSH attacks
+block quick from <bruteforce>
+pass quick proto { tcp, udp } from any to any port ssh \
+    flags S/SA keep state \
+    (max-src-conn 10, max-src-conn-rate 5/3, \
+    overload <bruteforce> flush global)
+
+# Allow Ping 
+pass inet proto icmp icmp-type echoreq
+
+# Webserver 
+#pass proto tcp from any to $ext_if port $webports
+
+# Allow essential outgoing traffic 
+pass out quick on $ext_if proto tcp to any port $tcp_services
+pass out quick on $ext_if proto udp to any port $udp_services
+
@@ -0,0 +1,21 @@
+zfs_enable="YES"
+clear_tmp_enable="YES"
+hostname="bit.xdi.uevora.pt"
+ifconfig_em0="inet 193.137.120.198 netmask 255.255.255.192"
+defaultrouter="193.137.120.254"
+ifconfig_em0_ipv6="inet6 accept_rtadv"
+sshd_enable="YES"
+ntpd_enable="YES"
+ntpd_sync_on_start="YES"
+powerd_enable="NO"
+
+# pf firewall
+pf_enable="YES"
+#pf_flags="-T expire 86400"
+pf_rules="/etc/pf.conf"
+#pflog_enable="YES"
+#pflog_flags=""
+#pflog_logfile="/var/log/pflog"
+
+# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
+dumpdev="NO"
@@ -1,39 +0,0 @@
-{
-    "name": "aprendizations",
-    "lockfileVersion": 2,
-    "requires": true,
-    "packages": {
-        "": {
-            "dependencies": {
-                "@fortawesome/fontawesome-free": "^5.15.3",
-                "codemirror": "^5.59.4"
-            }
-        },
-        "node_modules/@fortawesome/fontawesome-free": {
-            "version": "5.15.4",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
-            "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==",
-            "hasInstallScript": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/codemirror": {
-            "version": "5.62.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
-            "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
-        }
-    },
-    "dependencies": {
-        "@fortawesome/fontawesome-free": {
-            "version": "5.15.4",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
-            "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
-        },
-        "codemirror": {
-            "version": "5.62.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
-            "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
-        }
-    }
-}
@@ -1,9 +0,0 @@
-{
-    "description": "Javascript libraries required to run the server",
-    "email": "mjsb@uevora.pt",
-    "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.3",
-        "codemirror": "^5.59.4"
-    },
-    "private": true
-}
	@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.		@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.
30	'''	30	'''
31		31
32	APP_NAME = 'aprendizations'	32	APP_NAME = 'aprendizations'
33	-APP_VERSION = '2021.08.dev1'	33	+APP_VERSION = '2021.11.dev1'
34	APP_DESCRIPTION = __doc__	34	APP_DESCRIPTION = __doc__
35		35
36	__author__ = 'Miguel Barão'	36	__author__ = 'Miguel Barão'
	@@ -411,7 +411,7 @@ class QuestionHandler(BaseHandler):		@@ -411,7 +411,7 @@ class QuestionHandler(BaseHandler):
411	return	411	return
412		412
413	# --- brain hacking ;)	413	# --- brain hacking ;)
414	- await asyncio.sleep(1.5)	414	+ # await asyncio.sleep(1.5)
415		415
416	# --- answers are in a list. fix depending on question type	416	# --- answers are in a list. fix depending on question type
417	qtype = self.learn.get_student_question_type(user)	417	qtype = self.learn.get_student_question_type(user)
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-../../node_modules/codemirror/
2	\ No newline at end of file	0	\ No newline at end of file
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-../../node_modules/@fortawesome/fontawesome-free/
2	\ No newline at end of file	0	\ No newline at end of file
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+
	2	+# Public interface
	3	+ext_if="em0"
	4	+
	5	+table <bruteforce> persist
	6	+
	7	+# Set and drop these IP ranges on public interface
	8	+martians = "{ 0.0.0.0/8, 127.0.0.0/8 }"
	9	+
	10	+# 192.168.0.0/16, 172.16.0.0/12, \
	11	+# 10.0.0.0/8, 169.254.0.0/16, 192.0.2.0/24, \
	12	+# 240.0.0.0/4 }"
	13	+
	14	+webports = "{ 8080, 8443 }"
	15	+
	16	+tcp_services = "{ domain, ntp, smtp, www, https, ssh }"
	17	+udp_services = "{ domain, ntp }"
	18	+
	19	+# Skip all PF processing on loopback interface
	20	+set skip on lo
	21	+
	22	+# Log statistics on interface
	23	+set loginterface $ext_if
	24	+
	25	+# Packet normalization
	26	+scrub in all
	27	+
	28	+# Redirect http and https ports to 8080 and 8443, resp.
	29	+no rdr on $ext_if proto tcp from <bruteforce> to any
	30	+rdr on $ext_if proto tcp from any to any port 80 -> 127.0.0.1 port 8080
	31	+rdr on $ext_if proto tcp from any to any port 443 -> 127.0.0.1 port 8443
	32	+
	33	+# Default policy
	34	+#block return in log all
	35	+#block out all
	36	+
	37	+# Protect against spoofed or forget IP addresses
	38	+antispoof quick for $ext_if
	39	+
	40	+# Drop all Non-Routable Addresses
	41	+block drop in quick on $ext_if from $martians to any
	42	+block drop out quick on $ext_if from any to $martians
	43	+
	44	+# Protect against SSH attacks
	45	+block quick from <bruteforce>
	46	+pass quick proto { tcp, udp } from any to any port ssh \
	47	+ flags S/SA keep state \
	48	+ (max-src-conn 10, max-src-conn-rate 5/3, \
	49	+ overload <bruteforce> flush global)
	50	+
	51	+# Allow Ping
	52	+pass inet proto icmp icmp-type echoreq
	53	+
	54	+# Webserver
	55	+#pass proto tcp from any to $ext_if port $webports
	56	+
	57	+# Allow essential outgoing traffic
	58	+pass out quick on $ext_if proto tcp to any port $tcp_services
	59	+pass out quick on $ext_if proto udp to any port $udp_services
	60	+
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+zfs_enable="YES"
	2	+clear_tmp_enable="YES"
	3	+hostname="bit.xdi.uevora.pt"
	4	+ifconfig_em0="inet 193.137.120.198 netmask 255.255.255.192"
	5	+defaultrouter="193.137.120.254"
	6	+ifconfig_em0_ipv6="inet6 accept_rtadv"
	7	+sshd_enable="YES"
	8	+ntpd_enable="YES"
	9	+ntpd_sync_on_start="YES"
	10	+powerd_enable="NO"
	11	+
	12	+# pf firewall
	13	+pf_enable="YES"
	14	+#pf_flags="-T expire 86400"
	15	+pf_rules="/etc/pf.conf"
	16	+#pflog_enable="YES"
	17	+#pflog_flags=""
	18	+#pflog_logfile="/var/log/pflog"
	19	+
	20	+# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
	21	+dumpdev="NO"
	@@ -1,39 +0,0 @@	@@ -1,39 +0,0 @@
1	-{
2	- "name": "aprendizations",
3	- "lockfileVersion": 2,
4	- "requires": true,
5	- "packages": {
6	- "": {
7	- "dependencies": {
8	- "@fortawesome/fontawesome-free": "^5.15.3",
9	- "codemirror": "^5.59.4"
10	- }
11	- },
12	- "node_modules/@fortawesome/fontawesome-free": {
13	- "version": "5.15.4",
14	- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
15	- "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==",
16	- "hasInstallScript": true,
17	- "engines": {
18	- "node": ">=6"
19	- }
20	- },
21	- "node_modules/codemirror": {
22	- "version": "5.62.2",
23	- "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
24	- "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
25	- }
26	- },
27	- "dependencies": {
28	- "@fortawesome/fontawesome-free": {
29	- "version": "5.15.4",
30	- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
31	- "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
32	- },
33	- "codemirror": {
34	- "version": "5.62.2",
35	- "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
36	- "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
37	- }
38	- }
39	-}
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-{
2	- "description": "Javascript libraries required to run the server",
3	- "email": "mjsb@uevora.pt",
4	- "dependencies": {
5	- "@fortawesome/fontawesome-free": "^5.15.3",
6	- "codemirror": "^5.59.4"
7	- },
8	- "private": true
9	-}