1
0

External links file done

This commit is contained in:
Michael Gordeev
2019-10-19 20:54:30 +03:00
parent 6fcc621f20
commit 0146f32e82
7 changed files with 18 additions and 13 deletions
@@ -13,7 +13,7 @@ namespace MyWebsite.Controllers
HtmlToPdf converter = new HtmlToPdf(); HtmlToPdf converter = new HtmlToPdf();
converter.Options.MarginTop = 25; converter.Options.MarginTop = 25;
converter.Options.MarginBottom = 25; converter.Options.MarginBottom = 25;
PdfDocument doc = converter.ConvertUrl($"https://{Request.Host}/CV/PrintCV?pdfPreview=true"); PdfDocument doc = converter.ConvertUrl($"{Request.Scheme}://{Request.Host}/CV/PrintCV?pdfPreview=true");
byte[] data = doc.Save(); byte[] data = doc.Save();
doc.Close(); doc.Close();
return File(data, "application/pdf", "[Michael Gordeev] CV.pdf"); return File(data, "application/pdf", "[Michael Gordeev] CV.pdf");
@@ -11,7 +11,7 @@ namespace MyWebsite.Controllers
{ {
public IActionResult Index() public IActionResult Index()
{ {
Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString($"https://{Request.Host}/Links.json")); Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString($"{Request.Scheme}://{Request.Host}/Links.json"));
ViewData["contactLinks"] = links.Values.ToList().FindAll(i => i.CanContactMe); ViewData["contactLinks"] = links.Values.ToList().FindAll(i => i.CanContactMe);
ViewData["otherLinks"] = links.Values.ToList().FindAll(i => !i.CanContactMe); ViewData["otherLinks"] = links.Values.ToList().FindAll(i => !i.CanContactMe);
@@ -12,7 +12,7 @@ namespace MyWebsite.Controllers
[HttpGet("Arts")] [HttpGet("Arts")]
public async Task<IActionResult> Index() public async Task<IActionResult> Index()
{ {
ViewData["Images"] = JsonConvert.DeserializeObject<Image[]>(await new HttpClient().GetStringAsync($"https://{Request.Host}/Gallery.json")); ViewData["Images"] = JsonConvert.DeserializeObject<Image[]>(await new HttpClient().GetStringAsync($"{Request.Scheme}://{Request.Host}/Gallery.json"));
return View(); return View();
} }
@@ -1,8 +1,6 @@
using System.Collections.Generic; using System.Diagnostics;
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using MyWebsite.Models; using MyWebsite.Models;
using Newtonsoft.Json;
namespace MyWebsite.Controllers namespace MyWebsite.Controllers
{ {
@@ -10,7 +10,7 @@ namespace MyWebsite.Controllers
{ {
public async Task<IActionResult> Index() public async Task<IActionResult> Index()
{ {
Project[] projects = JsonConvert.DeserializeObject<Project[]>(await new HttpClient().GetStringAsync($"https://{Request.Host}/Projects.json")); Project[] projects = JsonConvert.DeserializeObject<Project[]>(await new HttpClient().GetStringAsync($"{Request.Scheme}://{Request.Host}/Projects.json"));
ViewData["Images"] = projects; ViewData["Images"] = projects;
@@ -1,4 +1,10 @@
<div class="contact-me"> @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"));
}
<div class="contact-me">
<code> <code>
<var>if</var> (<var class="class">You</var>.InsterestedInMe)<br /> <var>if</var> (<var class="class">You</var>.InsterestedInMe)<br />
<span class="t1"></span><var class="method">ContactMe</var>();<br /> <span class="t1"></span><var class="method">ContactMe</var>();<br />
@@ -9,10 +15,10 @@
<span class="t1"></span><var>string</var> email = <a class="string" href="mailto:michael.xfox@outlook.com">"mihcael.xfox@outlook.com"</a>;<br /> <span class="t1"></span><var>string</var> email = <a class="string" href="mailto:michael.xfox@outlook.com">"mihcael.xfox@outlook.com"</a>;<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="//linkedin.com/xfox">"https://linkedin.com/xfox"</a>),<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="//github.com/xfox111">"https://github.com/xfox111"</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="//twitter.com/xfox111">"https://twitter.com/xfox111"</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="//vk.com/xfox.mike">"https://vk.com/xfox.mike"</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 />
<span class="t1"></span>}<br /> <span class="t1"></span>}<br />
}<br /> }<br />
<br /> <br />
@@ -1,7 +1,8 @@
@using Newtonsoft.Json @using Newtonsoft.Json
@using System.Net @using System.Net
@using System.Web
@{ @{
Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString("Links.json")); Dictionary<string, Link> links = JsonConvert.DeserializeObject<Dictionary<string, Link>>(new WebClient().DownloadString($"{Context.Request.Scheme}://{Context.Request.Host}/Links.json"));
} }
<!DOCTYPE html> <!DOCTYPE html>