diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs index 43800b1..e37435f 100644 --- a/Controllers/ProjectsController.cs +++ b/Controllers/ProjectsController.cs @@ -180,11 +180,15 @@ namespace TicketManager.Controllers EndingDate = projectDto.EndingDate, Manager = await _context.AppUsers.FindAsync(projectDto.ManagerId) }; - // project.LogAction( - // $"{project.Title} has been created by {project.Manager.FullName}.", - // ActivityType.StartTask); _context.Projects.Add(project); + _context.Assignments.Add(new Assignment() + { + Project = project, + ProjectId = project.Id, + User = project.Manager, + UserId = project.Manager.Id + }); await _context.SaveChangesAsync(); var dto = new ProjectDTO(project); return CreatedAtAction("GetProject", new { id = project.Id }, dto); diff --git a/Resources/Project/NewProjectDTO.cs b/Resources/Project/NewProjectDTO.cs index 8043069..244c484 100644 --- a/Resources/Project/NewProjectDTO.cs +++ b/Resources/Project/NewProjectDTO.cs @@ -11,6 +11,6 @@ namespace TicketManager.Resources [Required] public DateTime EndingDate { get; set; } [Required] - public Guid ManagerId { get; set; } + public string ManagerId { get; set; } } } \ No newline at end of file diff --git a/app.db b/app.db index ff1acb8..26a5986 100644 Binary files a/app.db and b/app.db differ diff --git a/client/src/components/ButtonAppBar.tsx b/client/src/components/ButtonAppBar.tsx index 95d2796..8ae9de2 100644 --- a/client/src/components/ButtonAppBar.tsx +++ b/client/src/components/ButtonAppBar.tsx @@ -46,8 +46,7 @@ export default function ButtonAppBar() { {!isAuthenticated ? ( diff --git a/client/src/components/Footer.tsx b/client/src/components/Footer.tsx index ce709cc..b6cda25 100644 --- a/client/src/components/Footer.tsx +++ b/client/src/components/Footer.tsx @@ -1,4 +1,5 @@ import React, { FC } from "react"; +import { Link as RouterLink } from "react-router-dom"; import { Container, Typography, Link } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; @@ -16,7 +17,7 @@ const Copyright: FC = ({ brand, text }) => { return ( {"© "} - + {brand} {" "} {new Date().getFullYear()} diff --git a/client/src/components/Modals/NewProjectModal.tsx b/client/src/components/Modals/NewProjectModal.tsx index 6477a7f..a9acc2d 100644 --- a/client/src/components/Modals/NewProjectModal.tsx +++ b/client/src/components/Modals/NewProjectModal.tsx @@ -22,7 +22,7 @@ const NewProjectModal: FC = ({ show, handleClose }) => { title: title, description: description, endingDate: new Date(endingDate).toISOString(), - managerId: getUID(user), // get current User id + managerId: getUID(user), }; const token = await getTokenSilently();