Merge pull request #16 from VasukiElango/master

1037762: V34.1.29 has been published

Author: kmuthukumarmkm

.github/workflows/dotnet.yml

@@ -16,14 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Setup .NET8
+    - name: Setup .NET10
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
-    - name: Setup .NET9
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Build Server
       run: dotnet build ./Server/FloorPlanner.csproj
     - name: Build Wasm

Common/BlazorServerCommon_NET8.csproj Common/BlazorServerCommon_NET10.csprojCommon/BlazorServerCommon_NET8.csproj renamed to Common/BlazorServerCommon_NET10.csproj

@@ -62,7 +62,7 @@
     /// <summary>
     /// Gets or sets the scroll limit for the diagram's viewport.
     /// </summary>
-    public ScrollLimitMode scrollLimit { get; set; } = ScrollLimitMode.Infinity;
+    public ScrollLimitMode scrollLimit { get; set; } = ScrollLimitMode.Diagram;
     /// <summary>
     /// Gets or sets the current zoom level of the diagram.
     /// </summary>

Common/BlazorWasmCommon_NET8.csproj Common/BlazorWasmCommon_NET10.csprojCommon/BlazorWasmCommon_NET8.csproj renamed to Common/BlazorWasmCommon_NET10.csproj

@@ -76,6 +76,16 @@
         <DiagramSaveDialog @ref="@SaveDialogBox"></DiagramSaveDialog>
         <DiagramExportDialog @ref="@ExportDialogBox"></DiagramExportDialog>
         <DiagramPrintDialog @ref="@PrintDialogBox"></DiagramPrintDialog>
+        <div class="promotion-text e-control">
+            <img src="syncfusion_logo.svg" style="margin-right:7px; filter: brightness(0) invert(1)"
+                 alt="Syncfusion Logo" />
+            Powered by&nbsp;
+            <a href="https://www.syncfusion.com/blazor-components/blazor-diagram?tag=es-freetools-floor-planner-sample-ft"
+               target="_blank"
+               style="text-decoration:none; color:#fff30f;">
+                Syncfusion Diagram Component
+            </a>
+        </div>
     </div>
 </div>
 

Common/Pages/DiagramMainContent.razor

@@ -7,7 +7,6 @@
 @using Syncfusion.Blazor.Popups
 @using System.Collections.ObjectModel
 @using Syncfusion.Blazor.SplitButtons
-@using Newtonsoft.Json.Linq
 @using System.Drawing
 
 

Common/Pages/DiagramMenuBar.razor

@@ -2,7 +2,6 @@
 using Microsoft.JSInterop;
 using System;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using Syncfusion.Blazor.Diagram;

Common/Pages/DiagramPropertyContainer.razor

@@ -13,6 +13,31 @@
             </div>
         </div>
     </div>
+    <!-- Fixed footer -->
+    <div class="footer">
+        <div class="footer-container">
+            <div class="diagram-icon">
+                <img class="footer-logo" src="diagram_component.svg" alt="Diagram Component" />
+            </div>
+            <div class="footer-content">
+                <div class="title">
+                    <span>Want interactive diagramming in your app?</span>
+                    <span><strong class="main-title"> Try our Diagram component</strong> — build, connect, and customize!</span>
+                </div>
+                <div class="buttons">
+                    <a class="e-trial-btn e-btn"
+                       href="https://www.syncfusion.com/downloads/blazor?tag=es-freetools-floor-planner-sample-ads-trial"
+                       target="_blank" rel="noopener noreferrer">
+                    </a>
+                    <a class="e-demo-btn"
+                       href="https://www.syncfusion.com/request-demo?tag=es-freetools-floor-planner-sample-ads-demo"
+                       target="_blank" rel="noopener noreferrer">
+                        Request Demo
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 

Common/Pages/DiagramToolBar.razor.cs

@@ -1,4 +1,4 @@
-/* https://fonts.google.com/specimen/Roboto?selection.family=Lato|Roboto */
+z/* https://fonts.google.com/specimen/Roboto?selection.family=Lato|Roboto */
 html, body {
     height: 100%;
     overflow: hidden;
@@ -9,7 +9,23 @@ html, body {
     font-family: "Roboto","GeezaPro","DejaVu Serif";
     letter-spacing: 0.3px;
 }
-
+/* Layout adjustments to keep footer at bottom and align header content */
+#FloorPlanner-container {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+/* Content area should fill remaining space between header and footer */
+.row.content {
+    flex: 1 1 auto;
+    position: relative;
+}
+/* Ensure editor panes fill available height inside flex container */
+#FloorPlanner-container .sidebar,
+#FloorPlanner-container .main-content {
+    top: 0;
+    height: 100%;
+}
 #DiagramTooltip {
     width: 100% !important;
     height: 100% !important;
