diff --git a/MyWebsite/MyWebsite/MyWebsite.csproj.user b/MyWebsite/MyWebsite/MyWebsite.csproj.user index 79c2e03..eab0a5f 100644 --- a/MyWebsite/MyWebsite/MyWebsite.csproj.user +++ b/MyWebsite/MyWebsite/MyWebsite.csproj.user @@ -5,7 +5,7 @@ root/Controller 600 True - False + True False False diff --git a/MyWebsite/MyWebsite/Startup.cs b/MyWebsite/MyWebsite/Startup.cs index 0af09b1..d2d5160 100644 --- a/MyWebsite/MyWebsite/Startup.cs +++ b/MyWebsite/MyWebsite/Startup.cs @@ -51,7 +51,7 @@ namespace MyWebsite { routes.MapRoute( name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + template: "{controller=Home}/{action=Index}"); }); } } diff --git a/MyWebsite/MyWebsite/Views/CV/Index.cshtml b/MyWebsite/MyWebsite/Views/CV/Index.cshtml index b547d59..692293d 100644 --- a/MyWebsite/MyWebsite/Views/CV/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/CV/Index.cshtml @@ -8,7 +8,7 @@ // Download CV (.pdf)  -
+

Michael (Mikhail) A. Gordeev

@@ -152,30 +152,4 @@

On request.

-
- - if (You.InsterestedInMe)
- ContactMe();
-
- // All links are clickable
- public void ConatactMe()
- {
- string email = "mihcael.xfox@outlook.com";
- Link[] socialNetworks = new Link[]
- {
- new Link("LinkedIn", "https://linkedin.com/xfox"),
- new Link("GitHub", "https://github.com/xfox111"),
- new Link("Twitter", "https://twitter.com/xfox111"),
- new Link("Vkontakte", "https://vk.com/xfox.mike")
- }
- }
-
- // Copyright ©2019 Michael "XFox" Gordeev - - - -
\ No newline at end of file + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Contacts/Index.cshtml b/MyWebsite/MyWebsite/Views/Contacts/Index.cshtml index cb0f339..edc7c28 100644 --- a/MyWebsite/MyWebsite/Views/Contacts/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/Contacts/Index.cshtml @@ -7,7 +7,7 @@

Contact information

-
+

Email: michael.xfox@outlook.com
LinkedIn: @@xfox
diff --git a/MyWebsite/MyWebsite/Views/Projects/Index.cshtml b/MyWebsite/MyWebsite/Views/Projects/Index.cshtml index 884d0e0..01ad4f9 100644 --- a/MyWebsite/MyWebsite/Views/Projects/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/Projects/Index.cshtml @@ -3,7 +3,7 @@ ViewData["Title"] = "My projects"; } -

+

My projects

Here is presented the most of projects I worked on

@@ -11,20 +11,16 @@
-
+
@foreach (Project p in ViewData["Images"] as Project[]) {
- @if (!string.IsNullOrWhiteSpace(p.ImageName)) - { - - } -
+

@p.Title

-

@p.Description

+

@p.Description

@p.LinkCaption
-
+
@foreach (string i in p.Badges) {
@@ -33,3 +29,5 @@
}
+ + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml new file mode 100644 index 0000000..68b51e4 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml @@ -0,0 +1,23 @@ +
+ + if (You.InsterestedInMe)
+ ContactMe();
+
+ // All links are clickable
+ public void ConatactMe()
+ {
+ string email = "mihcael.xfox@outlook.com";
+ Link[] socialNetworks = new Link[]
+ {
+ new Link("LinkedIn", "https://linkedin.com/xfox"),
+ new Link("GitHub", "https://github.com/xfox111"),
+ new Link("Twitter", "https://twitter.com/xfox111"),
+ new Link("Vkontakte", "https://vk.com/xfox.mike")
+ }
+ }
+
+ // Copyright ©2019 Michael "XFox" Gordeev + + + +
\ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Shared/Index.cshtml b/MyWebsite/MyWebsite/Views/Shared/Index.cshtml index 209101f..adc4a24 100644 --- a/MyWebsite/MyWebsite/Views/Shared/Index.cshtml +++ b/MyWebsite/MyWebsite/Views/Shared/Index.cshtml @@ -3,14 +3,8 @@ ViewData["Title"] = "About me"; } -
-

About me

-
- -
- -

- -

