diff --git a/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs b/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs index 21cb45d..3f85650 100644 --- a/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs +++ b/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html b/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html index d27e493..c5678c1 100644 --- a/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html +++ b/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html @@ -10,7 +10,7 @@ durationin:2000; delayin:300; offsetxout:-50; - durationout:1000;" style="top: 370px; left: 200px; font-weight: 300; height: 40px; padding: 0px 10px; font-size: 30px; line-height: 37px; color: rgb(169, 69, 69); white-space: nowrap; width: auto; border-width: 0px; margin-left: 0px; margin-top: 0px; transform-origin: 50% 50% 0px; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.002, 0, 0, 0, 1); opacity: 0.7; visibility: visible; filter: none; background: rgba(255, 255, 255, 0.85098);"> + durationout:1000;" style="top: 370px; left: 200px; font-weight: 300; height: 40px; padding: 0 10px; font-size: 30px; line-height: 37px; color: rgb(169, 69, 69); white-space: nowrap; width: auto; border-width: 0; margin-left: 0; margin-top: 0; transform-origin: 50% 50% 0; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.002, 0, 0, 0, 1); opacity: 0.7; visibility: visible; filter: none; background: rgba(255, 255, 255, 0.85098);"> {{project.title}}

diff --git a/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs index f63d4b3..5f15630 100644 --- a/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs +++ b/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Data/Showcase.Data.Models/File.cs b/Source/Data/Showcase.Data.Models/File.cs index 0e09c0d..e69cf42 100644 --- a/Source/Data/Showcase.Data.Models/File.cs +++ b/Source/Data/Showcase.Data.Models/File.cs @@ -2,8 +2,6 @@ { using System.ComponentModel.DataAnnotations.Schema; - using Showcase.Data.Common; - [Table("Files")] public class File : FileInfo { diff --git a/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs index a32bb76..ca9ae7a 100644 --- a/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs +++ b/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs index 39201a7..d4467b8 100644 --- a/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs +++ b/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs b/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs index a2bde41..7f185df 100644 --- a/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs +++ b/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs @@ -2,7 +2,6 @@ { using System.Web.Http; - using AutoMapper; using AutoMapper.QueryableExtensions; using Showcase.Server.Api.Controllers.Base; diff --git a/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs index 5c47982..47cbd89 100644 --- a/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs +++ b/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs index bcc07fe..6a5c740 100644 --- a/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs +++ b/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs index 9274b90..314e525 100644 --- a/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs +++ b/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs b/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs index 8fb9de6..96bdce3 100644 --- a/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs +++ b/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs @@ -35,7 +35,7 @@ public void CreateMappings(IConfiguration configuration) { string visitorUsername = null; string username = null; - bool isAdmin = false; + bool isAdmin = false; // TODO: Value is always false? configuration.CreateMap() .ForMember(u => u.ProjectsCount, opt => opt.MapFrom(u => u.Projects.Count)) .ForMember(u => u.CommentsCount, opt => opt.MapFrom(u => u.Comments.Count)) diff --git a/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs b/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs index c92c0e2..f124b8e 100644 --- a/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs +++ b/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs @@ -1,7 +1,6 @@ namespace Showcase.Server.Infrastructure.Auth { using System; - using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Owin.Security; @@ -115,12 +114,12 @@ private bool IsValidContext(OAuthGrantResourceOwnerCredentialsContext context) } else if (string.IsNullOrEmpty(context.UserName) || string.IsNullOrWhiteSpace(context.UserName)) { - context.SetError("invalid_grant", string.Format("Information is not valid")); + context.SetError("invalid_grant", "Information is not valid"); isValid = false; } else if (string.IsNullOrEmpty(context.Password) || string.IsNullOrWhiteSpace(context.Password)) { - context.SetError("invalid_grant", string.Format("Information is not valid")); + context.SetError("invalid_grant", "Information is not valid"); isValid = false; } @@ -134,7 +133,7 @@ private async Task LoginUser(OAuthGrantResourceOwnerCredentialsContext con // Check if remote login credentials are correct if (user == null) { - context.SetError("invalid_grant", string.Format("Information is not valid")); + context.SetError("invalid_grant", "Information is not valid"); return null; } diff --git a/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs b/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs index 48177ef..c2158d7 100644 --- a/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs +++ b/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs @@ -44,6 +44,7 @@ private async Task SaveFile(byte[] content, string path) await Task.Run(async () => { var filePath = HostingEnvironment.MapPath(path); + //// TODO: filePath can be null var fileInfo = new FileInfo(filePath); fileInfo.Directory.Create(); using (var fileWriter = new FileStream(filePath, FileMode.CreateNew)) diff --git a/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs b/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs index 4b0e3ad..d81dcd9 100644 --- a/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs +++ b/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs @@ -49,6 +49,7 @@ public override Task WriteToStreamAsync(Type type, object value, Stream writeStr var task = Task.Factory.StartNew(() => { var viewPath = HostingEnvironment.MapPath(CrawlersIndexView); + //// TODO: viewPath can be null var template = File.ReadAllText(viewPath); if (!Engine.Razor.IsTemplateCached(type.Name, type)) diff --git a/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs index 8ce831f..e898805 100644 --- a/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs +++ b/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs b/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs index caef6f2..3982c3a 100644 --- a/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs +++ b/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs @@ -17,6 +17,7 @@ public override void OnActionExecuting(HttpActionContext actionContext) { var routeData = actionContext.RequestContext.RouteData.Values; + //// TODO: routeData.FirstOrDefault() result can be null var folder = int.Parse(routeData.FirstOrDefault(a => a.Key == "folder").Value as string); var file = routeData.FirstOrDefault(a => a.Key == "file").Value as string; diff --git a/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs index db25fac..cc8cd91 100644 --- a/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs +++ b/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs b/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs index b36b585..f2ae6cf 100644 --- a/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs +++ b/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs @@ -35,7 +35,7 @@ public async Task> AddNew(IEnumerable rawFiles) { var addedFiles = await rawFiles.ForEachAsync(async rawFile => { - var file = await base.SaveFileInfo(rawFile); + var file = await this.SaveFileInfo(rawFile); file.Content = rawFile.Content; return file; }); diff --git a/Source/Services/Showcase.Services.Data/ImagesService.cs b/Source/Services/Showcase.Services.Data/ImagesService.cs index dfc7047..965cc52 100644 --- a/Source/Services/Showcase.Services.Data/ImagesService.cs +++ b/Source/Services/Showcase.Services.Data/ImagesService.cs @@ -24,7 +24,7 @@ public async Task> ProcessImages(IEnumerable { - var image = await base.SaveFileInfo(rawImage); + var image = await this.SaveFileInfo(rawImage); var thumbnailContent = await this.imageProcessor.Resize(rawImage.Content, ProcessedImage.ThumbnailImageWidth); var highContent = await this.imageProcessor.Resize(rawImage.Content, ProcessedImage.HighResolutionWidth); diff --git a/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs b/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs index f173e6a..1e264bb 100644 --- a/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs +++ b/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs @@ -14,16 +14,16 @@ public class ProcessedImage : Image public const int HighResolutionWidth = 1360; public const string HighResolutionImage = "high"; - private static IMappingService mappingService; + private static readonly IMappingService MappingService; static ProcessedImage() { - mappingService = ObjectFactory.Get(); + MappingService = ObjectFactory.Get(); } public static Func ToImage { - get { return pi => mappingService.Map(pi); } + get { return pi => MappingService.Map(pi); } } public byte[] ThumbnailContent { get; set; } @@ -32,7 +32,7 @@ static ProcessedImage() public static ProcessedImage FromImage(Image image, byte[] thumbnailContent, byte[] highResolutionContent) { - var result = mappingService.Map(image); + var result = MappingService.Map(image); result.ThumbnailContent = thumbnailContent; result.HighResolutionContent = highResolutionContent; return result; diff --git a/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs index f6b05ec..e5b96a7 100644 --- a/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs +++ b/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs index f67e281..b78bca8 100644 --- a/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs +++ b/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs b/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs index 1c3028d..97ceda6 100644 --- a/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs +++ b/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following