From b418607a893af9cb998f8a8949130b3fff107ec2 Mon Sep 17 00:00:00 2001
From: lumijiez <59575049+lumijiez@users.noreply.github.com>
Date: Fri, 20 Jun 2025 14:38:54 +0300
Subject: [PATCH 1/3] Add Automapper

---
 .../CreateProductVariantHandler.cs            |  37 +-
 .../DeleteProductVariantHandler.cs            |   4 +
 .../GetProductVariantsHandler.cs              |  34 +-
 .../UpdateProductVariantHandler.cs            |  33 +-
 .../Domains/Products/CreateProductHandler.cs  |  46 +-
 .../Domains/Users/DeleteUserRoleHandler.cs    |   9 +-
 .../Domains/Users/GetAllRolesHandler.cs       |  17 +
 .../Domains/Users/GetUserRolesHandler.cs      |   9 +-
 .../Domains/Users/SetUserFullNameHandler.cs   |  18 +-
 .../Domains/Users/SetUserPhoneHandler.cs      |  18 +-
 .../Domains/Users/SetUserRoleHandler.cs       |   9 +-
 .../Domains/Users/SyncUserHandler.cs          |  19 +-
 .../Imprink.Application.csproj                |   4 -
 .../Mappings/MappingProfile.cs                |   5 +
 .../Mappings/ProductMappingProfile.cs         |  42 ++
 .../Mappings/UserMappingProfile.cs            |  42 ++
 .../Controllers/Users/UsersController.cs      |  35 +-
 .../Middleware/ExceptionHandlingMiddleware.cs |   1 +
 src/Imprink.WebApi/Program.cs                 |   2 -
 src/Imprink.WebApi/Startup.cs                 |   4 +-
 webui/src/app/page.js                         | 589 ++++++------------
 21 files changed, 364 insertions(+), 613 deletions(-)
 create mode 100644 src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs
 create mode 100644 src/Imprink.Application/Mappings/MappingProfile.cs
 create mode 100644 src/Imprink.Application/Mappings/ProductMappingProfile.cs
 create mode 100644 src/Imprink.Application/Mappings/UserMappingProfile.cs

diff --git a/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs b/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs
index 9a6aef9..d1ab5fd 100644
--- a/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs
+++ b/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Entities.Product;
 using MediatR;
@@ -16,7 +17,7 @@ public class CreateProductVariantCommand : IRequest<ProductVariantDto>
     public bool IsActive { get; set; } = true;
 }
 
-public class CreateProductVariantHandler(IUnitOfWork unitOfWork)
+public class CreateProductVariantHandler(IUnitOfWork unitOfWork, IMapper mapper)
     : IRequestHandler<CreateProductVariantCommand, ProductVariantDto>
 {
     public async Task<ProductVariantDto> Handle(CreateProductVariantCommand request, CancellationToken cancellationToken)
@@ -25,36 +26,16 @@ public class CreateProductVariantHandler(IUnitOfWork unitOfWork)
         
         try
         {
-            var productVariant = new ProductVariant
-            {
-                ProductId = request.ProductId,
-                Size = request.Size,
-                Color = request.Color,
-                Price = request.Price,
-                ImageUrl = request.ImageUrl,
-                Sku = request.Sku,
-                StockQuantity = request.StockQuantity,
-                IsActive = request.IsActive,
-                Product = null!
-            };
+            var productVariant = mapper.Map<ProductVariant>(request);
+            
+            productVariant.Product = null!;
 
             var createdVariant = await unitOfWork.ProductVariantRepository.AddAsync(productVariant, cancellationToken);
+            
+            await unitOfWork.SaveAsync(cancellationToken);
             await unitOfWork.CommitTransactionAsync(cancellationToken);
-
-            return new ProductVariantDto
-            {
-                Id = createdVariant.Id,
-                ProductId = createdVariant.ProductId,
-                Size = createdVariant.Size,
-                Color = createdVariant.Color,
-                Price = createdVariant.Price,
-                ImageUrl = createdVariant.ImageUrl,
-                Sku = createdVariant.Sku,
-                StockQuantity = createdVariant.StockQuantity,
-                IsActive = createdVariant.IsActive,
-                CreatedAt = createdVariant.CreatedAt,
-                ModifiedAt = createdVariant.ModifiedAt
-            };
+            
+            return mapper.Map<ProductVariantDto>(createdVariant);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs b/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs
index 10e257e..7fdf8a9 100644
--- a/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs
+++ b/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs
@@ -16,6 +16,7 @@ public class DeleteProductVariantHandler(IUnitOfWork unitOfWork) : IRequestHandl
         try
         {
             var exists = await unitOfWork.ProductVariantRepository.ExistsAsync(request.Id, cancellationToken);
+            
             if (!exists)
             {
                 await unitOfWork.RollbackTransactionAsync(cancellationToken);
@@ -23,7 +24,10 @@ public class DeleteProductVariantHandler(IUnitOfWork unitOfWork) : IRequestHandl
             }
 
             await unitOfWork.ProductVariantRepository.DeleteAsync(request.Id, cancellationToken);
+            
+            await unitOfWork.SaveAsync(cancellationToken);
             await unitOfWork.CommitTransactionAsync(cancellationToken);
+            
             return true;
         }
         catch
diff --git a/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs b/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs
index 609036b..c572305 100644
--- a/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs
+++ b/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs
@@ -1,6 +1,8 @@
+using AutoMapper;
 using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Entities.Product;
 using MediatR;
+using Microsoft.Extensions.Logging;
 
 namespace Imprink.Application.Domains.ProductVariants;
 
@@ -11,7 +13,7 @@ public class GetProductVariantsQuery : IRequest<IEnumerable<ProductVariantDto>>
     public bool InStockOnly { get; set; } = false;
 }
 
-public class GetProductVariantsHandler(IUnitOfWork unitOfWork)
+public class GetProductVariantsHandler(IUnitOfWork unitOfWork, IMapper mapper, ILogger<GetProductVariantsHandler> logger)
     : IRequestHandler<GetProductVariantsQuery, IEnumerable<ProductVariantDto>>
 {
     public async Task<IEnumerable<ProductVariantDto>> Handle(GetProductVariantsQuery request, CancellationToken cancellationToken)
@@ -37,33 +39,7 @@ public class GetProductVariantsHandler(IUnitOfWork unitOfWork)
         {
             variants = new List<ProductVariant>();
         }
-
-        return variants.Select(pv => new ProductVariantDto
-        {
-            Id = pv.Id,
-            ProductId = pv.ProductId,
-            Size = pv.Size,
-            Color = pv.Color,
-            Price = pv.Price,
-            ImageUrl = pv.ImageUrl,
-            Sku = pv.Sku,
-            StockQuantity = pv.StockQuantity,
-            IsActive = pv.IsActive,
-            Product = new ProductDto
-            {
-                Id = pv.Product.Id,
-                Name = pv.Product.Name,
-                Description = pv.Product.Description,
-                BasePrice = pv.Product.BasePrice,
-                IsCustomizable = pv.Product.IsCustomizable,
-                IsActive = pv.Product.IsActive,
-                ImageUrl = pv.Product.ImageUrl,
-                CategoryId = pv.Product.CategoryId,
-                CreatedAt = pv.Product.CreatedAt,
-                ModifiedAt = pv.Product.ModifiedAt
-            },
-            CreatedAt = pv.CreatedAt,
-            ModifiedAt = pv.ModifiedAt
-        });
+        
+        return mapper.Map<IEnumerable<ProductVariantDto>>(variants);
     }
 }
\ No newline at end of file
diff --git a/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs b/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs
index b7574b1..07a7724 100644
--- a/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs
+++ b/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Products.Dtos;
 using MediatR;
@@ -17,7 +18,7 @@ public class UpdateProductVariantCommand : IRequest<ProductVariantDto>
     public bool IsActive { get; set; }
 }
 
-public class UpdateProductVariantHandler(IUnitOfWork unitOfWork)
+public class UpdateProductVariantHandler(IUnitOfWork unitOfWork, IMapper mapper)
     : IRequestHandler<UpdateProductVariantCommand, ProductVariantDto>
 {
     public async Task<ProductVariantDto> Handle(UpdateProductVariantCommand request, CancellationToken cancellationToken)
@@ -29,36 +30,16 @@ public class UpdateProductVariantHandler(IUnitOfWork unitOfWork)
             var existingVariant = await unitOfWork.ProductVariantRepository.GetByIdAsync(request.Id, cancellationToken);
             
             if (existingVariant == null)
-            {
                 throw new NotFoundException($"Product variant with ID {request.Id} not found.");
-            }
-
-            existingVariant.ProductId = request.ProductId;
-            existingVariant.Size = request.Size;
-            existingVariant.Color = request.Color;
-            existingVariant.Price = request.Price;
-            existingVariant.ImageUrl = request.ImageUrl;
-            existingVariant.Sku = request.Sku;
-            existingVariant.StockQuantity = request.StockQuantity;
-            existingVariant.IsActive = request.IsActive;
+            
+            mapper.Map(request, existingVariant);
 
             var updatedVariant = await unitOfWork.ProductVariantRepository.UpdateAsync(existingVariant, cancellationToken);
+            
+            await unitOfWork.SaveAsync(cancellationToken);
             await unitOfWork.CommitTransactionAsync(cancellationToken);
 
-            return new ProductVariantDto
-            {
-                Id = updatedVariant.Id,
-                ProductId = updatedVariant.ProductId,
-                Size = updatedVariant.Size,
-                Color = updatedVariant.Color,
-                Price = updatedVariant.Price,
-                ImageUrl = updatedVariant.ImageUrl,
-                Sku = updatedVariant.Sku,
-                StockQuantity = updatedVariant.StockQuantity,
-                IsActive = updatedVariant.IsActive,
-                CreatedAt = updatedVariant.CreatedAt,
-                ModifiedAt = updatedVariant.ModifiedAt
-            };
+            return mapper.Map<ProductVariantDto>(updatedVariant);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Products/CreateProductHandler.cs b/src/Imprink.Application/Domains/Products/CreateProductHandler.cs
index a9a0df7..2e84304 100644
--- a/src/Imprink.Application/Domains/Products/CreateProductHandler.cs
+++ b/src/Imprink.Application/Domains/Products/CreateProductHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Entities.Product;
 using MediatR;
@@ -15,7 +16,7 @@ public class CreateProductCommand : IRequest<ProductDto>
     public Guid? CategoryId { get; set; }
 }
 
