diff --git a/.gitignore b/.gitignore index 6fce4c1..ba903e8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ dist coverage/ .nyc_output/ yarn.lock +.ssh +*.pem diff --git a/buildimage.sh b/buildimage.sh new file mode 100755 index 0000000..f5125ca --- /dev/null +++ b/buildimage.sh @@ -0,0 +1,5 @@ +$(aws ecr get-login --no-include-email --region ap-southeast-1) +docker build -t vly1-main-repo . +docker tag vly1-main-repo:latest 585172581592.dkr.ecr.ap-southeast-1.amazonaws.com/vly1-main-repo:latest +docker push 585172581592.dkr.ecr.ap-southeast-1.amazonaws.com/vly1-main-repo:latest + diff --git a/client/main.css b/client/main.css index 8fbbce3..bfa3d82 100644 --- a/client/main.css +++ b/client/main.css @@ -12,7 +12,7 @@ :root { --fore-color: #111; --secondary-fore-color: #444; - --back-color: #f8f8f8; + --back-color: #fcfcfc; --secondary-back-color: #f0f0f0; --blockquote-color: #f57c00; --pre-color: #1565c0; diff --git a/client/modules/App/components/Header/Vlogo.js b/client/modules/App/components/Header/Vlogo.js index 63efd4b..fea631b 100644 --- a/client/modules/App/components/Header/Vlogo.js +++ b/client/modules/App/components/Header/Vlogo.js @@ -7,6 +7,7 @@ import React from 'react'; export function Vlogo() { return ( + Voluntarily Logo // eslint-disable-next-line max-len

Typography Elements

-

Heading 1 Subheading

+

Heading 1 Ha ha ha

Heading 2 Subheading

Heading 3 Subheading

Heading 4 Subheading

diff --git a/docker-compose-ecs-atlas.yml b/docker-compose-ecs-atlas.yml new file mode 100644 index 0000000..0f6aa01 --- /dev/null +++ b/docker-compose-ecs-atlas.yml @@ -0,0 +1,12 @@ +version: '3' +services: + web: + image: 585172581592.dkr.ecr.ap-southeast-1.amazonaws.com/vly1-main-repo:latest + depends_on: + - db + ports: + - "${WEB_PORT:-80}:8000" + environment: + NODE_ENV: production + MONGO_URL: mongodb+srv://vly-client:ZhF3BUDiwpy8C3xK@vly-cluster-1-dl1mj.mongodb.net/test?retryWrites=true + diff --git a/docker-compose-ecs-dev.yml b/docker-compose-ecs-dev.yml new file mode 100644 index 0000000..0214d37 --- /dev/null +++ b/docker-compose-ecs-dev.yml @@ -0,0 +1,19 @@ +version: '3' +services: + web: + image: 585172581592.dkr.ecr.ap-southeast-1.amazonaws.com/vly1-main-repo:latest + depends_on: + - db + ports: + - "${WEB_PORT:-80}:8000" + environment: + NODE_ENV: development + MONGO_URL: mongodb://db:27017/vly1 + db: + image: mongo:latest + ports: + - "27017:27017" + volumes: + - dbdata:/data/db +volumes: + dbdata: diff --git a/docker-compose-ecs.yml b/docker-compose-ecs.yml new file mode 100644 index 0000000..5dbbb06 --- /dev/null +++ b/docker-compose-ecs.yml @@ -0,0 +1,19 @@ +version: '3' +services: + web: + image: 585172581592.dkr.ecr.ap-southeast-1.amazonaws.com/vly1-main-repo:latest + depends_on: + - db + ports: + - "${WEB_PORT:-80}:8000" + environment: + NODE_ENV: production + MONGO_URL: mongodb+srv://vly-client:ZhF3BUDiwpy8C3xK@vly-cluster-1-dl1mj.mongodb.net/test?retryWrites=true + db: + image: mongo:latest + ports: + - "27017:27017" + volumes: + - dbdata:/data/db +volumes: + dbdata: diff --git a/docker-compose-production.yml b/docker-compose-production.yml index b77d73f..639836b 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -1,4 +1,4 @@ -version: '3.4' +version: '3' services: web: build: diff --git a/server/config.js b/server/config.js index 7f23f71..eeeefc7 100644 --- a/server/config.js +++ b/server/config.js @@ -1,5 +1,6 @@ const config = { - mongoURL: process.env.MONGO_URL || 'mongodb://localhost:27017/vly1', + mongoURL: process.env.MONGO_URL || 'mongodb+srv://vly-client:ZhF3BUDiwpy8C3xK@vly-cluster-1-dl1mj.mongodb.net/test?retryWrites=true', + // 'mongodb://localhost:27017/vly1', port: process.env.PORT || 8000, }; diff --git a/server/config/environment/production.js b/server/config/environment/production.js index c9a75de..51b194f 100644 --- a/server/config/environment/production.js +++ b/server/config/environment/production.js @@ -12,7 +12,8 @@ module.exports = { // MongoDB connection options mongo: { - uri: process.env.MONGODB_URI || + uri: process.env.MONGO_URL || + process.env.MONGODB_URI || process.env.MONGOHQ_URL || process.env.OPENSHIFT_MONGODB_DB_URL + process.env.OPENSHIFT_APP_NAME ||