Refactor .env and enketo express

.env

@@ -17,6 +17,7 @@ CENTRAL_USER_PASS=StrongPassword@1234
 #enketo-express
 ENCRYPTION_KEY=somestrongencrytionkey
 LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey
+FORM_MANAGER_BASE_URI=IP:PORT_OF_DEPLOYED_INSTANCE
 
 # form manager
 FORM_MANAGER_URL=http://form-manager:3006
@@ -40,6 +41,6 @@ HASURA_GRAPHQL_DATABASE_URL=postgres://$TSDB_POSTGRES_USER:$TSDB_POSTGRES_PASSWO
 # http://service-name is not going to work as we are building a static build
 # and serving it through nginx
 # use actual IP address instead
-REACT_APP_ENKETO_URL=http://enketo-express:8065
-REACT_APP_FORM_MANAGER_URL=http://form-manager:3006
-REACT_APP_HASURA_URL=http://gql:8080
+REACT_APP_ENKETO_URL=https://8065-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io
+REACT_APP_FORM_MANAGER_URL=https://3006-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io
+REACT_APP_HASURA_URL=https://8080-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io
\ No newline at end of file

.gitpod.yml

@@ -28,6 +28,8 @@ tasks:
       sed -i~ "/^REACT_APP_ENKETO_URL=/s/=.*/=https\:\/\/8065-${GITPOD_WORKSPACE_URL:8}/" .env
       sed -i~ "/^REACT_APP_FORM_MANAGER_URL=/s/=.*/=https\:\/\/3006-${GITPOD_WORKSPACE_URL:8}/" .env
       sed -i~ "/^REACT_APP_HASURA_URL=/s/=.*/=https\:\/\/8080-${GITPOD_WORKSPACE_URL:8}/" .env
+      # for enketo-express
+      sed -i~ "/^FORM_MANAGER_BASE_URI=/s/=.*/=https\:\/\/3006-${GITPOD_WORKSPACE_URL:8}/" .env
       
       docker-compose up -d
       gp sync-done setup

apps/wrapper/src/workflow_first.json

 {
   "forms": {
-    "jumping_form_1": {
+    "test_form": {
       "skipOnSuccessMessage": true,
       "prefill": {},
       "submissionURL": "",
@@ -49,6 +49,6 @@
       }
     }
   },
-  "startingForm": "jumping_form_1",
+  "startingForm": "test_form",
   "metaData": {}
 }
\ No newline at end of file

docker-compose.yml

@@ -166,7 +166,7 @@ services:
       REDIS_MAIN_PORT: 6379
       REDIS_CACHE_HOST: redis_cache
       REDIS_CACHE_PORT: 6379
-      FORM_MANAGER_BASE_URI: ${FORM_MANAGER_URL}
+      FORM_MANAGER_BASE_URI: ${FORM_MANAGER_BASE_URI}
   
   fm-cache:
     image: redis:7
@@ -192,6 +192,9 @@ services:
       MINIO_BUCKETNAME: ${MINIO_BUCKETNAME} 
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
+      FORM_MANAGER_URL: ${http://form-manager:3006}
+      MINIO_USE_SSL: ${MINIO_USE_SSL}
+
 
   wrapper:
     image: wrapper