diff --git a/MyWebsite/MyWebsite/Controllers/GalleryController.cs b/MyWebsite/MyWebsite/Controllers/GalleryController.cs index 5e44ea9..8b4b554 100644 --- a/MyWebsite/MyWebsite/Controllers/GalleryController.cs +++ b/MyWebsite/MyWebsite/Controllers/GalleryController.cs @@ -10,7 +10,7 @@ namespace MyWebsite.Controllers Startup.Database = context; public IActionResult Index() => - View(); + View(Startup.Database.Gallery); public IActionResult Details(string id) => View(Startup.Database.Gallery.FirstOrDefault(i => i.FileName == id)); diff --git a/MyWebsite/MyWebsite/Controllers/HomeController.cs b/MyWebsite/MyWebsite/Controllers/HomeController.cs index cb65705..fc1021d 100644 --- a/MyWebsite/MyWebsite/Controllers/HomeController.cs +++ b/MyWebsite/MyWebsite/Controllers/HomeController.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using System.Linq; using Microsoft.AspNetCore.Mvc; using MyWebsite.Models; @@ -14,7 +15,7 @@ namespace MyWebsite.Controllers [Route("Contacts")] public IActionResult Contacts() => - View(); + View(Startup.Database.Links.OrderBy(i => i.Order)); [Route("Projects")] public IActionResult Projects() => diff --git a/MyWebsite/MyWebsite/Controllers/ResumeController.cs b/MyWebsite/MyWebsite/Controllers/ResumeController.cs index 080cf76..a547ed0 100644 --- a/MyWebsite/MyWebsite/Controllers/ResumeController.cs +++ b/MyWebsite/MyWebsite/Controllers/ResumeController.cs @@ -11,10 +11,10 @@ namespace MyWebsite.Controllers Startup.Database = context; public IActionResult Index() => - View(Startup.Database.Resume.Find(CultureInfo.CurrentUICulture.Name)); + View(Startup.Database.Resume.Find(CultureInfo.CurrentUICulture.Name) ?? Startup.Database.Resume.Find("en-US")); public IActionResult Print() => - View(Startup.Database.Resume.Find(CultureInfo.CurrentUICulture.Name)); + View(Startup.Database.Resume.Find(CultureInfo.CurrentUICulture.Name) ?? Startup.Database.Resume.Find("en-US")); public IActionResult Download() { @@ -25,7 +25,7 @@ namespace MyWebsite.Controllers converter.Options.MarginRight = 25; PdfDocument doc = converter.ConvertHtmlString( $@" - {Startup.Database.Resume.Find("en-US").Content} + {(Startup.Database.Resume.Find(CultureInfo.CurrentUICulture.Name) ?? Startup.Database.Resume.Find("en-US")).Content} "); diff --git a/MyWebsite/MyWebsite/MyWebsite.csproj.user b/MyWebsite/MyWebsite/MyWebsite.csproj.user index d0b5b39..21d96d1 100644 --- a/MyWebsite/MyWebsite/MyWebsite.csproj.user +++ b/MyWebsite/MyWebsite/MyWebsite.csproj.user @@ -5,7 +5,7 @@ root/Controller 600 True - False + True False diff --git a/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml b/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml index 6461231..7438a41 100644 --- a/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml +++ b/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml @@ -19,4 +19,23 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml b/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml index 53cfa14..c9dd546 100644 --- a/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml @@ -1,4 +1,5 @@ -@{ +@model IEnumerable +@{ ViewData["Title"] = "My artworks"; } @@ -7,8 +8,8 @@
- @if (Startup.Database.Gallery.Count() > 0) - foreach (Image image in Startup.Database.Gallery.OrderByDescending(i => i.CreationDate)) + @if (Model.Count() > 0) + foreach (Image image in Model.OrderByDescending(i => i.CreationDate)) { } diff --git a/MyWebsite/MyWebsite/Views/Resume/Index.cshtml b/MyWebsite/MyWebsite/Views/Resume/Index.cshtml index 4d9ab3d..8936581 100644 --- a/MyWebsite/MyWebsite/Views/Resume/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/Resume/Index.cshtml @@ -5,7 +5,7 @@

My resume

-

Last update: @Model.LastUpdate

+

Last update: @Model?.LastUpdate

// Download CV (.pdf) 
// Print CV  diff --git a/MyWebsite/MyWebsite/Views/Shared/Contacts.cshtml b/MyWebsite/MyWebsite/Views/Shared/Contacts.cshtml index 6f56625..123c0d6 100644 --- a/MyWebsite/MyWebsite/Views/Shared/Contacts.cshtml +++ b/MyWebsite/MyWebsite/Views/Shared/Contacts.cshtml @@ -1,4 +1,5 @@ -@{ +@model IEnumerable +@{ ViewData["Title"] = "Contact info"; } @@ -8,13 +9,13 @@

- @foreach (Link link in Startup.Database.Links.Where(i => i.CanContactMe).OrderBy(i => i.Order)) + @foreach (Link link in Model.Where(i => i.CanContactMe)) { @(link.Title) @(link.Username)
}

- @foreach (Link link in Startup.Database.Links.Where(i => !i.CanContactMe).OrderBy(i => i.Order)) + @foreach (Link link in Model.Where(i => !i.CanContactMe)) { @(link.Title) @(link.Username)
} diff --git a/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml index f7e719f..b5c77c5 100644 --- a/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml +++ b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml @@ -4,28 +4,26 @@ }

- - if (You.InsterestedInMe)
- ContactMe();
-
- // All links are clickable
- public void ConatactMe()
- {
- @if(email != null) - { - string email = "@email.Username";
- } - Link[] socialNetworks = new Link[]
- {
- @foreach(Link link in links) - { - new Link("@(link.Title)", "https:@(link.Url)"),
- } - }
- }
-
- // Copyright ©@(DateTime.Today.Year) Michael "XFox" Gordeev - + if (You.InsterestedInMe)
+ ContactMe();
+
+ // All links are clickable
+ public void ConatactMe()
+ {
+ @if (email != null) + { + string email = "@email.Username";
+ } + Link[] socialNetworks = new Link[]
+ {
+ @foreach (Link link in links) + { + new Link("@(link.Title)", "https:@(link.Url)"),
+ } + }
+ }
+
+ // Copyright ©@(DateTime.Today.Year) Michael "XFox" Gordeev +
- - \ No newline at end of file + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml b/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml index 5fc8ac5..9d492a2 100644 --- a/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml +++ b/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml @@ -4,7 +4,7 @@ @ViewData["Title"] - XFox111.NET - + @@ -20,6 +20,7 @@ } + @@ -35,7 +36,7 @@ -