Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle opt out from Twilio #9

Merged
merged 5 commits into from Nov 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5,111 changes: 1,775 additions & 3,336 deletions client/package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions client/package.json
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"axios": "^0.18.0",
"basscss": "^8.0.2",
"basscss": "^8.0.10",
"papaparse": "^4.6.1",
"url-join": "^4.0.0",
"vue": "^2.5.17",
Expand All @@ -19,12 +19,12 @@
"vuex": "^3.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.5",
"@vue/cli-plugin-eslint": "^3.0.5",
"@vue/cli-service": "^3.0.5",
"@vue/cli-plugin-babel": "^3.1.1",
"@vue/cli-plugin-eslint": "^3.1.4",
"@vue/cli-service": "^3.1.3",
"@vue/eslint-config-airbnb": "^3.0.5",
"lint-staged": "^7.2.2",
"node-sass": "^4.9.0",
"node-sass": "^4.10.0",
"sass-loader": "^7.0.1",
"vue-template-compiler": "^2.5.17"
},
Expand Down
4 changes: 2 additions & 2 deletions client/src/config.js
@@ -1,2 +1,2 @@
// export const API_URL = process.env.API_URL || 'http://localhost:3000/api'; // eslint-disable-line
export const API_URL = 'https://ohack2018-team19.now.sh/api'; // eslint-disable-line
export const API_URL = process.env.API_URL || 'http://localhost:3000/api'; // eslint-disable-line
// export const API_URL = 'https://ohack2018-team19.now.sh/api'; // eslint-disable-line
2 changes: 1 addition & 1 deletion client/src/store.js
Expand Up @@ -77,7 +77,7 @@ export default new Vuex.Store({
date: message.date.getTime(),
campaignId: campaign,
};
const newMessage = (await axios.post(urljoin(API_URL, '/message'), payload, authOptions)).data;
const newMessage = (await axios.post(urljoin(API_URL, `/campaign/${campaign}/message`), payload, authOptions)).data;
context.commit('RECEIVE_NEW_MESSAGE', { message: newMessage, campaign });
return newMessage;
},
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Expand Up @@ -13,6 +13,8 @@ services:
- /server/node_modules
depends_on:
- mongo
environment:
- RUN_MODE=local

mongo:
image: mongo:3.6
Expand Down
166 changes: 92 additions & 74 deletions server/package-lock.json

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