Merge branch 'ever-co:develop' into nadir-gauzy

ever-co · Oct 8, 2023 · 3ed5c05 · 3ed5c05
2 parents ed7c935 + de96926
commit 3ed5c05
Show file tree

Hide file tree

Showing 54 changed files with 1,067 additions and 125 deletions.
diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile
@@ -65,6 +65,11 @@ ARG UNLEASH_API_KEY
 ARG PM2_PUBLIC_KEY
 ARG PM2_SECRET_KEY
 ARG PM2_MACHINE_NAME
+ARG JITSU_SERVER_URL
+ARG JITSU_SERVER_WRITE_KEY
+ARG GAUZY_GITHUB_CLIENT_ID
+ARG GAUZY_GITHUB_WEBHOOK_URL
+ARG GAUZY_GITHUB_WEBHOOK_SECRET
 
 FROM node:18-alpine3.17 AS dependencies
 
@@ -291,6 +296,11 @@ ENV UNLEASH_API_KEY=${UNLEASH_API_KEY}
 ENV PM2_PUBLIC_KEY=${PM2_PUBLIC_KEY}
 ENV PM2_SECRET_KEY=${PM2_SECRET_KEY}
 ENV PM2_MACHINE_NAME=${PM2_MACHINE_NAME}
+ENV JITSU_SERVER_URL=${JITSU_SERVER_URL}
+ENV JITSU_SERVER_WRITE_KEY=${JITSU_SERVER_WRITE_KEY}
+ENV GAUZY_GITHUB_CLIENT_ID=${GAUZY_GITHUB_CLIENT_ID}
+ENV GAUZY_GITHUB_WEBHOOK_URL=${GAUZY_GITHUB_WEBHOOK_URL}
+ENV GAUZY_GITHUB_WEBHOOK_SECRET=${GAUZY_GITHUB_WEBHOOK_SECRET}
 
 EXPOSE ${API_PORT}
 

diff --git a/.deploy/k8s/k8s-manifest.civo.demo.yaml b/.deploy/k8s/k8s-manifest.civo.demo.yaml
@@ -117,6 +117,20 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
                   ports:
                       - containerPort: 4200
                         protocol: TCP

diff --git a/.deploy/k8s/k8s-manifest.cw.demo.yaml b/.deploy/k8s/k8s-manifest.cw.demo.yaml
@@ -154,6 +154,21 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
+
                   ports:
                       - containerPort: 4200
                         protocol: TCP

diff --git a/.deploy/k8s/k8s-manifest.cw.prod.yaml b/.deploy/k8s/k8s-manifest.cw.prod.yaml
@@ -195,6 +195,16 @@ spec:
                         value: '$PM2_SECRET_KEY'
                       - name: PM2_MACHINE_NAME
                         value: '$PM2_MACHINE_NAME'
+                      - name: JITSU_SERVER_URL
+                        value: '$JITSU_SERVER_URL'
+                      - name: JITSU_SERVER_WRITE_KEY
+                        value: '$JITSU_SERVER_WRITE_KEY'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_WEBHOOK_URL
+                        value: '$GAUZY_GITHUB_WEBHOOK_URL'
+                      - name: GAUZY_GITHUB_WEBHOOK_SECRET
+                        value: '$GAUZY_GITHUB_WEBHOOK_SECRET'
 
                   ports:
                       - containerPort: 3000
@@ -275,6 +285,21 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
+
                   ports:
                       - containerPort: 4200
                         protocol: TCP

diff --git a/.deploy/k8s/k8s-manifest.cw.stage.yaml b/.deploy/k8s/k8s-manifest.cw.stage.yaml
@@ -189,6 +189,16 @@ spec:
                         value: '$UNLEASH_METRICS_INTERVAL'
                       - name: UNLEASH_API_KEY
                         value: '$UNLEASH_API_KEY'
+                      - name: JITSU_SERVER_URL
+                        value: '$JITSU_SERVER_URL'
+                      - name: JITSU_SERVER_WRITE_KEY
+                        value: '$JITSU_SERVER_WRITE_KEY'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_WEBHOOK_URL
+                        value: '$GAUZY_GITHUB_WEBHOOK_URL'
+                      - name: GAUZY_GITHUB_WEBHOOK_SECRET
+                        value: '$GAUZY_GITHUB_WEBHOOK_SECRET'
 
                   ports:
                       - containerPort: 3000
