From 47491744d39def2da0f5da1f5a0e111f94cea7cc Mon Sep 17 00:00:00 2001 From: Kelsey McMahon <40438334+kelseymcmahon@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:24:38 -0700 Subject: [PATCH] feat: Add about page and book image (#493) ## Description Fixes: #338 #337 #336 Edits: - Adding some UI updates to the site, including some nicer colors and a slightly nicer navigation UI/UX - Added an about page - Added book to about/home pages - Better mobile nav bar image image image Would like to create some kind of graphic to fill this area, created a story(#494): image Also, I think I need to update the root css colors to match the parser project side to the added web colors here. There is a bit of a mismatch at the moment on the generated pages. ### Ensure that your pull request has followed all the steps below: - [x] Code compilation - [ ] Created tests which fail without the change (if possible) - [x] All tests passing - [ ] Extended the README / documentation, if necessary --- .../Controllers/HomeController.cs | 13 +- EssentialCSharp.Web/Views/Home/About.cshtml | 71 ++++++++ .../Views/Home/Announcements.cshtml | 43 ++--- .../Views/Home/Guidelines.cshtml | 27 +-- EssentialCSharp.Web/Views/Home/Home.cshtml | 108 +++++++----- .../Views/Shared/_Layout.cshtml | 157 ++++++++++-------- .../Views/Shared/_LoginPartial.cshtml | 21 +-- EssentialCSharp.Web/wwwroot/css/styles.css | 123 +++++++++----- EssentialCSharp.Web/wwwroot/images/book.png | Bin 0 -> 933257 bytes .../wwwroot/images/intellitect-logo.svg | 29 ++++ 10 files changed, 382 insertions(+), 210 deletions(-) create mode 100644 EssentialCSharp.Web/Views/Home/About.cshtml create mode 100644 EssentialCSharp.Web/wwwroot/images/book.png create mode 100644 EssentialCSharp.Web/wwwroot/images/intellitect-logo.svg diff --git a/EssentialCSharp.Web/Controllers/HomeController.cs b/EssentialCSharp.Web/Controllers/HomeController.cs index 7ef7d483..f20f0ee0 100644 --- a/EssentialCSharp.Web/Controllers/HomeController.cs +++ b/EssentialCSharp.Web/Controllers/HomeController.cs @@ -60,16 +60,21 @@ public IActionResult TermsOfService() return View(); } - [Route("/Announcements", - Name = "Announcements")] + [Route("/Announcements", Name = "Announcements")] public IActionResult Announcements() { ViewBag.PageTitle = "Announcements"; return View(); } - [Route("/home", - Name = "home")] + [Route("/about", Name = "about")] + public IActionResult About() + { + ViewBag.PageTitle = "About"; + return View(); + } + + [Route("/home", Name = "home")] public IActionResult Home() { return View(); diff --git a/EssentialCSharp.Web/Views/Home/About.cshtml b/EssentialCSharp.Web/Views/Home/About.cshtml new file mode 100644 index 00000000..375a3216 --- /dev/null +++ b/EssentialCSharp.Web/Views/Home/About.cshtml @@ -0,0 +1,71 @@ +@{ + ViewData["Title"] = "About"; +} + +
+

@ViewData["Title"]

+
+ +
+
+
+ Who We Are +
+

+ IntelliTect is a high-end software architecture and development consulting firm based in Spokane, Washington. +

+

+ At IntelliTect, we offer a full range of software and consulting services. + Our passion for innovation manifests itself primarily in technology and software development. +

+

+ We provide high-end architecture consulting, full life-cycle software development, and training that enables our clients to solve their most challenging problems. +

+
+ Learn More About Intellitect +
+
+
+
+ IntelliTect Logo +
+
+
+ +
+ +
+
+
+ Essential C Sharp Book +
+
+
+
+ Essential C# Book +
+

+ Check out the interactive and comprehensive guide to the C# coding language to expand your development knowledge and enhance your skill set at your own pace. The site includes everything developers need to master C# and is an excellent tool for beginners to experts. +

+
+ Get the Book +
+ +
+
+
+ +
+
+ Welcome to one of the most venerable and trusted franchises you could dream of in the world of C# books—and probably far beyond! +
+
+
+ From the Foreword by Mads Torgersen +
+ C# Lead Designer, Microsoft +
+
+
+
+
\ No newline at end of file diff --git a/EssentialCSharp.Web/Views/Home/Announcements.cshtml b/EssentialCSharp.Web/Views/Home/Announcements.cshtml index 5465ddc0..bc28425e 100644 --- a/EssentialCSharp.Web/Views/Home/Announcements.cshtml +++ b/EssentialCSharp.Web/Views/Home/Announcements.cshtml @@ -1,57 +1,40 @@ @{ ViewData["Title"] = "Announcements"; } -
-
-

@ViewData["Title"]

-
- -
-
-
+
+

@ViewData["Title"]

+
-
+
-

Web Features Coming Soon

+

Web Features Coming Soon

-
-
+
+

-
-
-
-
- -
-

Content Coming Soon

+

Content Coming Soon

-
-
+
+

-
- -
-
-
-
-

Recently Completed

+

Recently Completed

-
-
+
+

diff --git a/EssentialCSharp.Web/Views/Home/Guidelines.cshtml b/EssentialCSharp.Web/Views/Home/Guidelines.cshtml index 4e8ae470..87a5387a 100644 --- a/EssentialCSharp.Web/Views/Home/Guidelines.cshtml +++ b/EssentialCSharp.Web/Views/Home/Guidelines.cshtml @@ -4,19 +4,24 @@ var guidelines = (List)ViewBag.Guidelines as List; } -
- @foreach (var group in guidelines.GroupBy(g => g.SanitizedSubsection).OrderBy(g => g.Key)) - { -

@group.Key

- foreach (var guideline in group) +
+

@ViewData["Title"]

+
+ +
+ @foreach (var group in guidelines.GroupBy(g => g.SanitizedSubsection).OrderBy(g => g.Key)) { -
- - @guideline.Guideline -
+

@group.Key

+ foreach (var guideline in group) + { +
+ + @guideline.Guideline +
+ } +
} -
- } +
@functions { diff --git a/EssentialCSharp.Web/Views/Home/Home.cshtml b/EssentialCSharp.Web/Views/Home/Home.cshtml index 6a568a8d..bbd0b2fa 100644 --- a/EssentialCSharp.Web/Views/Home/Home.cshtml +++ b/EssentialCSharp.Web/Views/Home/Home.cshtml @@ -1,39 +1,71 @@ -
+

Welcome to Essential C#

-

Written by Mark Michaelis with Eric Lippert & Kevin Bost

-
-
-
- +
+ +
+ +
+
+

The Comprehensive, Expert Guide to C# Language Programming

+
Written by Mark Michaelis with Eric Lippert & Kevin Bost
+

+ Essential C# is a well-organized, no-fluff guide to C# for programmers at all levels of experience. + Reflecting the most important C# features from 3.0 through 8.0 and including modern programming patterns, + it will help you write code that’s simple, powerful, robust, secure, and maintainable. +

+

+ World-class C# expert Mark Michaelis presents a complete tutorial and reference for the entire language, + including expert coverage of key C# enhancements, C#’s use with .NET Core/.NET Standard, + and cross-platform compilation. He illustrates key C# constructs with succinct examples, + and presents best-practice coding guidelines. +

+
+
+ +
+ +
+
+
+ Essential C Sharp Book +
+
+
+

Essential C# Book

+

+ Check out the interactive and comprehensive guide to the C# coding language to expand your development knowledge and enhance your skill set at your own pace. The site includes everything developers need to master C# and is an excellent tool for beginners to experts. +

+ + +
+
+
+ +
+
+ Welcome to one of the most venerable and trusted franchises you could dream of in the world of C# books—and probably far beyond! +
-
- Welcome to one of the most venerable and trusted franchises you could dream of in the world of C# books—and probably far beyond! +
+ From the Foreword by Mads Torgersen +
+ C# Lead Designer, Microsoft
-
- From the Foreword by Mads Torgersen -
- C# Lead Designer, Microsoft -
-
-

The Comprehensive, Expert Guide to C# Language Programming

-

Essential C# is a well-organized, no-fluff guide to C# for programmers at all levels of experience. Reflecting the most important C# features from 3.0 through 8.0 and including modern programming patterns, it will help you write code that’s simple, powerful, robust, secure, and maintainable. World-class C# expert Mark Michaelis presents a complete tutorial and reference for the entire language, including expert coverage of key C# enhancements, C#’s use with .NET Core/.NET Standard, and cross-platform compilation. He illustrates key C# constructs with succinct examples, and presents best-practice coding guidelines.

-
- -
-
-
+
-
+

Web Features Coming Soon

-
-
+
+

@@ -42,34 +74,26 @@
-
-
-
- -
+

Content Coming Soon

-
-
+
+
-
+

-
-
-
- -
+

Recently Completed

-
-
+
+

@@ -77,12 +101,12 @@
+
- +
-
\ No newline at end of file diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml index 6288da9f..5a8fe1ff 100644 --- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml +++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml @@ -8,9 +8,9 @@ @{ -const string imageUrl = "https://essentialcsharp.com/images/icon.png"; -const string description = "Accelerate your development knowledge with C# expert Mark Michaelis' free, online comprehensive C# tutorial and reference that is updated through C# 11.0"; -string title = $"Essential C#{(string.IsNullOrEmpty(ViewBag.PageTitle) ? string.Empty : $": {ViewBag.PageTitle}")}"; + const string imageUrl = "https://essentialcsharp.com/images/icon.png"; + const string description = "Accelerate your development knowledge with C# expert Mark Michaelis' free, online comprehensive C# tutorial and reference that is updated through C# 11.0"; + string title = $"Essential C#{(string.IsNullOrEmpty(ViewBag.PageTitle) ? string.Empty : $": {ViewBag.PageTitle}")}"; } @@ -92,13 +92,28 @@ string title = $"Essential C#{(string.IsNullOrEmpty(ViewBag.PageTitle) ? string.
-