Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sonsoleslp committed Aug 19, 2020
1 parent 8568a8d commit 941ab10
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 14 deletions.
12 changes: 9 additions & 3 deletions README.md → README
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion controllers/play_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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});
};

Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 . ",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/main.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 941ab10

Please sign in to comment.