diff --git a/Makefile b/Makefile index 9657161..cba77b0 100644 --- a/Makefile +++ b/Makefile @@ -42,3 +42,7 @@ yarn: ## Update yarn dependencies .PHONY: shell shell: ## Run shell docker-compose run --rm app sh + +.PHONY: open +open: ## Open app in browser + xdg-open http://localhost:3000 diff --git a/app.js b/app.js index 33aae18..b46674d 100644 --- a/app.js +++ b/app.js @@ -20,6 +20,7 @@ import search from './routes/search.js'; import share from './routes/share.js'; import { slack, oauth } from './routes/slack.js'; import errorHandler from './lib/error-handler.js'; +import newrelic from 'newrelic'; const debug = debuglog('combine.fm'); diff --git a/docker-compose.yml b/docker-compose.yml index e357976..b467425 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: - ./:/app command: yarn run watch-worker ports: - - "3001:3000" + - "3001:3001" database: image: "postgres:12.1-alpine" ports: diff --git a/models/index.cjs b/models/index.cjs index 3c5aa18..41b9552 100644 --- a/models/index.cjs +++ b/models/index.cjs @@ -16,7 +16,7 @@ fs .readdirSync(__dirname) .filter(file => (file.indexOf('.') !== 0) && (file !== 'index.cjs')) .forEach((file) => { - const model = sequelize.import(path.join(__dirname, file)); + const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes) db[model.name] = model; }); diff --git a/package.json b/package.json index 4d56298..406d1fc 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "bluebird": "^3.7.2", "bulma": "^0.9.0", "co": "~4.6.0", - "css-loader": "^3.6.0", + "css-loader": "^4.2.1", "debug": "^4.1.1", "ejs": "^3.1.3", "file-loader": "^6.0.0", @@ -45,17 +45,18 @@ "koa-static": "^5.0.0", "koa-views": "^6.3.0", "kue": "^0.11.6", - "mini-css-extract-plugin": "^0.9.0", + "mini-css-extract-plugin": "^0.10.0", "mocha-esm": "^1.1.1", + "newrelic": "^6.12.0", "node-sass": "^4.14.1", "nodebrainz": "^2.1.1", "pg": "^8.3.0", "playmusic": "^2.3.0", "sass-loader": "^9.0.2", - "sequelize": "^5.21.13", + "sequelize": "^6.3.4", "sequelize-cli-esm": "^5.0.6", "spotify-web-api-node": "^4.0.0", - "superagent": "^5.3.1", + "superagent": "^6.0.0", "vue": "^2.6.11", "vue-loader": "^15.9.3", "vue-router": "^3.3.4", diff --git a/public/src/app.vue b/public/src/app.vue index 35d4b05..7b49ebe 100644 --- a/public/src/app.vue +++ b/public/src/app.vue @@ -25,12 +25,9 @@