Merge pull request #160 from mixcore/develop

Merge latest Develop branch to Master
mixcore · Dec 23, 2019 · f491acd · f491acd
2 parents ca34da1 + b1068f8
commit f491acd
Show file tree

Hide file tree

Showing 787 changed files with 48,436 additions and 23,552 deletions.
diff --git a/.gitignore b/.gitignore
@@ -288,3 +288,10 @@ src/Mix\.Cms\.Web/Cache/
 .DS_Store
 
 .vscode/
+
+src/Mix.Cms.Web/appsettings.*.json
+/src/_MixCore.sln
+
+src/Mix.Cms.Web/logs/
+
+src/Mix.Cms.Web.old/
diff --git a/assets/crm-flow.jpg b/assets/crm-flow.jpg
diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiAccountController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiAccountController.cs
@@ -166,7 +166,7 @@ public async Task<RepositoryResponse<AccessTokenViewModel>> RefreshToken(string
         [Route("Register")]
         [HttpPost, HttpOptions]
         [AllowAnonymous]
-        public async Task<RepositoryResponse<AccessTokenViewModel>> Register([FromBody] MixRegisterViewModel model)
+        public async Task<ActionResult<RepositoryResponse<AccessTokenViewModel>>> Register([FromBody] MixRegisterViewModel model)
         {
             RepositoryResponse<AccessTokenViewModel> result = new RepositoryResponse<AccessTokenViewModel>();
             if (ModelState.IsValid)
@@ -180,16 +180,15 @@ public async Task<RepositoryResponse<AccessTokenViewModel>> Register([FromBody]
                     Avatar = model.Avatar ?? MixService.GetConfig<string>("DefaultAvatar"),
                     JoinDate = DateTime.UtcNow
                 };
+
                 var createResult = await _userManager.CreateAsync(user, password: model.Password).ConfigureAwait(false);
                 if (createResult.Succeeded)
                 {
                     _logger.LogInformation("User created a new account with password.");
-
                     user = await _userManager.FindByEmailAsync(model.Email).ConfigureAwait(false);
                     model.Id = user.Id;
                     model.CreatedDateTime = DateTime.UtcNow;
                     // Save to cms db context
-
                     await model.SaveModelAsync();
                     var token = await _helper.GenerateAccessTokenAsync(user, true);
                     if (token != null)
@@ -201,7 +200,7 @@ public async Task<RepositoryResponse<AccessTokenViewModel>> Register([FromBody]
                     }
                     else
                     {
-                        return result;
+                        return Ok(result);
                     }
                 }
                 else
@@ -210,11 +209,11 @@ public async Task<RepositoryResponse<AccessTokenViewModel>> Register([FromBody]
                     {
                         result.Errors.Add(error.Description);
                     }
-                    return result;
+                    return BadRequest(result);
                 }
             }
 
-            return result;
+            return BadRequest(result);
         }
 
         [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme,

diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiFileController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiFileController.cs
@@ -2,6 +2,7 @@
 // The Mixcore Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
 using Mix.Cms.Lib.Models.Cms;
@@ -45,15 +46,11 @@ public RepositoryResponse<FileViewModel> Details(string folder, string filename)
 
         // GET api/files/id
         [HttpGet, HttpOptions]
-        [Route("delete/{id}")]
-        public RepositoryResponse<bool> Delete(RequestObject request)
+        [Route("delete")]
+        public RepositoryResponse<bool> Delete()
         {
-            string fullPath = CommonHelper.GetFullPath(new string[]
-            {
-                request.Key,
-                request.Keyword
-            });
-            var result = FileRepository.Instance.DeleteWebFile(fullPath);
+            string fullPath = Request.Query["fullPath"].ToString();
+            var result = FileRepository.Instance.DeleteFile(fullPath);
             return new RepositoryResponse<bool>()
             {
                 IsSucceed = result,
@@ -65,16 +62,16 @@ public RepositoryResponse<bool> Delete(RequestObject request)
         /// <summary>
         /// Uploads the image.
         /// </summary>
-        /// <param name="image">The img information.</param>
+        /// <param name="image">The img information.</param>    
         /// <param name="file"></param> Ex: { "base64": "", "fileFolder":"" }
         /// <returns></returns>
-        [Route("uploadFile")]
+        [Route("upload-file")]
         [HttpPost, HttpOptions]
-        public IActionResult Edit(FileViewModel file)
+        public IActionResult Upload([FromForm] string folder, [FromForm]IFormFile file)
         {
             if (ModelState.IsValid)
             {
-                var result = FileRepository.Instance.SaveWebFile(file);
+                var result = FileRepository.Instance.SaveFile(file, file.FileName, folder);
                 return Ok(result);
             }
             return BadRequest();
@@ -117,7 +114,5 @@ public RepositoryResponse<FilePageViewModel> GetList([FromBody]RequestPaging req
             };
         }
         #endregion Post
-
-
     }
 }
diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiInitCmsController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiInitCmsController.cs
@@ -116,13 +116,15 @@ public async Task<RepositoryResponse<AccessTokenViewModel>> InitSuperAdmin([From
                     if (createResult.Succeeded)
                     {
                         user = await _userManager.FindByEmailAsync(model.Email).ConfigureAwait(false);
+                        await _userManager.AddToRoleAsync(user, "SuperAdmin");
+                        model.ExpandView();
                         model.Id = user.Id;
                         model.CreatedDateTime = DateTime.UtcNow;
                         model.Avatar = model.Avatar ?? MixService.GetConfig<string>("DefaultAvatar");
                         // Save to cms db context
 
                         await model.SaveModelAsync();
-                        await _userManager.AddToRoleAsync(user, "SuperAdmin");
+
                         var token = await _idHelper.GenerateAccessTokenAsync(user, true);
                         if (token != null)
                         {
@@ -209,6 +211,7 @@ public async Task<RepositoryResponse<bool>> InitLanguages([FromBody]List<MixLang
                         MixService.SetConfig("InitStatus", 4);
                         MixService.SetConfig("IsInit", true);
                         MixService.SaveSettings();
+                        _ = MixCacheService.RemoveCacheAsync();
                         MixService.Reload();
                     }
                 }
@@ -235,7 +238,7 @@ public async Task<RepositoryResponse<bool>> InitLanguages([FromBody]List<MixLang
             if (theme != null)
             {
                 string importFolder = $"Imports/Themes/{DateTime.UtcNow.ToString("dd-MM-yyyy")}/{data.Name}";
-                FileRepository.Instance.SaveWebFile(theme, importFolder);
+                FileRepository.Instance.SaveWebFile(theme, theme.FileName, importFolder);
                 data.TemplateAsset = new Lib.ViewModels.FileViewModel(theme, importFolder);
             }
             else
@@ -273,7 +276,9 @@ public async Task<RepositoryResponse<bool>> InitLanguages([FromBody]List<MixLang
                     // MixService.SetConfig<string>("SiteName", _lang, data.Title);
                     MixService.LoadFromDatabase();
                     MixService.SetConfig("InitStatus", 3);
+                    MixService.SetConfig("IsInit", true);
                     MixService.SaveSettings();
+                    _ = MixCacheService.RemoveCacheAsync();
                     MixService.Reload();
                 }
                 return result;
@@ -304,7 +309,7 @@ private async Task<RepositoryResponse<bool>> InitStep1Async(InitCmsViewModel mod
                 MixService.SetConfig<string>("DefaultCulture", model.Culture.Specificulture);
                 MixService.SetConfig("InitStatus", 1);
                 MixService.SaveSettings();
-                MixService.Reload();
+                //MixService.Reload();
             }
             else
             {

diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiMediaController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiMediaController.cs
@@ -78,15 +78,17 @@ public async Task<ActionResult<JObject>> Details(string viewType, int? id)
         #region Post
 
         // POST api/media
-        [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme, Roles = "SuperAdmin, Admin")]
         [HttpPost, HttpOptions]
         [Route("save")]
-        public async Task<RepositoryResponse<UpdateViewModel>> Save([FromBody]UpdateViewModel model)
+        public async Task<RepositoryResponse<UpdateViewModel>> Save([FromForm]string model, [FromForm]IFormFile file)
         {
             if (model != null)
             {
-                model.Specificulture = _lang;
-                var result = await base.SaveAsync<UpdateViewModel>(model, true);
+                var json = JObject.Parse(model);
+                var data = json.ToObject<UpdateViewModel>();
+                data.Specificulture = _lang;
+                data.File = file;
+                var result = await base.SaveAsync<UpdateViewModel>(data, true);
                 return result;
             }
             return new RepositoryResponse<UpdateViewModel>() { Status = 501 };

diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiModuleController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiModuleController.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
+using Mix.Cms.Lib;
 using Mix.Cms.Lib.Models.Cms;
 using Mix.Cms.Lib.Services;
 using Mix.Cms.Lib.ViewModels;
@@ -143,6 +144,24 @@ public async Task<RepositoryResponse<MixModule>> SaveFields(int id, [FromBody]Li
             return new RepositoryResponse<MixModule>();
         }
 
+        // POST api/module
+        [HttpPost, HttpOptions]
+        [Route("data/save/{name}/{formName}")]
+        public async Task<ActionResult<JObject>> SaveData(string name, string formName, [FromBody]JObject obj)
+        {
+            // Get module by name
+            string _username = User?.Claims.FirstOrDefault(c => c.Type == "Username")?.Value;
+            var result = await ODataMobileViewModel.SaveByModuleName(_lang, _username, name, formName, obj);
+            if (result.IsSucceed)
+            {
+                return Ok(result);
+            }
+            else
+            {
+                return BadRequest(result);
+            }
+        }
+
         // GET api/module
         [HttpPost, HttpOptions]
         [Route("list")]

diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiModuleDataController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiModuleDataController.cs
@@ -250,6 +250,7 @@ public async Task<ActionResult<RepositoryResponse<PaginationModel<ReadViewModel>
             Expression<Func<MixModuleData, bool>> predicate = model =>
                 model.Specificulture == _lang
                 && model.ModuleId == moduleId
+                && (string.IsNullOrEmpty(request.Keyword) || model.Value.Contains(request.Keyword))
                 && (postId == 0 || model.PostId == postId)
                 && (pageId == 0 || model.PageId == pageId)
                 && (!request.FromDate.HasValue
@@ -288,10 +289,12 @@ public async Task<ActionResult<RepositoryResponse<PaginationModel<ReadViewModel>
             int.TryParse(query.Get("post_id"), out int postId);
             int.TryParse(query.Get("product_id"), out int productId);
             int.TryParse(query.Get("category_id"), out int pageId);
+
             string key = $"{request.Key}_{request.PageSize}_{request.PageIndex}";
             Expression<Func<MixModuleData, bool>> predicate = model =>
                 model.Specificulture == _lang
                 && model.ModuleId == moduleId
+                && (string.IsNullOrEmpty(request.Keyword) || model.Value.Contains(request.Keyword))
                 && (postId == 0 || model.PostId == postId)
                 && (pageId == 0 || model.PageId == pageId)
                 && (!request.FromDate.HasValue