Updated DockerFile and node version in devcontainer

.devcontainer/Dockerfile

@@ -43,11 +43,15 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then \
 # RUN pip3 --disable-pip-version-check --no-cache-dir install -r \
 #    /tmp/pip-tmp/requirements.txt && rm -rf /tmp/pip-tmp
 
-RUN sudo apt-get update && \
-    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        # psql is useful and needed in the container post-create commands.
-        postgresql-contrib \
-        # A JRE is needed to run SonarLint.
-        default-jre \
-        # X is needed to run the Cypress GUI.
-        libasound2 libgconf-2-4 libgtk-3-dev libnotify-dev libnss3 libxss1 xvfb
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+
+    # Add the Yarn package repository to APT sources
+    RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+
+    # Update APT package lists and install required packages
+    RUN sudo apt-get update && \
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
+            postgresql-contrib \
+            default-jre \
+            libasound2 libgconf-2-4 libgtk-3-dev libnotify-dev libnss3 libxss1 xvfb
+

.devcontainer/docker-compose.yml

@@ -32,7 +32,7 @@ services:
         VARIANT: '0.201.2-3.8'
 
         # Node.js version to install
-        NODE_VERSION: '14.17.5'
+        NODE_VERSION: '20.11.1'
 
       context: '..'
 

api/requirements.txt

@@ -1,52 +1,103 @@
-# Moved to the top of the requirements as another package uses the latest Werkzeug.  Werkzeug==0.16.1 is required for flask-restx until later release  flask-restx 0.2.0.
-flask-restx==0.5.1
-jinja2==2.11.3
-greenlet==1.1.2
-#  SQLAlchemy needs to point to version 1.3.12 because there is a bug with
-#  with inviting Citizens expected to be fixed with Release 1.3.14
-SQLAlchemy<1.4
-snowplow-tracker==0.9.1
-Flask-Admin==1.5.8
-Flask-Cache==0.13.1
-Flask-Login==0.5.0
-# FLASK MIGRATE version 3.0.1 and 3.0.0 causes this error when api is built - 
-# ImportError: cannot import name 'MigrateCommand' from 'flask_migrate'
-Flask-Migrate==2.7.0
-Flask-Moment==0.11.0
-flask-jwt-oidc==0.3.0
-Flask-Script==2.0.6
-#eventlet==0.30.2 upgradeed on 05-12-2023
+alembic==1.5.2
+amqp==5.2.0
+aniso8601==9.0.1
+astroid==2.5.8
+async-timeout==4.0.3
+attrs==23.2.0
+bidict==0.23.1
+blinker==1.8.2
+Brotli==1.1.0
+cachelib==0.13.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==7.1.2
+decorator==5.0.9
+dnspython==1.16.0
+ecdsa==0.19.0
 eventlet==0.30.3
 filelock==3.0.12
+Flask==1.1.4
+Flask-Admin==1.5.8
+Flask-Cache==0.13.1
 Flask-Caching==1.11.1
 Flask-Compress==1.9.0
 Flask-Cors==3.0.10
+flask-jwt-oidc==0.3.0
+Flask-Login==0.5.0
 flask-marshmallow==0.14.0
+Flask-Migrate==2.7.0
+Flask-Moment==0.11.0
+flask-restx==0.5.1
+Flask-Script==2.0.6
 Flask-SocketIO==5.1.0
-#gunicorn==20.1.0
+Flask-SQLAlchemy==2.5.1
+future==0.18.2
+gevent==24.2.1
+greenlet==3.0.3
 gunicorn==21.2.0
+h11==0.14.0
+idna==3.7
+ijson==2.6.1
+importlib_metadata==7.1.0
+importlib_resources==6.4.0
+iniconfig==2.0.0
+isort==5.13.2
+itsdangerous==1.1.0
+Jinja2==2.11.3
+jsonschema==4.22.0
+jsonschema-specifications==2023.12.1
+kombu==5.1.0
+lazy-object-proxy==1.10.0
+Mako==1.3.3
+MarkupSafe==2.0.1
+marshmallow==3.21.2
 marshmallow-sqlalchemy==0.26.1
+mccabe==0.6.1
 minio==7.0.4
+numpy==1.21.0
+oauthlib==3.2.2
+packaging==24.0
+pip==24.0
+pkgutil_resolve_name==1.3.10
+pluggy==0.13.1
 psycopg2-binary==2.9.1
+py==1.11.0
+pyasn1==0.6.0
+pycontracts3==7.2
+pylint==2.7.2
+pyparsing==3.0.7
 pysnow==0.7.17
 pytest==6.2.4
-pytz==2019.3
+python-dateutil==2.9.0.post0
 python-dotenv==0.17.1
-SQLAlchemy-Utc==0.12.0
-SQLAlchemy-Continuum==1.3.11
-redis==4.5.3
-kombu==5.1.0
-alembic==1.5.2
-WTForms==3.0.0
-# Using MarkupSafe 2.1.0 throws error importing soft_unicode 
-MarkupSafe==2.0.1
-# Added on 18-10-2023 
-numpy==1.21
-pyparsing==3.0.7
-future==0.18.2
-decorator==5.0.9
-#Added on 06-11-2023
-urllib3==1.26.9
+python-editor==1.0.4
+python-engineio==4.9.0
 python-jose==3.3.0
+python-magic==0.4.27
+python-socketio==5.11.2
+pytz==2019.3
+redis==4.5.3
+referencing==0.35.1
+requests==2.31.0
+requests-oauthlib==1.3.1
+rpds-py==0.18.1
+rsa==4.9
 setuptools==68.2.2
-wheel==0.41.2
+simple-websocket==1.0.0
+six==1.16.0
+snowplow-tracker==0.9.1
+SQLAlchemy==1.3.24
+SQLAlchemy-Continuum==1.3.11
+SQLAlchemy-Utc==0.12.0
+SQLAlchemy-Utils==0.41.2
+toml==0.10.2
+urllib3==1.26.9
+vine==5.1.0
+Werkzeug==1.0.1
+wheel==0.41.2
+wrapt==1.12.1
+wsproto==1.2.0
+WTForms==3.0.0
+zipp==3.18.1
+zope.event==5.0
+zope.interface==6.3

documentation/Readme.md

@@ -37,6 +37,49 @@ Opening the cloned repo in VSCode will detect the *.devcontainer* directory and
 TODO: config files
     1. copy *documentation/demo-files/keycloak.json* to *frontend/static/* (**TODO: really? I don't have it**)
 
+
+## Directory Structure for Configuration Files
+
+```
+queue-management
+    ├───.devcontainer
+    │       devcontainer.json
+    │       docker-compose.yml
+    │       postCreateCommand.sh
+    │
+    ├───api
+    │       .env
+    │
+    ├───appointment-frontend
+    │   └───public
+    │       └───config
+    │           │   configuration.json
+    │           │
+    │           └───kc
+    │                   keycloak-public.json
+    │                   keycloak-public.json_silver
+    │
+    ├───feedback-api
+    │       .env
+    │
+    ├───frontend
+    │   └───public
+    │       ├───config
+    │       │       configuration.json
+    │       │
+    │       └───static
+    │           └───keycloak
+    │                   keycloak.json
+    │                   keycloak.json_silver
+    │
+    ├───jobs
+    │   └───appointment_reminder
+    │           .env
+    │
+    └───notifications-api
+            .env
+```
+
 ## Set up Keycloak:
 
 TODO: automate this.