From dae8fbfe5efa9449b60ecaa901ad0f59fc102e54 Mon Sep 17 00:00:00 2001 From: Josh-Heaps Date: Fri, 2 Jan 2026 17:13:39 -0700 Subject: [PATCH] Create node graph page --- .claude/settings.local.json | 6 +- Media.JoshHeaps.Net/Api/AuthApi.cs | 21 +- Media.JoshHeaps.Net/Api/FolderApi.cs | 29 +- Media.JoshHeaps.Net/Api/FolderShareApi.cs | 21 +- Media.JoshHeaps.Net/Api/GraphApi.cs | 381 +++++ Media.JoshHeaps.Net/Api/MediaApi.cs | 25 +- Media.JoshHeaps.Net/Database/007_graphs.sql | 16 + .../Database/008_graph_nodes.sql | 15 + .../Database/009_graph_edges.sql | 22 + Media.JoshHeaps.Net/DbExecutor.cs | 16 + Media.JoshHeaps.Net/Models/Graph.cs | 17 + Media.JoshHeaps.Net/Models/GraphEdge.cs | 17 + Media.JoshHeaps.Net/Models/GraphNode.cs | 16 + .../Pages/{Index.cshtml => Gallery.cshtml} | 36 +- .../{Index.cshtml.cs => Gallery.cshtml.cs} | 12 +- Media.JoshHeaps.Net/Pages/Landing.cshtml | 105 ++ Media.JoshHeaps.Net/Pages/Landing.cshtml.cs | 12 + Media.JoshHeaps.Net/Pages/Login.cshtml.cs | 15 +- Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml | 275 ++++ .../Pages/NetworkGraph.cshtml.cs | 25 + Media.JoshHeaps.Net/Pages/Register.cshtml.cs | 15 +- .../Pages/ResendVerification.cshtml.cs | 15 +- .../Pages/VerifyEmail.cshtml.cs | 11 +- Media.JoshHeaps.Net/Program.cs | 8 + Media.JoshHeaps.Net/Services/EmailService.cs | 51 +- Media.JoshHeaps.Net/Services/FolderService.cs | 99 +- Media.JoshHeaps.Net/Services/GraphService.cs | 810 +++++++++++ Media.JoshHeaps.Net/Services/MediaService.cs | 69 +- Media.JoshHeaps.Net/Services/UserService.cs | 19 +- .../wwwroot/css/Gallery/page.css | 188 +++ Media.JoshHeaps.Net/wwwroot/css/landing.css | 344 +++++ .../wwwroot/css/network-graph.css | 528 +++++++ .../wwwroot/js/network-graph.js | 1251 +++++++++++++++++ run-migrations.ps1 | 73 + 34 files changed, 4294 insertions(+), 269 deletions(-) create mode 100644 Media.JoshHeaps.Net/Api/GraphApi.cs create mode 100644 Media.JoshHeaps.Net/Database/007_graphs.sql create mode 100644 Media.JoshHeaps.Net/Database/008_graph_nodes.sql create mode 100644 Media.JoshHeaps.Net/Database/009_graph_edges.sql create mode 100644 Media.JoshHeaps.Net/Models/Graph.cs create mode 100644 Media.JoshHeaps.Net/Models/GraphEdge.cs create mode 100644 Media.JoshHeaps.Net/Models/GraphNode.cs rename Media.JoshHeaps.Net/Pages/{Index.cshtml => Gallery.cshtml} (86%) rename Media.JoshHeaps.Net/Pages/{Index.cshtml.cs => Gallery.cshtml.cs} (94%) create mode 100644 Media.JoshHeaps.Net/Pages/Landing.cshtml create mode 100644 Media.JoshHeaps.Net/Pages/Landing.cshtml.cs create mode 100644 Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml create mode 100644 Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml.cs create mode 100644 Media.JoshHeaps.Net/Services/GraphService.cs create mode 100644 Media.JoshHeaps.Net/wwwroot/css/Gallery/page.css create mode 100644 Media.JoshHeaps.Net/wwwroot/css/landing.css create mode 100644 Media.JoshHeaps.Net/wwwroot/css/network-graph.css create mode 100644 Media.JoshHeaps.Net/wwwroot/js/network-graph.js create mode 100644 run-migrations.ps1 diff --git a/.claude/settings.local.json b/.claude/settings.local.json index b93b5ca..6755399 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -6,7 +6,11 @@ "Bash(powershell:*)", "Bash(dotnet script:*)", "Bash(taskkill:*)", - "Bash(dir:*)" + "Bash(dir:*)", + "Bash(cd:*)", + "Bash(tree:*)", + "Bash(del Index.cshtml Index.cshtml.cs)", + "Bash(dotnet build:*)" ], "deny": [], "ask": [] diff --git a/Media.JoshHeaps.Net/Api/AuthApi.cs b/Media.JoshHeaps.Net/Api/AuthApi.cs index 5a4cfed..c9aecfa 100644 --- a/Media.JoshHeaps.Net/Api/AuthApi.cs +++ b/Media.JoshHeaps.Net/Api/AuthApi.cs @@ -11,17 +11,8 @@ namespace Media.JoshHeaps.Net.Api; [ApiController] [Route("api/auth")] -public class AuthApi : ControllerBase +public class AuthApi(AuthService authService, IConfiguration configuration) : ControllerBase { - private readonly AuthService _authService; - private readonly IConfiguration _configuration; - - public AuthApi(AuthService authService, IConfiguration configuration) - { - _authService = authService; - _configuration = configuration; - } - [HttpPost("login")] public async Task Login([FromBody] LoginRequest request) { @@ -30,7 +21,7 @@ public class AuthApi : ControllerBase return BadRequest(new { error = "Email/username and password are required" }); } - var (success, error, userInfo) = await _authService.LoginAsync(request.EmailOrUsername, request.Password); + var (success, error, userInfo) = await authService.LoginAsync(request.EmailOrUsername, request.Password); if (!success || userInfo == null) { @@ -77,10 +68,10 @@ public class AuthApi : ControllerBase private string GenerateJwtToken(UserLoginInfo user) { - var jwtKey = _configuration["Jwt:Key"] ?? throw new InvalidOperationException("JWT Key not configured"); - var jwtIssuer = _configuration["Jwt:Issuer"] ?? throw new InvalidOperationException("JWT Issuer not configured"); - var jwtAudience = _configuration["Jwt:Audience"] ?? throw new InvalidOperationException("JWT Audience not configured"); - var jwtExpiryDays = int.Parse(_configuration["Jwt:ExpiryInDays"] ?? "30"); + var jwtKey = configuration["Jwt:Key"] ?? throw new InvalidOperationException("JWT Key not configured"); + var jwtIssuer = configuration["Jwt:Issuer"] ?? throw new InvalidOperationException("JWT Issuer not configured"); + var jwtAudience = configuration["Jwt:Audience"] ?? throw new InvalidOperationException("JWT Audience not configured"); + var jwtExpiryDays = int.Parse(configuration["Jwt:ExpiryInDays"] ?? "30"); var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtKey)); var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256); diff --git a/Media.JoshHeaps.Net/Api/FolderApi.cs b/Media.JoshHeaps.Net/Api/FolderApi.cs index 7048680..a493060 100644 --- a/Media.JoshHeaps.Net/Api/FolderApi.cs +++ b/Media.JoshHeaps.Net/Api/FolderApi.cs @@ -6,15 +6,8 @@ namespace Media.JoshHeaps.Net.Api; [ApiController] [Route("api/folder")] -public class FolderApi : ControllerBase +public class FolderApi(FolderService folderService) : ControllerBase { - private readonly FolderService _folderService; - - public FolderApi(FolderService folderService) - { - _folderService = folderService; - } - [HttpGet("list")] public async Task ListFolders([FromQuery] long? folderId = null) { @@ -24,7 +17,7 @@ public class FolderApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var folders = await _folderService.GetUserFoldersAsync(userId.Value, folderId); + var folders = await folderService.GetUserFoldersAsync(userId.Value, folderId); return Ok(folders); } @@ -37,7 +30,7 @@ public class FolderApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var path = await _folderService.GetFolderPathAsync(folderId, userId.Value); + var path = await folderService.GetFolderPathAsync(folderId, userId.Value); return Ok(path); } @@ -58,14 +51,14 @@ public class FolderApi : ControllerBase // If parent folder specified, check ownership (can't create in shared folders) if (request.ParentFolderId.HasValue) { - var parentOwnerId = await _folderService.GetFolderOwnerIdAsync(request.ParentFolderId.Value); + var parentOwnerId = await folderService.GetFolderOwnerIdAsync(request.ParentFolderId.Value); if (parentOwnerId != userId.Value) { return Forbid("Cannot create folders in shared folders"); } } - var folder = await _folderService.CreateFolderAsync(userId.Value, request.Name, request.ParentFolderId); + var folder = await folderService.CreateFolderAsync(userId.Value, request.Name, request.ParentFolderId); if (folder == null) { return BadRequest(new { error = "Failed to create folder" }); @@ -89,13 +82,13 @@ public class FolderApi : ControllerBase } // Check ownership (can't rename shared folders) - var ownerId = await _folderService.GetFolderOwnerIdAsync(request.FolderId); + var ownerId = await folderService.GetFolderOwnerIdAsync(request.FolderId); if (ownerId != userId.Value) { return Forbid("Cannot rename shared folders"); } - var success = await _folderService.RenameFolderAsync(request.FolderId, userId.Value, request.NewName); + var success = await folderService.RenameFolderAsync(request.FolderId, userId.Value, request.NewName); if (!success) { return BadRequest(new { error = "Failed to rename folder" }); @@ -114,13 +107,13 @@ public class FolderApi : ControllerBase } // Check ownership (can't delete shared folders) - var ownerId = await _folderService.GetFolderOwnerIdAsync(folderId); + var ownerId = await folderService.GetFolderOwnerIdAsync(folderId); if (ownerId != userId.Value) { return Forbid("Cannot delete shared folders"); } - var success = await _folderService.DeleteFolderAsync(folderId, userId.Value, deleteContents); + var success = await folderService.DeleteFolderAsync(folderId, userId.Value, deleteContents); if (!success) { return BadRequest(new { error = "Failed to delete folder" }); @@ -139,13 +132,13 @@ public class FolderApi : ControllerBase } // Check ownership (can't move shared folders) - var ownerId = await _folderService.GetFolderOwnerIdAsync(request.FolderId); + var ownerId = await folderService.GetFolderOwnerIdAsync(request.FolderId); if (ownerId != userId.Value) { return Forbid("Cannot move shared folders"); } - var success = await _folderService.MoveFolderAsync(request.FolderId, userId.Value, request.NewParentFolderId); + var success = await folderService.MoveFolderAsync(request.FolderId, userId.Value, request.NewParentFolderId); if (!success) { return BadRequest(new { error = "Failed to move folder" }); diff --git a/Media.JoshHeaps.Net/Api/FolderShareApi.cs b/Media.JoshHeaps.Net/Api/FolderShareApi.cs index 2e83f65..d65b62b 100644 --- a/Media.JoshHeaps.Net/Api/FolderShareApi.cs +++ b/Media.JoshHeaps.Net/Api/FolderShareApi.cs @@ -6,17 +6,8 @@ namespace Media.JoshHeaps.Net.Api; [ApiController] [Route("api/folder-share")] -public class FolderShareApi : ControllerBase +public class FolderShareApi(FolderService folderService, UserService userService) : ControllerBase { - private readonly FolderService _folderService; - private readonly UserService _userService; - - public FolderShareApi(FolderService folderService, UserService userService) - { - _folderService = folderService; - _userService = userService; - } - [HttpPost("share")] public async Task ShareFolder([FromBody] ShareFolderRequest request) { @@ -26,7 +17,7 @@ public class FolderShareApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var share = await _folderService.ShareFolderAsync(request.FolderId, userId.Value, request.SharedWithUserId); + var share = await folderService.ShareFolderAsync(request.FolderId, userId.Value, request.SharedWithUserId); if (share == null) { return BadRequest(new { error = "Failed to share folder" }); @@ -44,7 +35,7 @@ public class FolderShareApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var success = await _folderService.UnshareFolderAsync(folderId, userId.Value, sharedWithUserId); + var success = await folderService.UnshareFolderAsync(folderId, userId.Value, sharedWithUserId); if (!success) { return BadRequest(new { error = "Failed to unshare folder" }); @@ -62,7 +53,7 @@ public class FolderShareApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var shares = await _folderService.GetFolderSharesAsync(folderId, userId.Value); + var shares = await folderService.GetFolderSharesAsync(folderId, userId.Value); return Ok(shares); } @@ -75,7 +66,7 @@ public class FolderShareApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var sharedFolders = await _folderService.GetSharedFoldersAsync(userId.Value); + var sharedFolders = await folderService.GetSharedFoldersAsync(userId.Value); return Ok(sharedFolders); } @@ -93,7 +84,7 @@ public class FolderShareApi : ControllerBase return Ok(new List()); } - var users = await _userService.SearchUsersAsync(query, userId.Value); + var users = await userService.SearchUsersAsync(query, userId.Value); return Ok(users); } diff --git a/Media.JoshHeaps.Net/Api/GraphApi.cs b/Media.JoshHeaps.Net/Api/GraphApi.cs new file mode 100644 index 0000000..a35d6d5 --- /dev/null +++ b/Media.JoshHeaps.Net/Api/GraphApi.cs @@ -0,0 +1,381 @@ +using Media.JoshHeaps.Net.Services; +using Media.JoshHeaps.Net.Models; +using Microsoft.AspNetCore.Mvc; +using System.Security.Claims; + +namespace Media.JoshHeaps.Net.Api; + +[ApiController] +[Route("api/graph")] +public class GraphApi(GraphService graphService) : ControllerBase +{ + + #region Graph Endpoints + + [HttpGet("list")] + public async Task ListGraphs() + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var graphs = await graphService.GetUserGraphsAsync(userId.Value); + return Ok(graphs); + } + + [HttpGet("{graphId}")] + public async Task GetGraph(long graphId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var graph = await graphService.GetGraphByIdAsync(graphId, userId.Value); + if (graph == null) + { + return NotFound(new { error = "Graph not found" }); + } + + return Ok(graph); + } + + [HttpGet("{graphId}/data")] + public async Task GetGraphData(long graphId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var graphData = await graphService.GetGraphDataAsync(graphId, userId.Value); + if (graphData.Graph == null || graphData.Graph.Id == 0) + { + return NotFound(new { error = "Graph not found" }); + } + + return Ok(graphData); + } + + [HttpPost("create")] + public async Task CreateGraph([FromBody] CreateGraphRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(request.Name)) + { + return BadRequest(new { error = "Graph name is required" }); + } + + var graph = await graphService.CreateGraphAsync(userId.Value, request.Name, request.Description); + if (graph == null) + { + return BadRequest(new { error = "Failed to create graph" }); + } + + return Ok(graph); + } + + [HttpPut("{graphId}")] + public async Task UpdateGraph(long graphId, [FromBody] UpdateGraphRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(request.Name)) + { + return BadRequest(new { error = "Graph name is required" }); + } + + var success = await graphService.UpdateGraphAsync(graphId, userId.Value, request.Name, request.Description); + if (!success) + { + return BadRequest(new { error = "Failed to update graph" }); + } + + return Ok(new { success = true }); + } + + [HttpDelete("{graphId}")] + public async Task DeleteGraph(long graphId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var success = await graphService.DeleteGraphAsync(graphId, userId.Value); + if (!success) + { + return BadRequest(new { error = "Failed to delete graph" }); + } + + return Ok(new { success = true }); + } + + [HttpPost("{graphId}/clone")] + public async Task CloneGraph(long graphId, [FromBody] CloneGraphRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(request.NewName)) + { + return BadRequest(new { error = "New graph name is required" }); + } + + var newGraph = await graphService.CloneGraphAsync(graphId, userId.Value, request.NewName); + if (newGraph == null) + { + return BadRequest(new { error = "Failed to clone graph" }); + } + + return Ok(newGraph); + } + + #endregion + + #region Node Endpoints + + [HttpGet("{graphId}/nodes")] + public async Task GetNodes(long graphId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var nodes = await graphService.GetGraphNodesAsync(graphId, userId.Value); + return Ok(nodes); + } + + [HttpPost("{graphId}/nodes")] + public async Task CreateNode(long graphId, [FromBody] CreateNodeRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(request.Label)) + { + return BadRequest(new { error = "Node label is required" }); + } + + var node = await graphService.CreateNodeAsync(graphId, userId.Value, request.Label, request.Notes); + if (node == null) + { + return BadRequest(new { error = "Failed to create node" }); + } + + return Ok(node); + } + + [HttpPut("nodes/{nodeId}")] + public async Task UpdateNode(long nodeId, [FromBody] UpdateNodeRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(request.Label)) + { + return BadRequest(new { error = "Node label is required" }); + } + + var success = await graphService.UpdateNodeAsync(nodeId, userId.Value, request.Label, request.Notes); + if (!success) + { + return BadRequest(new { error = "Failed to update node" }); + } + + return Ok(new { success = true }); + } + + [HttpDelete("nodes/{nodeId}")] + public async Task DeleteNode(long nodeId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var success = await graphService.DeleteNodeAsync(nodeId, userId.Value); + if (!success) + { + return BadRequest(new { error = "Failed to delete node" }); + } + + return Ok(new { success = true }); + } + + [HttpGet("{graphId}/nodes/search")] + public async Task SearchNodes(long graphId, [FromQuery] string q) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + if (string.IsNullOrWhiteSpace(q)) + { + return BadRequest(new { error = "Search term is required" }); + } + + var nodes = await graphService.SearchNodesAsync(graphId, userId.Value, q); + return Ok(nodes); + } + + #endregion + + #region Edge Endpoints + + [HttpGet("{graphId}/edges")] + public async Task GetEdges(long graphId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var edges = await graphService.GetGraphEdgesAsync(graphId, userId.Value); + return Ok(edges); + } + + [HttpPost("{graphId}/edges")] + public async Task CreateEdge(long graphId, [FromBody] CreateEdgeRequest request) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var edge = await graphService.CreateEdgeAsync(graphId, userId.Value, request.SourceNodeId, request.TargetNodeId); + if (edge == null) + { + return BadRequest(new { error = "Failed to create edge" }); + } + + return Ok(edge); + } + + [HttpDelete("edges/{edgeId}")] + public async Task DeleteEdge(long edgeId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var success = await graphService.DeleteEdgeAsync(edgeId, userId.Value); + if (!success) + { + return BadRequest(new { error = "Failed to delete edge" }); + } + + return Ok(new { success = true }); + } + + #endregion + + #region Filter Endpoints + + [HttpGet("{graphId}/nodes/filter/connects-to/{targetNodeId}")] + public async Task FilterConnectsTo(long graphId, long targetNodeId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var nodes = await graphService.FilterConnectsToAsync(graphId, userId.Value, targetNodeId); + return Ok(nodes); + } + + [HttpGet("{graphId}/nodes/filter/not-connects-to/{targetNodeId}")] + public async Task FilterDoesNotConnectTo(long graphId, long targetNodeId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var nodes = await graphService.FilterDoesNotConnectToAsync(graphId, userId.Value, targetNodeId); + return Ok(nodes); + } + + [HttpGet("{graphId}/nodes/filter/two-degrees/{targetNodeId}")] + public async Task FilterTwoDegrees(long graphId, long targetNodeId) + { + var userId = GetUserIdFromAuth(); + if (userId == null) + { + return Unauthorized(new { error = "Not authenticated" }); + } + + var nodes = await graphService.FilterConnectsTwoDegreesAsync(graphId, userId.Value, targetNodeId); + return Ok(nodes); + } + + #endregion + + #region Helper Methods + + private long? GetUserIdFromAuth() + { + // First try JWT claims (for mobile/API authentication) + var userIdClaim = User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + if (!string.IsNullOrEmpty(userIdClaim) && long.TryParse(userIdClaim, out var jwtUserId)) + { + return jwtUserId; + } + + // Fall back to session (for web authentication) + var userIdString = HttpContext.Session.GetString("UserId"); + if (!string.IsNullOrEmpty(userIdString) && long.TryParse(userIdString, out var sessionUserId)) + { + return sessionUserId; + } + + return null; + } + + #endregion +} + +#region Request Models + +public record CreateGraphRequest(string Name, string? Description); +public record UpdateGraphRequest(string Name, string? Description); +public record CloneGraphRequest(string NewName); +public record CreateNodeRequest(string Label, string? Notes); +public record UpdateNodeRequest(string Label, string? Notes); +public record CreateEdgeRequest(long SourceNodeId, long TargetNodeId); + +#endregion diff --git a/Media.JoshHeaps.Net/Api/MediaApi.cs b/Media.JoshHeaps.Net/Api/MediaApi.cs index debd78e..e03f1a9 100644 --- a/Media.JoshHeaps.Net/Api/MediaApi.cs +++ b/Media.JoshHeaps.Net/Api/MediaApi.cs @@ -6,17 +6,8 @@ namespace Media.JoshHeaps.Net.Api; [ApiController] [Route("api/media")] -public class MediaApi : ControllerBase +public class MediaApi(MediaService mediaService, FolderService folderService) : ControllerBase { - private readonly MediaService _mediaService; - private readonly FolderService _folderService; - - public MediaApi(MediaService mediaService, FolderService folderService) - { - _mediaService = mediaService; - _folderService = folderService; - } - [HttpGet("load")] public async Task LoadMedia([FromQuery] int offset = 0, [FromQuery] int limit = 20, [FromQuery] long? folderId = null) { @@ -27,7 +18,7 @@ public class MediaApi : ControllerBase return Unauthorized(); } - var media = await _mediaService.GetUserMediaAsync(userId.Value, offset, limit, folderId, userId.Value); + var media = await mediaService.GetUserMediaAsync(userId.Value, offset, limit, folderId, userId.Value); return Ok(media); } @@ -43,14 +34,14 @@ public class MediaApi : ControllerBase } // Get media metadata (includes ownership check) - var media = await _mediaService.GetMediaByIdAsync(mediaId, userId.Value); + var media = await mediaService.GetMediaByIdAsync(mediaId, userId.Value); if (media == null) { return NotFound(new { error = "Image not found or access denied" }); } // Get decrypted image data - var imageData = await _mediaService.GetDecryptedMediaDataAsync(mediaId, userId.Value); + var imageData = await mediaService.GetDecryptedMediaDataAsync(mediaId, userId.Value); if (imageData == null) { return NotFound(new { error = "Image file not found" }); @@ -73,7 +64,7 @@ public class MediaApi : ControllerBase // Check folder ownership if uploading to a folder (can't upload to shared folders) if (folderId.HasValue) { - var ownerId = await _folderService.GetFolderOwnerIdAsync(folderId.Value); + var ownerId = await folderService.GetFolderOwnerIdAsync(folderId.Value); if (ownerId != userId.Value) { return Forbid("Cannot upload to shared folders"); @@ -99,7 +90,7 @@ public class MediaApi : ControllerBase } // Save media using existing service - var media = await _mediaService.SaveMediaAsync(userId.Value, file, description, folderId); + var media = await mediaService.SaveMediaAsync(userId.Value, file, description, folderId); if (media == null) { return StatusCode(500, new { error = "Failed to upload image" }); @@ -118,7 +109,7 @@ public class MediaApi : ControllerBase return Unauthorized(new { error = "Not authenticated" }); } - var success = await _mediaService.MoveMediaToFolderAsync(request.MediaId, userId.Value, request.FolderId); + var success = await mediaService.MoveMediaToFolderAsync(request.MediaId, userId.Value, request.FolderId); if (!success) { return BadRequest(new { error = "Failed to move media" }); @@ -147,7 +138,7 @@ public class MediaApi : ControllerBase foreach (var mediaId in request.MediaIds) { - var success = await _mediaService.MoveMediaToFolderAsync(mediaId, userId.Value, request.FolderId); + var success = await mediaService.MoveMediaToFolderAsync(mediaId, userId.Value, request.FolderId); if (success) { successCount++; diff --git a/Media.JoshHeaps.Net/Database/007_graphs.sql b/Media.JoshHeaps.Net/Database/007_graphs.sql new file mode 100644 index 0000000..9bff27f --- /dev/null +++ b/Media.JoshHeaps.Net/Database/007_graphs.sql @@ -0,0 +1,16 @@ +-- Network Graphs Table +-- Stores user-created network graphs +CREATE TABLE IF NOT EXISTS app.graphs ( + id BIGSERIAL PRIMARY KEY, + user_id BIGINT NOT NULL, + name VARCHAR(255) NOT NULL, + description TEXT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (user_id) REFERENCES app.users(id) ON DELETE CASCADE, + -- Ensure graph names are unique per user + UNIQUE (user_id, name) +); + +CREATE INDEX IF NOT EXISTS idx_graphs_user_id ON app.graphs(user_id); +CREATE INDEX IF NOT EXISTS idx_graphs_name ON app.graphs(name); diff --git a/Media.JoshHeaps.Net/Database/008_graph_nodes.sql b/Media.JoshHeaps.Net/Database/008_graph_nodes.sql new file mode 100644 index 0000000..02fcb72 --- /dev/null +++ b/Media.JoshHeaps.Net/Database/008_graph_nodes.sql @@ -0,0 +1,15 @@ +-- Graph Nodes Table +-- Stores nodes within network graphs +-- Node positions are calculated automatically by the client using community detection +CREATE TABLE IF NOT EXISTS app.graph_nodes ( + id BIGSERIAL PRIMARY KEY, + graph_id BIGINT NOT NULL, + label VARCHAR(255) NOT NULL, + notes TEXT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (graph_id) REFERENCES app.graphs(id) ON DELETE CASCADE +); + +CREATE INDEX IF NOT EXISTS idx_graph_nodes_graph_id ON app.graph_nodes(graph_id); +CREATE INDEX IF NOT EXISTS idx_graph_nodes_label ON app.graph_nodes(label); diff --git a/Media.JoshHeaps.Net/Database/009_graph_edges.sql b/Media.JoshHeaps.Net/Database/009_graph_edges.sql new file mode 100644 index 0000000..2ccacbe --- /dev/null +++ b/Media.JoshHeaps.Net/Database/009_graph_edges.sql @@ -0,0 +1,22 @@ +-- Graph Edges Table +-- Stores connections/relationships between nodes in a graph +CREATE TABLE IF NOT EXISTS app.graph_edges ( + id BIGSERIAL PRIMARY KEY, + graph_id BIGINT NOT NULL, + source_node_id BIGINT NOT NULL, + target_node_id BIGINT NOT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (graph_id) REFERENCES app.graphs(id) ON DELETE CASCADE, + FOREIGN KEY (source_node_id) REFERENCES app.graph_nodes(id) ON DELETE CASCADE, + FOREIGN KEY (target_node_id) REFERENCES app.graph_nodes(id) ON DELETE CASCADE, + -- Prevent duplicate edges between the same nodes + UNIQUE (graph_id, source_node_id, target_node_id), + -- Prevent self-loops (node connecting to itself) + CHECK (source_node_id != target_node_id) +); + +CREATE INDEX IF NOT EXISTS idx_graph_edges_graph_id ON app.graph_edges(graph_id); +CREATE INDEX IF NOT EXISTS idx_graph_edges_source_node_id ON app.graph_edges(source_node_id); +CREATE INDEX IF NOT EXISTS idx_graph_edges_target_node_id ON app.graph_edges(target_node_id); +-- Composite index for efficient bidirectional queries +CREATE INDEX IF NOT EXISTS idx_graph_edges_nodes ON app.graph_edges(source_node_id, target_node_id); diff --git a/Media.JoshHeaps.Net/DbExecutor.cs b/Media.JoshHeaps.Net/DbExecutor.cs index b9b38ca..fb3119b 100644 --- a/Media.JoshHeaps.Net/DbExecutor.cs +++ b/Media.JoshHeaps.Net/DbExecutor.cs @@ -103,4 +103,20 @@ public class DbExecutor(IConfiguration config) return results; } + + // Executes a non-query command (INSERT, UPDATE, DELETE) and returns rows affected + public async Task ExecuteNonQueryAsync(string query, object? parameters = null) + { + parameters ??= new(); + using var conn = new NpgsqlConnection(ConnectionString); + await conn.OpenAsync(); + using var cmd = new NpgsqlCommand(query, conn); + + foreach (var prop in parameters.GetType().GetProperties()) + { + cmd.Parameters.AddWithValue($"@{prop.Name}", prop.GetValue(parameters) ?? DBNull.Value); + } + + return await cmd.ExecuteNonQueryAsync(); + } } diff --git a/Media.JoshHeaps.Net/Models/Graph.cs b/Media.JoshHeaps.Net/Models/Graph.cs new file mode 100644 index 0000000..5155c22 --- /dev/null +++ b/Media.JoshHeaps.Net/Models/Graph.cs @@ -0,0 +1,17 @@ +namespace Media.JoshHeaps.Net.Models; + +public class Graph +{ + public long Id { get; set; } + public long UserId { get; set; } + public string Name { get; set; } = string.Empty; + public string? Description { get; set; } + public DateTime CreatedAt { get; set; } + public DateTime UpdatedAt { get; set; } +} + +public class GraphWithCounts : Graph +{ + public int NodeCount { get; set; } + public int EdgeCount { get; set; } +} diff --git a/Media.JoshHeaps.Net/Models/GraphEdge.cs b/Media.JoshHeaps.Net/Models/GraphEdge.cs new file mode 100644 index 0000000..f64f265 --- /dev/null +++ b/Media.JoshHeaps.Net/Models/GraphEdge.cs @@ -0,0 +1,17 @@ +namespace Media.JoshHeaps.Net.Models; + +public class GraphEdge +{ + public long Id { get; set; } + public long GraphId { get; set; } + public long SourceNodeId { get; set; } + public long TargetNodeId { get; set; } + public DateTime CreatedAt { get; set; } +} + +public class GraphData +{ + public Graph Graph { get; set; } = new(); + public List Nodes { get; set; } = []; + public List Edges { get; set; } = []; +} diff --git a/Media.JoshHeaps.Net/Models/GraphNode.cs b/Media.JoshHeaps.Net/Models/GraphNode.cs new file mode 100644 index 0000000..0a46758 --- /dev/null +++ b/Media.JoshHeaps.Net/Models/GraphNode.cs @@ -0,0 +1,16 @@ +namespace Media.JoshHeaps.Net.Models; + +public class GraphNode +{ + public long Id { get; set; } + public long GraphId { get; set; } + public string Label { get; set; } = string.Empty; + public string? Notes { get; set; } + public DateTime CreatedAt { get; set; } + public DateTime UpdatedAt { get; set; } +} + +public class GraphNodeWithConnections : GraphNode +{ + public int ConnectionCount { get; set; } +} diff --git a/Media.JoshHeaps.Net/Pages/Index.cshtml b/Media.JoshHeaps.Net/Pages/Gallery.cshtml similarity index 86% rename from Media.JoshHeaps.Net/Pages/Index.cshtml rename to Media.JoshHeaps.Net/Pages/Gallery.cshtml index 6aabf0e..9c8fd76 100644 --- a/Media.JoshHeaps.Net/Pages/Index.cshtml +++ b/Media.JoshHeaps.Net/Pages/Gallery.cshtml @@ -1,18 +1,26 @@ @page "{handler?}" -@model Media.JoshHeaps.Net.Pages.IndexModel +@model Media.JoshHeaps.Net.Pages.GalleryModel @{ - ViewData["Title"] = "Dashboard"; + ViewData["Title"] = "Gallery"; Layout = "_Layout"; } @section Styles { - + }
-