@@ -269,6 +279,21 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
+
                   ports:
                       - containerPort: 4200
                         protocol: TCP

diff --git a/.deploy/k8s/k8s-manifest.demo.yaml b/.deploy/k8s/k8s-manifest.demo.yaml
@@ -135,6 +135,20 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
 
                   ports:
                       - containerPort: 4200

diff --git a/.deploy/k8s/k8s-manifest.prod.yaml b/.deploy/k8s/k8s-manifest.prod.yaml
@@ -187,6 +187,16 @@ spec:
                         value: '$PM2_SECRET_KEY'
                       - name: PM2_MACHINE_NAME
                         value: '$PM2_MACHINE_NAME'
+                      - name: JITSU_SERVER_URL
+                        value: '$JITSU_SERVER_URL'
+                      - name: JITSU_SERVER_WRITE_KEY
+                        value: '$JITSU_SERVER_WRITE_KEY'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_WEBHOOK_URL
+                        value: '$GAUZY_GITHUB_WEBHOOK_URL'
+                      - name: GAUZY_GITHUB_WEBHOOK_SECRET
+                        value: '$GAUZY_GITHUB_WEBHOOK_SECRET'
 
                   ports:
                       - containerPort: 3000
@@ -234,6 +244,21 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
+
                   ports:
                       - containerPort: 4200
                         protocol: TCP
diff --git a/.deploy/k8s/k8s-manifest.stage.yaml b/.deploy/k8s/k8s-manifest.stage.yaml
@@ -181,6 +181,16 @@ spec:
                         value: '$UNLEASH_METRICS_INTERVAL'
                       - name: UNLEASH_API_KEY
                         value: '$UNLEASH_API_KEY'
+                      - name: JITSU_SERVER_URL
+                        value: '$JITSU_SERVER_URL'
+                      - name: JITSU_SERVER_WRITE_KEY
+                        value: '$JITSU_SERVER_WRITE_KEY'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_WEBHOOK_URL
+                        value: '$GAUZY_GITHUB_WEBHOOK_URL'
+                      - name: GAUZY_GITHUB_WEBHOOK_SECRET
+                        value: '$GAUZY_GITHUB_WEBHOOK_SECRET'
 
                   ports:
                       - containerPort: 3000
@@ -228,6 +238,21 @@ spec:
                         value: '23.3332736'
                       - name: DEFAULT_CURRENCY
                         value: 'USD'
+                      - name: GAUZY_GITHUB_CLIENT_ID
+                        value: '$GAUZY_GITHUB_CLIENT_ID'
+                      - name: GAUZY_GITHUB_APP_NAME
+                        value: '$GAUZY_GITHUB_APP_NAME'
+                      - name: GAUZY_GITHUB_REDIRECT_URL
+                        value: '$GAUZY_GITHUB_REDIRECT_URL'
+                      - name: GAUZY_GITHUB_POST_INSTALL_URL
+                        value: '$GAUZY_GITHUB_POST_INSTALL_URL'
+                      - name: GAUZY_GITHUB_APP_ID
+                        value: '$GAUZY_GITHUB_APP_ID'
+                      - name: JITSU_BROWSER_URL
+                        value: '$JITSU_BROWSER_URL'
+                      - name: JITSU_BROWSER_WRITE_KEY
+                        value: '$JITSU_BROWSER_WRITE_KEY'
+
                   ports:
                       - containerPort: 4200
                         protocol: TCP
diff --git a/.deploy/webapp/Dockerfile b/.deploy/webapp/Dockerfile
@@ -23,6 +23,13 @@ ARG DEFAULT_COUNTRY
 ARG DEMO
 ARG WEB_HOST
 ARG WEB_PORT
+ARG GAUZY_GITHUB_CLIENT_ID
+ARG GAUZY_GITHUB_APP_NAME
+ARG GAUZY_GITHUB_REDIRECT_URL
+ARG GAUZY_GITHUB_POST_INSTALL_URL
+ARG GAUZY_GITHUB_APP_ID
+ARG JITSU_BROWSER_URL
+ARG JITSU_BROWSER_WRITE_KEY
 
 FROM node:18-alpine3.17 AS dependencies
 