-public class CreateProductHandler(IUnitOfWork unitOfWork) : IRequestHandler<CreateProductCommand, ProductDto>
+public class CreateProductHandler(IUnitOfWork unitOfWork, IMapper mapper) : IRequestHandler<CreateProductCommand, ProductDto>
 {
     public async Task<ProductDto> Handle(CreateProductCommand request, CancellationToken cancellationToken)
     {
@@ -23,49 +24,18 @@ public class CreateProductHandler(IUnitOfWork unitOfWork) : IRequestHandler<Crea
         
         try
         {
-            var product = new Product
-            {
-                Name = request.Name,
-                Description = request.Description,
-                BasePrice = request.BasePrice,
-                IsCustomizable = request.IsCustomizable,
-                IsActive = request.IsActive,
-                ImageUrl = request.ImageUrl,
-                CategoryId = request.CategoryId,
-                Category = null!
-            };
+            var product = mapper.Map<Product>(request);
 
             var createdProduct = await unitOfWork.ProductRepository.AddAsync(product, cancellationToken);
-
-            var categoryDto = new CategoryDto
+            
+            if (createdProduct.CategoryId.HasValue)
             {
-                Id = createdProduct.Category.Id,
-                Name = createdProduct.Category.Name,
-                Description = createdProduct.Category.Description,
-                ImageUrl = createdProduct.Category.ImageUrl,
-                SortOrder = createdProduct.Category.SortOrder,
-                IsActive = createdProduct.Category.IsActive,
-                ParentCategoryId = createdProduct.Category.ParentCategoryId,
-                CreatedAt = createdProduct.Category.CreatedAt,
-                ModifiedAt = createdProduct.Category.ModifiedAt
-            };
+                createdProduct.Category = (await unitOfWork.CategoryRepository.GetByIdAsync(createdProduct.CategoryId.Value, cancellationToken))!;
+            }
             
             await unitOfWork.CommitTransactionAsync(cancellationToken);
 
-            return new ProductDto
-            {
-                Id = createdProduct.Id,
-                Name = createdProduct.Name,
-                Description = createdProduct.Description,
-                BasePrice = createdProduct.BasePrice,
-                IsCustomizable = createdProduct.IsCustomizable,
-                IsActive = createdProduct.IsActive,
-                ImageUrl = createdProduct.ImageUrl,
-                CategoryId = createdProduct.CategoryId,
-                Category = categoryDto,
-                CreatedAt = createdProduct.CreatedAt,
-                ModifiedAt = createdProduct.ModifiedAt
-            };
+            return mapper.Map<ProductDto>(createdProduct);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs b/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs
index 28bed6d..7755d01 100644
--- a/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs
+++ b/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Users.Dtos;
 using MediatR;
@@ -6,7 +7,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record DeleteUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 
-public class DeleteUserRoleHandler(IUnitOfWork uw) : IRequestHandler<DeleteUserRoleCommand, UserRoleDto?>
+public class DeleteUserRoleHandler(IUnitOfWork uw, IMapper mapper) : IRequestHandler<DeleteUserRoleCommand, UserRoleDto?>
 {
     public async Task<UserRoleDto?> Handle(DeleteUserRoleCommand request, CancellationToken cancellationToken)
     {
@@ -27,11 +28,7 @@ public class DeleteUserRoleHandler(IUnitOfWork uw) : IRequestHandler<DeleteUserR
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);
             
-            return new UserRoleDto
-            {
-                UserId = removedRole.UserId,
-                RoleId = removedRole.RoleId
-            };
+            return mapper.Map<UserRoleDto>(removedRole);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs b/src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs
new file mode 100644
index 0000000..12d3df2
--- /dev/null
+++ b/src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs
@@ -0,0 +1,17 @@
+using AutoMapper;
+using Imprink.Application.Users.Dtos;
+using MediatR;
+
+namespace Imprink.Application.Domains.Users;
+
+public record GetAllRolesCommand : IRequest<IEnumerable<RoleDto>>;
+
+public class GetAllRolesHandler(IUnitOfWork uw, IMapper mapper): IRequestHandler<GetAllRolesCommand, IEnumerable<RoleDto>>
+{
+    public async Task<IEnumerable<RoleDto>> Handle(GetAllRolesCommand request, CancellationToken cancellationToken)
+    {
+        var roles = await uw.RoleRepository.GetAllRolesAsync(cancellationToken);
+
+        return mapper.Map<IEnumerable<RoleDto>>(roles);
+    }
+}
\ No newline at end of file
diff --git a/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs b/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs
index acd95a2..902900f 100644
--- a/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs
+++ b/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Users.Dtos;
 using MediatR;
@@ -6,7 +7,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record GetUserRolesCommand(string Sub) : IRequest<IEnumerable<RoleDto>>;
 
-public class GetUserRolesHandler(IUnitOfWork uw): IRequestHandler<GetUserRolesCommand, IEnumerable<RoleDto>>
+public class GetUserRolesHandler(IUnitOfWork uw, IMapper mapper): IRequestHandler<GetUserRolesCommand, IEnumerable<RoleDto>>
 {
     public async Task<IEnumerable<RoleDto>> Handle(GetUserRolesCommand request, CancellationToken cancellationToken)
     {
@@ -15,10 +16,6 @@ public class GetUserRolesHandler(IUnitOfWork uw): IRequestHandler<GetUserRolesCo
         
         var roles = await uw.UserRoleRepository.GetUserRolesAsync(request.Sub, cancellationToken);
 
-        return roles.Select(role => new RoleDto
-        {
-            RoleId = role.Id,
-            RoleName = role.RoleName
-        }).ToList();
+        return mapper.Map<IEnumerable<RoleDto>>(roles);
     }
 }
\ No newline at end of file
diff --git a/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs b/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs
index b8b4ce1..7fa91ce 100644
--- a/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs
+++ b/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Services;
 using Imprink.Application.Users.Dtos;
@@ -7,7 +8,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record SetUserFullNameCommand(string FirstName, string LastName) : IRequest<UserDto?>;
 
-public class SetUserFullNameHandler(IUnitOfWork uw, ICurrentUserService userService) : IRequestHandler<SetUserFullNameCommand, UserDto?>
+public class SetUserFullNameHandler(IUnitOfWork uw, IMapper mapper, ICurrentUserService userService) : IRequestHandler<SetUserFullNameCommand, UserDto?>
 {
     public async Task<UserDto?> Handle(SetUserFullNameCommand request, CancellationToken cancellationToken)
     {
@@ -16,28 +17,19 @@ public class SetUserFullNameHandler(IUnitOfWork uw, ICurrentUserService userServ
         try
         {
             var currentUser = userService.GetCurrentUserId();
+            
             if (currentUser == null)
                 throw new NotFoundException("User token could not be accessed.");
 
             var user = await uw.UserRepository.SetUserFullNameAsync(currentUser, request.FirstName, request.LastName, cancellationToken);
+            
             if (user == null)
                 throw new DataUpdateException("User name could not be updated.");
 
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);
 
-            return new UserDto
-            {
-                Id = user.Id,
-                Name = user.Name,
-                Nickname = user.Nickname,
-                Email = user.Email,
-                EmailVerified = user.EmailVerified,
-                FirstName = user.FirstName,
-                LastName = user.LastName,
-                PhoneNumber = user.PhoneNumber,
-                IsActive = user.IsActive
-            };
+            return mapper.Map<UserDto>(user);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs b/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs
index b7b5289..369c15d 100644
--- a/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs
+++ b/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Services;
 using Imprink.Application.Users.Dtos;
@@ -7,7 +8,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record SetUserPhoneCommand(string PhoneNumber) : IRequest<UserDto?>;
 
-public class SetUserPhoneHandler(IUnitOfWork uw, ICurrentUserService userService) : IRequestHandler<SetUserPhoneCommand, UserDto?>
+public class SetUserPhoneHandler(IUnitOfWork uw, IMapper mapper, ICurrentUserService userService) : IRequestHandler<SetUserPhoneCommand, UserDto?>
 {
     public async Task<UserDto?> Handle(SetUserPhoneCommand request, CancellationToken cancellationToken)
     {
@@ -16,28 +17,19 @@ public class SetUserPhoneHandler(IUnitOfWork uw, ICurrentUserService userService
         try
         {
             var currentUser = userService.GetCurrentUserId();
+            
             if (currentUser == null)
                 throw new NotFoundException("User token could not be accessed.");
 
             var user = await uw.UserRepository.SetUserPhoneAsync(currentUser, request.PhoneNumber, cancellationToken);
+            
             if (user == null)
                 throw new DataUpdateException("User phone could not be updated.");
 
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);
 
-            return new UserDto
-            {
-                Id = user.Id,
-                Name = user.Name,
-                Nickname = user.Nickname,
-                Email = user.Email,
-                EmailVerified = user.EmailVerified,
-                FirstName = user.FirstName,
-                LastName = user.LastName,
-                PhoneNumber = user.PhoneNumber,
-                IsActive = user.IsActive
-            };
+            return mapper.Map<UserDto>(user);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs b/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs
index 426eb8b..d681363 100644
--- a/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs
+++ b/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Entities.Users;
@@ -7,7 +8,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record SetUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 
-public class SetUserRoleHandler(IUnitOfWork uw) : IRequestHandler<SetUserRoleCommand, UserRoleDto?>
+public class SetUserRoleHandler(IUnitOfWork uw, IMapper mapper) : IRequestHandler<SetUserRoleCommand, UserRoleDto?>
 {
     public async Task<UserRoleDto?> Handle(SetUserRoleCommand request, CancellationToken cancellationToken)
     {
@@ -29,11 +30,7 @@ public class SetUserRoleHandler(IUnitOfWork uw) : IRequestHandler<SetUserRoleCom
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);
 
-            return new UserRoleDto
-            {
-                UserId = addedRole.UserId,
-                RoleId = addedRole.RoleId
-            };
+            return mapper.Map<UserRoleDto>(addedRole);
         }
         catch
         {
diff --git a/src/Imprink.Application/Domains/Users/SyncUserHandler.cs b/src/Imprink.Application/Domains/Users/SyncUserHandler.cs
index 503521a..ae2cac8 100644
--- a/src/Imprink.Application/Domains/Users/SyncUserHandler.cs
+++ b/src/Imprink.Application/Domains/Users/SyncUserHandler.cs
@@ -1,3 +1,4 @@
+using AutoMapper;
 using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
@@ -6,7 +7,7 @@ namespace Imprink.Application.Domains.Users;
 
 public record SyncUserCommand(Auth0User User) : IRequest<UserDto?>;
 
-public class SyncUserHandler(IUnitOfWork uw): IRequestHandler<SyncUserCommand, UserDto?>
+public class SyncUserHandler(IUnitOfWork uw, IMapper mapper): IRequestHandler<SyncUserCommand, UserDto?>
 {
     public async Task<UserDto?> Handle(SyncUserCommand request, CancellationToken cancellationToken)
     {
@@ -16,23 +17,13 @@ public class SyncUserHandler(IUnitOfWork uw): IRequestHandler<SyncUserCommand, U
         {
             var user = await uw.UserRepository.UpdateOrCreateUserAsync(request.User, cancellationToken);
             
-            if (user == null) throw new Exception("User exists but could not be updated");
+            if (user == null) 
+                throw new Exception("User exists but could not be updated");
             
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);
             
-            return new UserDto
-            {
-                Id = user.Id,
-                Name = user.Name,
-                Nickname = user.Nickname,
-                Email = user.Email,
-                EmailVerified = user.EmailVerified,
-                FirstName = user.FirstName,
-                LastName = user.LastName,
-                PhoneNumber = user.PhoneNumber,
-                IsActive = user.IsActive
-            };
+            return mapper.Map<UserDto>(user);
         }
         catch
         {
diff --git a/src/Imprink.Application/Imprink.Application.csproj b/src/Imprink.Application/Imprink.Application.csproj
index 5a13bfc..17480c4 100644
--- a/src/Imprink.Application/Imprink.Application.csproj
+++ b/src/Imprink.Application/Imprink.Application.csproj
@@ -19,8 +19,4 @@
       <ProjectReference Include="..\Imprink.Domain\Imprink.Domain.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Domains\Orders\" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Imprink.Application/Mappings/MappingProfile.cs b/src/Imprink.Application/Mappings/MappingProfile.cs
new file mode 100644
index 0000000..572be15
--- /dev/null
+++ b/src/Imprink.Application/Mappings/MappingProfile.cs
@@ -0,0 +1,5 @@
+using AutoMapper;
+
+namespace Imprink.Application.Mappings;
+
+public abstract class MappingProfile : Profile { }
\ No newline at end of file
diff --git a/src/Imprink.Application/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Mappings/ProductMappingProfile.cs
new file mode 100644
index 0000000..e58e2cc
--- /dev/null
+++ b/src/Imprink.Application/Mappings/ProductMappingProfile.cs
@@ -0,0 +1,42 @@
+using AutoMapper;
+using Imprink.Application.Domains.Products;
+using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.Products.Dtos;
+using Imprink.Domain.Entities.Product;
+
+namespace Imprink.Application.Mappings;
+
+public class ProductMappingProfile: Profile
+{
+    public ProductMappingProfile()
+    {
+        CreateMap<CreateProductVariantCommand, ProductVariant>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore())
+            .ForMember(dest => dest.CreatedAt, opt => opt.Ignore())
+            .ForMember(dest => dest.ModifiedAt, opt => opt.Ignore())
+            .ForMember(dest => dest.CreatedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.ModifiedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.Product, opt => opt.Ignore())
+            .ForMember(dest => dest.OrderItems, opt => opt.Ignore());
+        
+        CreateMap<ProductVariant, ProductVariantDto>();
+        CreateMap<ProductVariantDto, ProductVariant>()
+            .ForMember(dest => dest.CreatedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.ModifiedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.OrderItems, opt => opt.Ignore());
+        
+        CreateMap<Product, ProductDto>();
+        
+        CreateMap<CreateProductCommand, Product>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore())
+            .ForMember(dest => dest.CreatedAt, opt => opt.Ignore())
+            .ForMember(dest => dest.ModifiedAt, opt => opt.Ignore())
+            .ForMember(dest => dest.CreatedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.ModifiedBy, opt => opt.Ignore())
+            .ForMember(dest => dest.Category, opt => opt.Ignore())
+            .ForMember(dest => dest.ProductVariants, opt => opt.Ignore())
+            .ForMember(dest => dest.OrderItems, opt => opt.Ignore());
+        
+        CreateMap<Category, CategoryDto>();
+    }
+}
\ No newline at end of file
diff --git a/src/Imprink.Application/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Mappings/UserMappingProfile.cs
new file mode 100644
index 0000000..8eda701
--- /dev/null
+++ b/src/Imprink.Application/Mappings/UserMappingProfile.cs
@@ -0,0 +1,42 @@
+using System.Security.Claims;
+using AutoMapper;
+using Imprink.Application.Users.Dtos;
+using Imprink.Domain.Entities.Users;
+using Imprink.Domain.Models;
+
+namespace Imprink.Application.Mappings;
+
+public class UserMappingProfile: Profile
+{
+    public UserMappingProfile()
+    {
+        CreateMap<User, UserDto>()
+            .ForMember(dest => dest.DefaultAddress, opt => opt.Ignore())
+            .ForMember(dest => dest.Roles, opt => opt.Ignore());
+
+        CreateMap<UserDto, User>()
+            .ForMember(dest => dest.DefaultAddress, opt => opt.Ignore())
+            .ForMember(dest => dest.Roles, opt => opt.Ignore());
+        
+        CreateMap<UserRole, UserRoleDto>();
+        CreateMap<UserRoleDto, UserRole>();
+        
+        CreateMap<Role, RoleDto>()
+            .ForMember(dest => dest.RoleId, opt => opt.MapFrom(src => src.Id));
+        CreateMap<RoleDto, Role>()
+            .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.RoleId))
+            .ForMember(dest => dest.UserRoles, opt => opt.Ignore());
+        
+        CreateMap<ClaimsPrincipal, Auth0User>()
+            .ForMember(dest => dest.Sub, opt => opt.MapFrom(src => 
+                src.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)!.Value))
+            .ForMember(dest => dest.Name, opt => opt.MapFrom(src => 
+                src.Claims.FirstOrDefault(c => c.Type == "name")!.Value))
+            .ForMember(dest => dest.Nickname, opt => opt.MapFrom(src => 
+                src.Claims.FirstOrDefault(c => c.Type == "nickname")!.Value))
+            .ForMember(dest => dest.Email, opt => opt.MapFrom(src => 
+                src.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value))
+            .ForMember(dest => dest.EmailVerified, opt => opt.MapFrom(src => 
+                src.Claims.FirstOrDefault(c => c.Type == "email_verified")!.Value == "true"));
+    }
+}
\ No newline at end of file
diff --git a/src/Imprink.WebApi/Controllers/Users/UsersController.cs b/src/Imprink.WebApi/Controllers/Users/UsersController.cs
index 53b6830..6819114 100644
--- a/src/Imprink.WebApi/Controllers/Users/UsersController.cs
+++ b/src/Imprink.WebApi/Controllers/Users/UsersController.cs
@@ -1,5 +1,7 @@
 using System.Security.Claims;
+using AutoMapper;
 using Imprink.Application.Domains.Users;
+using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
@@ -9,30 +11,21 @@ namespace Imprink.WebApi.Controllers.Users;
 
 [ApiController]
 [Route("/api/users")]
-public class UsersController(IMediator mediator) : ControllerBase
+public class UsersController(IMediator mediator, IMapper mapper) : ControllerBase
 {
     [Authorize]
     [HttpPost("me/sync")]
     public async Task<IActionResult> SyncMyProfile()
     {
-        var claims = User.Claims as Claim[] ?? User.Claims.ToArray();
-        
-        var auth0User = new Auth0User
-        {
-            Sub = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value ?? string.Empty,
-            Name = claims.FirstOrDefault(c => c.Type == "name")?.Value ?? string.Empty,
-            Nickname = claims.FirstOrDefault(c => c.Type == "nickname")?.Value ?? string.Empty,
-            Email = claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)?.Value ?? string.Empty,
-            EmailVerified = bool.TryParse(claims.FirstOrDefault(c => c.Type == "email_verified")?.Value, out var emailVerified) && emailVerified
-        };
+        var auth0User = mapper.Map<Auth0User>(User);
         
         await mediator.Send(new SyncUserCommand(auth0User));
-        return Ok("User profile synchronized.");
+        return Ok("Synced");
     }
     
     [Authorize]
     [HttpGet("me/roles")]
-    public async Task<IActionResult> GetMyRoles()
+    public async Task<ActionResult<IEnumerable<RoleDto>>> GetMyRoles()
     {
         var sub = User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
         return Ok(await mediator.Send(new GetUserRolesCommand(sub)));
@@ -40,21 +33,29 @@ public class UsersController(IMediator mediator) : ControllerBase
     
     [Authorize]
     [HttpPut("me/phone")]
-    public async Task<IActionResult> UpdateMyPhone([FromBody] SetUserPhoneCommand command)
+    public async Task<ActionResult<UserDto?>> UpdateMyPhone([FromBody] SetUserPhoneCommand command)
     {
         return Ok(await mediator.Send(command));
     }
     
     [Authorize]
     [HttpPut("me/fullname")]
-    public async Task<IActionResult> UpdateMyFullName([FromBody] SetUserFullNameCommand command)
+    public async Task<ActionResult<UserDto?>> UpdateMyFullName([FromBody] SetUserFullNameCommand command)
     {
         return Ok(await mediator.Send(command));
     }
     
+    [Authorize]
+    [HttpGet("roles")]
+    public async Task<ActionResult<UserRoleDto?>> GetAllRoles()
+    {
+        var command = new GetAllRolesCommand();
+        return Ok(await mediator.Send(command));
+    }
+    
     [Authorize(Roles = "Admin")]
     [HttpPut("{userId}/roles/{roleId:guid}")]
-    public async Task<IActionResult> AddUserRole(string userId, Guid roleId)
+    public async Task<ActionResult<UserRoleDto?>> AddUserRole(string userId, Guid roleId)
     {
         var command = new SetUserRoleCommand(userId, roleId);
         return Ok(await mediator.Send(command));
@@ -62,7 +63,7 @@ public class UsersController(IMediator mediator) : ControllerBase
 
     [Authorize(Roles = "Admin")]
     [HttpDelete("{userId}/roles/{roleId:guid}")]
-    public async Task<IActionResult> RemoveUserRole(string userId, Guid roleId)
+    public async Task<ActionResult<UserRoleDto?>> RemoveUserRole(string userId, Guid roleId)
     {
         var command = new DeleteUserRoleCommand(userId, roleId);
         return Ok(await mediator.Send(command));
diff --git a/src/Imprink.WebApi/Middleware/ExceptionHandlingMiddleware.cs b/src/Imprink.WebApi/Middleware/ExceptionHandlingMiddleware.cs
index eb70eab..9e88443 100644
--- a/src/Imprink.WebApi/Middleware/ExceptionHandlingMiddleware.cs
+++ b/src/Imprink.WebApi/Middleware/ExceptionHandlingMiddleware.cs
@@ -61,6 +61,7 @@ public class ExceptionHandlingMiddleware(
         return exception switch
         {
             NotFoundException => (HttpStatusCode.NotFound, exception.Message, false),
+            DataUpdateException => (HttpStatusCode.Conflict, exception.Message, false),
             _ => (HttpStatusCode.InternalServerError, "An internal server error occurred", true)
         };
     }
diff --git a/src/Imprink.WebApi/Program.cs b/src/Imprink.WebApi/Program.cs
index 3992d18..120a9d8 100644
--- a/src/Imprink.WebApi/Program.cs
+++ b/src/Imprink.WebApi/Program.cs
@@ -13,5 +13,3 @@ var app = builder.Build();
 Startup.Configure(app, app.Environment);
 
 app.Run();
-
-public partial class Program { }
\ No newline at end of file
diff --git a/src/Imprink.WebApi/Startup.cs b/src/Imprink.WebApi/Startup.cs
index 0f7403d..eb5ead3 100644
--- a/src/Imprink.WebApi/Startup.cs
+++ b/src/Imprink.WebApi/Startup.cs
@@ -2,6 +2,7 @@ using System.Security.Claims;
 using FluentValidation;
 using Imprink.Application;
 using Imprink.Application.Domains.Products;
+using Imprink.Application.Mappings;
 using Imprink.Application.Products;
 using Imprink.Application.Services;
 using Imprink.Application.Validation.Models;
@@ -39,8 +40,9 @@ public static class Startup
         services.AddScoped<IOrderItemRepository, OrderItemRepository>();
         services.AddScoped<IUnitOfWork, UnitOfWork>();
         services.AddScoped<ICurrentUserService, CurrentUserService>();
-        
         services.AddScoped<Seeder>();
+
+        services.AddAutoMapper(typeof(MappingProfile).Assembly);
         
         services.AddHttpContextAccessor();
 
diff --git a/webui/src/app/page.js b/webui/src/app/page.js
index c2d8331..141ace0 100644
--- a/webui/src/app/page.js
+++ b/webui/src/app/page.js
@@ -1,423 +1,192 @@
-'use client'
+'use client';
 
-import {useEffect, useState} from 'react';
-import axios from 'axios';
-import {
-    Alert,
-    AppBar,
-    Badge,
-    Box,
-    Button,
-    Card,
-    CardActions,
-    CardContent,
-    CardMedia,
-    Chip,
-    Container,
-    Fab,
-    Grid,
-    IconButton,
-    Skeleton,
-    Toolbar,
-    Typography
-} from '@mui/material';
-import {createTheme, ThemeProvider} from '@mui/material/styles';
-import CssBaseline from '@mui/material/CssBaseline';
-import {Menu, Palette, Search, ShoppingCart} from 'lucide-react';
+import { useUser } from "@auth0/nextjs-auth0";
+import {useEffect, useState} from "react";
 
-const theme = createTheme({
-    palette: {
-        mode: 'dark',
-        primary: {
-            main: '#D0BCFF',
-            light: '#EADDFF',
-            dark: '#9A82DB',
-            contrastText: '#21005D'
-        },
-        secondary: {
-            main: '#CCC2DC',
-            light: '#E8DEF8',
-            dark: '#A8A2BA',
-            contrastText: '#332D41'
-        },
-        background: {
-            default: '#101418',
-            paper: '#1D1B20'
-        },
-        surface: {
-            main: '#1D1B20',
-            variant: '#49454F'
-        },
-        error: {
-            main: '#F2B8B5',
-            light: '#FFDAD6',
-            dark: '#BA1A1A',
-            contrastText: '#410002'
-        },
-        success: {
-            main: '#A6D4A3',
-            light: '#C4F0B8',
-            dark: '#52B788'
-        },
-        text: {
-            primary: '#E6E0E9',
-            secondary: '#CAC4D0'
-        }
-    },
-    shape: {
-        borderRadius: 16
-    },
-    typography: {
-        fontFamily: '"Google Sans", "Roboto", "Helvetica", "Arial", sans-serif',
-        h4: {
-            fontWeight: 400,
-            fontSize: '2rem'
-        },
-        h6: {
-            fontWeight: 500,
-            fontSize: '1.25rem'
-        },
-        body1: {
-            fontSize: '1rem',
-            lineHeight: 1.5
-        },
-        body2: {
-            fontSize: '0.875rem',
-            lineHeight: 1.43
-        }
-    },
-    components: {
-        MuiCard: {
-            styleOverrides: {
-                root: {
-                    backgroundImage: 'none',
-                    backgroundColor: '#1D1B20',
-                    border: '1px solid #49454F',
-                    transition: 'all 0.3s ease',
-                    '&:hover': {
-                        transform: 'translateY(-4px)',
-                        borderColor: '#D0BCFF',
-                        boxShadow: '0 8px 32px rgba(208, 188, 255, 0.1)'
-                    }
-                }
-            }
-        },
-        MuiButton: {
-            styleOverrides: {
-                root: {
-                    textTransform: 'none',
-                    fontWeight: 500,
-                    borderRadius: 20,
-                    paddingLeft: 24,
-                    paddingRight: 24,
-                    height: 40
-                }
-            }
-        },
-        MuiTextField: {
-            styleOverrides: {
-                root: {
-                    '& .MuiOutlinedInput-root': {
-                        borderRadius: 12,
-                        backgroundColor: '#1D1B20',
-                        '& fieldset': {
-                            borderColor: '#49454F'
-                        },
-                        '&:hover fieldset': {
-                            borderColor: '#CAC4D0'
-                        }
-                    }
-                }
-            }
-        },
-        MuiChip: {
-            styleOverrides: {
-                root: {
-                    borderRadius: 8
-                }
-            }
-        }
-    }
-});
-
-const ProductCard = ({ product }) => {
-    const [imageLoaded, setImageLoaded] = useState(false);
-
-    return (
-        <Card sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-            <Box sx={{ position: 'relative', overflow: 'hidden' }}>
-                {!imageLoaded && (
-                    <Skeleton variant="rectangular" height={200} />
-                )}
-                <CardMedia
-                    component="img"
-                    height="200"
-                    image={product.imageUrl}
-                    alt={product.name}
-                    onLoad={() => setImageLoaded(true)}
-                    sx={{
-                        display: imageLoaded ? 'block' : 'none',
-                        objectFit: 'cover',
-                        transition: 'transform 0.3s ease',
-                        '&:hover': {
-                            transform: 'scale(1.05)'
-                        }
-                    }}
-                />
-                <Box sx={{
-                    position: 'absolute',
-                    top: 12,
-                    right: 12,
-                    display: 'flex',
-                    flexDirection: 'column',
-                    gap: 1
-                }}>
-                    {product.isCustomizable && (
-                        <Chip
-                            icon={<Palette size={16} />}
-                            label="Customizable"
-                            size="small"
-                            color="primary"
-                            sx={{ fontSize: '0.75rem' }}
-                        />
-                    )}
-                    <Chip
-                        label={product.category.name}
-                        size="small"
-                        variant="outlined"
-                        sx={{ fontSize: '0.75rem' }}
-                    />
-                </Box>
-            </Box>
-
-            <CardContent sx={{ flexGrow: 1, pb: 1 }}>
-                <Typography variant="h6" component="h3" gutterBottom>
-                    {product.name}
-                </Typography>
-                <Typography variant="body2" color="text.secondary" sx={{ mb: 2 }}>
-                    {product.description}
-                </Typography>
-                <Typography variant="h5" color="primary.main" fontWeight="bold">
-                    ${product.basePrice.toFixed(2)}
-                </Typography>
-            </CardContent>
-
-            <CardActions sx={{ p: 2, pt: 0 }}>
-                <Button
-                    variant="contained"
-                    fullWidth
-                    startIcon={<ShoppingCart size={18} />}
-                    sx={{
-                        background: 'linear-gradient(45deg, #D0BCFF 30%, #EADDFF 90%)',
-                        color: '#21005D'
-                    }}
-                >
-                    Add to Cart
-                </Button>
-            </CardActions>
-        </Card>
-    );
-};
-
-const LoadingSkeleton = () => (
-    <Grid container spacing={3}>
-        {[...Array(8)].map((_, index) => (
-            <Grid item xs={12} sm={6} md={4} lg={3} key={index}>
-                <Card>
-                    <Skeleton variant="rectangular" height={200} />
-                    <CardContent>
-                        <Skeleton variant="text" height={32} />
-                        <Skeleton variant="text" height={20} />
-                        <Skeleton variant="text" height={20} width="60%" />
-                        <Skeleton variant="text" height={28} width="40%" />
-                    </CardContent>
-                </Card>
-            </Grid>
-        ))}
-    </Grid>
-);
-
-const ImprintLanding = () => {
-    const [products, setProducts] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [error, setError] = useState(null);
-    const [cartCount, setCartCount] = useState(0);
+export default function Home() {
+    const { user, error, isLoading } = useUser();
 
     useEffect(() => {
-        const fetchProducts = async () => {
-            try {
-                setLoading(true);
-                const response = await axios.get('https://impr.ink/api/products', {
-                    params: {
-                        PageNumber: 1,
-                        PageSize: 20
-                    }
-                });
-                setProducts(response.data.items);
-            } catch (err) {
-                setError('Failed to load products. Please try again later.');
-                console.error('Error fetching products:', err);
-            } finally {
-                setLoading(false);
+        const fetchAccessToken = async () => {
+            if (user) {
+                try {
+                    await fetch('/token');
+                } catch (error) {
+                    console.error("Error fetching token");
+                }
+            } else {
+                try {
+                    await fetch('/untoken');
+                } catch (e) {
+                    console.error('Error in /api/untoken:', e);
+                }
             }
         };
 
-        fetchProducts().then(r => console.log(r));
-    }, []);
+        fetchAccessToken().then(r => console.log(r));
+    }, [user]);
+
+    if (isLoading) {
+        return (
+            <div className="min-h-screen bg-gradient-to-br from-purple-900 via-blue-900 to-indigo-900 flex items-center justify-center">
+                <div className="relative">
+                    <div className="w-16 h-16 border-4 border-white/20 border-t-white rounded-full animate-spin"></div>
+                    <div className="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+                        <div className="w-10 h-10 border-4 border-transparent border-t-purple-400 rounded-full animate-spin"></div>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
+    if (error) {
+        return (
+            <div className="min-h-screen bg-gradient-to-br from-red-900 via-pink-900 to-purple-900 flex items-center justify-center p-4">
+                <div className="bg-white/10 backdrop-blur-xl rounded-2xl p-6 border border-white/20 shadow-2xl">
+                    <div className="text-white/80 mb-4">{error.message}</div>
+                    <div className="text-center">
+                        <a
+                            href="/auth/login"
+                            className="group relative inline-flex items-center gap-2 px-8 py-3 bg-gradient-to-r from-purple-500 to-blue-500 rounded-xl font-bold text-white shadow-2xl hover:shadow-purple-500/25 transition-all duration-300 hover:scale-105 active:scale-95"
+                        >
+                            <div
+                                className="absolute inset-0 bg-gradient-to-r from-purple-600 to-blue-600 rounded-xl opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
+                            <span className="relative flex items-center gap-2">
+                                Sign In
+                            </span>
+                        </a>
+                        <a
+                            onClick={() => checkValidity()}
+                            className="group relative px-6 py-3 bg-gradient-to-r from-red-500 to-pink-500 rounded-xl font-bold text-white shadow-2xl hover:shadow-red-500/25 transition-all duration-300 hover:scale-105 active:scale-95"
+                        >
+                            <div
+                                className="absolute inset-0 bg-gradient-to-r from-red-600 to-pink-600 rounded-xl opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
+                            <span className="relative flex items-center gap-2">
+                                    Check
+                                </span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        );
+    }
 
-    const featuredProducts = products.slice(0, 4);
     return (
-        <ThemeProvider theme={theme}>
-            <CssBaseline />
-            <Box sx={{ flexGrow: 1 }}>
-                {/* App Bar */}
-                <AppBar position="sticky" sx={{ backgroundColor: 'background.paper', borderBottom: '1px solid #49454F' }}>
-                    <Toolbar>
-                        <IconButton edge="start" color="inherit" sx={{ mr: 2 }}>
-                            <Menu />
-                        </IconButton>
-                        <Typography variant="h6" component="div" sx={{ flexGrow: 1, color: 'primary.main', fontWeight: 'bold' }}>
-                            impr.ink
-                        </Typography>
-                        <IconButton color="inherit" sx={{ mr: 1 }}>
-                            <Search />
-                        </IconButton>
-                        <IconButton color="inherit">
-                            <Badge badgeContent={cartCount} color="primary">
-                                <ShoppingCart />
-                            </Badge>
-                        </IconButton>
-                    </Toolbar>
-                </AppBar>
+        <div
+            className="min-h-screen bg-gradient-to-br from-purple-900 via-blue-900 to-indigo-900 relative overflow-hidden">
+            <div className="relative z-10 min-h-screen flex items-center justify-center p-4">
+                {user ? (
+                    <div className="w-full max-w-5xl">
+                        <div className="text-center mb-6">
+                            <div
+                                className="inline-flex items-center justify-center w-16 h-16 bg-gradient-to-r from-purple-500 to-blue-500 rounded-full mb-3 shadow-2xl">
+                                {user.picture ? (
+                                    <img
+                                        src={user.picture}
+                                        alt="Profile"
+                                        className="w-full h-full rounded-full object-cover border-3 border-white/20"
+                                    />
+                                ) : (
+                                    <div className="text-white text-xl font-bold">
+                                        {user.name?.charAt(0) || user.email?.charAt(0) || '👤'}
+                                    </div>
+                                )}
+                            </div>
+                            <h1 className="text-2xl pb-1 font-bold bg-gradient-to-r from-white via-purple-200 to-blue-200 bg-clip-text text-transparent">
+                                Just testing :P
+                            </h1>
+                        </div>
 
-                {/* Hero Section */}
-                <Box sx={{
-                    background: 'linear-gradient(135deg, #1D1B20 0%, #2D1B69 50%, #1D1B20 100%)',
-                    py: 8,
-                    position: 'relative',
-                    overflow: 'hidden'
-                }}>
-                    <Container maxWidth="lg">
-                        <Box sx={{ textAlign: 'center', position: 'relative', zIndex: 1 }}>
-                            <Typography variant="h2" component="h1" gutterBottom sx={{
-                                fontWeight: 300,
-                                background: 'linear-gradient(45deg, #D0BCFF, #EADDFF)',
-                                backgroundClip: 'text',
-                                WebkitBackgroundClip: 'text',
-                                WebkitTextFillColor: 'transparent',
-                                mb: 2
-                            }}>
-                                Custom Printing Made Beautiful
-                            </Typography>
-                            <Typography variant="h5" color="text.secondary" sx={{ mb: 4, maxWidth: 600, mx: 'auto' }}>
-                                High-quality custom printing solutions for caps, flyers, coasters, and more.
-                                Premium materials with excellent print adhesion and longevity.
-                            </Typography>
-                            <Button
-                                variant="contained"
-                                size="large"
-                                sx={{
-                                    background: 'linear-gradient(45deg, #D0BCFF 30%, #EADDFF 90%)',
-                                    color: '#21005D',
-                                    px: 4,
-                                    py: 1.5,
-                                    fontSize: '1.1rem'
-                                }}
+                        <div className="bg-white/10 backdrop-blur-xl rounded-2xl border border-white/20 shadow-2xl overflow-hidden mb-4">
+                            <div className="bg-gradient-to-r from-purple-500/20 to-blue-500/20 p-4 border-b border-white/10">
+                                <h2 className="text-xl font-bold text-white flex items-center gap-2">
+                                    Auth Details
+                                </h2>
+                            </div>
+                            <div className="p-5">
+                                <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+                                    <div className="space-y-4">
+                                        <div>
+                                            <label
+                                                className="text-purple-300 text-xs font-semibold uppercase tracking-wider">Name</label>
+                                            <div
+                                                className="text-white text-base mt-1 p-2 bg-white/5 rounded-lg border border-white/10">
+                                                {user.name || 'Not provided'}
+                                            </div>
+                                        </div>
+                                        <div>
+                                            <label
+                                                className="text-purple-300 text-xs font-semibold uppercase tracking-wider">Email</label>
+                                            <div
+                                                className="text-white text-base mt-1 p-2 bg-white/5 rounded-lg border border-white/10">
+                                                {user.email || 'Not provided'}
+                                            </div>
+                                        </div>
+                                        <div>
+                                            <label
+                                                className="text-purple-300 text-xs font-semibold uppercase tracking-wider">User
+                                                ID</label>
+                                            <div
+                                                className="text-white/80 text-xs mt-1 p-2 bg-white/5 rounded-lg border border-white/10 font-mono break-all">
+                                                {user.sub || 'Not available'}
+                                            </div>
+                                        </div>
+                                        {user.nickname && (
+                                            <div>
+                                                <label
+                                                    className="text-purple-300 text-xs font-semibold uppercase tracking-wider">Nickname</label>
+                                                <div
+                                                    className="text-white text-base mt-1 p-2 bg-white/5 rounded-lg border border-white/10">
+                                                    {user.nickname}
+                                                </div>
+                                            </div>
+                                        )}
+                                    </div>
+
+                                    <div>
+                                        <label
+                                            className="text-purple-300 text-xs font-semibold uppercase tracking-wider mb-2 block">
+                                            Raw User Data
+                                        </label>
+                                        <div
+                                            className="bg-black/30 rounded-lg p-3 border border-white/10 h-64 overflow-auto">
+                                            <pre
+                                                className="text-green-300 text-xs font-mono leading-tight whitespace-pre-wrap">
+                                                {JSON.stringify(user, null, 2)}
+                                            </pre>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div className="flex justify-center">
+                            <a
+                                onClick={() => checkValidity()}
+                                className="group relative px-6 py-3 bg-gradient-to-r from-red-500 to-pink-500 rounded-xl font-bold text-white shadow-2xl hover:shadow-red-500/25 transition-all duration-300 hover:scale-105 active:scale-95"
                             >
-                                Explore Products
-                            </Button>
-                        </Box>
-                    </Container>
-                </Box>
-
-                <Container maxWidth="lg" sx={{ py: 6 }}>
-                    {error && (
-                        <Alert severity="error" sx={{ mb: 4 }}>
-                            {error}
-                        </Alert>
-                    )}
-
-                    {/* Featured Products */}
-                    <Box sx={{ mb: 6 }}>
-                        <Typography variant="h4" component="h2" gutterBottom sx={{ mb: 4, textAlign: 'center' }}>
-                            Featured Products
-                        </Typography>
-                        {loading ? (
-                            <Grid container spacing={3}>
-                                {[...Array(4)].map((_, index) => (
-                                    <Grid item xs={12} sm={6} md={3} key={index}>
-                                        <Card>
-                                            <Skeleton variant="rectangular" height={200} />
-                                            <CardContent>
-                                                <Skeleton variant="text" height={32} />
-                                                <Skeleton variant="text" height={20} />
-                                                <Skeleton variant="text" height={28} width="40%" />
-                                            </CardContent>
-                                        </Card>
-                                    </Grid>
-                                ))}
-                            </Grid>
-                        ) : (
-                            <Grid container spacing={3}>
-                                {featuredProducts.map((product) => (
-                                    <Grid item xs={12} sm={6} md={3} key={product.id}>
-                                        <ProductCard product={product} />
-                                    </Grid>
-                                ))}
-                            </Grid>
-                        )}
-                    </Box>
-
-                    {/* All Products */}
-                    <Box>
-                        <Typography variant="h4" component="h2" gutterBottom sx={{ mb: 4, textAlign: 'center' }}>
-                            All Products
-                        </Typography>
-                        {loading ? (
-                            <LoadingSkeleton />
-                        ) : (
-                            <Grid container spacing={3}>
-                                {products.map((product) => (
-                                    <Grid item xs={12} sm={6} md={4} lg={3} key={product.id}>
-                                        <ProductCard product={product} />
-                                    </Grid>
-                                ))}
-                            </Grid>
-                        )}
-                    </Box>
-
-                    {/* Load More Button */}
-                    {!loading && products.length > 0 && (
-                        <Box sx={{ textAlign: 'center', mt: 6 }}>
-                            <Button
-                                variant="outlined"
-                                size="large"
-                                sx={{ px: 4 }}
+                                <div
+                                    className="absolute inset-0 bg-gradient-to-r from-red-600 to-pink-600 rounded-xl opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
+                                <span className="relative flex items-center gap-2">
+                                    Check
+                                </span>
+                            </a>
+                            <a
+                                href="/auth/logout"
+                                className="group relative px-6 py-3 bg-gradient-to-r from-red-500 to-pink-500 rounded-xl font-bold text-white shadow-2xl hover:shadow-red-500/25 transition-all duration-300 hover:scale-105 active:scale-95"
                             >
-                                Load More Products
-                            </Button>
-                        </Box>
-                    )}
-                </Container>
-
-                {/* Floating Action Button */}
-                <Fab
-                    color="primary"
-                    sx={{
-                        position: 'fixed',
-                        bottom: 16,
-                        right: 16,
-                        background: 'linear-gradient(45deg, #D0BCFF 30%, #EADDFF 90%)',
-                        color: '#21005D'
-                    }}
-                >
-                    <Badge badgeContent={cartCount} color="error">
-                        <ShoppingCart />
-                    </Badge>
-                </Fab>
-            </Box>
-        </ThemeProvider>
+                                <div
+                                    className="absolute inset-0 bg-gradient-to-r from-red-600 to-pink-600 rounded-xl opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
+                                <span className="relative flex items-center gap-2">
+                                    Sign Out
+                                </span>
+                            </a>
+                        </div>
+                    </div>
+                ) : (
+                    <div></div>
+                )}
+            </div>
+        </div>
     );
-};
-
-export default ImprintLanding;
\ No newline at end of file
+}
\ No newline at end of file

From 92bdb8444bc8a6ac79f6bef613c57038d840cb6e Mon Sep 17 00:00:00 2001
From: lumijiez <59575049+lumijiez@users.noreply.github.com>
Date: Fri, 20 Jun 2025 14:54:19 +0300
Subject: [PATCH 2/3] Clean up

---
 .../Categories => Categories/Commands}/CreateCategoryHandler.cs   | 0
 .../Categories => Categories/Commands}/DeleteCategoryHandler.cs   | 0
 .../Categories => Categories/Commands}/GetCategoriesHandler.cs    | 0
 .../Categories => Categories/Commands}/UpdateCategoryHandler.cs   | 0
 .../{Domains => }/Categories/Dtos/CategoryDto.cs                  | 0
 .../Validation}/CreateCategoryCommandValidator.cs                 | 0
 .../Validation}/DeleteCategoryCommandValidator.cs                 | 0
 .../Validation}/UpdateCategoryCommandValidator.cs                 | 0
 src/Imprink.Application/{Mappings => }/MappingProfile.cs          | 0
 .../Validation}/OrderFilterParametersValidator.cs                 | 0
 .../Commands}/CreateProductVariantHandler.cs                      | 0
 .../Commands}/DeleteProductVariantHandler.cs                      | 0
 .../Commands}/GetProductVariantsHandler.cs                        | 0
 .../Commands}/UpdateProductVariantHandler.cs                      | 0
 .../{Domains => }/ProductVariants/Dtos/ProductVariantDto.cs       | 0
 .../Validation}/CreateProducVariantCommandValidator.cs            | 0
 .../Validation}/DeleteProductVariantCommandValidator.cs           | 0
 .../Validation}/GetProductVariantsQueryValidator.cs               | 0
 .../Validation}/UpdateProductVariantCommandValidator.cs           | 0
 .../Products => Products/Commands}/CreateProductHandler.cs        | 0
 .../Products => Products/Commands}/DeleteProductHandler.cs        | 0
 .../{Domains/Products => Products/Commands}/GetProductsHandler.cs | 0
 .../Products => Products/Commands}/UpdateProductCommand.cs        | 0
 .../{Domains => }/Products/Dtos/PagedResultDto.cs                 | 0
 src/Imprink.Application/{Domains => }/Products/Dtos/ProductDto.cs | 0
 .../{ => Products}/Mappings/ProductMappingProfile.cs              | 0
 .../Validation}/CreateProductCommandValidator.cs                  | 0
 .../Validation}/DeleteProductCommandValidator.cs                  | 0
 .../Products => Products/Validation}/GetProductsQueryValidator.cs | 0
 .../Validation}/ProductFilterParametersValidator.cs               | 0
 .../Validation}/UpdateProductCommandValidator.cs                  | 0
 .../{Domains/Users => Users/Commands}/DeleteUserRoleHandler.cs    | 0
 .../{Domains/Users => Users/Commands}/GetAllRolesHandler.cs       | 0
 .../{Domains/Users => Users/Commands}/GetUserRolesHandler.cs      | 0
 .../{Domains/Users => Users/Commands}/SetUserFullNameHandler.cs   | 0
 .../{Domains/Users => Users/Commands}/SetUserPhoneHandler.cs      | 0
 .../{Domains/Users => Users/Commands}/SetUserRoleHandler.cs       | 0
 .../{Domains/Users => Users/Commands}/SyncUserHandler.cs          | 0
 src/Imprink.Application/{Domains => }/Users/Dtos/RoleDto.cs       | 0
 src/Imprink.Application/{Domains => }/Users/Dtos/UserDto.cs       | 0
 src/Imprink.Application/{Domains => }/Users/Dtos/UserRoleDto.cs   | 0
 .../{ => Users}/Mappings/UserMappingProfile.cs                    | 0
 .../{ => Users}/Services/ICurrentUserService.cs                   | 0
 .../{Validation/Models => Users/Validation}/Auth0UserValidator.cs | 0
 .../Users => Users/Validation}/SetUserFullNameCommandValidator.cs | 0
 .../Users => Users/Validation}/SetUserPhoneCommandValidator.cs    | 0
 46 files changed, 0 insertions(+), 0 deletions(-)
 rename src/Imprink.Application/{Domains/Categories => Categories/Commands}/CreateCategoryHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Categories => Categories/Commands}/DeleteCategoryHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Categories => Categories/Commands}/GetCategoriesHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Categories => Categories/Commands}/UpdateCategoryHandler.cs (100%)
 rename src/Imprink.Application/{Domains => }/Categories/Dtos/CategoryDto.cs (100%)
 rename src/Imprink.Application/{Validation/Categories => Categories/Validation}/CreateCategoryCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Categories => Categories/Validation}/DeleteCategoryCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Categories => Categories/Validation}/UpdateCategoryCommandValidator.cs (100%)
 rename src/Imprink.Application/{Mappings => }/MappingProfile.cs (100%)
 rename src/Imprink.Application/{Validation/Models => Orders/Validation}/OrderFilterParametersValidator.cs (100%)
 rename src/Imprink.Application/{Domains/ProductVariants => ProductVariants/Commands}/CreateProductVariantHandler.cs (100%)
 rename src/Imprink.Application/{Domains/ProductVariants => ProductVariants/Commands}/DeleteProductVariantHandler.cs (100%)
 rename src/Imprink.Application/{Domains/ProductVariants => ProductVariants/Commands}/GetProductVariantsHandler.cs (100%)
 rename src/Imprink.Application/{Domains/ProductVariants => ProductVariants/Commands}/UpdateProductVariantHandler.cs (100%)
 rename src/Imprink.Application/{Domains => }/ProductVariants/Dtos/ProductVariantDto.cs (100%)
 rename src/Imprink.Application/{Validation/ProductVariants => ProductVariants/Validation}/CreateProducVariantCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/ProductVariants => ProductVariants/Validation}/DeleteProductVariantCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/ProductVariants => ProductVariants/Validation}/GetProductVariantsQueryValidator.cs (100%)
 rename src/Imprink.Application/{Validation/ProductVariants => ProductVariants/Validation}/UpdateProductVariantCommandValidator.cs (100%)
 rename src/Imprink.Application/{Domains/Products => Products/Commands}/CreateProductHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Products => Products/Commands}/DeleteProductHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Products => Products/Commands}/GetProductsHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Products => Products/Commands}/UpdateProductCommand.cs (100%)
 rename src/Imprink.Application/{Domains => }/Products/Dtos/PagedResultDto.cs (100%)
 rename src/Imprink.Application/{Domains => }/Products/Dtos/ProductDto.cs (100%)
 rename src/Imprink.Application/{ => Products}/Mappings/ProductMappingProfile.cs (100%)
 rename src/Imprink.Application/{Validation/Products => Products/Validation}/CreateProductCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Products => Products/Validation}/DeleteProductCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Products => Products/Validation}/GetProductsQueryValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Models => Products/Validation}/ProductFilterParametersValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Products => Products/Validation}/UpdateProductCommandValidator.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/DeleteUserRoleHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/GetAllRolesHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/GetUserRolesHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/SetUserFullNameHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/SetUserPhoneHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/SetUserRoleHandler.cs (100%)
 rename src/Imprink.Application/{Domains/Users => Users/Commands}/SyncUserHandler.cs (100%)
 rename src/Imprink.Application/{Domains => }/Users/Dtos/RoleDto.cs (100%)
 rename src/Imprink.Application/{Domains => }/Users/Dtos/UserDto.cs (100%)
 rename src/Imprink.Application/{Domains => }/Users/Dtos/UserRoleDto.cs (100%)
 rename src/Imprink.Application/{ => Users}/Mappings/UserMappingProfile.cs (100%)
 rename src/Imprink.Application/{ => Users}/Services/ICurrentUserService.cs (100%)
 rename src/Imprink.Application/{Validation/Models => Users/Validation}/Auth0UserValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Users => Users/Validation}/SetUserFullNameCommandValidator.cs (100%)
 rename src/Imprink.Application/{Validation/Users => Users/Validation}/SetUserPhoneCommandValidator.cs (100%)

