From 693fa6005d4905fc64cce3ee37d41653fc284a5b Mon Sep 17 00:00:00 2001 From: Barry Low Date: Sun, 2 Sep 2018 00:47:58 -0700 Subject: [PATCH] Update deploy + fix cors --- packages/aateam-api/Dockerfile | 20 +++++++----------- packages/aateam-api/docker-compose.prod.yml | 21 ++++++++++--------- packages/aateam-api/docker-compose.yml | 2 +- packages/aateam-client/src/actions/index.js | 3 ++- packages/aateam-client/src/auth/index.js | 5 +++-- packages/aateam-client/src/state/index.js | 2 +- .../src/views/pages/dashboard/index.js | 1 + 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/aateam-api/Dockerfile b/packages/aateam-api/Dockerfile index 43a95af54..360e3f6db 100644 --- a/packages/aateam-api/Dockerfile +++ b/packages/aateam-api/Dockerfile @@ -1,25 +1,21 @@ FROM mhart/alpine-node:8 -ARG PORT=4000 -ARG APP_PATH=/usr/src/app +ENV PORT=4000 -RUN mkdir -p /usr && \ - mkdir -p $APP_PATH && \ - mkdir -p $APP_PATH /node_modules +RUN mkdir -p /var/www/app && \ + mkdir -p /var/www/app/node_modules # Use app directory as current workdir -WORKDIR $APP_PATH - +WORKDIR /var/www/app +ENV PATH /var/www/app/node_modules/.bin:$PATH # Copy package.json to workdir -COPY package.json . +COPY package.json /var/www/app/package.json # Install dependencies -RUN npm install +RUN npm install --silent # Copy application code -COPY . . - -RUN NODE_ENV=production npm run start +COPY . /var/www/app # Expose Port EXPOSE $PORT diff --git a/packages/aateam-api/docker-compose.prod.yml b/packages/aateam-api/docker-compose.prod.yml index 94c8f4cc5..09f2a736a 100644 --- a/packages/aateam-api/docker-compose.prod.yml +++ b/packages/aateam-api/docker-compose.prod.yml @@ -1,26 +1,27 @@ version: '3' services: node: - image: aateamapi/prod + image: aateamapi-prod:v1 + build: + context: . + dockerfile: ./Dockerfile environment: - NODE_ENV=production - GENERATE_SOURCEMAP=false - - APP_PATH=/usr/src/app - COMPOSE_HTTP_TIMEOUT=2000 - - VIRTUAL_HOST=api.algocommunity.org - - LETSENCRYPT_HOST=api.algocommunity.org - - LETSENCRYPT_EMAIL=barry@algocommunity.org + - VIRTUAL_HOST=teams.advancedalgos.net + - LETSENCRYPT_HOST=teams.advancedalgos.net + - LETSENCRYPT_EMAIL=support@advancedalgos.net - VIRTUAL_PORT=4000 container_name: aateamapi tty: true stdin_open: true volumes: - - ./:${APP_PATH} - - ${APP_PATH}/build - - ${APP_PATH}/node_modules - working_dir: ${APP_PATH} + - ./:/var/www/app + - /var/www/app/node_modules + working_dir: /var/www/app restart: always - command: npm run start + command: node -r dotenv/config src/index.js expose: - 4000 - 80 diff --git a/packages/aateam-api/docker-compose.yml b/packages/aateam-api/docker-compose.yml index ccbd2f161..a88b1f971 100644 --- a/packages/aateam-api/docker-compose.yml +++ b/packages/aateam-api/docker-compose.yml @@ -13,4 +13,4 @@ services: volumes: - .:/var/www/application - /var/www/application/node_modules - container_name: aateam-api + container_name: aateam-api-dev diff --git a/packages/aateam-client/src/actions/index.js b/packages/aateam-client/src/actions/index.js index badb69be3..b13d2a47a 100644 --- a/packages/aateam-client/src/actions/index.js +++ b/packages/aateam-client/src/actions/index.js @@ -52,7 +52,8 @@ export const actions = { } }, updateTeamView: () => [ - action('toggleModal', '') + action('toggleModal', ''), + action('team.form', { form: '', message: '' }) ], nav, team, diff --git a/packages/aateam-client/src/auth/index.js b/packages/aateam-client/src/auth/index.js index 4da43d3ac..262e4bb8c 100644 --- a/packages/aateam-client/src/auth/index.js +++ b/packages/aateam-client/src/auth/index.js @@ -11,7 +11,8 @@ export const AUTH_CONFIG = { api_audience: process.env.AUTH0_AUDIENCE, domain: process.env.AUTH0_DOMAIN, clientId: process.env.AUTH0_CLIENTID, - callbackUrl: process.env.AUTH0_CALLBACK_URL + callbackUrl: process.env.AUTH0_CALLBACK_URL, + logoutUrl: process.env.AUTH0_LOGOUT_URL } console.log(process.env.AUTH0_CLIENTID) @@ -163,7 +164,7 @@ class Auth { deleteCookie('ajs_user_id') deleteCookie('current_tenant') actions.setLoggedOut() - lock.logout({ returnTo: 'http://0.0.0.0:5000' }) + lock.logout({ returnTo: AUTH_CONFIG.logoutUrl }) console.log('logout') } diff --git a/packages/aateam-client/src/state/index.js b/packages/aateam-client/src/state/index.js index 0fae14fca..6642e8e98 100644 --- a/packages/aateam-client/src/state/index.js +++ b/packages/aateam-client/src/state/index.js @@ -7,7 +7,7 @@ import team from '../modules/team/state' import algobot from '../modules/algobots/state' import community from '../modules/community/state' -const appVersion = '0.0.7' +const appVersion = '0.0.8' export const state = getStateFromStorage(appVersion) || { location: location.state, appVersion: appVersion, diff --git a/packages/aateam-client/src/views/pages/dashboard/index.js b/packages/aateam-client/src/views/pages/dashboard/index.js index 95d537249..6f8ba1cf6 100644 --- a/packages/aateam-client/src/views/pages/dashboard/index.js +++ b/packages/aateam-client/src/views/pages/dashboard/index.js @@ -8,6 +8,7 @@ import { Dashboard } from './sections' import { AddTeamForm } from '../../../modules/team/views' export const DashboardWrapper = props => (state, actions) => { + if (state.team.form.form === 'addTeamSuccess') actions.updateTeamView() if (state.loggedIn) { const name = state.user.name === (undefined || null || '')