fix folder structure

.circleci/config.yml

@@ -6,12 +6,12 @@ defaults: &defaults
         - TERM: xterm-256color
         - CC_TEST_REPORTER_ID: $CC_TEST_REPORTER_ID
   working_directory: ~/andela-socials
-  
+
 install_yarn_packages: &install_yarn_packages
     run:
       name: install dependencies
       command: |
-        yarn --cwd client/package.json install
+        yarn --cwd client/v1/package.json install
 
 attach_workspace: &attach_workspace
   attach_workspace:
@@ -63,7 +63,7 @@ jobs:
                       ./tmp/cc-test-reporter format-coverage -t coverage.py -o tmp/codeclimate.backend.json coverage.xml
             - persist_to_workspace:
                 root: tmp
-                paths: 
+                paths:
                     - codeclimate.backend.json
             - store_artifacts:
                   path: test-reports
@@ -77,7 +77,7 @@ jobs:
           - run:
               name: Verify and Check Yarn packages for vulnerabilities
               command: |
-                yarn --cwd client/package.json check --integrity
+                yarn --cwd client/v1/package.json check --integrity
 
     # If lint check is required uncomment the block of code below
     # lint:
@@ -88,7 +88,7 @@ jobs:
     #         - run:
     #             name: Run lint
     #             command: |
-    #                 yarn --cwd client/package.json lint
+    #                 yarn --cwd client/v1/package.json lint
 
     frontend_test:
         <<: *defaults
@@ -100,12 +100,12 @@ jobs:
           - run:
               name: Run frontend test
               command: |
-                yarn --cwd client/package.json test
-                ls ./client/
-                ./tmp/cc-test-reporter format-coverage -t lcov -o tmp/codeclimate.frontend.json ./client/coverage/lcov.info
+                yarn --cwd client/v1/package.json test
+                ls ./client/v1/
+                ./tmp/cc-test-reporter format-coverage -t lcov -o tmp/codeclimate.frontend.json ./client/v1/coverage/lcov.info
           - persist_to_workspace:
               root: tmp
-              paths: 
+              paths:
                 - codeclimate.frontend.json
 
     upload_coverage:
@@ -162,10 +162,10 @@ workflows:
             # - lint
             - build
             - backend_test:
-                requires: 
+                requires:
                   - build
             - frontend_test:
-                requires: 
+                requires:
                   - build
             - upload_coverage:
                 requires:

README.md

@@ -92,10 +92,10 @@ Or run the command below:
 make server test
 ```
 
-To run cypress test for the client side, navigate to the client folder
+To run cypress test for the client side, navigate to the client folder and choose which version
 
 ```sh
-cd client
+cd client/{v1 or v2}
 ```
 
 For e2e tests, ensure you have `cypress.json`, start the server and run:
@@ -131,7 +131,9 @@ After the build is complete, spin up the docker containers with:
 make start
 ```
 
-Then you can access the client application; served by webpack-dev-server at `http://localhost:9000`, and the backend application; served by the django development server at `http://localhost:8000`
+Then you can access the client/v1 application; served by webpack-dev-server at `http://localhost:9000`,
+or the client/v2 application; served by webpack-dev-server at `http://localhost:9000`,
+and the backend application; served by the django development server at `http://localhost:8000`
 
 To stop the application, you can pull down the containers with:
 

clientV2/config/webpack.config.dev.js → client/v2/config/webpack.config.dev.js