diff --git a/src/Imprink.Application/Domains/Categories/CreateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/CreateCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/DeleteCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/DeleteCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/GetCategoriesHandler.cs b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/GetCategoriesHandler.cs
rename to src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/UpdateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/UpdateCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/Dtos/CategoryDto.cs b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/Dtos/CategoryDto.cs
rename to src/Imprink.Application/Categories/Dtos/CategoryDto.cs
diff --git a/src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Mappings/MappingProfile.cs b/src/Imprink.Application/MappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/MappingProfile.cs
rename to src/Imprink.Application/MappingProfile.cs
diff --git a/src/Imprink.Application/Validation/Models/OrderFilterParametersValidator.cs b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/OrderFilterParametersValidator.cs
rename to src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/Dtos/ProductVariantDto.cs b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/Dtos/ProductVariantDto.cs
rename to src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Domains/Products/CreateProductHandler.cs b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/CreateProductHandler.cs
rename to src/Imprink.Application/Products/Commands/CreateProductHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/DeleteProductHandler.cs b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/DeleteProductHandler.cs
rename to src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/GetProductsHandler.cs b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/GetProductsHandler.cs
rename to src/Imprink.Application/Products/Commands/GetProductsHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/UpdateProductCommand.cs b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/UpdateProductCommand.cs
rename to src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
diff --git a/src/Imprink.Application/Domains/Products/Dtos/PagedResultDto.cs b/src/Imprink.Application/Products/Dtos/PagedResultDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/Dtos/PagedResultDto.cs
rename to src/Imprink.Application/Products/Dtos/PagedResultDto.cs
diff --git a/src/Imprink.Application/Domains/Products/Dtos/ProductDto.cs b/src/Imprink.Application/Products/Dtos/ProductDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/Dtos/ProductDto.cs
rename to src/Imprink.Application/Products/Dtos/ProductDto.cs
diff --git a/src/Imprink.Application/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/ProductMappingProfile.cs
rename to src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
diff --git a/src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs
rename to src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
diff --git a/src/Imprink.Application/Validation/Models/ProductFilterParametersValidator.cs b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/ProductFilterParametersValidator.cs
rename to src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
diff --git a/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs
rename to src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs
rename to src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs
rename to src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SyncUserHandler.cs b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SyncUserHandler.cs
rename to src/Imprink.Application/Users/Commands/SyncUserHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/RoleDto.cs b/src/Imprink.Application/Users/Dtos/RoleDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/RoleDto.cs
rename to src/Imprink.Application/Users/Dtos/RoleDto.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/UserDto.cs b/src/Imprink.Application/Users/Dtos/UserDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/UserDto.cs
rename to src/Imprink.Application/Users/Dtos/UserDto.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/UserRoleDto.cs b/src/Imprink.Application/Users/Dtos/UserRoleDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/UserRoleDto.cs
rename to src/Imprink.Application/Users/Dtos/UserRoleDto.cs
diff --git a/src/Imprink.Application/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/UserMappingProfile.cs
rename to src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
diff --git a/src/Imprink.Application/Services/ICurrentUserService.cs b/src/Imprink.Application/Users/Services/ICurrentUserService.cs
similarity index 100%
rename from src/Imprink.Application/Services/ICurrentUserService.cs
rename to src/Imprink.Application/Users/Services/ICurrentUserService.cs
diff --git a/src/Imprink.Application/Validation/Models/Auth0UserValidator.cs b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/Auth0UserValidator.cs
rename to src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
diff --git a/src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs
rename to src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs
rename to src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs

