Merge branch 'lowcoder-org:main' into patch-2

Author: konstchri

README.md

@@ -3,9 +3,9 @@
 
 <div align="center">
     <h1 style="border-bottom: none; margin-bottom: 0">Lowcoder</h1>
-    <h3 style="margin-top: 0">The Open Source Retool Alternative</h3>
+    <h3 style="margin-top: 0">The Open Source Retool, Tooljet and Appsmith Alternative</h3>
     <p>
-        Build internal tools fast, with no limitations
+        Build internal and customer facing Apps fast, with no limitations
     </p>
 </div>
 

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -1932,7 +1932,7 @@ export const en = {
     jsLibraryInstallSuccess: "JavaScript library installed successfully",
     jsLibraryInstallFailed: "JavaScript library installation failed",
     jsLibraryInstallFailedCloud:
-      "Perhaps the library is not available in the sandbox, [Documentation](https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}",
+      "Perhaps the library is not available in the sandbox, [Documentation](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}",
     jsLibraryInstallFailedHost: "{message}",
     add: "Add New",
     jsHelpText: "Add a global method or variable to the current application.",
@@ -2083,7 +2083,7 @@ export const en = {
     showBorder: "Show border",
   },
   docUrls: {
-    docHome: "https://docs.lowcoder.dev/",
+    docHome: "https://docs.lowcoder.cloud/",
     components: "https://cloud.lowcoder.dev/components?n={compType}",
     module: "",
     optionList: "",
@@ -2092,12 +2092,12 @@ export const en = {
     aboutUs: "",
     changeLog: "",
     introVideo: "",
-    devNpmPlugin: "https://docs.lowcoder.dev/build-plugins/develop-your-first-plugin",
+    devNpmPlugin: "https://docs.lowcoder.cloud/lowcoder-extension/develop-data-source-plugins",
     devNpmPluginText: "How to develop npm plugin",
-    useHost: "https://docs.lowcoder.dev/self-hosting/access-local-database-or-api",
+    useHost: "https://docs.lowcoder.cloud/setup-and-run/self-hosting/access-local-database-or-api",
     eventHandlerSlowdown:
-      "https://docs.lowcoder.dev/build-apps/event-handlers#debounce-and-throttle",
-    thirdLib: "https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries",
+      "https://docs.lowcoder.cloud/build-applications/app-interaction/event-handlers",
+    thirdLib: "https://docs.lowcoder.cloud/lowcoder-extension/use-third-party-libraries-in-apps",
     thirdLibUrlText: "Use third-party libraries",
   },
   datasourceTutorial: {
@@ -2111,8 +2111,8 @@ export const en = {
   },
   queryTutorial: {
     js: "",
-    transformer: "https://docs.lowcoder.dev/build-apps/write-javascript/transformers",
-    tempState: "https://docs.lowcoder.dev/build-apps/write-javascript/temporary-state",
+    transformer: "https://docs.lowcoder.cloud/business-logic-in-apps/write-javascript/transformers",
+    tempState: "https://docs.lowcoder.cloud/business-logic-in-apps/write-javascript/temporary-state",
   },
   customComponent: {
     entryUrl: "https://sdk.lowcoder.cloud/custom_component.html",
@@ -2121,8 +2121,8 @@ export const en = {
     cloneUrl: "/apps/template-import/",
   },
   lowcoderUrl: {
-    createIssue: "https://github.com/lowcoder-dev/lowcoder/issues",
-    discord: "https://discord.com/invite/z5W2YHXdtt",
+    createIssue: "https://github.com/lowcoder-org/lowcoder/issues",
+    discord: "https://discord.com/invite/qMG9uTmAx2",
   },
   componentDoc: {
     markdownDemoText:

client/packages/lowcoder/src/i18n/locales/zh.ts

@@ -1906,7 +1906,7 @@ export const zh  = {
         jsLibraryDownloadError: "JavaScript库下载错误",
         jsLibraryInstallSuccess: "JavaScript库安装成功",
         jsLibraryInstallFailed: "JavaScript库安装失败",
-        jsLibraryInstallFailedCloud: "可能该库在沙盒中不可用,[文档](https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}",
+        jsLibraryInstallFailedCloud: "可能该库在沙盒中不可用,[文档](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}",
         jsLibraryInstallFailedHost: "{message}",
         add: "新增",
         jsHelpText: "向当前应用程序添加全局方法或变量.",
@@ -2053,7 +2053,7 @@ export const zh  = {
         showBorder: "显示边框"
     },
     docUrls: {
-      docHome: "https://docs.lowcoder.dev/",
+      docHome: "https://docs.lowcoder.cloud/",
       components: "https://cloud.lowcoder.dev/components?n={compType}",
       module: "",
       optionList: "",
@@ -2062,12 +2062,12 @@ export const zh  = {
       aboutUs: "",
       changeLog: "",
       introVideo: "",
-      devNpmPlugin: "https://docs.lowcoder.dev/build-plugins/develop-your-first-plugin",
+      devNpmPlugin: "https://docs.lowcoder.cloud/build-plugins/develop-your-first-plugin",
       devNpmPluginText: "如何开发npm插件?",
-      useHost: "https://docs.lowcoder.dev/self-hosting/access-local-database-or-api",
+      useHost: "https://docs.lowcoder.cloud/self-hosting/access-local-database-or-api",
       eventHandlerSlowdown:
-        "https://docs.lowcoder.dev/build-apps/event-handlers#debounce-and-throttle",
-      thirdLib: "https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries",
+        "https://docs.lowcoder.cloud/build-apps/event-handlers#debounce-and-throttle",
+      thirdLib: "https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries",
       thirdLibUrlText: "使用第三方插件库",
     },
     datasourceTutorial: {
@@ -2081,8 +2081,8 @@ export const zh  = {
     },
     queryTutorial: {
       js: "",
-      transformer: "https://docs.lowcoder.dev/build-apps/write-javascript/transformers",
-      tempState: "https://docs.lowcoder.dev/build-apps/write-javascript/temporary-state",
+      transformer: "https://docs.lowcoder.cloud/build-apps/write-javascript/transformers",
+      tempState: "https://docs.lowcoder.cloud/build-apps/write-javascript/temporary-state",
     },
     customComponent: {
       entryUrl: "https://sdk.lowcoder.cloud/custom_component.html",
@@ -2091,8 +2091,8 @@ export const zh  = {
       cloneUrl: "/apps/template-import/",
     },
     lowcoderUrl: {
-      createIssue: "https://github.com/lowcoder-dev/lowcoder/issues",
-      discord: "https://discord.com/invite/z5W2YHXdtt",
+      createIssue: "https://github.com/lowcoder-org/lowcoder/issues",
+      discord: "https://discord.com/invite/qMG9uTmAx2",
     },
     componentDoc: {
         markdownDemoText: "**Lowcoder** 是一个开发人员友好的开源低代码平台,可在几分钟内构建内部应用.",

client/packages/lowcoder/src/util/tutorialUtils.ts

@@ -9,7 +9,7 @@ const DatasourceTutorials: Partial<Record<DatasourceType, string>> = {
   es: trans("datasourceTutorial.es"),
   smtp: trans("datasourceTutorial.smtp"),
   clickHouse: trans("datasourceTutorial.clickHouse"),
-  googleSheets: "https://docs.lowcoder.dev/data-sources/connect-to-databases/google-sheets",
+  googleSheets: "https://docs.lowcoder.cloud/connect-your-data/apis-as-datasource/google-sheets",
 };
 
 export const getDatasourceTutorial = (datasourceType: DatasourceType) => {

deploy/docker/Dockerfile

@@ -135,9 +135,10 @@ RUN yarn build
 FROM nginx:1.23.4 as lowcoder-ce-frontend
 LABEL maintainer="lowcoder"
 
-# Change default nginx user into lowcoder user
+# Change default nginx user into lowcoder user and remove default nginx config
 RUN usermod --login lowcoder --uid 9001 nginx \
-  && groupmod --new-name lowcoder --gid 9001 nginx
+  && groupmod --new-name lowcoder --gid 9001 nginx \
+  && rm -f /etc/nginx/nginx.conf
 
 # Copy lowcoder client data
 COPY --chown=lowcoder:lowcoder --from=build-client /lowcoder-client/packages/lowcoder/build/ /lowcoder/client
@@ -149,8 +150,14 @@ COPY deploy/docker/frontend/01-update-nginx-conf.sh /docker-entrypoint.d/01-upda
 RUN chmod +x /docker-entrypoint.d/00-change-nginx-user.sh && \
     chmod +x /docker-entrypoint.d/01-update-nginx-conf.sh
 
-COPY deploy/docker/frontend/nginx.conf /etc/nginx/nginx.conf
+COPY deploy/docker/frontend/nginx-http.conf /etc/nginx/nginx-http.conf
+COPY deploy/docker/frontend/nginx-https.conf /etc/nginx/nginx-https.conf
+COPY deploy/docker/frontend/ssl-certificate.conf /etc/nginx/ssl-certificate.conf
+COPY deploy/docker/frontend/ssl-params.conf /etc/nginx/ssl-params.conf
+
+
 EXPOSE 3000
+EXPOSE 3443
 
 #############################################################################
 
@@ -189,6 +196,7 @@ COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/etc /lowcoder/etc
 COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/entrypoint.sh /lowcoder/entrypoint.sh
 
 EXPOSE 3000
+EXPOSE 3443
 
 ENTRYPOINT [ "/bin/sh" , "/lowcoder/entrypoint.sh" ]
 CMD ["/usr/bin/supervisord", "-n" , "-c" , "/lowcoder/etc/supervisord.conf"]

deploy/docker/all-in-one/entrypoint.sh

@@ -19,19 +19,20 @@ fi;
 
 LOGS="/lowcoder-stacks/logs"
 DATA="/lowcoder-stacks/data"
+CERT="/lowcoder-stacks/ssl"
 # Create folder for holding application logs and data
 mkdir -p ${LOGS}/redis \
   ${LOGS}/mongodb \
   ${LOGS}/api-service \
   ${LOGS}/node-service \
   ${LOGS}/frontend \
   ${DATA}/redis \
-  ${DATA}/mongodb
+  ${DATA}/mongodb \
+  ${CERT}
 
 # Update owner of logs and data
 chown -R ${USER_ID}:${GROUP_ID} /lowcoder-stacks/ /lowcoder/etc
 
-
 # Enable services
 SUPERVISOR_AVAILABLE="/lowcoder/etc/supervisord/conf-available"
 SUPERVISOR_ENABLED="/lowcoder/etc/supervisord/conf-enabled"
@@ -62,7 +63,7 @@ if [ "${NODE_SERVICE_ENABLED:=true}" = "true" ]; then
     ln ${SUPERVISOR_AVAILABLE}/11-node-service.conf ${SUPERVISOR_ENABLED}/11-node-service.conf
 fi;
 
-# Enable forntend if configured to run
+# Enable frontend if configured to run
 if [ "${FRONTEND_ENABLED:=true}" = "true" ]; then
    ln ${SUPERVISOR_AVAILABLE}/20-frontend.conf ${SUPERVISOR_ENABLED}/20-frontend.conf
 fi;

deploy/docker/docker-compose.yaml

@@ -9,6 +9,7 @@ services:
     container_name: lowcoder
     ports:
       - "3000:3000"
+      - "3443:3443"
     environment:
       # enable services
       REDIS_ENABLED: "true"

deploy/docker/frontend/01-update-nginx-conf.sh

@@ -2,6 +2,19 @@
 
 set -e
 
+echo "Creating nginx config..."
+if [ -e "${CERT}/fullchain.pem" ] && [ -e "${CERT}/privkey.pem" ]; then
+   echo "Certificates found, configuring with HTTPS."
+   ln -s /etc/nginx/nginx-https.conf /etc/nginx/nginx.conf
+   if [ ! -e "${CERT}/dhparam.pem" ]; then
+      echo "Diffle-Helmann parameters file not found, generating in now... (this can take some time)"
+      openssl dhparam -out "${CERT}/dhparam.pem" 4096
+   fi;
+else
+   echo "Certificates not found, configuring with HTTP."
+   ln -s /etc/nginx/nginx-http.conf /etc/nginx/nginx.conf
+fi;
+
 sed -i "s@__LOWCODER_API_SERVICE_URL__@${LOWCODER_API_SERVICE_URL:=http://localhost:8080}@" /etc/nginx/nginx.conf
 sed -i "s@__LOWCODER_NODE_SERVICE_URL__@${LOWCODER_NODE_SERVICE_URL:=http://localhost:6060}@" /etc/nginx/nginx.conf
 

deploy/docker/frontend/nginx.conf renamed to deploy/docker/frontend/nginx-http.conf

@@ -46,12 +46,14 @@ http {
         location /api {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-Host $host;
+	    proxy_set_header X-Real-IP $remote_addr;
             proxy_pass __LOWCODER_API_SERVICE_URL__;
         }
 
         location /node-service/plugin-icons {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-Host $host;
+	    proxy_set_header X-Real-IP $remote_addr;
             proxy_pass __LOWCODER_NODE_SERVICE_URL__;
         }
     }

deploy/docker/frontend/nginx-https.conf

@@ -0,0 +1,63 @@
+user  lowcoder;
+
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format main '"$time_local" client=$remote_addr '
+               'method=$request_method request="$request" '
+               'request_length=$request_length '
+               'status=$status bytes_sent=$bytes_sent '
+               'body_bytes_sent=$body_bytes_sent '
+               'referer=$http_referer '
+               'http_x_forwarded_for=$http_x_forwarded_for '
+               'user_agent="$http_user_agent" '
+               'upstream_addr=$upstream_addr '
+               'upstream_status=$upstream_status '
+               'request_time=$request_time '
+               'upstream_response_time=$upstream_response_time '
+               'upstream_connect_time=$upstream_connect_time '
+               'upstream_header_time=$upstream_header_time';
+
+    keepalive_timeout  65;
+    sendfile        on;
+    #tcp_nopush     on;
+
+    server {
+        listen 3443 ssl;
+        root /lowcoder/client;
+
+        include /etc/nginx/ssl-certificate.conf;
+        include /etc/nginx/ssl-params.conf;
+
+        location / {
+            try_files $uri /index.html;
+
+            if ($request_filename ~* .*.(html|htm)$) {
+                add_header Cache-Control no-cache;
+            }
+        }
+
+        location /api {
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
+	    proxy_set_header X-Real-IP $remote_addr;
+            proxy_pass __LOWCODER_API_SERVICE_URL__;
+        }
+
+        location /node-service/plugin-icons {
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
+	    proxy_set_header X-Real-IP $remote_addr;
+            proxy_pass __LOWCODER_NODE_SERVICE_URL__;
+        }
+    }
+
+}