@@ -55,6 +71,9 @@ html, body {
 
 .db-menu-container {
     padding: 2px 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .db-toolbar-editor {
@@ -1185,7 +1204,7 @@ html, body {
 }
 
 .e-dialog .e-dlg-header-content {
-    height: 36px;
+    height: 46px;
     padding: 9.5px 4px 9.5px 16px;
     border-bottom: 1px solid #D5D5D5;
 }
@@ -1240,6 +1259,7 @@ html, body {
 .e-upload .e-upload-files .e-upload-file-list,
 .e-upload .e-upload-files {
     border: none;
+    width: auto;
 }
 /*.e-icons {
     color: black;
@@ -1855,4 +1875,205 @@ td {
     max-width: unset;
 }
     /* Some animation occur while click the dropdown value End */
-    /* Some animation occur while click the dropdown value End */
+    /* Some animation occur while click the dropdown value End */
+/* Animation At Initial Rendering End */
+.promotion-text {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    font-weight: 500;
+    margin-right: 1.5rem;
+    margin-left: auto;
+    color: white;
+}
+/* Footer styles scoped to the sample root */
+.footer {
+    position: static;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(90.4deg, #154db9 0.03%, #081b3f 11.56%, #081b3f 85.56%, #154db9 99.97%);
+    border-top: 1px solid #D8DEE9;
+    padding: 12px;
+    font-family: sans-serif;
+}
+
+.footer-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 16px;
+}
+
+.diagram-icon {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex: 0 0 auto;
+    width: 38px;
+    height: 38px;
+}
+
+.footer-logo{
+    width:38px;
+    height:38px;
+}
+
+.footer-content {
+    display: flex;
+    align-items: center;
+    gap: 20px;
+}
+
+.title span {
+    font-weight: 400;
+    font-size: 16px;
+    color: #e1e3e7;
+}
+
+    .title span .main-title {
+        font-weight: 700;
+        font-size: 16px;
+        color: #ffffff;
+    }
+
+.buttons {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.e-trial-btn::before {
+    content: 'Start Free Trail';
+    font-family: sans-serif;
+}
+
+.e-trial-btn {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    background: #FFF30F;
+    color: #0F172A;
+    border: transparent;
+    border-radius: 8px;
+    padding: 10px 16px;
+    font-size: 14px;
+    font-weight: 700;
+    height: 40px;
+    width: auto;
+    box-shadow: none;
+    font-family: "Open Sans", Helvetica, Arial, sans-serif;
+    text-decoration: none;
+    text-transform: none;
+    box-sizing: border-box;
+}
+
+.e-demo-btn {
+    display: flex;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-smoothing: antialiased;
+    align-items: center;
+    background-color: transparent;
+    border: transparent;
+    color: white;
+    border-radius: 6px;
+    gap: 10px;
+    padding: 10px 16px;
+    font-size: 14px;
+    font-weight: 500;
+    letter-spacing: .7px;
+    height: 40px;
+    box-shadow: none;
+    text-transform: none;
+    text-decoration: none;
+    transition: box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+    .e-demo-btn:hover {
+        background-color: #173D87;
+        text-decoration: none;
+        color: white;
+    }
+
+    .e-demo-btn:focus {
+        color: white;
+        text-decoration: none;
+    }
+
+.e-trial-btn::after {
+    content: "\e7f9";
+    font-family: 'e-icons';
+}
+
+.e-trial-btn:hover {
+    background: #F1E50B;
+    text-decoration: none;
+    color: #0F172A;
+}
+
+.e-trial-btn:focus {
+    background: #F1E50B;
+    text-decoration: none;
+    color: #0F172A;
+}
+/* Responsive handling for footer */
+@media screen and (max-width: 1140px), screen and (max-device-width: 1140px) {
+    .title {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .footer-content .title span, .footer-content .title span .main-title {
+        font-size: 14px;
+    }
+}
+/* Hide extra footer text on smaller screens */
+@media screen and (max-width: 900px), screen and (max-device-width: 900px) {
+    .e-ribbon .help-pane-content,
+    .title span:last-child {
+        display: none;
+    }
+}
+
+@media screen and (max-width: 730px) {
+    .buttons .e-demo-btn {
+        display: none;
+    }
+
+    .buttons .e-trial-btn::before {
+        content: 'Free Trial';
+    }
+
+    .buttons .e-trial-btn::after {
+        display: none;
+    }
+}
+/* Hide Request Demo button on small screens + increase footer size */
+@media screen and (max-device-width: 730px) {
+    .footer {
+        height: 90px; /* Increased footer height */
+    }
+
+    .buttons .e-demo-btn {
+        display: none;
+    }
+
+    .buttons .e-trial-btn::before {
+        content: 'Free Trial';
+    }
+
+    .buttons .e-trial-btn::after {
+        display: none;
+    }
+
+    .title span,
+    .title span .main-title {
+        font-size: 26px; /* Bigger font for mobile */
+    }
+}
+/* Hide the promotion text */
+@media screen and (max-width: 620px), screen and (max-device-width: 620px) {
+    .promotion-text {
+        display: none;
+    }
+}