diff --git a/README.md b/README similarity index 75% rename from README.md rename to README index 454cbe32..b3cbee7b 100644 --- a/README.md +++ b/README @@ -4,17 +4,23 @@ escapp is a web platform for managing educational escape rooms. Below is a list * [x] Teacher and student registration * [x] Escape room profile creation -* [x] Shift configuration +* [x] Shift configuration (multitudinary vs. self-paced) * [x] Puzzle configuration * [x] Hint configuration * [x] Custom escape room instructions +* [x] Custom escape room content edition (WYSIWYG) +* [x] Gamification elements (leaderboard, progress bar, countdown) +* [x] Multimedia upload and insertion * [x] Custom themes * [x] Team management * [x] Countdown +* [x] Roll call * [x] Student progress tracking * [x] Automatic hint delivery -* [x] Learning analytics - +* [x] Real-time and post-activity learning analytics +* [x] Real-time team progress synchronization +* [x] API REST for puzzle solving +* [x] [Client application](https://github.com/agordillo/escapp_client) for the development of external puzzles ## Installation diff --git a/controllers/play_controller.js b/controllers/play_controller.js index d6d6ad4a..b6b37d28 100644 --- a/controllers/play_controller.js +++ b/controllers/play_controller.js @@ -116,7 +116,8 @@ exports.writeMessage = async (req, res) => { const participants = await models.user.findAll(queries.user.participantsWithTurnoAndTeam(escapeRoom.id, undefined, "name")); const teams = await models.team.findAll(queries.team.teamComplete(escapeRoom.id, undefined, "name")); const {turnId} = req.query; - console.log(turnId) + + console.log(turnId); res.render("escapeRooms/messages", {escapeRoom, turnos, participants, teams, turnId}); }; diff --git a/migrate.js b/db_migrate.js similarity index 100% rename from migrate.js rename to db_migrate.js diff --git a/package-lock.json b/package-lock.json index 9f80a4a0..5ef231f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2782,9 +2782,9 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz", + "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==", "requires": { "is-obj": "^1.0.0" } @@ -7604,9 +7604,9 @@ } }, "nodemailer": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.10.tgz", - "integrity": "sha512-j+pS9CURhPgk6r0ENr7dji+As2xZiHSvZeVnzKniLOw1eRAyM/7flP0u65tCnsapV8JFu+t0l/5VeHsCZEeh9g==" + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz", + "integrity": "sha512-BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ==" }, "nodemon": { "version": "1.19.4", diff --git a/package.json b/package.json index 912af228..7a9525b9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,10 @@ "dev-windows": "nodemon bin/www -e sass,scss,js,json --ignore 'public/js/*,public/apps/*,migrations/*,seeders/*,test/*' --exec \"npm run css && npm run lint && node\" && start http://localhost:3000", "test": "DATABASE_URL=postgres://loguser:password@localhost/er_jest TEST=true jest", "test:watch": "DATABASE_URL=postgres://loguser:password@localhost/er_jest TEST=true jest --watchAll", - "migrate_local": "node migrate.js", + "create_local": "sequelize db:create --url $(grep DATABASE_URL .env | cut -d '=' -f2)", + "create_local_sqlite": "sequelize db:create --url sqlite://$(pwd)/escaperoom.sqlite", + "create_local_sqlite_windows": "sequelize db:create --url sqlite://%cd%/escaperoom.sqlite", + "migrate_local": "node db_migrate.js", "migrate_local_sqlite": "sequelize db:migrate --url sqlite://$(pwd)/escaperoom.sqlite", "migrate_local_sqlite_windows": "sequelize db:migrate --url sqlite://%cd%/escaperoom.sqlite", "migrate_heroku": "heroku run ./node_modules/.bin/sequelize db:migrate --url $DATABASE_URL", @@ -21,7 +24,7 @@ "seed_local_sqlite_windows": "sequelize db:seed:all --url sqlite://%cd%/escaperoom.sqlite", "seed_heroku": "heroku run ./node_modules/.bin/sequelize db:seed:all --url $DATABASE_URL", "reset_heroku": "heroku pg:reset DATABASE", - "reset_local_sqlite": "rm -rf escaperoom.sqlite", + "reset_local_sqlite_windows": "rm -rf escaperoom.sqlite", "open_heroku": "heroku open", "css": "node-sass public/stylesheets/style.sass public/stylesheets/style.css", "lint": "eslint . ", @@ -56,7 +59,7 @@ "node-fetch": "^2.6.0", "node-sass": "^4.14.1", "node-sass-middleware": "0.11.0", - "nodemailer": "^6.4.10", + "nodemailer": "^6.4.11", "nodemon": "^1.18.11", "pg": "7.10.0", "revalidator": "^0.3.1", diff --git a/public/stylesheets/main.sass b/public/stylesheets/main.sass index 5c4a3fc9..e50fea18 100644 --- a/public/stylesheets/main.sass +++ b/public/stylesheets/main.sass @@ -154,7 +154,7 @@ @extend %scale-animation-down .addItem background-color: #9196A9 - color: #D2D4DC + color: #ebebee font-size: 100px padding: 10px 20px border-width: 5px