archive/my-old-website
Archived
1
0
Fork 0
Code Activity

Cleanup 3

Browse Source
This commit is contained in:
Michael Gordeev
2019-12-16 00:54:24 +03:00
parent e15bbce9ad
commit 0d5109c48c
23 changed files with 302 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyWebsite/MyWebsite/Controllers/HomeController.cs
+2 -2
View File
@@ -19,11 +19,11 @@ namespace MyWebsite.Controllers
[Route("Projects")] [Route("Projects")]
public IActionResult Projects() => public IActionResult Projects() =>
View(); View(Startup.Database.Projects.OrderByDescending(i => i.Id));
[Route("Error")] [Route("Error")]
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error() => public IActionResult Error() =>
View("Views/Shared/Error.cshtml", new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
} }
} }
MyWebsite/MyWebsite/Models/Project.cs
-2
View File
@@ -16,8 +16,6 @@ namespace MyWebsite.Models
[Column(TypeName = "text")] [Column(TypeName = "text")]
public string Description { get; set; } public string Description { get; set; }
[Column(TypeName = "varchar(50)")]
public string ImageName { get; set; }
[Column(TypeName = "varchar(50)")] [Column(TypeName = "varchar(50)")]
public string Link { get; set; } public string Link { get; set; }
[Column(TypeName = "varchar(50)")] [Column(TypeName = "varchar(50)")]
MyWebsite/MyWebsite/Program.cs
-6
View File
@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace MyWebsite namespace MyWebsite
{ {
MyWebsite/MyWebsite/Views/Gallery/Details.cshtml
+6 -7
View File
@@ -4,7 +4,9 @@
} }
<header> <header>
<p>&#xE760; <a asp-action="Index" asp-controller="Gallery">Back to gallery</a></p> <p>
&#xE760; <a asp-action="Index" asp-controller="Gallery">Back to gallery</a>
</p>
</header> </header>
<article class="image-overview-block"> <article class="image-overview-block">
@@ -20,17 +22,14 @@
</article> </article>
<link rel="stylesheet" type="text/css" href="~/css/Gallery.css" /> <link rel="stylesheet" type="text/css" href="~/css/Gallery.css" />
<script type="text/javascript"> <script type="text/javascript">
function ToggleImageSize() function ToggleImageSize()
{ {
var image = document.getElementById("image"); var image = document.getElementById("image");
if (image.style.maxHeight == "none") if (image.style.cursor == "zoom-out")
{ image.style = "";
image.style.maxHeight = "50vh";
image.style.maxWidth = "100%";
image.style.cursor = "zoom-in";
}
else else
{ {
image.style.maxHeight = "none"; image.style.maxHeight = "none";
MyWebsite/MyWebsite/Views/Gallery/Index.cshtml
+1 -1
View File
@@ -15,7 +15,7 @@
} }
else else
{ {
<h3>No content available</h3> <p class="comment">// No content available</p>
} }
</article> </article>
MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml
+19 -13
View File
@@ -3,24 +3,30 @@
List<Link> links = Startup.Database.Links.Where(i => new string[] { "linkedin", "github", "twitter", "vkontakte" }.Contains(i.Name)).OrderBy(i => i.Order).ToList(); List<Link> links = Startup.Database.Links.Where(i => new string[] { "linkedin", "github", "twitter", "vkontakte" }.Contains(i.Name)).OrderBy(i => i.Order).ToList();
} }
<div class="contact-me"> <div id="contact-me">
<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 /> <div>
<var class="method">ContactMe</var>();<br />
</div>
<br /> <br />
<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 />
@if (email != null) <div>
{ @if (email != null)
<span><span class="t1"></span><var>string</var> email = <a class="string" href="@email.Url">"@email.Username"</a>;</span><br /> {
} <span><var>string</var> email = <a href="@email.Url">@email.Username</a>;<br /></span>
<span class="t1"></span><var class="class">Link</var>[] socialNetworks = <var>new</var> <var class="class">Link</var>[]<br /> }
<span class="t1"></span>{<br /> <var class="class">Link</var>[] socialNetworks = <var>new</var> <var class="class">Link</var>[]<br />
@foreach (Link link in links) {<br />
{ <div>
<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 /> @foreach (Link link in links)
} {
<span class="t1"></span>}<br /> <span><img /><img /><var>new</var> <var class="class">Link</var>(<a>@(link.Title)</a>, <a target="_blank" href="@(link.Url)">https:@(link.Url)</a>),</span><br />
}
</div>
}<br />
</div>
}<br /> }<br />
<br /> <br />
<a class="comment">// Copyright &copy;@(DateTime.Today.Year) Michael "XFox" Gordeev</a> <a class="comment">// Copyright &copy;@(DateTime.Today.Year) Michael "XFox" Gordeev</a>
MyWebsite/MyWebsite/Views/Shared/Error.cshtml
+1
View File
@@ -3,6 +3,7 @@
ViewData["Title"] = "Error"; ViewData["Title"] = "Error";
} }
<!-- TODO: Make Error page-->
<header> <header>
<h1 class="text-danger">Error.</h1> <h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2> <h2 class="text-danger">An error occurred while processing your request.</h2>
MyWebsite/MyWebsite/Views/Shared/Projects.cshtml
+5 -4
View File
@@ -1,4 +1,5 @@
@{ @model IEnumerable<Project>
@{
ViewData["Title"] = "My projects"; ViewData["Title"] = "My projects";
List<Badge> badges = Startup.Database.Badges.ToList(); List<Badge> badges = Startup.Database.Badges.ToList();
} }
@@ -12,7 +13,7 @@
</header> </header>
<article> <article>
@foreach (Project project in Startup.Database.Projects.OrderByDescending(i => i.Id)) @foreach (Project project in Model)
{ {
<div class="project-item"> <div class="project-item">
<div> <div>
@@ -22,10 +23,10 @@
</p> </p>
<a href="@(project.Link)" target="_blank">@project.LinkCaption</a> <a href="@(project.Link)" target="_blank">@project.LinkCaption</a>
</div> </div>
<div> <div class="badge-placeholder">
@foreach (string badge in project.Badges.Split(',')) @foreach (string badge in project.Badges.Split(','))
{ {
<div class="badge" style="background-image: url(../images/Badges/@(badges.FirstOrDefault(i => i.Name == badge)?.Image).png)" title="@(badges.FirstOrDefault(i => i.Name == badge)?.Description)"></div> <div style="background-image: url(../images/Badges/@(badges.FirstOrDefault(i => i.Name == badge)?.Image).png)" title="@(badges.FirstOrDefault(i => i.Name == badge)?.Description)"></div>
} }
</div> </div>
</div> </div>
MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml
+2 -3
View File
@@ -2,15 +2,14 @@
<html> <html>
<head> <head>
<title>@ViewData["Title"] - XFox111.NET</title> <title>@ViewData["Title"] - XFox111.NET</title>
<link rel="shortcut icon" href="~/images/favicon.png" type="image/png" /> <link rel="shortcut icon" href="~/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="~/css/Style.css" /> <link rel="stylesheet" type="text/css" href="~/css/Style.css" />
<link rel="stylesheet" href="https://d1azc1qln24ryf.cloudfront.net/114779/Socicon/style-cf.css?9ukd8d"> <link rel="stylesheet" href="https://d1azc1qln24ryf.cloudfront.net/114779/Socicon/style-cf.css?9ukd8d">
<script src="~/js/site.js" type="text/javascript"></script> <script src="~/js/site.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
function ToggleMenu() function ToggleMenu() {
{
var menu = document.getElementById("main-menu"); var menu = document.getElementById("main-menu");
if (menu.style.display == "none") if (menu.style.display == "none")
MyWebsite/MyWebsite/wwwroot/css/AboutMe.css
-37
View File
@@ -1,37 +0,0 @@
article {
margin: 0px;
}
.block {
position: relative;
margin-bottom: -10px;
z-index: -1;
}
.block .content {
position: absolute;
}
.block .background {
width: 100%;
}
.intro {
color: white;
background-color: #00a7dc;
font-size: 36px;
text-shadow: 2px 2px 1px black;
}
.intro .content {
bottom: 50px;
left: 50px;
max-width: 65%;
}
.sut {
color: white;
background-color: #ff8000;
font-size: 28px;
text-shadow: 2px 2px 1px black;
}
.sut .content {
margin: 50px 50px;
}
MyWebsite/MyWebsite/wwwroot/css/ContactsBlock.css
+43 -25
View File
@@ -1,33 +1,51 @@
footer { footer
display: none; {
display: none;
} }
.contact-me { #contact-me
padding: 30px 50px; {
background-color: #1e1e1e; padding: 30px 50px;
color: white; margin: 0px;
background-color: #1e1e1e;
color: white;
} }
var { #contact-me var
color: #569cd6; {
font: inherit; color: #569cd6;
} font: inherit;
}
.class { #contact-me .class
color: #4ec9b0; {
} color: #4ec9b0;
}
.string, .string:visited { #contact-me .method
color: #d69d85; {
text-decoration: none; color: #dcdcaa;
} }
.string:link:hover {
text-decoration: underline;
}
.method { #contact-me div
color: #dcdcaa; {
} margin-left: 25px;
}
.t1 { margin-right: 25px; } #contact-me span a,
.t2 { margin-right: 50px; } #contact-me span a:visited
{
color: #d69d85;
text-decoration: none;
}
#contact-me span a:before,
#contact-me span a:after
{
content: "\"";
}
#contact-me span a:link:hover
{
text-decoration: underline;
}
MyWebsite/MyWebsite/wwwroot/css/Gallery.css
+44 -30
View File
@@ -1,35 +1,49 @@
.gallery img { /* Gallery styles */
object-fit: cover; .gallery img
max-height: 300px; {
max-width: 100%; object-fit: cover;
margin: 2px; max-height: 300px;
transition: .25s; max-width: 100%;
} margin: 2px;
.gallery img:hover { transition: .25s;
filter: brightness(125%);
transform: scale(1.1);
} }
.image-overview-block img { .gallery img:hover
max-height: 50vh; {
max-width: 100%; filter: brightness(125%);
float: left; transform: scale(1.1);
cursor: zoom-in; }
}
.image-overview-block div { /* Adaptive code */
display: inline-block; @media only screen and (max-width: 600px)
margin-left: 20px; {
} .gallery img
.image-overview-block h1 { {
margin-bottom: 0px; max-height: none;
}
.gallery img:hover
{
transform: none;
}
} }
@media only screen and (max-width: 600px) { /* Image details page styles */
.gallery img { .image-overview-block img
max-height: none; {
} max-height: 50vh;
.gallery img:hover { max-width: 100%;
filter: brightness(125%); float: left;
transform: none; cursor: zoom-in;
} }
.image-overview-block div
{
display: inline-block;
margin-left: 20px;
}
.image-overview-block h1
{
margin-bottom: 0px;
} }
MyWebsite/MyWebsite/wwwroot/css/Projects.css
+48 -30
View File
@@ -1,41 +1,59 @@
header { /* Header style rules */
display: grid; header
grid-template-columns: 1fr auto; {
grid-template-rows: auto auto; display: grid;
grid-column-gap: 20px; grid-template-columns: 1fr auto;
margin-bottom: 20px; grid-column-gap: 20px;
margin: 20px 50px;
} }
article { h1
margin: 0px 10px; {
margin: 0px;
} }
.github-stats { .github-stats
margin-top: 20px; {
width: 200px; width: 200px;
height: 110px; height: 110px;
} }
.project-item { @media only screen and (max-width: 600px)
display: grid; {
padding: 20px; .github-stats
padding-top: 0px; {
grid-template-rows: auto auto; grid-row: 2;
grid-row-gap: 20px; }
background-color: whitesmoke;
margin-bottom: 10px;
} }
.badge { /* Content styles */
height: 25px; article
width: 25px; {
margin-right: 10px; display: grid;
display: inline-block; grid-row-gap: 10px;
background-size: contain; margin: 0px 10px;
} }
@media only screen and (max-width: 600px) { .project-item
.github-stats { {
grid-row: 2; display: grid;
} padding: 20px;
grid-row-gap: 20px;
background-color: whitesmoke;
} }
.badge-placeholder
{
display: grid;
grid-column-gap: 10px;
grid-auto-columns: max-content;
grid-auto-flow: column;
}
.badge-placeholder div
{
height: 25px;
width: 25px;
display: inline-block;
background-size: contain;
}
MyWebsite/MyWebsite/wwwroot/css/Style.css
+128 -102
View File
@@ -2,129 +2,155 @@
This file contains main layout styles which applies to every View. In some views this rules are overrided in separate CSS files This file contains main layout styles which applies to every View. In some views this rules are overrided in separate CSS files
*/ */
/*Declaring fonts*/ /* Declaring fonts */
@font-face { @font-face
font-family: 'Consolas'; {
src: url("/fonts/consolas.eot"); font-family: 'Consolas';
src: url("/fonts/consolas.eot?#iefix") format("embedded-opentype"), url("/fonts/consolas.otf") format("opentype"), url("/fonts/consolas.svg") format("svg"), url("/fonts/consolas.ttf") format("truetype"), url("/fonts/consolas.woff") format("woff"), url("/fonts/consolas.woff2") format("woff2"); src: url("/fonts/consolas.eot");
src: url("/fonts/consolas.eot?#iefix") format("embedded-opentype"), url("/fonts/consolas.otf") format("opentype"), url("/fonts/consolas.svg") format("svg"), url("/fonts/consolas.ttf") format("truetype"), url("/fonts/consolas.woff") format("woff"), url("/fonts/consolas.woff2") format("woff2");
} }
@font-face { @font-face
font-family: 'Segoe MDL2 Assets'; {
src: url("/fonts/segoeMLD2assets.eot"); font-family: 'Segoe MDL2 Assets';
src: url("/fonts/segoeMLD2assets.eot?#iefix") format("embedded-opentype"), url("/fonts/segoeMLD2assets.otf") format("opentype"), url("/fonts/segoeMLD2assets.svg") format("svg"), url("/fonts/segoeMLD2assets.ttf") format("truetype"), url("/fonts/segoeMLD2assets.woff") format("woff"), url("/fonts/segoeMLD2assets.woff2") format("woff2"); src: url("/fonts/segoeMLD2assets.eot");
src: url("/fonts/segoeMLD2assets.eot?#iefix") format("embedded-opentype"), url("/fonts/segoeMLD2assets.otf") format("opentype"), url("/fonts/segoeMLD2assets.svg") format("svg"), url("/fonts/segoeMLD2assets.ttf") format("truetype"), url("/fonts/segoeMLD2assets.woff") format("woff"), url("/fonts/segoeMLD2assets.woff2") format("woff2");
} }
/*Header styles*/ /* Header styles */
nav { nav
display: grid; {
grid-template-columns: auto 1fr auto; display: grid;
grid-column-gap: 10px; grid-template-columns: auto 1fr auto;
grid-template-rows: auto auto; grid-column-gap: 10px;
background-color: #343434; grid-template-rows: auto auto;
position: fixed; background-color: #343434;
top: 0; position: fixed;
left: 0; top: 0;
right: 0; left: 0;
z-index: 10; right: 0;
padding: 10px; z-index: 10;
min-height: 33px; padding: 10px;
font-size: 26px; min-height: 33px;
font-size: 26px;
} }
nav a { nav a
text-decoration: none; {
color: white; text-decoration: none;
} color: white;
nav a:hover { }
color: gray;
} nav a:hover
nav div { {
grid-column: 3; color: gray;
user-select: none; }
cursor: pointer;
} nav div
menu { {
margin: 26px auto 26px auto; grid-column: 3;
grid-row: 2; user-select: none;
list-style: none; cursor: pointer;
} }
menu li {
font-size: 20px; menu
margin-top: 10px; {
margin: 26px auto 26px auto;
grid-row: 2;
list-style: none;
} }
/*Adaptive code*/ menu li
@media only screen and (min-width: 1000px) { {
menu { font-size: 20px;
display: initial !important; margin-top: 10px;
grid-row: 1; }
grid-column: 2;
margin: 0px;
}
menu li { /* Adaptive code */
display: inline-block; @media only screen and (min-width: 1000px)
margin-right: 10px; {
margin-top: 0px; menu
} {
display: initial !important;
grid-row: 1;
grid-column: 2;
margin: 0px;
}
#menu-toggle { menu li
display: none; {
} display: inline-block;
margin-right: 10px;
margin-top: 0px;
}
#menu-toggle
{
display: none;
}
} }
/*Footer styles*/ /* Footer styles */
footer { footer
padding: 10px; {
display: grid; padding: 10px;
align-items: center; display: grid;
grid-template-columns: 1fr auto; align-items: center;
grid-column-gap: 10px; grid-template-columns: 1fr auto;
} grid-column-gap: 10px;
footer a {
text-decoration: none;
color: black;
}
footer a:hover {
color: orangered;
} }
/*Body styles*/ footer a
html { {
overflow: hidden; text-decoration: none;
color: black;
}
footer a:hover
{
color: orangered;
}
/* Body styles */
html
{
overflow: hidden;
} }
body { body
overflow: auto; {
overflow: auto;
margin: 0px; margin: 0px;
margin-top: 53px; margin-top: 53px;
font-family: 'Consolas', 'Segoe MDL2 Assets';
font-family: 'Consolas', 'Segoe MDL2 Assets'; /* This stuff is necessary for sticky footer */
display: grid;
/*This stuff is necessary for sticky footer*/ grid-template-rows: 1fr auto;
display: grid; height: calc(100vh - 53px);
grid-template-rows: 1fr auto;
height: calc(100vh - 53px);
} }
header a { header a
text-decoration: none; {
color: black; text-decoration: none;
} color: black;
header a:hover {
text-decoration: underline;
} }
article, header { header a:hover
margin: 0px 50px; {
text-decoration: underline;
}
article, header
{
margin: 0px 50px;
} }
article a:visited, article a:link { article a:visited, article a:link
color: blue; {
} color: blue;
}
.comment, .comment:visited { .comment, .comment:visited
color: #57a64a !important; {
color: #57a64a !important;
} }
MyWebsite/MyWebsite/wwwroot/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 756 B

MyWebsite/MyWebsite/wwwroot/images/Projects/2048.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

MyWebsite/MyWebsite/wwwroot/images/Projects/Bonch.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 223 KiB

MyWebsite/MyWebsite/wwwroot/images/Projects/FoxTube.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 MiB

MyWebsite/MyWebsite/wwwroot/images/Projects/MiSmartAlarm.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

MyWebsite/MyWebsite/wwwroot/images/Projects/MotionDecoder.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

MyWebsite/MyWebsite/wwwroot/images/cvbg.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 897 KiB

MyWebsite/MyWebsite/wwwroot/images/favicon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 267 KiB

MyWebsite/MyWebsite/wwwroot/images/sut.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 MiB