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 0000000..ac96ac2 Binary files /dev/null and b/MyWebsite/wwwroot/images/Badges/ios.png differ 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