From 70ba07bb644889f2429eb5309aeb5ef2fdf3e0bd Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Tue, 24 Jun 2025 23:58:38 -0300 Subject: [PATCH 01/42] fix: busca da pagina e ajuste de icones --- .../Repositories/UserPageRepository.cs | 2 +- src/BCards.Web/Views/UserPage/Display.cshtml | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/BCards.Web/Repositories/UserPageRepository.cs b/src/BCards.Web/Repositories/UserPageRepository.cs index 5954196..e03c7f3 100644 --- a/src/BCards.Web/Repositories/UserPageRepository.cs +++ b/src/BCards.Web/Repositories/UserPageRepository.cs @@ -31,7 +31,7 @@ public class UserPageRepository : IUserPageRepository public async Task GetBySlugAsync(string category, string slug) { - return await _pages.Find(x => x.Category == category.ToLower() && x.Slug == slug && x.IsActive).FirstOrDefaultAsync(); + return await _pages.Find(x => x.Category.ToLower() == category.ToLower() && x.Slug == slug && x.IsActive).FirstOrDefaultAsync(); } public async Task GetByUserIdAsync(string userId) diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index 7c4d296..eae3687 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -3,7 +3,7 @@ var seo = ViewBag.SeoSettings as BCards.Web.Models.SeoSettings; var category = ViewBag.Category as BCards.Web.Models.Category; var isPreview = ViewBag.IsPreview as bool? ?? false; - + ViewData["Title"] = seo?.Title ?? $"{Model.DisplayName} - {category?.Name}"; Layout = isPreview ? "_Layout" : "_UserPageLayout"; } @@ -11,9 +11,16 @@ @if (!isPreview) { @section Styles { - + + + } +} +else +{ + @section Styles { + } } @@ -59,7 +66,7 @@ onclick="recordClick('@Model.Id', @i)"> @if (!string.IsNullOrEmpty(link.Icon)) { - @link.Icon + }
@link.Title
From 27ae8b606ed7418fd6b0e0843aa99659c565643a Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Wed, 25 Jun 2025 19:30:19 -0300 Subject: [PATCH 02/42] =?UTF-8?q?feat:=20+login=20ms=20que=20permite=20con?= =?UTF-8?q?tas=20corporativas=20ou=20n=C3=A3o.=20+Links=20para=20produtos?= =?UTF-8?q?=20de=20afiliados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 3 +- src/BCards.Web/BCards.Web.csproj | 1 + src/BCards.Web/Controllers/AdminController.cs | 24 +- src/BCards.Web/Controllers/AuthController.cs | 18 + .../Controllers/ProductController.cs | 131 ++++++ .../Controllers/UserPageController.cs | 17 +- src/BCards.Web/Models/LinkItem.cs | 25 ++ src/BCards.Web/Models/OpenGraphCache.cs | 55 +++ src/BCards.Web/Models/PlanLimitations.cs | 16 + src/BCards.Web/Models/PlanType.cs | 29 ++ src/BCards.Web/Program.cs | 19 + src/BCards.Web/Services/IOpenGraphService.cs | 10 + src/BCards.Web/Services/IThemeService.cs | 1 + src/BCards.Web/Services/OpenGraphService.cs | 299 +++++++++++++ src/BCards.Web/Services/ThemeService.cs | 123 ++++++ src/BCards.Web/Utils/AllowedDomains.cs | 69 +++ .../ViewModels/ManagePageViewModel.cs | 16 + src/BCards.Web/Views/Admin/ManagePage.cshtml | 416 +++++++++++++++--- .../Views/Shared/_ThemeStyles.cshtml | 135 +++++- src/BCards.Web/Views/UserPage/Display.cshtml | 95 ++-- 20 files changed, 1404 insertions(+), 98 deletions(-) create mode 100644 src/BCards.Web/Controllers/ProductController.cs create mode 100644 src/BCards.Web/Models/OpenGraphCache.cs create mode 100644 src/BCards.Web/Services/IOpenGraphService.cs create mode 100644 src/BCards.Web/Services/OpenGraphService.cs create mode 100644 src/BCards.Web/Utils/AllowedDomains.cs diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 48b5eab..3dd86bd 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -15,7 +15,8 @@ "Bash(rg:*)", "Bash(pkill:*)", "Bash(sudo rm:*)", - "Bash(rm:*)" + "Bash(rm:*)", + "Bash(curl:*)" ] }, "enableAllProjectMcpServers": false diff --git a/src/BCards.Web/BCards.Web.csproj b/src/BCards.Web/BCards.Web.csproj index f5427fc..65fd4a4 100644 --- a/src/BCards.Web/BCards.Web.csproj +++ b/src/BCards.Web/BCards.Web.csproj @@ -17,6 +17,7 @@ + diff --git a/src/BCards.Web/Controllers/AdminController.cs b/src/BCards.Web/Controllers/AdminController.cs index 77f547a..5c82e6c 100644 --- a/src/BCards.Web/Controllers/AdminController.cs +++ b/src/BCards.Web/Controllers/AdminController.cs @@ -493,7 +493,13 @@ public class AdminController : Controller Description = l.Description, Icon = l.Icon, Order = l.Order, - IsActive = l.IsActive + IsActive = l.IsActive, + Type = l.Type, + ProductTitle = l.ProductTitle, + ProductImage = l.ProductImage, + ProductPrice = l.ProductPrice, + ProductDescription = l.ProductDescription, + ProductDataCachedAt = l.ProductDataCachedAt }).ToList() ?? new List(), AvailableCategories = categories, AvailableThemes = themes.Where(t => !t.IsPremium || userPlanType.AllowsCustomThemes()).ToList(), @@ -529,7 +535,13 @@ public class AdminController : Controller Description = l.Description, Icon = l.Icon, IsActive = l.IsActive, - Order = index + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle, + ProductImage = l.ProductImage, + ProductPrice = l.ProductPrice, + ProductDescription = l.ProductDescription, + ProductDataCachedAt = l.ProductDataCachedAt })); } @@ -612,7 +624,13 @@ public class AdminController : Controller Description = l.Description, Icon = l.Icon, IsActive = l.IsActive, - Order = index + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle, + ProductImage = l.ProductImage, + ProductPrice = l.ProductPrice, + ProductDescription = l.ProductDescription, + ProductDataCachedAt = l.ProductDataCachedAt })); } diff --git a/src/BCards.Web/Controllers/AuthController.cs b/src/BCards.Web/Controllers/AuthController.cs index 7c4a359..7a48beb 100644 --- a/src/BCards.Web/Controllers/AuthController.cs +++ b/src/BCards.Web/Controllers/AuthController.cs @@ -110,8 +110,26 @@ public class AuthController : Controller [Authorize] public async Task Logout() { + // Identifica qual provedor foi usado + var authResult = await HttpContext.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme); + var loginProvider = authResult.Principal?.FindFirst("LoginProvider")?.Value; + + // Faz logout local primeiro await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); + TempData["Success"] = "Logout realizado com sucesso"; + + // Se foi Microsoft, faz logout completo no provedor + if (loginProvider == "Microsoft") + { + return SignOut(MicrosoftAccountDefaults.AuthenticationScheme); + } + // Se foi Google, faz logout completo no provedor + else if (loginProvider == "Google") + { + return SignOut(GoogleDefaults.AuthenticationScheme); + } + return RedirectToAction("Index", "Home"); } diff --git a/src/BCards.Web/Controllers/ProductController.cs b/src/BCards.Web/Controllers/ProductController.cs new file mode 100644 index 0000000..830c9c5 --- /dev/null +++ b/src/BCards.Web/Controllers/ProductController.cs @@ -0,0 +1,131 @@ +using BCards.Web.Models; +using BCards.Web.Services; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System.Security.Claims; + +namespace BCards.Web.Controllers; + +[Authorize] +[ApiController] +[Route("api/[controller]")] +public class ProductController : ControllerBase +{ + private readonly IOpenGraphService _openGraphService; + private readonly ILogger _logger; + + public ProductController( + IOpenGraphService openGraphService, + ILogger logger) + { + _openGraphService = openGraphService; + _logger = logger; + } + + [HttpPost("extract")] + public async Task ExtractProduct([FromBody] ExtractProductRequest request) + { + try + { + if (string.IsNullOrWhiteSpace(request.Url)) + { + return BadRequest(new { success = false, message = "URL é obrigatória." }); + } + + if (!Uri.TryCreate(request.Url, UriKind.Absolute, out var uri)) + { + return BadRequest(new { success = false, message = "URL inválida." }); + } + + var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + if (string.IsNullOrEmpty(userId)) + { + return Unauthorized(new { success = false, message = "Usuário não autenticado." }); + } + + // Verificar rate limiting antes de tentar extrair + var isRateLimited = await _openGraphService.IsRateLimitedAsync(userId); + if (isRateLimited) + { + return this.TooManyRequests(new { + success = false, + message = "Aguarde 1 minuto antes de extrair dados de outro produto." + }); + } + + var ogData = await _openGraphService.ExtractDataAsync(request.Url, userId); + + if (!ogData.IsValid) + { + return BadRequest(new { + success = false, + message = string.IsNullOrEmpty(ogData.ErrorMessage) + ? "Não foi possível extrair dados desta página." + : ogData.ErrorMessage + }); + } + + return Ok(new { + success = true, + title = ogData.Title, + description = ogData.Description, + image = ogData.Image, + price = ogData.Price, + currency = ogData.Currency + }); + } + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Operação inválida na extração de produto para usuário {UserId}", + User.FindFirst(ClaimTypes.NameIdentifier)?.Value); + return BadRequest(new { success = false, message = ex.Message }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Erro interno na extração de produto para usuário {UserId}", + User.FindFirst(ClaimTypes.NameIdentifier)?.Value); + return StatusCode(500, new { + success = false, + message = "Erro interno do servidor. Tente novamente em alguns instantes." + }); + } + } + + [HttpGet("cache/{urlHash}")] + public Task GetCachedData(string urlHash) + { + try + { + // Por segurança, vamos reconstruir a URL a partir do hash (se necessário) + // Por agora, apenas retornamos erro se não encontrado + return Task.FromResult(NotFound(new { success = false, message = "Cache não encontrado." })); + } + catch (Exception ex) + { + _logger.LogError(ex, "Erro ao buscar cache para hash {UrlHash}", urlHash); + return Task.FromResult(StatusCode(500, new { success = false, message = "Erro interno do servidor." })); + } + } +} + +public class ExtractProductRequest +{ + public string Url { get; set; } = string.Empty; +} + +// Custom result for 429 Too Many Requests +public class TooManyRequestsResult : ObjectResult +{ + public TooManyRequestsResult(object value) : base(value) + { + StatusCode = 429; + } +} + +public static class ControllerBaseExtensions +{ + public static TooManyRequestsResult TooManyRequests(this ControllerBase controller, object value) + { + return new TooManyRequestsResult(value); + } +} \ No newline at end of file diff --git a/src/BCards.Web/Controllers/UserPageController.cs b/src/BCards.Web/Controllers/UserPageController.cs index 81cb418..0f17640 100644 --- a/src/BCards.Web/Controllers/UserPageController.cs +++ b/src/BCards.Web/Controllers/UserPageController.cs @@ -9,15 +9,18 @@ public class UserPageController : Controller private readonly IUserPageService _userPageService; private readonly ICategoryService _categoryService; private readonly ISeoService _seoService; + private readonly IThemeService _themeService; public UserPageController( IUserPageService userPageService, ICategoryService categoryService, - ISeoService seoService) + ISeoService seoService, + IThemeService themeService) { _userPageService = userPageService; _categoryService = categoryService; _seoService = seoService; + _themeService = themeService; } //[Route("{category}/{slug}")] @@ -32,6 +35,12 @@ public class UserPageController : Controller if (categoryObj == null) return NotFound(); + // Ensure theme is loaded - critical fix for theme display issue + if (userPage.Theme?.Id == null || string.IsNullOrEmpty(userPage.Theme.PrimaryColor)) + { + userPage.Theme = _themeService.GetDefaultTheme(); + } + // Generate SEO settings var seoSettings = _seoService.GenerateSeoSettings(userPage, categoryObj); @@ -65,6 +74,12 @@ public class UserPageController : Controller if (categoryObj == null) return NotFound(); + // Ensure theme is loaded for preview too + if (userPage.Theme?.Id == null || string.IsNullOrEmpty(userPage.Theme.PrimaryColor)) + { + userPage.Theme = _themeService.GetDefaultTheme(); + } + ViewBag.Category = categoryObj; ViewBag.IsPreview = true; diff --git a/src/BCards.Web/Models/LinkItem.cs b/src/BCards.Web/Models/LinkItem.cs index 5dd05ce..0ae91a8 100644 --- a/src/BCards.Web/Models/LinkItem.cs +++ b/src/BCards.Web/Models/LinkItem.cs @@ -2,6 +2,12 @@ using MongoDB.Bson.Serialization.Attributes; namespace BCards.Web.Models; +public enum LinkType +{ + Normal = 0, // Link comum + Product = 1 // Link de produto com preview +} + public class LinkItem { [BsonElement("title")] @@ -27,4 +33,23 @@ public class LinkItem [BsonElement("createdAt")] public DateTime CreatedAt { get; set; } = DateTime.UtcNow; + + // Campos para Link de Produto + [BsonElement("type")] + public LinkType Type { get; set; } = LinkType.Normal; + + [BsonElement("productTitle")] + public string ProductTitle { get; set; } = string.Empty; + + [BsonElement("productImage")] + public string ProductImage { get; set; } = string.Empty; + + [BsonElement("productPrice")] + public string ProductPrice { get; set; } = string.Empty; + + [BsonElement("productDescription")] + public string ProductDescription { get; set; } = string.Empty; + + [BsonElement("productDataCachedAt")] + public DateTime? ProductDataCachedAt { get; set; } } \ No newline at end of file diff --git a/src/BCards.Web/Models/OpenGraphCache.cs b/src/BCards.Web/Models/OpenGraphCache.cs new file mode 100644 index 0000000..3931cab --- /dev/null +++ b/src/BCards.Web/Models/OpenGraphCache.cs @@ -0,0 +1,55 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace BCards.Web.Models; + +public class OpenGraphCache +{ + [BsonId] + [BsonRepresentation(BsonType.ObjectId)] + public string Id { get; set; } = string.Empty; + + [BsonElement("url")] + public string Url { get; set; } = string.Empty; + + [BsonElement("urlHash")] + public string UrlHash { get; set; } = string.Empty; + + [BsonElement("title")] + public string Title { get; set; } = string.Empty; + + [BsonElement("description")] + public string Description { get; set; } = string.Empty; + + [BsonElement("image")] + public string Image { get; set; } = string.Empty; + + [BsonElement("price")] + public string Price { get; set; } = string.Empty; + + [BsonElement("currency")] + public string Currency { get; set; } = "BRL"; + + [BsonElement("isValid")] + public bool IsValid { get; set; } + + [BsonElement("errorMessage")] + public string ErrorMessage { get; set; } = string.Empty; + + [BsonElement("cachedAt")] + public DateTime CachedAt { get; set; } = DateTime.UtcNow; + + [BsonElement("expiresAt")] + public DateTime ExpiresAt { get; set; } = DateTime.UtcNow.AddHours(24); +} + +public class OpenGraphData +{ + public string Title { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public string Image { get; set; } = string.Empty; + public string Price { get; set; } = string.Empty; + public string Currency { get; set; } = "BRL"; + public bool IsValid { get; set; } + public string ErrorMessage { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/src/BCards.Web/Models/PlanLimitations.cs b/src/BCards.Web/Models/PlanLimitations.cs index f2d0585..bdf5d78 100644 --- a/src/BCards.Web/Models/PlanLimitations.cs +++ b/src/BCards.Web/Models/PlanLimitations.cs @@ -24,4 +24,20 @@ public class PlanLimitations [BsonElement("planType")] public string PlanType { get; set; } = "free"; + + // Novos campos para Links de Produto + [BsonElement("maxProductLinks")] + public int MaxProductLinks { get; set; } = 0; + + [BsonElement("maxOGExtractionsPerDay")] + public int MaxOGExtractionsPerDay { get; set; } = 0; + + [BsonElement("allowProductLinks")] + public bool AllowProductLinks { get; set; } = false; + + [BsonElement("ogExtractionsUsedToday")] + public int OGExtractionsUsedToday { get; set; } = 0; + + [BsonElement("lastExtractionDate")] + public DateTime? LastExtractionDate { get; set; } } \ No newline at end of file diff --git a/src/BCards.Web/Models/PlanType.cs b/src/BCards.Web/Models/PlanType.cs index e6db8e9..03b2438 100644 --- a/src/BCards.Web/Models/PlanType.cs +++ b/src/BCards.Web/Models/PlanType.cs @@ -91,4 +91,33 @@ public static class PlanTypeExtensions { return planType == PlanType.Trial ? 7 : 0; } + + public static int GetMaxProductLinks(this PlanType planType) + { + return planType switch + { + PlanType.Trial => 1, // 1 link de produto para trial + PlanType.Basic => 3, // 3 links de produto + PlanType.Professional => 8, // DECOY - mais caro para poucos benefícios + PlanType.Premium => int.MaxValue, // Ilimitado + _ => 0 + }; + } + + public static int GetMaxOGExtractionsPerDay(this PlanType planType) + { + return planType switch + { + PlanType.Trial => 2, // 2 extrações por dia no trial + PlanType.Basic => 5, // 5 extrações por dia + PlanType.Professional => 15, // 15 extrações por dia + PlanType.Premium => int.MaxValue, // Ilimitado + _ => 0 + }; + } + + public static bool AllowsProductLinks(this PlanType planType) + { + return GetMaxProductLinks(planType) > 0; + } } \ No newline at end of file diff --git a/src/BCards.Web/Program.cs b/src/BCards.Web/Program.cs index 5c55c74..da90e8d 100644 --- a/src/BCards.Web/Program.cs +++ b/src/BCards.Web/Program.cs @@ -8,6 +8,8 @@ using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.Options; using MongoDB.Driver; using System.Globalization; +using Stripe; +using Microsoft.AspNetCore.Authentication.OAuth; var builder = WebApplication.CreateBuilder(args); @@ -69,6 +71,19 @@ builder.Services.AddAuthentication(options => var msAuth = builder.Configuration.GetSection("Authentication:Microsoft"); options.ClientId = msAuth["ClientId"] ?? ""; options.ClientSecret = msAuth["ClientSecret"] ?? ""; + + // Força seleção de conta a cada login + options.AuthorizationEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize"; + options.TokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token"; + + options.Events = new OAuthEvents + { + OnRedirectToAuthorizationEndpoint = context => + { + context.Response.Redirect(context.RedirectUri + "&prompt=select_account"); + return Task.CompletedTask; + } + }; }); // Localization @@ -99,6 +114,10 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); + +// Add HttpClient for OpenGraphService +builder.Services.AddHttpClient(); // Background Services builder.Services.AddHostedService(); diff --git a/src/BCards.Web/Services/IOpenGraphService.cs b/src/BCards.Web/Services/IOpenGraphService.cs new file mode 100644 index 0000000..8a05748 --- /dev/null +++ b/src/BCards.Web/Services/IOpenGraphService.cs @@ -0,0 +1,10 @@ +using BCards.Web.Models; + +namespace BCards.Web.Services; + +public interface IOpenGraphService +{ + Task ExtractDataAsync(string url, string userId); + Task IsRateLimitedAsync(string userId); + Task GetCachedDataAsync(string url); +} \ No newline at end of file diff --git a/src/BCards.Web/Services/IThemeService.cs b/src/BCards.Web/Services/IThemeService.cs index bed15e8..e07f08d 100644 --- a/src/BCards.Web/Services/IThemeService.cs +++ b/src/BCards.Web/Services/IThemeService.cs @@ -8,6 +8,7 @@ public interface IThemeService Task GetThemeByIdAsync(string themeId); Task GetThemeByNameAsync(string themeName); Task GenerateCustomCssAsync(PageTheme theme); + Task GenerateThemeCSSAsync(PageTheme theme, UserPage page); Task InitializeDefaultThemesAsync(); PageTheme GetDefaultTheme(); } \ No newline at end of file diff --git a/src/BCards.Web/Services/OpenGraphService.cs b/src/BCards.Web/Services/OpenGraphService.cs new file mode 100644 index 0000000..9451ec3 --- /dev/null +++ b/src/BCards.Web/Services/OpenGraphService.cs @@ -0,0 +1,299 @@ +using BCards.Web.Models; +using BCards.Web.Utils; +using Microsoft.Extensions.Caching.Memory; +using MongoDB.Driver; +using HtmlAgilityPack; +using System.Text.RegularExpressions; +using System.Security.Cryptography; +using System.Text; + +namespace BCards.Web.Services; + +public class OpenGraphService : IOpenGraphService +{ + private readonly IMemoryCache _cache; + private readonly ILogger _logger; + private readonly HttpClient _httpClient; + private readonly IMongoCollection _ogCache; + + public OpenGraphService( + IMemoryCache cache, + ILogger logger, + HttpClient httpClient, + IMongoDatabase database) + { + _cache = cache; + _logger = logger; + _httpClient = httpClient; + _ogCache = database.GetCollection("openGraphCache"); + + // Configure HttpClient + _httpClient.DefaultRequestHeaders.Clear(); + //_httpClient.DefaultRequestHeaders.Add("User-Agent", + // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"); + _httpClient.DefaultRequestHeaders.Add("User-Agent", + "facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)"); + _httpClient.Timeout = TimeSpan.FromSeconds(10); + } + + public async Task ExtractDataAsync(string url, string userId) + { + // 1. Validar domínio + if (!AllowedDomains.IsAllowed(url)) + { + _logger.LogWarning("Tentativa de extração de domínio não permitido: {Url} pelo usuário {UserId}", url, userId); + throw new InvalidOperationException("Domínio não permitido. Use apenas e-commerces conhecidos e seguros."); + } + + // 2. Verificar rate limit (1 request por minuto por usuário) + var rateLimitKey = $"og_rate_{userId}"; + if (_cache.TryGetValue(rateLimitKey, out _)) + { + _logger.LogWarning("Rate limit excedido para usuário {UserId}", userId); + throw new InvalidOperationException("Aguarde 1 minuto antes de extrair dados de outro produto."); + } + + // 3. Verificar cache no MongoDB + var urlHash = GenerateUrlHash(url); + var cachedData = await GetCachedDataAsync(url); + + if (cachedData != null && cachedData.ExpiresAt > DateTime.UtcNow) + { + _logger.LogInformation("Retornando dados do cache MongoDB para URL: {Url}", url); + return new OpenGraphData + { + Title = cachedData.Title, + Description = cachedData.Description, + Image = cachedData.Image, + Price = cachedData.Price, + Currency = cachedData.Currency, + IsValid = cachedData.IsValid, + ErrorMessage = cachedData.ErrorMessage + }; + } + + // 4. Extrair dados da URL + var extractedData = await ExtractFromUrlAsync(url); + + // 5. Salvar no cache MongoDB + await SaveToCacheAsync(url, urlHash, extractedData); + + // 6. Aplicar rate limit (1 minuto) + _cache.Set(rateLimitKey, true, TimeSpan.FromMinutes(1)); + + _logger.LogInformation("Dados extraídos com sucesso para URL: {Url}", url); + return extractedData; + } + + public Task IsRateLimitedAsync(string userId) + { + var rateLimitKey = $"og_rate_{userId}"; + return Task.FromResult(_cache.TryGetValue(rateLimitKey, out _)); + } + + public async Task GetCachedDataAsync(string url) + { + var urlHash = GenerateUrlHash(url); + return await _ogCache + .Find(x => x.UrlHash == urlHash && x.ExpiresAt > DateTime.UtcNow) + .FirstOrDefaultAsync(); + } + + private async Task ExtractFromUrlAsync(string url) + { + try + { + _logger.LogInformation("Iniciando extração de dados para URL: {Url}", url); + + var response = await _httpClient.GetAsync(url); + response.EnsureSuccessStatusCode(); + + var html = await response.Content.ReadAsStringAsync(); + var doc = new HtmlDocument(); + doc.LoadHtml(html); + + var title = GetMetaContent(doc, "og:title", "title") ?? GetTitleFromHTML(doc); + var description = GetMetaContent(doc, "og:description", "description"); + var image = GetMetaContent(doc, "og:image"); + var price = GetMetaContent(doc, "og:price:amount") ?? ExtractPriceFromHTML(html, doc); + var currency = GetMetaContent(doc, "og:price:currency") ?? "BRL"; + + // Limpar e validar dados + title = CleanText(title); + description = CleanText(description); + price = CleanPrice(price); + image = ValidateImageUrl(image, url); + + var isValid = !string.IsNullOrEmpty(title); + + return new OpenGraphData + { + Title = title, + Description = description, + Image = image, + Price = price, + Currency = currency, + IsValid = isValid + }; + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Falha ao extrair dados de {Url}", url); + return new OpenGraphData + { + IsValid = false, + ErrorMessage = $"Erro ao processar a página: {ex.Message}" + }; + } + } + + private string? GetMetaContent(HtmlDocument doc, params string[] properties) + { + foreach (var property in properties) + { + var meta = doc.DocumentNode + .SelectSingleNode($"//meta[@property='{property}' or @name='{property}' or @itemprop='{property}']"); + + var content = meta?.GetAttributeValue("content", null); + if (!string.IsNullOrWhiteSpace(content)) + return content; + } + return null; + } + + private string? GetTitleFromHTML(HtmlDocument doc) + { + var titleNode = doc.DocumentNode.SelectSingleNode("//title"); + return titleNode?.InnerText?.Trim(); + } + + private string? ExtractPriceFromHTML(string html, HtmlDocument doc) + { + // Regex patterns para encontrar preços em diferentes formatos + var pricePatterns = new[] + { + @"R\$\s*[\d\.,]+", + @"BRL\s*[\d\.,]+", + @"[\$]\s*[\d\.,]+", + @"price[^>]*>([^<]*[\d\.,]+[^<]*)<", + @"valor[^>]*>([^<]*[\d\.,]+[^<]*)<", + @"preço[^>]*>([^<]*[\d\.,]+[^<]*)<" + }; + + foreach (var pattern in pricePatterns) + { + var match = Regex.Match(html, pattern, RegexOptions.IgnoreCase); + if (match.Success) + { + return match.Value; + } + } + + // Tentar encontrar por seletores específicos + var priceSelectors = new[] + { + ".price", ".valor", ".preco", "[data-price]", ".price-current", + ".price-value", ".product-price", ".sale-price" + }; + + foreach (var selector in priceSelectors) + { + var priceNode = doc.DocumentNode.SelectSingleNode($"//*[contains(@class, '{selector.Replace(".", "")}')]"); + if (priceNode != null) + { + var priceText = priceNode.InnerText?.Trim(); + if (Regex.IsMatch(priceText ?? "", @"[\d\.,]+")) + { + return priceText; + } + } + } + + return null; + } + + private string CleanText(string? text) + { + if (string.IsNullOrWhiteSpace(text)) + return string.Empty; + + return Regex.Replace(text.Trim(), @"\s+", " "); + } + + private string CleanPrice(string? price) + { + if (string.IsNullOrWhiteSpace(price)) + return string.Empty; + + // Limpar e formatar preço + var cleanPrice = Regex.Replace(price, @"[^\d\.,R\$]", " ").Trim(); + return Regex.Replace(cleanPrice, @"\s+", " "); + } + + private string ValidateImageUrl(string? imageUrl, string baseUrl) + { + if (string.IsNullOrWhiteSpace(imageUrl)) + return string.Empty; + + try + { + // Se for URL relativa, converter para absoluta + if (imageUrl.StartsWith("/")) + { + var baseUri = new Uri(baseUrl); + return $"{baseUri.Scheme}://{baseUri.Host}{imageUrl}"; + } + + // Validar se é uma URL válida + if (Uri.TryCreate(imageUrl, UriKind.Absolute, out var uri)) + { + return uri.ToString(); + } + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Erro ao validar URL da imagem: {ImageUrl}", imageUrl); + } + + return string.Empty; + } + + private string GenerateUrlHash(string url) + { + using var sha256 = SHA256.Create(); + var hashBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(url.ToLowerInvariant())); + return Convert.ToBase64String(hashBytes); + } + + private async Task SaveToCacheAsync(string url, string urlHash, OpenGraphData data) + { + try + { + var cacheItem = new OpenGraphCache + { + Url = url, + UrlHash = urlHash, + Title = data.Title, + Description = data.Description, + Image = data.Image, + Price = data.Price, + Currency = data.Currency, + IsValid = data.IsValid, + ErrorMessage = data.ErrorMessage, + CachedAt = DateTime.UtcNow, + ExpiresAt = data.IsValid ? DateTime.UtcNow.AddHours(24) : DateTime.UtcNow.AddHours(1) + }; + + // Upsert no MongoDB + await _ogCache.ReplaceOneAsync( + x => x.UrlHash == urlHash, + cacheItem, + new ReplaceOptions { IsUpsert = true } + ); + } + catch (Exception ex) + { + _logger.LogError(ex, "Erro ao salvar cache para URL: {Url}", url); + } + } +} \ No newline at end of file diff --git a/src/BCards.Web/Services/ThemeService.cs b/src/BCards.Web/Services/ThemeService.cs index fd11302..e889504 100644 --- a/src/BCards.Web/Services/ThemeService.cs +++ b/src/BCards.Web/Services/ThemeService.cs @@ -1,5 +1,6 @@ using BCards.Web.Models; using MongoDB.Driver; +using System.Text; namespace BCards.Web.Services; @@ -133,6 +134,128 @@ public class ThemeService : IThemeService return Task.FromResult(css); } + public async Task GenerateThemeCSSAsync(PageTheme theme, UserPage page) + { + var css = new StringBuilder(); + + // CSS base com variáveis do tema + css.AppendLine($":root {{"); + css.AppendLine($" --primary-color: {theme.PrimaryColor};"); + css.AppendLine($" --secondary-color: {theme.SecondaryColor};"); + css.AppendLine($" --background-color: {theme.BackgroundColor};"); + css.AppendLine($" --text-color: {theme.TextColor};"); + css.AppendLine($"}}"); + + // CSS específico por tema + switch (theme.Name?.ToLower()) + { + case "minimalista": + css.AppendLine(GetMinimalistCSS()); + break; + case "corporativo": + css.AppendLine(GetCorporateCSS()); + break; + case "dark mode": + css.AppendLine(GetDarkCSS()); + break; + case "natureza": + css.AppendLine(GetNatureCSS()); + break; + case "vibrante": + css.AppendLine(GetVibrantCSS()); + break; + default: + css.AppendLine(await GenerateCustomCssAsync(theme)); + break; + } + + return css.ToString(); + } + + private string GetMinimalistCSS() => @" + .profile-card { + background: white; + box-shadow: 0 2px 10px rgba(0,0,0,0.1); + border-radius: 12px; + } + .link-button { + background: var(--primary-color); + border-radius: 8px; + } + "; + + private string GetCorporateCSS() => @" + .user-page { + background: linear-gradient(135deg, #f8fafc 0%, #e2e8f0 100%); + } + .profile-card { + background: white; + box-shadow: 0 4px 20px rgba(0,0,0,0.1); + border: 1px solid #e2e8f0; + } + .link-button { + background: var(--primary-color); + border-radius: 6px; + font-weight: 600; + } + "; + + private string GetDarkCSS() => @" + .user-page { + background: linear-gradient(135deg, #1a1a1a 0%, #2d2d2d 100%); + } + .profile-card { + background: rgba(255,255,255,0.1); + backdrop-filter: blur(15px); + border: 1px solid rgba(255,255,255,0.2); + color: #f9fafb; + } + .link-button { + background: var(--primary-color); + box-shadow: 0 4px 15px rgba(0,0,0,0.3); + } + .profile-name, .profile-bio { + color: #f9fafb; + } + "; + + private string GetNatureCSS() => @" + .user-page { + background: linear-gradient(135deg, #f0fdf4 0%, #dcfce7 100%); + background-image: url('data:image/svg+xml,'); + } + .profile-card { + background: rgba(255,255,255,0.9); + backdrop-filter: blur(10px); + border: 1px solid rgba(34, 197, 94, 0.2); + } + .link-button { + background: linear-gradient(135deg, var(--primary-color), var(--secondary-color)); + border-radius: 25px; + } + "; + + private string GetVibrantCSS() => @" + .user-page { + background: linear-gradient(135deg, #fef2f2 0%, #fee2e2 50%, #fecaca 100%); + } + .profile-card { + background: rgba(255,255,255,0.95); + box-shadow: 0 8px 32px rgba(220, 38, 38, 0.2); + border: 2px solid rgba(220, 38, 38, 0.1); + } + .link-button { + background: linear-gradient(135deg, var(--primary-color), var(--secondary-color)); + border-radius: 30px; + transform: perspective(1000px) rotateX(0deg); + transition: all 0.3s ease; + } + .link-button:hover { + transform: perspective(1000px) rotateX(-5deg) translateY(-5px); + box-shadow: 0 15px 30px rgba(220, 38, 38, 0.3); + } + "; + public async Task InitializeDefaultThemesAsync() { var existingThemes = await _themes.Find(x => x.IsActive).ToListAsync(); diff --git a/src/BCards.Web/Utils/AllowedDomains.cs b/src/BCards.Web/Utils/AllowedDomains.cs new file mode 100644 index 0000000..17cec15 --- /dev/null +++ b/src/BCards.Web/Utils/AllowedDomains.cs @@ -0,0 +1,69 @@ +namespace BCards.Web.Utils; + +public static class AllowedDomains +{ + public static readonly HashSet EcommerceWhitelist = new(StringComparer.OrdinalIgnoreCase) + { + // Principais E-commerces Brasileiros + "mercadolivre.com.br", "mercadolibre.com", + "amazon.com.br", "amazon.com", + "magazineluiza.com.br", "magalu.com.br", + "americanas.com", "submarino.com.br", + "extra.com.br", "pontofrio.com.br", + "casasbahia.com.br", "casas.com.br", + "shopee.com.br", "shopee.com", "s.shopee.com.br", + "aliexpress.com", "aliexpress.us", + "netshoes.com.br", "centauro.com.br", + "dafiti.com.br", "kanui.com.br", + "fastshop.com.br", "kabum.com.br", + "pichau.com.br", "terabyteshop.com.br", + + // Marketplaces Internacionais Seguros + "ebay.com", "etsy.com", "walmart.com", + "target.com", "bestbuy.com", + + // E-commerces de Moda + "zara.com", "hm.com", "gap.com", + "uniqlo.com", "forever21.com", + + // Livrarias e Educação + "saraiva.com.br", "livrariacultura.com.br", + "estantevirtual.com.br", + + // Casa e Decoração + "mobly.com.br", "tok-stok.com.br", + "westwing.com.br", "madeiramadeira.com.br" + }; + + public static bool IsAllowed(string url) + { + try + { + var uri = new Uri(url); + var domain = uri.Host.ToLowerInvariant(); + + // Remove "www." se existir + if (domain.StartsWith("www.")) + domain = domain.Substring(4); + + return EcommerceWhitelist.Contains(domain); + } + catch + { + return false; + } + } + + public static string GetDomainFromUrl(string url) + { + try + { + var uri = new Uri(url); + return uri.Host.ToLowerInvariant().Replace("www.", ""); + } + catch + { + return string.Empty; + } + } +} \ No newline at end of file diff --git a/src/BCards.Web/ViewModels/ManagePageViewModel.cs b/src/BCards.Web/ViewModels/ManagePageViewModel.cs index 5710c3e..f3e460c 100644 --- a/src/BCards.Web/ViewModels/ManagePageViewModel.cs +++ b/src/BCards.Web/ViewModels/ManagePageViewModel.cs @@ -63,6 +63,22 @@ public class ManageLinkViewModel public string Icon { get; set; } = string.Empty; public int Order { get; set; } = 0; public bool IsActive { get; set; } = true; + + // Campos para Links de Produto + public LinkType Type { get; set; } = LinkType.Normal; + + [StringLength(100, ErrorMessage = "Título do produto deve ter no máximo 100 caracteres")] + public string ProductTitle { get; set; } = string.Empty; + + public string ProductImage { get; set; } = string.Empty; + + [StringLength(50, ErrorMessage = "Preço deve ter no máximo 50 caracteres")] + public string ProductPrice { get; set; } = string.Empty; + + [StringLength(200, ErrorMessage = "Descrição do produto deve ter no máximo 200 caracteres")] + public string ProductDescription { get; set; } = string.Empty; + + public DateTime? ProductDataCachedAt { get; set; } } public class DashboardViewModel diff --git a/src/BCards.Web/Views/Admin/ManagePage.cshtml b/src/BCards.Web/Views/Admin/ManagePage.cshtml index 690f6f3..f2f1140 100644 --- a/src/BCards.Web/Views/Admin/ManagePage.cshtml +++ b/src/BCards.Web/Views/Admin/ManagePage.cshtml @@ -355,41 +355,126 @@
+
- - -
Nome que aparecerá no botão
+ +
+
+ + +
+
+ + +
+
- -
- - -
Link completo incluindo https://
+ + + - -
- - -
Texto adicional que aparece abaixo do título
-
- -
- - + + +
@@ -501,6 +586,32 @@ transform: translateY(-1px); box-shadow: 0 4px 8px rgba(0,0,0,0.15); } + +/* Product Link Preview Styles */ +.product-link-preview { + background: rgba(25, 135, 84, 0.05); + border-color: rgba(25, 135, 84, 0.2); +} + +.product-link-preview .card { + box-shadow: none; + background: white; +} + +.product-link-preview .card-body { + padding: 1rem; +} + +.product-link-preview .card-title { + font-size: 1rem; + font-weight: 600; + margin-bottom: 0.5rem; +} + +.product-link-preview img { + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 4px; +} @section Scripts { @@ -534,40 +645,44 @@ } }); - // Save link from modal - $(document).on('click', '#saveLinkBtn', function() { - console.log('Save button clicked'); + // Toggle between link types + $('input[name="linkType"]').on('change', function() { + const linkType = $(this).val(); + if (linkType === 'Product') { + $('#normalLinkSection').hide(); + $('#productLinkSection').show(); + } else { + $('#normalLinkSection').show(); + $('#productLinkSection').hide(); + } + }); + + // Extract product data + $('#extractProductBtn').on('click', function() { + const url = $('#productUrl').val().trim(); - const title = $('#linkTitle').val().trim(); - const url = $('#linkUrl').val().trim(); - const description = $('#linkDescription').val().trim(); - const icon = $('#linkIcon').val(); - - console.log('Values:', { title, url, description, icon }); - - if (!title || !url) { - alert('Por favor, preencha pelo menos o título e a URL do link.'); + if (!url) { + alert('Por favor, insira a URL do produto.'); return; } - // Basic URL validation if (!url.startsWith('http://') && !url.startsWith('https://')) { alert('Por favor, insira uma URL válida que comece com http:// ou https://'); return; } - addLinkInput(title, url, description, icon); + extractProductData(url); + }); + + // Save link from modal + $(document).on('click', '#saveLinkBtn', function() { + const linkType = $('input[name="linkType"]:checked').val(); - // Clear modal form - $('#addLinkForm')[0].reset(); - - // Close modal using Bootstrap 5 syntax - var modal = bootstrap.Modal.getInstance(document.getElementById('addLinkModal')); - if (modal) { - modal.hide(); + if (linkType === 'Product') { + saveProductLink(); + } else { + saveNormalLink(); } - - markStepComplete(3); }); // Remove link functionality @@ -663,7 +778,7 @@ } } - function addLinkInput(title = '', url = '', description = '', icon = '') { + function addLinkInput(title = '', url = '', description = '', icon = '', linkType = 'Normal') { const iconHtml = icon ? `` : ''; const linkHtml = ` @@ -696,6 +811,7 @@
+ @@ -712,5 +828,193 @@ $(this).attr('data-link', index); }); } + + function saveNormalLink() { + const title = $('#linkTitle').val().trim(); + const url = $('#linkUrl').val().trim(); + const description = $('#linkDescription').val().trim(); + const icon = $('#linkIcon').val(); + + if (!title || !url) { + alert('Por favor, preencha pelo menos o título e a URL do link.'); + return; + } + + if (!url.startsWith('http://') && !url.startsWith('https://')) { + alert('Por favor, insira uma URL válida que comece com http:// ou https://'); + return; + } + + addLinkInput(title, url, description, icon, 'Normal'); + closeModalAndReset(); + } + + function saveProductLink() { + const url = $('#productUrl').val().trim(); + const title = $('#productTitle').val().trim(); + const description = $('#productDescription').val().trim(); + const price = $('#productPrice').val().trim(); + const image = $('#productImage').val(); + + if (!url) { + alert('Por favor, insira a URL do produto.'); + return; + } + + if (!title) { + alert('Por favor, preencha o título do produto.'); + return; + } + + if (!url.startsWith('http://') && !url.startsWith('https://')) { + alert('Por favor, insira uma URL válida que comece com http:// ou https://'); + return; + } + + addProductLinkInput(title, url, description, price, image); + closeModalAndReset(); + } + + function extractProductData(url) { + $('#extractProductBtn').prop('disabled', true); + $('#extractLoading').show(); + + $.ajax({ + url: '/api/Product/extract', + type: 'POST', + contentType: 'application/json', + data: JSON.stringify({ url: url }), + success: function(response) { + if (response.success) { + $('#productTitle').val(response.title || ''); + $('#productDescription').val(response.description || ''); + $('#productPrice').val(response.price || ''); + + if (response.image) { + $('#productImage').val(response.image); + $('#productImagePreview').attr('src', response.image).show(); + $('#productImagePlaceholder').hide(); + } + + showToast('Dados extraídos com sucesso!', 'success'); + } else { + alert('Erro: ' + (response.message || 'Não foi possível extrair os dados do produto.')); + } + }, + error: function(xhr) { + let errorMessage = 'Erro ao extrair dados do produto.'; + + if (xhr.responseJSON && xhr.responseJSON.message) { + errorMessage = xhr.responseJSON.message; + } else if (xhr.status === 429) { + errorMessage = 'Aguarde 1 minuto antes de extrair dados de outro produto.'; + } else if (xhr.status === 401) { + errorMessage = 'Você precisa estar logado para usar esta funcionalidade.'; + } + + alert(errorMessage); + }, + complete: function() { + $('#extractProductBtn').prop('disabled', false); + $('#extractLoading').hide(); + } + }); + } + + function addProductLinkInput(title, url, description, price, image) { + const linkHtml = ` +
+
+
+ Link de Produto ${linkCount + 1} +
+ +
+
+
+
+
+ ${image ? `
Sem imagem';">` : '
Sem imagem'} +
+
+
+
+
${title}
+ ${price ? `

${price}

` : ''} + ${description ? `

${description}

` : ''} + + + ${url.length > 50 ? url.substring(0, 50) + '...' : url} + +
+
+
+
+ + + + + + + + + + + + + + +
+ `; + + $('#linksContainer').append(linkHtml); + linkCount++; + markStepComplete(3); + } + + function closeModalAndReset() { + // Clear modal form + $('#addLinkForm')[0].reset(); + $('#productImagePreview').hide(); + $('#productImagePlaceholder').show(); + $('#productImage').val(''); + $('#normalLinkSection').show(); + $('#productLinkSection').hide(); + $('#linkTypeNormal').prop('checked', true); + + // Close modal + var modal = bootstrap.Modal.getInstance(document.getElementById('addLinkModal')); + if (modal) { + modal.hide(); + } + } + + function showToast(message, type = 'info') { + // Simple toast notification + const toastHtml = ` + + `; + + if (!$('#toastContainer').length) { + $('body').append('
'); + } + + const $toast = $(toastHtml); + $('#toastContainer').append($toast); + + const toast = new bootstrap.Toast($toast[0]); + toast.show(); + + setTimeout(() => { + $toast.remove(); + }, 5000); + } } \ No newline at end of file diff --git a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml index 383b4a9..86ec234 100644 --- a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml +++ b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml @@ -2,11 +2,15 @@ @{ var theme = Model ?? new BCards.Web.Models.PageTheme { + Name = "Padrão", PrimaryColor = "#2563eb", SecondaryColor = "#1d4ed8", BackgroundColor = "#ffffff", TextColor = "#1f2937" }; + + // Debug - vamos ver o que está chegando + // Console.WriteLine($"Theme recebido: {Model?.Name ?? "NULL"} - Primary: {Model?.PrimaryColor ?? "NULL"}"); } :root { @@ -78,23 +82,25 @@ background-color: var(--primary-color); color: white !important; border: none; - padding: 1rem 2rem; - border-radius: 50px; + padding: 0.75rem 1.5rem; + border-radius: 12px; text-decoration: none; display: block; - margin-bottom: 1rem; + margin-bottom: 0.75rem; text-align: center; font-weight: 500; transition: all 0.3s ease; - box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); position: relative; overflow: hidden; + max-width: 100%; + font-size: 0.95rem; } .link-button:hover { background-color: var(--secondary-color); - transform: translateY(-2px); - box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15); + transform: translateY(-1px); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); color: white !important; text-decoration: none; } @@ -156,16 +162,17 @@ } .link-button { - padding: 0.875rem 1.5rem; - font-size: 0.95rem; + padding: 0.65rem 1.25rem; + font-size: 0.9rem; + margin-bottom: 0.6rem; } .link-title { - font-size: 1rem; + font-size: 0.95rem; } .link-description { - font-size: 0.85rem; + font-size: 0.8rem; } } @@ -186,7 +193,9 @@ } .link-button { - padding: 0.75rem 1.25rem; + padding: 0.6rem 1rem; + font-size: 0.85rem; + margin-bottom: 0.5rem; } } @@ -212,4 +221,108 @@ .link-button:hover::before { left: 100%; +} + +/* Product Link Card Styles */ +.product-link-card { + transition: transform 0.2s ease, box-shadow 0.2s ease; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 15px; + overflow: hidden; + background: rgba(255, 255, 255, 0.95); + backdrop-filter: blur(10px); +} + +.product-link-card:hover { + transform: translateY(-3px); + box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15); + border-color: var(--primary-color); +} + +.product-image { + height: 120px; + width: 100%; + object-fit: cover; + border-radius: 15px 0 0 15px; +} + +.product-title { + color: var(--primary-color); + font-weight: 600; + margin-bottom: 0.5rem; + line-height: 1.3; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +.product-description { + font-size: 0.85rem; + line-height: 1.4; + margin-bottom: 0.5rem; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +.product-price { + font-size: 1.1rem; + font-weight: 700; + color: #28a745 !important; +} + +.product-link .card-body { + padding: 1rem; +} + +/* Responsive adjustments for product cards */ +@@media (max-width: 768px) { + .product-image { + height: 100px; + border-radius: 15px 15px 0 0; + } + + .product-link-card .row { + flex-direction: column; + } + + .product-link-card .col-md-4, + .product-link-card .col-md-8 { + flex: none; + width: 100%; + max-width: 100%; + } + + .product-title { + font-size: 1rem; + } + + .product-description { + font-size: 0.8rem; + } + + .product-price { + font-size: 1rem; + } +} + +@@media (max-width: 480px) { + .product-image { + height: 80px; + } + + .product-link .card-body { + padding: 0.75rem; + } + + .product-title { + font-size: 0.9rem; + } + + .product-description { + font-size: 0.75rem; + -webkit-line-clamp: 1; + } } \ No newline at end of file diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index eae3687..47f633f 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -8,20 +8,11 @@ Layout = isPreview ? "_Layout" : "_UserPageLayout"; } -@if (!isPreview) -{ - @section Styles { +@section Styles { - } -} -else -{ - @section Styles { - - } }
@@ -58,24 +49,76 @@ else var link = Model.Links[i]; if (link.IsActive) { - - @if (!string.IsNullOrEmpty(link.Icon)) - { - - } - - +
+
@link.Title
+ @if (!string.IsNullOrEmpty(link.Description)) + { +
@link.Description
+ } +
+ + } } } } From 6bba003cb6a0045892703ee21bf96edaa40ceb4f Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Wed, 25 Jun 2025 21:27:59 -0300 Subject: [PATCH 03/42] =?UTF-8?q?fix:=20Ajuste=20para=20grava=C3=A7=C3=A3o?= =?UTF-8?q?=20de=20IDs=20de=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BCards.Web/Controllers/AdminController.cs | 272 +++-- .../ViewModels/ManagePageViewModel.cs | 158 ++- src/BCards.Web/Views/Admin/ManagePage.cshtml | 931 +++++++++++------- 3 files changed, 904 insertions(+), 457 deletions(-) diff --git a/src/BCards.Web/Controllers/AdminController.cs b/src/BCards.Web/Controllers/AdminController.cs index 5c82e6c..e64c444 100644 --- a/src/BCards.Web/Controllers/AdminController.cs +++ b/src/BCards.Web/Controllers/AdminController.cs @@ -138,6 +138,29 @@ public class AdminController : Controller _logger.LogInformation($"ManagePage POST: IsNewPage={model.IsNewPage}, DisplayName={model.DisplayName}, Category={model.Category}, Links={model.Links?.Count ?? 0}"); + // Filtrar links vazios ANTES da validação + if (model.Links != null) + { + model.Links = model.Links.Where(l => !l.IsEmpty).ToList(); + + // Reordenar os links restantes + for (int i = 0; i < model.Links.Count; i++) + { + model.Links[i].Order = i; + } + } + + foreach (var link in model.Links) + { + if (string.IsNullOrEmpty(link.Id)) + { + link.Id = Guid.NewGuid().ToString(); + } + } + + // Limpar ModelState de campos que foram removidos + RemoveEmptyLinkValidations(); + if (!ModelState.IsValid) { _logger.LogWarning("ModelState is invalid:"); @@ -145,7 +168,7 @@ public class AdminController : Controller { _logger.LogWarning($"Key: {error.Key}, Errors: {string.Join(", ", error.Value.Errors.Select(e => e.ErrorMessage))}"); } - + // Repopulate dropdowns model.AvailableCategories = await _categoryService.GetAllCategoriesAsync(); model.AvailableThemes = await _themeService.GetAvailableThemesAsync(); @@ -169,25 +192,15 @@ public class AdminController : Controller return View(model); } - // Check if user can create the requested number of links - var activeLinksCount = model.Links?.Count ?? 0; - if (activeLinksCount > model.MaxLinksAllowed) - { - ModelState.AddModelError("", $"Você excedeu o limite de {model.MaxLinksAllowed} links do seu plano atual."); - model.AvailableCategories = await _categoryService.GetAllCategoriesAsync(); - model.AvailableThemes = await _themeService.GetAvailableThemesAsync(); - return View(model); - } - try { // Create new page var userPage = await MapToUserPage(model, user.Id); _logger.LogInformation($"Mapped to UserPage: {userPage.DisplayName}, Category: {userPage.Category}, Slug: {userPage.Slug}"); - + await _userPageService.CreatePageAsync(userPage); _logger.LogInformation("Page created successfully!"); - + TempData["Success"] = "Página criada com sucesso!"; } catch (Exception ex) @@ -214,6 +227,27 @@ public class AdminController : Controller return RedirectToAction("Dashboard"); } + private void RemoveEmptyLinkValidations() + { + var keysToRemove = ModelState.Keys + .Where(key => key.StartsWith("Links[") && ( + key.Contains(".Title") || + key.Contains(".Url") || + key.Contains(".Description") || + key.Contains(".ProductTitle") || + key.Contains(".ProductDescription") || + key.Contains(".ProductPrice") || + key.Contains(".ProductImage") + )) + .ToList(); + + foreach (var key in keysToRemove) + { + ModelState.Remove(key); + } + } + + [HttpPost] [Route("CreatePage")] public async Task CreatePage(CreatePageViewModel model) @@ -475,6 +509,39 @@ public class AdminController : Controller private ManagePageViewModel MapToManageViewModel(UserPage page, List categories, List themes, PlanType userPlanType) { + // Separar links de redes sociais dos links normais + var socialMediaLinks = page.Links?.Where(l => + l.Icon.Contains("whatsapp") || + l.Icon.Contains("facebook") || + l.Icon.Contains("twitter") || + l.Icon.Contains("instagram") + ).ToList() ?? new List(); + + var regularLinks = page.Links?.Where(l => + !l.Icon.Contains("whatsapp") && + !l.Icon.Contains("facebook") && + !l.Icon.Contains("twitter") && + !l.Icon.Contains("instagram") + ).ToList() ?? new List(); + + // Extrair URLs das redes sociais + var whatsappLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("whatsapp")); + var facebookLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("facebook")); + var twitterLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("twitter")); + var instagramLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("instagram")); + + // Extrair número do WhatsApp da URL + string whatsappNumber = ""; + if (whatsappLink != null && whatsappLink.Url.Contains("wa.me/")) + { + var numberPart = whatsappLink.Url.Split("wa.me/").LastOrDefault(); + if (!string.IsNullOrEmpty(numberPart)) + { + // Formatar número para exibição (adicionar espaços, parênteses, etc.) + whatsappNumber = FormatWhatsAppNumber(numberPart); + } + } + return new ManagePageViewModel { Id = page.Id, @@ -485,9 +552,17 @@ public class AdminController : Controller Bio = page.Bio, Slug = page.Slug, SelectedTheme = page.Theme?.Name ?? "minimalist", - Links = page.Links?.Select((l, index) => new ManageLinkViewModel + + // Redes sociais + WhatsAppNumber = whatsappNumber, + FacebookUrl = facebookLink?.Url ?? "", + TwitterUrl = twitterLink?.Url ?? "", + InstagramUrl = instagramLink?.Url ?? "", + + // Links regulares + Links = regularLinks.Select((l, index) => new ManageLinkViewModel { - Id = $"link_{index}", + Id = page.Id + "_" + index, // ID único para identificação Title = l.Title, Url = l.Url, Description = l.Description, @@ -500,7 +575,8 @@ public class AdminController : Controller ProductPrice = l.ProductPrice, ProductDescription = l.ProductDescription, ProductDataCachedAt = l.ProductDataCachedAt - }).ToList() ?? new List(), + }).ToList(), + AvailableCategories = categories, AvailableThemes = themes.Where(t => !t.IsPremium || userPlanType.AllowsCustomThemes()).ToList(), MaxLinksAllowed = userPlanType.GetMaxLinksPerPage() @@ -510,7 +586,7 @@ public class AdminController : Controller private async Task MapToUserPage(ManagePageViewModel model, string userId) { var theme = await _themeService.GetThemeByNameAsync(model.SelectedTheme) ?? _themeService.GetDefaultTheme(); - + var userPage = new UserPage { UserId = userId, @@ -524,44 +600,47 @@ public class AdminController : Controller Links = new List() }; - // Add regular links + // Add regular links (apenas links não vazios) if (model.Links?.Any() == true) { - userPage.Links.AddRange(model.Links.Where(l => !string.IsNullOrEmpty(l.Title) && !string.IsNullOrEmpty(l.Url)) - .Select((l, index) => new LinkItem - { - Title = l.Title, - Url = l.Url.ToLower(), - Description = l.Description, - Icon = l.Icon, - IsActive = l.IsActive, - Order = index, - Type = l.Type, - ProductTitle = l.ProductTitle, - ProductImage = l.ProductImage, - ProductPrice = l.ProductPrice, - ProductDescription = l.ProductDescription, - ProductDataCachedAt = l.ProductDataCachedAt - })); + var validLinks = model.Links.Where(l => !l.IsEmpty).ToList(); + + userPage.Links.AddRange(validLinks.Select((l, index) => new LinkItem + { + Title = l.Title, + Url = l.Url, + Description = l.Description ?? string.Empty, + Icon = l.Icon ?? string.Empty, + IsActive = l.IsActive, + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle ?? string.Empty, + ProductImage = l.ProductImage ?? string.Empty, + ProductPrice = l.ProductPrice ?? string.Empty, + ProductDescription = l.ProductDescription ?? string.Empty, + ProductDataCachedAt = l.ProductDataCachedAt + })); } - // Add social media links + // Add social media links apenas se preenchidos var socialLinks = new List(); var currentOrder = userPage.Links.Count; - if (!string.IsNullOrEmpty(model.WhatsAppNumber)) + if (!string.IsNullOrWhiteSpace(model.WhatsAppNumber)) { + var cleanNumber = model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); socialLinks.Add(new LinkItem { Title = "WhatsApp", - Url = $"https://wa.me/{model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", "")}", + Url = $"https://wa.me/{cleanNumber}", Icon = "fab fa-whatsapp", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal }); } - if (!string.IsNullOrEmpty(model.FacebookUrl)) + if (!string.IsNullOrWhiteSpace(model.FacebookUrl)) { socialLinks.Add(new LinkItem { @@ -569,11 +648,12 @@ public class AdminController : Controller Url = model.FacebookUrl, Icon = "fab fa-facebook", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal }); } - if (!string.IsNullOrEmpty(model.TwitterUrl)) + if (!string.IsNullOrWhiteSpace(model.TwitterUrl)) { socialLinks.Add(new LinkItem { @@ -581,11 +661,12 @@ public class AdminController : Controller Url = model.TwitterUrl, Icon = "fab fa-x-twitter", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal }); } - if (!string.IsNullOrEmpty(model.InstagramUrl)) + if (!string.IsNullOrWhiteSpace(model.InstagramUrl)) { socialLinks.Add(new LinkItem { @@ -593,7 +674,8 @@ public class AdminController : Controller Url = model.InstagramUrl, Icon = "fab fa-instagram", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal }); } @@ -610,47 +692,52 @@ public class AdminController : Controller page.Slug = model.Slug; page.UpdatedAt = DateTime.UtcNow; - // Update links - page.Links = new List(); - - // Add regular links + // Limpar todos os links existentes + page.Links.Clear(); + + // Adicionar apenas links válidos (não vazios) if (model.Links?.Any() == true) { - page.Links.AddRange(model.Links.Where(l => !string.IsNullOrEmpty(l.Title) && !string.IsNullOrEmpty(l.Url)) - .Select((l, index) => new LinkItem - { - Title = l.Title, - Url = l.Url, - Description = l.Description, - Icon = l.Icon, - IsActive = l.IsActive, - Order = index, - Type = l.Type, - ProductTitle = l.ProductTitle, - ProductImage = l.ProductImage, - ProductPrice = l.ProductPrice, - ProductDescription = l.ProductDescription, - ProductDataCachedAt = l.ProductDataCachedAt - })); + var validLinks = model.Links.Where(l => !l.IsEmpty).ToList(); + + page.Links.AddRange(validLinks.Select((l, index) => new LinkItem + { + Title = l.Title, + Url = l.Url, + Description = l.Description ?? string.Empty, + Icon = l.Icon ?? string.Empty, + IsActive = l.IsActive, + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle ?? string.Empty, + ProductImage = l.ProductImage ?? string.Empty, + ProductPrice = l.ProductPrice ?? string.Empty, + ProductDescription = l.ProductDescription ?? string.Empty, + ProductDataCachedAt = l.ProductDataCachedAt, + CreatedAt = DateTime.UtcNow // Para novos links ou manter o existente se for uma atualização + })); } - // Add social media links (same logic as create) + // Adicionar links de redes sociais apenas se preenchidos var socialLinks = new List(); var currentOrder = page.Links.Count; - if (!string.IsNullOrEmpty(model.WhatsAppNumber)) + if (!string.IsNullOrWhiteSpace(model.WhatsAppNumber)) { + var cleanNumber = model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); socialLinks.Add(new LinkItem { Title = "WhatsApp", - Url = $"https://wa.me/{model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", "")}", + Url = $"https://wa.me/{cleanNumber}", Icon = "fab fa-whatsapp", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal, + CreatedAt = DateTime.UtcNow }); } - if (!string.IsNullOrEmpty(model.FacebookUrl)) + if (!string.IsNullOrWhiteSpace(model.FacebookUrl)) { socialLinks.Add(new LinkItem { @@ -658,11 +745,13 @@ public class AdminController : Controller Url = model.FacebookUrl, Icon = "fab fa-facebook", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal, + CreatedAt = DateTime.UtcNow }); } - if (!string.IsNullOrEmpty(model.TwitterUrl)) + if (!string.IsNullOrWhiteSpace(model.TwitterUrl)) { socialLinks.Add(new LinkItem { @@ -670,11 +759,13 @@ public class AdminController : Controller Url = model.TwitterUrl, Icon = "fab fa-x-twitter", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal, + CreatedAt = DateTime.UtcNow }); } - if (!string.IsNullOrEmpty(model.InstagramUrl)) + if (!string.IsNullOrWhiteSpace(model.InstagramUrl)) { socialLinks.Add(new LinkItem { @@ -682,10 +773,41 @@ public class AdminController : Controller Url = model.InstagramUrl, Icon = "fab fa-instagram", IsActive = true, - Order = currentOrder++ + Order = currentOrder++, + Type = LinkType.Normal, + CreatedAt = DateTime.UtcNow }); } page.Links.AddRange(socialLinks); } -} \ No newline at end of file + + // Método helper para formatar número do WhatsApp + private string FormatWhatsAppNumber(string cleanNumber) + { + // Remove caracteres não numéricos + cleanNumber = new string(cleanNumber.Where(char.IsDigit).ToArray()); + + if (cleanNumber.Length >= 10) + { + // Formato brasileiro: +55 11 99999-9999 + if (cleanNumber.StartsWith("55") && cleanNumber.Length >= 12) + { + var countryCode = cleanNumber.Substring(0, 2); + var areaCode = cleanNumber.Substring(2, 2); + var firstPart = cleanNumber.Substring(4, cleanNumber.Length - 8); + var lastPart = cleanNumber.Substring(cleanNumber.Length - 4); + + return $"+{countryCode} {areaCode} {firstPart}-{lastPart}"; + } + else + { + // Formato genérico + return "+" + cleanNumber; + } + } + + return cleanNumber; + } +} + diff --git a/src/BCards.Web/ViewModels/ManagePageViewModel.cs b/src/BCards.Web/ViewModels/ManagePageViewModel.cs index f3e460c..c59479f 100644 --- a/src/BCards.Web/ViewModels/ManagePageViewModel.cs +++ b/src/BCards.Web/ViewModels/ManagePageViewModel.cs @@ -3,7 +3,7 @@ using BCards.Web.Models; namespace BCards.Web.ViewModels; -public class ManagePageViewModel +public class ManagePageViewModel : IValidatableObject { public string Id { get; set; } = string.Empty; public bool IsNewPage { get; set; } = true; @@ -26,61 +26,165 @@ public class ManagePageViewModel [Required(ErrorMessage = "Tema é obrigatório")] public string SelectedTheme { get; set; } = "minimalist"; + // Redes sociais sem [Required] - serão validadas no método Validate public string WhatsAppNumber { get; set; } = string.Empty; - public string FacebookUrl { get; set; } = string.Empty; - public string TwitterUrl { get; set; } = string.Empty; - public string InstagramUrl { get; set; } = string.Empty; public List Links { get; set; } = new(); - + // Data for dropdowns and selections public List AvailableCategories { get; set; } = new(); public List AvailableThemes { get; set; } = new(); - + // Plan limitations public int MaxLinksAllowed { get; set; } = 3; public bool CanUseTheme(string themeName) => AvailableThemes.Any(t => t.Name.ToLower() == themeName.ToLower()); + + public IEnumerable Validate(ValidationContext validationContext) + { + var results = new List(); + + // Validar URLs de redes sociais apenas se preenchidas + if (!string.IsNullOrWhiteSpace(FacebookUrl) && !Uri.TryCreate(FacebookUrl, UriKind.Absolute, out _)) + { + results.Add(new ValidationResult("URL do Facebook inválida", new[] { nameof(FacebookUrl) })); + } + + if (!string.IsNullOrWhiteSpace(TwitterUrl) && !Uri.TryCreate(TwitterUrl, UriKind.Absolute, out _)) + { + results.Add(new ValidationResult("URL do Twitter inválida", new[] { nameof(TwitterUrl) })); + } + + if (!string.IsNullOrWhiteSpace(InstagramUrl) && !Uri.TryCreate(InstagramUrl, UriKind.Absolute, out _)) + { + results.Add(new ValidationResult("URL do Instagram inválida", new[] { nameof(InstagramUrl) })); + } + + // Validar número do WhatsApp apenas se preenchido + if (!string.IsNullOrWhiteSpace(WhatsAppNumber)) + { + var cleanNumber = WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); + if (cleanNumber.Length < 10 || !cleanNumber.All(char.IsDigit)) + { + results.Add(new ValidationResult("Número do WhatsApp inválido", new[] { nameof(WhatsAppNumber) })); + } + } + + // Validar links ativos + var activeLinks = Links?.Where(l => !l.IsEmpty).ToList() ?? new List(); + if (activeLinks.Count > MaxLinksAllowed) + { + results.Add(new ValidationResult($"Você pode ter no máximo {MaxLinksAllowed} links ativos", new[] { nameof(Links) })); + } + + return results; + } } - -public class ManageLinkViewModel +public class ManageLinkViewModel : IValidatableObject { - public string Id { get; set; } = "new"; - - [Required(ErrorMessage = "Título é obrigatório")] - [StringLength(50, ErrorMessage = "Título deve ter no máximo 50 caracteres")] + public string Id { get; set; } = Guid.NewGuid().ToString(); public string Title { get; set; } = string.Empty; - - [Required(ErrorMessage = "URL é obrigatória")] - [Url(ErrorMessage = "URL inválida")] public string Url { get; set; } = string.Empty; - - [StringLength(100, ErrorMessage = "Descrição deve ter no máximo 100 caracteres")] public string Description { get; set; } = string.Empty; - public string Icon { get; set; } = string.Empty; public int Order { get; set; } = 0; public bool IsActive { get; set; } = true; // Campos para Links de Produto public LinkType Type { get; set; } = LinkType.Normal; - - [StringLength(100, ErrorMessage = "Título do produto deve ter no máximo 100 caracteres")] public string ProductTitle { get; set; } = string.Empty; - public string ProductImage { get; set; } = string.Empty; - - [StringLength(50, ErrorMessage = "Preço deve ter no máximo 50 caracteres")] public string ProductPrice { get; set; } = string.Empty; - - [StringLength(200, ErrorMessage = "Descrição do produto deve ter no máximo 200 caracteres")] public string ProductDescription { get; set; } = string.Empty; - public DateTime? ProductDataCachedAt { get; set; } -} + // Validação customizada + public IEnumerable Validate(ValidationContext validationContext) + { + var results = new List(); + + // Se tem título OU URL, então ambos são obrigatórios + bool hasTitle = !string.IsNullOrWhiteSpace(Title); + bool hasUrl = !string.IsNullOrWhiteSpace(Url); + + if (hasTitle || hasUrl) + { + if (!hasTitle) + { + results.Add(new ValidationResult( + "Título é obrigatório quando URL é preenchida", + new[] { nameof(Title) })); + } + + if (!hasUrl) + { + results.Add(new ValidationResult( + "URL é obrigatória quando título é preenchido", + new[] { nameof(Url) })); + } + else if (!Uri.TryCreate(Url, UriKind.Absolute, out _)) + { + results.Add(new ValidationResult( + "URL inválida", + new[] { nameof(Url) })); + } + + // Validações específicas para links de produto + if (Type == LinkType.Product && hasTitle && hasUrl) + { + if (string.IsNullOrWhiteSpace(ProductTitle)) + { + results.Add(new ValidationResult( + "Título do produto é obrigatório para links de produto", + new[] { nameof(ProductTitle) })); + } + } + + // Validações de tamanho apenas se os campos estão preenchidos + if (hasTitle && Title.Length > 50) + { + results.Add(new ValidationResult( + "Título deve ter no máximo 50 caracteres", + new[] { nameof(Title) })); + } + + if (!string.IsNullOrWhiteSpace(Description) && Description.Length > 100) + { + results.Add(new ValidationResult( + "Descrição deve ter no máximo 100 caracteres", + new[] { nameof(Description) })); + } + + if (!string.IsNullOrWhiteSpace(ProductTitle) && ProductTitle.Length > 100) + { + results.Add(new ValidationResult( + "Título do produto deve ter no máximo 100 caracteres", + new[] { nameof(ProductTitle) })); + } + + if (!string.IsNullOrWhiteSpace(ProductPrice) && ProductPrice.Length > 50) + { + results.Add(new ValidationResult( + "Preço deve ter no máximo 50 caracteres", + new[] { nameof(ProductPrice) })); + } + + if (!string.IsNullOrWhiteSpace(ProductDescription) && ProductDescription.Length > 200) + { + results.Add(new ValidationResult( + "Descrição do produto deve ter no máximo 200 caracteres", + new[] { nameof(ProductDescription) })); + } + } + + return results; + } + + // Propriedade helper para verificar se o link está vazio + public bool IsEmpty => string.IsNullOrWhiteSpace(Title) && string.IsNullOrWhiteSpace(Url); +} public class DashboardViewModel { public User CurrentUser { get; set; } = new(); diff --git a/src/BCards.Web/Views/Admin/ManagePage.cshtml b/src/BCards.Web/Views/Admin/ManagePage.cshtml index f2f1140..9b0fa9a 100644 --- a/src/BCards.Web/Views/Admin/ManagePage.cshtml +++ b/src/BCards.Web/Views/Admin/ManagePage.cshtml @@ -618,403 +618,624 @@ @{await Html.RenderPartialAsync("_ValidationScriptsPartial");} } \ No newline at end of file From 2b3d9f308d34297bbd4c769a7845e50314aeea58 Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Thu, 26 Jun 2025 00:25:04 -0300 Subject: [PATCH 04/42] fix: paginas de links funcionando --- src/BCards.Web/Controllers/AdminController.cs | 272 ++--- .../ViewModels/ManagePageViewModel.cs | 158 +-- src/BCards.Web/Views/Admin/ManagePage.cshtml | 951 +++++++----------- 3 files changed, 467 insertions(+), 914 deletions(-) diff --git a/src/BCards.Web/Controllers/AdminController.cs b/src/BCards.Web/Controllers/AdminController.cs index e64c444..5c82e6c 100644 --- a/src/BCards.Web/Controllers/AdminController.cs +++ b/src/BCards.Web/Controllers/AdminController.cs @@ -138,29 +138,6 @@ public class AdminController : Controller _logger.LogInformation($"ManagePage POST: IsNewPage={model.IsNewPage}, DisplayName={model.DisplayName}, Category={model.Category}, Links={model.Links?.Count ?? 0}"); - // Filtrar links vazios ANTES da validação - if (model.Links != null) - { - model.Links = model.Links.Where(l => !l.IsEmpty).ToList(); - - // Reordenar os links restantes - for (int i = 0; i < model.Links.Count; i++) - { - model.Links[i].Order = i; - } - } - - foreach (var link in model.Links) - { - if (string.IsNullOrEmpty(link.Id)) - { - link.Id = Guid.NewGuid().ToString(); - } - } - - // Limpar ModelState de campos que foram removidos - RemoveEmptyLinkValidations(); - if (!ModelState.IsValid) { _logger.LogWarning("ModelState is invalid:"); @@ -168,7 +145,7 @@ public class AdminController : Controller { _logger.LogWarning($"Key: {error.Key}, Errors: {string.Join(", ", error.Value.Errors.Select(e => e.ErrorMessage))}"); } - + // Repopulate dropdowns model.AvailableCategories = await _categoryService.GetAllCategoriesAsync(); model.AvailableThemes = await _themeService.GetAvailableThemesAsync(); @@ -192,15 +169,25 @@ public class AdminController : Controller return View(model); } + // Check if user can create the requested number of links + var activeLinksCount = model.Links?.Count ?? 0; + if (activeLinksCount > model.MaxLinksAllowed) + { + ModelState.AddModelError("", $"Você excedeu o limite de {model.MaxLinksAllowed} links do seu plano atual."); + model.AvailableCategories = await _categoryService.GetAllCategoriesAsync(); + model.AvailableThemes = await _themeService.GetAvailableThemesAsync(); + return View(model); + } + try { // Create new page var userPage = await MapToUserPage(model, user.Id); _logger.LogInformation($"Mapped to UserPage: {userPage.DisplayName}, Category: {userPage.Category}, Slug: {userPage.Slug}"); - + await _userPageService.CreatePageAsync(userPage); _logger.LogInformation("Page created successfully!"); - + TempData["Success"] = "Página criada com sucesso!"; } catch (Exception ex) @@ -227,27 +214,6 @@ public class AdminController : Controller return RedirectToAction("Dashboard"); } - private void RemoveEmptyLinkValidations() - { - var keysToRemove = ModelState.Keys - .Where(key => key.StartsWith("Links[") && ( - key.Contains(".Title") || - key.Contains(".Url") || - key.Contains(".Description") || - key.Contains(".ProductTitle") || - key.Contains(".ProductDescription") || - key.Contains(".ProductPrice") || - key.Contains(".ProductImage") - )) - .ToList(); - - foreach (var key in keysToRemove) - { - ModelState.Remove(key); - } - } - - [HttpPost] [Route("CreatePage")] public async Task CreatePage(CreatePageViewModel model) @@ -509,39 +475,6 @@ public class AdminController : Controller private ManagePageViewModel MapToManageViewModel(UserPage page, List categories, List themes, PlanType userPlanType) { - // Separar links de redes sociais dos links normais - var socialMediaLinks = page.Links?.Where(l => - l.Icon.Contains("whatsapp") || - l.Icon.Contains("facebook") || - l.Icon.Contains("twitter") || - l.Icon.Contains("instagram") - ).ToList() ?? new List(); - - var regularLinks = page.Links?.Where(l => - !l.Icon.Contains("whatsapp") && - !l.Icon.Contains("facebook") && - !l.Icon.Contains("twitter") && - !l.Icon.Contains("instagram") - ).ToList() ?? new List(); - - // Extrair URLs das redes sociais - var whatsappLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("whatsapp")); - var facebookLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("facebook")); - var twitterLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("twitter")); - var instagramLink = socialMediaLinks.FirstOrDefault(l => l.Icon.Contains("instagram")); - - // Extrair número do WhatsApp da URL - string whatsappNumber = ""; - if (whatsappLink != null && whatsappLink.Url.Contains("wa.me/")) - { - var numberPart = whatsappLink.Url.Split("wa.me/").LastOrDefault(); - if (!string.IsNullOrEmpty(numberPart)) - { - // Formatar número para exibição (adicionar espaços, parênteses, etc.) - whatsappNumber = FormatWhatsAppNumber(numberPart); - } - } - return new ManagePageViewModel { Id = page.Id, @@ -552,17 +485,9 @@ public class AdminController : Controller Bio = page.Bio, Slug = page.Slug, SelectedTheme = page.Theme?.Name ?? "minimalist", - - // Redes sociais - WhatsAppNumber = whatsappNumber, - FacebookUrl = facebookLink?.Url ?? "", - TwitterUrl = twitterLink?.Url ?? "", - InstagramUrl = instagramLink?.Url ?? "", - - // Links regulares - Links = regularLinks.Select((l, index) => new ManageLinkViewModel + Links = page.Links?.Select((l, index) => new ManageLinkViewModel { - Id = page.Id + "_" + index, // ID único para identificação + Id = $"link_{index}", Title = l.Title, Url = l.Url, Description = l.Description, @@ -575,8 +500,7 @@ public class AdminController : Controller ProductPrice = l.ProductPrice, ProductDescription = l.ProductDescription, ProductDataCachedAt = l.ProductDataCachedAt - }).ToList(), - + }).ToList() ?? new List(), AvailableCategories = categories, AvailableThemes = themes.Where(t => !t.IsPremium || userPlanType.AllowsCustomThemes()).ToList(), MaxLinksAllowed = userPlanType.GetMaxLinksPerPage() @@ -586,7 +510,7 @@ public class AdminController : Controller private async Task MapToUserPage(ManagePageViewModel model, string userId) { var theme = await _themeService.GetThemeByNameAsync(model.SelectedTheme) ?? _themeService.GetDefaultTheme(); - + var userPage = new UserPage { UserId = userId, @@ -600,47 +524,44 @@ public class AdminController : Controller Links = new List() }; - // Add regular links (apenas links não vazios) + // Add regular links if (model.Links?.Any() == true) { - var validLinks = model.Links.Where(l => !l.IsEmpty).ToList(); - - userPage.Links.AddRange(validLinks.Select((l, index) => new LinkItem - { - Title = l.Title, - Url = l.Url, - Description = l.Description ?? string.Empty, - Icon = l.Icon ?? string.Empty, - IsActive = l.IsActive, - Order = index, - Type = l.Type, - ProductTitle = l.ProductTitle ?? string.Empty, - ProductImage = l.ProductImage ?? string.Empty, - ProductPrice = l.ProductPrice ?? string.Empty, - ProductDescription = l.ProductDescription ?? string.Empty, - ProductDataCachedAt = l.ProductDataCachedAt - })); + userPage.Links.AddRange(model.Links.Where(l => !string.IsNullOrEmpty(l.Title) && !string.IsNullOrEmpty(l.Url)) + .Select((l, index) => new LinkItem + { + Title = l.Title, + Url = l.Url.ToLower(), + Description = l.Description, + Icon = l.Icon, + IsActive = l.IsActive, + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle, + ProductImage = l.ProductImage, + ProductPrice = l.ProductPrice, + ProductDescription = l.ProductDescription, + ProductDataCachedAt = l.ProductDataCachedAt + })); } - // Add social media links apenas se preenchidos + // Add social media links var socialLinks = new List(); var currentOrder = userPage.Links.Count; - if (!string.IsNullOrWhiteSpace(model.WhatsAppNumber)) + if (!string.IsNullOrEmpty(model.WhatsAppNumber)) { - var cleanNumber = model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); socialLinks.Add(new LinkItem { Title = "WhatsApp", - Url = $"https://wa.me/{cleanNumber}", + Url = $"https://wa.me/{model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", "")}", Icon = "fab fa-whatsapp", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.FacebookUrl)) + if (!string.IsNullOrEmpty(model.FacebookUrl)) { socialLinks.Add(new LinkItem { @@ -648,12 +569,11 @@ public class AdminController : Controller Url = model.FacebookUrl, Icon = "fab fa-facebook", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.TwitterUrl)) + if (!string.IsNullOrEmpty(model.TwitterUrl)) { socialLinks.Add(new LinkItem { @@ -661,12 +581,11 @@ public class AdminController : Controller Url = model.TwitterUrl, Icon = "fab fa-x-twitter", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.InstagramUrl)) + if (!string.IsNullOrEmpty(model.InstagramUrl)) { socialLinks.Add(new LinkItem { @@ -674,8 +593,7 @@ public class AdminController : Controller Url = model.InstagramUrl, Icon = "fab fa-instagram", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal + Order = currentOrder++ }); } @@ -692,52 +610,47 @@ public class AdminController : Controller page.Slug = model.Slug; page.UpdatedAt = DateTime.UtcNow; - // Limpar todos os links existentes - page.Links.Clear(); - - // Adicionar apenas links válidos (não vazios) + // Update links + page.Links = new List(); + + // Add regular links if (model.Links?.Any() == true) { - var validLinks = model.Links.Where(l => !l.IsEmpty).ToList(); - - page.Links.AddRange(validLinks.Select((l, index) => new LinkItem - { - Title = l.Title, - Url = l.Url, - Description = l.Description ?? string.Empty, - Icon = l.Icon ?? string.Empty, - IsActive = l.IsActive, - Order = index, - Type = l.Type, - ProductTitle = l.ProductTitle ?? string.Empty, - ProductImage = l.ProductImage ?? string.Empty, - ProductPrice = l.ProductPrice ?? string.Empty, - ProductDescription = l.ProductDescription ?? string.Empty, - ProductDataCachedAt = l.ProductDataCachedAt, - CreatedAt = DateTime.UtcNow // Para novos links ou manter o existente se for uma atualização - })); + page.Links.AddRange(model.Links.Where(l => !string.IsNullOrEmpty(l.Title) && !string.IsNullOrEmpty(l.Url)) + .Select((l, index) => new LinkItem + { + Title = l.Title, + Url = l.Url, + Description = l.Description, + Icon = l.Icon, + IsActive = l.IsActive, + Order = index, + Type = l.Type, + ProductTitle = l.ProductTitle, + ProductImage = l.ProductImage, + ProductPrice = l.ProductPrice, + ProductDescription = l.ProductDescription, + ProductDataCachedAt = l.ProductDataCachedAt + })); } - // Adicionar links de redes sociais apenas se preenchidos + // Add social media links (same logic as create) var socialLinks = new List(); var currentOrder = page.Links.Count; - if (!string.IsNullOrWhiteSpace(model.WhatsAppNumber)) + if (!string.IsNullOrEmpty(model.WhatsAppNumber)) { - var cleanNumber = model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); socialLinks.Add(new LinkItem { Title = "WhatsApp", - Url = $"https://wa.me/{cleanNumber}", + Url = $"https://wa.me/{model.WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", "")}", Icon = "fab fa-whatsapp", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal, - CreatedAt = DateTime.UtcNow + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.FacebookUrl)) + if (!string.IsNullOrEmpty(model.FacebookUrl)) { socialLinks.Add(new LinkItem { @@ -745,13 +658,11 @@ public class AdminController : Controller Url = model.FacebookUrl, Icon = "fab fa-facebook", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal, - CreatedAt = DateTime.UtcNow + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.TwitterUrl)) + if (!string.IsNullOrEmpty(model.TwitterUrl)) { socialLinks.Add(new LinkItem { @@ -759,13 +670,11 @@ public class AdminController : Controller Url = model.TwitterUrl, Icon = "fab fa-x-twitter", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal, - CreatedAt = DateTime.UtcNow + Order = currentOrder++ }); } - if (!string.IsNullOrWhiteSpace(model.InstagramUrl)) + if (!string.IsNullOrEmpty(model.InstagramUrl)) { socialLinks.Add(new LinkItem { @@ -773,41 +682,10 @@ public class AdminController : Controller Url = model.InstagramUrl, Icon = "fab fa-instagram", IsActive = true, - Order = currentOrder++, - Type = LinkType.Normal, - CreatedAt = DateTime.UtcNow + Order = currentOrder++ }); } page.Links.AddRange(socialLinks); } - - // Método helper para formatar número do WhatsApp - private string FormatWhatsAppNumber(string cleanNumber) - { - // Remove caracteres não numéricos - cleanNumber = new string(cleanNumber.Where(char.IsDigit).ToArray()); - - if (cleanNumber.Length >= 10) - { - // Formato brasileiro: +55 11 99999-9999 - if (cleanNumber.StartsWith("55") && cleanNumber.Length >= 12) - { - var countryCode = cleanNumber.Substring(0, 2); - var areaCode = cleanNumber.Substring(2, 2); - var firstPart = cleanNumber.Substring(4, cleanNumber.Length - 8); - var lastPart = cleanNumber.Substring(cleanNumber.Length - 4); - - return $"+{countryCode} {areaCode} {firstPart}-{lastPart}"; - } - else - { - // Formato genérico - return "+" + cleanNumber; - } - } - - return cleanNumber; - } -} - +} \ No newline at end of file diff --git a/src/BCards.Web/ViewModels/ManagePageViewModel.cs b/src/BCards.Web/ViewModels/ManagePageViewModel.cs index c59479f..f3e460c 100644 --- a/src/BCards.Web/ViewModels/ManagePageViewModel.cs +++ b/src/BCards.Web/ViewModels/ManagePageViewModel.cs @@ -3,7 +3,7 @@ using BCards.Web.Models; namespace BCards.Web.ViewModels; -public class ManagePageViewModel : IValidatableObject +public class ManagePageViewModel { public string Id { get; set; } = string.Empty; public bool IsNewPage { get; set; } = true; @@ -26,165 +26,61 @@ public class ManagePageViewModel : IValidatableObject [Required(ErrorMessage = "Tema é obrigatório")] public string SelectedTheme { get; set; } = "minimalist"; - // Redes sociais sem [Required] - serão validadas no método Validate public string WhatsAppNumber { get; set; } = string.Empty; + public string FacebookUrl { get; set; } = string.Empty; + public string TwitterUrl { get; set; } = string.Empty; + public string InstagramUrl { get; set; } = string.Empty; public List Links { get; set; } = new(); - + // Data for dropdowns and selections public List AvailableCategories { get; set; } = new(); public List AvailableThemes { get; set; } = new(); - + // Plan limitations public int MaxLinksAllowed { get; set; } = 3; public bool CanUseTheme(string themeName) => AvailableThemes.Any(t => t.Name.ToLower() == themeName.ToLower()); - - public IEnumerable Validate(ValidationContext validationContext) - { - var results = new List(); - - // Validar URLs de redes sociais apenas se preenchidas - if (!string.IsNullOrWhiteSpace(FacebookUrl) && !Uri.TryCreate(FacebookUrl, UriKind.Absolute, out _)) - { - results.Add(new ValidationResult("URL do Facebook inválida", new[] { nameof(FacebookUrl) })); - } - - if (!string.IsNullOrWhiteSpace(TwitterUrl) && !Uri.TryCreate(TwitterUrl, UriKind.Absolute, out _)) - { - results.Add(new ValidationResult("URL do Twitter inválida", new[] { nameof(TwitterUrl) })); - } - - if (!string.IsNullOrWhiteSpace(InstagramUrl) && !Uri.TryCreate(InstagramUrl, UriKind.Absolute, out _)) - { - results.Add(new ValidationResult("URL do Instagram inválida", new[] { nameof(InstagramUrl) })); - } - - // Validar número do WhatsApp apenas se preenchido - if (!string.IsNullOrWhiteSpace(WhatsAppNumber)) - { - var cleanNumber = WhatsAppNumber.Replace("+", "").Replace(" ", "").Replace("-", "").Replace("(", "").Replace(")", ""); - if (cleanNumber.Length < 10 || !cleanNumber.All(char.IsDigit)) - { - results.Add(new ValidationResult("Número do WhatsApp inválido", new[] { nameof(WhatsAppNumber) })); - } - } - - // Validar links ativos - var activeLinks = Links?.Where(l => !l.IsEmpty).ToList() ?? new List(); - if (activeLinks.Count > MaxLinksAllowed) - { - results.Add(new ValidationResult($"Você pode ter no máximo {MaxLinksAllowed} links ativos", new[] { nameof(Links) })); - } - - return results; - } } -public class ManageLinkViewModel : IValidatableObject + +public class ManageLinkViewModel { - public string Id { get; set; } = Guid.NewGuid().ToString(); + public string Id { get; set; } = "new"; + + [Required(ErrorMessage = "Título é obrigatório")] + [StringLength(50, ErrorMessage = "Título deve ter no máximo 50 caracteres")] public string Title { get; set; } = string.Empty; + + [Required(ErrorMessage = "URL é obrigatória")] + [Url(ErrorMessage = "URL inválida")] public string Url { get; set; } = string.Empty; + + [StringLength(100, ErrorMessage = "Descrição deve ter no máximo 100 caracteres")] public string Description { get; set; } = string.Empty; + public string Icon { get; set; } = string.Empty; public int Order { get; set; } = 0; public bool IsActive { get; set; } = true; // Campos para Links de Produto public LinkType Type { get; set; } = LinkType.Normal; + + [StringLength(100, ErrorMessage = "Título do produto deve ter no máximo 100 caracteres")] public string ProductTitle { get; set; } = string.Empty; + public string ProductImage { get; set; } = string.Empty; + + [StringLength(50, ErrorMessage = "Preço deve ter no máximo 50 caracteres")] public string ProductPrice { get; set; } = string.Empty; + + [StringLength(200, ErrorMessage = "Descrição do produto deve ter no máximo 200 caracteres")] public string ProductDescription { get; set; } = string.Empty; + public DateTime? ProductDataCachedAt { get; set; } - - // Validação customizada - public IEnumerable Validate(ValidationContext validationContext) - { - var results = new List(); - - // Se tem título OU URL, então ambos são obrigatórios - bool hasTitle = !string.IsNullOrWhiteSpace(Title); - bool hasUrl = !string.IsNullOrWhiteSpace(Url); - - if (hasTitle || hasUrl) - { - if (!hasTitle) - { - results.Add(new ValidationResult( - "Título é obrigatório quando URL é preenchida", - new[] { nameof(Title) })); - } - - if (!hasUrl) - { - results.Add(new ValidationResult( - "URL é obrigatória quando título é preenchido", - new[] { nameof(Url) })); - } - else if (!Uri.TryCreate(Url, UriKind.Absolute, out _)) - { - results.Add(new ValidationResult( - "URL inválida", - new[] { nameof(Url) })); - } - - // Validações específicas para links de produto - if (Type == LinkType.Product && hasTitle && hasUrl) - { - if (string.IsNullOrWhiteSpace(ProductTitle)) - { - results.Add(new ValidationResult( - "Título do produto é obrigatório para links de produto", - new[] { nameof(ProductTitle) })); - } - } - - // Validações de tamanho apenas se os campos estão preenchidos - if (hasTitle && Title.Length > 50) - { - results.Add(new ValidationResult( - "Título deve ter no máximo 50 caracteres", - new[] { nameof(Title) })); - } - - if (!string.IsNullOrWhiteSpace(Description) && Description.Length > 100) - { - results.Add(new ValidationResult( - "Descrição deve ter no máximo 100 caracteres", - new[] { nameof(Description) })); - } - - if (!string.IsNullOrWhiteSpace(ProductTitle) && ProductTitle.Length > 100) - { - results.Add(new ValidationResult( - "Título do produto deve ter no máximo 100 caracteres", - new[] { nameof(ProductTitle) })); - } - - if (!string.IsNullOrWhiteSpace(ProductPrice) && ProductPrice.Length > 50) - { - results.Add(new ValidationResult( - "Preço deve ter no máximo 50 caracteres", - new[] { nameof(ProductPrice) })); - } - - if (!string.IsNullOrWhiteSpace(ProductDescription) && ProductDescription.Length > 200) - { - results.Add(new ValidationResult( - "Descrição do produto deve ter no máximo 200 caracteres", - new[] { nameof(ProductDescription) })); - } - } - - return results; - } - - // Propriedade helper para verificar se o link está vazio - public bool IsEmpty => string.IsNullOrWhiteSpace(Title) && string.IsNullOrWhiteSpace(Url); } + public class DashboardViewModel { public User CurrentUser { get; set; } = new(); diff --git a/src/BCards.Web/Views/Admin/ManagePage.cshtml b/src/BCards.Web/Views/Admin/ManagePage.cshtml index 9b0fa9a..f2f1140 100644 --- a/src/BCards.Web/Views/Admin/ManagePage.cshtml +++ b/src/BCards.Web/Views/Admin/ManagePage.cshtml @@ -618,624 +618,403 @@ @{await Html.RenderPartialAsync("_ValidationScriptsPartial");} } \ No newline at end of file From 603698c9c0213959e4dc10c338df0f764e7b34fc Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Thu, 26 Jun 2025 00:25:11 -0300 Subject: [PATCH 05/42] fix: paginas de links funcionando --- .../Controllers/UserPageController.cs | 3 +- src/BCards.Web/Views/Shared/_Layout.cshtml | 1 + .../Views/Shared/_ThemeStyles.cshtml | 565 +++++++++++------- .../Views/Shared/_UserPageLayout.cshtml | 2 + src/BCards.Web/Views/UserPage/Display.cshtml | 298 ++++++--- 5 files changed, 594 insertions(+), 275 deletions(-) diff --git a/src/BCards.Web/Controllers/UserPageController.cs b/src/BCards.Web/Controllers/UserPageController.cs index 0f17640..bc5e4d9 100644 --- a/src/BCards.Web/Controllers/UserPageController.cs +++ b/src/BCards.Web/Controllers/UserPageController.cs @@ -24,7 +24,8 @@ public class UserPageController : Controller } //[Route("{category}/{slug}")] - [ResponseCache(Duration = 300, VaryByQueryKeys = new[] { "category", "slug" })] + //VOltar a linha abaixo em prod + //[ResponseCache(Duration = 300, VaryByQueryKeys = new[] { "category", "slug" })] public async Task Display(string category, string slug) { var userPage = await _userPageService.GetPageAsync(category, slug); diff --git a/src/BCards.Web/Views/Shared/_Layout.cshtml b/src/BCards.Web/Views/Shared/_Layout.cshtml index a801765..91906ac 100644 --- a/src/BCards.Web/Views/Shared/_Layout.cshtml +++ b/src/BCards.Web/Views/Shared/_Layout.cshtml @@ -31,6 +31,7 @@ } + diff --git a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml index 86ec234..1afbb31 100644 --- a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml +++ b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml @@ -1,16 +1,14 @@ @model BCards.Web.Models.PageTheme + @{ var theme = Model ?? new BCards.Web.Models.PageTheme - { - Name = "Padrão", - PrimaryColor = "#2563eb", - SecondaryColor = "#1d4ed8", - BackgroundColor = "#ffffff", - TextColor = "#1f2937" - }; - - // Debug - vamos ver o que está chegando - // Console.WriteLine($"Theme recebido: {Model?.Name ?? "NULL"} - Primary: {Model?.PrimaryColor ?? "NULL"}"); + { + Name = "Padrão", + PrimaryColor = "#2563eb", + SecondaryColor = "#1d4ed8", + BackgroundColor = "#ffffff", + TextColor = "#1f2937" + }; } :root { @@ -18,28 +16,27 @@ --secondary-color: @theme.SecondaryColor; --background-color: @theme.BackgroundColor; --text-color: @theme.TextColor; + --card-bg: rgba(255, 255, 255, 0.95); + --border-color: rgba(0, 0, 0, 0.1); } .user-page { background-color: var(--background-color); color: var(--text-color); - @if (!string.IsNullOrEmpty(theme.BackgroundImage)) - { - @:background-image: url('@theme.BackgroundImage'); - @:background-size: cover; - @:background-position: center; - @:background-attachment: fixed; - } + min-height: 100vh; + padding: 2rem 0; + } .profile-card { - background-color: rgba(255, 255, 255, 0.95); + background-color: var(--card-bg); backdrop-filter: blur(10px); border-radius: 20px; padding: 2rem; box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1); - border: 1px solid rgba(255, 255, 255, 0.2); + border: 1px solid var(--border-color); max-width: 500px; + margin: 0 auto; } .profile-image { @@ -56,15 +53,20 @@ height: 120px; border-radius: 50%; border: 4px solid var(--primary-color); - background-color: rgba(255, 255, 255, 0.1); + background-color: var(--card-bg); color: var(--primary-color); + display: flex; + align-items: center; + justify-content: center; + font-size: 3rem; + margin: 0 auto; } .profile-name { color: var(--primary-color); font-size: 2rem; font-weight: 600; - margin-bottom: 0.5rem; + margin: 1rem 0 0.5rem 0; } .profile-bio { @@ -74,104 +76,347 @@ font-size: 1.1rem; } +/* ========== LINKS CONTAINER ========== */ .links-container { margin-bottom: 2rem; } -.link-button { - background-color: var(--primary-color); - color: white !important; - border: none; - padding: 0.75rem 1.5rem; +/* ========== UNIVERSAL LINK STYLE (TODOS OS LINKS IGUAIS) ========== */ +.universal-link { + border: 1px solid var(--border-color); border-radius: 12px; - text-decoration: none; - display: block; margin-bottom: 0.75rem; - text-align: center; - font-weight: 500; - transition: all 0.3s ease; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); - position: relative; overflow: hidden; - max-width: 100%; - font-size: 0.95rem; + background-color: var(--card-bg); + transition: all 0.3s ease; } -.link-button:hover { - background-color: var(--secondary-color); +.universal-link:hover { transform: translateY(-1px); box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); - color: white !important; - text-decoration: none; } -.link-button:active { - transform: translateY(0); +.universal-link-header { + background-color: var(--primary-color); + color: white !important; + padding: 0.75rem 1rem; + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + text-decoration: none !important; + transition: background-color 0.3s ease; + position: relative; + font-weight: 500; +} + +.universal-link-header:hover { + background-color: var(--secondary-color); + color: white !important; + text-decoration: none !important; +} + +.universal-link-content { + display: flex; + align-items: center; + flex: 1; + min-width: 0; + text-align: left; +} + +/* Thumbnail para produtos */ +.link-thumbnail { + width: 40px; + height: 40px; + border-radius: 6px; + object-fit: cover; + margin-right: 0.75rem; + flex-shrink: 0; + background-color: rgba(255, 255, 255, 0.2); +} + +/* Ícone para links normais */ +.link-icon { + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 0.75rem; + flex-shrink: 0; + font-size: 1.2rem; + color: white; +} + +.link-text-container { + flex: 1; + min-width: 0; } .link-title { - font-size: 1.1rem; - margin-bottom: 0.25rem; font-weight: 600; + font-size: 1rem; + color: white; + margin: 0; + line-height: 1.2; + /* Truncate long titles */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -.link-description { +.link-subtitle { + font-size: 0.85rem; + color: rgba(255, 255, 255, 0.8); + margin: 0; + line-height: 1.1; + /* Truncate long subtitles */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +/* Seta de expansão */ +.expand-arrow { + background: rgba(255, 255, 255, 0.2); + border: none; + color: white; + border-radius: 6px; + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + transition: all 0.3s ease; + flex-shrink: 0; + margin-left: 0.5rem; +} + +.expand-arrow:hover { + background: rgba(255, 255, 255, 0.3); + transform: scale(1.05); +} + +.expand-arrow i { font-size: 0.9rem; - opacity: 0.9; + transition: transform 0.3s ease; } -.link-icon { - font-size: 1.2rem; - margin-right: 0.5rem; +.expand-arrow.expanded i { + transform: rotate(180deg); } -.profile-footer { - border-top: 1px solid rgba(0, 0, 0, 0.1); - padding-top: 1rem; +/* Conteúdo expandido */ +.universal-link-details { + padding: 0; + background-color: var(--card-bg); + border-top: 1px solid var(--border-color); + max-height: 0; + overflow: hidden; + transition: max-height 0.3s ease-out, padding 0.3s ease; } -.profile-footer a { +.universal-link-details.show { + max-height: 400px; + padding: 1rem; +} + +/* Imagem expandida para produtos */ +.expanded-image { + width: 100%; + max-width: 200px; + height: auto; + border-radius: 8px; + margin-bottom: 1rem; + display: block; + margin-left: auto; + margin-right: auto; +} + +.expanded-description { + color: var(--text-color); + opacity: 0.8; + font-size: 0.9rem; + line-height: 1.5; + margin-bottom: 0.75rem; +} + +.expanded-price { + color: #28a745; + font-weight: 700; + font-size: 1.1rem; + margin-bottom: 0.75rem; + text-align: center; +} + +.expanded-action { color: var(--primary-color); + font-size: 0.85rem; + font-weight: 500; + display: flex; + align-items: center; + justify-content: center; + gap: 0.25rem; +} + +/* ========== FOOTER ========== */ +.profile-footer { + margin-top: 2rem; + padding-top: 1rem; + border-top: 1px solid var(--border-color); + text-align: center; +} + +.footer-promo { + background-color: var(--card-bg); + border: 1px solid var(--border-color); + border-radius: 8px; + padding: 1rem; + margin-bottom: 1rem; + cursor: pointer; + transition: all 0.3s ease; +} + +.footer-promo:hover { + transform: translateY(-1px); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); +} + +.footer-promo-header { + display: flex; + align-items: center; + justify-content: space-between; + color: var(--primary-color); + font-weight: 600; + font-size: 0.9rem; +} + +.footer-promo-header i { + transition: transform 0.3s ease; +} + +.footer-promo-header.expanded i { + transform: rotate(180deg); +} + +.footer-promo-content { + margin-top: 0.5rem; + max-height: 0; + overflow: hidden; + transition: max-height 0.3s ease-out, margin-top 0.3s ease; + color: var(--text-color); + opacity: 0.8; + font-size: 0.85rem; + line-height: 1.4; +} + +.footer-promo-content.show { + max-height: 200px; + margin-top: 0.75rem; +} + +.footer-promo-button { + background-color: var(--primary-color); + color: white !important; + border: none; + padding: 0.4rem 0.8rem; + border-radius: 6px; + text-decoration: none !important; + font-size: 0.8rem; + display: inline-flex; + align-items: center; + gap: 0.25rem; + margin-top: 0.5rem; + transition: background-color 0.3s ease; +} + +.footer-promo-button:hover { + background-color: var(--secondary-color); + color: white !important; + text-decoration: none !important; +} + +.footer-credits { + font-size: 0.8rem; + color: var(--text-color); + opacity: 0.6; +} + +.footer-credits a { + color: var(--primary-color); + text-decoration: none; font-weight: 500; } -.profile-footer a:hover { +.footer-credits a:hover { color: var(--secondary-color); + text-decoration: underline; } -/* Responsive Design */ +/* ========== ANIMATIONS ========== */ +@@keyframes slideDown { + from { + max-height: 0; + padding-top: 0; + padding-bottom: 0; + opacity: 0; + } + to { + max-height: 400px; + padding-top: 1rem; + padding-bottom: 1rem; + opacity: 1; + } +} + +/* ========== RESPONSIVE DESIGN ========== */ @@media (max-width: 768px) { + .user-page { + padding: 1rem 0; + } + .profile-card { padding: 1.5rem; - margin: 1rem; + margin: 0 1rem; border-radius: 15px; } - + .profile-image, .profile-image-placeholder { width: 100px; height: 100px; } - + .profile-name { font-size: 1.75rem; } - - .profile-bio { - font-size: 1rem; + + .universal-link-header { + padding: 0.65rem 0.8rem; } - - .link-button { - padding: 0.65rem 1.25rem; - font-size: 0.9rem; - margin-bottom: 0.6rem; - } - + .link-title { font-size: 0.95rem; } - - .link-description { + + .link-subtitle { + font-size: 0.8rem; + } + + .link-thumbnail, + .link-icon { + width: 36px; + height: 36px; + margin-right: 0.5rem; + } + + .expand-arrow { + width: 28px; + height: 28px; + } + + .expand-arrow i { font-size: 0.8rem; } } @@ -179,150 +424,70 @@ @@media (max-width: 480px) { .profile-card { padding: 1rem; - margin: 0.5rem; + margin: 0 0.5rem; } - + .profile-image, .profile-image-placeholder { width: 80px; height: 80px; } - + .profile-name { font-size: 1.5rem; } - - .link-button { - padding: 0.6rem 1rem; - font-size: 0.85rem; - margin-bottom: 0.5rem; + + .universal-link-header { + padding: 0.6rem 0.8rem; } -} -/* Dark theme adjustments */ -@@media (prefers-color-scheme: dark) { - .user-page[data-theme="dark"] .profile-card { - background-color: rgba(17, 24, 39, 0.95); - color: #f9fafb; - } -} - -/* Animation for link buttons */ -.link-button::before { - content: ''; - position: absolute; - top: 0; - left: -100%; - width: 100%; - height: 100%; - background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent); - transition: left 0.5s; -} - -.link-button:hover::before { - left: 100%; -} - -/* Product Link Card Styles */ -.product-link-card { - transition: transform 0.2s ease, box-shadow 0.2s ease; - border: 1px solid rgba(0, 0, 0, 0.125); - border-radius: 15px; - overflow: hidden; - background: rgba(255, 255, 255, 0.95); - backdrop-filter: blur(10px); -} - -.product-link-card:hover { - transform: translateY(-3px); - box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15); - border-color: var(--primary-color); -} - -.product-image { - height: 120px; - width: 100%; - object-fit: cover; - border-radius: 15px 0 0 15px; -} - -.product-title { - color: var(--primary-color); - font-weight: 600; - margin-bottom: 0.5rem; - line-height: 1.3; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; -} - -.product-description { - font-size: 0.85rem; - line-height: 1.4; - margin-bottom: 0.5rem; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; -} - -.product-price { - font-size: 1.1rem; - font-weight: 700; - color: #28a745 !important; -} - -.product-link .card-body { - padding: 1rem; -} - -/* Responsive adjustments for product cards */ -@@media (max-width: 768px) { - .product-image { - height: 100px; - border-radius: 15px 15px 0 0; - } - - .product-link-card .row { - flex-direction: column; - } - - .product-link-card .col-md-4, - .product-link-card .col-md-8 { - flex: none; - width: 100%; - max-width: 100%; - } - - .product-title { - font-size: 1rem; - } - - .product-description { - font-size: 0.8rem; - } - - .product-price { - font-size: 1rem; - } -} - -@@media (max-width: 480px) { - .product-image { - height: 80px; - } - - .product-link .card-body { - padding: 0.75rem; - } - - .product-title { + .link-title { font-size: 0.9rem; } - - .product-description { + + .link-subtitle { font-size: 0.75rem; - -webkit-line-clamp: 1; } + + .link-thumbnail, + .link-icon { + width: 32px; + height: 32px; + margin-right: 0.5rem; + } + + .expand-arrow { + width: 26px; + height: 26px; + } + + .expanded-image { + max-width: 150px; + } +} + +/* ========== DARK THEME COMPATIBILITY ========== */ +.user-page[data-theme="dark"] .profile-card, +.user-page[data-theme="dark"] .universal-link, +.user-page[data-theme="dark"] .footer-promo { + background-color: rgba(31, 41, 55, 0.95); + border-color: rgba(255, 255, 255, 0.1); +} + +.user-page[data-theme="dark"] .universal-link-details, +.user-page[data-theme="dark"] .footer-promo-content { + background-color: rgba(31, 41, 55, 0.95); + border-color: rgba(255, 255, 255, 0.1); +} + +/* Accessibility */ +.universal-link-header:focus, +.expand-arrow:focus { + outline: 2px solid rgba(255, 255, 255, 0.5); + outline-offset: 2px; +} + +/* Smooth scroll for mobile */ +.universal-link-details { + scroll-behavior: smooth; } \ No newline at end of file diff --git a/src/BCards.Web/Views/Shared/_UserPageLayout.cshtml b/src/BCards.Web/Views/Shared/_UserPageLayout.cshtml index 4b32c7e..d288596 100644 --- a/src/BCards.Web/Views/Shared/_UserPageLayout.cshtml +++ b/src/BCards.Web/Views/Shared/_UserPageLayout.cshtml @@ -42,7 +42,9 @@ } + + @await RenderSectionAsync("Styles", required: false) diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index 47f633f..fa629a3 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -11,7 +11,15 @@ @section Styles { } @@ -27,20 +35,20 @@ } else { -
- 👤 +
+ 👤
}

@Model.DisplayName

- + @if (!string.IsNullOrEmpty(Model.Bio)) {

@Model.Bio

} - +
@if (Model.Links?.Any(l => l.IsActive) == true) { @@ -49,76 +57,122 @@ var link = Model.Links[i]; if (link.IsActive) { - @if (link.Type == BCards.Web.Models.LinkType.Product) - { - - -
-
- @if (!string.IsNullOrEmpty(link.ProductImage)) - { -
- @(link.ProductTitle ?? link.Title) -
- } -
-
-
- @(!string.IsNullOrEmpty(link.ProductTitle) ? link.ProductTitle : link.Title) -
- @if (!string.IsNullOrEmpty(link.ProductDescription)) - { -

- @link.ProductDescription -

- } - @if (!string.IsNullOrEmpty(link.ProductPrice)) - { -

- @link.ProductPrice -

- } - - - Ver produto - -
+ var hasExpandableContent = (!string.IsNullOrEmpty(link.Description) || + (link.Type == BCards.Web.Models.LinkType.Product && !string.IsNullOrEmpty(link.ProductDescription))); + + +
+ + + +
+ @if (link.Type == BCards.Web.Models.LinkType.Product && !string.IsNullOrEmpty(link.ProductImage)) + { + + @(link.ProductTitle ?? link.Title) + } + else if (!string.IsNullOrEmpty(link.Icon)) + { + +
+
+ } + else + { + +
+ +
+ } + +
+
+ @if (link.Type == BCards.Web.Models.LinkType.Product && !string.IsNullOrEmpty(link.ProductTitle)) + { + @link.ProductTitle + } + else + { + @link.Title + } +
+ + @if (link.Type == BCards.Web.Models.LinkType.Product && !string.IsNullOrEmpty(link.ProductPrice)) + { +
@link.ProductPrice
+ } + else if (!string.IsNullOrEmpty(link.Description) && link.Description.Length > 50) + { +
@(link.Description.Substring(0, 50))...
+ }
- - } - else - { - - - @if (!string.IsNullOrEmpty(link.Icon)) + + @if (hasExpandableContent) { - + + } -
-
@link.Title
- @if (!string.IsNullOrEmpty(link.Description)) - { -
@link.Description
- } -
- } + + @if (hasExpandableContent) + { + + + } +
} } } @@ -131,10 +185,29 @@
-
- - Criado com BCards - +
+ + +
+
+ 💡 Gostou desta página? + +
+
+ Crie a sua própria página personalizada com BCards! + É rápido, fácil e profissional. Compartilhe todos os seus links em um só lugar. +
+ + + Criar Minha Página + +
+
+
+ +
+ Criado com BCards +
@@ -151,8 +224,8 @@ @section Scripts { } \ No newline at end of file From 2a6e5fb2e91eab5e74552a134a3ca0815eca6498 Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Thu, 26 Jun 2025 00:59:50 -0300 Subject: [PATCH 06/42] =?UTF-8?q?fix:=20padr=C3=A3o=20de=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Shared/_ThemeStyles.cshtml | 22 +++++++++++++++++++ src/BCards.Web/Views/UserPage/Display.cshtml | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml index 1afbb31..d702223 100644 --- a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml +++ b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml @@ -232,6 +232,7 @@ display: block; margin-left: auto; margin-right: auto; + } .expanded-description { @@ -240,6 +241,27 @@ font-size: 0.9rem; line-height: 1.5; margin-bottom: 0.75rem; + + max-height: 150px; /* Ajuste conforme necessário */ + overflow-y: auto; + padding-right: 0.5rem; /* Espaço para a scrollbar */ + + /* Styling da scrollbar (opcional) */ + scrollbar-width: thin; + scrollbar-color: var(--primary-color) transparent; +} + +.expanded-description::-webkit-scrollbar { + width: 6px; +} + +.expanded-description::-webkit-scrollbar-track { + background: transparent; +} + +.expanded-description::-webkit-scrollbar-thumb { + background-color: var(--primary-color); + border-radius: 3px; } .expanded-price { diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index fa629a3..ad596f3 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -13,7 +13,6 @@ @section Scripts { @@ -804,6 +879,9 @@ // Initialize social media fields initializeSocialMedia(); + // Initialize image upload + initializeImageUpload(); + // Check for validation errors and show toast + open accordion checkValidationErrors(); @@ -1469,6 +1547,61 @@ } } } + + // Image Upload Functions + function initializeImageUpload() { + const fileInput = $('#profileImageInput'); + const preview = $('#imagePreview'); + const removeBtn = $('#removeImageBtn'); + const errorSpan = $('#imageError'); + const hiddenField = $('#profileImageId'); + + // Preview da imagem selecionada + fileInput.on('change', function(e) { + const file = e.target.files[0]; + errorSpan.text(''); + + if (!file) return; + + // Validações client-side + if (!file.type.match(/^image\/(jpeg|jpg|png|gif)$/i)) { + errorSpan.text('Formato inválido. Use apenas JPG, PNG ou GIF.'); + fileInput.val(''); + return; + } + + if (file.size > 5 * 1024 * 1024) { // 5MB + errorSpan.text('Arquivo muito grande. Máximo 5MB.'); + fileInput.val(''); + return; + } + + // Preview + const reader = new FileReader(); + reader.onload = function(e) { + preview.attr('src', e.target.result); + removeBtn.show(); + markStepComplete(1); // Marcar step 1 como completo + }; + reader.readAsDataURL(file); + }); + + // Remover imagem + removeBtn.on('click', function() { + if (confirm('Tem certeza que deseja remover a imagem de perfil?')) { + fileInput.val(''); + hiddenField.val(''); + preview.attr('src', '/images/default-avatar.svg'); + removeBtn.hide(); + errorSpan.text(''); + } + }); + + // Mostrar botão remover se já tem imagem + if (hiddenField.val()) { + removeBtn.show(); + } + } } diff --git a/src/BCards.Web/Views/Home/Index.cshtml b/src/BCards.Web/Views/Home/Index.cshtml index 8564556..8810d49 100644 --- a/src/BCards.Web/Views/Home/Index.cshtml +++ b/src/BCards.Web/Views/Home/Index.cshtml @@ -114,16 +114,16 @@
- @if (!string.IsNullOrEmpty(page.ProfileImage)) + @if (!string.IsNullOrEmpty(page.ProfileImageId)) { - @(page.DisplayName) } else {
- 👤 +
}
@(page.DisplayName)
diff --git a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml index d702223..0838566 100644 --- a/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml +++ b/src/BCards.Web/Views/Shared/_ThemeStyles.cshtml @@ -39,16 +39,16 @@ margin: 0 auto; } -.profile-image { +.profile-image-large { width: 120px; height: 120px; - border-radius: 50%; border: 4px solid var(--primary-color); object-fit: cover; + display: block; margin: 0 auto; } -.profile-image-placeholder { +.profile-icon-placeholder { width: 120px; height: 120px; border-radius: 50%; @@ -404,8 +404,8 @@ border-radius: 15px; } - .profile-image, - .profile-image-placeholder { + .profile-image-large, + .profile-icon-placeholder { width: 100px; height: 100px; } @@ -449,8 +449,8 @@ margin: 0 0.5rem; } - .profile-image, - .profile-image-placeholder { + .profile-image-large, + .profile-icon-placeholder { width: 80px; height: 80px; } diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index 4506cbd..8812b6b 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -46,21 +46,23 @@
-
- - @if (!string.IsNullOrEmpty(Model.ProfileImage)) - { - @Model.DisplayName - } - else - { -
- 👤 -
- } +
+ +
+ @if (!string.IsNullOrEmpty(Model.ProfileImageId)) + { + @Model.DisplayName + } + else + { +
+ +
+ } +

@Model.DisplayName

+
- -

@Model.DisplayName

+
@if (!string.IsNullOrEmpty(Model.Bio)) { @@ -228,7 +230,9 @@ Criado com BCards
-
+ +
+
diff --git a/src/BCards.Web/wwwroot/css/userpage.css b/src/BCards.Web/wwwroot/css/userpage.css index 8578a18..0110d8c 100644 --- a/src/BCards.Web/wwwroot/css/userpage.css +++ b/src/BCards.Web/wwwroot/css/userpage.css @@ -27,6 +27,22 @@ margin: 0 auto; } +.profile-image-small { + width: 60px; + height: 60px; + border-radius: 50%; + border: 3px solid #007bff; + object-fit: cover; + flex-shrink: 0; +} + +.profile-header { + padding: 1rem; + background: rgba(255, 255, 255, 0.1); + border-radius: 15px; + backdrop-filter: blur(10px); +} + .profile-image-placeholder { width: 120px; height: 120px; @@ -152,6 +168,15 @@ height: 100px; } + .profile-image-small { + width: 50px; + height: 50px; + } + + .profile-header { + padding: 0.75rem; + } + .profile-name { font-size: 1.75rem; } diff --git a/src/BCards.Web/wwwroot/images/default-avatar.svg b/src/BCards.Web/wwwroot/images/default-avatar.svg new file mode 100644 index 0000000..dfa8d80 --- /dev/null +++ b/src/BCards.Web/wwwroot/images/default-avatar.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From ca980012993bf4c7372ef2a59a8fda0263b7052d Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 19:01:30 -0300 Subject: [PATCH 37/42] fix: muitos temas! --- src/BCards.Web/Controllers/AdminController.cs | 9 +++++++-- src/BCards.Web/Models/PageTheme.cs | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/BCards.Web/Controllers/AdminController.cs b/src/BCards.Web/Controllers/AdminController.cs index 319fb67..dd3059e 100644 --- a/src/BCards.Web/Controllers/AdminController.cs +++ b/src/BCards.Web/Controllers/AdminController.cs @@ -317,7 +317,7 @@ public class AdminController : Controller model.ProfileImageId = existingPage.ProfileImageId; } - UpdateUserPageFromModel(existingPage, model); + await UpdateUserPageFromModel(existingPage, model); // Set status to PendingModeration for updates existingPage.Status = ViewModels.PageStatus.Creating; @@ -740,7 +740,7 @@ public class AdminController : Controller return userPage; } - private void UpdateUserPageFromModel(UserPage page, ManagePageViewModel model) + private async Task UpdateUserPageFromModel(UserPage page, ManagePageViewModel model) { page.DisplayName = model.DisplayName; page.Category = model.Category; @@ -748,6 +748,11 @@ public class AdminController : Controller page.Bio = model.Bio; page.Slug = model.Slug; page.ProfileImageId = model.ProfileImageId; // CRUCIAL: Atualizar ProfileImageId + + // CRUCIAL: Atualizar tema selecionado + var selectedTheme = await _themeService.GetThemeByNameAsync(model.SelectedTheme) ?? _themeService.GetDefaultTheme(); + page.Theme = selectedTheme; + page.UpdatedAt = DateTime.UtcNow; // Update links diff --git a/src/BCards.Web/Models/PageTheme.cs b/src/BCards.Web/Models/PageTheme.cs index 78d036b..c14e2bf 100644 --- a/src/BCards.Web/Models/PageTheme.cs +++ b/src/BCards.Web/Models/PageTheme.cs @@ -38,4 +38,9 @@ public class PageTheme [BsonElement("createdAt")] public DateTime CreatedAt { get; set; } = DateTime.UtcNow; + + // Campo translations - para compatibilidade futura, não usado por enquanto + [BsonElement("translations")] + [BsonIgnoreIfDefault] + public object? Translations { get; set; } } \ No newline at end of file From ef4d189ef113c59fa5ae587f886a460e9f8c9e9c Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 19:36:30 -0300 Subject: [PATCH 38/42] =?UTF-8?q?feat:=20bot=C3=A3o=20fechar=20scroll=20de?= =?UTF-8?q?=20temas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PaymentController.cs | 32 ++++- src/BCards.Web/Models/User.cs | 4 +- src/BCards.Web/Services/PaymentService.cs | 3 +- src/BCards.Web/Views/Admin/ManagePage.cshtml | 83 +++++++++-- src/BCards.Web/Views/UserPage/Display.cshtml | 129 +++++++++++++++++- 5 files changed, 234 insertions(+), 17 deletions(-) diff --git a/src/BCards.Web/Controllers/PaymentController.cs b/src/BCards.Web/Controllers/PaymentController.cs index 8727f87..b01b7b1 100644 --- a/src/BCards.Web/Controllers/PaymentController.cs +++ b/src/BCards.Web/Controllers/PaymentController.cs @@ -2,6 +2,7 @@ using BCards.Web.Models; using BCards.Web.Repositories; using BCards.Web.Services; using BCards.Web.ViewModels; +using BCards.Web.Utils; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; @@ -110,12 +111,16 @@ public class PaymentController : Controller try { + // Parse do plano atual (mesmo que o Dashboard) + var userPlanType = Enum.TryParse(user.CurrentPlan, true, out var planType) ? planType : PlanType.Trial; + var currentPlanString = userPlanType.ToString().ToLower(); + var viewModel = new ManageSubscriptionViewModel { User = user, StripeSubscription = await _paymentService.GetSubscriptionDetailsAsync(user.Id), PaymentHistory = await _paymentService.GetPaymentHistoryAsync(user.Id), - AvailablePlans = GetAvailablePlans(user.CurrentPlan) + AvailablePlans = GetAvailablePlans(currentPlanString) }; // Pegar assinatura local se existir @@ -129,11 +134,15 @@ public class PaymentController : Controller } catch (Exception ex) { + // Parse do plano atual também no catch + var userPlanType = Enum.TryParse(user.CurrentPlan, true, out var planType) ? planType : PlanType.Trial; + var currentPlanString = userPlanType.ToString().ToLower(); + var errorViewModel = new ManageSubscriptionViewModel { User = user, ErrorMessage = $"Erro ao carregar dados da assinatura: {ex.Message}", - AvailablePlans = GetAvailablePlans(user.CurrentPlan) + AvailablePlans = GetAvailablePlans(currentPlanString) }; return View(errorViewModel); @@ -212,6 +221,8 @@ public class PaymentController : Controller { var plans = new List { + // Plano Trial não é incluído aqui pois é gerenciado internamente + // O "downgrade" para Trial acontece via cancelamento da assinatura new() { PlanType = "basic", @@ -250,8 +261,20 @@ public class PaymentController : Controller } }; - // Marcar upgrades e downgrades + // Marcar upgrades e filtrar downgrades var currentPlanIndex = plans.FindIndex(p => p.IsCurrentPlan); + + // Se usuário está no Trial (não encontrou plano atual), todos são upgrades + if (currentPlanIndex == -1 && (currentPlan == "trial" || currentPlan == "free")) + { + foreach (var plan in plans) + { + plan.IsUpgrade = true; + } + return plans; // Mostrar todos os planos pagos como upgrade + } + + // Para planos pagos, marcar apenas upgrades superiores for (int i = 0; i < plans.Count; i++) { if (i > currentPlanIndex) @@ -260,6 +283,7 @@ public class PaymentController : Controller plans[i].IsDowngrade = true; } - return plans; + // Retornar apenas plano atual e upgrades (Stripe não gerencia downgrades automaticamente) + return plans.Where(p => p.IsCurrentPlan || p.IsUpgrade).ToList(); } } \ No newline at end of file diff --git a/src/BCards.Web/Models/User.cs b/src/BCards.Web/Models/User.cs index 739b19d..a7910cf 100644 --- a/src/BCards.Web/Models/User.cs +++ b/src/BCards.Web/Models/User.cs @@ -25,10 +25,10 @@ public class User public string StripeCustomerId { get; set; } = string.Empty; [BsonElement("subscriptionStatus")] - public string SubscriptionStatus { get; set; } = "free"; + public string SubscriptionStatus { get; set; } = "trial"; [BsonElement("currentPlan")] - public string CurrentPlan { get; set; } = "free"; + public string CurrentPlan { get; set; } = "trial"; [BsonElement("createdAt")] public DateTime CreatedAt { get; set; } = DateTime.UtcNow; diff --git a/src/BCards.Web/Services/PaymentService.cs b/src/BCards.Web/Services/PaymentService.cs index a3cc862..84c00b7 100644 --- a/src/BCards.Web/Services/PaymentService.cs +++ b/src/BCards.Web/Services/PaymentService.cs @@ -322,7 +322,8 @@ public class PaymentService : IPaymentService user.SubscriptionStatus = stripeSubscription.Status; if (stripeSubscription.Status != "active") { - user.CurrentPlan = "free"; + // Quando assinatura não está ativa, usuário volta para o plano trial (gratuito) + user.CurrentPlan = "trial"; } await _userRepository.UpdateAsync(user); } diff --git a/src/BCards.Web/Views/Admin/ManagePage.cshtml b/src/BCards.Web/Views/Admin/ManagePage.cshtml index 69df0aa..132b811 100644 --- a/src/BCards.Web/Views/Admin/ManagePage.cshtml +++ b/src/BCards.Web/Views/Admin/ManagePage.cshtml @@ -162,10 +162,12 @@

Escolha um tema que combine com sua personalidade ou marca:

- @{ - var themeCount = 0; - } - @foreach (var theme in Model.AvailableThemes) + +
+ @{ + var themeCount = 0; + } + @foreach (var theme in Model.AvailableThemes) { @if (themeCount % 4 == 0) { @@ -200,10 +202,11 @@ themeCount++; } - @if (Model.AvailableThemes.Any()) - { - @:
- } + @if (Model.AvailableThemes.Any()) + { + @:
+ } +
@@ -1605,6 +1608,70 @@ } +@section Styles { + +} + @if (TempData["Error"] != null) {
diff --git a/src/BCards.Web/Views/UserPage/Display.cshtml b/src/BCards.Web/Views/UserPage/Display.cshtml index 8812b6b..7e3fb69 100644 --- a/src/BCards.Web/Views/UserPage/Display.cshtml +++ b/src/BCards.Web/Views/UserPage/Display.cshtml @@ -42,6 +42,42 @@ } +@if (isPreview) +{ + +} +
@@ -240,8 +276,48 @@ @if (isPreview) { -
- MODO PREVIEW - Esta é uma prévia da sua página + +
+
+
+
+ + MODO PREVIEW +
+
+ Esta é uma prévia da sua página +
+
+ + +
+
+
+
+ + +
+
} @@ -335,6 +411,55 @@ } }); }); + + @if (isPreview) + { + @:// Mostrar toast informativo após carregar + @:setTimeout(function() { + @: var toastEl = document.getElementById('previewToast'); + @: if (toastEl) { + @: var toast = new bootstrap.Toast(toastEl); + @: toast.show(); + @: } + @:}, 1000); // Delay de 1 segundo + } }); + + @if (isPreview) + { + @:// Funções específicas do modo preview + @:function goBackToDashboard() { + @: // Detectar se está em mobile ou desktop + @: if (window.opener) { + @: // Está numa nova aba/janela - fechar e focar na aba pai + @: window.opener.focus(); + @: window.close(); + @: } else { + @: // Navegação normal - ir para o dashboard + @: window.location.href = '@Url.Action("Dashboard", "Admin")'; + @: } + @:} + @: + @:function closePreview() { + @: if (window.opener) { + @: // Está numa nova aba - fechar + @: window.close(); + @: } else { + @: // Tentar voltar na história ou ir para dashboard + @: if (window.history.length > 1) { + @: window.history.back(); + @: } else { + @: window.location.href = '@Url.Action("Dashboard", "Admin")'; + @: } + @: } + @:} + @: + @:// Detectar tecla ESC para fechar preview + @:document.addEventListener('keydown', function(e) { + @: if (e.key === 'Escape') { + @: closePreview(); + @: } + @:}); + } } \ No newline at end of file From 0d9a0988fe6042a7648ad0100be1c41acf627439 Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 20:50:40 -0300 Subject: [PATCH 39/42] feat: aparencia dashboard --- .../Controllers/PaymentController.cs | 5 +- src/BCards.Web/Program.cs | 2 +- .../ViewModels/ManageSubscriptionViewModel.cs | 2 +- src/BCards.Web/Views/Admin/Dashboard.cshtml | 89 ++++----- .../Views/Payment/ManageSubscription.cshtml | 4 +- src/BCards.Web/Views/Shared/_Layout.cshtml | 169 ++++++++++++++++++ src/BCards.Web/Views/UserPage/Display.cshtml | 4 +- 7 files changed, 227 insertions(+), 48 deletions(-) diff --git a/src/BCards.Web/Controllers/PaymentController.cs b/src/BCards.Web/Controllers/PaymentController.cs index b01b7b1..b0b1410 100644 --- a/src/BCards.Web/Controllers/PaymentController.cs +++ b/src/BCards.Web/Controllers/PaymentController.cs @@ -114,13 +114,14 @@ public class PaymentController : Controller // Parse do plano atual (mesmo que o Dashboard) var userPlanType = Enum.TryParse(user.CurrentPlan, true, out var planType) ? planType : PlanType.Trial; var currentPlanString = userPlanType.ToString().ToLower(); - + var subscription = await _subscriptionRepository.GetByUserIdAsync(user.Id); var viewModel = new ManageSubscriptionViewModel { User = user, StripeSubscription = await _paymentService.GetSubscriptionDetailsAsync(user.Id), PaymentHistory = await _paymentService.GetPaymentHistoryAsync(user.Id), - AvailablePlans = GetAvailablePlans(currentPlanString) + AvailablePlans = GetAvailablePlans(currentPlanString), + CurrentPeriodEnd = (DateTime?) subscription.CurrentPeriodEnd }; // Pegar assinatura local se existir diff --git a/src/BCards.Web/Program.cs b/src/BCards.Web/Program.cs index 414ab94..d01fa48 100644 --- a/src/BCards.Web/Program.cs +++ b/src/BCards.Web/Program.cs @@ -87,7 +87,7 @@ builder.Services.AddAuthentication(options => { OnRedirectToAuthorizationEndpoint = context => { - context.Response.Redirect(context.RedirectUri + "&prompt=select_account"); + context.Response.Redirect(context.RedirectUri + "&prompt=login"); return Task.CompletedTask; } }; diff --git a/src/BCards.Web/ViewModels/ManageSubscriptionViewModel.cs b/src/BCards.Web/ViewModels/ManageSubscriptionViewModel.cs index ef75549..968930e 100644 --- a/src/BCards.Web/ViewModels/ManageSubscriptionViewModel.cs +++ b/src/BCards.Web/ViewModels/ManageSubscriptionViewModel.cs @@ -19,7 +19,7 @@ public class ManageSubscriptionViewModel public bool CanDowngrade => HasActiveSubscription && User.CurrentPlan != "basic"; public bool WillCancelAtPeriodEnd => StripeSubscription?.CancelAtPeriodEnd == true; - public DateTime? CurrentPeriodEnd => null; + public DateTime? CurrentPeriodEnd { get; set; } public DateTime? NextBillingDate => !WillCancelAtPeriodEnd ? CurrentPeriodEnd : null; public decimal? MonthlyAmount => StripeSubscription?.Items?.Data?.FirstOrDefault()?.Price?.UnitAmount / 100m; diff --git a/src/BCards.Web/Views/Admin/Dashboard.cshtml b/src/BCards.Web/Views/Admin/Dashboard.cshtml index 709ac69..b15f863 100644 --- a/src/BCards.Web/Views/Admin/Dashboard.cshtml +++ b/src/BCards.Web/Views/Admin/Dashboard.cshtml @@ -93,13 +93,15 @@
} -
- +
+ +
+
@if (pageItem.Status == BCards.Web.ViewModels.PageStatus.Active) { - Ver + class="btn btn-success flex-fill"> + Ver Página } else if (pageItem.Status == BCards.Web.ViewModels.PageStatus.Creating || @@ -107,24 +109,30 @@ pageItem.Status == BCards.Web.ViewModels.PageStatus.PendingModeration) { } - - -
- + } + +
+ -
    +
      @if (pageItem.Status == BCards.Web.ViewModels.PageStatus.PendingModeration) { @@ -144,7 +152,6 @@ } - @if (pageItem.Status == BCards.Web.ViewModels.PageStatus.Creating || pageItem.Status == BCards.Web.ViewModels.PageStatus.Rejected) { @@ -170,36 +177,38 @@
-
-
- Criada em @(pageItem.CreatedAt.ToString("dd/MM/yyyy")) - @if ((pageItem.LastModerationStatus ?? pageItem.Status) == BCards.Web.ViewModels.PageStatus.Rejected && !string.IsNullOrEmpty(pageItem.Motive)) - { -
-
+
@if (!Model.WillCancelAtPeriodEnd) { } -
+
From 951b44f7ebcd524082167140473cfe52299a395d Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 21:35:45 -0300 Subject: [PATCH 40/42] feat: pipeline --- .github/workflows/deploy-bcards.yml | 254 ++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 .github/workflows/deploy-bcards.yml diff --git a/.github/workflows/deploy-bcards.yml b/.github/workflows/deploy-bcards.yml new file mode 100644 index 0000000..c7699a5 --- /dev/null +++ b/.github/workflows/deploy-bcards.yml @@ -0,0 +1,254 @@ +name: Deploy BCards +on: + push: + branches: [ main, 'release/*' ] + pull_request: + branches: [ main ] + +env: + REGISTRY: registry.redecarneir.us + IMAGE_NAME: bcards + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget- + + - name: Restore dependencies + run: dotnet restore + + - name: Build + run: dotnet build --no-restore --configuration Release + + - name: Test + run: dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" + + - name: Upload coverage + uses: codecov/codecov-action@v3 + with: + files: coverage.cobertura.xml + + build-and-push: + needs: test + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Determine build settings + run: | + if [ "${{ github.ref }}" = "refs/heads/main" ]; then + echo "TAG=latest" >> $GITHUB_ENV + echo "PLATFORM=linux/arm64" >> $GITHUB_ENV + echo "ENVIRONMENT=Production" >> $GITHUB_ENV + elif [[ "${{ github.ref }}" == refs/heads/release/* ]]; then + # Extrai versão da branch (release/v1.0.0 -> v1.0.0) + VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/heads\/release\///') + echo "TAG=${VERSION}" >> $GITHUB_ENV + echo "PLATFORM=linux/amd64" >> $GITHUB_ENV + echo "ENVIRONMENT=Staging" >> $GITHUB_ENV + fi + + echo "IMAGE_TAG=$TAG" >> $GITHUB_ENV + + - name: Build and push to registry + run: | + # Build da imagem para a plataforma correta + docker buildx build \ + --platform ${{ env.PLATFORM }} \ + --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} \ + --push \ + . + + deploy-production: + needs: build-and-push + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' + environment: production + + steps: + - name: Deploy to Production Servers (ARM - OCI) + run: | + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Deploy no Servidor 1 (ARM - OCI) + ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 << 'EOF' + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure || true + docker rm bcards-infrastructure || true + docker stop bcards-test-app || true + docker rm bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-prod || true + docker rm bcards-prod || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Executa novo container BCards + docker run -d \ + --name bcards-prod \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Production \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Recarrega NGINX + sudo nginx -t && sudo systemctl reload nginx + EOF + + # Deploy no Servidor 2 (ARM - OCI) + ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 << 'EOF' + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure || true + docker rm bcards-infrastructure || true + docker stop bcards-test-app || true + docker rm bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-prod || true + docker rm bcards-prod || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Executa novo container BCards + docker run -d \ + --name bcards-prod \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Production \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + EOF + + - name: Health Check Production + run: | + # Aguarda containers subirem + sleep 30 + + # Verifica se os serviços estão respondendo + echo "Verificando Servidor 1 (ARM)..." + ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 'curl -f http://localhost:5002/health || echo "Servidor 1 pode não estar respondendo"' + + echo "Verificando Servidor 2 (ARM)..." + ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 'curl -f http://localhost:5002/health || echo "Servidor 2 pode não estar respondendo"' + + deploy-staging: + needs: build-and-push + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/heads/release/') + + steps: + - name: Deploy to Staging Server (x86 - Local) + run: | + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Extrai versão da branch + VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/heads\/release\///') + + # Deploy no Servidor Local x86 + ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 << EOF + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure || true + docker rm bcards-infrastructure || true + docker stop bcards-test-app || true + docker rm bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-staging || true + docker rm bcards-staging || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} + + # Executa novo container BCards + docker run -d \ + --name bcards-staging \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Staging \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} + EOF + + - name: Health Check Staging + run: | + # Aguarda container subir + sleep 30 + + # Verifica se o serviço está respondendo + echo "Verificando Servidor Staging (x86)..." + ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 'curl -f http://localhost:5002/health || echo "Servidor staging pode não estar respondendo"' + + cleanup: + needs: [deploy-production, deploy-staging] + runs-on: ubuntu-latest + if: always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) + + steps: + - name: Cleanup old containers and images + run: | + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Lista de servidores baseada na branch + if [ "${{ github.ref }}" = "refs/heads/main" ]; then + SERVERS=("141.148.162.114" "129.146.116.218") + else + SERVERS=("192.168.0.100") + fi + + # Limpeza em cada servidor + for server in "${SERVERS[@]}"; do + echo "Limpando servidor $server..." + ssh -o StrictHostKeyChecking=no ubuntu@$server << 'EOF' + # Remove containers parados + docker container prune -f + + # Remove imagens não utilizadas (mantém as mais recentes) + docker image prune -f + + # Remove redes não utilizadas + docker network prune -f + EOF + done \ No newline at end of file From 38c991758c923fe9d5374bc71fd663b72c34031d Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 21:44:46 -0300 Subject: [PATCH 41/42] fix: actions --- .claude/settings.local.json | 3 +- .gitea/workflows/deploy-bcards.yml | 359 ++++++++++++++++++ ...alidation.yml => pr-validation.yml.backup} | 0 ...e-deploy.yml => release-deploy.yml.backup} | 0 .github/workflows/deploy-bcards.yml | 254 ------------- 5 files changed, 361 insertions(+), 255 deletions(-) create mode 100644 .gitea/workflows/deploy-bcards.yml rename .gitea/workflows/{pr-validation.yml => pr-validation.yml.backup} (100%) rename .gitea/workflows/{release-deploy.yml => release-deploy.yml.backup} (100%) delete mode 100644 .github/workflows/deploy-bcards.yml diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 2ed84fa..0ffc967 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -19,7 +19,8 @@ "Bash(curl:*)", "Bash(docker-compose up:*)", "Bash(dotnet build:*)", - "Bash(chmod:*)" + "Bash(chmod:*)", + "Bash(mv:*)" ] }, "enableAllProjectMcpServers": false diff --git a/.gitea/workflows/deploy-bcards.yml b/.gitea/workflows/deploy-bcards.yml new file mode 100644 index 0000000..fc2f60c --- /dev/null +++ b/.gitea/workflows/deploy-bcards.yml @@ -0,0 +1,359 @@ +name: BCards Deployment Pipeline + +on: + push: + branches: + - main + - 'Release/*' + pull_request: + branches: [ main ] + +env: + REGISTRY: registry.redecarneir.us + IMAGE_NAME: bcards + MONGODB_HOST: 192.168.0.100:27017 + +jobs: + test: + name: Run Tests + runs-on: ubuntu-latest + + steps: + - name: Test info + run: | + echo "🧪 Executando testes para ${{ github.ref_name }}" + echo "🎯 Trigger: ${{ github.event_name }}" + + # Verificar se deve pular testes + SKIP_TESTS="${{ github.event.inputs.skip_tests || vars.SKIP_TESTS }}" + + if [ "$SKIP_TESTS" == "true" ]; then + echo "⚠️ Testes PULADOS" + echo "TESTS_SKIPPED=true" >> $GITHUB_ENV + else + echo "✅ Executando testes" + echo "TESTS_SKIPPED=false" >> $GITHUB_ENV + fi + + - name: Checkout code + if: env.TESTS_SKIPPED == 'false' + uses: actions/checkout@v4 + + - name: Setup .NET 8 + if: env.TESTS_SKIPPED == 'false' + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' + + - name: Cache dependencies + if: env.TESTS_SKIPPED == 'false' + uses: actions/cache@v3 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget- + + - name: Restore dependencies + if: env.TESTS_SKIPPED == 'false' + run: dotnet restore + + - name: Build solution + if: env.TESTS_SKIPPED == 'false' + run: dotnet build --no-restore --configuration Release + + - name: Run unit tests + if: env.TESTS_SKIPPED == 'false' + run: dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" + + build-and-push: + name: Build and Push Image + runs-on: ubuntu-latest + needs: [test] + if: always() && (needs.test.result == 'success' || needs.test.result == 'skipped') + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + platforms: linux/amd64,linux/arm64 + + - name: Determine build settings + id: settings + run: | + BRANCH_NAME="${{ github.ref_name }}" + + if [ "$BRANCH_NAME" = "main" ]; then + # Main = Produção (ARM64) + echo "tag=latest" >> $GITHUB_OUTPUT + echo "platform=linux/arm64" >> $GITHUB_OUTPUT + echo "environment=Production" >> $GITHUB_OUTPUT + echo "dockerfile=Dockerfile" >> $GITHUB_OUTPUT + echo "deploy_target=production" >> $GITHUB_OUTPUT + elif [[ "$BRANCH_NAME" == Release/* ]]; then + # Release = Staging (x86) + VERSION_RAW=${BRANCH_NAME#Release/} + VERSION=$(echo "$VERSION_RAW" | sed 's/^[Vv]//') + [ -z "$VERSION" ] && VERSION="0.0.1" + + echo "tag=$VERSION" >> $GITHUB_OUTPUT + echo "platform=linux/amd64" >> $GITHUB_OUTPUT + echo "environment=Staging" >> $GITHUB_OUTPUT + echo "dockerfile=Dockerfile.release" >> $GITHUB_OUTPUT + echo "deploy_target=staging" >> $GITHUB_OUTPUT + echo "version=$VERSION" >> $GITHUB_OUTPUT + fi + + COMMIT_SHA=${{ github.sha }} + SHORT_COMMIT=${COMMIT_SHA:0:7} + echo "commit=$SHORT_COMMIT" >> $GITHUB_OUTPUT + + echo "📦 Tag: $(echo '${{ steps.settings.outputs.tag }}')" + echo "🏗️ Platform: $(echo '${{ steps.settings.outputs.platform }}')" + echo "🌍 Environment: $(echo '${{ steps.settings.outputs.environment }}')" + echo "🎯 Target: $(echo '${{ steps.settings.outputs.deploy_target }}')" + + - name: Build and push image + run: | + echo "🏗️ Building image for ${{ steps.settings.outputs.deploy_target }}..." + + # Build para a plataforma correta + docker buildx build \ + --platform ${{ steps.settings.outputs.platform }} \ + --file ${{ steps.settings.outputs.dockerfile }} \ + --tag $REGISTRY/$IMAGE_NAME:${{ steps.settings.outputs.tag }} \ + --push \ + --build-arg VERSION=${{ steps.settings.outputs.version || 'latest' }} \ + --build-arg COMMIT=${{ steps.settings.outputs.commit }} \ + --progress=plain \ + . + + deploy-production: + name: Deploy to Production (ARM - OCI) + runs-on: ubuntu-latest + needs: [build-and-push] + if: github.ref_name == 'main' + environment: production + + steps: + - name: Deploy to Production Servers + run: | + echo "🚀 Deploying to production servers (ARM64)..." + + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Deploy no Servidor 1 (ARM - OCI) + ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 << 'EOF' + echo "🔄 Atualizando Servidor 1..." + + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure bcards-test-app || true + docker rm bcards-infrastructure bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-prod || true + docker rm bcards-prod || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Executa novo container BCards + docker run -d \ + --name bcards-prod \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Production \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Recarrega NGINX + sudo nginx -t && sudo systemctl reload nginx + + echo "✅ Servidor 1 atualizado" + EOF + + # Deploy no Servidor 2 (ARM - OCI) + ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 << 'EOF' + echo "🔄 Atualizando Servidor 2..." + + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure bcards-test-app || true + docker rm bcards-infrastructure bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-prod || true + docker rm bcards-prod || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + # Executa novo container BCards + docker run -d \ + --name bcards-prod \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Production \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + + echo "✅ Servidor 2 atualizado" + EOF + + - name: Health Check Production + run: | + echo "🏥 Verificando saúde dos servidores de produção..." + sleep 30 + + # Verifica Servidor 1 + echo "Verificando Servidor 1 (ARM)..." + ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 'curl -f http://localhost:5002/health || echo "⚠️ Servidor 1 pode não estar respondendo"' + + # Verifica Servidor 2 + echo "Verificando Servidor 2 (ARM)..." + ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 'curl -f http://localhost:5002/health || echo "⚠️ Servidor 2 pode não estar respondendo"' + + deploy-staging: + name: Deploy to Staging (x86 - Local) + runs-on: ubuntu-latest + needs: [build-and-push] + if: startsWith(github.ref_name, 'Release/') + + steps: + - name: Extract version + id: version + run: | + BRANCH_NAME="${{ github.ref_name }}" + VERSION_RAW=${BRANCH_NAME#Release/} + VERSION=$(echo "$VERSION_RAW" | sed 's/^[Vv]//') + [ -z "$VERSION" ] && VERSION="0.0.1" + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "📦 Deploying version: $VERSION" + + - name: Deploy to Staging Server + run: | + echo "🚀 Deploying to staging server (x86)..." + + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Deploy no Servidor Local x86 + ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 << EOF + echo "🔄 Atualizando Servidor Staging..." + + # Remove containers bcards-infrastructure se existirem + docker stop bcards-infrastructure bcards-test-app || true + docker rm bcards-infrastructure bcards-test-app || true + + # Para o container BCards atual se existir + docker stop bcards-staging || true + docker rm bcards-staging || true + + # Remove imagem antiga + docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} || true + + # Puxa nova imagem + docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} + + # Executa novo container BCards + docker run -d \ + --name bcards-staging \ + --restart unless-stopped \ + -p 5002:8080 \ + -e ASPNETCORE_ENVIRONMENT=Staging \ + -e ASPNETCORE_URLS=http://+:8080 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} + + echo "✅ Servidor Staging atualizado" + EOF + + - name: Health Check Staging + run: | + echo "🏥 Verificando saúde do servidor de staging..." + sleep 30 + + echo "Verificando Servidor Staging (x86)..." + ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 'curl -f http://localhost:5002/health || echo "⚠️ Servidor staging pode não estar respondendo"' + + cleanup: + name: Cleanup Old Resources + runs-on: ubuntu-latest + needs: [deploy-production, deploy-staging] + if: always() && (needs.deploy-production.result == 'success' || needs.deploy-staging.result == 'success') + + steps: + - name: Cleanup containers and images + run: | + echo "🧹 Limpando recursos antigos..." + + # Configura SSH + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + + # Lista de servidores baseada na branch + if [ "${{ github.ref_name }}" = "main" ]; then + SERVERS=("141.148.162.114" "129.146.116.218") + else + SERVERS=("192.168.0.100") + fi + + # Limpeza em cada servidor + for server in "${SERVERS[@]}"; do + echo "🧹 Limpando servidor $server..." + ssh -o StrictHostKeyChecking=no ubuntu@$server << 'EOF' + # Remove containers parados + docker container prune -f + + # Remove imagens não utilizadas + docker image prune -f + + # Remove redes não utilizadas + docker network prune -f + EOF + done + + echo "✅ Limpeza concluída!" + + deployment-summary: + name: Deployment Summary + runs-on: ubuntu-latest + needs: [deploy-production, deploy-staging] + if: always() + + steps: + - name: Summary + run: | + echo "📋 DEPLOYMENT SUMMARY" + echo "====================" + echo "🎯 Branch: ${{ github.ref_name }}" + echo "🔑 Commit: ${{ github.sha }}" + echo "🏗️ Registry: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" + + if [ "${{ github.ref_name }}" = "main" ]; then + echo "🌍 Environment: Production (ARM64)" + echo "🖥️ Servers: 141.148.162.114, 129.146.116.218" + echo "📦 Tag: latest" + echo "🔗 Status: ${{ needs.deploy-production.result }}" + else + echo "🌍 Environment: Staging (x86)" + echo "🖥️ Server: 192.168.0.100" + echo "📦 Tag: ${{ github.ref_name }}" + echo "🔗 Status: ${{ needs.deploy-staging.result }}" + fi + + echo "====================" + echo "✅ Pipeline completed!" \ No newline at end of file diff --git a/.gitea/workflows/pr-validation.yml b/.gitea/workflows/pr-validation.yml.backup similarity index 100% rename from .gitea/workflows/pr-validation.yml rename to .gitea/workflows/pr-validation.yml.backup diff --git a/.gitea/workflows/release-deploy.yml b/.gitea/workflows/release-deploy.yml.backup similarity index 100% rename from .gitea/workflows/release-deploy.yml rename to .gitea/workflows/release-deploy.yml.backup diff --git a/.github/workflows/deploy-bcards.yml b/.github/workflows/deploy-bcards.yml deleted file mode 100644 index c7699a5..0000000 --- a/.github/workflows/deploy-bcards.yml +++ /dev/null @@ -1,254 +0,0 @@ -name: Deploy BCards -on: - push: - branches: [ main, 'release/*' ] - pull_request: - branches: [ main ] - -env: - REGISTRY: registry.redecarneir.us - IMAGE_NAME: bcards - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - - name: Cache dependencies - uses: actions/cache@v3 - with: - path: ~/.nuget/packages - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-nuget- - - - name: Restore dependencies - run: dotnet restore - - - name: Build - run: dotnet build --no-restore --configuration Release - - - name: Test - run: dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" - - - name: Upload coverage - uses: codecov/codecov-action@v3 - with: - files: coverage.cobertura.xml - - build-and-push: - needs: test - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Determine build settings - run: | - if [ "${{ github.ref }}" = "refs/heads/main" ]; then - echo "TAG=latest" >> $GITHUB_ENV - echo "PLATFORM=linux/arm64" >> $GITHUB_ENV - echo "ENVIRONMENT=Production" >> $GITHUB_ENV - elif [[ "${{ github.ref }}" == refs/heads/release/* ]]; then - # Extrai versão da branch (release/v1.0.0 -> v1.0.0) - VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/heads\/release\///') - echo "TAG=${VERSION}" >> $GITHUB_ENV - echo "PLATFORM=linux/amd64" >> $GITHUB_ENV - echo "ENVIRONMENT=Staging" >> $GITHUB_ENV - fi - - echo "IMAGE_TAG=$TAG" >> $GITHUB_ENV - - - name: Build and push to registry - run: | - # Build da imagem para a plataforma correta - docker buildx build \ - --platform ${{ env.PLATFORM }} \ - --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} \ - --push \ - . - - deploy-production: - needs: build-and-push - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' - environment: production - - steps: - - name: Deploy to Production Servers (ARM - OCI) - run: | - # Configura SSH - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - # Deploy no Servidor 1 (ARM - OCI) - ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 << 'EOF' - # Remove containers bcards-infrastructure se existirem - docker stop bcards-infrastructure || true - docker rm bcards-infrastructure || true - docker stop bcards-test-app || true - docker rm bcards-test-app || true - - # Para o container BCards atual se existir - docker stop bcards-prod || true - docker rm bcards-prod || true - - # Remove imagem antiga - docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true - - # Puxa nova imagem - docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - - # Executa novo container BCards - docker run -d \ - --name bcards-prod \ - --restart unless-stopped \ - -p 5002:8080 \ - -e ASPNETCORE_ENVIRONMENT=Production \ - -e ASPNETCORE_URLS=http://+:8080 \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - - # Recarrega NGINX - sudo nginx -t && sudo systemctl reload nginx - EOF - - # Deploy no Servidor 2 (ARM - OCI) - ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 << 'EOF' - # Remove containers bcards-infrastructure se existirem - docker stop bcards-infrastructure || true - docker rm bcards-infrastructure || true - docker stop bcards-test-app || true - docker rm bcards-test-app || true - - # Para o container BCards atual se existir - docker stop bcards-prod || true - docker rm bcards-prod || true - - # Remove imagem antiga - docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest || true - - # Puxa nova imagem - docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - - # Executa novo container BCards - docker run -d \ - --name bcards-prod \ - --restart unless-stopped \ - -p 5002:8080 \ - -e ASPNETCORE_ENVIRONMENT=Production \ - -e ASPNETCORE_URLS=http://+:8080 \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - EOF - - - name: Health Check Production - run: | - # Aguarda containers subirem - sleep 30 - - # Verifica se os serviços estão respondendo - echo "Verificando Servidor 1 (ARM)..." - ssh -o StrictHostKeyChecking=no ubuntu@141.148.162.114 'curl -f http://localhost:5002/health || echo "Servidor 1 pode não estar respondendo"' - - echo "Verificando Servidor 2 (ARM)..." - ssh -o StrictHostKeyChecking=no ubuntu@129.146.116.218 'curl -f http://localhost:5002/health || echo "Servidor 2 pode não estar respondendo"' - - deploy-staging: - needs: build-and-push - runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/heads/release/') - - steps: - - name: Deploy to Staging Server (x86 - Local) - run: | - # Configura SSH - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - # Extrai versão da branch - VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/heads\/release\///') - - # Deploy no Servidor Local x86 - ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 << EOF - # Remove containers bcards-infrastructure se existirem - docker stop bcards-infrastructure || true - docker rm bcards-infrastructure || true - docker stop bcards-test-app || true - docker rm bcards-test-app || true - - # Para o container BCards atual se existir - docker stop bcards-staging || true - docker rm bcards-staging || true - - # Remove imagem antiga - docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} || true - - # Puxa nova imagem - docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} - - # Executa novo container BCards - docker run -d \ - --name bcards-staging \ - --restart unless-stopped \ - -p 5002:8080 \ - -e ASPNETCORE_ENVIRONMENT=Staging \ - -e ASPNETCORE_URLS=http://+:8080 \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} - EOF - - - name: Health Check Staging - run: | - # Aguarda container subir - sleep 30 - - # Verifica se o serviço está respondendo - echo "Verificando Servidor Staging (x86)..." - ssh -o StrictHostKeyChecking=no ubuntu@192.168.0.100 'curl -f http://localhost:5002/health || echo "Servidor staging pode não estar respondendo"' - - cleanup: - needs: [deploy-production, deploy-staging] - runs-on: ubuntu-latest - if: always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) - - steps: - - name: Cleanup old containers and images - run: | - # Configura SSH - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - # Lista de servidores baseada na branch - if [ "${{ github.ref }}" = "refs/heads/main" ]; then - SERVERS=("141.148.162.114" "129.146.116.218") - else - SERVERS=("192.168.0.100") - fi - - # Limpeza em cada servidor - for server in "${SERVERS[@]}"; do - echo "Limpando servidor $server..." - ssh -o StrictHostKeyChecking=no ubuntu@$server << 'EOF' - # Remove containers parados - docker container prune -f - - # Remove imagens não utilizadas (mantém as mais recentes) - docker image prune -f - - # Remove redes não utilizadas - docker network prune -f - EOF - done \ No newline at end of file From ec559e8115a9f51a29ce535b0595fe68b95a0ad1 Mon Sep 17 00:00:00 2001 From: Ricardo Carneiro Date: Sun, 17 Aug 2025 21:49:13 -0300 Subject: [PATCH 42/42] fix: build --- .gitea/workflows/deploy-bcards.yml | 39 +++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy-bcards.yml b/.gitea/workflows/deploy-bcards.yml index fc2f60c..1e00f60 100644 --- a/.gitea/workflows/deploy-bcards.yml +++ b/.gitea/workflows/deploy-bcards.yml @@ -5,8 +5,10 @@ on: branches: - main - 'Release/*' + # PRs apenas validam, não fazem deploy pull_request: branches: [ main ] + types: [opened, synchronize, reopened] env: REGISTRY: registry.redecarneir.us @@ -66,11 +68,31 @@ jobs: if: env.TESTS_SKIPPED == 'false' run: dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" + # Job específico para validação de PRs (sem deploy) + pr-validation: + name: PR Validation + runs-on: ubuntu-latest + needs: [test] + if: github.event_name == 'pull_request' + + steps: + - name: PR Validation Summary + run: | + echo "✅ Pull Request Validation Summary" + echo "🎯 Target Branch: ${{ github.base_ref }}" + echo "📂 Source Branch: ${{ github.head_ref }}" + echo "🧪 Tests: ${{ needs.test.result }}" + echo "👤 Author: ${{ github.event.pull_request.user.login }}" + echo "📝 Title: ${{ github.event.pull_request.title }}" + echo "" + echo "✨ PR está pronto para merge!" + build-and-push: name: Build and Push Image runs-on: ubuntu-latest needs: [test] - if: always() && (needs.test.result == 'success' || needs.test.result == 'skipped') + # Só faz build/push em push (não em PR) + if: github.event_name == 'push' && (needs.test.result == 'success' || needs.test.result == 'skipped') steps: - name: Checkout code @@ -111,20 +133,25 @@ jobs: SHORT_COMMIT=${COMMIT_SHA:0:7} echo "commit=$SHORT_COMMIT" >> $GITHUB_OUTPUT - echo "📦 Tag: $(echo '${{ steps.settings.outputs.tag }}')" - echo "🏗️ Platform: $(echo '${{ steps.settings.outputs.platform }}')" - echo "🌍 Environment: $(echo '${{ steps.settings.outputs.environment }}')" - echo "🎯 Target: $(echo '${{ steps.settings.outputs.deploy_target }}')" + echo "📦 Tag: ${{ steps.settings.outputs.tag }}" + echo "🏗️ Platform: ${{ steps.settings.outputs.platform }}" + echo "🌍 Environment: ${{ steps.settings.outputs.environment }}" + echo "🎯 Target: ${{ steps.settings.outputs.deploy_target }}" - name: Build and push image run: | echo "🏗️ Building image for ${{ steps.settings.outputs.deploy_target }}..." + # Debug das variáveis + echo "Platform: ${{ steps.settings.outputs.platform }}" + echo "Dockerfile: ${{ steps.settings.outputs.dockerfile }}" + echo "Tag: ${{ steps.settings.outputs.tag }}" + # Build para a plataforma correta docker buildx build \ --platform ${{ steps.settings.outputs.platform }} \ --file ${{ steps.settings.outputs.dockerfile }} \ - --tag $REGISTRY/$IMAGE_NAME:${{ steps.settings.outputs.tag }} \ + --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.settings.outputs.tag }} \ --push \ --build-arg VERSION=${{ steps.settings.outputs.version || 'latest' }} \ --build-arg COMMIT=${{ steps.settings.outputs.commit }} \