@@ -135,6 +142,13 @@ ENV DEFAULT_COUNTRY=${DEFAULT_COUNTRY}
 ENV GAUZY_CLOUD_APP=${GAUZY_CLOUD_APP}
 ENV CHAT_MESSAGE_GOOGLE_MAP=${CHAT_MESSAGE_GOOGLE_MAP}
 ENV HUBSTAFF_REDIRECT_URL=${HUBSTAFF_REDIRECT_URL}
+ENV GAUZY_GITHUB_CLIENT_ID=${GAUZY_GITHUB_CLIENT_ID}
+ENV GAUZY_GITHUB_APP_NAME=${GAUZY_GITHUB_APP_NAME}
+ENV GAUZY_GITHUB_REDIRECT_URL=${GAUZY_GITHUB_REDIRECT_URL}
+ENV GAUZY_GITHUB_APP_ID=${GAUZY_GITHUB_APP_ID}
+ENV GAUZY_GITHUB_POST_INSTALL_URL=${GAUZY_GITHUB_POST_INSTALL_URL}
+ENV JITSU_BROWSER_URL=${JITSU_BROWSER_URL}
+ENV JITSU_BROWSER_WRITE_KEY=${JITSU_BROWSER_WRITE_KEY}
 
 EXPOSE ${WEB_PORT}
 

diff --git a/.deploy/webapp/entrypoint.compose.sh b/.deploy/webapp/entrypoint.compose.sh
@@ -27,7 +27,15 @@ sed -i "s#DOCKER_DEFAULT_COUNTRY#$DEFAULT_COUNTRY#g" *.js
 sed -i "s#DOCKER_DEMO#$DEMO#g" *.js
 sed -i "s#DOCKER_WEB_HOST#$WEB_HOST#g" *.js
 sed -i "s#DOCKER_WEB_PORT#$WEB_PORT#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_CLIENT_ID#$GAUZY_GITHUB_CLIENT_ID#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_APP_NAME#$GAUZY_GITHUB_APP_NAME#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_REDIRECT_URL#$GAUZY_GITHUB_REDIRECT_URL#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_APP_ID#$GAUZY_GITHUB_APP_ID#g" *.js
+sed -i "s|DOCKER_GAUZY_GITHUB_POST_INSTALL_URL|$GAUZY_GITHUB_POST_INSTALL_URL|g" *.js
+sed -i "s#DOCKER_JITSU_BROWSER_URL#$JITSU_BROWSER_URL#g" *.js
+sed -i "s#DOCKER_JITSU_BROWSER_WRITE_KEY#$JITSU_BROWSER_WRITE_KEY#g" *.js
 
+# We need to copy nginx.conf to correct place
 envsubst '${API_HOST} ${API_PORT}' < /etc/nginx/conf.d/compose.conf.template > /etc/nginx/nginx.conf
 
 # In Docker Compose we should wait other services start

diff --git a/.deploy/webapp/entrypoint.prod.sh b/.deploy/webapp/entrypoint.prod.sh
@@ -25,6 +25,13 @@ sed -i "s#DOCKER_DEFAULT_COUNTRY#$DEFAULT_COUNTRY#g" *.js
 sed -i "s#DOCKER_DEMO#$DEMO#g" *.js
 sed -i "s#DOCKER_WEB_HOST#$WEB_HOST#g" *.js
 sed -i "s#DOCKER_WEB_PORT#$WEB_PORT#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_CLIENT_ID#$GAUZY_GITHUB_CLIENT_ID#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_APP_NAME#$GAUZY_GITHUB_APP_NAME#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_REDIRECT_URL#$GAUZY_GITHUB_REDIRECT_URL#g" *.js
