1
0

Added projects ordering, updated print function for resume, homepage and resume contacts block building

This commit is contained in:
Michael Gordeev
2019-12-12 17:44:05 +03:00
parent 59337f17d9
commit 009f52bc86
6 changed files with 30 additions and 19 deletions
+1 -2
View File
@@ -7,8 +7,7 @@ namespace MyWebsite.Models
public class Project public class Project
{ {
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] public decimal Id { get; set; }
public Guid Id { get; set; }
[Required] [Required]
[Column(TypeName = "varchar(100)")] [Column(TypeName = "varchar(100)")]
@@ -9,8 +9,13 @@
<link rel="stylesheet" type="text/css" href="~/css/Style.css" /> <link rel="stylesheet" type="text/css" href="~/css/Style.css" />
<style> <style>
html {
overflow: initial;
}
body { body {
margin-top: 0px; display: initial;
margin: initial;
height: initial;
} }
</style> </style>
@@ -1,7 +1,6 @@
@using Newtonsoft.Json @{
@using System.Net Link email = Startup.Database.Links.FirstOrDefault(i => i.Name == "outlook");
@{ List<Link> links = Startup.Database.Links.Where(i => new string[] { "linkedin", "github", "twitter", "vkontakte" }.Contains(i.Name)).OrderBy(i => i.Id).ToList();
Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString($"{Context.Request.Scheme}://{Context.Request.Host}/Links.json"));
} }
<div class="contact-me"> <div class="contact-me">
@@ -12,13 +11,16 @@
<a class="comment">// All links are clickable</a><br /> <a class="comment">// All links are clickable</a><br />
<var>public void</var> <var class="method">ConatactMe</var>()<br /> <var>public void</var> <var class="method">ConatactMe</var>()<br />
{<br /> {<br />
<span class="t1"></span><var>string</var> email = <a class="string" href="mailto:michael.xfox@outlook.com">"mihcael.xfox@outlook.com"</a>;<br /> @if(email != null)
{
<span><span class="t1"></span><var>string</var> email = <a class="string" href="@email.Url">"@email.Username"</a>;</span><br />
}
<span class="t1"></span><var class="class">Link</var>[] socialNetworks = <var>new</var> <var class="class">Link</var>[]<br /> <span class="t1"></span><var class="class">Link</var>[] socialNetworks = <var>new</var> <var class="class">Link</var>[]<br />
<span class="t1"></span>{<br /> <span class="t1"></span>{<br />
<span class="t2"></span><var>new</var> <var class="class">Link</var>(<a class="string">"LinkedIn"</a>, <a class="string" target="_blank" href="@(links["linkedin"].Url)">"https:@(links["linkedin"].Url)"</a>),<br /> @foreach(Link link in links)
<span class="t2"></span><var>new</var> <var class="class">Link</var>(<a class="string">"GitHub"</a>, <a class="string" target="_blank" href="@(links["github"].Url)">"https:@(links["github"].Url)"</a>),<br /> {
<span class="t2"></span><var>new</var> <var class="class">Link</var>(<a class="string">"Twitter"</a>, <a class="string" target="_blank" href="@(links["twitter"].Url)">"https:@(links["twitter"].Url)"</a>),<br /> <span><span class="t2"></span><var>new</var> <var class="class">Link</var>(<a class="string">"@(link.Title)"</a>, <a class="string" target="_blank" href="@(link.Url)">"https:@(link.Url)"</a>),</span><br />
<span class="t2"></span><var>new</var> <var class="class">Link</var>(<a class="string">"Vkontakte"</a>, <a class="string" target="_blank" href="@(links["vk"].Url)">"https:@(links["vk"].Url)"</a>)<br /> }
<span class="t1"></span>}<br /> <span class="t1"></span>}<br />
}<br /> }<br />
<br /> <br />
@@ -2,7 +2,12 @@
ViewData["Title"] = "Home Page"; ViewData["Title"] = "Home Page";
} }
<div class="text-center"> <header>
<h1 class="display-4">Welcome</h1> <h1>Hello, World!</h1>
<p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p> </header>
</div>
<article>
<p>
Homepage
</p>
</article>
@@ -12,7 +12,7 @@
</header> </header>
<article> <article>
@foreach (Project project in Startup.Database.Projects) @foreach (Project project in Startup.Database.Projects.OrderByDescending(i => i.Id))
{ {
<div class="project-item"> <div class="project-item">
<div> <div>
@@ -28,8 +28,8 @@
<a asp-controller="Home" asp-action="Index">XFox111.NET</a> <a asp-controller="Home" asp-action="Index">XFox111.NET</a>
<menu type="toolbar" class="main-menu" style="display:none"> <menu type="toolbar" class="main-menu" style="display:none">
<li><a asp-controller="About" asp-action="Index">AboutMe();</a></li> <li><a asp-controller="Home" asp-action="Index">AboutMe();</a></li>
<li><a asp-controller="Resume" asp-action="Index">CV();</a></li> <li><a asp-controller="Resume" asp-action="Index">Resume();</a></li>
<li><a asp-controller="Projects" asp-action="Index">Projects();</a></li> <li><a asp-controller="Projects" asp-action="Index">Projects();</a></li>
<li><a asp-controller="Gallery" asp-action="Index">Arts();</a></li> <li><a asp-controller="Gallery" asp-action="Index">Arts();</a></li>
<li><a asp-controller="Contacts" asp-action="Index">Contacts();</a></li> <li><a asp-controller="Contacts" asp-action="Index">Contacts();</a></li>