From 716c5c94e88ca1e5c285afe76ac7101fa8b45e43 Mon Sep 17 00:00:00 2001
From: lumijiez <59575049+lumijiez@users.noreply.github.com>
Date: Fri, 20 Jun 2025 14:56:29 +0300
Subject: [PATCH 3/3] Fix all namespaces

---
 .../Categories/Commands/CreateCategoryHandler.cs       |  5 +++--
 .../Categories/Commands/DeleteCategoryHandler.cs       |  2 +-
 .../Categories/Commands/GetCategoriesHandler.cs        |  5 +++--
 .../Categories/Commands/UpdateCategoryHandler.cs       |  3 ++-
 src/Imprink.Application/Categories/Dtos/CategoryDto.cs |  2 +-
 .../Validation/CreateCategoryCommandValidator.cs       |  4 ++--
 .../Validation/DeleteCategoryCommandValidator.cs       |  4 ++--
 .../Validation/UpdateCategoryCommandValidator.cs       |  4 ++--
 src/Imprink.Application/MappingProfile.cs              |  2 +-
 .../Validation/OrderFilterParametersValidator.cs       |  2 +-
 .../Commands/CreateProductVariantHandler.cs            |  6 +++---
 .../Commands/DeleteProductVariantHandler.cs            |  2 +-
 .../Commands/GetProductVariantsHandler.cs              |  6 +++---
 .../Commands/UpdateProductVariantHandler.cs            |  4 ++--
 .../ProductVariants/Dtos/ProductVariantDto.cs          |  4 +++-
 .../Validation/CreateProducVariantCommandValidator.cs  |  4 ++--
 .../Validation/DeleteProductVariantCommandValidator.cs |  4 ++--
 .../Validation/GetProductVariantsQueryValidator.cs     |  4 ++--
 .../Validation/UpdateProductVariantCommandValidator.cs |  4 ++--
 .../Products/Commands/CreateProductHandler.cs          |  4 ++--
 .../Products/Commands/DeleteProductHandler.cs          |  2 +-
 .../Products/Commands/GetProductsHandler.cs            |  3 ++-
 .../Products/Commands/UpdateProductCommand.cs          |  3 ++-
 src/Imprink.Application/Products/Dtos/ProductDto.cs    |  2 ++
 .../Products/Mappings/ProductMappingProfile.cs         | 10 ++++++----
 .../Validation/CreateProductCommandValidator.cs        |  4 ++--
 .../Validation/DeleteProductCommandValidator.cs        |  4 ++--
 .../Products/Validation/GetProductsQueryValidator.cs   |  5 ++---
 .../Validation/ProductFilterParametersValidator.cs     |  2 +-
 .../Validation/UpdateProductCommandValidator.cs        |  4 ++--
 .../Users/Commands/DeleteUserRoleHandler.cs            |  2 +-
 .../Users/Commands/GetAllRolesHandler.cs               |  2 +-
 .../Users/Commands/GetUserRolesHandler.cs              |  2 +-
 .../Users/Commands/SetUserFullNameHandler.cs           |  4 ++--
 .../Users/Commands/SetUserPhoneHandler.cs              |  4 ++--
 .../Users/Commands/SetUserRoleHandler.cs               |  2 +-
 .../Users/Commands/SyncUserHandler.cs                  |  2 +-
 .../Users/Mappings/UserMappingProfile.cs               |  2 +-
 .../Users/Services/ICurrentUserService.cs              |  2 +-
 .../Users/Validation/Auth0UserValidator.cs             |  2 +-
 .../Validation/SetUserFullNameCommandValidator.cs      |  4 ++--
 .../Users/Validation/SetUserPhoneCommandValidator.cs   |  4 ++--
 src/Imprink.Domain/Entities/Orders/OrderItem.cs        |  4 ++--
 src/Imprink.Domain/Entities/Products/Category.cs       |  2 +-
 src/Imprink.Domain/Entities/Products/Product.cs        |  2 +-
 src/Imprink.Domain/Entities/Products/ProductVariant.cs |  4 ++--
 .../Repositories/Products/ICategoryRepository.cs       |  2 +-
 .../Repositories/Products/IProductRepository.cs        |  2 +-
 .../Repositories/Products/IProductVariantRepository.cs |  2 +-
 .../Repositories/Users/IRoleRepository.cs              |  2 +-
 .../Configuration/Products/CategoryConfiguration.cs    |  2 +-
 .../Configuration/Products/ProductConfiguration.cs     |  2 +-
 .../Products/ProductVariantConfiguration.cs            |  2 +-
 .../Database/ApplicationDbContext.cs                   |  2 +-
 .../Repositories/Products/CategoryRepository.cs        |  2 +-
 .../Repositories/Products/ProductRepository.cs         |  2 +-
 .../Repositories/Products/ProductVariantRepository.cs  |  2 +-
 .../Repositories/Users/RoleRepository.cs               |  1 +
 .../Services/CurrentUserService.cs                     |  2 +-
 .../Controllers/Products/CategoriesController.cs       |  3 ++-
 .../Controllers/Products/ProductVariantsController.cs  |  3 ++-
 .../Controllers/Products/ProductsController.cs         |  2 +-
 .../Controllers/Users/UsersController.cs               |  2 +-
 src/Imprink.WebApi/Seeder.cs                           |  2 +-
 src/Imprink.WebApi/Startup.cs                          |  7 +++----
 65 files changed, 107 insertions(+), 95 deletions(-)

