Merge branch 'dev' into feature-swagger-display

FalkWolsky · web-flow · commit ae4121881f19 · 2024-05-24T19:43:43.000+02:00
diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx
@@ -122,10 +122,43 @@ class AppIndex extends React.Component<AppIndexProps, any> {
           {<title>{this.props.brandName}</title>}
           {<link rel="icon" href={this.props.favicon} />}
           <meta name="description" content={trans("productDesc")} />
+          <meta name="keywords" content="Lowcoder, Applications, App Builder, Internal Applications, Websites, Dashboards, Data Visualization, Customer Applications, CRM, ERP, eCommerce, VideoMeeting, Rapid Development" />
+          <meta name="author" content="Lowcoder Software LTD" />
+          <meta name="robots" content="index, follow" />
+
+          
+          <meta key="og:title" property="og:title" content={this.props.brandName} />
+          <meta key="og:description" property="og:description" content={trans("productDesc")} />
+          <meta key="og:image" property="og:image" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/App%20Editor%20%7C%20Main%20Screeen%20clean%20v2.4.0.png" />
+          <meta key="og:url" property="og:url" content={window.location.href} />
+          <meta key="og:type" property="og:type" content="website" />
+
+          <meta key="twitter:card" name="twitter:card" content="summary_large_image" />
+          <meta key="twitter:title" name="twitter:title" content={this.props.brandName} />
+          <meta key="twitter:description" name="twitter:description" content={trans("productDesc")} />
+          <meta key="twitter:image" name="twitter:image" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/App%20Editor%20%7C%20Main%20Screeen%20clean%20v2.4.0.png" />
+
+          <meta key="viewport" name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+          <meta key="mobile-web-app-capable" name="mobile-web-app-capable" content="yes" />
+          <meta key="theme-color" name="theme-color" content="#b480de" />
+
+          <meta key="apple-mobile-web-app-capable" name="apple-mobile-web-app-capable" content="yes" />
+          <meta key="apple-mobile-web-app-status-bar-style" name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+          <meta key="apple-mobile-web-app-title" name="apple-mobile-web-app-title" content={this.props.brandName} />
+          <link key="apple-touch-icon" rel="apple-touch-icon" href="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20512.png" />
+          <link key="apple-touch-startup-image" rel="apple-touch-startup-image" href="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20512.png" />
+
+          <meta key="application-name" name="application-name" content={this.props.brandName} />
+          <meta key="msapplication-TileColor" name="msapplication-TileColor" content="#b480de" />
+          <meta key="msapplication-TileImage" name="msapplication-TileImage" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20150.png" />
+          {/* }<meta key="msapplication-config" name="msapplication-config" content="https://www.yourdomain.com/path/to/browserconfig.xml" />, */}
+
+          <link rel="canonical" href={window.location.href} />
           {isLowCoderDomain && [
             // Adding Support for iframely to be able to embedd the component explorer in the docu
-            <meta key="iframely:title" property="iframely:title" content="Lowcoder" />,
-            <meta key="iframely:description" property="iframely:description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />,
+            <meta key="iframely:title" property="iframely:title" content={this.props.brandName} />,
+            <meta key="iframely:description" property="iframely:description" content={trans("productDesc")} />,
+
             <link key="preconnect-googleapis" rel="preconnect" href="https://fonts.googleapis.com" />,
             <link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
             <link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
diff --git a/client/packages/lowcoder/src/assets/images/marketplaceHeaderImage.jpg b/client/packages/lowcoder/src/assets/images/marketplaceHeaderImage.jpg
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/MoveToFolderModal.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/MoveToFolderModal.tsx
@@ -108,7 +108,7 @@ export const MoveToFolderModal = (props: { source?: HomeRes; onClose: () => void
                       label: (
                         <FolderSelectLabel>
                           <FolderIcon style={{ marginRight: "8px", flexShrink: 0 }} />
-                          {trans("home.rootFolder")}
+                          {trans("home.rootFolder")} 
                         </FolderSelectLabel>
                       ),
                       value: "",
@@ -120,7 +120,7 @@ export const MoveToFolderModal = (props: { source?: HomeRes; onClose: () => void
                 .map((f) => ({
                   label: (
                     <FolderSelectLabel>
-                      <FolderIcon style={{ marginRight: "8px", flexShrink: 0 }} />
+                      <FolderIcon style={{ marginRight: "8px", width: "20px", flexShrink: 0 }} />
                       {f.name}
                     </FolderSelectLabel>
                   ),
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java
@@ -29,7 +29,9 @@ public class ServerSettingServiceImpl implements ServerSettingService {
     "LOWCODER_ADMIN_SMTP_USERNAME",
     "LOWCODER_ADMIN_SMTP_PASSWORD",
     "LOWCODER_SUPERADMIN_PASSWORD",
-    "LOWCODER_SUPERADMIN_USERNAME");
+    "LOWCODER_SUPERADMIN_USERNAME",
+    "LOWCODER_SUPERUSER_PASSWORD",
+    "LOWCODER_SUPERUSER_USERNAME");
 
     @Autowired
     public ServerSettingServiceImpl(ServerSettingRepository repository) {