Welcome back, @Model.Dashboard?.Username!

+
+ + + + + + +

Welcome back, @Model.Dashboard?.Username!

+
@if (Model.Dashboard?.EmailVerified == false) { @@ -59,11 +67,11 @@
- Home + Home @foreach (var folder in Model.FolderPath) { / - @folder.Name + @folder.Name } @if (Model.IsSharedFolder && !string.IsNullOrEmpty(Model.SharedByUsername)) { @@ -72,9 +80,9 @@
- My Folders - Shared with Me - All + My Folders + Shared with Me + All
@if (!Model.IsSharedFolder) { @@ -97,8 +105,8 @@ @if (Model.CurrentFolderId.HasValue) { var backUrl = Model.FolderPath.Count > 1 - ? $"/?folderId={Model.FolderPath[Model.FolderPath.Count - 2].Id}&view={Model.ViewMode}" - : $"/?view={Model.ViewMode}"; + ? $"/Gallery?folderId={Model.FolderPath[Model.FolderPath.Count - 2].Id}&view={Model.ViewMode}" + : $"/Gallery?view={Model.ViewMode}";
@@ -110,7 +118,7 @@ } @foreach (var sharedFolder in Model.SharedFolders) { -
+
@@ -125,7 +133,7 @@ } @foreach (var folder in Model.Folders) { -
+
@@ -226,4 +234,4 @@ -} \ No newline at end of file +} diff --git a/Media.JoshHeaps.Net/Pages/Index.cshtml.cs b/Media.JoshHeaps.Net/Pages/Gallery.cshtml.cs similarity index 94% rename from Media.JoshHeaps.Net/Pages/Index.cshtml.cs rename to Media.JoshHeaps.Net/Pages/Gallery.cshtml.cs index 4ebea30..e2c1a94 100644 --- a/Media.JoshHeaps.Net/Pages/Index.cshtml.cs +++ b/Media.JoshHeaps.Net/Pages/Gallery.cshtml.cs @@ -4,16 +4,16 @@ using Microsoft.AspNetCore.Mvc; namespace Media.JoshHeaps.Net.Pages { - public class IndexModel(UserService userService, MediaService mediaService, FolderService folderService) : AuthenticatedPageModel + public class GalleryModel(UserService userService, MediaService mediaService, FolderService folderService) : AuthenticatedPageModel { private readonly MediaService _mediaService = mediaService; private readonly FolderService _folderService = folderService; public UserDashboard? Dashboard { get; set; } - public List MediaItems { get; set; } = new(); - public List Folders { get; set; } = new(); - public List FolderPath { get; set; } = new(); - public List SharedFolders { get; set; } = new(); + public List MediaItems { get; set; } = []; + public List Folders { get; set; } = []; + public List FolderPath { get; set; } = []; + public List SharedFolders { get; set; } = []; public long? CurrentFolderId { get; set; } public bool IsSharedFolder { get; set; } public long? FolderOwnerId { get; set; } @@ -64,7 +64,7 @@ namespace Media.JoshHeaps.Net.Pages SharedFolders = await _folderService.GetSharedFoldersAsync(UserId); if (!CurrentFolderId.HasValue) { - Folders = new List(); + Folders = []; } else if (IsSharedFolder && FolderOwnerId.HasValue) { diff --git a/Media.JoshHeaps.Net/Pages/Landing.cshtml b/Media.JoshHeaps.Net/Pages/Landing.cshtml new file mode 100644 index 0000000..d599859 --- /dev/null +++ b/Media.JoshHeaps.Net/Pages/Landing.cshtml @@ -0,0 +1,105 @@ +@page +@model Media.JoshHeaps.Net.Pages.LandingModel +@{ + ViewData["Title"] = "Home"; + Layout = null; +} + + + + + + + @ViewData["Title"] - Media Manager + + + + + +
+
+
+
+
+ + + + + +
+

Welcome Back

+

Choose a workspace to continue

+
+
+ +
+ +
+
+
+ + + + + +
+
+
+

Media Storage

+

Upload, organize, and manage your images in folders with sharing capabilities

+
+
+
+ Open workspace +
+ + + + +
+
+ + + +
+
+
+ + + + + + + + + + + +
+
+
+

Network Graphs

+

Create and visualize network graphs to map relationships and connections

+
+
+
+ Open workspace +
+ + + + +
+
+ +
+ +
+ Profile + • + Logout +
+
+
+ + diff --git a/Media.JoshHeaps.Net/Pages/Landing.cshtml.cs b/Media.JoshHeaps.Net/Pages/Landing.cshtml.cs new file mode 100644 index 0000000..5b91072 --- /dev/null +++ b/Media.JoshHeaps.Net/Pages/Landing.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Media.JoshHeaps.Net.Pages +{ + public class LandingModel : AuthenticatedPageModel + { + public void OnGet() + { + RequireAuthentication(); + } + } +} diff --git a/Media.JoshHeaps.Net/Pages/Login.cshtml.cs b/Media.JoshHeaps.Net/Pages/Login.cshtml.cs index 1a88ff3..ec68471 100644 --- a/Media.JoshHeaps.Net/Pages/Login.cshtml.cs +++ b/Media.JoshHeaps.Net/Pages/Login.cshtml.cs @@ -5,10 +5,8 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Media.JoshHeaps.Net.Pages; -public class LoginModel : PageModel +public class LoginModel(AuthService authService) : PageModel { - private readonly AuthService _authService; - [BindProperty] public string Email { get; set; } = string.Empty; @@ -22,18 +20,13 @@ public class LoginModel : PageModel public string? SuccessMessage { get; set; } public string? WarningMessage { get; set; } - public LoginModel(AuthService authService) - { - _authService = authService; - } - public void OnGet([FromQuery] string? registered, [FromQuery] string? verified) { // Check if user is already logged in var userId = HttpContext.Session.GetString("UserId"); if (!string.IsNullOrEmpty(userId)) { - Response.Redirect("/"); + Response.Redirect("/Landing"); return; } @@ -58,7 +51,7 @@ public class LoginModel : PageModel return Page(); } - var (success, error, userInfo) = await _authService.LoginAsync(Email, Password); + var (success, error, userInfo) = await authService.LoginAsync(Email, Password); if (!success || userInfo == null) { @@ -91,6 +84,6 @@ public class LoginModel : PageModel Response.Cookies.Append("RememberMe", userInfo.Id.ToString(), cookieOptions); } - return Redirect("/"); + return Redirect("/Landing"); } } diff --git a/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml b/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml new file mode 100644 index 0000000..446d94c --- /dev/null +++ b/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml @@ -0,0 +1,275 @@ +@page +@model Media.JoshHeaps.Net.Pages.NetworkGraphModel +@{ + ViewData["Title"] = "Network Graphs"; + Layout = "_Layout"; +} + +@section Styles { + + +} + +
+ +
+
+ + + + + + +

Network Graphs

+
+
+ + Profile + Logout +
+
+ + +
+
+

+ + + + + + + Your Graphs +

+
+ @if (Model.Graphs.Count == 0) + { +
+

No graphs yet. Create your first graph to get started!

+
+ } + else + { + foreach (var graph in Model.Graphs) + { +
+
+
@graph.Name
+
+ @graph.NodeCount nodes + @graph.EdgeCount edges +
+
+
+ + + +
+
+ } + } +
+
+
+ + + +
+ + + + + + + + + + +@section Scripts { + + +} + diff --git a/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml.cs b/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml.cs new file mode 100644 index 0000000..282dc30 --- /dev/null +++ b/Media.JoshHeaps.Net/Pages/NetworkGraph.cshtml.cs @@ -0,0 +1,25 @@ +using Media.JoshHeaps.Net.Models; +using Media.JoshHeaps.Net.Services; +using Microsoft.AspNetCore.Mvc; + +namespace Media.JoshHeaps.Net.Pages +{ + public class NetworkGraphModel(GraphService graphService) : AuthenticatedPageModel + { + private readonly GraphService _graphService = graphService; + + public List Graphs { get; set; } = []; + public long? SelectedGraphId { get; set; } + + public async Task OnGetAsync([FromQuery] long? graphId = null) + { + RequireAuthentication(); + LoadUserSession(); + + Graphs = await _graphService.GetUserGraphsAsync(UserId); + SelectedGraphId = graphId; + + return Page(); + } + } +} diff --git a/Media.JoshHeaps.Net/Pages/Register.cshtml.cs b/Media.JoshHeaps.Net/Pages/Register.cshtml.cs index a968236..b3d0bcb 100644 --- a/Media.JoshHeaps.Net/Pages/Register.cshtml.cs +++ b/Media.JoshHeaps.Net/Pages/Register.cshtml.cs @@ -5,11 +5,8 @@ using System.Text.RegularExpressions; namespace Media.JoshHeaps.Net.Pages; -public class RegisterModel : PageModel +public class RegisterModel(AuthService authService, EmailService emailService) : PageModel { - private readonly AuthService _authService; - private readonly EmailService _emailService; - [BindProperty] public string Email { get; set; } = string.Empty; @@ -24,12 +21,6 @@ public class RegisterModel : PageModel public string? ErrorMessage { get; set; } - public RegisterModel(AuthService authService, EmailService emailService) - { - _authService = authService; - _emailService = emailService; - } - public void OnGet() { // Check if user is already logged in @@ -79,7 +70,7 @@ public class RegisterModel : PageModel } // Register user - var (success, error, verificationToken) = await _authService.RegisterUserAsync(Email, Username, Password); + var (success, error, verificationToken) = await authService.RegisterUserAsync(Email, Username, Password); if (!success) { @@ -90,7 +81,7 @@ public class RegisterModel : PageModel // Send verification email if (!string.IsNullOrEmpty(verificationToken)) { - await _emailService.SendVerificationEmailAsync(Email, Username, verificationToken); + await emailService.SendVerificationEmailAsync(Email, Username, verificationToken); } // Redirect to verification pending page diff --git a/Media.JoshHeaps.Net/Pages/ResendVerification.cshtml.cs b/Media.JoshHeaps.Net/Pages/ResendVerification.cshtml.cs index a9e6107..b2dd605 100644 --- a/Media.JoshHeaps.Net/Pages/ResendVerification.cshtml.cs +++ b/Media.JoshHeaps.Net/Pages/ResendVerification.cshtml.cs @@ -4,23 +4,14 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Media.JoshHeaps.Net.Pages; -public class ResendVerificationModel : PageModel +public class ResendVerificationModel(AuthService authService, EmailService emailService) : PageModel { - private readonly AuthService _authService; - private readonly EmailService _emailService; - [BindProperty] public string Email { get; set; } = string.Empty; public string? ErrorMessage { get; set; } public string? SuccessMessage { get; set; } - public ResendVerificationModel(AuthService authService, EmailService emailService) - { - _authService = authService; - _emailService = emailService; - } - public void OnGet([FromQuery] string? email) { if (!string.IsNullOrEmpty(email)) @@ -37,7 +28,7 @@ public class ResendVerificationModel : PageModel return Page(); } - var (success, error, verificationToken) = await _authService.ResendVerificationTokenAsync(Email); + var (success, error, verificationToken) = await authService.ResendVerificationTokenAsync(Email); if (!success) { @@ -48,7 +39,7 @@ public class ResendVerificationModel : PageModel // Send verification email if (!string.IsNullOrEmpty(verificationToken)) { - var emailSent = await _emailService.SendVerificationEmailAsync(Email, Email, verificationToken); + var emailSent = await emailService.SendVerificationEmailAsync(Email, Email, verificationToken); if (emailSent) { diff --git a/Media.JoshHeaps.Net/Pages/VerifyEmail.cshtml.cs b/Media.JoshHeaps.Net/Pages/VerifyEmail.cshtml.cs index a75b66f..5acfd61 100644 --- a/Media.JoshHeaps.Net/Pages/VerifyEmail.cshtml.cs +++ b/Media.JoshHeaps.Net/Pages/VerifyEmail.cshtml.cs @@ -4,19 +4,12 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Media.JoshHeaps.Net.Pages; -public class VerifyEmailModel : PageModel +public class VerifyEmailModel(AuthService authService) : PageModel { - private readonly AuthService _authService; - public bool Success { get; set; } public string Message { get; set; } = string.Empty; public bool ShowResendLink { get; set; } - public VerifyEmailModel(AuthService authService) - { - _authService = authService; - } - public async Task OnGetAsync([FromQuery] string? token) { if (string.IsNullOrEmpty(token)) @@ -27,7 +20,7 @@ public class VerifyEmailModel : PageModel return Page(); } - var (success, error) = await _authService.VerifyEmailAsync(token); + var (success, error) = await authService.VerifyEmailAsync(token); Success = success; diff --git a/Media.JoshHeaps.Net/Program.cs b/Media.JoshHeaps.Net/Program.cs index ff97c82..9a70816 100644 --- a/Media.JoshHeaps.Net/Program.cs +++ b/Media.JoshHeaps.Net/Program.cs @@ -16,6 +16,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); // Add session support builder.Services.AddDistributedMemoryCache(); @@ -71,4 +72,11 @@ app.UseAuthorization(); app.MapRazorPages(); app.MapControllers(); // Map API controllers +// Redirect root to Landing page +app.MapGet("/", context => +{ + context.Response.Redirect("/Landing"); + return Task.CompletedTask; +}); + app.Run(); diff --git a/Media.JoshHeaps.Net/Services/EmailService.cs b/Media.JoshHeaps.Net/Services/EmailService.cs index 64a4484..29d7970 100644 --- a/Media.JoshHeaps.Net/Services/EmailService.cs +++ b/Media.JoshHeaps.Net/Services/EmailService.cs @@ -4,28 +4,19 @@ using MimeKit; namespace Media.JoshHeaps.Net.Services; -public class EmailService +public class EmailService(IConfiguration config, ILogger logger) { - private readonly IConfiguration _config; - private readonly ILogger _logger; - - public EmailService(IConfiguration config, ILogger logger) - { - _config = config; - _logger = logger; - } - public async Task SendVerificationEmailAsync(string toEmail, string username, string verificationToken) { try { - var appUrl = _config["AppUrl"] ?? "https://media.joshheaps.net"; + var appUrl = config["AppUrl"] ?? "https://media.joshheaps.net"; var verificationUrl = $"{appUrl}/VerifyEmail?token={verificationToken}"; var message = new MimeMessage(); message.From.Add(new MailboxAddress( - _config["Email:FromName"] ?? "Media App", - _config["Email:FromEmail"] ?? "noreply@example.com" + config["Email:FromName"] ?? "Media App", + config["Email:FromEmail"] ?? "noreply@example.com" )); message.To.Add(new MailboxAddress(username, toEmail)); message.Subject = "Verify Your Email Address"; @@ -85,11 +76,11 @@ If you didn't create an account, you can safely ignore this email. using var client = new SmtpClient(); - var smtpHost = _config["Email:SmtpHost"]; - var smtpPort = int.Parse(_config["Email:SmtpPort"] ?? "587"); - var smtpUsername = _config["Email:SmtpUsername"]; - var smtpPassword = _config["Email:SmtpPassword"]; - var enableSsl = bool.Parse(_config["Email:EnableSsl"] ?? "true"); + var smtpHost = config["Email:SmtpHost"]; + var smtpPort = int.Parse(config["Email:SmtpPort"] ?? "587"); + var smtpUsername = config["Email:SmtpUsername"]; + var smtpPassword = config["Email:SmtpPassword"]; + var enableSsl = bool.Parse(config["Email:EnableSsl"] ?? "true"); await client.ConnectAsync(smtpHost, smtpPort, enableSsl ? SecureSocketOptions.StartTls : SecureSocketOptions.None); @@ -101,12 +92,12 @@ If you didn't create an account, you can safely ignore this email. await client.SendAsync(message); await client.DisconnectAsync(true); - _logger.LogInformation($"Verification email sent to {toEmail}"); + logger.LogInformation($"Verification email sent to {toEmail}"); return true; } catch (Exception ex) { - _logger.LogError(ex, $"Failed to send verification email to {toEmail}"); + logger.LogError(ex, $"Failed to send verification email to {toEmail}"); return false; } } @@ -115,13 +106,13 @@ If you didn't create an account, you can safely ignore this email. { try { - var appUrl = _config["AppUrl"] ?? "http://localhost:5000"; + var appUrl = config["AppUrl"] ?? "http://localhost:5000"; var resetUrl = $"{appUrl}/ResetPassword?token={resetToken}"; var message = new MimeMessage(); message.From.Add(new MailboxAddress( - _config["Email:FromName"] ?? "Media App", - _config["Email:FromEmail"] ?? "noreply@example.com" + config["Email:FromName"] ?? "Media App", + config["Email:FromEmail"] ?? "noreply@example.com" )); message.To.Add(new MailboxAddress(username, toEmail)); message.Subject = "Password Reset Request"; @@ -184,11 +175,11 @@ If you didn't request a password reset, you can safely ignore this email. using var client = new SmtpClient(); - var smtpHost = _config["Email:SmtpHost"]; - var smtpPort = int.Parse(_config["Email:SmtpPort"] ?? "587"); - var smtpUsername = _config["Email:SmtpUsername"]; - var smtpPassword = _config["Email:SmtpPassword"]; - var enableSsl = bool.Parse(_config["Email:EnableSsl"] ?? "true"); + var smtpHost = config["Email:SmtpHost"]; + var smtpPort = int.Parse(config["Email:SmtpPort"] ?? "587"); + var smtpUsername = config["Email:SmtpUsername"]; + var smtpPassword = config["Email:SmtpPassword"]; + var enableSsl = bool.Parse(config["Email:EnableSsl"] ?? "true"); await client.ConnectAsync(smtpHost, smtpPort, enableSsl ? SecureSocketOptions.StartTls : SecureSocketOptions.None); @@ -200,12 +191,12 @@ If you didn't request a password reset, you can safely ignore this email. await client.SendAsync(message); await client.DisconnectAsync(true); - _logger.LogInformation($"Password reset email sent to {toEmail}"); + logger.LogInformation($"Password reset email sent to {toEmail}"); return true; } catch (Exception ex) { - _logger.LogError(ex, $"Failed to send password reset email to {toEmail}"); + logger.LogError(ex, $"Failed to send password reset email to {toEmail}"); return false; } } diff --git a/Media.JoshHeaps.Net/Services/FolderService.cs b/Media.JoshHeaps.Net/Services/FolderService.cs index eb34164..f332560 100644 --- a/Media.JoshHeaps.Net/Services/FolderService.cs +++ b/Media.JoshHeaps.Net/Services/FolderService.cs @@ -2,17 +2,8 @@ using Media.JoshHeaps.Net.Models; namespace Media.JoshHeaps.Net.Services; -public class FolderService +public class FolderService(DbExecutor db, ILogger logger) { - private readonly DbExecutor _db; - private readonly ILogger _logger; - - public FolderService(DbExecutor db, ILogger logger) - { - _db = db; - _logger = logger; - } - public async Task CreateFolderAsync(long userId, string name, long? parentFolderId = null) { try @@ -20,7 +11,7 @@ public class FolderService // Validate folder name if (string.IsNullOrWhiteSpace(name)) { - _logger.LogWarning("Cannot create folder with empty name for user {UserId}", userId); + logger.LogWarning("Cannot create folder with empty name for user {UserId}", userId); return null; } @@ -28,7 +19,7 @@ public class FolderService var sanitizedName = SanitizeFolderName(name); if (string.IsNullOrWhiteSpace(sanitizedName)) { - _logger.LogWarning("Folder name became empty after sanitization for user {UserId}", userId); + logger.LogWarning("Folder name became empty after sanitization for user {UserId}", userId); return null; } @@ -38,7 +29,7 @@ public class FolderService var parentExists = await FolderExistsAsync(parentFolderId.Value, userId); if (!parentExists) { - _logger.LogWarning("Parent folder {ParentFolderId} not found for user {UserId}", parentFolderId.Value, userId); + logger.LogWarning("Parent folder {ParentFolderId} not found for user {UserId}", parentFolderId.Value, userId); return null; } } @@ -48,7 +39,7 @@ public class FolderService VALUES (@userId, @name, @parentFolderId, @createdAt, @updatedAt) RETURNING id, user_id, name, parent_folder_id, created_at, updated_at"; - var folder = await _db.ExecuteReaderAsync(query, reader => + var folder = await db.ExecuteReaderAsync(query, reader => { return new Folder { @@ -72,7 +63,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to create folder '{Name}' for user {UserId}", name, userId); + logger.LogError(ex, "Failed to create folder '{Name}' for user {UserId}", name, userId); return null; } } @@ -99,7 +90,7 @@ public class FolderService ORDER BY name ASC"; } - var folders = await _db.ExecuteListReaderAsync(query, reader => + var folders = await db.ExecuteListReaderAsync(query, reader => { return new Folder { @@ -116,8 +107,8 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get folders for user {UserId}, parent {ParentFolderId}", userId, parentFolderId); - return new List(); + logger.LogError(ex, "Failed to get folders for user {UserId}, parent {ParentFolderId}", userId, parentFolderId); + return []; } } @@ -130,7 +121,7 @@ public class FolderService FROM app.folders WHERE id = @folderId AND user_id = @userId"; - var folder = await _db.ExecuteReaderAsync(query, reader => + var folder = await db.ExecuteReaderAsync(query, reader => { return new Folder { @@ -147,7 +138,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get folder {FolderId} for user {UserId}", folderId, userId); + logger.LogError(ex, "Failed to get folder {FolderId} for user {UserId}", folderId, userId); return null; } } @@ -159,7 +150,7 @@ public class FolderService var sanitizedName = SanitizeFolderName(newName); if (string.IsNullOrWhiteSpace(sanitizedName)) { - _logger.LogWarning("Cannot rename folder to empty name"); + logger.LogWarning("Cannot rename folder to empty name"); return false; } @@ -168,7 +159,7 @@ public class FolderService SET name = @newName, updated_at = @updatedAt WHERE id = @folderId AND user_id = @userId"; - await _db.ExecuteAsync(query, new + await db.ExecuteAsync(query, new { folderId, userId, @@ -180,7 +171,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to rename folder {FolderId} for user {UserId}", folderId, userId); + logger.LogError(ex, "Failed to rename folder {FolderId} for user {UserId}", folderId, userId); return false; } } @@ -193,12 +184,12 @@ public class FolderService var hasSubfoldersQuery = "SELECT COUNT(*) FROM app.folders WHERE parent_folder_id = @folderId"; var hasMediaQuery = "SELECT COUNT(*) FROM app.user_media WHERE folder_id = @folderId"; - var subfolderCount = await _db.ExecuteReaderAsync(hasSubfoldersQuery, reader => reader.GetInt64(0), new { folderId }); - var mediaCount = await _db.ExecuteReaderAsync(hasMediaQuery, reader => reader.GetInt64(0), new { folderId }); + var subfolderCount = await db.ExecuteReaderAsync(hasSubfoldersQuery, reader => reader.GetInt64(0), new { folderId }); + var mediaCount = await db.ExecuteReaderAsync(hasMediaQuery, reader => reader.GetInt64(0), new { folderId }); if (!deleteContents && (subfolderCount > 0 || mediaCount > 0)) { - _logger.LogWarning("Cannot delete folder {FolderId} - it contains items", folderId); + logger.LogWarning("Cannot delete folder {FolderId} - it contains items", folderId); return false; } @@ -214,7 +205,7 @@ public class FolderService SET parent_folder_id = @parentFolderId, updated_at = @updatedAt WHERE parent_folder_id = @folderId AND user_id = @userId"; - await _db.ExecuteAsync(moveSubfoldersQuery, new + await db.ExecuteAsync(moveSubfoldersQuery, new { parentFolderId = folder.ParentFolderId, folderId, @@ -228,7 +219,7 @@ public class FolderService SET folder_id = @parentFolderId, updated_at = @updatedAt WHERE folder_id = @folderId AND user_id = @userId"; - await _db.ExecuteAsync(moveMediaQuery, new + await db.ExecuteAsync(moveMediaQuery, new { parentFolderId = folder.ParentFolderId, folderId, @@ -240,13 +231,13 @@ public class FolderService // Delete the folder var deleteQuery = "DELETE FROM app.folders WHERE id = @folderId AND user_id = @userId"; - await _db.ExecuteAsync(deleteQuery, new { folderId, userId }); + await db.ExecuteAsync(deleteQuery, new { folderId, userId }); return true; } catch (Exception ex) { - _logger.LogError(ex, "Failed to delete folder {FolderId} for user {UserId}", folderId, userId); + logger.LogError(ex, "Failed to delete folder {FolderId} for user {UserId}", folderId, userId); return false; } } @@ -275,7 +266,7 @@ public class FolderService var isDescendant = await IsFolderDescendantAsync(newParentFolderId.Value, folderId); if (isDescendant) { - _logger.LogWarning("Cannot move folder {FolderId} into its descendant {ParentFolderId}", folderId, newParentFolderId.Value); + logger.LogWarning("Cannot move folder {FolderId} into its descendant {ParentFolderId}", folderId, newParentFolderId.Value); return false; } } @@ -285,7 +276,7 @@ public class FolderService SET parent_folder_id = @newParentFolderId, updated_at = @updatedAt WHERE id = @folderId AND user_id = @userId"; - await _db.ExecuteAsync(query, new + await db.ExecuteAsync(query, new { folderId, userId, @@ -297,7 +288,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to move folder {FolderId} for user {UserId}", folderId, userId); + logger.LogError(ex, "Failed to move folder {FolderId} for user {UserId}", folderId, userId); return false; } } @@ -330,8 +321,8 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get folder path for folder {FolderId}", folderId); - return new List(); + logger.LogError(ex, "Failed to get folder path for folder {FolderId}", folderId); + return []; } } @@ -340,7 +331,7 @@ public class FolderService try { var query = "SELECT COUNT(*) FROM app.folders WHERE id = @folderId AND user_id = @userId"; - var count = await _db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId, userId }); + var count = await db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId, userId }); return count > 0; } catch @@ -371,7 +362,7 @@ public class FolderService visited.Add(currentId); var query = "SELECT parent_folder_id FROM app.folders WHERE id = @folderId"; - var parentId = await _db.ExecuteReaderAsync(query, reader => reader.IsDBNull(0) ? (long?)null : reader.GetInt64(0), new { folderId = currentId }); + var parentId = await db.ExecuteReaderAsync(query, reader => reader.IsDBNull(0) ? (long?)null : reader.GetInt64(0), new { folderId = currentId }); if (!parentId.HasValue) { @@ -385,7 +376,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to check if folder {PotentialDescendantId} is descendant of {AncestorId}", potentialDescendantId, ancestorId); + logger.LogError(ex, "Failed to check if folder {PotentialDescendantId} is descendant of {AncestorId}", potentialDescendantId, ancestorId); return false; } } @@ -421,7 +412,7 @@ public class FolderService var folder = await GetFolderByIdAsync(folderId, ownerId); if (folder == null) { - _logger.LogWarning("Cannot share folder {FolderId} - not found or not owned by {OwnerId}", folderId, ownerId); + logger.LogWarning("Cannot share folder {FolderId} - not found or not owned by {OwnerId}", folderId, ownerId); return null; } @@ -437,7 +428,7 @@ public class FolderService VALUES (@folderId, @ownerId, @sharedWithUserId, @permissionLevel, @includeSubfolders, @createdAt, @updatedAt) RETURNING id, folder_id, owner_user_id, shared_with_user_id, permission_level, include_subfolders, created_at, updated_at"; - var share = await _db.ExecuteReaderAsync(query, reader => + var share = await db.ExecuteReaderAsync(query, reader => { return new FolderShare { @@ -465,7 +456,7 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to share folder {FolderId} with user {SharedWithUserId}", folderId, sharedWithUserId); + logger.LogError(ex, "Failed to share folder {FolderId} with user {SharedWithUserId}", folderId, sharedWithUserId); return null; } } @@ -478,12 +469,12 @@ public class FolderService DELETE FROM app.folder_shares WHERE folder_id = @folderId AND owner_user_id = @ownerId AND shared_with_user_id = @sharedWithUserId"; - await _db.ExecuteAsync(query, new { folderId, ownerId, sharedWithUserId }); + await db.ExecuteAsync(query, new { folderId, ownerId, sharedWithUserId }); return true; } catch (Exception ex) { - _logger.LogError(ex, "Failed to unshare folder {FolderId} from user {SharedWithUserId}", folderId, sharedWithUserId); + logger.LogError(ex, "Failed to unshare folder {FolderId} from user {SharedWithUserId}", folderId, sharedWithUserId); return false; } } @@ -500,7 +491,7 @@ public class FolderService WHERE fs.folder_id = @folderId AND fs.owner_user_id = @ownerId ORDER BY u.username ASC"; - var shares = await _db.ExecuteListReaderAsync(query, reader => + var shares = await db.ExecuteListReaderAsync(query, reader => { return new FolderShareWithUser { @@ -519,8 +510,8 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get shares for folder {FolderId}", folderId); - return new List(); + logger.LogError(ex, "Failed to get shares for folder {FolderId}", folderId); + return []; } } @@ -536,7 +527,7 @@ public class FolderService WHERE fs.shared_with_user_id = @userId ORDER BY f.name ASC"; - var sharedFolders = await _db.ExecuteListReaderAsync(query, reader => + var sharedFolders = await db.ExecuteListReaderAsync(query, reader => { return new SharedFolderInfo { @@ -553,8 +544,8 @@ public class FolderService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get shared folders for user {UserId}", userId); - return new List(); + logger.LogError(ex, "Failed to get shared folders for user {UserId}", userId); + return []; } } @@ -567,7 +558,7 @@ public class FolderService FROM app.folder_shares WHERE folder_id = @folderId AND shared_with_user_id = @sharedWithUserId"; - var share = await _db.ExecuteReaderAsync(query, reader => + var share = await db.ExecuteReaderAsync(query, reader => { return new FolderShare { @@ -596,7 +587,7 @@ public class FolderService { // Check if user is the owner var query = "SELECT COUNT(*) FROM app.folders WHERE id = @folderId AND user_id = @userId"; - var isOwner = await _db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId, userId }); + var isOwner = await db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId, userId }); if (isOwner > 0) return true; // Check if folder is shared with user (including parent folders due to subfolders) @@ -619,12 +610,12 @@ public class FolderService INNER JOIN folder_hierarchy fh ON fs.folder_id = fh.id WHERE fs.shared_with_user_id = @userId AND fs.include_subfolders = true"; - var hasShare = await _db.ExecuteReaderAsync(shareQuery, reader => reader.GetInt64(0), new { folderId, userId }); + var hasShare = await db.ExecuteReaderAsync(shareQuery, reader => reader.GetInt64(0), new { folderId, userId }); return hasShare > 0; } catch (Exception ex) { - _logger.LogError(ex, "Failed to check folder access for folder {FolderId} and user {UserId}", folderId, userId); + logger.LogError(ex, "Failed to check folder access for folder {FolderId} and user {UserId}", folderId, userId); return false; } } @@ -634,7 +625,7 @@ public class FolderService try { var query = "SELECT user_id FROM app.folders WHERE id = @folderId"; - var ownerId = await _db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId }); + var ownerId = await db.ExecuteReaderAsync(query, reader => reader.GetInt64(0), new { folderId }); return ownerId; } catch diff --git a/Media.JoshHeaps.Net/Services/GraphService.cs b/Media.JoshHeaps.Net/Services/GraphService.cs new file mode 100644 index 0000000..940432b --- /dev/null +++ b/Media.JoshHeaps.Net/Services/GraphService.cs @@ -0,0 +1,810 @@ +using Media.JoshHeaps.Net.Models; + +namespace Media.JoshHeaps.Net.Services; + +public class GraphService(DbExecutor db, ILogger logger) +{ + + #region Graph Operations + + public async Task> GetUserGraphsAsync(long userId) + { + try + { + var query = @" + SELECT + g.id, g.user_id, g.name, g.description, g.created_at, g.updated_at, + COUNT(DISTINCT n.id) as node_count, + COUNT(DISTINCT e.id) as edge_count + FROM app.graphs g + LEFT JOIN app.graph_nodes n ON g.id = n.graph_id + LEFT JOIN app.graph_edges e ON g.id = e.graph_id + WHERE g.user_id = @userId + GROUP BY g.id, g.user_id, g.name, g.description, g.created_at, g.updated_at + ORDER BY g.updated_at DESC"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphWithCounts + { + Id = reader.GetInt64(0), + UserId = reader.GetInt64(1), + Name = reader.GetString(2), + Description = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + NodeCount = reader.GetInt32(6), + EdgeCount = reader.GetInt32(7) + }; + }, new { userId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get graphs for user {UserId}", userId); + return []; + } + } + + public async Task GetGraphByIdAsync(long graphId, long userId) + { + try + { + var query = @" + SELECT id, user_id, name, description, created_at, updated_at + FROM app.graphs + WHERE id = @graphId AND user_id = @userId"; + + return await db.ExecuteReaderAsync(query, reader => + { + return new Graph + { + Id = reader.GetInt64(0), + UserId = reader.GetInt64(1), + Name = reader.GetString(2), + Description = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5) + }; + }, new { graphId, userId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get graph {GraphId} for user {UserId}", graphId, userId); + return null; + } + } + + public async Task CreateGraphAsync(long userId, string name, string? description = null) + { + try + { + if (string.IsNullOrWhiteSpace(name)) + { + logger.LogWarning("Cannot create graph with empty name for user {UserId}", userId); + return null; + } + + var query = @" + INSERT INTO app.graphs (user_id, name, description, created_at, updated_at) + VALUES (@userId, @name, @description, @createdAt, @updatedAt) + RETURNING id, user_id, name, description, created_at, updated_at"; + + return await db.ExecuteReaderAsync(query, reader => + { + return new Graph + { + Id = reader.GetInt64(0), + UserId = reader.GetInt64(1), + Name = reader.GetString(2), + Description = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5) + }; + }, new + { + userId, + name = name.Trim(), + description, + createdAt = DateTime.UtcNow, + updatedAt = DateTime.UtcNow + }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to create graph '{Name}' for user {UserId}", name, userId); + return null; + } + } + + public async Task UpdateGraphAsync(long graphId, long userId, string name, string? description) + { + try + { + if (string.IsNullOrWhiteSpace(name)) + { + logger.LogWarning("Cannot update graph with empty name"); + return false; + } + + var query = @" + UPDATE app.graphs + SET name = @name, description = @description, updated_at = @updatedAt + WHERE id = @graphId AND user_id = @userId"; + + var rowsAffected = await db.ExecuteNonQueryAsync(query, new + { + graphId, + userId, + name = name.Trim(), + description, + updatedAt = DateTime.UtcNow + }); + + return rowsAffected > 0; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to update graph {GraphId}", graphId); + return false; + } + } + + public async Task DeleteGraphAsync(long graphId, long userId) + { + try + { + var query = "DELETE FROM app.graphs WHERE id = @graphId AND user_id = @userId"; + var rowsAffected = await db.ExecuteNonQueryAsync(query, new { graphId, userId }); + return rowsAffected > 0; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to delete graph {GraphId}", graphId); + return false; + } + } + + public async Task CloneGraphAsync(long graphId, long userId, string newName) + { + try + { + // Get original graph + var originalGraph = await GetGraphByIdAsync(graphId, userId); + if (originalGraph == null) return null; + + // Create new graph + var newGraph = await CreateGraphAsync(userId, newName, originalGraph.Description); + if (newGraph == null) return null; + + // Get all nodes from original graph + var nodes = await GetGraphNodesAsync(graphId, userId); + var nodeMapping = new Dictionary(); // old ID -> new ID + + // Clone nodes + foreach (var node in nodes) + { + var newNode = await CreateNodeAsync(newGraph.Id, userId, node.Label, node.Notes); + if (newNode != null) + { + nodeMapping[node.Id] = newNode.Id; + } + } + + // Get all edges from original graph + var edges = await GetGraphEdgesAsync(graphId, userId); + + // Clone edges with new node IDs + foreach (var edge in edges) + { + if (nodeMapping.ContainsKey(edge.SourceNodeId) && nodeMapping.ContainsKey(edge.TargetNodeId)) + { + await CreateEdgeAsync(newGraph.Id, userId, nodeMapping[edge.SourceNodeId], nodeMapping[edge.TargetNodeId]); + } + } + + return newGraph; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to clone graph {GraphId}", graphId); + return null; + } + } + + #endregion + + #region Node Operations + + public async Task> GetGraphNodesAsync(long graphId, long userId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + var query = @" + SELECT + n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at, + COUNT(DISTINCT e1.id) + COUNT(DISTINCT e2.id) as connection_count + FROM app.graph_nodes n + LEFT JOIN app.graph_edges e1 ON n.id = e1.source_node_id + LEFT JOIN app.graph_edges e2 ON n.id = e2.target_node_id + WHERE n.graph_id = @graphId + GROUP BY n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at + ORDER BY n.label"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphNodeWithConnections + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + ConnectionCount = reader.GetInt32(6) + }; + }, new { graphId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get nodes for graph {GraphId}", graphId); + return []; + } + } + + public async Task CreateNodeAsync(long graphId, long userId, string label, string? notes = null) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return null; + + if (string.IsNullOrWhiteSpace(label)) + { + logger.LogWarning("Cannot create node with empty label"); + return null; + } + + var query = @" + INSERT INTO app.graph_nodes (graph_id, label, notes, created_at, updated_at) + VALUES (@graphId, @label, @notes, @createdAt, @updatedAt) + RETURNING id, graph_id, label, notes, created_at, updated_at"; + + var node = await db.ExecuteReaderAsync(query, reader => + { + return new GraphNode + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5) + }; + }, new + { + graphId, + label = label.Trim(), + notes, + createdAt = DateTime.UtcNow, + updatedAt = DateTime.UtcNow + }); + + // Update graph's updated_at + await TouchGraphAsync(graphId); + + return node; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to create node in graph {GraphId}", graphId); + return null; + } + } + + public async Task UpdateNodeAsync(long nodeId, long userId, string label, string? notes) + { + try + { + if (string.IsNullOrWhiteSpace(label)) + { + logger.LogWarning("Cannot update node with empty label"); + return false; + } + + // Get node to verify ownership through graph + var node = await GetNodeByIdAsync(nodeId); + if (node == null) return false; + + var graph = await GetGraphByIdAsync(node.GraphId, userId); + if (graph == null) return false; + + var query = @" + UPDATE app.graph_nodes + SET label = @label, notes = @notes, updated_at = @updatedAt + WHERE id = @nodeId"; + + var rowsAffected = await db.ExecuteNonQueryAsync(query, new + { + nodeId, + label = label.Trim(), + notes, + updatedAt = DateTime.UtcNow + }); + + if (rowsAffected > 0) + { + await TouchGraphAsync(node.GraphId); + } + + return rowsAffected > 0; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to update node {NodeId}", nodeId); + return false; + } + } + + public async Task DeleteNodeAsync(long nodeId, long userId) + { + try + { + // Get node to verify ownership and get graph ID + var node = await GetNodeByIdAsync(nodeId); + if (node == null) return false; + + var graph = await GetGraphByIdAsync(node.GraphId, userId); + if (graph == null) return false; + + var query = "DELETE FROM app.graph_nodes WHERE id = @nodeId"; + var rowsAffected = await db.ExecuteNonQueryAsync(query, new { nodeId }); + + if (rowsAffected > 0) + { + await TouchGraphAsync(node.GraphId); + } + + return rowsAffected > 0; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to delete node {NodeId}", nodeId); + return false; + } + } + + public async Task> SearchNodesAsync(long graphId, long userId, string searchTerm) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + var query = @" + SELECT + n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at, + COUNT(DISTINCT e1.id) + COUNT(DISTINCT e2.id) as connection_count + FROM app.graph_nodes n + LEFT JOIN app.graph_edges e1 ON n.id = e1.source_node_id + LEFT JOIN app.graph_edges e2 ON n.id = e2.target_node_id + WHERE n.graph_id = @graphId + AND (LOWER(n.label) LIKE @searchPattern OR LOWER(n.notes) LIKE @searchPattern) + GROUP BY n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at + ORDER BY n.label"; + + var searchPattern = $"%{searchTerm.ToLower()}%"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphNodeWithConnections + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + ConnectionCount = reader.GetInt32(6) + }; + }, new { graphId, searchPattern }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to search nodes in graph {GraphId}", graphId); + return []; + } + } + + private async Task GetNodeByIdAsync(long nodeId) + { + try + { + var query = @" + SELECT id, graph_id, label, notes, created_at, updated_at + FROM app.graph_nodes + WHERE id = @nodeId"; + + return await db.ExecuteReaderAsync(query, reader => + { + return new GraphNode + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5) + }; + }, new { nodeId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get node {NodeId}", nodeId); + return null; + } + } + + #endregion + + #region Edge Operations + + public async Task> GetGraphEdgesAsync(long graphId, long userId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + var query = @" + SELECT id, graph_id, source_node_id, target_node_id, created_at + FROM app.graph_edges + WHERE graph_id = @graphId + ORDER BY created_at"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphEdge + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + SourceNodeId = reader.GetInt64(2), + TargetNodeId = reader.GetInt64(3), + CreatedAt = reader.GetDateTime(4) + }; + }, new { graphId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get edges for graph {GraphId}", graphId); + return []; + } + } + + public async Task CreateEdgeAsync(long graphId, long userId, long sourceNodeId, long targetNodeId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return null; + + // Verify both nodes belong to this graph + var sourceNode = await GetNodeByIdAsync(sourceNodeId); + var targetNode = await GetNodeByIdAsync(targetNodeId); + + if (sourceNode == null || targetNode == null || + sourceNode.GraphId != graphId || targetNode.GraphId != graphId) + { + logger.LogWarning("Invalid nodes for edge creation"); + return null; + } + + var query = @" + INSERT INTO app.graph_edges (graph_id, source_node_id, target_node_id, created_at) + VALUES (@graphId, @sourceNodeId, @targetNodeId, @createdAt) + RETURNING id, graph_id, source_node_id, target_node_id, created_at"; + + var edge = await db.ExecuteReaderAsync(query, reader => + { + return new GraphEdge + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + SourceNodeId = reader.GetInt64(2), + TargetNodeId = reader.GetInt64(3), + CreatedAt = reader.GetDateTime(4) + }; + }, new + { + graphId, + sourceNodeId, + targetNodeId, + createdAt = DateTime.UtcNow + }); + + await TouchGraphAsync(graphId); + + return edge; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to create edge in graph {GraphId}", graphId); + return null; + } + } + + public async Task DeleteEdgeAsync(long edgeId, long userId) + { + try + { + // Get edge to verify ownership through graph + var edge = await GetEdgeByIdAsync(edgeId); + if (edge == null) return false; + + var graph = await GetGraphByIdAsync(edge.GraphId, userId); + if (graph == null) return false; + + var query = "DELETE FROM app.graph_edges WHERE id = @edgeId"; + var rowsAffected = await db.ExecuteNonQueryAsync(query, new { edgeId }); + + if (rowsAffected > 0) + { + await TouchGraphAsync(edge.GraphId); + } + + return rowsAffected > 0; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to delete edge {EdgeId}", edgeId); + return false; + } + } + + private async Task GetEdgeByIdAsync(long edgeId) + { + try + { + var query = @" + SELECT id, graph_id, source_node_id, target_node_id, created_at + FROM app.graph_edges + WHERE id = @edgeId"; + + return await db.ExecuteReaderAsync(query, reader => + { + return new GraphEdge + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + SourceNodeId = reader.GetInt64(2), + TargetNodeId = reader.GetInt64(3), + CreatedAt = reader.GetDateTime(4) + }; + }, new { edgeId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get edge {EdgeId}", edgeId); + return null; + } + } + + #endregion + + #region Filter Operations + + public async Task> FilterConnectsToAsync(long graphId, long userId, long targetNodeId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + var query = @" + SELECT + n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at, + COUNT(DISTINCT e1.id) + COUNT(DISTINCT e2.id) as connection_count + FROM app.graph_nodes n + LEFT JOIN app.graph_edges e1 ON n.id = e1.source_node_id + LEFT JOIN app.graph_edges e2 ON n.id = e2.target_node_id + WHERE n.graph_id = @graphId + AND EXISTS ( + SELECT 1 FROM app.graph_edges e + WHERE e.graph_id = @graphId + AND ( + (e.source_node_id = n.id AND e.target_node_id = @targetNodeId) + OR (e.target_node_id = n.id AND e.source_node_id = @targetNodeId) + ) + ) + GROUP BY n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at + ORDER BY n.label"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphNodeWithConnections + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + ConnectionCount = reader.GetInt32(6) + }; + }, new { graphId, targetNodeId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to filter nodes connecting to {NodeId}", targetNodeId); + return []; + } + } + + public async Task> FilterDoesNotConnectToAsync(long graphId, long userId, long targetNodeId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + var query = @" + SELECT + n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at, + COUNT(DISTINCT e1.id) + COUNT(DISTINCT e2.id) as connection_count + FROM app.graph_nodes n + LEFT JOIN app.graph_edges e1 ON n.id = e1.source_node_id + LEFT JOIN app.graph_edges e2 ON n.id = e2.target_node_id + WHERE n.graph_id = @graphId + AND n.id != @targetNodeId + AND NOT EXISTS ( + SELECT 1 FROM app.graph_edges e + WHERE e.graph_id = @graphId + AND ( + (e.source_node_id = n.id AND e.target_node_id = @targetNodeId) + OR (e.target_node_id = n.id AND e.source_node_id = @targetNodeId) + ) + ) + GROUP BY n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at + ORDER BY n.label"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphNodeWithConnections + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + ConnectionCount = reader.GetInt32(6) + }; + }, new { graphId, targetNodeId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to filter nodes not connecting to {NodeId}", targetNodeId); + return []; + } + } + + public async Task> FilterConnectsTwoDegreesAsync(long graphId, long userId, long targetNodeId) + { + try + { + // Verify user owns the graph + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return []; + + // Find nodes that connect to nodes that connect to the target (bidirectional) + var query = @" + SELECT DISTINCT + n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at, + COUNT(DISTINCT e1.id) + COUNT(DISTINCT e2.id) as connection_count + FROM app.graph_nodes n + LEFT JOIN app.graph_edges e1 ON n.id = e1.source_node_id + LEFT JOIN app.graph_edges e2 ON n.id = e2.target_node_id + WHERE n.graph_id = @graphId + AND n.id != @targetNodeId + AND EXISTS ( + SELECT 1 FROM app.graph_edges e_first, app.graph_edges e_second + WHERE e_first.graph_id = @graphId + AND e_second.graph_id = @graphId + -- n connects to intermediate node (bidirectional) + AND ( + (e_first.source_node_id = n.id AND e_second.source_node_id = e_first.target_node_id) + OR (e_first.source_node_id = n.id AND e_second.target_node_id = e_first.target_node_id) + OR (e_first.target_node_id = n.id AND e_second.source_node_id = e_first.source_node_id) + OR (e_first.target_node_id = n.id AND e_second.target_node_id = e_first.source_node_id) + ) + -- intermediate node connects to target (bidirectional) + AND ( + e_second.source_node_id = @targetNodeId + OR e_second.target_node_id = @targetNodeId + ) + -- Exclude direct connections + AND NOT EXISTS ( + SELECT 1 FROM app.graph_edges e_direct + WHERE e_direct.graph_id = @graphId + AND ( + (e_direct.source_node_id = n.id AND e_direct.target_node_id = @targetNodeId) + OR (e_direct.target_node_id = n.id AND e_direct.source_node_id = @targetNodeId) + ) + ) + ) + GROUP BY n.id, n.graph_id, n.label, n.notes, n.created_at, n.updated_at + ORDER BY n.label"; + + return await db.ExecuteListReaderAsync(query, reader => + { + return new GraphNodeWithConnections + { + Id = reader.GetInt64(0), + GraphId = reader.GetInt64(1), + Label = reader.GetString(2), + Notes = reader.IsDBNull(3) ? null : reader.GetString(3), + CreatedAt = reader.GetDateTime(4), + UpdatedAt = reader.GetDateTime(5), + ConnectionCount = reader.GetInt32(6) + }; + }, new { graphId, targetNodeId }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to filter nodes with two-degree connections to {NodeId}", targetNodeId); + return []; + } + } + + #endregion + + #region Helper Methods + + private async Task TouchGraphAsync(long graphId) + { + try + { + var query = "UPDATE app.graphs SET updated_at = @updatedAt WHERE id = @graphId"; + await db.ExecuteNonQueryAsync(query, new { graphId, updatedAt = DateTime.UtcNow }); + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to touch graph {GraphId}", graphId); + } + } + + public async Task GetGraphDataAsync(long graphId, long userId) + { + try + { + var graph = await GetGraphByIdAsync(graphId, userId); + if (graph == null) return new GraphData(); + + var nodes = await GetGraphNodesAsync(graphId, userId); + var edges = await GetGraphEdgesAsync(graphId, userId); + + return new GraphData + { + Graph = graph, + Nodes = nodes, + Edges = edges + }; + } + catch (Exception ex) + { + logger.LogError(ex, "Failed to get graph data for {GraphId}", graphId); + return new GraphData(); + } + } + + #endregion +} diff --git a/Media.JoshHeaps.Net/Services/MediaService.cs b/Media.JoshHeaps.Net/Services/MediaService.cs index f6bc896..0583f56 100644 --- a/Media.JoshHeaps.Net/Services/MediaService.cs +++ b/Media.JoshHeaps.Net/Services/MediaService.cs @@ -2,23 +2,8 @@ using Media.JoshHeaps.Net.Models; namespace Media.JoshHeaps.Net.Services; -public class MediaService +public class MediaService(DbExecutor db, IWebHostEnvironment environment, EncryptionService encryption, ILogger logger, FolderService folderService) { - private readonly DbExecutor _db; - private readonly IWebHostEnvironment _environment; - private readonly EncryptionService _encryption; - private readonly ILogger _logger; - private readonly FolderService _folderService; - - public MediaService(DbExecutor db, IWebHostEnvironment environment, EncryptionService encryption, ILogger logger, FolderService folderService) - { - _db = db; - _environment = environment; - _encryption = encryption; - _logger = logger; - _folderService = folderService; - } - public async Task SaveMediaAsync(long userId, IFormFile file, string? description = null, long? folderId = null) { string? tempFilePath = null; @@ -31,7 +16,7 @@ public class MediaService var uniqueFileName = $"{Guid.NewGuid()}{fileExtension}.enc"; // .enc for encrypted // Store outside wwwroot in App_Data folder - var mediaFolder = Path.Combine(_environment.ContentRootPath, "App_Data", "media", userId.ToString()); + var mediaFolder = Path.Combine(environment.ContentRootPath, "App_Data", "media", userId.ToString()); Directory.CreateDirectory(mediaFolder); tempFilePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); @@ -57,12 +42,12 @@ public class MediaService } catch (Exception ex) { - _logger.LogWarning(ex, "Failed to read image dimensions for {FileName}", file.FileName); + logger.LogWarning(ex, "Failed to read image dimensions for {FileName}", file.FileName); } } // Encrypt and save - await _encryption.EncryptFileAsync(tempFilePath, encryptedFilePath); + await encryption.EncryptFileAsync(tempFilePath, encryptedFilePath); // Delete temp file File.Delete(tempFilePath); @@ -77,7 +62,7 @@ public class MediaService VALUES (@userId, @fileName, @filePath, @fileSize, @mimeType, @width, @height, @description, @isEncrypted, @folderId, @createdAt, @updatedAt) RETURNING id, user_id, file_name, file_path, file_size, mime_type, width, height, description, is_encrypted, folder_id, created_at, updated_at"; - var media = await _db.ExecuteReaderAsync(query, reader => + var media = await db.ExecuteReaderAsync(query, reader => { return new UserMedia { @@ -115,7 +100,7 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to save media for user {UserId}", userId); + logger.LogError(ex, "Failed to save media for user {UserId}", userId); // Cleanup on error if (tempFilePath != null && File.Exists(tempFilePath)) @@ -139,14 +124,14 @@ public class MediaService var effectiveUserId = userId; if (requestingUserId.HasValue && folderId.HasValue) { - var hasAccess = await _folderService.HasFolderAccessAsync(folderId.Value, requestingUserId.Value); + var hasAccess = await folderService.HasFolderAccessAsync(folderId.Value, requestingUserId.Value); if (!hasAccess) { - _logger.LogWarning("User {RequestingUserId} does not have access to folder {FolderId}", requestingUserId.Value, folderId.Value); - return new List(); + logger.LogWarning("User {RequestingUserId} does not have access to folder {FolderId}", requestingUserId.Value, folderId.Value); + return []; } // Get the actual owner of the folder - var ownerId = await _folderService.GetFolderOwnerIdAsync(folderId.Value); + var ownerId = await folderService.GetFolderOwnerIdAsync(folderId.Value); if (ownerId.HasValue) { effectiveUserId = ownerId.Value; @@ -173,7 +158,7 @@ public class MediaService OFFSET @offset LIMIT @limit"; } - var mediaList = await _db.ExecuteListReaderAsync(query, reader => + var mediaList = await db.ExecuteListReaderAsync(query, reader => { return new UserMedia { @@ -197,8 +182,8 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get media for user {UserId}", userId); - return new List(); + logger.LogError(ex, "Failed to get media for user {UserId}", userId); + return []; } } @@ -212,7 +197,7 @@ public class MediaService FROM app.user_media WHERE id = @mediaId"; - var media = await _db.ExecuteReaderAsync(query, reader => + var media = await db.ExecuteReaderAsync(query, reader => { return new UserMedia { @@ -244,7 +229,7 @@ public class MediaService } // Check if user has access via shared folder - if (media.FolderId.HasValue && await _folderService.HasFolderAccessAsync(media.FolderId.Value, userId)) + if (media.FolderId.HasValue && await folderService.HasFolderAccessAsync(media.FolderId.Value, userId)) { return media; } @@ -254,7 +239,7 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get media {MediaId} for user {UserId}", mediaId, userId); + logger.LogError(ex, "Failed to get media {MediaId} for user {UserId}", mediaId, userId); return null; } } @@ -266,21 +251,21 @@ public class MediaService var media = await GetMediaByIdAsync(mediaId, userId); if (media == null) { - _logger.LogWarning("Media {MediaId} not found or user {UserId} doesn't have access", mediaId, userId); + logger.LogWarning("Media {MediaId} not found or user {UserId} doesn't have access", mediaId, userId); return null; } - var fullPath = Path.Combine(_environment.ContentRootPath, media.FilePath); + var fullPath = Path.Combine(environment.ContentRootPath, media.FilePath); if (!File.Exists(fullPath)) { - _logger.LogError("Media file not found at {FilePath}", fullPath); + logger.LogError("Media file not found at {FilePath}", fullPath); return null; } if (media.IsEncrypted) { - return await _encryption.DecryptFileAsync(fullPath); + return await encryption.DecryptFileAsync(fullPath); } else { @@ -289,7 +274,7 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to get decrypted media data for {MediaId}", mediaId); + logger.LogError(ex, "Failed to get decrypted media data for {MediaId}", mediaId); return null; } } @@ -300,16 +285,16 @@ public class MediaService { // Get media info first var query = "SELECT file_path FROM app.user_media WHERE id = @mediaId AND user_id = @userId"; - var filePath = await _db.ExecuteReaderAsync(query, reader => reader.GetString(0), new { mediaId, userId }); + var filePath = await db.ExecuteReaderAsync(query, reader => reader.GetString(0), new { mediaId, userId }); if (filePath == null) return false; // Delete from database var deleteQuery = "DELETE FROM app.user_media WHERE id = @mediaId AND user_id = @userId"; - await _db.ExecuteAsync(deleteQuery, new { mediaId, userId }); + await db.ExecuteAsync(deleteQuery, new { mediaId, userId }); // Delete physical file - var physicalPath = Path.Combine(_environment.ContentRootPath, filePath); + var physicalPath = Path.Combine(environment.ContentRootPath, filePath); if (File.Exists(physicalPath)) { File.Delete(physicalPath); @@ -319,7 +304,7 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to delete media {MediaId} for user {UserId}", mediaId, userId); + logger.LogError(ex, "Failed to delete media {MediaId} for user {UserId}", mediaId, userId); return false; } } @@ -333,7 +318,7 @@ public class MediaService SET folder_id = @folderId, updated_at = @updatedAt WHERE id = @mediaId AND user_id = @userId"; - await _db.ExecuteAsync(query, new + await db.ExecuteAsync(query, new { mediaId, userId, @@ -345,7 +330,7 @@ public class MediaService } catch (Exception ex) { - _logger.LogError(ex, "Failed to move media {MediaId} to folder {FolderId} for user {UserId}", mediaId, folderId, userId); + logger.LogError(ex, "Failed to move media {MediaId} to folder {FolderId} for user {UserId}", mediaId, folderId, userId); return false; } } diff --git a/Media.JoshHeaps.Net/Services/UserService.cs b/Media.JoshHeaps.Net/Services/UserService.cs index beb33c9..defff77 100644 --- a/Media.JoshHeaps.Net/Services/UserService.cs +++ b/Media.JoshHeaps.Net/Services/UserService.cs @@ -2,15 +2,8 @@ using Media.JoshHeaps.Net.Models; namespace Media.JoshHeaps.Net.Services; -public class UserService +public class UserService(DbExecutor db) { - private readonly DbExecutor _db; - - public UserService(DbExecutor db) - { - _db = db; - } - public async Task GetUserDashboardAsync(long userId) { try @@ -23,7 +16,7 @@ public class UserService LEFT JOIN app.user_profiles p ON u.id = p.user_id WHERE u.id = @userId"; - var dashboard = await _db.ExecuteReaderAsync(query, reader => + var dashboard = await db.ExecuteReaderAsync(query, reader => { return new UserDashboard { @@ -62,7 +55,7 @@ public class UserService FROM app.user_profiles WHERE user_id = @userId"; - var profile = await _db.ExecuteReaderAsync(query, reader => + var profile = await db.ExecuteReaderAsync(query, reader => { return new UserProfile { @@ -87,7 +80,7 @@ public class UserService { try { - await _db.ExecuteAsync( + await db.ExecuteAsync( @"UPDATE app.user_profiles SET bio = @bio, avatar_url = @avatarUrl, location = @location, website = @website, updated_at = @updatedAt @@ -116,7 +109,7 @@ public class UserService ORDER BY username ASC LIMIT 10"; - var users = await _db.ExecuteListReaderAsync(searchQuery, reader => + var users = await db.ExecuteListReaderAsync(searchQuery, reader => { return new UserSearchResult { @@ -130,7 +123,7 @@ public class UserService } catch (Exception) { - return new List(); + return []; } } } diff --git a/Media.JoshHeaps.Net/wwwroot/css/Gallery/page.css b/Media.JoshHeaps.Net/wwwroot/css/Gallery/page.css new file mode 100644 index 0000000..ced2d9c --- /dev/null +++ b/Media.JoshHeaps.Net/wwwroot/css/Gallery/page.css @@ -0,0 +1,188 @@ +.dashboard-container { + max-width: 1200px; + margin: 0 auto; + padding: 40px 20px; +} + +.welcome-section { + background: var(--bg-tertiary); + border: 1px solid var(--border-primary); + color: var(--text-primary); + padding: 32px 40px; + border-radius: 8px; + margin-bottom: 32px; + display: flex; + justify-content: space-between; + align-items: center; +} + +.welcome-left { + display: flex; + align-items: center; + gap: 16px; +} + +.back-button { + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 8px; + color: var(--text-secondary); + text-decoration: none; + transition: all 0.2s ease; + flex-shrink: 0; +} + +.back-button:hover { + background: var(--bg-hover); + border-color: var(--accent-primary); + color: var(--accent-primary); + transform: translateX(-2px); +} + +.back-button svg { + width: 20px; + height: 20px; +} + +.welcome-section h1 { + margin: 0; + font-size: 28px; + font-weight: 600; + letter-spacing: -0.5px; +} + +.welcome-section p { + margin: 0; + opacity: 0.8; + font-size: 16px; +} + +.dashboard-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); + gap: 20px; + margin-bottom: 30px; +} + +.card { + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 8px; + padding: 24px; + transition: border-color 0.2s ease; +} + +.card:hover { + border-color: var(--border-secondary); +} + +.card h2 { + margin: 0 0 20px 0; + font-size: 18px; + font-weight: 600; + color: var(--text-primary); + border-bottom: 1px solid var(--border-primary); + padding-bottom: 12px; +} + +.info-row { + display: flex; + justify-content: space-between; + padding: 12px 0; + border-bottom: 1px solid var(--border-secondary); +} + +.info-row:last-child { + border-bottom: none; +} + +.info-label { + font-weight: 500; + color: var(--text-secondary); +} + +.info-value { + color: var(--text-primary); + font-weight: 500; +} + +.status-badge { + display: inline-block; + padding: 4px 12px; + border-radius: 6px; + font-size: 12px; + font-weight: 600; +} + +.status-verified { + background: rgba(63, 185, 80, 0.15); + color: var(--success); +} + +.status-unverified { + background: rgba(187, 128, 9, 0.15); + color: #d29922; +} + +.quick-actions { + display: flex; + gap: 10px; + flex-wrap: wrap; + align-content: space-evenly; +} + +.btn { + padding: 8px 16px; + border-radius: 6px; + text-decoration: none; + font-weight: 500; + font-size: 14px; + display: inline-block; + transition: all 0.2s ease; + border: 1px solid transparent; +} + +.btn-primary { + background: var(--accent-primary); + color: var(--bg-primary); + border-color: var(--accent-primary); +} + +.btn-primary:hover { + background: var(--accent-hover); + border-color: var(--accent-hover); +} + +.btn-secondary { + background: var(--bg-tertiary); + color: var(--text-primary); + border-color: var(--border-primary); +} + +.btn-secondary:hover { + background: var(--bg-hover); + border-color: var(--border-secondary); +} + +.btn-danger { + background: transparent; + color: var(--danger); + border-color: var(--danger); +} + +.btn-danger:hover { + background: var(--danger); + color: var(--text-primary); +} + +.empty-state { + text-align: center; + color: var(--text-secondary); + padding: 20px; + font-style: italic; +} diff --git a/Media.JoshHeaps.Net/wwwroot/css/landing.css b/Media.JoshHeaps.Net/wwwroot/css/landing.css new file mode 100644 index 0000000..73f3cd8 --- /dev/null +++ b/Media.JoshHeaps.Net/wwwroot/css/landing.css @@ -0,0 +1,344 @@ +/* Landing Page Styles */ + +.landing-wrapper { + min-height: 100vh; + background: var(--bg-primary); + display: flex; + align-items: center; + justify-content: center; + padding: 2rem; +} + +.landing-container { + width: 100%; + max-width: 1000px; + margin: 0 auto; +} + +/* Header Section */ +.landing-header { + text-align: center; + margin-bottom: 4rem; +} + +.logo-area { + display: flex; + flex-direction: column; + align-items: center; + gap: 1rem; +} + +.logo-circle { + width: 72px; + height: 72px; + background: linear-gradient(135deg, var(--accent-primary), #3d8bdb); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 0.5rem; + box-shadow: 0 4px 12px rgba(88, 166, 255, 0.3); +} + +.logo-circle svg { + width: 36px; + height: 36px; + color: white; +} + +.landing-header h1 { + font-size: 2.75rem; + font-weight: 700; + color: var(--text-primary); + margin: 0; + letter-spacing: -0.02em; +} + +.landing-header .subtitle { + font-size: 1.125rem; + color: var(--text-secondary); + margin: 0; + font-weight: 400; +} + +/* Cards Grid */ +.cards-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); + gap: 1.5rem; + margin-bottom: 3rem; +} + +/* Card Styles */ +.landing-card { + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 16px; + padding: 0; + text-decoration: none; + transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); + display: flex; + flex-direction: column; + position: relative; + overflow: hidden; + min-height: 280px; +} + +.landing-card::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(135deg, + rgba(88, 166, 255, 0.05) 0%, + rgba(88, 166, 255, 0) 50%); + opacity: 0; + transition: opacity 0.3s ease; + pointer-events: none; +} + +.landing-card:hover { + transform: translateY(-4px); + border-color: var(--accent-primary); + box-shadow: + 0 12px 24px -10px rgba(88, 166, 255, 0.2), + 0 0 0 1px var(--accent-primary); +} + +.landing-card:hover::before { + opacity: 1; +} + +.landing-card:active { + transform: translateY(-2px); +} + +/* Card Content */ +.card-content { + padding: 2rem; + flex: 1; + display: flex; + flex-direction: column; + gap: 1.25rem; +} + +.card-icon-wrapper { + display: flex; + align-items: center; + justify-content: flex-start; +} + +.card-icon { + width: 56px; + height: 56px; + background: linear-gradient(135deg, + rgba(88, 166, 255, 0.15), + rgba(88, 166, 255, 0.05)); + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + color: var(--accent-primary); + transition: all 0.3s ease; +} + +.landing-card:hover .card-icon { + transform: scale(1.05); + background: linear-gradient(135deg, + rgba(88, 166, 255, 0.2), + rgba(88, 166, 255, 0.1)); +} + +.card-icon svg { + width: 28px; + height: 28px; +} + +.card-text { + display: flex; + flex-direction: column; + gap: 0.5rem; +} + +.landing-card h2 { + font-size: 1.5rem; + font-weight: 600; + color: var(--text-primary); + margin: 0; + letter-spacing: -0.01em; +} + +.card-description { + font-size: 0.9375rem; + color: var(--text-secondary); + line-height: 1.6; + margin: 0; +} + +/* Card Footer */ +.card-footer { + padding: 1.25rem 2rem; + border-top: 1px solid var(--border-primary); + display: flex; + align-items: center; + justify-content: space-between; + background: rgba(88, 166, 255, 0.02); + transition: background 0.3s ease; +} + +.landing-card:hover .card-footer { + background: rgba(88, 166, 255, 0.05); +} + +.card-link-text { + font-size: 0.875rem; + font-weight: 500; + color: var(--accent-primary); + transition: color 0.2s ease; +} + +.landing-card:hover .card-link-text { + color: var(--accent-hover); +} + +.card-arrow { + width: 20px; + height: 20px; + color: var(--accent-primary); + transition: all 0.3s ease; + display: flex; + align-items: center; + justify-content: center; +} + +.landing-card:hover .card-arrow { + transform: translateX(4px); + color: var(--accent-hover); +} + +.card-arrow svg { + width: 100%; + height: 100%; +} + +/* Footer */ +.landing-footer { + text-align: center; + padding-top: 2rem; + border-top: 1px solid var(--border-primary); + display: flex; + align-items: center; + justify-content: center; + gap: 1rem; +} + +.footer-link { + color: var(--text-secondary); + text-decoration: none; + font-size: 0.875rem; + transition: color 0.2s ease; +} + +.footer-link:hover { + color: var(--accent-primary); +} + +.footer-separator { + color: var(--border-primary); + font-size: 0.875rem; +} + +/* Responsive Design */ +@media (max-width: 768px) { + .landing-wrapper { + padding: 1.5rem; + } + + .landing-header { + margin-bottom: 3rem; + } + + .logo-circle { + width: 64px; + height: 64px; + } + + .logo-circle svg { + width: 32px; + height: 32px; + } + + .landing-header h1 { + font-size: 2.25rem; + } + + .landing-header .subtitle { + font-size: 1rem; + } + + .cards-grid { + grid-template-columns: 1fr; + gap: 1.25rem; + margin-bottom: 2.5rem; + } + + .landing-card { + min-height: 260px; + } + + .card-content { + padding: 1.75rem; + } + + .card-icon { + width: 48px; + height: 48px; + } + + .card-icon svg { + width: 24px; + height: 24px; + } + + .landing-card h2 { + font-size: 1.375rem; + } + + .card-footer { + padding: 1rem 1.75rem; + } +} + +@media (max-width: 480px) { + .landing-wrapper { + padding: 1rem; + } + + .landing-header { + margin-bottom: 2.5rem; + } + + .logo-circle { + width: 56px; + height: 56px; + } + + .logo-circle svg { + width: 28px; + height: 28px; + } + + .landing-header h1 { + font-size: 1.875rem; + } + + .card-content { + padding: 1.5rem; + } + + .card-footer { + padding: 1rem 1.5rem; + } +} diff --git a/Media.JoshHeaps.Net/wwwroot/css/network-graph.css b/Media.JoshHeaps.Net/wwwroot/css/network-graph.css new file mode 100644 index 0000000..aa8f44a --- /dev/null +++ b/Media.JoshHeaps.Net/wwwroot/css/network-graph.css @@ -0,0 +1,528 @@ +/* Network Graph Page Styles */ + +/* Graph Manager Section */ +.graph-manager-section { + margin-bottom: 32px; +} + +.graph-selector-card { + max-width: 100%; +} + +.graphs-list { + display: flex; + flex-direction: column; + gap: 12px; + margin-top: 20px; +} + +.graph-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 16px; + background: var(--bg-tertiary); + border: 2px solid var(--border-primary); + border-radius: 8px; + transition: all 0.2s ease; + cursor: pointer; +} + +.graph-item:hover { + border-color: var(--border-secondary); + background: var(--bg-hover); +} + +.graph-item.active { + border-color: var(--accent-primary); + background: rgba(88, 166, 255, 0.05); +} + +.graph-info { + flex: 1; +} + +.graph-name { + font-size: 16px; + font-weight: 600; + color: var(--text-primary); + margin-bottom: 4px; +} + +.graph-stats { + display: flex; + gap: 16px; + font-size: 13px; + color: var(--text-secondary); +} + +.graph-stats .stat { + display: flex; + align-items: center; + gap: 4px; +} + +.graph-actions { + display: flex; + gap: 8px; + opacity: 0; + transition: opacity 0.2s ease; +} + +.graph-item:hover .graph-actions { + opacity: 1; +} + +.btn-icon { + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 6px; + color: var(--text-secondary); + cursor: pointer; + transition: all 0.2s ease; +} + +.btn-icon:hover { + background: var(--bg-hover); + border-color: var(--accent-primary); + color: var(--accent-primary); +} + +.btn-icon.danger:hover { + border-color: var(--danger); + color: var(--danger); +} + +/* Graph Workspace */ +.graph-workspace { + display: flex; + flex-direction: column; + gap: 16px; +} + +.graph-toolbar { + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px; + flex-wrap: wrap; + gap: 16px; +} + +.toolbar-section { + display: flex; + gap: 12px; + align-items: center; + flex-wrap: wrap; +} + +.search-input { + padding: 8px 12px; + border: 1px solid var(--border-primary); + border-radius: 6px; + background: var(--bg-tertiary); + color: var(--text-primary); + font-size: 14px; + min-width: 200px; +} + +.search-input:focus { + outline: none; + border-color: var(--accent-primary); +} + +.filter-select { + padding: 8px 12px; + border: 1px solid var(--border-primary); + border-radius: 6px; + background: var(--bg-tertiary); + color: var(--text-primary); + font-size: 14px; + cursor: pointer; +} + +.filter-select:focus { + outline: none; + border-color: var(--accent-primary); +} + +/* Canvas */ +.graph-canvas-container { + position: relative; + height: 600px; + padding: 0; + overflow: hidden; +} + +#graph-canvas { + width: 100%; + height: 100%; + cursor: grab; +} + +#graph-canvas:active { + cursor: grabbing; +} + +.canvas-controls { + position: absolute; + bottom: 16px; + right: 16px; + display: flex; + flex-direction: column; + gap: 8px; +} + +.canvas-btn { + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 8px; + color: var(--text-secondary); + cursor: pointer; + transition: all 0.2s ease; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); +} + +.canvas-btn:hover { + background: var(--bg-hover); + border-color: var(--accent-primary); + color: var(--accent-primary); +} + +.canvas-help-text { + position: absolute; + top: 16px; + left: 50%; + transform: translateX(-50%); + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 8px; + padding: 8px 16px; + font-size: 13px; + color: var(--text-secondary); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); + pointer-events: none; + user-select: none; + z-index: 10; +} + +/* Context Menu */ +.context-menu { + position: fixed; + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2); + z-index: 2000; + min-width: 180px; + overflow: hidden; +} + +.context-menu-item { + display: flex; + align-items: center; + gap: 12px; + padding: 10px 16px; + cursor: pointer; + color: var(--text-primary); + font-size: 14px; + transition: background 0.2s ease; +} + +.context-menu-item:hover { + background: var(--bg-hover); +} + +.context-menu-item svg { + flex-shrink: 0; +} + +.context-menu-item.danger { + color: var(--danger); +} + +.context-menu-item.danger:hover { + background: rgba(239, 68, 68, 0.1); +} + +.context-menu-divider { + height: 1px; + background: var(--border-primary); + margin: 4px 0; +} + +/* Modal Styles */ +.modal { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1000; + display: flex; + align-items: center; + justify-content: center; +} + +.modal-backdrop { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.6); + backdrop-filter: blur(4px); +} + +.modal-dialog { + position: relative; + background: var(--bg-secondary); + border: 1px solid var(--border-primary); + border-radius: 12px; + width: 90%; + max-width: 500px; + max-height: 90vh; + overflow: hidden; + box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3); + z-index: 1001; +} + +.modal-dialog-large { + max-width: 650px; +} + +.modal-header { + padding: 20px 24px; + border-bottom: 1px solid var(--border-primary); + display: flex; + justify-content: space-between; + align-items: center; +} + +.modal-header h3 { + margin: 0; + font-size: 18px; + font-weight: 600; + color: var(--text-primary); +} + +.modal-close { + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + background: transparent; + border: none; + color: var(--text-secondary); + font-size: 24px; + cursor: pointer; + border-radius: 6px; + transition: all 0.2s ease; +} + +.modal-close:hover { + background: var(--bg-hover); + color: var(--text-primary); +} + +.modal-body { + padding: 24px; + overflow-y: auto; + max-height: calc(90vh - 120px); +} + +.form-group { + margin-bottom: 20px; +} + +.form-group label { + display: block; + margin-bottom: 8px; + font-weight: 500; + color: var(--text-primary); + font-size: 14px; +} + +.form-control { + width: 100%; + padding: 10px 12px; + border: 1px solid var(--border-primary); + border-radius: 6px; + background: var(--bg-tertiary); + color: var(--text-primary); + font-size: 14px; + font-family: inherit; + transition: border-color 0.2s ease; +} + +.form-control:focus { + outline: none; + border-color: var(--accent-primary); +} + +textarea.form-control { + resize: vertical; + min-height: 80px; +} + +.modal-actions { + display: flex; + justify-content: flex-end; + gap: 12px; + margin-top: 24px; +} + +/* Connection Management in Modal */ +.connection-search-container { + position: relative; + margin-bottom: 16px; +} + +.search-results-dropdown { + position: absolute; + top: 100%; + left: 0; + right: 0; + background: var(--bg-tertiary); + border: 1px solid var(--border-primary); + border-radius: 6px; + margin-top: 4px; + max-height: 200px; + overflow-y: auto; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); + z-index: 10; +} + +.search-result-item { + padding: 10px 12px; + cursor: pointer; + transition: background 0.2s ease; + border-bottom: 1px solid var(--border-primary); +} + +.search-result-item:last-child { + border-bottom: none; +} + +.search-result-item:hover { + background: var(--bg-hover); +} + +.search-result-label { + font-weight: 500; + color: var(--text-primary); + font-size: 14px; +} + +.search-result-notes { + font-size: 12px; + color: var(--text-secondary); + margin-top: 2px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.connections-list { + margin-top: 12px; + border: 1px solid var(--border-primary); + border-radius: 6px; + overflow: hidden; +} + +.connection-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 10px 12px; + background: var(--bg-tertiary); + border-bottom: 1px solid var(--border-primary); +} + +.connection-item:last-child { + border-bottom: none; +} + +.connection-info { + flex: 1; + min-width: 0; +} + +.connection-label { + font-weight: 500; + color: var(--text-primary); + font-size: 14px; +} + +.connection-type { + font-size: 12px; + color: var(--text-secondary); + margin-top: 2px; +} + +.connection-remove { + width: 28px; + height: 28px; + display: flex; + align-items: center; + justify-content: center; + background: transparent; + border: 1px solid var(--border-primary); + border-radius: 4px; + color: var(--text-secondary); + cursor: pointer; + transition: all 0.2s ease; + flex-shrink: 0; + margin-left: 8px; +} + +.connection-remove:hover { + background: var(--danger); + border-color: var(--danger); + color: white; +} + +.connections-empty { + padding: 20px; + text-align: center; + color: var(--text-secondary); + font-size: 14px; + background: var(--bg-tertiary); +} + +/* Responsive */ +@media (max-width: 768px) { + .graph-toolbar { + flex-direction: column; + align-items: stretch; + } + + .toolbar-section { + width: 100%; + justify-content: space-between; + } + + .search-input { + flex: 1; + min-width: 0; + } + + .graph-canvas-container { + height: 400px; + } + + .modal-dialog { + width: 95%; + } +} diff --git a/Media.JoshHeaps.Net/wwwroot/js/network-graph.js b/Media.JoshHeaps.Net/wwwroot/js/network-graph.js new file mode 100644 index 0000000..4d98d9f --- /dev/null +++ b/Media.JoshHeaps.Net/wwwroot/js/network-graph.js @@ -0,0 +1,1251 @@ +// Network Graph Visualization and Management with Community Detection + +// State +let currentGraphId = selectedGraphId; +let graphData = { nodes: [], edges: [] }; +let selectedNodes = new Set(); +let editingNodeId = null; +let editingGraphId = null; +let contextMenuNodeId = null; + +// Canvas and rendering +let canvas, ctx; +let scale = 1; +let offsetX = 0, offsetY = 0; +let isDragging = false; +let dragStartX = 0, dragStartY = 0; +let dragNodeId = null; + +// Physics simulation with community detection +let nodes = []; +let edges = []; +let communities = []; +const REPULSION = 10000; +const ATTRACTION = 0.0004; +const COMMUNITY_ATTRACTION = 0.0012; +const DAMPING = 0.85; +const NODE_RADIUS_BASE = 15; +const MIN_NODE_RADIUS = 12; +const MAX_SIMULATION_ITERATIONS = 500; +const MAX_VELOCITY = 10; // Cap maximum velocity to prevent explosive movements +const MIN_DISTANCE = 8; // Minimum distance between node centers +const MIN_VELOCITY = 0.01; // Threshold below which to stop the node completely +let simulationIterations = 0; +let simulationRunning = false; + +// Initialize +document.addEventListener('DOMContentLoaded', () => { + initializeCanvas(); + initializeEventListeners(); + + if (currentGraphId) { + loadGraphData(currentGraphId); + showWorkspace(); + } +}); + +// Canvas Setup +function initializeCanvas() { + canvas = document.getElementById('graph-canvas'); + if (!canvas) return; + + ctx = canvas.getContext('2d'); + resizeCanvas(); + window.addEventListener('resize', resizeCanvas); +} + +function resizeCanvas() { + if (!canvas) return; + const container = canvas.parentElement; + canvas.width = container.clientWidth; + canvas.height = container.clientHeight; + render(); +} + +// Event Listeners +function initializeEventListeners() { + // Graph management + document.getElementById('new-graph-btn')?.addEventListener('click', showNewGraphModal); + document.getElementById('graph-form')?.addEventListener('submit', handleGraphSubmit); + + // Node management + document.getElementById('add-node-btn')?.addEventListener('click', showNewNodeModal); + document.getElementById('link-nodes-btn')?.addEventListener('click', linkSelectedNodes); + document.getElementById('node-form')?.addEventListener('submit', handleNodeSubmit); + + // Search and filter + document.getElementById('search-nodes')?.addEventListener('input', handleSearch); + document.getElementById('apply-filter-btn')?.addEventListener('click', applyDegreeFilter); + document.getElementById('clear-filter-btn')?.addEventListener('click', clearFilter); + + // Canvas controls + document.getElementById('zoom-in-btn')?.addEventListener('click', () => zoomCanvas(1.2)); + document.getElementById('zoom-out-btn')?.addEventListener('click', () => zoomCanvas(0.8)); + document.getElementById('reset-view-btn')?.addEventListener('click', resetView); + + // Canvas interactions + if (canvas) { + canvas.addEventListener('mousedown', handleCanvasMouseDown); + canvas.addEventListener('mousemove', handleCanvasMouseMove); + canvas.addEventListener('mouseup', handleCanvasMouseUp); + canvas.addEventListener('wheel', handleCanvasWheel); + canvas.addEventListener('dblclick', handleCanvasDoubleClick); + canvas.addEventListener('contextmenu', handleCanvasContextMenu); + } + + // Close context menu when clicking outside + document.addEventListener('click', (e) => { + if (!e.target.closest('.context-menu')) { + hideContextMenu(); + } + }); + + // Context menu item clicks + document.addEventListener('click', (e) => { + const menuItem = e.target.closest('.context-menu-item'); + if (menuItem && menuItem.dataset.action) { + e.preventDefault(); + e.stopPropagation(); + + const action = menuItem.dataset.action; + switch (action) { + case 'edit': + handleContextEdit(); + break; + case 'link': + handleContextLinkTo(); + break; + case 'select': + handleContextSelect(); + break; + case 'delete': + handleContextDelete(); + break; + } + } + }); +} + +// Graph Management +function selectGraph(graphId) { + currentGraphId = graphId; + window.location.href = `/NetworkGraph?graphId=${graphId}`; +} + +async function loadGraphData(graphId) { + try { + const response = await fetch(`/api/graph/${graphId}/data`); + if (!response.ok) throw new Error('Failed to load graph'); + + graphData = await response.json(); + initializePhysics(); + showWorkspace(); + startSimulation(); + } catch (error) { + console.error('Error loading graph:', error); + alert('Failed to load graph data'); + } +} + +function showWorkspace() { + const workspace = document.getElementById('graph-workspace'); + if (workspace) { + workspace.style.display = 'flex'; + + requestAnimationFrame(() => { + resizeCanvas(); + centerGraph(); + render(); + }); + } +} + +function showNewGraphModal() { + editingGraphId = null; + document.getElementById('graph-modal-title').textContent = 'New Graph'; + document.getElementById('graph-name').value = ''; + document.getElementById('graph-description').value = ''; + document.getElementById('save-graph-btn').textContent = 'Create Graph'; + document.getElementById('graph-modal').style.display = 'flex'; +} + +function editGraph(id, name, description) { + editingGraphId = id; + document.getElementById('graph-modal-title').textContent = 'Edit Graph'; + document.getElementById('graph-name').value = name; + document.getElementById('graph-description').value = description; + document.getElementById('save-graph-btn').textContent = 'Save Changes'; + document.getElementById('graph-modal').style.display = 'flex'; +} + +async function handleGraphSubmit(e) { + e.preventDefault(); + + const name = document.getElementById('graph-name').value.trim(); + const description = document.getElementById('graph-description').value.trim(); + + if (!name) return; + + try { + let response; + if (editingGraphId) { + response = await fetch(`/api/graph/${editingGraphId}`, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name, description }) + }); + } else { + response = await fetch('/api/graph/create', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name, description }) + }); + } + + if (!response.ok) throw new Error('Failed to save graph'); + + closeGraphModal(); + window.location.reload(); + } catch (error) { + console.error('Error saving graph:', error); + alert('Failed to save graph'); + } +} + +async function deleteGraph(id, name) { + if (!confirm(`Are you sure you want to delete "${name}"? This cannot be undone.`)) return; + + try { + const response = await fetch(`/api/graph/${id}`, { method: 'DELETE' }); + if (!response.ok) throw new Error('Failed to delete graph'); + + window.location.href = '/NetworkGraph'; + } catch (error) { + console.error('Error deleting graph:', error); + alert('Failed to delete graph'); + } +} + +async function cloneGraph(id, name) { + const newName = prompt(`Enter name for cloned graph:`, `${name} (Copy)`); + if (!newName) return; + + try { + const response = await fetch(`/api/graph/${id}/clone`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ newName }) + }); + + if (!response.ok) throw new Error('Failed to clone graph'); + + const newGraph = await response.json(); + window.location.href = `/NetworkGraph?graphId=${newGraph.id}`; + } catch (error) { + console.error('Error cloning graph:', error); + alert('Failed to clone graph'); + } +} + +function closeGraphModal() { + document.getElementById('graph-modal').style.display = 'none'; +} + +// Node Management +function showNewNodeModal() { + if (!currentGraphId) return; + + editingNodeId = null; + document.getElementById('node-modal-title').textContent = 'New Node'; + document.getElementById('node-label').value = ''; + document.getElementById('node-notes').value = ''; + document.getElementById('save-node-btn').textContent = 'Create Node'; + + // Hide connections section for new nodes + document.getElementById('node-connections-section').style.display = 'none'; + + document.getElementById('node-modal').style.display = 'flex'; +} + +async function editNode(node) { + editingNodeId = node.id; + document.getElementById('node-modal-title').textContent = 'Edit Node'; + document.getElementById('node-label').value = node.label; + document.getElementById('node-notes').value = node.notes || ''; + document.getElementById('save-node-btn').textContent = 'Save Changes'; + + // Show connections section when editing + document.getElementById('node-connections-section').style.display = 'block'; + + // Load connections for this node + await loadNodeConnections(node.id); + + document.getElementById('node-modal').style.display = 'flex'; +} + +async function handleNodeSubmit(e) { + e.preventDefault(); + + const label = document.getElementById('node-label').value.trim(); + const notes = document.getElementById('node-notes').value.trim(); + + if (!label) return; + + try { + let response; + if (editingNodeId) { + response = await fetch(`/api/graph/nodes/${editingNodeId}`, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ label, notes }) + }); + } else { + response = await fetch(`/api/graph/${currentGraphId}/nodes`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ label, notes }) + }); + } + + if (!response.ok) throw new Error('Failed to save node'); + + closeNodeModal(); + await loadGraphData(currentGraphId); + } catch (error) { + console.error('Error saving node:', error); + alert('Failed to save node'); + } +} + +async function deleteNode(nodeId) { + if (!confirm('Delete this node and all its connections?')) return; + + try { + const response = await fetch(`/api/graph/nodes/${nodeId}`, { method: 'DELETE' }); + if (!response.ok) throw new Error('Failed to delete node'); + + await loadGraphData(currentGraphId); + } catch (error) { + console.error('Error deleting node:', error); + alert('Failed to delete node'); + } +} + +function closeNodeModal() { + document.getElementById('node-modal').style.display = 'none'; + // Clear connection search + document.getElementById('connection-search').value = ''; + document.getElementById('connection-search-results').style.display = 'none'; +} + +// Node Connection Management (in modal) +let nodeConnections = []; +let connectionSearchTimeout = null; + +async function loadNodeConnections(nodeId) { + if (!currentGraphId || !nodeId) return; + + try { + // Get all edges for this graph + const edgesResponse = await fetch(`/api/graph/${currentGraphId}/edges`); + if (!edgesResponse.ok) throw new Error('Failed to load edges'); + const allEdges = await edgesResponse.json(); + + // Get all nodes for the graph + const nodesResponse = await fetch(`/api/graph/${currentGraphId}/nodes`); + if (!nodesResponse.ok) throw new Error('Failed to load nodes'); + const allNodes = await nodesResponse.json(); + + // Find connections where this node is the source or target (bidirectional) + nodeConnections = []; + allEdges.forEach(edge => { + if (edge.sourceNodeId === nodeId) { + const targetNode = allNodes.find(n => n.id === edge.targetNodeId); + if (targetNode) { + nodeConnections.push({ + edgeId: edge.id, + nodeId: targetNode.id, + label: targetNode.label + }); + } + } else if (edge.targetNodeId === nodeId) { + const sourceNode = allNodes.find(n => n.id === edge.sourceNodeId); + if (sourceNode) { + nodeConnections.push({ + edgeId: edge.id, + nodeId: sourceNode.id, + label: sourceNode.label + }); + } + } + }); + + renderNodeConnections(); + } catch (error) { + console.error('Error loading connections:', error); + } +} + +function renderNodeConnections() { + const listEl = document.getElementById('node-connections-list'); + if (!listEl) return; + + if (nodeConnections.length === 0) { + listEl.innerHTML = '
No connections yet
'; + return; + } + + listEl.innerHTML = nodeConnections.map(conn => ` +
+
+
${escapeHtml(conn.label)}
+
+ +
+ `).join(''); +} + +async function removeConnection(edgeId) { + if (!confirm('Remove this connection?')) return; + + try { + const response = await fetch(`/api/graph/edges/${edgeId}`, { method: 'DELETE' }); + if (!response.ok) throw new Error('Failed to remove connection'); + + // Reload connections + await loadNodeConnections(editingNodeId); + } catch (error) { + console.error('Error removing connection:', error); + alert('Failed to remove connection'); + } +} + +// Connection search functionality +document.addEventListener('DOMContentLoaded', () => { + const searchInput = document.getElementById('connection-search'); + if (searchInput) { + searchInput.addEventListener('input', handleConnectionSearch); + searchInput.addEventListener('blur', () => { + // Delay hiding to allow click on result + setTimeout(() => { + document.getElementById('connection-search-results').style.display = 'none'; + }, 200); + }); + } +}); + +async function handleConnectionSearch(e) { + const query = e.target.value.trim(); + + if (!query) { + document.getElementById('connection-search-results').style.display = 'none'; + return; + } + + // Debounce search + clearTimeout(connectionSearchTimeout); + connectionSearchTimeout = setTimeout(async () => { + await performConnectionSearch(query); + }, 300); +} + +async function performConnectionSearch(query) { + if (!currentGraphId || !editingNodeId) return; + + try { + const response = await fetch(`/api/graph/${currentGraphId}/nodes/search?q=${encodeURIComponent(query)}`); + if (!response.ok) throw new Error('Search failed'); + + const results = await response.json(); + + // Filter out the current node and already connected nodes + const connectedNodeIds = nodeConnections.map(c => c.nodeId); + const availableResults = results.filter(n => + n.id !== editingNodeId && !connectedNodeIds.includes(n.id) + ); + + renderConnectionSearchResults(availableResults); + } catch (error) { + console.error('Connection search error:', error); + } +} + +function renderConnectionSearchResults(results) { + const resultsEl = document.getElementById('connection-search-results'); + if (!resultsEl) return; + + if (results.length === 0) { + resultsEl.innerHTML = '
No nodes found
'; + resultsEl.style.display = 'block'; + return; + } + + resultsEl.innerHTML = results.map(node => ` +
+
${escapeHtml(node.label)}
+ ${node.notes ? `
${escapeHtml(node.notes)}
` : ''} +
+ `).join(''); + + resultsEl.style.display = 'block'; +} + +async function addConnection(targetNodeId, targetLabel) { + if (!currentGraphId || !editingNodeId) return; + + try { + const response = await fetch(`/api/graph/${currentGraphId}/edges`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + sourceNodeId: editingNodeId, + targetNodeId: targetNodeId + }) + }); + + if (!response.ok) throw new Error('Failed to create connection'); + + // Clear search and reload connections + document.getElementById('connection-search').value = ''; + document.getElementById('connection-search-results').style.display = 'none'; + await loadNodeConnections(editingNodeId); + } catch (error) { + console.error('Error adding connection:', error); + alert('Failed to add connection'); + } +} + +function escapeHtml(text) { + const div = document.createElement('div'); + div.textContent = text; + return div.innerHTML; +} + +// Edge Management +async function linkSelectedNodes() { + if (selectedNodes.size < 2) { + alert('Please select at least 2 nodes to link'); + return; + } + + const nodeIds = Array.from(selectedNodes); + const sourceId = nodeIds[0]; + + try { + for (let i = 1; i < nodeIds.length; i++) { + await fetch(`/api/graph/${currentGraphId}/edges`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ sourceNodeId: sourceId, targetNodeId: nodeIds[i] }) + }); + } + + selectedNodes.clear(); + await loadGraphData(currentGraphId); + } catch (error) { + console.error('Error creating edges:', error); + alert('Failed to create connections'); + } +} + +async function deleteEdge(edgeId) { + try { + const response = await fetch(`/api/graph/edges/${edgeId}`, { method: 'DELETE' }); + if (!response.ok) throw new Error('Failed to delete edge'); + + await loadGraphData(currentGraphId); + } catch (error) { + console.error('Error deleting edge:', error); + } +} + +// Search and Filter +async function handleSearch(e) { + const query = e.target.value.trim(); + + // Show filter controls when there's a selected node + const hasSelection = selectedNodes.size > 0; + document.getElementById('degrees-input').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('filter-mode-select').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('apply-filter-btn').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('clear-filter-btn').style.display = hasSelection ? 'inline-block' : 'none'; + + if (!query) { + clearFilter(); + return; + } + + try { + const response = await fetch(`/api/graph/${currentGraphId}/nodes/search?q=${encodeURIComponent(query)}`); + if (!response.ok) throw new Error('Search failed'); + + const searchNodes = await response.json(); + highlightNodes(searchNodes.map(n => n.id)); + } catch (error) { + console.error('Search error:', error); + } +} + +async function applyDegreeFilter() { + if (selectedNodes.size === 0) { + alert('Please select a node to filter by (Ctrl+Click on a node)'); + return; + } + + const targetNodeId = Array.from(selectedNodes)[0]; + const degrees = parseInt(document.getElementById('degrees-input').value) || 1; + const mode = document.getElementById('filter-mode-select').value; + + // Calculate degrees of separation using BFS + const nodeMap = new Map(nodes.map(n => [n.id, n])); + const distances = new Map(); + const queue = [{ nodeId: targetNodeId, distance: 0 }]; + const visited = new Set([targetNodeId]); + + distances.set(targetNodeId, 0); + + while (queue.length > 0) { + const { nodeId, distance } = queue.shift(); + + // Find all edges connected to this node + for (const edge of edges) { + let neighborId = null; + if (edge.source.id === nodeId) { + neighborId = edge.target.id; + } else if (edge.target.id === nodeId) { + neighborId = edge.source.id; + } + + if (neighborId && !visited.has(neighborId)) { + visited.add(neighborId); + distances.set(neighborId, distance + 1); + queue.push({ nodeId: neighborId, distance: distance + 1 }); + } + } + } + + // Filter nodes based on mode + const filteredNodeIds = []; + for (const node of nodes) { + if (node.id === targetNodeId) continue; // Exclude the target node itself + + const dist = distances.get(node.id); + const hasConnection = dist !== undefined; + + switch (mode) { + case 'exact': + if (dist === degrees) { + filteredNodeIds.push(node.id); + } + break; + case 'within': + if (hasConnection && dist <= degrees) { + filteredNodeIds.push(node.id); + } + break; + case 'outside': + if (!hasConnection || dist > degrees) { + filteredNodeIds.push(node.id); + } + break; + } + } + + highlightNodes(filteredNodeIds); +} + +function clearFilter() { + // Clear highlights + nodes.forEach(n => n.highlighted = false); + render(); +} + +function highlightNodes(nodeIds) { + nodes.forEach(n => n.highlighted = nodeIds.includes(n.id)); + render(); +} + +// Community Detection using Louvain-inspired algorithm +function detectCommunities() { + if (nodes.length === 0) return []; + + // Build adjacency map + const adjacency = new Map(); + nodes.forEach(n => adjacency.set(n.id, new Set())); + + edges.forEach(e => { + adjacency.get(e.source.id).add(e.target.id); + adjacency.get(e.target.id).add(e.source.id); + }); + + // Initialize each node in its own community + const nodeToCommunity = new Map(); + nodes.forEach((n, idx) => nodeToCommunity.set(n.id, idx)); + + let improved = true; + let iterations = 0; + const maxIterations = 10; + + // Iteratively optimize modularity + while (improved && iterations < maxIterations) { + improved = false; + iterations++; + + for (const node of nodes) { + const currentCommunity = nodeToCommunity.get(node.id); + const neighbors = adjacency.get(node.id); + + if (neighbors.size === 0) continue; + + // Count connections to each neighboring community + const communityCounts = new Map(); + neighbors.forEach(neighborId => { + const neighborComm = nodeToCommunity.get(neighborId); + communityCounts.set(neighborComm, (communityCounts.get(neighborComm) || 0) + 1); + }); + + // Find best community (most connections) + let bestCommunity = currentCommunity; + let bestCount = communityCounts.get(currentCommunity) || 0; + + communityCounts.forEach((count, community) => { + if (count > bestCount) { + bestCount = count; + bestCommunity = community; + } + }); + + if (bestCommunity !== currentCommunity) { + nodeToCommunity.set(node.id, bestCommunity); + improved = true; + } + } + } + + // Group nodes by community + const communityMap = new Map(); + nodeToCommunity.forEach((community, nodeId) => { + if (!communityMap.has(community)) { + communityMap.set(community, []); + } + const node = nodes.find(n => n.id === nodeId); + if (node) { + communityMap.get(community).push(node); + } + }); + + return Array.from(communityMap.values()); +} + +// Physics Simulation with Community-Aware Layout +function initializePhysics() { + nodes = graphData.nodes.map(n => ({ + id: n.id, + label: n.label, + notes: n.notes, + x: Math.random() * canvas.width, + y: Math.random() * canvas.height, + vx: 0, + vy: 0, + connections: n.connectionCount, + selected: false, + highlighted: false, + community: null, + communityCenter: { x: 0, y: 0 } + })); + + edges = graphData.edges.map(e => ({ + id: e.id, + source: nodes.find(n => n.id === e.sourceNodeId), + target: nodes.find(n => n.id === e.targetNodeId) + })).filter(e => e.source && e.target); + + // Detect communities + communities = detectCommunities(); + + // Assign community centers in a circular pattern + const radius = Math.min(canvas.width, canvas.height) * 0.3; + communities.forEach((community, idx) => { + const angle = (idx / communities.length) * Math.PI * 2; + const centerX = canvas.width / 2 + Math.cos(angle) * radius; + const centerY = canvas.height / 2 + Math.sin(angle) * radius; + + community.forEach(node => { + node.community = idx; + node.communityCenter = { x: centerX, y: centerY }; + }); + }); + + simulationIterations = 0; + simulationRunning = true; + centerGraph(); +} + +function startSimulation() { + const animate = () => { + if (simulationRunning) { + applyForces(); + updatePositions(); + } + render(); + requestAnimationFrame(animate); + }; + animate(); +} + +function applyForces() { + // Reset velocities slightly + nodes.forEach(node => { + node.vx *= 0.4; + node.vy *= 0.4; + }); + + // Repulsion between all nodes + for (let i = 0; i < nodes.length; i++) { + for (let j = i + 1; j < nodes.length; j++) { + const dx = nodes[j].x - nodes[i].x; + const dy = nodes[j].y - nodes[i].y; + const dist = Math.sqrt(dx * dx + dy * dy) || 1; + + // Get node radii + const radiusI = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (nodes[i].connections * 4)); + const radiusJ = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (nodes[j].connections * 4)); + const minSeparation = radiusI + radiusJ + MIN_DISTANCE; + + // Adjust repulsion based on community + let repulsionMultiplier; + if (nodes[i].community === nodes[j].community) { + // Moderate repulsion within same community + repulsionMultiplier = 0.5; + } else { + // Stronger repulsion between different communities + repulsionMultiplier = 1.0; + } + + const force = (REPULSION * repulsionMultiplier) / (dist * dist); + const fx = (dx / dist) * force; + const fy = (dy / dist) * force; + + nodes[i].vx -= fx; + nodes[i].vy -= fy; + nodes[j].vx += fx; + nodes[j].vy += fy; + } + } + + // Attraction along edges (stronger within community) + edges.forEach(edge => { + const dx = edge.target.x - edge.source.x; + const dy = edge.target.y - edge.source.y; + const dist = Math.sqrt(dx * dx + dy * dy); + + const attractionStrength = edge.source.community === edge.target.community + ? ATTRACTION * 1.2 + : ATTRACTION * 0.4; + + const force = dist * attractionStrength; + const fx = dx * force; + const fy = dy * force; + + edge.source.vx += fx; + edge.source.vy += fy; + edge.target.vx -= fx; + edge.target.vy -= fy; + }); + + // Pull nodes toward their community center + nodes.forEach(node => { + const dx = node.communityCenter.x - node.x; + const dy = node.communityCenter.y - node.y; + const dist = Math.sqrt(dx * dx + dy * dy); + + // High-degree nodes pulled more strongly toward center + const centerPull = COMMUNITY_ATTRACTION * (1 + node.connections * 0.08); + const fx = dx * centerPull; + const fy = dy * centerPull; + + node.vx += fx; + node.vy += fy; + }); + + // Cap velocities to prevent explosive movements and stop tiny vibrations + nodes.forEach(node => { + const speed = Math.sqrt(node.vx * node.vx + node.vy * node.vy); + + // Stop very small movements to prevent vibration + if (speed < MIN_VELOCITY) { + node.vx = 0; + node.vy = 0; + } else if (speed > MAX_VELOCITY) { + node.vx = (node.vx / speed) * MAX_VELOCITY; + node.vy = (node.vy / speed) * MAX_VELOCITY; + } + }); +} + +function updatePositions() { + nodes.forEach(node => { + if (dragNodeId === node.id) return; // Don't update position of dragged node + + node.vx *= DAMPING; + node.vy *= DAMPING; + node.x += node.vx; + node.y += node.vy; + }); + + // Apply position constraints to prevent overlap + resolveCollisions(); +} + +function resolveCollisions() { + // Multiple passes to resolve all collisions + for (let pass = 0; pass < 3; pass++) { + for (let i = 0; i < nodes.length; i++) { + for (let j = i + 1; j < nodes.length; j++) { + const dx = nodes[j].x - nodes[i].x; + const dy = nodes[j].y - nodes[i].y; + const dist = Math.sqrt(dx * dx + dy * dy); + + // Calculate required minimum distance + const radiusI = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (nodes[i].connections * 4)); + const radiusJ = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (nodes[j].connections * 4)); + const minDist = radiusI + radiusJ + MIN_DISTANCE; + + // If overlapping, push them apart to exactly the minimum distance + if (dist < minDist && dist > 0.1) { + const overlap = minDist - dist; + const angle = Math.atan2(dy, dx); + + // Push each node half the overlap distance + const pushDist = overlap / 2; + + nodes[i].x -= Math.cos(angle) * pushDist; + nodes[i].y -= Math.sin(angle) * pushDist; + nodes[j].x += Math.cos(angle) * pushDist; + nodes[j].y += Math.sin(angle) * pushDist; + + // Zero out velocities in the collision direction to stop vibration + const relVelX = nodes[j].vx - nodes[i].vx; + const relVelY = nodes[j].vy - nodes[i].vy; + const relVelDotNormal = (relVelX * dx + relVelY * dy) / dist; + + if (relVelDotNormal < 0) { + // Moving toward each other, stop that component of velocity + const normalX = dx / dist; + const normalY = dy / dist; + + nodes[i].vx += normalX * relVelDotNormal * 0.5; + nodes[i].vy += normalY * relVelDotNormal * 0.5; + nodes[j].vx -= normalX * relVelDotNormal * 0.5; + nodes[j].vy -= normalY * relVelDotNormal * 0.5; + } + } + } + } + } +} + +// Rendering +function render() { + if (!ctx || !canvas) return; + + ctx.clearRect(0, 0, canvas.width, canvas.height); + ctx.save(); + + // Apply transformations + ctx.scale(scale, scale); + ctx.translate(offsetX, offsetY); + + // Draw edges + edges.forEach(edge => { + ctx.strokeStyle = getComputedStyle(document.documentElement).getPropertyValue('--border-primary'); + ctx.lineWidth = 2 / scale; + ctx.beginPath(); + ctx.moveTo(edge.source.x, edge.source.y); + ctx.lineTo(edge.target.x, edge.target.y); + ctx.stroke(); + }); + + // Draw nodes + nodes.forEach(node => { + // Size based on connections (degree centrality) + const radius = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (node.connections * 4)); + + // Node circle + ctx.fillStyle = node.selected + ? getComputedStyle(document.documentElement).getPropertyValue('--accent-primary') + : node.highlighted + ? getComputedStyle(document.documentElement).getPropertyValue('--success') + : getComputedStyle(document.documentElement).getPropertyValue('--bg-tertiary'); + + ctx.strokeStyle = getComputedStyle(document.documentElement).getPropertyValue('--border-primary'); + ctx.lineWidth = 2 / scale; + + ctx.beginPath(); + ctx.arc(node.x, node.y, radius, 0, Math.PI * 2); + ctx.fill(); + ctx.stroke(); + + // Label + ctx.fillStyle = getComputedStyle(document.documentElement).getPropertyValue('--text-primary'); + ctx.font = `${14 / scale}px sans-serif`; + ctx.textAlign = 'center'; + ctx.textBaseline = 'middle'; + ctx.fillText(node.label, node.x, node.y); + }); + + ctx.restore(); +} + +// Canvas Interactions +function handleCanvasMouseDown(e) { + const rect = canvas.getBoundingClientRect(); + const x = (e.clientX - rect.left - offsetX * scale) / scale; + const y = (e.clientY - rect.top - offsetY * scale) / scale; + + dragNodeId = null; + for (const node of nodes) { + const radius = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (node.connections * 4)); + const dist = Math.sqrt((x - node.x) ** 2 + (y - node.y) ** 2); + if (dist < radius) { + dragNodeId = node.id; + if (!e.ctrlKey && !e.metaKey) { + selectedNodes.clear(); + } + selectedNodes.add(node.id); + node.selected = true; + updateLinkButtonState(); + render(); + return; + } + } + + if (!e.ctrlKey && !e.metaKey) { + selectedNodes.clear(); + nodes.forEach(n => n.selected = false); + updateLinkButtonState(); + } + + isDragging = true; + dragStartX = e.clientX; + dragStartY = e.clientY; +} + +function handleCanvasMouseMove(e) { + if (dragNodeId) { + const rect = canvas.getBoundingClientRect(); + const x = (e.clientX - rect.left - offsetX * scale) / scale; + const y = (e.clientY - rect.top - offsetY * scale) / scale; + + const node = nodes.find(n => n.id === dragNodeId); + if (node) { + node.x = x; + node.y = y; + node.vx = 0; + node.vy = 0; + render(); + } + return; + } + + if (isDragging) { + const dx = e.clientX - dragStartX; + const dy = e.clientY - dragStartY; + offsetX += dx / scale; + offsetY += dy / scale; + dragStartX = e.clientX; + dragStartY = e.clientY; + render(); + } +} + +function handleCanvasMouseUp() { + dragNodeId = null; + isDragging = false; +} + +function handleCanvasWheel(e) { + e.preventDefault(); + const zoomFactor = e.deltaY > 0 ? 0.9 : 1.1; + zoomCanvas(zoomFactor); +} + +function handleCanvasDoubleClick(e) { + const rect = canvas.getBoundingClientRect(); + const x = (e.clientX - rect.left - offsetX * scale) / scale; + const y = (e.clientY - rect.top - offsetY * scale) / scale; + + for (const node of nodes) { + const radius = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (node.connections * 4)); + const dist = Math.sqrt((x - node.x) ** 2 + (y - node.y) ** 2); + if (dist < radius) { + editNode(node); + return; + } + } +} + +function zoomCanvas(factor) { + scale *= factor; + scale = Math.max(0.1, Math.min(5, scale)); + render(); +} + +function resetView() { + scale = 1; + centerGraph(); + render(); +} + +function centerGraph() { + if (nodes.length === 0) { + offsetX = 0; + offsetY = 0; + return; + } + + const minX = Math.min(...nodes.map(n => n.x)); + const maxX = Math.max(...nodes.map(n => n.x)); + const minY = Math.min(...nodes.map(n => n.y)); + const maxY = Math.max(...nodes.map(n => n.y)); + + const graphCenterX = (minX + maxX) / 2; + const graphCenterY = (minY + maxY) / 2; + + offsetX = canvas.width / 2 / scale - graphCenterX; + offsetY = canvas.height / 2 / scale - graphCenterY; +} + +function updateLinkButtonState() { + const btn = document.getElementById('link-nodes-btn'); + if (btn) { + btn.disabled = selectedNodes.size < 2; + } + + // Show/hide filter controls based on selection + const hasSelection = selectedNodes.size > 0; + document.getElementById('degrees-input').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('filter-mode-select').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('apply-filter-btn').style.display = hasSelection ? 'inline-block' : 'none'; + document.getElementById('clear-filter-btn').style.display = hasSelection ? 'inline-block' : 'none'; +} + +// Context Menu +function handleCanvasContextMenu(e) { + e.preventDefault(); + + const rect = canvas.getBoundingClientRect(); + const x = (e.clientX - rect.left - offsetX * scale) / scale; + const y = (e.clientY - rect.top - offsetY * scale) / scale; + + // Find clicked node + let clickedNode = null; + for (const node of nodes) { + const radius = Math.max(MIN_NODE_RADIUS, NODE_RADIUS_BASE + (node.connections * 4)); + const dist = Math.sqrt((x - node.x) ** 2 + (y - node.y) ** 2); + if (dist < radius) { + clickedNode = node; + break; + } + } + + if (clickedNode) { + contextMenuNodeId = clickedNode.id; + showContextMenu(e.clientX, e.clientY); + } else { + hideContextMenu(); + } +} + +function showContextMenu(x, y) { + const menu = document.getElementById('node-context-menu'); + if (!menu) return; + + menu.style.display = 'block'; + menu.style.left = x + 'px'; + menu.style.top = y + 'px'; + + // Adjust if menu goes off screen + const rect = menu.getBoundingClientRect(); + if (rect.right > window.innerWidth) { + menu.style.left = (x - rect.width) + 'px'; + } + if (rect.bottom > window.innerHeight) { + menu.style.top = (y - rect.height) + 'px'; + } +} + +function hideContextMenu() { + const menu = document.getElementById('node-context-menu'); + if (menu) { + menu.style.display = 'none'; + } + contextMenuNodeId = null; +} + +function handleContextEdit() { + hideContextMenu(); + if (contextMenuNodeId) { + const node = nodes.find(n => n.id === contextMenuNodeId); + if (node) { + editNode(node); + } + } +} + +async function handleContextLinkTo() { + hideContextMenu(); + if (!contextMenuNodeId) return; + + if (selectedNodes.size === 0) { + alert('Please select at least one other node first (Ctrl+Click on nodes)'); + return; + } + + // Create edges from all selected nodes to the context menu node + try { + for (const selectedId of selectedNodes) { + if (selectedId !== contextMenuNodeId) { + await fetch(`/api/graph/${currentGraphId}/edges`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + sourceNodeId: selectedId, + targetNodeId: contextMenuNodeId + }) + }); + } + } + + selectedNodes.clear(); + await loadGraphData(currentGraphId); + } catch (error) { + console.error('Error creating edges:', error); + alert('Failed to create connections'); + } +} + +function handleContextSelect() { + hideContextMenu(); + if (contextMenuNodeId) { + selectedNodes.add(contextMenuNodeId); + const node = nodes.find(n => n.id === contextMenuNodeId); + if (node) { + node.selected = true; + } + updateLinkButtonState(); + render(); + } +} + +async function handleContextDelete() { + hideContextMenu(); + if (contextMenuNodeId) { + await deleteNode(contextMenuNodeId); + } +} diff --git a/run-migrations.ps1 b/run-migrations.ps1 new file mode 100644 index 0000000..4273640 --- /dev/null +++ b/run-migrations.ps1 @@ -0,0 +1,73 @@ +# Run Database Migrations +# This script executes all SQL files in the Database folder in order + +param( + [string]$ConnectionString = "" +) + +if ([string]::IsNullOrEmpty($ConnectionString)) { + Write-Host "Usage: .\run-migrations.ps1 -ConnectionString 'your-connection-string'" + Write-Host "" + Write-Host "Example:" + Write-Host ".\run-migrations.ps1 -ConnectionString 'Host=localhost;Database=mydb;Username=postgres;Password=mypassword'" + exit 1 +} + +# Get all SQL files in the Database folder, sorted by name +$sqlFiles = Get-ChildItem -Path ".\Media.JoshHeaps.Net\Database\*.sql" | Sort-Object Name + +if ($sqlFiles.Count -eq 0) { + Write-Host "No SQL migration files found in .\Media.JoshHeaps.Net\Database\" + exit 1 +} + +Write-Host "Found $($sqlFiles.Count) migration files to execute:" +$sqlFiles | ForEach-Object { Write-Host " - $($_.Name)" } +Write-Host "" + +# Check if psql is available +$psqlPath = Get-Command psql -ErrorAction SilentlyContinue + +if (-not $psqlPath) { + Write-Host "ERROR: psql command not found. Please install PostgreSQL client tools." + Write-Host "" + Write-Host "Alternatively, you can manually run each SQL file using your preferred PostgreSQL client:" + $sqlFiles | ForEach-Object { + Write-Host " psql `"$ConnectionString`" -f `"$($_.FullName)`"" + } + exit 1 +} + +# Execute each migration +$successCount = 0 +$failCount = 0 + +foreach ($file in $sqlFiles) { + Write-Host "Executing: $($file.Name)... " -NoNewline + + try { + $result = psql $ConnectionString -f $file.FullName 2>&1 + + if ($LASTEXITCODE -eq 0) { + Write-Host "SUCCESS" -ForegroundColor Green + $successCount++ + } else { + Write-Host "FAILED" -ForegroundColor Red + Write-Host " Error: $result" + $failCount++ + } + } catch { + Write-Host "FAILED" -ForegroundColor Red + Write-Host " Error: $($_.Exception.Message)" + $failCount++ + } +} + +Write-Host "" +Write-Host "Migration Summary:" +Write-Host " Successful: $successCount" -ForegroundColor Green +Write-Host " Failed: $failCount" -ForegroundColor $(if ($failCount -gt 0) { "Red" } else { "Green" }) + +if ($failCount -gt 0) { + exit 1 +}