diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..1a35261 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "name": ".NET Core Launch (web)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/src/FeedbackBot/bin/Debug/net6.0/FeedbackBot.dll", + "args": [], + "cwd": "${workspaceFolder}/src/FeedbackBot", + "stopAtEntry": false, + // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser + "serverReadyAction": { + "action": "openExternally", + "pattern": "\\bNow listening on:\\s+(https?://\\S+)" + }, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..970a405 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,42 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/FeedbackBot/FeedbackBot.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/src/FeedbackBot/FeedbackBot.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "${workspaceFolder}/src/FeedbackBot/FeedbackBot.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/FeedbackBot.sln b/FeedbackBot.sln index 037bcb4..345f629 100644 --- a/FeedbackBot.sln +++ b/FeedbackBot.sln @@ -1,39 +1,27 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93CEE17B-350D-4310-8CF2-85F5CEF0EF6C}" +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3B9EDB84-68AC-4FC1-B020-F7F5AF5F3AFA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeedbackBot", "src\FeedbackBot\FeedbackBot.csproj", "{A17571A3-DF4C-4994-85FB-E8DA148EDA4A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeedbackBot", "src\FeedbackBot\FeedbackBot.csproj", "{B232FF92-9D2F-45E7-91AD-3824A59F3F6C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|x64.ActiveCfg = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|x64.Build.0 = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|x86.ActiveCfg = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Debug|x86.Build.0 = Debug|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|Any CPU.Build.0 = Release|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|x64.ActiveCfg = Release|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|x64.Build.0 = Release|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|x86.ActiveCfg = Release|Any CPU - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A}.Release|x86.Build.0 = Release|Any CPU + {B232FF92-9D2F-45E7-91AD-3824A59F3F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B232FF92-9D2F-45E7-91AD-3824A59F3F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B232FF92-9D2F-45E7-91AD-3824A59F3F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B232FF92-9D2F-45E7-91AD-3824A59F3F6C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A17571A3-DF4C-4994-85FB-E8DA148EDA4A} = {93CEE17B-350D-4310-8CF2-85F5CEF0EF6C} + {B232FF92-9D2F-45E7-91AD-3824A59F3F6C} = {3B9EDB84-68AC-4FC1-B020-F7F5AF5F3AFA} EndGlobalSection EndGlobal diff --git a/src/FeedbackBot/App.razor b/src/FeedbackBot/App.razor new file mode 100644 index 0000000..03cc869 --- /dev/null +++ b/src/FeedbackBot/App.razor @@ -0,0 +1,14 @@ + + + + + + + + Not found + +

Sorry, there's nothing at this address.

