This repository was archived by the owner on Jul 17, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
Implement Categories in header #91
Open
misha130
wants to merge
5
commits into
codidact:develop
Choose a base branch
from
misha130:cat-header
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
41 changes: 41 additions & 0 deletions
41
src/Application/Categories/Queries/ShortCategoriesListQuery/ShortCategoriesListQuery.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Codidact.Core.Application.Common.Contracts; | ||
| using Codidact.Core.Application.Common.Interfaces; | ||
| using Codidact.Core.Domain.Entities; | ||
| using Microsoft.Extensions.Logging; | ||
|
|
||
| namespace Codidact.Core.Application.Categories.Queries.ShortCategoriesListQuery | ||
| { | ||
| /// <summary> | ||
| /// Returns a list of categories with minimal data | ||
| /// </summary> | ||
| public class ShortCategoriesListQuery : IRequestHandler<ShortCategoriesListRequest, IEnumerable<ShortCategoryResult>> | ||
| { | ||
| private readonly IApplicationDbContext _context; | ||
| private readonly ILogger<ShortCategoriesListQuery> _logger; | ||
|
|
||
| public ShortCategoriesListQuery(IApplicationDbContext context, ILogger<ShortCategoriesListQuery> logger) | ||
| { | ||
| _context = context; | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public Task<IEnumerable<ShortCategoryResult>> Handle(ShortCategoriesListRequest message) | ||
| { | ||
| _logger.LogInformation($"{DateTime.UtcNow.ToString("u")} - Starting to handle request for Questions List"); | ||
|
|
||
| return Task.FromResult(_context.Categories.Select(MapCategoryToShortCategory).AsEnumerable()); | ||
| } | ||
|
|
||
| private ShortCategoryResult MapCategoryToShortCategory(Category category) | ||
| { | ||
| return new ShortCategoryResult | ||
| { | ||
| Name = category.DisplayName | ||
| }; | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/Application/Categories/Queries/ShortCategoriesListQuery/ShortCategoriesListRequest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| using System.Collections.Generic; | ||
| using Codidact.Core.Application.Common.Contracts; | ||
|
|
||
| namespace Codidact.Core.Application.Categories.Queries.ShortCategoriesListQuery | ||
| { | ||
| public class ShortCategoriesListRequest : IRequest<IEnumerable<ShortCategoryResult>> | ||
| { | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/Application/Categories/Queries/ShortCategoriesListQuery/ShortCategoryResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
|
|
||
| namespace Codidact.Core.Application.Categories.Queries.ShortCategoriesListQuery | ||
| { | ||
| public class ShortCategoryResult | ||
| { | ||
| public string Name { get; set; } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| @using Microsoft.AspNetCore.Mvc.Localization | ||
| @using Codidact.Core.Application.Categories.Queries.ShortCategoriesListQuery | ||
| @inject IViewLocalizer LayoutLocalizer | ||
| @inject ShortCategoriesListQuery query | ||
| @{ | ||
| var results = await query.Handle(new ShortCategoriesListRequest()); | ||
| string activeCategory; | ||
| var routeValue = ViewContext.RouteData.Values["category"]; | ||
| if (routeValue != null) | ||
| { | ||
| activeCategory = routeValue.ToString(); | ||
| } | ||
| else | ||
| { | ||
| activeCategory = results.Select(cat => cat.Name).FirstOrDefault(); | ||
| } | ||
| } | ||
| <header class="category-header is-blue"> | ||
| <div class="category-header--tabs"> | ||
| <div class="container category-header--tabs-container"> | ||
| @foreach (var category in results) | ||
| { | ||
| <a asp-page="Questions" asp-route-category="@category.Name" class="category-header--tab @(category?.Name == activeCategory ? "is-active" : "")">@category.Name</a> | ||
| } | ||
| </div> | ||
| </div> | ||
| <div class="container category-header--container"> | ||
| <div class="category-header--name">Q&A</div> | ||
| <div class="category-header--nav"> | ||
| <a asp-page="Questions" asp-route-category="@activeCategory" class="category-header--nav-item is-active">@LayoutLocalizer["Questions_title"]</a> | ||
| <a asp-page="Tags" asp-route-category="@activeCategory" class="category-header--nav-item">@LayoutLocalizer["Tags_title"]</a> | ||
| <a asp-page="Users" asp-route-category="@activeCategory" class="category-header--nav-item">@LayoutLocalizer["Users_title"]</a> | ||
| <div class="category-header--nav-separator"></div> | ||
| <a class="category-header--nav-item is-button" asp-page="NewQuestion" asp-route-category="@activeCategory">@LayoutLocalizer["New_question_button"]</a> | ||
| </div> | ||
| </div> | ||
| </header> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| @using Microsoft.AspNetCore.Mvc.Localization | ||
| @inject IViewLocalizer LayoutLocalizer | ||
|
|
||
| <header class="header"> | ||
| <div class="container header--container"> | ||
| <div class="header--brand"> | ||
| <a class="header--site-name" asp-area="" asp-page="/Index">Codidact</a> | ||
| </div> | ||
| <div class="header--menu"> | ||
| <div class="header--separator"></div> | ||
| @if (!User.Identity.IsAuthenticated) | ||
| { | ||
| <a class="header--item" asp-page="/Login">@LayoutLocalizer["Sign_in_button"]</a> | ||
| } | ||
| else | ||
| { | ||
| <form method="post" asp-page="/Logout"> | ||
| <button class="header--item" type="submit">@LayoutLocalizer["Sign_out_button"]</button> | ||
| </form> | ||
| } | ||
| <a class="header--item" href="https://github.com/codidact/core">@LayoutLocalizer["On_github_button"]</a> | ||
| <a class="header--item is-mobile-menu is-complex" data-trigger-header-slide="#js-hms" href="#!"> | ||
| <span class="header--menu-bars"> | ||
| <span></span> | ||
| <span></span> | ||
| <span></span> | ||
| </span> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| <aside class="header-slide" id="js-hms"> | ||
| <div class="header-slide--separator"></div> | ||
| @if (User.Identity.IsAuthenticated) | ||
| { | ||
| <a class="header-slide--item" asp-page="/Logout">@LayoutLocalizer["Sign_out_button"]</a> | ||
| } | ||
| else | ||
| { | ||
| <a class="header-slide--item" asp-page="/Login">@LayoutLocalizer["Sign_in_button"]</a> | ||
| } | ||
| <a class="header-slide--item" href="https://github.com/codidact/core">@LayoutLocalizer["On_github_button"]</a> | ||
| </aside> | ||
|
|
||
| <partial name="CategoryHeader" /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
src/WebApp/Resources/Pages/Shared/CategoryHeader.en.resx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <root> | ||
| <!-- | ||
| Microsoft ResX Schema | ||
|
|
||
| Version 2.0 | ||
|
|
||
| The primary goals of this format is to allow a simple XML format | ||
| that is mostly human readable. The generation and parsing of the | ||
| various data types are done through the TypeConverter classes | ||
| associated with the data types. | ||
|
|
||
| Example: | ||
|
|
||
| ... ado.net/XML headers & schema ... | ||
| <resheader name="resmimetype">text/microsoft-resx</resheader> | ||
| <resheader name="version">2.0</resheader> | ||
| <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | ||
| <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> | ||
| <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> | ||
| <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> | ||
| <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | ||
| <value>[base64 mime encoded serialized .NET Framework object]</value> | ||
| </data> | ||
| <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||
| <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> | ||
| <comment>This is a comment</comment> | ||
| </data> | ||
|
|
||
| There are any number of "resheader" rows that contain simple | ||
| name/value pairs. | ||
|
|
||
| Each data row contains a name, and value. The row also contains a | ||
| type or mimetype. Type corresponds to a .NET class that support | ||
| text/value conversion through the TypeConverter architecture. | ||
| Classes that don't support this are serialized and stored with the | ||
| mimetype set. | ||
|
|
||
| The mimetype is used for serialized objects, and tells the | ||
| ResXResourceReader how to depersist the object. This is currently not | ||
| extensible. For a given mimetype the value must be set accordingly: | ||
|
|
||
| Note - application/x-microsoft.net.object.binary.base64 is the format | ||
| that the ResXResourceWriter will generate, however the reader can | ||
| read any of the formats listed below. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.binary.base64 | ||
| value : The object must be serialized with | ||
| : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter | ||
| : and then encoded with base64 encoding. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.soap.base64 | ||
| value : The object must be serialized with | ||
| : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | ||
| : and then encoded with base64 encoding. | ||
|
|
||
| mimetype: application/x-microsoft.net.object.bytearray.base64 | ||
| value : The object must be serialized into a byte array | ||
| : using a System.ComponentModel.TypeConverter | ||
| : and then encoded with base64 encoding. | ||
| --> | ||
| <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | ||
| <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> | ||
| <xsd:element name="root" msdata:IsDataSet="true"> | ||
| <xsd:complexType> | ||
| <xsd:choice maxOccurs="unbounded"> | ||
| <xsd:element name="metadata"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" use="required" type="xsd:string" /> | ||
| <xsd:attribute name="type" type="xsd:string" /> | ||
| <xsd:attribute name="mimetype" type="xsd:string" /> | ||
| <xsd:attribute ref="xml:space" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="assembly"> | ||
| <xsd:complexType> | ||
| <xsd:attribute name="alias" type="xsd:string" /> | ||
| <xsd:attribute name="name" type="xsd:string" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="data"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
| <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> | ||
| <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | ||
| <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | ||
| <xsd:attribute ref="xml:space" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| <xsd:element name="resheader"> | ||
| <xsd:complexType> | ||
| <xsd:sequence> | ||
| <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
| </xsd:sequence> | ||
| <xsd:attribute name="name" type="xsd:string" use="required" /> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| </xsd:choice> | ||
| </xsd:complexType> | ||
| </xsd:element> | ||
| </xsd:schema> | ||
| <resheader name="resmimetype"> | ||
| <value>text/microsoft-resx</value> | ||
| </resheader> | ||
| <resheader name="version"> | ||
| <value>2.0</value> | ||
| </resheader> | ||
| <resheader name="reader"> | ||
| <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
| </resheader> | ||
| <resheader name="writer"> | ||
| <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
| </resheader> | ||
| <data name="New_question_button" xml:space="preserve"> | ||
| <value>New question</value> | ||
| <comment>The new question button</comment> | ||
| </data> | ||
| <data name="On_github_button" xml:space="preserve"> | ||
| <value>on GitHub</value> | ||
| <comment>The button for github on the layout header</comment> | ||
| </data> | ||
| <data name="Questions_title" xml:space="preserve"> | ||
| <value>Questions</value> | ||
| <comment>The questions button on the header of the layout</comment> | ||
| </data> | ||
| <data name="Sign_in_button" xml:space="preserve"> | ||
| <value>Sign In</value> | ||
| <comment>The sign in button in the layout header</comment> | ||
| </data> | ||
| <data name="Sign_out_button" xml:space="preserve"> | ||
| <value>Sign Out</value> | ||
| <comment>The sign out button in the layout header</comment> | ||
| </data> | ||
| <data name="Tags_title" xml:space="preserve"> | ||
| <value>Tags</value> | ||
| <comment>The tags button on the title of the header in the layout</comment> | ||
| </data> | ||
| <data name="Users_title" xml:space="preserve"> | ||
| <value>Users</value> | ||
| <comment>The users button on the title of the header in the layout</comment> | ||
| </data> | ||
| </root> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.