From c761f74fdad1b317079166141c28850493eff688 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Wed, 13 Nov 2019 02:04:47 +0300 Subject: [PATCH] Added iOS badge, updated project info and transfrerred some js code to C# --- MyWebsite/Controllers/ProjectsController.cs | 15 ++++++- MyWebsite/Views/Projects/Index.cshtml | 15 ++++--- MyWebsite/wwwroot/Projects.json | 3 +- MyWebsite/wwwroot/images/Badges/ios.png | Bin 0 -> 4916 bytes MyWebsite/wwwroot/js/site.js | 46 -------------------- 5 files changed, 25 insertions(+), 54 deletions(-) create mode 100644 MyWebsite/wwwroot/images/Badges/ios.png diff --git a/MyWebsite/Controllers/ProjectsController.cs b/MyWebsite/Controllers/ProjectsController.cs index 1bf39e2..fc61941 100644 --- a/MyWebsite/Controllers/ProjectsController.cs +++ b/MyWebsite/Controllers/ProjectsController.cs @@ -3,6 +3,7 @@ using MyWebsite.Models; using Newtonsoft.Json; using System.Net.Http; using System.Threading.Tasks; +using System.Collections.Generic; namespace MyWebsite.Controllers { @@ -12,7 +13,19 @@ namespace MyWebsite.Controllers { Project[] projects = JsonConvert.DeserializeObject(await new HttpClient().GetStringAsync($"{Request.Scheme}://{Request.Host}/Projects.json")); - ViewData["Images"] = projects; + ViewData["Projects"] = projects; + ViewData["Badges"] = new Dictionary + { + { "csharp", "C# Programming language" }, + { "dotnet", ".NET Framework" }, + { "xamarin", "Xamarin Framework" }, + { "unity", "Unity Engine" }, + { "uwp", "Universal Windows Platform" }, + { "windows", "Windows Platform" }, + { "win32", "Windows Platform (Win32)" }, + { "android", "Android Platform" }, + { "ios", "iOS Platform" } + }; return View(); } diff --git a/MyWebsite/Views/Projects/Index.cshtml b/MyWebsite/Views/Projects/Index.cshtml index 19df243..5910d20 100644 --- a/MyWebsite/Views/Projects/Index.cshtml +++ b/MyWebsite/Views/Projects/Index.cshtml @@ -1,5 +1,4 @@ - -@{ +@{ ViewData["Title"] = "My projects"; } @@ -12,23 +11,27 @@
- @foreach (Project p in ViewData["Images"] as Project[]) + @foreach (Project p in ViewData["Projects"] as Project[]) {

@p.Title

-

@p.Description

+

+ @foreach(string line in p.Description.Split("
")) + { + @line
+ } +

@p.LinkCaption
@foreach (string i in p.Badges) { -
+
}
} -
\ No newline at end of file diff --git a/MyWebsite/wwwroot/Projects.json b/MyWebsite/wwwroot/Projects.json index a05b295..f49849e 100644 --- a/MyWebsite/wwwroot/Projects.json +++ b/MyWebsite/wwwroot/Projects.json @@ -21,7 +21,8 @@ "csharp", "xamarin", "uwp", - "android" + "android", + "ios" ] }, { diff --git a/MyWebsite/wwwroot/images/Badges/ios.png b/MyWebsite/wwwroot/images/Badges/ios.png new file mode 100644 index 0000000000000000000000000000000000000000..ac96ac2dd2722051aabc6b483c02c819e897a46e GIT binary patch literal 4916 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%0AyRQ}qLpEqg#$yjaV z%IcxuW{c}*4qu|h=K#0}A~={v;OgUxPv`Qti`KOYu!Oy*l(yH4o_==oNTOLBus`~Y z&G9&(|8Eqii1H_1)+o)}SGHmR026YxE}g5*ZW82O9Utj^tKmi{SJYU&nWA{E+YL6q zXz}nXwTW%sji?qhb4?Qlpunv!!d>m=7e4K*^p^{ z947Xa5%YLiJ3$G2I$W$Gy4XBwI4MXpS%D;fOj~t?4T5S_6+VoEUh8(#PjHp&PYg%j zW-D*BG>CuGYS`V-TEWFvBIna$Xg=STk(eljnEZmMgTfMaArFm^#gHjvU@e9 literal 0 HcmV?d00001 diff --git a/MyWebsite/wwwroot/js/site.js b/MyWebsite/wwwroot/js/site.js index 3fa586b..5c1eff4 100644 --- a/MyWebsite/wwwroot/js/site.js +++ b/MyWebsite/wwwroot/js/site.js @@ -22,50 +22,4 @@ function ToggleImageSize() image.style.maxHeight = "none"; image.style.maxWidth = "none"; } -} - -function UpdateProjects() -{ - // Settings badges tooltips - var badges = document.getElementsByClassName("badge"); - for (var i = 0; i < badges.length; i++) - { - switch (badges[i].classList[1]) - { - case "csharp": - badges[i].setAttribute("title", "C# Programming language"); - break; - case "dotnet": - badges[i].setAttribute("title", ".NET Framework"); - break; - case "xamarin": - badges[i].setAttribute("title", "Xamarin Framework"); - break; - case "unity": - badges[i].setAttribute("title", "Unity Engine"); - break; - case "uwp": - badges[i].setAttribute("title", "Universal Windows Platform"); - break; - case "windows": - badges[i].setAttribute("title", "Windows Platform"); - break; - case "win32": - badges[i].setAttribute("title", "Windows Platform (Win32)"); - break; - case "android": - badges[i].setAttribute("title", "Android Platform"); - break; - } - } - - // Making projects descriptions multiline - var descriptions = document.getElementsByClassName("description"); - for (var i = 0; i < descriptions.length; i++) - { - var desc = descriptions[i]; - var text = desc.innerText; - desc.innerText = ""; - desc.innerHTML = text; - } } \ No newline at end of file