From ed820f60fce9d1e196a60c05ca0b4636bafadd5f Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Fri, 18 Sep 2020 15:35:20 +1000 Subject: [PATCH] mostly working uploads 0u0 --- Pages/Documents/Edit.cshtml | 13 ++++++- Pages/Documents/Edit.cshtml.cs | 6 ++- Pages/Index.cshtml | 2 +- Pages/Shared/_Layout.cshtml | 5 ++- Pages/Upload.cshtml | 55 +++++++++++++++++++++++++++ Pages/Upload.cshtml.cs | 69 ++++++++++++++++++++++++++++++++++ ViewModels/EditDocument.cs | 10 +++-- ViewModels/UploadDocument.cs | 24 ++++++++++++ 8 files changed, 173 insertions(+), 11 deletions(-) create mode 100644 Pages/Upload.cshtml create mode 100644 Pages/Upload.cshtml.cs create mode 100644 ViewModels/UploadDocument.cs diff --git a/Pages/Documents/Edit.cshtml b/Pages/Documents/Edit.cshtml index 0f98120..a64744f 100644 --- a/Pages/Documents/Edit.cshtml +++ b/Pages/Documents/Edit.cshtml @@ -3,7 +3,7 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ - ViewData["Title"] = "Edit"; + ViewData["Title"] = "Edit"; }
@@ -15,14 +15,23 @@ +
+ + +
+
+
+ + +
+
- @* *@ @Html.TextAreaFor(model => model.ed.Notes)
diff --git a/Pages/Documents/Edit.cshtml.cs b/Pages/Documents/Edit.cshtml.cs index f5b310a..ae35258 100644 --- a/Pages/Documents/Edit.cshtml.cs +++ b/Pages/Documents/Edit.cshtml.cs @@ -31,9 +31,9 @@ namespace Snootalogue.Pages.Documents { ed = new EditDocument { ID = Document.ID, Title = Document.Title, - Authors = Document.Authors, + Authors = string.Join(",", Document.Authors), Category = Document.Category, - Tags = Document.Tags, + Tags = Document.Tags == null ? "" : string.Join(",", Document.Tags), Read = Document.Read }; @@ -47,7 +47,9 @@ namespace Snootalogue.Pages.Documents { Document d = _context.Document.First(d => d.ID == ed.ID); d.Title = ed.Title; + d.Authors = ed.Authors.Split(",").ToList(); d.Category = ed.Category; + d.Tags = string.IsNullOrWhiteSpace(ed.Tags) ? null : ed.Tags.Split(",").ToList(); d.Notes = ed.Notes; d.Read = ed.Read; diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml index 75b823e..a9117ab 100644 --- a/Pages/Index.cshtml +++ b/Pages/Index.cshtml @@ -16,7 +16,7 @@
By @Html.DisplayFor(modelItem => item.Authors)
Category: @Html.DisplayFor(modelItem => item.Category)
@Html.DisplayFor(modelItem => item.Tags)
- @{string hash = item.Hash.Substring(0, 8);} + @{string hash = item.Hash?.Substring(0, 8);}
@Html.DisplayFor(modelItem => item.Filename) | @Html.DisplayFor(modelItem => item.Size) | diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml index 1af238a..cf278bb 100644 --- a/Pages/Shared/_Layout.cshtml +++ b/Pages/Shared/_Layout.cshtml @@ -1,4 +1,5 @@ - +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + @@ -14,7 +15,7 @@ diff --git a/Pages/Upload.cshtml b/Pages/Upload.cshtml new file mode 100644 index 0000000..c5c5980 --- /dev/null +++ b/Pages/Upload.cshtml @@ -0,0 +1,55 @@ +@page +@model Snootalogue.Pages.UploadModel +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + +@{ + ViewData["Title"] = "Upload"; +} + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + @Html.TextAreaFor(model => model.ud.Notes) +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ Cancel +
+ + + +@* value="@Model.EditDocument.Title" *@ diff --git a/Pages/Upload.cshtml.cs b/Pages/Upload.cshtml.cs new file mode 100644 index 0000000..994ff9f --- /dev/null +++ b/Pages/Upload.cshtml.cs @@ -0,0 +1,69 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; +using Snootalogue.Data; +using Microsoft.AspNetCore.Mvc; +using System.Net; +using System.Linq; +using System.IO; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Snootalogue.ViewModels; +using Snootalogue.Models; + +namespace Snootalogue.Pages { + public class UploadModel : PageModel { + private readonly SnootalogueContext _context; + [BindProperty] + public UploadDocument ud { get; set; } + + public UploadModel(SnootalogueContext context) { + _context = context; + } + + [HttpPost] + // [DisableFormValueModelBinding] + // [ValidateAntiForgeryToken] + public async Task OnPostAsync(UploadDocument ud) { + + if (!ModelState.IsValid) { + return Page(); + } + + if (ud.UploadedFile == null) { + return Page(); + } + + var filename = WebUtility.HtmlEncode(ud.UploadedFile.FileName); + // var uploadDirectory = Path.Combine(filename); + var uploadDirectory = "wwwroot/Content"; + var destination = Path.Combine(uploadDirectory, filename); + + using (var fs = new FileStream(destination, FileMode.Create)) { + await ud.UploadedFile.CopyToAsync(fs); + } + + // Document d = _context.Document. + Document d = new Document { + Title = ud.Title, + Authors = ud.Authors.Split(",").ToList(), + Category = ud.Category, + Tags = string.IsNullOrWhiteSpace(ud.Tags) ? null : ud.Tags.Split(",").ToList(), + Notes = ud.Notes, + Read = ud.Read, + Filename = filename + }; + + _context.Document.Add(d); + + try { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException e) { + // TODO: handle it like https://github.com/dotnet/AspNetCore.Docs/blob/master/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/Pages/Movies/Edit.cshtml.cs#L56 + throw e; + } + + return RedirectToPage("/Index"); + } + } + +} \ No newline at end of file diff --git a/ViewModels/EditDocument.cs b/ViewModels/EditDocument.cs index 0014a51..4e5938d 100644 --- a/ViewModels/EditDocument.cs +++ b/ViewModels/EditDocument.cs @@ -10,11 +10,13 @@ namespace Snootalogue.ViewModels { public int ID { get; set; } [Required] public string Title { get; set; } - [UIHint("CommaSeparatedList")] - public List Authors { get; set; } + [Required] + [Display(Name = "Authors (comma separated)")] + public string Authors { get; set; } + [Required] public string Category { get; set; } - [UIHint("CommaSeparatedList")] - public List Tags { get; set; } + [Display(Name = "Tags (comma separated)")] + public string Tags { get; set; } public Boolean Read { get; set; } public string Notes { get; set; } } diff --git a/ViewModels/UploadDocument.cs b/ViewModels/UploadDocument.cs new file mode 100644 index 0000000..e466fd4 --- /dev/null +++ b/ViewModels/UploadDocument.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http; + +// a version of the Document model designed for user editing + +namespace Snootalogue.ViewModels { + public class UploadDocument { + [Required] + public string Title { get; set; } + [Required] + [Display(Name = "Authors (comma separated)")] + public string Authors { get; set; } + [Required] + public string Category { get; set; } + [Display(Name = "Tags (comma separated)")] + public string Tags { get; set; } + public Boolean Read { get; set; } + public string Notes { get; set; } + [Display(Name = "File to upload")] + public IFormFile UploadedFile { get; set; } + } +}