Merge pull request #7194 from ever-co/develop

Release
ever-co · Nov 27, 2023 · af4a290 · af4a290
2 parents a030abf + 213dbf5
commit af4a290
Show file tree

Hide file tree

Showing 37 changed files with 2,399 additions and 2,012 deletions.
diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile
@@ -75,6 +75,15 @@ ARG GAUZY_GITHUB_APP_ID
 ARG GAUZY_GITHUB_APP_NAME
 ARG GAUZY_GITHUB_POST_INSTALL_URL
 ARG GAUZY_GITHUB_APP_PRIVATE_KEY
+ARG MAGIC_CODE_EXPIRATION_TIME
+ARG APP_NAME
+ARG APP_LOGO
+ARG APP_SIGNATURE
+ARG APP_LINK
+ARG APP_EMAIL_CONFIRMATION_URL
+ARG APP_MAGIC_SIGN_URL
+ARG COMPANY_LINK
+ARG COMPANY_NAME
 
 FROM node:18-alpine3.17 AS dependencies
 
@@ -314,6 +323,15 @@ ENV GAUZY_GITHUB_POST_INSTALL_URL=${GAUZY_GITHUB_POST_INSTALL_URL}
 ENV GAUZY_GITHUB_OAUTH_CLIENT_ID=${GAUZY_GITHUB_OAUTH_CLIENT_ID}
 ENV GAUZY_GITHUB_OAUTH_CLIENT_SECRET=${GAUZY_GITHUB_OAUTH_CLIENT_SECRET}
 ENV GAUZY_GITHUB_OAUTH_CALLBACK_URL=${GAUZY_GITHUB_OAUTH_CALLBACK_URL}
+ENV MAGIC_CODE_EXPIRATION_TIME=${MAGIC_CODE_EXPIRATION_TIME}
+ENV APP_NAME=${APP_NAME}
+ENV APP_LOGO=${APP_LOGO}
+ENV APP_SIGNATURE=${APP_SIGNATURE}
+ENV APP_LINK=${APP_LINK}
+ENV APP_EMAIL_CONFIRMATION_URL=${APP_EMAIL_CONFIRMATION_URL}
+ENV APP_MAGIC_SIGN_URL=${APP_MAGIC_SIGN_URL}
+ENV COMPANY_LINK=${COMPANY_LINK}
+ENV COMPANY_NAME=${COMPANY_NAME}
 
 EXPOSE ${API_PORT}
 

diff --git a/.deploy/k8s/k8s-manifest.civo.prod.yaml b/.deploy/k8s/k8s-manifest.civo.prod.yaml
@@ -195,6 +195,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.deploy/k8s/k8s-manifest.civo.stage.yaml b/.deploy/k8s/k8s-manifest.civo.stage.yaml
@@ -189,6 +189,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.deploy/k8s/k8s-manifest.cw.prod.yaml b/.deploy/k8s/k8s-manifest.cw.prod.yaml
@@ -221,6 +221,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.deploy/k8s/k8s-manifest.cw.stage.yaml b/.deploy/k8s/k8s-manifest.cw.stage.yaml
@@ -215,6 +215,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.deploy/k8s/k8s-manifest.prod.yaml b/.deploy/k8s/k8s-manifest.prod.yaml
@@ -213,6 +213,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.deploy/k8s/k8s-manifest.stage.yaml b/.deploy/k8s/k8s-manifest.stage.yaml
@@ -207,6 +207,24 @@ spec:
                         value: '$GAUZY_GITHUB_OAUTH_CLIENT_SECRET'
                       - name: GAUZY_GITHUB_OAUTH_CALLBACK_URL
                         value: '$GAUZY_GITHUB_OAUTH_CALLBACK_URL'
+                      - name: MAGIC_CODE_EXPIRATION_TIME
+                        value: '$MAGIC_CODE_EXPIRATION_TIME'
+                      - name: APP_NAME
+                        value: '$APP_NAME'
+                      - name: APP_LOGO
+                        value: '$APP_LOGO'
+                      - name: APP_SIGNATURE
+                        value: '$APP_SIGNATURE'
+                      - name: APP_LINK
+                        value: '$APP_LINK'
+                      - name: APP_EMAIL_CONFIRMATION_URL
+                        value: '$APP_EMAIL_CONFIRMATION_URL'
+                      - name: APP_MAGIC_SIGN_URL
+                        value: '$APP_MAGIC_SIGN_URL'
+                      - name: COMPANY_LINK
+                        value: '$COMPANY_LINK'
+                      - name: COMPANY_NAME
+                        value: '$COMPANY_NAME'
 
                   ports:
                       - containerPort: 3000

diff --git a/.env.sample b/.env.sample
@@ -16,21 +16,21 @@ APP_EMAIL_CONFIRMATION_URL="http://localhost:4200/#/auth/confirm-email"
 # The URL for magic sign-in in the application.
 APP_MAGIC_SIGN_URL="http://localhost:4200/#/auth/magic-sign-in"
 
-# set true if running inside Docker container
+# Set true if running inside Docker container
 IS_DOCKER=false
 
-# set true if running as a Demo
+# Set true if running as a Demo
 DEMO=false
 
 ALLOW_SUPER_ADMIN_ROLE=true
 
-# set to Gauzy API base URL
+# Set to Gauzy API base URL
 API_BASE_URL=http://localhost:3000
 
-# set to Gauzy UI base URL
+# Set to Gauzy UI base URL
 CLIENT_BASE_URL=http://localhost:4200
 
-#set to Website Platform
+# Set to Website Platform
 PLATFORM_WEBSITE_URL=https://gauzy.co
 PLATFORM_WEBSITE_DOWNLOAD_URL=https://gauzy.co/downloads