diff --git a/.gitignore b/.gitignore index 865287c..df5fc3f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,9 @@ /MyWebsite/MyWebsite/bin/Release/netcoreapp2.1 /MyWebsite/bin /MyWebsite/obj +/MyWebsite/MyWebsite/bin/Debug/netcoreapp3.1 +/MyWebsite.old/.vs/MyWebsite +/MyWebsite.old/MyWebsite/bin/Debug/netcoreapp2.1 +/MyWebsite.old/MyWebsite/obj/Debug/netcoreapp2.1 +/MyWebsite.old/MyWebsite/obj +/MyWebsite.old/obj/Debug/netcoreapp2.1 diff --git a/MyWebsite.sln b/MyWebsite.old.sln similarity index 100% rename from MyWebsite.sln rename to MyWebsite.old.sln diff --git a/MyWebsite/Controllers/AboutController.cs b/MyWebsite.old/Controllers/AboutController.cs similarity index 100% rename from MyWebsite/Controllers/AboutController.cs rename to MyWebsite.old/Controllers/AboutController.cs diff --git a/MyWebsite/Controllers/AdminController.cs b/MyWebsite.old/Controllers/AdminController.cs similarity index 100% rename from MyWebsite/Controllers/AdminController.cs rename to MyWebsite.old/Controllers/AdminController.cs diff --git a/MyWebsite/Controllers/CVController.cs b/MyWebsite.old/Controllers/CVController.cs similarity index 100% rename from MyWebsite/Controllers/CVController.cs rename to MyWebsite.old/Controllers/CVController.cs diff --git a/MyWebsite/Controllers/ContactsController.cs b/MyWebsite.old/Controllers/ContactsController.cs similarity index 100% rename from MyWebsite/Controllers/ContactsController.cs rename to MyWebsite.old/Controllers/ContactsController.cs diff --git a/MyWebsite/Controllers/GalleryController.cs b/MyWebsite.old/Controllers/GalleryController.cs similarity index 100% rename from MyWebsite/Controllers/GalleryController.cs rename to MyWebsite.old/Controllers/GalleryController.cs diff --git a/MyWebsite/Controllers/HomeController.cs b/MyWebsite.old/Controllers/HomeController.cs similarity index 100% rename from MyWebsite/Controllers/HomeController.cs rename to MyWebsite.old/Controllers/HomeController.cs diff --git a/MyWebsite/Controllers/ProjectsController.cs b/MyWebsite.old/Controllers/ProjectsController.cs similarity index 100% rename from MyWebsite/Controllers/ProjectsController.cs rename to MyWebsite.old/Controllers/ProjectsController.cs diff --git a/MyWebsite/Models/ErrorViewModel.cs b/MyWebsite.old/Models/ErrorViewModel.cs similarity index 100% rename from MyWebsite/Models/ErrorViewModel.cs rename to MyWebsite.old/Models/ErrorViewModel.cs diff --git a/MyWebsite/Models/Image.cs b/MyWebsite.old/Models/Image.cs similarity index 100% rename from MyWebsite/Models/Image.cs rename to MyWebsite.old/Models/Image.cs diff --git a/MyWebsite/Models/Link.cs b/MyWebsite.old/Models/Link.cs similarity index 100% rename from MyWebsite/Models/Link.cs rename to MyWebsite.old/Models/Link.cs diff --git a/MyWebsite/Models/Project.cs b/MyWebsite.old/Models/Project.cs similarity index 100% rename from MyWebsite/Models/Project.cs rename to MyWebsite.old/Models/Project.cs diff --git a/MyWebsite/MyWebsite.csproj b/MyWebsite.old/MyWebsite.csproj similarity index 100% rename from MyWebsite/MyWebsite.csproj rename to MyWebsite.old/MyWebsite.csproj diff --git a/MyWebsite/MyWebsite.csproj.user b/MyWebsite.old/MyWebsite.csproj.user similarity index 100% rename from MyWebsite/MyWebsite.csproj.user rename to MyWebsite.old/MyWebsite.csproj.user diff --git a/MyWebsite/Program.cs b/MyWebsite.old/Program.cs similarity index 100% rename from MyWebsite/Program.cs rename to MyWebsite.old/Program.cs diff --git a/MyWebsite/Properties/PublishProfiles/FolderProfile.pubxml b/MyWebsite.old/Properties/PublishProfiles/FolderProfile.pubxml similarity index 100% rename from MyWebsite/Properties/PublishProfiles/FolderProfile.pubxml rename to MyWebsite.old/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/MyWebsite/Properties/PublishProfiles/FolderProfile.pubxml.user b/MyWebsite.old/Properties/PublishProfiles/FolderProfile.pubxml.user similarity index 100% rename from MyWebsite/Properties/PublishProfiles/FolderProfile.pubxml.user rename to MyWebsite.old/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/MyWebsite/Properties/launchSettings.json b/MyWebsite.old/Properties/launchSettings.json similarity index 100% rename from MyWebsite/Properties/launchSettings.json rename to MyWebsite.old/Properties/launchSettings.json diff --git a/MyWebsite/Startup.cs b/MyWebsite.old/Startup.cs similarity index 100% rename from MyWebsite/Startup.cs rename to MyWebsite.old/Startup.cs diff --git a/MyWebsite/Views/Admin/Index.cshtml b/MyWebsite.old/Views/Admin/Index.cshtml similarity index 100% rename from MyWebsite/Views/Admin/Index.cshtml rename to MyWebsite.old/Views/Admin/Index.cshtml diff --git a/MyWebsite/Views/Admin/ProjectEditor.cshtml b/MyWebsite.old/Views/Admin/ProjectEditor.cshtml similarity index 100% rename from MyWebsite/Views/Admin/ProjectEditor.cshtml rename to MyWebsite.old/Views/Admin/ProjectEditor.cshtml diff --git a/MyWebsite/Views/Admin/Projects.cshtml b/MyWebsite.old/Views/Admin/Projects.cshtml similarity index 100% rename from MyWebsite/Views/Admin/Projects.cshtml rename to MyWebsite.old/Views/Admin/Projects.cshtml diff --git a/MyWebsite/Views/CV/CVContent.cshtml b/MyWebsite.old/Views/CV/CVContent.cshtml similarity index 100% rename from MyWebsite/Views/CV/CVContent.cshtml rename to MyWebsite.old/Views/CV/CVContent.cshtml diff --git a/MyWebsite/Views/CV/Index.cshtml b/MyWebsite.old/Views/CV/Index.cshtml similarity index 100% rename from MyWebsite/Views/CV/Index.cshtml rename to MyWebsite.old/Views/CV/Index.cshtml diff --git a/MyWebsite/Views/CV/PrintCV.cshtml b/MyWebsite.old/Views/CV/PrintCV.cshtml similarity index 100% rename from MyWebsite/Views/CV/PrintCV.cshtml rename to MyWebsite.old/Views/CV/PrintCV.cshtml diff --git a/MyWebsite/Views/Contacts/Index.cshtml b/MyWebsite.old/Views/Contacts/Index.cshtml similarity index 100% rename from MyWebsite/Views/Contacts/Index.cshtml rename to MyWebsite.old/Views/Contacts/Index.cshtml diff --git a/MyWebsite/Views/Gallery/Details.cshtml b/MyWebsite.old/Views/Gallery/Details.cshtml similarity index 100% rename from MyWebsite/Views/Gallery/Details.cshtml rename to MyWebsite.old/Views/Gallery/Details.cshtml diff --git a/MyWebsite/Views/Gallery/Index.cshtml b/MyWebsite.old/Views/Gallery/Index.cshtml similarity index 100% rename from MyWebsite/Views/Gallery/Index.cshtml rename to MyWebsite.old/Views/Gallery/Index.cshtml diff --git a/MyWebsite/Views/Projects/Index.cshtml b/MyWebsite.old/Views/Projects/Index.cshtml similarity index 100% rename from MyWebsite/Views/Projects/Index.cshtml rename to MyWebsite.old/Views/Projects/Index.cshtml diff --git a/MyWebsite/Views/Shared/ContactsBlock.cshtml b/MyWebsite.old/Views/Shared/ContactsBlock.cshtml similarity index 100% rename from MyWebsite/Views/Shared/ContactsBlock.cshtml rename to MyWebsite.old/Views/Shared/ContactsBlock.cshtml diff --git a/MyWebsite/Views/Shared/Error.cshtml b/MyWebsite.old/Views/Shared/Error.cshtml similarity index 100% rename from MyWebsite/Views/Shared/Error.cshtml rename to MyWebsite.old/Views/Shared/Error.cshtml diff --git a/MyWebsite/Views/Shared/Index.cshtml b/MyWebsite.old/Views/Shared/Index.cshtml similarity index 100% rename from MyWebsite/Views/Shared/Index.cshtml rename to MyWebsite.old/Views/Shared/Index.cshtml diff --git a/MyWebsite/Views/Shared/_Layout.cshtml b/MyWebsite.old/Views/Shared/_Layout.cshtml similarity index 100% rename from MyWebsite/Views/Shared/_Layout.cshtml rename to MyWebsite.old/Views/Shared/_Layout.cshtml diff --git a/MyWebsite/Views/_ViewImports.cshtml b/MyWebsite.old/Views/_ViewImports.cshtml similarity index 100% rename from MyWebsite/Views/_ViewImports.cshtml rename to MyWebsite.old/Views/_ViewImports.cshtml diff --git a/MyWebsite/Views/_ViewStart.cshtml b/MyWebsite.old/Views/_ViewStart.cshtml similarity index 100% rename from MyWebsite/Views/_ViewStart.cshtml rename to MyWebsite.old/Views/_ViewStart.cshtml diff --git a/MyWebsite/appsettings.Development.json b/MyWebsite.old/appsettings.Development.json similarity index 100% rename from MyWebsite/appsettings.Development.json rename to MyWebsite.old/appsettings.Development.json diff --git a/MyWebsite/appsettings.json b/MyWebsite.old/appsettings.json similarity index 100% rename from MyWebsite/appsettings.json rename to MyWebsite.old/appsettings.json diff --git a/MyWebsite/wwwroot/css/AboutMe.css b/MyWebsite.old/wwwroot/css/AboutMe.css similarity index 100% rename from MyWebsite/wwwroot/css/AboutMe.css rename to MyWebsite.old/wwwroot/css/AboutMe.css diff --git a/MyWebsite/wwwroot/css/Admin.css b/MyWebsite.old/wwwroot/css/Admin.css similarity index 100% rename from MyWebsite/wwwroot/css/Admin.css rename to MyWebsite.old/wwwroot/css/Admin.css diff --git a/MyWebsite/wwwroot/css/ContactsBlock.css b/MyWebsite.old/wwwroot/css/ContactsBlock.css similarity index 100% rename from MyWebsite/wwwroot/css/ContactsBlock.css rename to MyWebsite.old/wwwroot/css/ContactsBlock.css diff --git a/MyWebsite/wwwroot/css/Gallery.css b/MyWebsite.old/wwwroot/css/Gallery.css similarity index 100% rename from MyWebsite/wwwroot/css/Gallery.css rename to MyWebsite.old/wwwroot/css/Gallery.css diff --git a/MyWebsite/wwwroot/css/Projects.css b/MyWebsite.old/wwwroot/css/Projects.css similarity index 100% rename from MyWebsite/wwwroot/css/Projects.css rename to MyWebsite.old/wwwroot/css/Projects.css diff --git a/MyWebsite/wwwroot/css/Style.css b/MyWebsite.old/wwwroot/css/Style.css similarity index 100% rename from MyWebsite/wwwroot/css/Style.css rename to MyWebsite.old/wwwroot/css/Style.css diff --git a/MyWebsite/MyWebsite.sln b/MyWebsite/MyWebsite.sln new file mode 100644 index 0000000..f3c3942 --- /dev/null +++ b/MyWebsite/MyWebsite.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29519.181 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyWebsite", "MyWebsite\MyWebsite.csproj", "{9FB2B925-DC18-4081-AC91-96F2C49415F9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9FB2B925-DC18-4081-AC91-96F2C49415F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FB2B925-DC18-4081-AC91-96F2C49415F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FB2B925-DC18-4081-AC91-96F2C49415F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FB2B925-DC18-4081-AC91-96F2C49415F9}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DBEA98A5-43F1-4B55-B5E0-F2913A985494} + EndGlobalSection +EndGlobal diff --git a/MyWebsite/MyWebsite/Areas/API/FoxTubeController.cs b/MyWebsite/MyWebsite/Areas/API/FoxTubeController.cs new file mode 100644 index 0000000..d283ca9 --- /dev/null +++ b/MyWebsite/MyWebsite/Areas/API/FoxTubeController.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.AspNetCore.Mvc; +using MyWebsite.Models; + +namespace MyWebsite.Areas.API +{ + [Route("API/[controller]")] + [Area("API")] + [ApiController] + public class FoxTubeController : ControllerBase + { + [HttpPost("AddMetrics")] + public string AddMetrics() + { + MetricsPackage metrics = new MetricsPackage + { + Title = Request.Form["Title"], + Content = Request.Form["Content"], + Version = Request.Form["Version"] + }; + + // TODO: Insert package to database + + return metrics.Id.ToString(); + } + + [HttpGet("Messages")] + public IActionResult Messages(bool toast = false, DateTime? publishedAfter = null, string lang = "en-US") + { + if(toast) + { + + } + + return NoContent(); + } + + [HttpGet("Changelogs")] + public IActionResult Changelogs(bool toast = false, string version = null, string lang = "en-US") + { + if(toast) + { + + } + + return NoContent(); + } + } +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Areas/Projects/Controllers/FoxTubeController.cs b/MyWebsite/MyWebsite/Areas/Projects/Controllers/FoxTubeController.cs new file mode 100644 index 0000000..b4dbc29 --- /dev/null +++ b/MyWebsite/MyWebsite/Areas/Projects/Controllers/FoxTubeController.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace MyWebsite.Areas.Projects.Controllers +{ + [Area("Projects")] + public class FoxTubeController : Controller + { + public IActionResult Index() => + View("Areas/Projects/Views/FoxTube.cshtml"); + } +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Areas/Projects/Views/FoxTube.cshtml b/MyWebsite/MyWebsite/Areas/Projects/Views/FoxTube.cshtml new file mode 100644 index 0000000..7723a39 --- /dev/null +++ b/MyWebsite/MyWebsite/Areas/Projects/Views/FoxTube.cshtml @@ -0,0 +1,7 @@ + +@{ + ViewData["Title"] = "FoxTube"; +} + +

FoxTube

+ diff --git a/MyWebsite/MyWebsite/Controllers/GalleryController.cs b/MyWebsite/MyWebsite/Controllers/GalleryController.cs new file mode 100644 index 0000000..41105a0 --- /dev/null +++ b/MyWebsite/MyWebsite/Controllers/GalleryController.cs @@ -0,0 +1,19 @@ +using Microsoft.AspNetCore.Mvc; +using MyWebsite.Models; +using System.Threading.Tasks; +using System.Linq; + +namespace MyWebsite.Controllers +{ + public class GalleryController : Controller + { + public GalleryController(DatabaseContext context) => + Startup.Database = context; + + public IActionResult Index() => + View(); + + public async Task Details(string id) => + View(Startup.Database.Gallery.FirstOrDefault(i => i.FileName == id)); + } +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Controllers/HomeController.cs b/MyWebsite/MyWebsite/Controllers/HomeController.cs new file mode 100644 index 0000000..6255857 --- /dev/null +++ b/MyWebsite/MyWebsite/Controllers/HomeController.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using System.Diagnostics; +using Microsoft.AspNetCore.Mvc; +using MyWebsite.Models; +using System.Linq; + +namespace MyWebsite.Controllers +{ + public class HomeController : Controller + { + public HomeController(DatabaseContext context) => + Startup.Database = context; + + public IActionResult Index() => + View(); + + [Route("Contacts")] + public IActionResult Contacts() => + View(); + + [Route("Error")] + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() => + View("Views/Shared/Error.cshtml", new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + } +} diff --git a/MyWebsite/MyWebsite/Models/DatabaseContext.cs b/MyWebsite/MyWebsite/Models/DatabaseContext.cs new file mode 100644 index 0000000..f7837f1 --- /dev/null +++ b/MyWebsite/MyWebsite/Models/DatabaseContext.cs @@ -0,0 +1,16 @@ +using Microsoft.EntityFrameworkCore; + +namespace MyWebsite.Models +{ + public class DatabaseContext : DbContext + { + public DbSet Links { get; set; } + public DbSet Gallery { get; set; } + public DbSet Projects { get; set; } + + public DatabaseContext(DbContextOptions options) : base(options) + { + Database.EnsureCreated(); + } + } +} diff --git a/MyWebsite/MyWebsite/Models/ErrorViewModel.cs b/MyWebsite/MyWebsite/Models/ErrorViewModel.cs new file mode 100644 index 0000000..30e6359 --- /dev/null +++ b/MyWebsite/MyWebsite/Models/ErrorViewModel.cs @@ -0,0 +1,11 @@ +using System; + +namespace MyWebsite.Models +{ + public class ErrorViewModel + { + public string RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } +} diff --git a/MyWebsite/MyWebsite/Models/Image.cs b/MyWebsite/MyWebsite/Models/Image.cs new file mode 100644 index 0000000..c87075e --- /dev/null +++ b/MyWebsite/MyWebsite/Models/Image.cs @@ -0,0 +1,14 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace MyWebsite.Models +{ + public class Image + { + public string Title { get; set; } + public string Description { get; set; } + public DateTime CreationDate { get; set; } + [Key] + public string FileName { get; set; } + } +} diff --git a/MyWebsite/MyWebsite/Models/Link.cs b/MyWebsite/MyWebsite/Models/Link.cs new file mode 100644 index 0000000..be14c94 --- /dev/null +++ b/MyWebsite/MyWebsite/Models/Link.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace MyWebsite.Models +{ + public class Link + { + [Key] + public string Name { get; set; } + public string Title { get; set; } + public string Username { get; set; } + public string Url { get; set; } + public bool CanContactMe { get; set; } + } +} diff --git a/MyWebsite/MyWebsite/Models/MetricsPackage.cs b/MyWebsite/MyWebsite/Models/MetricsPackage.cs new file mode 100644 index 0000000..fbc9005 --- /dev/null +++ b/MyWebsite/MyWebsite/Models/MetricsPackage.cs @@ -0,0 +1,12 @@ +using System; + +namespace MyWebsite.Models +{ + public class MetricsPackage + { + public Guid Id { get; set; } + public string Title { get; set; } + public string Content { get; set; } + public string Version { get; set; } + } +} diff --git a/MyWebsite/MyWebsite/Models/Project.cs b/MyWebsite/MyWebsite/Models/Project.cs new file mode 100644 index 0000000..ddd98e1 --- /dev/null +++ b/MyWebsite/MyWebsite/Models/Project.cs @@ -0,0 +1,17 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace MyWebsite.Models +{ + public class Project + { + [Key] + public Guid Id { get; set; } + public string Title { get; set; } + public string Description { get; set; } + public string ImageName { get; set; } + public string Link { get; set; } + public string LinkCaption { get; set; } + public string Badges { get; set; } + } +} diff --git a/MyWebsite/MyWebsite/MyWebsite.csproj b/MyWebsite/MyWebsite/MyWebsite.csproj new file mode 100644 index 0000000..1c0139d --- /dev/null +++ b/MyWebsite/MyWebsite/MyWebsite.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.1 + + + + + + + + + + + + diff --git a/MyWebsite/MyWebsite/MyWebsite.csproj.user b/MyWebsite/MyWebsite/MyWebsite.csproj.user new file mode 100644 index 0000000..79c2e03 --- /dev/null +++ b/MyWebsite/MyWebsite/MyWebsite.csproj.user @@ -0,0 +1,14 @@ + + + + MvcControllerEmptyScaffolder + root/Controller + 600 + True + False + False + + False + 600 + + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Program.cs b/MyWebsite/MyWebsite/Program.cs new file mode 100644 index 0000000..f74053d --- /dev/null +++ b/MyWebsite/MyWebsite/Program.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace MyWebsite +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} diff --git a/MyWebsite/MyWebsite/Properties/launchSettings.json b/MyWebsite/MyWebsite/Properties/launchSettings.json new file mode 100644 index 0000000..3ad7c0a --- /dev/null +++ b/MyWebsite/MyWebsite/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:55171", + "sslPort": 44386 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MyWebsite": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/MyWebsite/MyWebsite/Startup.cs b/MyWebsite/MyWebsite/Startup.cs new file mode 100644 index 0000000..8673c47 --- /dev/null +++ b/MyWebsite/MyWebsite/Startup.cs @@ -0,0 +1,66 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.EntityFrameworkCore; +using MyWebsite.Models; + +namespace MyWebsite +{ + public class Startup + { + public static DatabaseContext Database { get; set; } + + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + string connection = Configuration.GetConnectionString("DefaultConnection"); + services.AddDbContext(options => + options.UseSqlServer(connection)); + + services.AddControllersWithViews(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public static void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + app.UseDeveloperExceptionPage(); + else + { + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + app.UseHttpsRedirection(); + app.UseStaticFiles(); + + app.UseRouting(); + + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapAreaControllerRoute( + name: "projects", + areaName: "Projects", + pattern: "Projects/{controller=Projects}/{action=Index}/{id?}"); + endpoints.MapAreaControllerRoute( + name: "api", + areaName: "API", + pattern: "API/{controller}/{action}"); + endpoints.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } +} diff --git a/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml b/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml new file mode 100644 index 0000000..4542df5 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Gallery/Details.cshtml @@ -0,0 +1,20 @@ +@model Image; +@{ + ViewData["Title"] = Model.Title; +} + +
+

Back to gallery

+
+ +
+ + +
+

@Model.Title

+ Creation date: @Model.CreationDate.ToShortDateString() +

@Model.Description

+
+
+ + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml b/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml new file mode 100644 index 0000000..2a56664 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Gallery/Index.cshtml @@ -0,0 +1,21 @@ +@{ + ViewData["Title"] = "My artworks"; +} + +
+

My arts

+
+ +
+ @if (Startup.Database.Gallery.Count() > 0) + foreach (Image image in Startup.Database.Gallery) + { + + } + else + { +

No content available

+ } +
+ + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Home/Contacts.cshtml b/MyWebsite/MyWebsite/Views/Home/Contacts.cshtml new file mode 100644 index 0000000..d4ae37f --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Home/Contacts.cshtml @@ -0,0 +1,22 @@ +@{ + ViewData["Title"] = "Contact info"; +} + +
+

Contact information

+
+ +
+

+ @foreach (Link link in Startup.Database.Links.Where(i => i.CanContactMe)) + { + @(link.Title) @(link.Username)
+ } +

+

+ @foreach (Link link in Startup.Database.Links.Where(i => !i.CanContactMe)) + { + @(link.Title) @(link.Username)
+ } +

+
\ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Home/Index.cshtml b/MyWebsite/MyWebsite/Views/Home/Index.cshtml new file mode 100644 index 0000000..d2d19bd --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Home/Index.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Home Page"; +} + +
+

Welcome

+

Learn about building Web apps with ASP.NET Core.

+
diff --git a/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml new file mode 100644 index 0000000..a3f6f21 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Shared/ContactsBlock.cshtml @@ -0,0 +1,29 @@ +@using Newtonsoft.Json +@using System.Net +@{ + Dictionary links = JsonConvert.DeserializeObject>(new WebClient().DownloadString($"{Context.Request.Scheme}://{Context.Request.Host}/Links.json")); +} + +
+ + 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:@(links["linkedin"].Url)"),
+ new Link("GitHub", "https:@(links["github"].Url)"),
+ new Link("Twitter", "https:@(links["twitter"].Url)"),
+ new Link("Vkontakte", "https:@(links["vk"].Url)")
+ }
+ }
+
+ // Copyright ©@(DateTime.Today.Year) Michael "XFox" Gordeev + + + +
\ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Shared/Error.cshtml b/MyWebsite/MyWebsite/Views/Shared/Error.cshtml new file mode 100644 index 0000000..a1e0478 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Shared/Error.cshtml @@ -0,0 +1,25 @@ +@model ErrorViewModel +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+ +@if (Model.ShowRequestId) +{ +

+ Request ID: @Model.RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

diff --git a/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml b/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000..d947752 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Shared/_Layout.cshtml @@ -0,0 +1,55 @@ + + + + @ViewData["Title"] - XFox111.NET + + + + + + + + + + + + + + + + + + + + + + + + +
+ @RenderBody() +
+ +
+ // Copyright ©@(DateTime.Today.Year) Michael "XFox" Gordeev + + @foreach (Link link in from i in Startup.Database.Links where new string[] { "outlook", "linkedin", "github" }.Contains(i.Name) orderby i.Name descending select i) + { + + } +
+ + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Views/Shared/_ValidationScriptsPartial.cshtml b/MyWebsite/MyWebsite/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 0000000..5a16d80 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,2 @@ + + diff --git a/MyWebsite/MyWebsite/Views/_ViewImports.cshtml b/MyWebsite/MyWebsite/Views/_ViewImports.cshtml new file mode 100644 index 0000000..5ecdfbb --- /dev/null +++ b/MyWebsite/MyWebsite/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using MyWebsite +@using MyWebsite.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/MyWebsite/MyWebsite/Views/_ViewStart.cshtml b/MyWebsite/MyWebsite/Views/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/MyWebsite/MyWebsite/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/MyWebsite/MyWebsite/appsettings.Development.json b/MyWebsite/MyWebsite/appsettings.Development.json new file mode 100644 index 0000000..8983e0f --- /dev/null +++ b/MyWebsite/MyWebsite/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/MyWebsite/MyWebsite/appsettings.json b/MyWebsite/MyWebsite/appsettings.json new file mode 100644 index 0000000..8d57aa0 --- /dev/null +++ b/MyWebsite/MyWebsite/appsettings.json @@ -0,0 +1,13 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=xfox111;Trusted_Connection=True;" + } +} diff --git a/MyWebsite/wwwroot/CV.txt b/MyWebsite/MyWebsite/wwwroot/CV.txt similarity index 100% rename from MyWebsite/wwwroot/CV.txt rename to MyWebsite/MyWebsite/wwwroot/CV.txt diff --git a/MyWebsite/wwwroot/Gallery.json b/MyWebsite/MyWebsite/wwwroot/Gallery.json similarity index 100% rename from MyWebsite/wwwroot/Gallery.json rename to MyWebsite/MyWebsite/wwwroot/Gallery.json diff --git a/MyWebsite/wwwroot/Links.json b/MyWebsite/MyWebsite/wwwroot/Links.json similarity index 100% rename from MyWebsite/wwwroot/Links.json rename to MyWebsite/MyWebsite/wwwroot/Links.json diff --git a/MyWebsite/wwwroot/Projects.json b/MyWebsite/MyWebsite/wwwroot/Projects.json similarity index 100% rename from MyWebsite/wwwroot/Projects.json rename to MyWebsite/MyWebsite/wwwroot/Projects.json diff --git a/MyWebsite/MyWebsite/wwwroot/css/AboutMe.css b/MyWebsite/MyWebsite/wwwroot/css/AboutMe.css new file mode 100644 index 0000000..41d61a8 --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/AboutMe.css @@ -0,0 +1,37 @@ +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; +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/Admin.css b/MyWebsite/MyWebsite/wwwroot/css/Admin.css new file mode 100644 index 0000000..de3f343 --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/Admin.css @@ -0,0 +1,62 @@ +input { + padding: 10px; + border-radius: 10px; + border: 1px solid black; + width: 100%; + box-sizing: border-box; +} + +select { + padding: 10px; + border: 1px solid black; + border-radius: 10px; + width: 100%; + -moz-appearance: none; /* Firefox */ + -webkit-appearance: none; /* Safari and Chrome */ +} + +button { + margin: 10px; + border-radius: 10px; + border: 0px; + padding: 10px 20px; + background-color: #343434; + color: white; +} + +textarea { + resize: none; + width: 100%; + border-radius: 10px; + border: 1px solid black; + padding: 10px; + box-sizing: border-box; + height: 200px; + font-family: Consolas; +} + +.select-container::after { + content: '>'; + transform: rotate(90deg); + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + right: 11px; + top: 11px; + position: absolute; + pointer-events: none; +} + +.select-container { + position: relative; +} + +form { + max-width: 50%; +} + +@media only screen and (max-width: 700px) { + form { + max-width: initial; + } +} 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/Gallery.css b/MyWebsite/MyWebsite/wwwroot/css/Gallery.css new file mode 100644 index 0000000..f81e39c --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/Gallery.css @@ -0,0 +1,35 @@ +.gallery img { + object-fit: cover; + max-height: 300px; + max-width: 100%; + margin: 2px; + transition: .25s; +} +.gallery img:hover { + filter: brightness(125%); + transform: scale(1.1); +} + +.image-overview-block img { + max-height: 50vh; + max-width: 100%; + float: left; + cursor: zoom-in; +} +.image-overview-block div { + display: inline-block; + margin-left: 20px; +} +.image-overview-block h1 { + margin-bottom: 0px; +} + +@media only screen and (max-width: 600px) { + .gallery img { + max-height: none; + } + .gallery img:hover { + filter: brightness(125%); + transform: none; + } +} \ 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..1856c78 --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/Projects.css @@ -0,0 +1,51 @@ +header { + display: grid; + grid-template-columns: 1fr auto; + grid-template-rows: auto auto; + grid-column-gap: 20px; + margin-bottom: 20px; +} + +article { + margin: 0px 10px; +} + +.github-stats { + margin-top: 20px; + width: 200px; + height: 110px; +} + +.project-item { + display: grid; + padding: 20px; + padding-top: 0px; + 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"); } +.ios { background-image: url("../images/Badges/ios.png"); } + +@media only screen and (max-width: 600px) { + .github-stats { + grid-row: 2; + } +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/Style.css b/MyWebsite/MyWebsite/wwwroot/css/Style.css new file mode 100644 index 0000000..0308b2a --- /dev/null +++ b/MyWebsite/MyWebsite/wwwroot/css/Style.css @@ -0,0 +1,122 @@ +@font-face { + font-family: 'Consolas'; + 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-family: 'Segoe MDL2 Assets'; + 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*/ +.navbar { + display: grid; + grid-template-columns: auto 1fr auto auto; + grid-column-gap: 10px; + grid-template-rows: auto auto; + background-color: #343434; + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10; + padding: 10px; + min-height: 33px; + font-size: 26px; +} + +.navbar a { + text-decoration: none; + color: white; +} +.navbar a:hover { + color: gray; +} + +.main-menu { + margin: 26px auto 26px auto; + grid-row: 2; + list-style: none; +} +.main-menu li { + font-size: 20px; + margin-top: 10px; +} + +.language-switch { + grid-column: 3; + user-select: none +} +.menu-toggle { + grid-column: 4; + cursor: pointer; + user-select: none; +} + +/*Footer styles*/ +footer { + padding: 10px; + display: grid; + align-items: center; + grid-template-columns: 1fr auto auto auto; + grid-column-gap: 10px; +} +footer a { + text-decoration: none; + color: black; +} +footer a:hover { + color: orangered; +} + +/*Body styles*/ +body { + margin: 0px; + margin-top: 53px; + font-family: Consolas, 'Segoe MDL2 Assets'; + + /*This stuff is necessary for sticky footer*/ + display: grid; + grid-template-rows: 1fr auto; + height: calc(100vh - 53px); +} + +header a { + text-decoration: none; + color: black; +} +header a:hover { + text-decoration: underline; +} + +article, header { + margin: 0px 50px; +} + +article a:visited, article a:link { + color: blue; +} + +.comment, .comment:visited { + color: #57a64a; +} + +/*Adaptive code*/ +@media only screen and (min-width: 1000px) { + .main-menu { + display: initial !important; + grid-row: 1; + grid-column: 2; + margin: 0px; + } + .main-menu li { + display: inline-block; + margin-right: 10px; + margin-top: 0px; + } + .menu-toggle { + display: none; + } +} \ No newline at end of file diff --git a/MyWebsite/wwwroot/favicon.ico b/MyWebsite/MyWebsite/wwwroot/favicon.ico similarity index 100% rename from MyWebsite/wwwroot/favicon.ico rename to MyWebsite/MyWebsite/wwwroot/favicon.ico diff --git a/MyWebsite/wwwroot/fonts/consolas.eot b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.eot similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.eot rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.eot diff --git a/MyWebsite/wwwroot/fonts/consolas.otf b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.otf similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.otf rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.otf diff --git a/MyWebsite/wwwroot/fonts/consolas.svg b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.svg similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.svg rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.svg diff --git a/MyWebsite/wwwroot/fonts/consolas.ttf b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.ttf similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.ttf rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.ttf diff --git a/MyWebsite/wwwroot/fonts/consolas.woff b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.woff similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.woff rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.woff diff --git a/MyWebsite/wwwroot/fonts/consolas.woff2 b/MyWebsite/MyWebsite/wwwroot/fonts/consolas.woff2 similarity index 100% rename from MyWebsite/wwwroot/fonts/consolas.woff2 rename to MyWebsite/MyWebsite/wwwroot/fonts/consolas.woff2 diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.eot b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.eot similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.eot rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.eot diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.otf b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.otf similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.otf rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.otf diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.svg b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.svg similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.svg rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.svg diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.ttf b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.ttf similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.ttf rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.ttf diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.woff rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff diff --git a/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff2 b/MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff2 similarity index 100% rename from MyWebsite/wwwroot/fonts/segoeMLD2assets.woff2 rename to MyWebsite/MyWebsite/wwwroot/fonts/segoeMLD2assets.woff2 diff --git a/MyWebsite/wwwroot/images/Badges/android.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/android.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/android.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/android.png diff --git a/MyWebsite/wwwroot/images/Badges/csharp.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/csharp.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/csharp.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/csharp.png diff --git a/MyWebsite/wwwroot/images/Badges/dotnet.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/dotnet.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/dotnet.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/dotnet.png diff --git a/MyWebsite/wwwroot/images/Badges/ios.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/ios.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/ios.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/ios.png diff --git a/MyWebsite/wwwroot/images/Badges/unity.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/unity.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/unity.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/unity.png diff --git a/MyWebsite/wwwroot/images/Badges/windows.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/windows.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/windows.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/windows.png diff --git a/MyWebsite/wwwroot/images/Badges/xamarin.png b/MyWebsite/MyWebsite/wwwroot/images/Badges/xamarin.png similarity index 100% rename from MyWebsite/wwwroot/images/Badges/xamarin.png rename to MyWebsite/MyWebsite/wwwroot/images/Badges/xamarin.png diff --git a/MyWebsite/wwwroot/images/Gallery/Cakeday.png b/MyWebsite/MyWebsite/wwwroot/images/Gallery/Cakeday.png similarity index 100% rename from MyWebsite/wwwroot/images/Gallery/Cakeday.png rename to MyWebsite/MyWebsite/wwwroot/images/Gallery/Cakeday.png diff --git a/MyWebsite/wwwroot/images/Gallery/VectorAvatar.svg b/MyWebsite/MyWebsite/wwwroot/images/Gallery/VectorAvatar.svg similarity index 100% rename from MyWebsite/wwwroot/images/Gallery/VectorAvatar.svg rename to MyWebsite/MyWebsite/wwwroot/images/Gallery/VectorAvatar.svg diff --git a/MyWebsite/wwwroot/images/Projects/2048.png b/MyWebsite/MyWebsite/wwwroot/images/Projects/2048.png similarity index 100% rename from MyWebsite/wwwroot/images/Projects/2048.png rename to MyWebsite/MyWebsite/wwwroot/images/Projects/2048.png diff --git a/MyWebsite/wwwroot/images/Projects/Bonch.jpg b/MyWebsite/MyWebsite/wwwroot/images/Projects/Bonch.jpg similarity index 100% rename from MyWebsite/wwwroot/images/Projects/Bonch.jpg rename to MyWebsite/MyWebsite/wwwroot/images/Projects/Bonch.jpg diff --git a/MyWebsite/wwwroot/images/Projects/FoxTube.png b/MyWebsite/MyWebsite/wwwroot/images/Projects/FoxTube.png similarity index 100% rename from MyWebsite/wwwroot/images/Projects/FoxTube.png rename to MyWebsite/MyWebsite/wwwroot/images/Projects/FoxTube.png diff --git a/MyWebsite/wwwroot/images/Projects/MiSmartAlarm.png b/MyWebsite/MyWebsite/wwwroot/images/Projects/MiSmartAlarm.png similarity index 100% rename from MyWebsite/wwwroot/images/Projects/MiSmartAlarm.png rename to MyWebsite/MyWebsite/wwwroot/images/Projects/MiSmartAlarm.png diff --git a/MyWebsite/wwwroot/images/Projects/MotionDecoder.png b/MyWebsite/MyWebsite/wwwroot/images/Projects/MotionDecoder.png similarity index 100% rename from MyWebsite/wwwroot/images/Projects/MotionDecoder.png rename to MyWebsite/MyWebsite/wwwroot/images/Projects/MotionDecoder.png diff --git a/MyWebsite/wwwroot/images/cvbg.png b/MyWebsite/MyWebsite/wwwroot/images/cvbg.png similarity index 100% rename from MyWebsite/wwwroot/images/cvbg.png rename to MyWebsite/MyWebsite/wwwroot/images/cvbg.png diff --git a/MyWebsite/wwwroot/images/favicon.png b/MyWebsite/MyWebsite/wwwroot/images/favicon.png similarity index 100% rename from MyWebsite/wwwroot/images/favicon.png rename to MyWebsite/MyWebsite/wwwroot/images/favicon.png diff --git a/MyWebsite/wwwroot/images/me.jpg b/MyWebsite/MyWebsite/wwwroot/images/me.jpg similarity index 100% rename from MyWebsite/wwwroot/images/me.jpg rename to MyWebsite/MyWebsite/wwwroot/images/me.jpg diff --git a/MyWebsite/wwwroot/images/sut.jpg b/MyWebsite/MyWebsite/wwwroot/images/sut.jpg similarity index 100% rename from MyWebsite/wwwroot/images/sut.jpg rename to MyWebsite/MyWebsite/wwwroot/images/sut.jpg diff --git a/MyWebsite/wwwroot/js/site.js b/MyWebsite/MyWebsite/wwwroot/js/site.js similarity index 100% rename from MyWebsite/wwwroot/js/site.js rename to MyWebsite/MyWebsite/wwwroot/js/site.js