Update deploy + fix cors

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

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

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

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,

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')
   }
 

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,

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 || '')