Sprint 2

CONTRIBUTING.md

@@ -18,6 +18,13 @@ All contributors are expected to adhere to our [Code of Conduct](./CODE_OF_CONDU
   ```bash
   git checkout -b feature/your-feature-name
 
+## Coding Conventions
+
+Before you want to start making your changes, consider these conventions in your codes:
+- [Naming Conventions by Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/design-guidelines/naming-guidelines)
+- [C# identifier naming rules and conventions by Microsoft](https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/coding-style/identifier-names)
+- [Common C# code conventions by Microsoft](https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/coding-style/coding-conventions)
+
 ## Submitting Changes
 
 Once you've made your changes, push the branch to your fork on GitHub. Navigate to the main FluentCMS repository and create a new Pull Request. Ensure your PR title is descriptive, and include "Fixes #IssueNumber" if your PR closes a specific issue. In the PR description, provide a detailed overview of the changes. 

src/.gitignore

@@ -3,6 +3,12 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
+# Client packages (bootstrap, etc.)
+lib/
+
+# Compiled css
+/FluentCMS.Web.UI/wwwroot/css/*.css
+
 # User-specific files
 *.rsuser
 *.suo

src/FluentCMS.Api/ConfigurationExtensions.cs

@@ -0,0 +1,36 @@
+using Microsoft.Extensions.Hosting;
+
+namespace Microsoft.Extensions.Configuration;
+
+public static class ConfigurationExtensions
+{
+    public static IConfigurationBuilder AddConfig(this IConfigurationBuilder configBuilder, IHostEnvironment env, string configFolder = "\\Config\\")
+    {
+        var folderName = env.ContentRootPath + configFolder;
+
+        // setting base path for config folder
+        configBuilder.SetBasePath(folderName);
+
+        foreach (var filename in Directory.GetFiles(folderName))
+        {
+            // read only json files
+            if (Path.GetExtension(filename) != ".json")
+                continue;
+
+            // accept only root config files
+            if (Path.GetFileName(filename).Split(".").Length != 2)
+                continue;
+
+            // adding config file
+            configBuilder.AddJsonFile(filename, optional: true, reloadOnChange: true)
+              .AddJsonFile($"{Path.GetFileNameWithoutExtension(filename)}.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
+        }
+
+        return configBuilder;
+    }
+
+    public static T? GetInstance<T>(this IConfiguration configuration, string sectionName)
+    {
+        return configuration.GetSection(sectionName).Get<T>();
+    }
+}

src/FluentCMS.Api/Controllers/BaseController.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentCMS.Api.Controllers;
+
+[ApiController]
+[Route("api/[controller]/[action]")]
+[Produces("application/json")]
+public abstract class BaseController
+{
+}

src/FluentCMS.Api/Controllers/PagesController.cs

@@ -0,0 +1,70 @@
+using AutoMapper;
+using FluentCMS.Api.Models;
+using FluentCMS.Api.Models.Pages;
+using FluentCMS.Entities.Pages;
+using FluentCMS.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentCMS.Api.Controllers;
+
+public class PagesController : BaseController
+{
+    private readonly IPageService _pageService;
+    private readonly IMapper _mapper;
+
+    public PagesController(IPageService pageService, IMapper mapper)
+    {
+        _pageService = pageService;
+        _mapper = mapper;
+    }
+
+    // GetBy Site and ParentId
+    [HttpPost]
+    public async Task<IApiPagingResult<PageResponse>> GetAll([FromBody] PageSearchRequest request)
+    {
+        var pages = await _pageService.GetBySiteIdAndParentId(request.SiteId, request.ParentId);
+        return new ApiPagingResult<PageResponse>(_mapper.Map<List<PageResponse>>(pages));
+    }
+
+    [HttpGet("{id}")]
+    public async Task<IApiResult<PageResponse>> GetById([FromRoute] Guid id)
+    {
+        var page = await _pageService.GetById(id);
+        var pageResponse = _mapper.Map<PageResponse>(page);
+        // map recursive?
+        await MapChildren(id, pageResponse);
+        return new ApiResult<PageResponse>(pageResponse);
+    }
+
+    private async Task MapChildren(Guid id, PageResponse pageResponse)
+    {
+        var childrenPage = await _pageService.GetByParentId(id);
+        pageResponse.Children = childrenPage.Select(x => _mapper.Map<PageResponse>(x));
+    }
+
+    [HttpPost]
+    public async Task<IApiResult<PageResponse>> Create(CreatePageRequest request)
+    {
+        var page = _mapper.Map<Page>(request);
+        var newPage = await _pageService.Create(page);
+        var pageResponse = _mapper.Map<PageResponse>(newPage);
+        return new ApiResult<PageResponse>(pageResponse);
+    }
+
+    [HttpPut]
+    public async Task<IApiResult<PageResponse>> Edit(EditPageRequest request)
+    {
+        var page = _mapper.Map<Page>(request);
+        var updatedPage = await _pageService.Edit(page);
+        var pageResponse = _mapper.Map<PageResponse>(updatedPage);
+        return new ApiResult<PageResponse>(pageResponse);
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IApiResult<bool>> Delete([FromRoute] Guid id)
+    {
+        var page = await _pageService.GetById(id);
+        await _pageService.Delete(page);
+        return new ApiResult<bool>(true);
+    }
+}

src/FluentCMS.Api/Controllers/RolesController.cs

@@ -0,0 +1,52 @@
+using AutoMapper;
+using FluentCMS.Api.Models;
+using FluentCMS.Api.Models.Users;
+using FluentCMS.Entities.Users;
+using FluentCMS.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentCMS.Api.Controllers;
+public class RolesController(IMapper mapper, IRoleService roleService) : BaseController
+{
+    [HttpGet]
+    public async Task<IApiPagingResult<RoleResponse>> GetAll([FromQuery] SearchRoleRequest request)
+    {
+        var roles = await roleService.GetAll();
+        var result = mapper.Map<IEnumerable<RoleResponse>>(roles);
+        return new ApiPagingResult<RoleResponse>(result);
+    }
+
+    [HttpGet("{id}")]
+    public async Task<IApiResult<RoleResponse>> GetById([FromRoute] Guid id)
+    {
+        var role = await roleService.GetById(id);
+        var result = mapper.Map<RoleResponse>(role);
+        return new ApiResult<RoleResponse>(result);
+    }
+
+    [HttpPost]
+    public async Task<IApiResult<RoleResponse>> Create(CreateRoleRequest request)
+    {
+        var role = mapper.Map<Role>(request);
+        var newRole = await roleService.Create(role);
+        var result = mapper.Map<RoleResponse>(newRole);
+        return new ApiResult<RoleResponse>(result);
+    }
+
+    [HttpPut]
+    public async Task<IApiResult<RoleResponse>> Edit(EditRoleRequest request)
+    {
+        var role = mapper.Map<Role>(request);
+        var editedRole = await roleService.Edit(role);
+        var result = mapper.Map<RoleResponse>(editedRole);
+        return new ApiResult<RoleResponse>(result);
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IApiResult<bool>> Delete([FromRoute] Guid id)
+    {
+        var role = await roleService.GetById(id);
+        await roleService.Delete(role);
+        return new ApiResult<bool>(true);
+    }
+}

src/FluentCMS.Api/Controllers/SiteController.cs

@@ -0,0 +1,82 @@
+using AutoMapper;
+using FluentCMS.Api.Models;
+using FluentCMS.Api.Models.Sites;
+using FluentCMS.Api.Models.Pages;
+using FluentCMS.Entities.Sites;
+using FluentCMS.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentCMS.Api.Controllers;
+
+public class SiteController : BaseController
+{
+    private readonly ISiteService _siteService;
+    private readonly IPageService _pageService;
+    private readonly IMapper _mapper;
+
+    public SiteController(ISiteService siteService, IPageService pageService, IMapper mapper)
+    {
+        _siteService = siteService;
+        _pageService = pageService;
+        _mapper = mapper;
+    }
+
+    [HttpGet]
+    public async Task<IApiPagingResult<SiteResponse>> GetAll([FromQuery] SearchSiteRequest request, CancellationToken cancellationToken = default)
+    {
+        var sites = await _siteService.GetAll(cancellationToken);
+        var siteResponses = _mapper.Map<List<SiteResponse>>(sites);
+        return new ApiPagingResult<SiteResponse>(siteResponses);
+    }
+
+    [HttpGet("{id}")]
+    public async Task<IApiResult<SiteResponse>> GetById(Guid id, CancellationToken cancellationToken = default)
+    {
+        var site = await _siteService.GetById(id, cancellationToken);
+        var pages = await _pageService.GetBySiteId(site.Id, cancellationToken);
+
+        var siteResponse = _mapper.Map<SiteResponse>(site);
+        siteResponse.Pages = _mapper.Map<List<PageResponse>>(pages);
+
+        return new ApiResult<SiteResponse>(siteResponse);
+    }
+
+    [HttpGet]
+    public async Task<IApiResult<SiteResponse>> GetByUrl([FromQuery] string url, CancellationToken cancellationToken = default)
+    {
+        // TODO: should we change Url to domain?
+        var site = await _siteService.GetByUrl(url, cancellationToken);
+        var pages = await _pageService.GetBySiteId(site.Id, cancellationToken);
+
+        var siteResponse = _mapper.Map<SiteResponse>(site);
+        siteResponse.Pages = _mapper.Map<List<PageResponse>>(pages);
+
+        return new ApiResult<SiteResponse>(siteResponse);
+    }
+
+    [HttpPost]
+    public async Task<IApiResult<SiteResponse>> Create(CreateSiteRequest request, CancellationToken cancellationToken = default)
+    {
+        var site = _mapper.Map<Site>(request);
+        var newSite = await _siteService.Create(site, cancellationToken);
+        var siteResponse = _mapper.Map<SiteResponse>(newSite);
+        return new ApiResult<SiteResponse>(siteResponse);
+    }
+
+    [HttpPatch]
+    public async Task<IApiResult<SiteResponse>> Edit(EditSiteRequest request, CancellationToken cancellationToken = default)
+    {
+        var site = _mapper.Map<Site>(request);
+        var updateSite = await _siteService.Edit(site, cancellationToken);
+        var siteResponse = _mapper.Map<SiteResponse>(updateSite);
+        return new ApiResult<SiteResponse>(siteResponse);
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IApiResult> Delete([FromRoute] Guid id, CancellationToken cancellationToken = default)
+    {
+        var site = await _siteService.GetById(id);
+        await _siteService.Delete(site, cancellationToken);
+        return new ApiResult();
+    }
+}

src/FluentCMS.Api/Controllers/UsersController.cs

@@ -0,0 +1,65 @@
+using AutoMapper;
+using FluentCMS.Api.Models;
+using FluentCMS.Api.Models.Users;
+using FluentCMS.Entities.Users;
+using FluentCMS.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentCMS.Api.Controllers;
+public class UsersController(IMapper mapper, IUserService userService) : BaseController
+{
+    [HttpGet]
+    public async Task<IApiPagingResult<UserResponse>> GetAll([FromQuery] SearchUserRequest request)
+    {
+        var users = await userService.GetAll();
+        var result = mapper.Map<IEnumerable<UserResponse>>(users);
+        return new ApiPagingResult<UserResponse>(result);
+    }
+
+    [HttpGet("{id}")]
+    public async Task<IApiResult<UserResponse>> GetById([FromRoute] Guid id)
+    {
+        var user = await userService.GetById(id);
+        var result = mapper.Map<UserResponse>(user);
+        return new ApiResult<UserResponse>(result);
+    }
+
+    [HttpPost]
+    public async Task<IApiResult<UserResponse>> Create(CreateUserRequest request)
+    {
+        var user = mapper.Map<User>(request);
+        user.Id = Guid.NewGuid();
+        user.UserRoles = request.Roles?.Select(x => new UserRole
+        {
+            Id = Guid.NewGuid(),
+            UserId = user.Id,
+            RoleId = x
+        }).ToList() ?? [];
+        var newUser = await userService.Create(user);
+        var result = mapper.Map<UserResponse>(newUser);
+        return new ApiResult<UserResponse>(result);
+    }
+
+    [HttpPut]
+    public async Task<IApiResult<UserResponse>> Edit(EditUserRequest request)
+    {
+        var user = mapper.Map<User>(request);
+        user.UserRoles = request.Roles?.Select(x => new UserRole
+        {
+            Id = Guid.NewGuid(),
+            UserId = user.Id,
+            RoleId = x
+        }).ToList() ?? [];
+        var editedUser = await userService.Edit(user);
+        var result = mapper.Map<UserResponse>(editedUser);
+        return new ApiResult<UserResponse>(result);
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IApiResult<bool>> Delete([FromRoute] Guid id)
+    {
+        var user = await userService.GetById(id);
+        await userService.Delete(user);
+        return new ApiResult<bool>(true);
+    }
+}

src/FluentCMS.Api/FluentCMS.Api.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="SeedData\pages.json" />
+    <None Remove="SeedData\site.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="SeedData\pages.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="SeedData\site.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="FluentValidation" Version="11.8.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="SharpGrip.FluentValidation.AutoValidation.Mvc" Version="1.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FluentCMS.Services\FluentCMS.Services.csproj" />
+  </ItemGroup>
+
+</Project>