+
+
+ \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/ContactsBlock.css b/MyWebsite/MyWebsite/wwwroot/css/ContactsBlock.css new file mode 100644 index 0000000..61dcf0c --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/ContactsBlock.css @@ -0,0 +1,37 @@ +footer { + display: none; +} + +.contact-me { + padding: 30px 50px; + background-color: #1e1e1e; + color: white; +} + +code { + font: inherit; +} + +var { + color: #569cd6; + font: inherit; +} + +.class { + color: #4ec9b0; +} + +.string, .string:visited { + color: #d69d85; + text-decoration: none; +} +.string:link:hover { + text-decoration: underline; +} + +.method { + color: #dcdcaa; +} + +.t1 { margin-right: 25px; } +.t2 { margin-right: 50px; } \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/Projects.css b/MyWebsite/MyWebsite/wwwroot/css/Projects.css new file mode 100644 index 0000000..02d8333 --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/Projects.css @@ -0,0 +1,39 @@ +header { + display: grid; + margin-bottom: 20px; + grid-template-columns: 1fr auto; +} + +article { + margin: 0px 10px; +} + +.github-stats { + margin-top: 20px; +} + +.project-item { + display: grid; + padding: 0px 20px 20px 20px; + grid-template-rows: auto auto; + grid-row-gap: 20px; + background-color: whitesmoke; + margin-bottom: 10px; +} + +.badge { + height: 25px; + width: 25px; + margin-right: 10px; + display: inline-block; + background-size: contain; +} + +.csharp { background-image: url(../images/Badges/csharp.png); } +.dotnet { background-image: url("../images/Badges/dotnet.png"); } +.xamarin { background-image: url("../images/Badges/xamarin.png"); } +.unity { background-image: url("../images/Badges/unity.png"); } +.android { background-image: url("../images/Badges/android.png"); } +.uwp { background-image: url("../images/Badges/windows.png"); } +.win32 { background-image: url("../images/Badges/windows.png"); } +.windows { background-image: url("../images/Badges/windows.png"); } \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/Style.css b/MyWebsite/MyWebsite/wwwroot/css/Style.css index 21078bf..0ce0345 100644 --- a/MyWebsite/MyWebsite/wwwroot/css/Style.css +++ b/MyWebsite/MyWebsite/wwwroot/css/Style.css @@ -77,13 +77,14 @@ main { min-height: calc(100vh - 130px); } -.info-block { +article, header { margin: 0px 50px; } -header { - margin: 0px 50px; +article a:visited, article a:link { + color: blue; } + header a { text-decoration: none; color: black; @@ -109,13 +110,6 @@ header a:hover { margin: 0px; } -article a:visited { - color: blue; -} -article a:link { - color: blue; -} - .gallery img { transition: .25s; object-fit: cover; @@ -128,106 +122,6 @@ article a:link { transform: scale(1.25); } -.github-stats { - margin-top: 20px; - grid-column: 2 / 2; -} - -.projects-block { - margin: 0px 10px; -} - -.projects-header { - display: grid; - margin-bottom: 20px; - grid-template-columns: 1fr auto; -} - -.project-item { - display: grid; - grid-template-columns: auto 1fr; - grid-template-rows: auto auto; - grid-column-gap: 20px; - - background-color: whitesmoke; - margin-bottom: 10px; -} -.project-item .thumbnail { - grid-column: 1/1; - grid-row: 1/3; -} -.project-item .thumbnail img { - max-height: 220px; -} -.badges { - grid-column: 2/2; - grid-row: 2/2; - margin-bottom: 20px; - align-self: end; -} - -.project-item .text { - grid-column: 2/2; - grid-row: 1/1; - margin-bottom: 15px; -} - -.text div { - margin-top: 20px; -} - -.badge { - height: 25px; - width: 25px; - margin-right: 10px !important; - display: inline-block; - background-size: contain; -} - -.comment { +.comment, .comment:visited { color: #57a64a; -} -.comment:visited { - color: #57a64a; -} -.tab { - margin-right: 25px; -} -.contact-me { - padding: 30px 50px; - background-color: #1e1e1e; - color: white; -} -code { - font: inherit; -} -var { - color: #569cd6; - font: inherit; -} -.class { - color: #4ec9b0; -} -.string { - color: #d69d85; - text-decoration: none; -} -.string:link:hover { - text-decoration: underline; -} -.string:visited { - color: #d69d85; - text-decoration: none; -} -.method { - color: rgb(220, 220, 170); -} - -.csharp { background-image: url(../images/Badges/csharp.png); } -.dotnet { background-image: url("../images/Badges/dotnet.png"); } -.xamarin { background-image: url("../images/Badges/xamarin.png"); } -.unity { background-image: url("../images/Badges/unity.png"); } -.android { background-image: url("../images/Badges/android.png"); } -.uwp { background-image: url("../images/Badges/windows.png"); } -.win32 { background-image: url("../images/Badges/windows.png"); } -.windows { background-image: url("../images/Badges/windows.png"); } \ No newline at end of file +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/images/cvbg.png b/MyWebsite/MyWebsite/wwwroot/images/cvbg.png new file mode 100644 index 0000000..f63d5e2 Binary files /dev/null and b/MyWebsite/MyWebsite/wwwroot/images/cvbg.png differ diff --git a/MyWebsite/MyWebsite/wwwroot/images/sut.jpg b/MyWebsite/MyWebsite/wwwroot/images/sut.jpg new file mode 100644 index 0000000..9e641f7 Binary files /dev/null and b/MyWebsite/MyWebsite/wwwroot/images/sut.jpg differ