mixcore · nhathoang989 · Oct 22, 2021 · Oct 17, 2021 · Oct 17, 2021 · Oct 22, 2021
diff --git a/src/Mix.Cms.Lib/Helpers/MixCmsHelper.cs b/src/Mix.Cms.Lib/Helpers/MixCmsHelper.cs
@@ -258,6 +258,11 @@ public static async Task<MixNavigation> GetNavigationAsync(string name, string c
 
                     foreach (var item in cate.MenuItems)
                     {
+                        if (item.Uri.IndexOf('?') > 0)
+                        {
+                            item.Uri = item.Uri[..item.Uri.IndexOf('?')];
+                        }
+
                         item.IsActive = item.Uri == activePath;
                         if (item.IsActive)
                         {
@@ -623,6 +628,25 @@ public static string TranslateUrl(string url, string srcCulture, string destCult
                 : $"/{destCulture}{url}";
         }
 
+        public static string GetUrlByPageId(int pageId, string culture)
+        {
+            using var context = new MixCmsContext();
+            var seoName = context.MixPage.Where(p => p.Id == pageId && p.Specificulture == culture).Select(p => p.SeoName).FirstOrDefault();
+            if (seoName == null)
+            {
+                return $"/{culture}";
+            }
+
+            string seoUrl = $"/{culture}/{seoName}";
+            var urlAlias = context.MixUrlAlias.Where(m => m.SourceId == pageId.ToString() && m.Specificulture == culture).Select(p => p.Alias).FirstOrDefault();
+            if (urlAlias == null)
+            {
+                return seoUrl;
+            }
+
+            return urlAlias;
+        }
+
         public static string BuildUrl(HttpContext context, string key, string value)
         {
             var nameValueCollection = new NameValueCollection

diff --git a/src/Mix.Cms.Lib/Readme.txt b/src/Mix.Cms.Lib/Readme.txt
@@ -14,6 +14,7 @@ Update-Database -Context MixCmsContext
 remove ntext type
 remove default value
 
+mysql> SET GLOBAL sort_buffer_size = 1024 * 1024 * 4;
 
 // Clean Init Database
 

diff --git a/src/Mix.Cms.Web/web.config b/src/Mix.Cms.Web/web.config
@@ -8,11 +8,7 @@
       <handlers>
         <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
       </handlers>
-      <aspNetCore processPath="dotnet" arguments=".\mixcore.dll" stdoutLogEnabled="true" stdoutLogFile=".\logs\stdout" hostingModel="inprocess">
-        <environmentVariables>
-          <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
-        </environmentVariables>
-      </aspNetCore>
+      <aspNetCore processPath="dotnet" arguments=".\mixcore.dll" stdoutLogEnabled="true" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
     </system.webServer>
   </location>
 </configuration>

diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-client.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-client.min.css
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor-scss.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor-scss.min.css
@@ -1,4 +1,4 @@
-/* Thu Oct 07 2021 10:37:10 GMT+0700 (Indochina Time) */fb-login {
+/* Sat Oct 16 2021 14:15:51 GMT+0700 (Indochina Time) */fb-login {
   background-color: aqua; }
 
 medias .modal {
@@ -32,6 +32,10 @@ mix-module-data-table .preview-container {
 upload-croppie .cr-boundary {
   overflow: hidden; }
 
+.table-data td.preview {
+  max-width: 120px;
+  overflow: hidden; }
+
 main-side-bar-dynamic .sw-sidebar .sw-toc-item {
   position: relative; }
   main-side-bar-dynamic .sw-sidebar .sw-toc-item .sw-toc-link .sw-toc-link {
@@ -63,7 +67,3 @@ mix-database-nav-values mix-column-preview .rowx {
   #modal-content-filter .modal-lg,
   #modal-content-filter .modal-xl {
     max-width: 80vw; } }
-
-.table-data td.preview {
-  max-width: 120px;
-  overflow: hidden; }
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor.min.css
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/js/app-client.min.js b/src/Mix.Cms.Web/wwwroot/mix-app/js/app-client.min.js
@@ -462,44 +462,19 @@ modules.component("fbCustomerChat", {
   },
 });
 
-modules.component("fbLike", {
-  templateUrl: "/mix-app/views/app-client/components/fb-like/fb-like.html",
-  controller: [
-    "$location",
-    function ($location) {
-      var ctrl = this;
-      ctrl.href = ctrl.href || window.top.location.href;
-      ctrl.layout = ctrl.layout || "standard";
-      ctrl.size = ctrl.size || "small";
-      ctrl.showFaces = ctrl.showFaces || true;
-      this.$ () {
-        setTimeout(() => {
-          FB.XFBML.parse();
-        }, 200);
-      };
-    },
-  ],
-  bindings: {
-    href: "=",
-    layout: "=",
-    size: "=",
-    showFaces: "=",
-  },
-});
-
-modules.component("fbShare", {
-  templateUrl: "/mix-app/views/app-client/components/fb-share/fb-share.html",
+modules.component("fbSend", {
+  templateUrl: "/mix-app/views/app-client/components/fb-send/fb-send.html",
   controller: [
     "$location",
     function ($location) {
       var ctrl = this;
       ctrl.href = ctrl.href || window.top.location.href;
-      ctrl.share = function () {
-        var href = window.top.location.href;
+      ctrl.send = function () {
+        var link = ctrl.href || window.top.location.href;
         FB.ui(
           {
-            method: "share",
-            href: href,
+            method: "send",
+            link: link,
           },
           function (response) {}
         );
@@ -508,31 +483,32 @@ modules.component("fbShare", {
   ],
   bindings: {
     href: "=",
+    appId: "=",
   },
 });
 
-modules.component("fbSend", {
-  templateUrl: "/mix-app/views/app-client/components/fb-send/fb-send.html",
+modules.component("fbLike", {
+  templateUrl: "/mix-app/views/app-client/components/fb-like/fb-like.html",
   controller: [
     "$location",
     function ($location) {
       var ctrl = this;
       ctrl.href = ctrl.href || window.top.location.href;
-      ctrl.send = function () {
-        var link = ctrl.href || window.top.location.href;
-        FB.ui(
-          {
-            method: "send",
-            link: link,
-          },
-          function (response) {}
-        );
+      ctrl.layout = ctrl.layout || "standard";
+      ctrl.size = ctrl.size || "small";
+      ctrl.showFaces = ctrl.showFaces || true;
+      this.$ () {
+        setTimeout(() => {
+          FB.XFBML.parse();
+        }, 200);
       };
     },
   ],
   bindings: {
     href: "=",
-    appId: "=",
+    layout: "=",
+    size: "=",
+    showFaces: "=",
   },
 });
 
@@ -779,6 +755,30 @@ modules.component("mixMessagesHubClient", {
   ],
 });
 
+modules.component("fbShare", {
+  templateUrl: "/mix-app/views/app-client/components/fb-share/fb-share.html",
+  controller: [
+    "$location",
+    function ($location) {
+      var ctrl = this;
+      ctrl.href = ctrl.href || window.top.location.href;
+      ctrl.share = function () {
+        var href = window.top.location.href;
+        FB.ui(
+          {
+            method: "share",
+            href: href,
+          },
+          function (response) {}
+        );
+      };
+    },
+  ],
+  bindings: {
+    href: "=",
+  },
+});
+
 modules.component("serviceHubClient", {
   templateUrl:
     "/mix-app/views/app-client/components/service-hub-client/view.html",
@@ -1001,124 +1001,6 @@ modules.component("serviceHubClient", {
   ],
 });
 
-modules.component("shoppingCart", {
-  templateUrl: "/mix-app/views/app-client/components/shopping-cart/view.html",
-  bindings: {
-    cartData: "=?",
-    successCallback: "&?",
-  },
-  controller: "ShoppingCartController",
-});
-modules.controller("ShoppingCartController", [
-  "$rootScope",
-  "$scope",
-  "$element",
-  "localStorageService",
-  "RestMixDatabaseDataClientService",
-  function ($rootScope, $scope, $element, localStorageService, dataService) {
-    $scope.submitted = false;
-    $scope.isShow = false;
-    $scope.init = function (validateCallback, successCallback, failCallback) {
-      $scope.validateCallback = validateCallback;
-      $scope.successCallback = successCallback;
-      $scope.failCallback = failCallback;
-    };
-    $scope.translate = $rootScope.translate;
-
-    $scope.showShoppingCart = function () {
-      $scope.cartModal.show();
-    };
-    $scope.calculate = function () {
-      $scope.cartData.total = 0;
-      $scope.cartData.totalItem = $scope.cartData.items.length;
-      angular.forEach($scope.cartData.items, function (e) {
-        $scope.cartData.total += parseInt(e.price) * e.quantity;
-      });
-      localStorageService.set("shoppingCart", $scope.cartData);
-    };
-    $scope.removeItem = function (index) {
-      $scope.cartData.items.splice(index, 1);
-      $scope.calculate();
-    };
-    $scope.submit = async function () {
-      $scope.onValidate();
-      if ($scope.frmCheckOut.$valid) {
-        $rootScope.submitting = true;
-        var result = await dataService.saveData(
-          "shoppingCart",
-          $scope.cartData
-        );
-        if (result.isSucceed) {
-          $scope.onSuccess(result.data);
-        } else {
-          $scope.onFail(result.errors);
-        }
-        $scope.$apply();
-      }
-    };
-
-    $scope. function () {
-      $scope.frmCheckOut.$$element.addClass("was-validated");
-      if ($scope.validateCallback) {
-        let isValid = await $rootScope.executeFunctionByName(
-          $scope.validateCallback,
-          [$scope.frmCheckOut, $scope.cartData],
-          window
-        );
-        $scope.frmCheckOut.$valid = $scope.frmCheckOut.$valid && isValid;
-      }
-    };
-    $scope. (resp) {
-      setTimeout(() => {
-        $scope.submitting = false;
-      }, 1000);
-      $scope.cartData = {
-        items: [],
-        totalItem: 0,
-        total: 0,
-      };
-      localStorageService.set("shoppingCart", $scope.cartData);
-
-      if ($scope.successCallback) {
-        $rootScope.executeFunctionByName(
-          $scope.successCallback,
-          [resp],
-          window
-        );
-      } else {
-        window.location.href = "/";
-      }
-    };
-    $scope. (errors) {
-      if ($scope.failCallback) {
-        $rootScope.executeFunctionByName($scope.failCallback, [errors], window);
-      }
-    };
-    $scope.sendmail = async function () {
-      let edm =
-        'Url: <a href="[url]">View Tour</a> <br/>Name: [name] <br/>' +
-        "Phone: [phone]<br/>" +
-        "Email: [email]<br/>" +
-        "Quantity: [quantity]<br/>" +
-        "Message: [message] <br/>" +
-        "property: [property] <br/>Price: [price] <br/>";
-
-      edm = edm.replace(/\[url\]/g, window.top.location.href);
-      edm = edm.replace(/\[name\]/g, $scope.order.name);
-      edm = edm.replace(/\[phone\]/g, $scope.order.phone);
-      edm = edm.replace(/\[email\]/g, $scope.order.email);
-      edm = edm.replace(/\[message\]/g, $scope.order.message);
-      edm = edm.replace(/\[property\]/g, $scope.order.propertyId);
-      edm = edm.replace(/\[price\]/g, $scope.order.price);
-      edm = edm.replace(/\[quantity\]/g, $scope.order.quantity);
-
-      //   TODO Handle cart submit
-      await commonService.sendMail("Booking - " + $scope.propertyName, edm);
-      $scope.submitted = true;
-    };
-  },
-]);
-
 app.factory("ConnectionManager", [
   function () {
     var serviceFactory = {};