diff --git a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
index 2b67a75..dfc5a1b 100644
--- a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
+++ b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
@@ -1,8 +1,9 @@
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Domains.Categories;
+namespace Imprink.Application.Categories.Commands;
 
 public class CreateCategoryCommand : IRequest<CategoryDto>
 {
diff --git a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
index b3d5850..7220027 100644
--- a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
+++ b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.Domains.Categories;
+namespace Imprink.Application.Categories.Commands;
 
 public class DeleteCategoryCommand : IRequest<bool>
 {
diff --git a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
index a0b13f1..5c4b3e3 100644
--- a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
+++ b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
@@ -1,8 +1,9 @@
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Domains.Categories;
+namespace Imprink.Application.Categories.Commands;
 
 public class GetCategoriesQuery : IRequest<IEnumerable<CategoryDto>>
 {
diff --git a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
index a10eb1f..c236880 100644
--- a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
+++ b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
@@ -1,8 +1,9 @@
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Products.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.Categories;
+namespace Imprink.Application.Categories.Commands;
 
 public class UpdateCategoryCommand : IRequest<CategoryDto>
 {
diff --git a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs
index fbc701b..64b9e19 100644
--- a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs
+++ b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs
@@ -1,4 +1,4 @@
-namespace Imprink.Application.Products.Dtos;
+namespace Imprink.Application.Categories.Dtos;
 
 public class CategoryDto
 {
diff --git a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
index 6f20535..88e9f22 100644
--- a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
+++ b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Categories;
+using Imprink.Application.Categories.Commands;
 
-namespace Imprink.Application.Validation.Categories;
+namespace Imprink.Application.Categories.Validation;
 
 public class CreateCategoryCommandValidator : AbstractValidator<CreateCategoryCommand>
 {
diff --git a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
index d1f9cb3..89c8c7e 100644
--- a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
+++ b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Categories;
+using Imprink.Application.Categories.Commands;
 
-namespace Imprink.Application.Validation.Categories;
+namespace Imprink.Application.Categories.Validation;
 
 public class DeleteCategoryCommandValidator : AbstractValidator<DeleteCategoryCommand>
 {
diff --git a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
index 7e493bf..dfb0af8 100644
--- a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
+++ b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Categories;
+using Imprink.Application.Categories.Commands;
 
-namespace Imprink.Application.Validation.Categories;
+namespace Imprink.Application.Categories.Validation;
 
 public class UpdateCategoryCommandValidator : AbstractValidator<UpdateCategoryCommand>
 {
diff --git a/src/Imprink.Application/MappingProfile.cs b/src/Imprink.Application/MappingProfile.cs
index 572be15..9391d58 100644
--- a/src/Imprink.Application/MappingProfile.cs
+++ b/src/Imprink.Application/MappingProfile.cs
@@ -1,5 +1,5 @@
 using AutoMapper;
 
-namespace Imprink.Application.Mappings;
+namespace Imprink.Application;
 
 public abstract class MappingProfile : Profile { }
\ No newline at end of file
diff --git a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
index 0efcdad..243f5e8 100644
--- a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
+++ b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Validation.Models;
+namespace Imprink.Application.Orders.Validation;
 
 public class OrderFilterParametersValidator : AbstractValidator<OrderFilterParameters>
 {
diff --git a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
index d1ab5fd..fbb3f1a 100644
--- a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
+++ b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
-using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Application.ProductVariants.Dtos;
+using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Domains.ProductVariants;
+namespace Imprink.Application.ProductVariants.Commands;
 
 public class CreateProductVariantCommand : IRequest<ProductVariantDto>
 {
diff --git a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
index 7fdf8a9..3c6609f 100644
--- a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
+++ b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.Domains.ProductVariants;
+namespace Imprink.Application.ProductVariants.Commands;
 
 public class DeleteProductVariantCommand : IRequest<bool>
 {
diff --git a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
index c572305..92deb03 100644
--- a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
+++ b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
@@ -1,10 +1,10 @@
 using AutoMapper;
-using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Application.ProductVariants.Dtos;
+using Imprink.Domain.Entities.Products;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
-namespace Imprink.Application.Domains.ProductVariants;
+namespace Imprink.Application.ProductVariants.Commands;
 
 public class GetProductVariantsQuery : IRequest<IEnumerable<ProductVariantDto>>
 {
diff --git a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
index 07a7724..53eefc2 100644
--- a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
+++ b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Products.Dtos;
+using Imprink.Application.ProductVariants.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.ProductVariants;
+namespace Imprink.Application.ProductVariants.Commands;
 
 public class UpdateProductVariantCommand : IRequest<ProductVariantDto>
 {
diff --git a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
index 881c54d..0afec2c 100644
--- a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
+++ b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
@@ -1,4 +1,6 @@
-namespace Imprink.Application.Products.Dtos;
+using Imprink.Application.Products.Dtos;
+
+namespace Imprink.Application.ProductVariants.Dtos;
 
 public class ProductVariantDto
 {
diff --git a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
index c3d3957..8897c47 100644
--- a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
+++ b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.ProductVariants.Commands;
 
-namespace Imprink.Application.Validation.ProductVariants;
+namespace Imprink.Application.ProductVariants.Validation;
 
 public class CreateProductVariantCommandValidator : AbstractValidator<CreateProductVariantCommand>
 {
diff --git a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
index acda88f..419aa93 100644
--- a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
+++ b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.ProductVariants.Commands;
 
-namespace Imprink.Application.Validation.ProductVariants;
+namespace Imprink.Application.ProductVariants.Validation;
 
 public class DeleteProductVariantCommandValidator : AbstractValidator<DeleteProductVariantCommand>
 {
diff --git a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
index 2ad4d09..9aa11b1 100644
--- a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
+++ b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.ProductVariants.Commands;
 
-namespace Imprink.Application.Validation.ProductVariants;
+namespace Imprink.Application.ProductVariants.Validation;
 
 public class GetProductVariantsQueryValidator : AbstractValidator<GetProductVariantsQuery>
 {
diff --git a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
index dd9fe23..d01b1b2 100644
--- a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
+++ b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.ProductVariants.Commands;
 
-namespace Imprink.Application.Validation.ProductVariants;
+namespace Imprink.Application.ProductVariants.Validation;
 
 public class UpdateProductVariantCommandValidator : AbstractValidator<UpdateProductVariantCommand>
 {
diff --git a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs
index 2e84304..a36e606 100644
--- a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs
+++ b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
 using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Domains.Products;
+namespace Imprink.Application.Products.Commands;
 
 public class CreateProductCommand : IRequest<ProductDto>
 {
diff --git a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
index c81d3d8..2983496 100644
--- a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
+++ b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.Domains.Products;
+namespace Imprink.Application.Products.Commands;
 
 public class DeleteProductCommand : IRequest<bool>
 {
diff --git a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs
index 615553d..ea83640 100644
--- a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs
+++ b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs
@@ -1,8 +1,9 @@
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 
-namespace Imprink.Application.Domains.Products;
+namespace Imprink.Application.Products.Commands;
 
 public class GetProductsQuery : IRequest<PagedResultDto<ProductDto>>
 {
diff --git a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
index 3aadffa..f6c3e8c 100644
--- a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
+++ b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
@@ -1,8 +1,9 @@
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Exceptions;
 using Imprink.Application.Products.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.Products;
+namespace Imprink.Application.Products.Commands;
 
 public class UpdateProductCommand : IRequest<ProductDto>
 {
diff --git a/src/Imprink.Application/Products/Dtos/ProductDto.cs b/src/Imprink.Application/Products/Dtos/ProductDto.cs
index abb8403..cc71be2 100644
--- a/src/Imprink.Application/Products/Dtos/ProductDto.cs
+++ b/src/Imprink.Application/Products/Dtos/ProductDto.cs
@@ -1,3 +1,5 @@
+using Imprink.Application.Categories.Dtos;
+
 namespace Imprink.Application.Products.Dtos;
 
 public class ProductDto
diff --git a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
index e58e2cc..97d1fd7 100644
--- a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
+++ b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
@@ -1,10 +1,12 @@
 using AutoMapper;
-using Imprink.Application.Domains.Products;
-using Imprink.Application.Domains.ProductVariants;
+using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Products.Commands;
 using Imprink.Application.Products.Dtos;
-using Imprink.Domain.Entities.Product;
+using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.ProductVariants.Dtos;
+using Imprink.Domain.Entities.Products;
 
-namespace Imprink.Application.Mappings;
+namespace Imprink.Application.Products.Mappings;
 
 public class ProductMappingProfile: Profile
 {
diff --git a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
index 60da2bd..d79875a 100644
--- a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
+++ b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Products;
+using Imprink.Application.Products.Commands;
 
-namespace Imprink.Application.Validation.Products;
+namespace Imprink.Application.Products.Validation;
 
 public class CreateProductCommandValidator : AbstractValidator<CreateProductCommand>
 {
diff --git a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
index 5cb3cea..53903ab 100644
--- a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
+++ b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Products;
+using Imprink.Application.Products.Commands;
 
-namespace Imprink.Application.Validation.Products;
+namespace Imprink.Application.Products.Validation;
 
 public class DeleteProductCommandValidator : AbstractValidator<DeleteProductCommand>
 {
diff --git a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
index 9026474..1194b72 100644
--- a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
+++ b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
@@ -1,8 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Products;
-using Imprink.Application.Validation.Models;
+using Imprink.Application.Products.Commands;
 
-namespace Imprink.Application.Validation.Products;
+namespace Imprink.Application.Products.Validation;
 
 public class GetProductsQueryValidator : AbstractValidator<GetProductsQuery>
 {
diff --git a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
index 08131c9..55cd4d0 100644
--- a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
+++ b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Validation.Models;
+namespace Imprink.Application.Products.Validation;
 
 public class ProductFilterParametersValidator : AbstractValidator<ProductFilterParameters>
 {
diff --git a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
index afc7cbf..3c49ebe 100644
--- a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
+++ b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Products;
+using Imprink.Application.Products.Commands;
 
-namespace Imprink.Application.Validation.Products;
+namespace Imprink.Application.Products.Validation;
 
 public class UpdateProductCommandValidator : AbstractValidator<UpdateProductCommand>
 {
diff --git a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
index 7755d01..6d1888a 100644
--- a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
+++ b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
@@ -3,7 +3,7 @@ using Imprink.Application.Exceptions;
 using Imprink.Application.Users.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record DeleteUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 
diff --git a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
index 12d3df2..4d9ab5e 100644
--- a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
+++ b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
@@ -2,7 +2,7 @@ using AutoMapper;
 using Imprink.Application.Users.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record GetAllRolesCommand : IRequest<IEnumerable<RoleDto>>;
 
diff --git a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
index 902900f..9c39568 100644
--- a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
+++ b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
@@ -3,7 +3,7 @@ using Imprink.Application.Exceptions;
 using Imprink.Application.Users.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record GetUserRolesCommand(string Sub) : IRequest<IEnumerable<RoleDto>>;
 
diff --git a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
index 7fa91ce..d7865d8 100644
--- a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
+++ b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
@@ -1,10 +1,10 @@
 using AutoMapper;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Services;
 using Imprink.Application.Users.Dtos;
+using Imprink.Application.Users.Services;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record SetUserFullNameCommand(string FirstName, string LastName) : IRequest<UserDto?>;
 
diff --git a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
index 369c15d..d1e3ca7 100644
--- a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
+++ b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
@@ -1,10 +1,10 @@
 using AutoMapper;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Services;
 using Imprink.Application.Users.Dtos;
+using Imprink.Application.Users.Services;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record SetUserPhoneCommand(string PhoneNumber) : IRequest<UserDto?>;
 
diff --git a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
index d681363..bb9d892 100644
--- a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
+++ b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
@@ -4,7 +4,7 @@ using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Entities.Users;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record SetUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 
diff --git a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs
index ae2cac8..99bdc9f 100644
--- a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs
+++ b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs
@@ -3,7 +3,7 @@ using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 
-namespace Imprink.Application.Domains.Users;
+namespace Imprink.Application.Users.Commands;
 
 public record SyncUserCommand(Auth0User User) : IRequest<UserDto?>;
 
diff --git a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
index 8eda701..16a8a43 100644
--- a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
+++ b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
@@ -4,7 +4,7 @@ using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Entities.Users;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Mappings;
+namespace Imprink.Application.Users.Mappings;
 
 public class UserMappingProfile: Profile
 {
diff --git a/src/Imprink.Application/Users/Services/ICurrentUserService.cs b/src/Imprink.Application/Users/Services/ICurrentUserService.cs
index 83bbe41..86b15a4 100644
--- a/src/Imprink.Application/Users/Services/ICurrentUserService.cs
+++ b/src/Imprink.Application/Users/Services/ICurrentUserService.cs
@@ -1,4 +1,4 @@
-namespace Imprink.Application.Services;
+namespace Imprink.Application.Users.Services;
 
 public interface ICurrentUserService
 {
diff --git a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
index 4df6070..309558b 100644
--- a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
+++ b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Validation.Models;
+namespace Imprink.Application.Users.Validation;
 
 public class Auth0UserValidator : AbstractValidator<Auth0User>
 {
diff --git a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
index b97eed6..cadda16 100644
--- a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
+++ b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Users;
+using Imprink.Application.Users.Commands;
 
-namespace Imprink.Application.Validation.Users;
+namespace Imprink.Application.Users.Validation;
 
 public class SetUserFullNameCommandValidator : AbstractValidator<SetUserFullNameCommand>
 {
diff --git a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs
index 54a73a8..b0c0508 100644
--- a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs
+++ b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs
@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Domains.Users;
+using Imprink.Application.Users.Commands;
 
-namespace Imprink.Application.Validation.Users;
+namespace Imprink.Application.Users.Validation;
 
 public class SetUserPhoneCommandValidator : AbstractValidator<SetUserPhoneCommand>
 {
diff --git a/src/Imprink.Domain/Entities/Orders/OrderItem.cs b/src/Imprink.Domain/Entities/Orders/OrderItem.cs
index 4013d51..7f63ce2 100644
--- a/src/Imprink.Domain/Entities/Orders/OrderItem.cs
+++ b/src/Imprink.Domain/Entities/Orders/OrderItem.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 
 namespace Imprink.Domain.Entities.Orders;
 
@@ -14,6 +14,6 @@ public class OrderItem : EntityBase
     public string CustomizationDescription { get; set; } = null!;
         
     public Order Order { get; set; } = null!;
-    public Product.Product Product { get; set; } = null!;
+    public Product Product { get; set; } = null!;
     public ProductVariant ProductVariant { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/src/Imprink.Domain/Entities/Products/Category.cs b/src/Imprink.Domain/Entities/Products/Category.cs
index 3bbf53c..19d4299 100644
--- a/src/Imprink.Domain/Entities/Products/Category.cs
+++ b/src/Imprink.Domain/Entities/Products/Category.cs
@@ -1,4 +1,4 @@
-namespace Imprink.Domain.Entities.Product;
+namespace Imprink.Domain.Entities.Products;
 
 public class Category : EntityBase
 {
diff --git a/src/Imprink.Domain/Entities/Products/Product.cs b/src/Imprink.Domain/Entities/Products/Product.cs
index d728d5b..e551681 100644
--- a/src/Imprink.Domain/Entities/Products/Product.cs
+++ b/src/Imprink.Domain/Entities/Products/Product.cs
@@ -1,6 +1,6 @@
 using Imprink.Domain.Entities.Orders;
 
-namespace Imprink.Domain.Entities.Product;
+namespace Imprink.Domain.Entities.Products;
 
 public class Product : EntityBase
 {
diff --git a/src/Imprink.Domain/Entities/Products/ProductVariant.cs b/src/Imprink.Domain/Entities/Products/ProductVariant.cs
index 5dd781e..a802569 100644
--- a/src/Imprink.Domain/Entities/Products/ProductVariant.cs
+++ b/src/Imprink.Domain/Entities/Products/ProductVariant.cs
@@ -1,6 +1,6 @@
 using Imprink.Domain.Entities.Orders;
 
-namespace Imprink.Domain.Entities.Product;
+namespace Imprink.Domain.Entities.Products;
 
 public class ProductVariant : EntityBase
 {
@@ -13,6 +13,6 @@ public class ProductVariant : EntityBase
     public int StockQuantity { get; set; }
     public bool IsActive { get; set; }
         
-    public virtual required Imprink.Domain.Entities.Product.Product Product { get; set; }
+    public virtual required Product Product { get; set; }
     public virtual ICollection<OrderItem> OrderItems { get; set; } = new List<OrderItem>();
 }
\ No newline at end of file
diff --git a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs b/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs
index 3308a6e..ba41959 100644
--- a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs
+++ b/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 
 namespace Imprink.Domain.Repositories.Products;
 
diff --git a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs b/src/Imprink.Domain/Repositories/Products/IProductRepository.cs
index 9fd577e..a4dd90a 100644
--- a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs
+++ b/src/Imprink.Domain/Repositories/Products/IProductRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Models;
 
 namespace Imprink.Domain.Repositories.Products;
diff --git a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs b/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs
index ae8af5e..8f01e7e 100644
--- a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs
+++ b/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 
 namespace Imprink.Domain.Repositories.Products;
 
diff --git a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs b/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs
index f92043c..f2dfee2 100644
--- a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs
+++ b/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs
@@ -1,6 +1,6 @@
 using Imprink.Domain.Entities.Users;
 
-namespace Imprink.Domain.Repositories;
+namespace Imprink.Domain.Repositories.Users;
 
 public interface IRoleRepository
 {
diff --git a/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs
index 0867cb7..b019efa 100644
--- a/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs
+++ b/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
diff --git a/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs
index ed3054e..49bb909 100644
--- a/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs
+++ b/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
diff --git a/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs
index 7593b6b..42dd79a 100644
--- a/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs
+++ b/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
diff --git a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs b/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs
index 4fe7a92..96eaeed 100644
--- a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs
+++ b/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs
@@ -1,5 +1,5 @@
 using Imprink.Domain.Entities.Orders;
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Entities.Users;
 using Imprink.Infrastructure.Configuration.Orders;
 using Imprink.Infrastructure.Configuration.Products;
diff --git a/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs
index b5d9873..89afab7 100644
--- a/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs
+++ b/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs
index 95af010..7c8acdd 100644
--- a/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs
+++ b/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Models;
 using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
diff --git a/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs
index 1c892bf..e97babf 100644
--- a/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs
+++ b/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs b/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs
index bf64712..23ce386 100644
--- a/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs
+++ b/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs
@@ -1,5 +1,6 @@
 using Imprink.Domain.Entities.Users;
 using Imprink.Domain.Repositories;
+using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/Imprink.Infrastructure/Services/CurrentUserService.cs b/src/Imprink.Infrastructure/Services/CurrentUserService.cs
index 89ffbe9..52102cc 100644
--- a/src/Imprink.Infrastructure/Services/CurrentUserService.cs
+++ b/src/Imprink.Infrastructure/Services/CurrentUserService.cs
@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using Imprink.Application.Services;
+using Imprink.Application.Users.Services;
 using Microsoft.AspNetCore.Http;
 
 namespace Imprink.Infrastructure.Services;
diff --git a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs b/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs
index ba087ae..04d9b32 100644
--- a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs
+++ b/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs
@@ -1,4 +1,5 @@
-using Imprink.Application.Domains.Categories;
+using Imprink.Application.Categories.Commands;
+using Imprink.Application.Categories.Dtos;
 using Imprink.Application.Products.Dtos;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs b/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs
index 745de3e..7b065a2 100644
--- a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs
+++ b/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs
@@ -1,5 +1,6 @@
-using Imprink.Application.Domains.ProductVariants;
 using Imprink.Application.Products.Dtos;
+using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.ProductVariants.Dtos;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Imprink.WebApi/Controllers/Products/ProductsController.cs b/src/Imprink.WebApi/Controllers/Products/ProductsController.cs
index e1f7fc5..be28cd5 100644
--- a/src/Imprink.WebApi/Controllers/Products/ProductsController.cs
+++ b/src/Imprink.WebApi/Controllers/Products/ProductsController.cs
@@ -1,5 +1,5 @@
-using Imprink.Application.Domains.Products;
 using Imprink.Application.Products;
+using Imprink.Application.Products.Commands;
 using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
diff --git a/src/Imprink.WebApi/Controllers/Users/UsersController.cs b/src/Imprink.WebApi/Controllers/Users/UsersController.cs
index 6819114..42b43de 100644
--- a/src/Imprink.WebApi/Controllers/Users/UsersController.cs
+++ b/src/Imprink.WebApi/Controllers/Users/UsersController.cs
@@ -1,6 +1,6 @@
 using System.Security.Claims;
 using AutoMapper;
-using Imprink.Application.Domains.Users;
+using Imprink.Application.Users.Commands;
 using Imprink.Application.Users.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
diff --git a/src/Imprink.WebApi/Seeder.cs b/src/Imprink.WebApi/Seeder.cs
index 14f4016..fa66f6f 100644
--- a/src/Imprink.WebApi/Seeder.cs
+++ b/src/Imprink.WebApi/Seeder.cs
@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Product;
+using Imprink.Domain.Entities.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/Imprink.WebApi/Startup.cs b/src/Imprink.WebApi/Startup.cs
index eb5ead3..40b612b 100644
--- a/src/Imprink.WebApi/Startup.cs
+++ b/src/Imprink.WebApi/Startup.cs
@@ -1,11 +1,10 @@
 using System.Security.Claims;
 using FluentValidation;
 using Imprink.Application;
-using Imprink.Application.Domains.Products;
-using Imprink.Application.Mappings;
 using Imprink.Application.Products;
-using Imprink.Application.Services;
-using Imprink.Application.Validation.Models;
+using Imprink.Application.Products.Commands;
+using Imprink.Application.Users.Services;
+using Imprink.Application.Users.Validation;
 using Imprink.Domain.Repositories;
 using Imprink.Domain.Repositories.Orders;
 using Imprink.Domain.Repositories.Products;