+sed -i "s#DOCKER_GAUZY_GITHUB_APP_ID#$GAUZY_GITHUB_APP_ID#g" *.js
+sed -i "s|DOCKER_GAUZY_GITHUB_POST_INSTALL_URL|$GAUZY_GITHUB_POST_INSTALL_URL|g" *.js
+sed -i "s#DOCKER_JITSU_BROWSER_URL#$JITSU_BROWSER_URL#g" *.js
+sed -i "s#DOCKER_JITSU_BROWSER_WRITE_KEY#$JITSU_BROWSER_WRITE_KEY#g" *.js
 
 # We may not need to use that env vars now in nginx.config, but we may want later.
 # Also we just need to copy nginx.conf to correct place anyway...

diff --git a/.env.compose b/.env.compose
@@ -309,6 +309,12 @@ HUBSTAFF_CLIENT_ID=
 HUBSTAFF_CLIENT_SECRET=
 HUBSTAFF_PERSONAL_ACCESS_TOKEN=
 
-# Jitsu Configuration
-JITSU_BROWSER_HOST=
+# Jitsu Browser Configuration
+JITSU_BROWSER_URL=
 JITSU_BROWSER_WRITE_KEY=
+
+# Jitsu Server Configuration
+JITSU_SERVER_URL=
+JITSU_SERVER_WRITE_KEY=
+JITSU_SERVER_DEBUG=
+JITSU_SERVER_ECHO_EVENTS=
diff --git a/.env.docker b/.env.docker
@@ -282,6 +282,12 @@ HUBSTAFF_CLIENT_ID=
 HUBSTAFF_CLIENT_SECRET=
 HUBSTAFF_PERSONAL_ACCESS_TOKEN=
 
-# Jitsu Configuration
-JITSU_BROWSER_HOST=
+# Jitsu Browser Configuration
+JITSU_BROWSER_URL=
 JITSU_BROWSER_WRITE_KEY=
+
+# Jitsu Server Configuration
+JITSU_SERVER_URL=
+JITSU_SERVER_WRITE_KEY=
+JITSU_SERVER_DEBUG=
+JITSU_SERVER_ECHO_EVENTS=
diff --git a/.env.local b/.env.local
@@ -269,6 +269,12 @@ HUBSTAFF_CLIENT_ID=
 HUBSTAFF_CLIENT_SECRET=
 HUBSTAFF_PERSONAL_ACCESS_TOKEN=
 
-# Jitsu Configuration
-JITSU_BROWSER_HOST=
+# Jitsu Browser Configuration
+JITSU_BROWSER_URL=
 JITSU_BROWSER_WRITE_KEY=
+
+# Jitsu Server Configuration
+JITSU_SERVER_URL=
+JITSU_SERVER_WRITE_KEY=
+JITSU_SERVER_DEBUG=
+JITSU_SERVER_ECHO_EVENTS=
diff --git a/.env.sample b/.env.sample
@@ -302,6 +302,12 @@ HUBSTAFF_CLIENT_ID=
 HUBSTAFF_CLIENT_SECRET=
 HUBSTAFF_PERSONAL_ACCESS_TOKEN=
 
-# Jitsu Configuration
-JITSU_BROWSER_HOST=
+# Jitsu Browser Configuration
+JITSU_BROWSER_URL=
 JITSU_BROWSER_WRITE_KEY=
+
+# Jitsu Server Configuration
+JITSU_SERVER_URL=
+JITSU_SERVER_WRITE_KEY=
+JITSU_SERVER_DEBUG=
+JITSU_SERVER_ECHO_EVENTS=
diff --git a/.github/workflows/deploy-civo-demo.yml b/.github/workflows/deploy-civo-demo.yml
@@ -36,6 +36,7 @@ jobs:
               run: |
                   envsubst < $GITHUB_WORKSPACE/.deploy/k8s/k8s-manifest.civo.demo.yaml | kubectl --context ever apply -f -
               env:
+                  # below we are using GitHub secrets for both frontend and backend
                   DB_NAME: 'gauzy_demo'
                   SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
                   SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-cw-demo.yml b/.github/workflows/deploy-cw-demo.yml
@@ -36,6 +36,7 @@ jobs:
               run: |
                   envsubst < $GITHUB_WORKSPACE/.deploy/k8s/k8s-manifest.cw.demo.yaml | kubectl --context coreweave apply -f -
               env:
+                  # below we are using GitHub secrets for both frontend and backend
                   DB_NAME: 'gauzy_demo'
                   SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
                   SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'