@@ -31,8 +31,8 @@ module.exports = merge(webpackCommonConfig, {
       'Access-Control-Allow-Headers':
         'X-Requested-With, content-type, Content-Type, Authorization, accept, accept-encoding, authorization, dnt, origin, user-agent, x-csrftoken, x-requested-with'
     },
-    publicPath: 'http://0.0.0.0:9000/',
-    port: 9000,
+    publicPath: 'http://0.0.0.0:3000/',
+    port: 3000,
     compress: true,
     proxy: {
       '/api/v1': {

clientV2/server.js → client/v2/server.js

@@ -5,7 +5,7 @@ const dotenv = require('dotenv');
 
 dotenv.config();
 
-const PORT = process.env.PORT || 9000;
+const PORT = process.env.PORT || 3000;
 const app = express();
 
 app.use(express.static(path.join(__dirname, './dist')));

client/v2/start-client.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+if [ $NODE_ENV = "production" ]; then
+  npm start
+else
+  npm run start:dev
+fi

docker/dev/docker-compose.yml

@@ -32,10 +32,10 @@ services:
     ports:
       - "8000:8000"
 
-  client:
+  client_v1:
     container_name: dev_andela_social_client
     build:
-      context: ../../client
+      context: ../../client/v1
       dockerfile: ../docker/dev/client/Dockerfile
     env_file:
       - ./dev.env
@@ -44,5 +44,20 @@ services:
     ports:
       - "9000:9000"
     volumes:
-      - ../../client:/andela_social
+      - ../../client/v1:/andela_social
+      - a_socials_node_modules:/andela_social/node_modules
+
+  client_v2:
+    container_name: dev_andela_social_client_v2
+    build:
+      context: ../../client/v2
+      dockerfile: ../docker/dev/client/Dockerfile
+    env_file:
+      - ./dev.env
+    depends_on:
+      - server
+    ports:
+      - "3000:3000"
+    volumes:
+      - ../../client/v2:/andela_social
       - a_socials_node_modules:/andela_social/node_modules

docker/nginx/nginx.conf

@@ -29,6 +29,10 @@ http {
         server client:9000;
     }
 
+    upstream front_end_v2 {
+        server client:3000;
+    }
+
     server {
         listen      80;
         charset     utf-8;
@@ -48,5 +52,12 @@ http {
             proxy_set_header Host $http_host;
             proxy_set_header X-NginX-Proxy true;
         }
+
+        location /v2 {
+            proxy_pass http://front_end_v2;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-NginX-Proxy true;
+        }
     }
 }

docker/prod/docker-compose.yml

@@ -22,8 +22,8 @@ services:
     volumes:
       - static_dir:/andela_social/static
       - staticfiles:/andela_social/staticfiles
-      
-  client:
+
+  client: # not making a change here because I believe we will switch over when it's time
     container_name: prod_andela_social_client
     build:
       context: ../../client
@@ -48,7 +48,7 @@ services:
       - postgres_backup:/backups
     ports:
       - "8093:5432"
-  
+
   nginx:
     container_name: nginx_server
     build: ../nginx

docker/release/client/Dockerfile

@@ -8,8 +8,8 @@ ENV NODE_PATH /usr/local/lib/node_modules/
 
 RUN npm install -g [email protected] [email protected]
 
-COPY client/dist /app/dist
-COPY client/server.js /app
+COPY client/v1/dist /app/dist
+COPY client/v1/server.js /app
 
 WORKDIR /app
 

scripts/deployFrontend.sh

@@ -31,7 +31,7 @@ authorize_docker() {
 deploy_image() {
 
     echo ${FRONTEND_BASE_URL} ${SERVER_API_BASE_URL} ${G_SUITE_DOMAIN} ${ANDELA_API_BASE_URL} ${CLIENT_ID}
-    cd client && yarn install
+    cd client/v1 && yarn install
 
     export NODE_ENV=production
 

scripts/setup.sh

@@ -12,7 +12,7 @@ function setup_server() {
 }
 
 function setup_client() {
-	cd client
+	cd client/v1
 
 	yarn -v
 	export status=$?

scripts/start.sh

@@ -4,7 +4,7 @@ set -e
 set -o pipefail # if any code doesn't return 0, exit the script
 
 function start_client() {
-  cd client
+  cd client/v1
   yarn start:dev &
 }
 

scripts/startProd.sh

@@ -20,7 +20,7 @@ fi
 
 
 function start_client() {
-  cd client
+  cd client/v1
   yarn start &
 }