+ + + + diff --git a/src/FeedbackBot/AppSettings.cs b/src/FeedbackBot/AppSettings.cs index 530f962..a6c030b 100644 --- a/src/FeedbackBot/AppSettings.cs +++ b/src/FeedbackBot/AppSettings.cs @@ -2,8 +2,8 @@ namespace FeedbackBot { public class AppSettings { - public string GitHubUser { get; set; } - public string GitHubPassword { get; set; } - public string GitHubToken { get; set; } + public string GitHubUser { get; set; } = ""; + public string GitHubPassword { get; set; } = ""; + public string GitHubToken { get; set; } = ""; } } \ No newline at end of file diff --git a/src/FeedbackBot/Controllers/AccountController.cs b/src/FeedbackBot/Controllers/AccountController.cs deleted file mode 100644 index ffdd3c4..0000000 --- a/src/FeedbackBot/Controllers/AccountController.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Threading.Tasks; -using AspNetCore.Security.CAS; -using FeedbackBot.Models; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Options; - -namespace FeedbackBot.Controllers -{ - public class AccountController : Controller - { - private readonly AuthSettings _authSettings; - public AccountController(IOptions authSettings) - { - _authSettings = authSettings.Value; - } - public IActionResult AccessDenied() - { - return View(); - } - - [AllowAnonymous] - [Route("login")] - public async Task Login(string returnUrl) - { - var props = new AuthenticationProperties { RedirectUri = returnUrl }; - await HttpContext.ChallengeAsync(CasDefaults.AuthenticationScheme, props); - } - - [Route("logout")] - public async Task Logout() - { - await HttpContext.SignOutAsync(); - return Redirect($"{_authSettings.CasBaseUrl}logout"); - } - - } -} diff --git a/src/FeedbackBot/Controllers/HomeController.cs b/src/FeedbackBot/Controllers/HomeController.cs deleted file mode 100644 index 6aedb51..0000000 --- a/src/FeedbackBot/Controllers/HomeController.cs +++ /dev/null @@ -1,203 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using FeedbackBot.Models; -using FeedbackBot.Services; -using Microsoft.AspNetCore.Authorization; -using Octokit; - -namespace FeedbackBot.Controllers -{ - [Authorize] - public class HomeController : Controller - { - private readonly IGitHubService _gitHubService; - - public HomeController(IGitHubService gitHubService) - { - _gitHubService = gitHubService; - } - - public IActionResult Index() - { - ViewData["Message"] = "Welcome"; - - return View(); - } - - [HttpGet("/app/{appName}")] - public async Task App(string appName) - { - var issues = await _gitHubService.GetIssues(appName); - - // List out all the current issues - var issueContainerList = new List(); - foreach (var i in issues) - { - var newIssueContainer = new IssueContainer { Kerberos = User.Identity.Name }; - newIssueContainer.Deserialize(i); - issueContainerList.Add(newIssueContainer); - } - ViewData["AppName"] = appName; - ViewData["Message"] = "Current Feedback for " + appName; - - return View(issueContainerList); - } - - /* - * Creates a new issue in FeedbackBot repository - * @param string title - The title of the feedback [required] - * @param string descrption - The description of the feedback - */ - [HttpPost("createIssue")] - public async Task CreateIssue(string title, string description, string appName) - { - // Initialize new issue - var createIssue = new NewIssue(title) - { - Body = - $"{description}\r\n" + - "--------------------\r\n" + - "Votes: 1\r\n" + - $"Author: {User.Identity.Name}\r\n" + - $"Voters: {User.Identity.Name}", - Labels = { "feedback" } - }; - var issue = await _gitHubService.CreateIssue(appName, createIssue); - return RedirectToAction("App", "home", new { appName }); - } - - [HttpPost("search")] - public async Task Search(string searchInput, string appName) - { - if (searchInput == null) - { - return RedirectToAction("App", "home", new { appName }); - } - - var results = await _gitHubService.Search(appName, searchInput); - - var issueContainerList = new List(); - foreach (var i in results.Items) - { - var newIssueContainer = new IssueContainer { Kerberos = User.Identity.Name }; - newIssueContainer.Deserialize(i); - issueContainerList.Add(newIssueContainer); - } - ViewData["AppName"] = appName; - ViewData["SearchTerm"] = searchInput; - ViewData["Message"] = "Search Results For " + searchInput + " In " + appName; - - return View(issueContainerList); - } - - [HttpPost("addComment")] - public async Task AddComment(string comment, string voteID, string appName) - { - var id = int.Parse(voteID); - var body = $"{comment} \r\n" + - "--------------------\r\n" + - $"Author: {User.Identity.Name}"; - var issue = await _gitHubService.GetIssue(appName, id); - var result = await _gitHubService.AddComment(appName, id, body); - - return RedirectToAction("details", "home", new { appName = appName, id = voteID }); - } - - /* - * Upvotes a feedback issue - * @param string voteID - The number of the issue we are upvoting - */ - [HttpPost("vote")] - public async Task Vote(string voteID, string appName) - { - var id = int.Parse(voteID); - - var issue = await _gitHubService.GetIssue(appName, id); - var newIssueContainer = new IssueContainer { Kerberos = User.Identity.Name }; - - newIssueContainer.Deserialize(issue); - - if (newIssueContainer.VoteState == "unvote") - { - var newVoteCount = newIssueContainer.NumOfVotesInt - 1; - newIssueContainer.NumOfVotesInt = newVoteCount; - newIssueContainer.NumOfVotes = newVoteCount.ToString(); - newIssueContainer.ListOfVoters.Remove(User.Identity.Name); - } - else - { - // Update vote count - var newVoteCount = newIssueContainer.NumOfVotesInt + 1; - newIssueContainer.NumOfVotesInt = newVoteCount; - newIssueContainer.NumOfVotes = newVoteCount.ToString(); - newIssueContainer.ListOfVoters.Add(User.Identity.Name); - } - newIssueContainer.StringOfVoters = string.Join(",", newIssueContainer.ListOfVoters.ToArray()).Trim().TrimStart(','); - - // Update issue on GitHub - var update = issue.ToUpdate(); - update.Body = newIssueContainer.Serialize(); - await _gitHubService.UpdateIssue(appName, id, update); - - TempData["voteValidationMessage"] = "Thank you for voting on this issue!"; - - // Update voters - return RedirectToAction("details", "home", new { appName = appName, id = voteID }); - } - - /* - * Displays the details of an issue along with all its comments - * @param string voteID - The number of the issue we are upvoting - */ - [HttpGet("/issues/{appName}/{id}")] - public async Task Details(string appName, int id) - { - // Getting issue - var issue = await _gitHubService.GetIssue(appName, id); - var newIssueContainer = new IssueContainer { Kerberos = User.Identity.Name }; - newIssueContainer.Deserialize(issue); - - // Getting all comments in the issue - var issueComments = await _gitHubService.GetComments(appName, id); - var listOfComments = new List(); - - foreach (var i in issueComments) { - - var indexOfLine = i.Body.IndexOf ("--------------------"); - // add to the list if the issue is from FeedbackBot. - if (indexOfLine >= 0) { - - var bodycomment = i.Body.Substring (0, indexOfLine); - // don't add to the list if its an issue with empty comment. - if (!String.IsNullOrWhiteSpace (bodycomment)) { - var commentContainer = new CommentContainer (); - commentContainer.Deserialize (i, bodycomment); - listOfComments.Add (commentContainer); - } - } - } - - // Update model view - var issuesView = new IssueDetailsViewModel - { - Comments = listOfComments, - Issue = newIssueContainer - }; - - if (TempData["voteValidationMessage"] != null) - { - issuesView.VoteMessage = TempData["voteValidationMessage"].ToString(); - } - ViewData["AppName"] = appName; - - return View(issuesView); - } - - public IActionResult Error() - { - return View(); - } - } -} diff --git a/src/FeedbackBot/FeedbackBot.csproj b/src/FeedbackBot/FeedbackBot.csproj index 13762ee..f4e6526 100644 --- a/src/FeedbackBot/FeedbackBot.csproj +++ b/src/FeedbackBot/FeedbackBot.csproj @@ -1,15 +1,19 @@ - netcoreapp3.1 - InProcess - 3d018503-0709-4725-a85f-46666fed579c + net6.0 + enable + enable + aspnet-FeedbackBot-FD20D021-FD9A-4865-B014-0002FD473E09 + 0 - - - + + + + + diff --git a/src/FeedbackBot/Models/AuthSettings.cs b/src/FeedbackBot/Models/AuthSettings.cs index e03a23f..f77af8a 100644 --- a/src/FeedbackBot/Models/AuthSettings.cs +++ b/src/FeedbackBot/Models/AuthSettings.cs @@ -7,6 +7,6 @@ namespace FeedbackBot.Models { public class AuthSettings { - public string CasBaseUrl { get; set; } + public string? CasBaseUrl { get; set; } } } diff --git a/src/FeedbackBot/Models/CommentContainer.cs b/src/FeedbackBot/Models/CommentContainer.cs index 86f280b..2f744a7 100644 --- a/src/FeedbackBot/Models/CommentContainer.cs +++ b/src/FeedbackBot/Models/CommentContainer.cs @@ -5,11 +5,11 @@ namespace FeedbackBot.Models { public class CommentContainer { - public string Body { get; set; } + public string? Body { get; set; } - public string Author { get; set; } + public string? Author { get; set; } - public string CreateDate { get; set; } + public string? CreateDate { get; set; } public void Deserialize(IssueComment comment, string bodyComment) { diff --git a/src/FeedbackBot/Models/IssueContainer.cs b/src/FeedbackBot/Models/IssueContainer.cs index 327f1d5..4b6f8d6 100644 --- a/src/FeedbackBot/Models/IssueContainer.cs +++ b/src/FeedbackBot/Models/IssueContainer.cs @@ -8,25 +8,25 @@ namespace FeedbackBot.Models { public class IssueContainer { - public string Title { get; set; } + public string? Title { get; set; } - public string NumOfVotes { get; set; } + public string? NumOfVotes { get; set; } public int NumOfVotesInt { get; set; } - public string StringOfVoters { get; set; } + public string? StringOfVoters { get; set; } - public List ListOfVoters { get; set; } + public List ListOfVoters { get; set; } = new (); - public string Body { get; set; } + public string? Body { get; set; } public int Number { get; set; } - public string VoteState { get; set; } + public string? VoteState { get; set; } - public string Kerberos { get; set; } + public string? Kerberos { get; set; } - public string Author { get; set; } + public string? Author { get; set; } public int NumOfComments { get; set; } @@ -70,7 +70,7 @@ public void Deserialize(Issue issue) StringOfVoters = issueBody.Substring(indexOfVoters + 7); ListOfVoters = StringOfVoters.Split(',').Select(d => d.Trim()).ToList(); - VoteState = StringOfVoters.IndexOf(Kerberos, StringComparison.Ordinal) > 0 ? "unvote" : "vote"; + VoteState = StringOfVoters.IndexOf(Kerberos ?? "", StringComparison.Ordinal) > 0 ? "unvote" : "vote"; } } } diff --git a/src/FeedbackBot/Models/IssueDetailsViewModel.cs b/src/FeedbackBot/Models/IssueDetailsViewModel.cs index 743b512..3f2455d 100644 --- a/src/FeedbackBot/Models/IssueDetailsViewModel.cs +++ b/src/FeedbackBot/Models/IssueDetailsViewModel.cs @@ -10,10 +10,10 @@ public IssueDetailsViewModel() Comments = new List(); } - public IssueContainer Issue { get; set; } + public IssueContainer? Issue { get; set; } public List Comments { get; set; } - public string VoteMessage { get; set; } + public string? VoteMessage { get; set; } } } diff --git a/src/FeedbackBot/Pages/AppIssues.razor b/src/FeedbackBot/Pages/AppIssues.razor new file mode 100644 index 0000000..4f13cdf --- /dev/null +++ b/src/FeedbackBot/Pages/AppIssues.razor @@ -0,0 +1,46 @@ +@page "/app/{appName}" +@inject IGitHubService gitHubService +@inject IUserService userService + +Home Page - FeedbackBot + +
+ +

@appName

+ + + + + + +
+ + + +@code { + [Parameter] + public string? appName { get; set; } + + private BulkObservableCollection appIssues { get; init; } = new(); + + protected override async Task OnInitializedAsync() + { + if (!await userService.IsAuthenticated() || string.IsNullOrEmpty(appName)) + { + return; + } + + var kerberos = await userService.GetKerberos(); + var issues = await gitHubService.GetIssues(appName); + + // List out all the current issues + appIssues.Clear(); + appIssues.AddRange(issues.Select(i => + { + var newIssueContainer = new IssueContainer { Kerberos = kerberos }; + newIssueContainer.Deserialize(i); + return newIssueContainer; + })); + + } +} \ No newline at end of file diff --git a/src/FeedbackBot/Pages/Counter.razor b/src/FeedbackBot/Pages/Counter.razor new file mode 100644 index 0000000..cdd866f --- /dev/null +++ b/src/FeedbackBot/Pages/Counter.razor @@ -0,0 +1,18 @@ +@page "/counter" + +Counter + +

Counter

+ +

Current count: @currentCount

+ + + +@code { + private int currentCount = 0; + + private void IncrementCount() + { + currentCount++; + } +} diff --git a/src/FeedbackBot/Pages/Details.razor b/src/FeedbackBot/Pages/Details.razor new file mode 100644 index 0000000..bd93bd0 --- /dev/null +++ b/src/FeedbackBot/Pages/Details.razor @@ -0,0 +1,182 @@ +@page "/issues/{appName}/{id:int}" +@inject IGitHubService gitHubService +@inject IUserService userService + +Issue - FeedbackBot + +

@message

+ + + + @if (issueDetails != null) + { + @if (issueDetails.VoteMessage != null) + { + + } +
+ +
+ Back +
+ +
+
+
+
+

@issueDetails.Issue?.Title

+ +
+

by @issueDetails.Issue?.Author

+
+ +
+
+ @issueDetails.Issue?.Body
+
+ +
+

+ Upvoted by: + @issueDetails.Issue?.StringOfVoters +

+
+ +
+
+
+
+
+
+

Submit New Comment


+
+ + +
+ + + + +
+
+ +
+ @foreach (var comment in issueDetails.Comments) + { +
+
+
+
Date Created: @comment.CreateDate

+
Comment: @comment.Body

+
Author: @comment.Author


+
+
+
+ } +
+
+ } + + +@code { + + [Parameter] + public string? appName { get; set; } + + [Parameter] + public int id { get; set; } + + private IssueDetailsViewModel? issueDetails { get; set; } + + private string message { get; set; } = ""; + + private FormModel formModel = new(); + + + protected override async Task OnInitializedAsync() + { + await FetchIssueDetails(); + } + + private async Task FetchIssueDetails() + { + if (!await userService.IsAuthenticated() || string.IsNullOrEmpty(appName)) + { + return; + } + + var kerberos = await userService.GetKerberos(); + + // Getting issue + var issue = await gitHubService.GetIssue(appName, id); + var newIssueContainer = new IssueContainer { Kerberos = kerberos }; + newIssueContainer.Deserialize(issue); + + // Getting all comments in the issue + var issueComments = await gitHubService.GetComments(appName, id); + if (issueComments == null) + { + return; + } + + var listOfComments = issueComments.Select(c => c.ToIssueCommentContainer()) + .Where(c => c != null).Cast().ToList(); + + issueDetails = new IssueDetailsViewModel + { + Comments = listOfComments, + Issue = newIssueContainer + }; + StateHasChanged(); + } + + private void Voted(IssueContainer issue) + { + if (issueDetails != null) + { + issueDetails.Issue = issue; + issueDetails.VoteMessage = "Thank you for voting on this issue!"; + StateHasChanged(); + } + } + + private async Task SubmitComment() + { + if (!await userService.IsAuthenticated() || string.IsNullOrEmpty(appName) || issueDetails == null) + { + return; + } + + var kerberos = await userService.GetKerberos(); + + var body = $"{formModel.Comment} \r\n" + + "--------------------\r\n" + + $"Author: {kerberos}"; + + var issue = await gitHubService.GetIssue(appName, id); + var result = await gitHubService.AddComment(appName, id, body); + + if (result == null) + { + return; + } + + var comment = result.ToIssueCommentContainer(); + + if (comment == null) + { + return; + } + + issueDetails.Comments.Insert(0, comment); + StateHasChanged(); + } + + + private class FormModel + { + [Required] + public string Comment { get; set; } = ""; + } +} \ No newline at end of file diff --git a/src/FeedbackBot/Pages/Error.cshtml b/src/FeedbackBot/Pages/Error.cshtml new file mode 100644 index 0000000..19cb643 --- /dev/null +++ b/src/FeedbackBot/Pages/Error.cshtml @@ -0,0 +1,42 @@ +@page +@model FeedbackBot.Pages.ErrorModel + + + + + + + + Error + + + + + +
+
+

Error.

+

An error occurred while processing your request.

+ + @if (Model.ShowRequestId) + { +

+ Request ID: @Model.RequestId +

+ } + +

Development Mode

+

+ Swapping to the Development environment displays detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

+
+
+ + + diff --git a/src/FeedbackBot/Pages/Error.cshtml.cs b/src/FeedbackBot/Pages/Error.cshtml.cs new file mode 100644 index 0000000..0fc3451 --- /dev/null +++ b/src/FeedbackBot/Pages/Error.cshtml.cs @@ -0,0 +1,26 @@ +using System.Diagnostics; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace FeedbackBot.Pages; + +[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] +[IgnoreAntiforgeryToken] +public class ErrorModel : PageModel +{ + public string? RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + + private readonly ILogger _logger; + + public ErrorModel(ILogger logger) + { + _logger = logger; + } + + public void OnGet() + { + RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; + } +} diff --git a/src/FeedbackBot/Pages/Index.razor b/src/FeedbackBot/Pages/Index.razor new file mode 100644 index 0000000..ff9326a --- /dev/null +++ b/src/FeedbackBot/Pages/Index.razor @@ -0,0 +1,69 @@ +@page "/" + +Welcome - FeedbackBot + +
+

Welcome

+ +

Welcome to feedback! This is a website to keep track of user feedback of various applications of UC Davis.

+
+
+
+
+

PrePurchasing

+

PrePurchasing allows users to submit any type of order request, including KFS, MyTravel, + and other campus services.

+ + + +
+
+
+
+

ACE

+

Academic Course Evaluation (ACE) makes course evaluations easier for students, faculty, and + staff.

+ + + +
+
+
+
+

Commencement

+

Commencement allows staff to manage student's requests pertaining to Commencement + activities.

+ + + +
+
+
+
+

FeedbackBot

+

Hello this is an app called feedbackbot it does stuff related to giving feedback + automatically to our team directly into the github repo

+ + + +
+
+
+
+

Online Registration

+

Online Registration allows departments to manage and collect fees for events.

+ + + +
+
+
+
+

PEAKS

+

People, Equipment, Access, Keys and Space Tracking application

+ + + +
+
+
diff --git a/src/FeedbackBot/Pages/_Host.cshtml b/src/FeedbackBot/Pages/_Host.cshtml new file mode 100644 index 0000000..96f73fb --- /dev/null +++ b/src/FeedbackBot/Pages/_Host.cshtml @@ -0,0 +1,8 @@ +@page "/" +@namespace FeedbackBot.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@{ + Layout = "_Layout"; +} + + diff --git a/src/FeedbackBot/Pages/_Imports.razor b/src/FeedbackBot/Pages/_Imports.razor new file mode 100644 index 0000000..f2952a3 --- /dev/null +++ b/src/FeedbackBot/Pages/_Imports.razor @@ -0,0 +1 @@ +@namespace FeedbackBot.Pages diff --git a/src/FeedbackBot/Pages/_Layout.cshtml b/src/FeedbackBot/Pages/_Layout.cshtml new file mode 100644 index 0000000..32c7970 --- /dev/null +++ b/src/FeedbackBot/Pages/_Layout.cshtml @@ -0,0 +1,48 @@ +@using Microsoft.AspNetCore.Components.Web +@namespace FeedbackBot.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + + + + + + + + + + + + + + + + + @RenderBody() + +
+ + An error has occurred. This application may no longer respond until reloaded. + + + An unhandled exception has occurred. See browser dev tools for details. + + Reload + 🗙 +
+ + + + + diff --git a/src/FeedbackBot/Program.cs b/src/FeedbackBot/Program.cs index 500ee0b..72dd6e3 100644 --- a/src/FeedbackBot/Program.cs +++ b/src/FeedbackBot/Program.cs @@ -1,21 +1,71 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; +using Microsoft.AspNetCore.Authentication.OpenIdConnect; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.IdentityModel.Tokens; +using Microsoft.IdentityModel.Protocols.OpenIdConnect; +using FeedbackBot; +using FeedbackBot.Services; -namespace FeedbackBot +var builder = WebApplication.CreateBuilder(args); + +builder.Services.Configure(builder.Configuration.GetSection("AppSettings")); + +// Add services to the container. +builder.Services.AddAuthentication(options => { - public class Program + options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme; +}) +.AddCookie() +.AddOpenIdConnect(oidc => +{ + oidc.ClientId = builder.Configuration["Authentication:ClientId"]; + oidc.ClientSecret = builder.Configuration["Authentication:ClientSecret"]; + oidc.Authority = builder.Configuration["Authentication:Authority"]; + oidc.ResponseType = OpenIdConnectResponseType.Code; + oidc.Scope.Add("openid"); + oidc.Scope.Add("profile"); + oidc.Scope.Add("email"); + oidc.Scope.Add("eduPerson"); + oidc.TokenValidationParameters = new TokenValidationParameters { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } + NameClaimType = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" + }; +}); + +builder.Services.AddAuthorization(options => +{ + // By default, all incoming requests will be authorized according to the default policy + options.FallbackPolicy = options.DefaultPolicy; +}); + +builder.Services.AddRazorPages(); +builder.Services.AddServerSideBlazor(); + +// infrastructure +builder.Services.AddTransient(); +builder.Services.AddScoped(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); } + +app.UseHttpsRedirection(); + +app.UseStaticFiles(); + +app.UseRouting(); + +app.UseAuthentication(); +app.UseAuthorization(); + +app.MapControllers(); +app.MapBlazorHub(); +app.MapFallbackToPage("/_Host"); + +app.Run(); diff --git a/src/FeedbackBot/Properties/launchSettings.json b/src/FeedbackBot/Properties/launchSettings.json index 5ed32f6..f497b59 100644 --- a/src/FeedbackBot/Properties/launchSettings.json +++ b/src/FeedbackBot/Properties/launchSettings.json @@ -1,27 +1,29 @@ -{ +{ "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, + "windowsAuthentication": false, + "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:57993", - "sslPort": 44310 + "applicationUrl": "http://localhost:17181", + "sslPort": 44391 } }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", + "FeedbackBot": { + "commandName": "Project", + "dotnetRunMessages": true, "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "hotReloadProfile": "aspnetcore" }, - "FeedbackBot": { - "commandName": "Project", + "IIS Express": { + "commandName": "IISExpress", "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } } } -} \ No newline at end of file +} diff --git a/src/FeedbackBot/Services/GitHubService.cs b/src/FeedbackBot/Services/GitHubService.cs index bb51b8f..f678a76 100644 --- a/src/FeedbackBot/Services/GitHubService.cs +++ b/src/FeedbackBot/Services/GitHubService.cs @@ -1,85 +1,82 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Octokit; -namespace FeedbackBot.Services +namespace FeedbackBot.Services; + +public interface IGitHubService { - public interface IGitHubService - { - Task> GetIssues(string appName); + Task> GetIssues(string appName); - Task CreateIssue(string appName, NewIssue issue); + Task CreateIssue(string appName, NewIssue issue); - Task GetIssue(string appName, int id); + Task GetIssue(string appName, int id); - Task UpdateIssue(string appName, int id, IssueUpdate update); + Task UpdateIssue(string appName, int id, IssueUpdate update); - Task> GetComments(string appName, int issueId); + Task> GetComments(string appName, int issueId); - Task AddComment(string appName, int issueId, string comment); + Task AddComment(string appName, int issueId, string comment); - Task Search(string appName, string query); - } + Task Search(string appName, string query); +} - public class GitHubService : IGitHubService +public class GitHubService : IGitHubService +{ + public GitHubClient client; + + public GitHubService(IOptions appSettings) { - public GitHubClient client; + var settings = appSettings.Value; - public GitHubService(IOptions appSettings) - { - var settings = appSettings.Value; + client = new GitHubClient(new ProductHeaderValue("FeedbackBot")); - client = new GitHubClient(new ProductHeaderValue("FeedbackBot")); - - client.Credentials = new Credentials(settings.GitHubToken); - } + client.Credentials = new Credentials(settings.GitHubToken); + } - public async Task> GetIssues(string appName) + public async Task> GetIssues(string appName) + { + var settings = new RepositoryIssueRequest { - var settings = new RepositoryIssueRequest - { - Filter = IssueFilter.Created, - Labels = { "feedback" } - }; + Filter = IssueFilter.Created, + Labels = { "feedback" } + }; - return await client.Issue.GetAllForRepository("ucdavis", appName, settings); - } + return await client.Issue.GetAllForRepository("ucdavis", appName, settings); + } - public async Task CreateIssue(string appName, NewIssue issue) - { - return await client.Issue.Create("ucdavis", appName, issue); - } + public async Task CreateIssue(string appName, NewIssue issue) + { + return await client.Issue.Create("ucdavis", appName, issue); + } - public async Task GetIssue(string appName, int id) - { - return await client.Issue.Get("ucdavis", appName, id); - } + public async Task GetIssue(string appName, int id) + { + return await client.Issue.Get("ucdavis", appName, id); + } - public Task UpdateIssue(string appName, int id, IssueUpdate update) - { - return client.Issue.Update("ucdavis", appName, id, update); - } + public Task UpdateIssue(string appName, int id, IssueUpdate update) + { + return client.Issue.Update("ucdavis", appName, id, update); + } - public async Task> GetComments(string appName, int issueId) - { - return await client.Issue.Comment.GetAllForIssue("ucdavis", appName, issueId); - } + public async Task> GetComments(string appName, int issueId) + { + return await client.Issue.Comment.GetAllForIssue("ucdavis", appName, issueId); + } - public async Task AddComment(string appName, int issueId, string comment) - { - return await client.Issue.Comment.Create("ucdavis", appName, issueId, comment); - } + public async Task AddComment(string appName, int issueId, string comment) + { + return await client.Issue.Comment.Create("ucdavis", appName, issueId, comment); + } - public async Task Search(string appName, string query) - { - var request = new SearchIssuesRequest(query); - request.Repos.Add("ucdavis", appName); - request.Labels = new List() { "feedback" }; ; - request.State = ItemState.Open; + public async Task Search(string appName, string query) + { + var request = new SearchIssuesRequest(query); + request.Repos.Add("ucdavis", appName); + request.Labels = new List() { "feedback" }; ; + request.State = ItemState.Open; - return await client.Search.SearchIssues(request); - } + return await client.Search.SearchIssues(request); } } + diff --git a/src/FeedbackBot/Services/GitHubServiceExtensions.cs b/src/FeedbackBot/Services/GitHubServiceExtensions.cs new file mode 100644 index 0000000..dc187d5 --- /dev/null +++ b/src/FeedbackBot/Services/GitHubServiceExtensions.cs @@ -0,0 +1,27 @@ +using FeedbackBot.Models; +using Octokit; + +namespace FeedbackBot.Services; + +public static class GitHubServiceExtensions +{ + public static CommentContainer? ToIssueCommentContainer(this IssueComment comment) + { + var indexOfLine = comment.Body.IndexOf("--------------------"); + if (indexOfLine == -1) + { + // not a FeedbackBot comment + return null; + } + + var bodycomment = comment.Body.Substring(0, indexOfLine); + if (String.IsNullOrWhiteSpace(bodycomment)) + { + return null; + } + + var commentContainer = new CommentContainer(); + commentContainer.Deserialize(comment, bodycomment); + return commentContainer; + } +} diff --git a/src/FeedbackBot/Services/UserService.cs b/src/FeedbackBot/Services/UserService.cs new file mode 100644 index 0000000..684c9e8 --- /dev/null +++ b/src/FeedbackBot/Services/UserService.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Components.Authorization; + +namespace FeedbackBot.Services; + +public class UserService: IUserService +{ + private AuthenticationStateProvider _authStateProvider; + + public UserService(AuthenticationStateProvider authStateProvider) => _authStateProvider = authStateProvider; + + public async Task GetKerberos() + { + var authState = await _authStateProvider.GetAuthenticationStateAsync(); + return authState?.User?.Identity?.Name; + } + + public async Task IsAuthenticated() + { + var authState = await _authStateProvider.GetAuthenticationStateAsync(); + return authState?.User?.Identity?.IsAuthenticated ?? false; + } +} + +public interface IUserService +{ + Task GetKerberos(); + Task IsAuthenticated(); +} \ No newline at end of file diff --git a/src/FeedbackBot/Shared/CreateIssue.razor b/src/FeedbackBot/Shared/CreateIssue.razor new file mode 100644 index 0000000..45bf79b --- /dev/null +++ b/src/FeedbackBot/Shared/CreateIssue.razor @@ -0,0 +1,60 @@ +@inject IGitHubService gitHubService +@inject IUserService userService +@inject NavigationManager navigationManager + +
+ @*

Submit a new feedback for @appName

*@ +
+ + @*
+

AUserName

+
*@ + + +
+
+ + + + +
+
+ +@code { + [CascadingParameter(Name = "appName")] + public string appName { get; set; } = ""; + + private FormModel formModel = new(); + + async Task CreateNewIssue() + { + if (!await userService.IsAuthenticated()) + { + return; + } + + var kerberos = await userService.GetKerberos(); + + // Initialize new issue + var newIssue = new NewIssue(formModel.Title) + { + Body = $"{formModel.Description}\r\n" + + "--------------------\r\n" + + "Votes: 1\r\n" + + $"Author: {kerberos}\r\n" + + $"Voters: {kerberos}", + Labels = { "feedback" } + }; + var issue = await gitHubService.CreateIssue(appName, newIssue); + navigationManager.NavigateTo($"/app/{appName}"); + } + + private class FormModel + { + [Required] + public string Title { get; set; } = ""; + + [Required] + public string Description { get; set; } = ""; + } +} \ No newline at end of file diff --git a/src/FeedbackBot/Shared/DisplayIssues.razor b/src/FeedbackBot/Shared/DisplayIssues.razor new file mode 100644 index 0000000..b0c8a6e --- /dev/null +++ b/src/FeedbackBot/Shared/DisplayIssues.razor @@ -0,0 +1,78 @@ +@if (@appIssues != null) +{ + int i = 0; + @foreach (var issue in @appIssues) + { +
+
+ +
+
+ +

@issue.Title

+ +
+
+

by @issue.Author

+ +
+
+
+
+ @issue.Body
+
+
+ +
+

+ Upvoted by: + @issue.StringOfVoters +

+
+
+ + + + +
+
+ +
+
+ i++; + } +} + +@code { + [Parameter] + public BulkObservableCollection? appIssues { get; set; } + + [CascadingParameter(Name = "appName")] + public string appName { get; set; } = ""; + + override protected void OnInitialized() + { + if (appIssues != null) + { + appIssues.CollectionChanged += (sender, e) => + { + StateHasChanged(); + }; + } + } + + private void Voted(IssueContainer issue) + { + if (issue != null && appIssues != null) + { + // the +1 -1 thing is so that it returns -1 for missing instead of 0 + var i = appIssues.Where(x => x.Number == issue.Number).Select((x, i) => i + 1).SingleOrDefault() - 1; + if (i == -1) + { + return; + } + appIssues[i] = issue; + StateHasChanged(); + } + } +} \ No newline at end of file diff --git a/src/FeedbackBot/Shared/MainLayout.razor b/src/FeedbackBot/Shared/MainLayout.razor new file mode 100644 index 0000000..619e491 --- /dev/null +++ b/src/FeedbackBot/Shared/MainLayout.razor @@ -0,0 +1,27 @@ +@inherits LayoutComponentBase + +FeedbackBot + +
+
+
+ + + + +
+
+ +
+
+
+
+ @Body +
+
+

© 2016 - FeedbackBot

+
+
\ No newline at end of file diff --git a/src/FeedbackBot/Shared/SearchBar.razor b/src/FeedbackBot/Shared/SearchBar.razor new file mode 100644 index 0000000..d7b1757 --- /dev/null +++ b/src/FeedbackBot/Shared/SearchBar.razor @@ -0,0 +1,49 @@ +@inject IGitHubService gitHubService +@inject IUserService userService + +
+
+ + + + + + +
+
+ +@code { + [CascadingParameter(Name = "appName")] + public string appName { get; set; } = ""; + + [Parameter] + public BulkObservableCollection? appIssues { get; set; } + + private FormModel formModel = new(); + + async Task DoSearch() + { + if (!await userService.IsAuthenticated() || string.IsNullOrEmpty(appName) || appIssues == null) + { + return; + } + + var kerberos = await userService.GetKerberos(); + var results = await gitHubService.Search(appName, formModel.Search); + + appIssues.Clear(); + appIssues.AddRange(results.Items.Select(i => + { + var newIssueContainer = new IssueContainer { Kerberos = kerberos }; + newIssueContainer.Deserialize(i); + return newIssueContainer; + })); + StateHasChanged(); + } + + private class FormModel + { + [Required] + public string Search { get; set; } = ""; + } +} \ No newline at end of file diff --git a/src/FeedbackBot/Shared/VoteButton.razor b/src/FeedbackBot/Shared/VoteButton.razor new file mode 100644 index 0000000..3c6fbf2 --- /dev/null +++ b/src/FeedbackBot/Shared/VoteButton.razor @@ -0,0 +1,63 @@ +@inject IGitHubService gitHubService +@inject IUserService userService + +
+ +

|

+

@issueDetails?.NumOfVotes

+
+ +@code { + [CascadingParameter(Name = "appName")] + public string appName { get; set; } = ""; + + [Parameter] + public IssueContainer? issueDetails { get; set; } + + [Parameter] + public Action? OnVoted { get; set; } + + private async Task Vote(int? id) + { + if (!await userService.IsAuthenticated() || string.IsNullOrEmpty(appName) || id == null || issueDetails == null) + { + return; + } + + var kerberos = await userService.GetKerberos() ?? ""; + + var issue = await gitHubService.GetIssue(appName, id.Value); + var newIssueContainer = new IssueContainer { Kerberos = kerberos }; + + newIssueContainer.Deserialize(issue); + + if (newIssueContainer.VoteState == "unvote") + { + var newVoteCount = newIssueContainer.NumOfVotesInt - 1; + newIssueContainer.NumOfVotesInt = newVoteCount; + newIssueContainer.NumOfVotes = newVoteCount.ToString(); + newIssueContainer.ListOfVoters.Remove(kerberos); + } + else + { + // Update vote count + var newVoteCount = newIssueContainer.NumOfVotesInt + 1; + newIssueContainer.NumOfVotesInt = newVoteCount; + newIssueContainer.NumOfVotes = newVoteCount.ToString(); + newIssueContainer.ListOfVoters.Add(kerberos); + } + newIssueContainer.StringOfVoters = string.Join(",", newIssueContainer.ListOfVoters.ToArray()).Trim().TrimStart(','); + + // Update issue on gitHubService + var update = issue.ToUpdate(); + update.Body = newIssueContainer.Serialize(); + await gitHubService.UpdateIssue(appName, id.Value, update); + + issueDetails = newIssueContainer; + + StateHasChanged(); + OnVoted?.Invoke(newIssueContainer); + } + +} \ No newline at end of file diff --git a/src/FeedbackBot/Shared/_Imports.razor b/src/FeedbackBot/Shared/_Imports.razor new file mode 100644 index 0000000..db75921 --- /dev/null +++ b/src/FeedbackBot/Shared/_Imports.razor @@ -0,0 +1 @@ +@namespace FeedbackBot.Shared diff --git a/src/FeedbackBot/Startup.cs b/src/FeedbackBot/Startup.cs deleted file mode 100644 index ef79cba..0000000 --- a/src/FeedbackBot/Startup.cs +++ /dev/null @@ -1,92 +0,0 @@ -using AspNetCore.Security.CAS; -using FeedbackBot.Models; -using FeedbackBot.Services; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace FeedbackBot -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - // global configuration - services.AddSingleton(_ => Configuration); - services.Configure(Configuration.GetSection("AppSettings")); - services.Configure(Configuration.GetSection("Authentication")); - - // infrastructure - services.AddTransient(); - - // caching - services.AddDistributedMemoryCache(); - - // sessions - services.AddSession(/* options go here */); - - services.Configure(options => - { - // This lambda determines whether user consent for non-essential cookies is needed for a given request. - options.CheckConsentNeeded = context => true; - options.MinimumSameSitePolicy = SameSiteMode.None; - }); - - // add cas auth backed by a cookie signin scheme - services.AddAuthentication(options => - { - options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; - }) - .AddCookie(options => - { - options.LoginPath = new PathString("/login"); - }) - .AddCAS(options => - { - options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; - options.CasServerUrlBase = Configuration["Authentication:CasBaseUrl"]; - }); - - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - - app.UseHttpsRedirection(); - app.UseStaticFiles(); - app.UseCookiePolicy(); - app.UseRouting(); - app.UseAuthentication(); - app.UseAuthorization(); - - app.UseEndpoints(routes => { - routes.MapDefaultControllerRoute(); - }); - } - } -} diff --git a/src/FeedbackBot/Utilities/BulkObservableCollection.cs b/src/FeedbackBot/Utilities/BulkObservableCollection.cs new file mode 100644 index 0000000..1e45852 --- /dev/null +++ b/src/FeedbackBot/Utilities/BulkObservableCollection.cs @@ -0,0 +1,39 @@ +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; + +namespace FeedbackBot.Utilities; + +/// +/// Adds AddRange method to ObservableCollection. +/// +/// +public class BulkObservableCollection : ObservableCollection +{ + public BulkObservableCollection() : base() { } + + public BulkObservableCollection(IEnumerable collection) : base(collection) { } + + public BulkObservableCollection(List list) : base(list) { } + + public void AddRange(IEnumerable range) + { + var startIndex = this.Count; + + foreach (var item in range) + { + Items.Add(item); + } + + this.OnPropertyChanged(new PropertyChangedEventArgs("Count")); + this.OnPropertyChanged(new PropertyChangedEventArgs("Item[]")); + this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, range, startIndex)); + } + + public void Reset(IEnumerable range) + { + this.Items.Clear(); + + AddRange(range); + } +} diff --git a/src/FeedbackBot/Views/Home/Details.cshtml b/src/FeedbackBot/Views/Home/Details.cshtml deleted file mode 100644 index 287f6ab..0000000 --- a/src/FeedbackBot/Views/Home/Details.cshtml +++ /dev/null @@ -1,84 +0,0 @@ -@model FeedbackBot.Models.IssueDetailsViewModel - -@{ - ViewData["Title"] = "Issue"; -} - -

@ViewData["Message"]

- - -@if (Model.VoteMessage != null) -{ - -} -
- -
- Back -
- -
-
-
-
-

@Model.Issue.Title

- -
-

by @Model.Issue.Author

-
- -
-
- @Model.Issue.Body
-
- -
-

- Upvoted by: - @Model.Issue.StringOfVoters -

-
-
- @using (Html.BeginForm("vote", "Home")) - { - - - - - } -

|

-

@Model.Issue.NumOfVotes

-
-
-
-
-
-
-
-

Submit New Comment


-
- @using (Html.BeginForm("addComment", "Home")) - { -
- -
-
- } -
-
- -
- @foreach (var comment in Model.Comments) - { -
-
-
-
Date Created: @comment.CreateDate

-
Comment: @comment.Body

-
Author: @comment.Author


-
-
-
- } -
-
diff --git a/src/FeedbackBot/Views/Home/DisplayIssuesPartial.cshtml b/src/FeedbackBot/Views/Home/DisplayIssuesPartial.cshtml deleted file mode 100644 index fcadb0a..0000000 --- a/src/FeedbackBot/Views/Home/DisplayIssuesPartial.cshtml +++ /dev/null @@ -1,48 +0,0 @@ -@model IReadOnlyList - -@foreach (var issue in Model) -{ -
-
- -
-
-

@issue.Title

 -
-
-

by @issue.Author

- -
-
-
-
- @issue.Body
-
-
- -
-

- Upvoted by: - @issue.StringOfVoters -

-
-
-
- @using (Html.BeginForm("vote", "Home")) - { - - - - } -

|

-

@issue.NumOfVotes

-
- - - -
-
- -
-
-} diff --git a/src/FeedbackBot/Views/Home/Index.cshtml b/src/FeedbackBot/Views/Home/Index.cshtml deleted file mode 100644 index 4d7839d..0000000 --- a/src/FeedbackBot/Views/Home/Index.cshtml +++ /dev/null @@ -1,64 +0,0 @@ - @{ - ViewData["Title"] = "Welcome"; -} -
-

@ViewData["Message"]

- -

Welcome to feedback! This is a website to keep track of user feedback of various applications of UC Davis.

-
-
-
-
-

PrePurchasing

-

PrePurchasing allows users to submit any type of order request, including KFS, MyTravel, and other campus services.

- - - -
-
-
-
-

ACE

-

Academic Course Evaluation (ACE) makes course evaluations easier for students, faculty, and staff.

- - - -
-
-
-
-

Commencement

-

Commencement allows staff to manage student's requests pertaining to Commencement activities.

- - - -
-
-
-
-

FeedbackBot

-

Hello this is an app called feedbackbot it does stuff related to giving feedback automatically to our team directly into the github repo

- - - -
-
-
-
-

Online Registration

-

Online Registration allows departments to manage and collect fees for events.

- - - -
-
-
-
-

PEAKS

-

People, Equipment, Access, Keys and Space Tracking application

- - - -
-
-
diff --git a/src/FeedbackBot/Views/Home/NewIssuePartial.cshtml b/src/FeedbackBot/Views/Home/NewIssuePartial.cshtml deleted file mode 100644 index 12f9138..0000000 --- a/src/FeedbackBot/Views/Home/NewIssuePartial.cshtml +++ /dev/null @@ -1,18 +0,0 @@ - -
-
- @using (Html.BeginForm("createIssue", "Home", new { appName = ViewData["AppName"] })) - { - - -
-

-
- - -
-
- - } -
-
\ No newline at end of file diff --git a/src/FeedbackBot/Views/Home/Search.cshtml b/src/FeedbackBot/Views/Home/Search.cshtml deleted file mode 100644 index 866618c..0000000 --- a/src/FeedbackBot/Views/Home/Search.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@model IReadOnlyList - -
- @{ - ViewData["Title"] = "Home Page"; - } - -
- - Back - -

Search Results For @ViewData["SearchTerm"] in @ViewData["AppName"]

- - @{ - Html.RenderPartial("SearchBarPartial"); - } - - @{ - Html.RenderPartial("DisplayIssuesPartial"); - } -
diff --git a/src/FeedbackBot/Views/Home/SearchBarPartial.cshtml b/src/FeedbackBot/Views/Home/SearchBarPartial.cshtml deleted file mode 100644 index 689596a..0000000 --- a/src/FeedbackBot/Views/Home/SearchBarPartial.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -
-
- @using (Html.BeginForm("search", "Home", new { appName = ViewData["AppName"] })) - { - - - - } -
-
\ No newline at end of file diff --git a/src/FeedbackBot/Views/Home/app.cshtml b/src/FeedbackBot/Views/Home/app.cshtml deleted file mode 100644 index ed2550c..0000000 --- a/src/FeedbackBot/Views/Home/app.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@model IReadOnlyList - -
- @{ - ViewData["Title"] = "Home Page"; -

Submit a new feedback for @ViewData["AppName"]

- } - - @{ - Html.RenderPartial("SearchBarPartial"); - } - - @{ - Html.RenderPartial("NewIssuePartial"); - } - -

@ViewData["AppName"]

- - @{ - Html.RenderPartial("DisplayIssuesPartial"); - } -
diff --git a/src/FeedbackBot/Views/Shared/Error.cshtml b/src/FeedbackBot/Views/Shared/Error.cshtml deleted file mode 100644 index e514139..0000000 --- a/src/FeedbackBot/Views/Shared/Error.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

diff --git a/src/FeedbackBot/Views/Shared/_Layout.cshtml b/src/FeedbackBot/Views/Shared/_Layout.cshtml deleted file mode 100644 index fe61f31..0000000 --- a/src/FeedbackBot/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - @ViewData["Title"] - FeedbackBot - - - - - - - - -
-
-
- - - - -
-
- -
-
-
-
- @RenderBody() -
-
-

© 2016 - FeedbackBot

-
-
- - - - - - @RenderSection("scripts", required: false) - - diff --git a/src/FeedbackBot/Views/Shared/css_browser_selector.js b/src/FeedbackBot/Views/Shared/css_browser_selector.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/FeedbackBot/Views/_ViewImports.cshtml b/src/FeedbackBot/Views/_ViewImports.cshtml deleted file mode 100644 index 906b587..0000000 --- a/src/FeedbackBot/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using FeedbackBot -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/FeedbackBot/Views/_ViewStart.cshtml b/src/FeedbackBot/Views/_ViewStart.cshtml deleted file mode 100644 index a5f1004..0000000 --- a/src/FeedbackBot/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/src/FeedbackBot/_Imports.razor b/src/FeedbackBot/_Imports.razor new file mode 100644 index 0000000..34c055f --- /dev/null +++ b/src/FeedbackBot/_Imports.razor @@ -0,0 +1,18 @@ +@using System.Net.Http +@using System.Collections.ObjectModel +@using System.Collections.Generic +@using System.ComponentModel.DataAnnotations +@using System.Linq +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Components.Authorization +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using FeedbackBot +@using FeedbackBot.Models +@using FeedbackBot.Shared +@using FeedbackBot.Services +@using FeedbackBot.Utilities +@using Octokit diff --git a/src/FeedbackBot/appsettings.Development.json b/src/FeedbackBot/appsettings.Development.json index a2880cb..f042c67 100644 --- a/src/FeedbackBot/appsettings.Development.json +++ b/src/FeedbackBot/appsettings.Development.json @@ -1,9 +1,9 @@ { + "DetailedErrors": true, "Logging": { "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Default": "Information", + "Microsoft.AspNetCore": "Warning" } } } diff --git a/src/FeedbackBot/appsettings.json b/src/FeedbackBot/appsettings.json index 7b343a4..0a3c24e 100644 --- a/src/FeedbackBot/appsettings.json +++ b/src/FeedbackBot/appsettings.json @@ -5,14 +5,15 @@ "GitHubToken": "" }, "Authentication": { - "CasBaseUrl": "https://ssodev.ucdavis.edu/cas/" + "ClientId": "lN9ycqqv6GVHRwb2qb9NIIBt5dR0VxGFpW4u", + "ClientSecret": "rP0Uuz5f9Eoz1p7yuvdQoY72a7PjgHledned", + "Authority": "https://cas.ucdavis.edu/cas/oidc" }, "Logging": { - "IncludeScopes": false, "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Default": "Information", + "Microsoft.AspNetCore": "Warning" } - } + }, + "AllowedHosts": "*" } diff --git a/src/FeedbackBot/wwwroot/_references.js b/src/FeedbackBot/wwwroot/_references.js deleted file mode 100644 index 9f22612..0000000 --- a/src/FeedbackBot/wwwroot/_references.js +++ /dev/null @@ -1,7 +0,0 @@ -/// -/// -/// -/// -/// -/// -/// diff --git a/src/FeedbackBot/wwwroot/css/site.css b/src/FeedbackBot/wwwroot/css/site.css index 398a3c9..04577ff 100644 --- a/src/FeedbackBot/wwwroot/css/site.css +++ b/src/FeedbackBot/wwwroot/css/site.css @@ -480,3 +480,32 @@ body { width: 100%; } } + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } diff --git a/src/FeedbackBot/wwwroot/css/site.min.css b/src/FeedbackBot/wwwroot/css/site.min.css index bab8e5e..adc1fe5 100644 --- a/src/FeedbackBot/wwwroot/css/site.min.css +++ b/src/FeedbackBot/wwwroot/css/site.min.css @@ -476,3 +476,32 @@ body { width: 100%; } } + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } diff --git a/src/FeedbackBot/wwwroot/favicon.ico b/src/FeedbackBot/wwwroot/favicon.ico index a3a7999..63e859b 100644 Binary files a/src/FeedbackBot/wwwroot/favicon.ico and b/src/FeedbackBot/wwwroot/favicon.ico differ diff --git a/src/FeedbackBot/wwwroot/js/site.js b/src/FeedbackBot/wwwroot/js/site.js deleted file mode 100644 index c88372b..0000000 --- a/src/FeedbackBot/wwwroot/js/site.js +++ /dev/null @@ -1,18 +0,0 @@ -// Write your Javascript code. -document.querySelector('button').addEventListener('click',function clickHandler(e){ - - console.log("new button thing") - - this.removeEventListener('click',clickHandler,false); - - e.preventDefault(); - var self = this; - setTimeout(function(){ - self.className = 'loading'; - },50); - - setTimeout(function(){ - self.className = 'ready'; - },100); - -},false);