Added projects ordering, updated print function for resume, homepage and resume contacts block building
This commit is contained in:
@@ -7,8 +7,7 @@ namespace MyWebsite.Models
|
||||
public class Project
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public Guid Id { get; set; }
|
||||
public decimal Id { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column(TypeName = "varchar(100)")]
|
||||
|
||||
@@ -9,8 +9,13 @@
|
||||
<link rel="stylesheet" type="text/css" href="~/css/Style.css" />
|
||||
|
||||
<style>
|
||||
html {
|
||||
overflow: initial;
|
||||
}
|
||||
body {
|
||||
margin-top: 0px;
|
||||
display: initial;
|
||||
margin: initial;
|
||||
height: initial;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
@using Newtonsoft.Json
|
||||
@using System.Net
|
||||
@{
|
||||
Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString($"{Context.Request.Scheme}://{Context.Request.Host}/Links.json"));
|
||||
@{
|
||||
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();
|
||||
}
|
||||
|
||||
<div class="contact-me">
|
||||
@@ -12,13 +11,16 @@
|
||||
<a class="comment">// All links are clickable</a><br />
|
||||
<var>public void</var> <var class="method">ConatactMe</var>()<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>{<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 />
|
||||
<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 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 />
|
||||
@foreach(Link link in links)
|
||||
{
|
||||
<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="t1"></span>}<br />
|
||||
}<br />
|
||||
<br />
|
||||
|
||||
@@ -2,7 +2,12 @@
|
||||
ViewData["Title"] = "Home Page";
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
<h1 class="display-4">Welcome</h1>
|
||||
<p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
|
||||
</div>
|
||||
<header>
|
||||
<h1>Hello, World!</h1>
|
||||
</header>
|
||||
|
||||
<article>
|
||||
<p>
|
||||
Homepage
|
||||
</p>
|
||||
</article>
|
||||
@@ -12,7 +12,7 @@
|
||||
</header>
|
||||
|
||||
<article>
|
||||
@foreach (Project project in Startup.Database.Projects)
|
||||
@foreach (Project project in Startup.Database.Projects.OrderByDescending(i => i.Id))
|
||||
{
|
||||
<div class="project-item">
|
||||
<div>
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
<a asp-controller="Home" asp-action="Index">XFox111.NET</a>
|
||||
|
||||
<menu type="toolbar" class="main-menu" style="display:none">
|
||||
<li><a asp-controller="About" asp-action="Index">AboutMe();</a></li>
|
||||
<li><a asp-controller="Resume" asp-action="Index">CV();</a></li>
|
||||
<li><a asp-controller="Home" asp-action="Index">AboutMe();</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="Gallery" asp-action="Index">Arts();</a></li>
|
||||
<li><a asp-controller="Contacts" asp-action="Index">Contacts();</a></li>
|
||||
|
||||
Reference in New Issue
Block a user