Learn_CSS
Changes
Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs 57(+30 -27)
Learn_CSS/Learn_CSS.APP.Web/packages.config 36(+18 -18)
Learn_CSS/Learn_CSS.APP.Web/Web.config 14(+11 -3)
Learn_CSS/Learn_CSS.Test.Unit/app.config 16(+8 -8)
Details
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_1.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_1.txt
new file mode 100644
index 0000000..12db09c
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_1.txt
@@ -0,0 +1,24 @@
+|FileName
+Task_1.txt
+|HTML_Text
+<p>
+Установите линейный градиентный фон для элемента elem1 от верхнего <br />
+левого угла к нижнему правому, переходя от красного к синему.<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: linear-gradient(to bottom right, red, blue);
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "linear-gradient(to right bottom, rgb(255, 0, 0), rgb(0, 0, 255))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_2.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_2.txt
new file mode 100644
index 0000000..9f33eeb
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_2.txt
@@ -0,0 +1,24 @@
+|FileName
+Task_2.txt
+|HTML_Text
+<p>
+Установите линейный градиентный фон для элемента elem1, который идет <br />
+под углом 70 градусов, переходя от белого к зеленому.<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: linear-gradient(70deg, white, green);
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "linear-gradient(70deg, rgb(255, 255, 255), rgb(0, 128, 0))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_3.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_3.txt
new file mode 100644
index 0000000..838ad8c
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_3.txt
@@ -0,0 +1,24 @@
+|FileName
+Task_3.txt
+|HTML_Text
+<p>
+Установите линейный градиентный фон для элемента elem1, двигаясь сверху <br />
+вниз, переходя от «белого» к «красному» к «синему» к «зеленому».<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: linear-gradient(white, red, blue, green);
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "linear-gradient(rgb(255, 255, 255), rgb(255, 0, 0), rgb(0, 0, 255), rgb(0, 128, 0))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_4.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_4.txt
new file mode 100644
index 0000000..1b2422c
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_4.txt
@@ -0,0 +1,24 @@
+|FileName
+Task_4.txt
+|HTML_Text
+<p>
+Установите линейный градиентный фон для элемента elem1, двигаясь <br />
+сверху вниз, переходя от «rgba (0,255,0,0.2)» к «rgba (0,255,0,1)».<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: linear-gradient(rgba(0,255,0,0.2), rgba(0,255,0,1));
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "linear-gradient(rgba(0, 255, 0, 0.2), rgb(0, 255, 0))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_5.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_5.txt
new file mode 100644
index 0000000..2e4198f
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_5.txt
@@ -0,0 +1,23 @@
+|FileName
+Task_5.txt
+|HTML_Text
+<p>
+Установите радиальный градиентный фон для элемента elem1, переходя от красного к чёрному.<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: radial-gradient(red, black);
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "radial-gradient(rgb(255, 0, 0), rgb(0, 0, 0))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_6.txt b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_6.txt
new file mode 100644
index 0000000..010b2f5
--- /dev/null
+++ b/Learn_CSS/Learn_CSS.APP.Web/AppData/Task_6.txt
@@ -0,0 +1,24 @@
+|FileName
+Task_6.txt
+|HTML_Text
+<p>
+Установите радиальный градиентный фон для элемента elem1 <br />
+в форме круга с переходом от синего к красному.<br />
+</p>
+|HTML_Template
+<div class="elem1" style="height: 300px; width:300px;">
+ <br />
+ <br />
+ <br />
+</div>
+|CSS_Template
+/*[placeholder] Enter your css:*/
+.elem1 {
+ background-image: repeating-radial-gradient(circle, blue, red);
+ }
+|JSON_Result
+{
+ "elem1": {
+ "background-image": "repeating-radial-gradient(circle, rgb(0, 0, 255), rgb(255, 0, 0))"
+ }
+}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Controllers/ApiTaskController.cs b/Learn_CSS/Learn_CSS.APP.Web/Controllers/ApiTaskController.cs
index 02754a6..638c625 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Controllers/ApiTaskController.cs
+++ b/Learn_CSS/Learn_CSS.APP.Web/Controllers/ApiTaskController.cs
@@ -19,7 +19,7 @@ namespace Learn_CSS.APP.Web.Controllers
private readonly JsonIncludeService jsonIncludeService
= new JsonIncludeService();
- private readonly Storage Storage
+ private readonly Storage Storage
= new SignlethonWithParamsManager<Storage, StorageParams>().Get();
private readonly TaskService taskService
@@ -27,20 +27,20 @@ namespace Learn_CSS.APP.Web.Controllers
[HttpGet]
- public JsonResult Count()
+ public JsonResult Count()
{
return Json(Storage.data.Count, JsonRequestBehavior.AllowGet);
}
[HttpGet]
- public JsonResult ReadTasks()
+ public JsonResult ReadTasks()
{
try
{
Storage.Load();
}
- catch (Exception ex)
+ catch (Exception ex)
{
string full_message = "";
@@ -54,7 +54,7 @@ namespace Learn_CSS.APP.Web.Controllers
}
[HttpPost]
- public JsonResult GetTask(int ID)
+ public JsonResult GetTask(int ID)
{
var task = Storage.data[ID];
@@ -64,7 +64,7 @@ namespace Learn_CSS.APP.Web.Controllers
[HttpPost]
- public JsonResult Validate(ValidateEntity entity)
+ public JsonResult Validate(ValidateEntity entity)
{
var task = Storage.data[entity.ID];
Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs 57(+30 -27)
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs b/Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs
index 70fdd77..ac855c1 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs
+++ b/Learn_CSS/Learn_CSS.APP.Web/Global.asax.cs
@@ -21,9 +21,9 @@ namespace Learn_CSS.APP.Web
{
public class MvcApplication : System.Web.HttpApplication
{
- static readonly string TaskDirectory = "Tasks";
+ //static readonly string TaskDirectory = "Tasks";
- public string GetPath_App_Data => Server.MapPath("~/App_Data");
+ public string GetPath_AppData => Server.MapPath("~/AppData");
protected void Application_Start()
{
@@ -32,9 +32,6 @@ namespace Learn_CSS.APP.Web
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
-
-
-
RegisterModelBinders();
RegisterTaskStorage();
@@ -48,29 +45,35 @@ namespace Learn_CSS.APP.Web
private void RegisterTaskStorage()
{
- var stor =
- new SignlethonWithParamsManager<Storage, StorageParams>(new StorageParams()
- {
- Directory = Server.MapPath("~/AppData"),
- TaskSerializerService = new TaskSerializerService('|')
- }).Get();
-
- stor.Load();
-
- if (stor.data.Count == 0)
- {
- for (int i = 0; i < 2; i++)
- {
- stor.data.Add(new TaskEntity()
+ //try
+ //{
+ var stor =
+ new SignlethonWithParamsManager<Storage, StorageParams>(new StorageParams()
{
- HTML_Text = "Text " + i,
- HTML_Template = "Template " + i,
- JSON_Result = "Result " + i
- });
- }
- }
-
- stor.Save();
+ Directory = GetPath_AppData,
+ TaskSerializerService = new TaskSerializerService('|')
+ }).Get();
+
+ stor.Load();
+
+ stor.Save();
+ //}
+ //catch (Exception ex)
+ //{
+ // return;
+ //}
+ //if (stor.data.Count == 0)
+ //{
+ // for (int i = 0; i < 2; i++)
+ // {
+ // stor.data.Add(new TaskEntity()
+ // {
+ // HTML_Text = "Text " + i,
+ // HTML_Template = "Template " + i,
+ // JSON_Result = "Result " + i
+ // });
+ // }
+ //}
}
}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Learn_CSS.APP.Web.csproj b/Learn_CSS/Learn_CSS.APP.Web/Learn_CSS.APP.Web.csproj
index 206a93d..41a76f9 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Learn_CSS.APP.Web.csproj
+++ b/Learn_CSS/Learn_CSS.APP.Web/Learn_CSS.APP.Web.csproj
@@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Learn_CSS.APP.Web</RootNamespace>
<AssemblyName>Learn_CSS.APP.Web</AssemblyName>
- <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@@ -25,6 +25,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -65,8 +66,8 @@
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
@@ -79,6 +80,7 @@
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
+ <Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
@@ -88,11 +90,6 @@
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Web.Abstractions" />
- <Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
@@ -101,8 +98,7 @@
</Reference>
<Reference Include="System.Net.Http.WebRequest">
</Reference>
- <Reference Include="Tools.SingletonTool, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="Tools.SingletonTool">
<HintPath>..\..\DLL\Tools.SingletonTool.dll</HintPath>
</Reference>
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -130,8 +126,13 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="AppData\Task 0.txt" />
- <Content Include="AppData\Task 1.txt" />
+ <Content Include="AppData\Task_0.txt" />
+ <Content Include="AppData\Task_1.txt" />
+ <Content Include="AppData\Task_2.txt" />
+ <Content Include="AppData\Task_3.txt" />
+ <Content Include="AppData\Task_4.txt" />
+ <Content Include="AppData\Task_5.txt" />
+ <Content Include="AppData\Task_6.txt" />
<Content Include="Content\bootstrap-theme.css" />
<Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap.css" />
@@ -140,14 +141,14 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Content\Site\Site.css" />
- <Content Include="fonts\glyphicons-halflings-regular.woff2" />
- <Content Include="fonts\glyphicons-halflings-regular.woff" />
- <Content Include="fonts\glyphicons-halflings-regular.ttf" />
- <Content Include="fonts\glyphicons-halflings-regular.eot" />
<Content Include="Content\bootstrap.min.css.map" />
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-theme.min.css.map" />
<Content Include="Content\bootstrap-theme.css.map" />
+ <Content Include="fonts\glyphicons-halflings-regular.woff2" />
+ <Content Include="fonts\glyphicons-halflings-regular.woff" />
+ <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+ <Content Include="fonts\glyphicons-halflings-regular.eot" />
<None Include="packages.config" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/Storage.cs b/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/Storage.cs
index 4884027..910c30a 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/Storage.cs
+++ b/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/Storage.cs
@@ -33,6 +33,9 @@ namespace Learn_CSS.APP.Web.Models.Entities
}
+ /// <summary>
+ /// Прочитать задания
+ /// </summary>
public void Load()
{
DirectoryInfo dir = new DirectoryInfo(param.Directory);
@@ -51,21 +54,27 @@ namespace Learn_CSS.APP.Web.Models.Entities
data.Add(param.TaskSerializerService.Load(elem.FullName));
}
}
+
+
+ /// <summary>
+ /// Сохранение в файловую систему с предварительной отчисткой
+ /// </summary>
public void Save()
{
DirectoryInfo dir = new DirectoryInfo(param.Directory);
- if (!dir.Exists)
+ if (dir.Exists)
{
dir.Delete(true);
}
+ System.Threading.Thread.Sleep(250);
dir.Create();
for (int i = 0; i< data.Count; i++)
{
var elem = data[i];
- param.TaskSerializerService.Save(elem, Path.Combine(dir.FullName, "Task " + i + ".txt"));
+ param.TaskSerializerService.Save(elem, Path.Combine(dir.FullName, elem.FileName));
}
}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/TaskEntity.cs b/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/TaskEntity.cs
index 1cb4bed..116afb9 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/TaskEntity.cs
+++ b/Learn_CSS/Learn_CSS.APP.Web/Models/Entities/TaskEntity.cs
@@ -7,6 +7,8 @@ namespace Learn_CSS.APP.Web.Models.Entities
{
public class TaskEntity
{
+ public string FileName { set; get; }
+
public string HTML_Text { set; get; }
public string HTML_Template { set; get; }
public string CSS_Template { set; get; }
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Models/Services/TaskSerializerService.cs b/Learn_CSS/Learn_CSS.APP.Web/Models/Services/TaskSerializerService.cs
index 293b7ff..755071c 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Models/Services/TaskSerializerService.cs
+++ b/Learn_CSS/Learn_CSS.APP.Web/Models/Services/TaskSerializerService.cs
@@ -21,7 +21,10 @@ namespace Learn_CSS.APP.Web.Models.Services
public TaskEntity Load(string file)
{
- TaskEntity res = new TaskEntity();
+ TaskEntity res = new TaskEntity()
+ {
+ FileName = Path.GetFileName(file)
+ };
var type = typeof(TaskEntity);
var properties = type.GetProperties()
Learn_CSS/Learn_CSS.APP.Web/packages.config 36(+18 -18)
diff --git a/Learn_CSS/Learn_CSS.APP.Web/packages.config b/Learn_CSS/Learn_CSS.APP.Web/packages.config
index 1579155..ad22a21 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/packages.config
+++ b/Learn_CSS/Learn_CSS.APP.Web/packages.config
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
- <package id="bootstrap" version="3.4.1" targetFramework="net472" />
- <package id="jQuery" version="3.3.1" targetFramework="net472" />
- <package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
- <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
- <package id="Microsoft.AspNet.Mvc.ru" version="5.2.7" targetFramework="net472" />
- <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
- <package id="Microsoft.AspNet.Razor.ru" version="3.2.7" targetFramework="net472" />
- <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
- <package id="Microsoft.AspNet.Web.Optimization.ru" version="1.1.3" targetFramework="net472" />
- <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
- <package id="Microsoft.AspNet.WebPages.ru" version="3.2.7" targetFramework="net472" />
- <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net472" />
- <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net472" />
- <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
- <package id="Modernizr" version="2.8.3" targetFramework="net472" />
- <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
- <package id="WebGrease" version="1.6.0" targetFramework="net472" />
+ <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
+ <package id="bootstrap" version="3.4.1" targetFramework="net461" />
+ <package id="jQuery" version="3.3.1" targetFramework="net461" />
+ <package id="jQuery.Validation" version="1.17.0" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Mvc.ru" version="5.2.7" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Razor.ru" version="3.2.7" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
+ <package id="Microsoft.AspNet.Web.Optimization.ru" version="1.1.3" targetFramework="net461" />
+ <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
+ <package id="Microsoft.AspNet.WebPages.ru" version="3.2.7" targetFramework="net461" />
+ <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
+ <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net461" />
+ <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
+ <package id="Modernizr" version="2.8.3" targetFramework="net461" />
+ <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+ <package id="WebGrease" version="1.6.0" targetFramework="net461" />
</packages>
\ No newline at end of file
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Properties/PublishProfiles/FolderProfile.pubxml.user b/Learn_CSS/Learn_CSS.APP.Web/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9e83ac2..5f434f1 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Learn_CSS/Learn_CSS.APP.Web/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,14 +6,14 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
- <_PublishTargetUrl>C:\Data\Projects\Learn_CSS\Learn_CSS\Learn_CSS.APP.Web\bin\Release\Publish</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\Projects\VS\Learn_CSS\Learn_CSS\Learn_CSS.APP.Web\bin\Release\Publish</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="AppData/Task 0.txt">
- <publishTime>12/24/2019 00:01:10</publishTime>
+ <publishTime>12/26/2019 23:46:05</publishTime>
</File>
<File Include="AppData/Task 1.txt">
- <publishTime>12/24/2019 00:01:10</publishTime>
+ <publishTime>12/26/2019 23:47:46</publishTime>
</File>
<File Include="App_Data/Task 0.txt">
<publishTime>12/24/2019 00:01:10</publishTime>
@@ -28,16 +28,16 @@
<publishTime>09/10/2013 16:29:20</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
- <publishTime>12/26/2019 00:10:20</publishTime>
+ <publishTime>12/26/2019 23:47:58</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
- <publishTime>12/26/2019 00:10:20</publishTime>
+ <publishTime>12/26/2019 23:47:58</publishTime>
</File>
<File Include="bin/Learn_CSS.APP.Web.dll">
- <publishTime>12/26/2019 00:10:16</publishTime>
+ <publishTime>12/26/2019 23:47:47</publishTime>
</File>
<File Include="bin/Learn_CSS.APP.Web.pdb">
- <publishTime>12/26/2019 00:10:16</publishTime>
+ <publishTime>12/26/2019 23:47:47</publishTime>
</File>
<File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
<publishTime>05/24/2018 13:38:22</publishTime>
@@ -229,124 +229,124 @@
<publishTime>11/28/2018 13:04:24</publishTime>
</File>
<File Include="bin/Tools.SingletonTool.dll">
- <publishTime>12/22/2019 23:00:16</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="bin/Tools.SingletonTool.pdb">
- <publishTime>12/22/2019 23:00:16</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
</File>
<File Include="Content/bootstrap-theme.css">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap-theme.css.map">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap-theme.min.css">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap-theme.min.css.map">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap.css.map">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/bootstrap.min.css.map">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Content/Site.css">
<publishTime>12/10/2019 20:09:46</publishTime>
</File>
<File Include="Content/Site/Site.css">
- <publishTime>12/10/2019 20:09:46</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="favicon.ico">
- <publishTime>12/10/2019 20:09:46</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff2">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="PrecompiledApp.config">
- <publishTime>12/26/2019 00:10:17</publishTime>
+ <publishTime>12/26/2019 23:47:49</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Scripts/bootstrap.min.js">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.js">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.min.js">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.min.map">
- <publishTime>12/21/2019 19:19:11</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.js">
- <publishTime>12/21/2019 19:19:10</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.min.js">
- <publishTime>12/21/2019 19:19:10</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.min.map">
- <publishTime>12/21/2019 19:19:10</publishTime>
+ <publishTime>12/26/2019 22:59:05</publishTime>
</File>
<File Include="Scripts/jquery.validate.js">
- <publishTime>12/21/2019 19:19:12</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Scripts/jquery.validate.min.js">
- <publishTime>12/21/2019 19:19:12</publishTime>
+ <publishTime>12/26/2019 22:59:06</publishTime>
</File>
<File Include="Scripts/jquery.validate.unobtrusive.js">
- <publishTime>12/21/2019 19:19:12</publishTime>
+ <publishTime>12/26/2019 22:59:08</publishTime>
</File>
<File Include="Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>12/21/2019 19:19:12</publishTime>
+ <publishTime>12/26/2019 22:59:08</publishTime>
</File>
<File Include="Scripts/modernizr-2.8.3.js">
- <publishTime>12/21/2019 19:19:13</publishTime>
+ <publishTime>12/26/2019 22:59:11</publishTime>
</File>
<File Include="Scripts/Site/ApiProvider.js">
- <publishTime>12/23/2019 22:56:10</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Scripts/Site/AppPage.js">
- <publishTime>12/23/2019 23:59:58</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Scripts/Site/JavaScript.js">
<publishTime>12/10/2019 21:38:42</publishTime>
</File>
<File Include="Scripts/Site/SiteScript.js">
- <publishTime>12/23/2019 23:01:24</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Scripts/Site/StringExtensions.js">
- <publishTime>12/23/2019 23:23:36</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Scripts/Site/TaskMenuControl.js">
- <publishTime>12/23/2019 23:42:51</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Views/App/Index.cshtml">
- <publishTime>12/23/2019 23:36:18</publishTime>
+ <publishTime>12/26/2019 23:33:37</publishTime>
</File>
<File Include="Views/Home/About.cshtml">
<publishTime>12/10/2019 20:09:46</publishTime>
@@ -358,19 +358,19 @@
<publishTime>12/10/2019 20:09:46</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>12/10/2019 20:09:46</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>12/23/2019 23:33:26</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Views/Web.config">
- <publishTime>12/23/2019 02:09:42</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>12/10/2019 20:09:46</publishTime>
+ <publishTime>12/26/2019 22:53:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/24/2019 00:01:54</publishTime>
+ <publishTime>12/26/2019 23:47:48</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Scripts/Site/AppPage.js b/Learn_CSS/Learn_CSS.APP.Web/Scripts/Site/AppPage.js
index e39bdb8..5894767 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Scripts/Site/AppPage.js
+++ b/Learn_CSS/Learn_CSS.APP.Web/Scripts/Site/AppPage.js
@@ -32,7 +32,6 @@
this.div_task.innerHTML = e.HTML_Text;
this.div_UserView.innerHTML = e.HTML_Template;
this.text_UserCss.value = e.CSS_Template;
-
});
}
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Views/App/Index.cshtml b/Learn_CSS/Learn_CSS.APP.Web/Views/App/Index.cshtml
index c74a144..8550002 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Views/App/Index.cshtml
+++ b/Learn_CSS/Learn_CSS.APP.Web/Views/App/Index.cshtml
@@ -38,6 +38,7 @@
<div class="col-md-12">
+ <hr />
<button id="Button_SetCss">css it</button>
<button id="Button_Validate">Validate</button>
<input id="Validate" readonly="readonly" />
Learn_CSS/Learn_CSS.APP.Web/Web.config 14(+11 -3)
diff --git a/Learn_CSS/Learn_CSS.APP.Web/Web.config b/Learn_CSS/Learn_CSS.APP.Web/Web.config
index c85a2af..b58d274 100644
--- a/Learn_CSS/Learn_CSS.APP.Web/Web.config
+++ b/Learn_CSS/Learn_CSS.APP.Web/Web.config
@@ -18,9 +18,17 @@
</webServices>
</scripting>
</system.web.extensions>-->
+ <!--
+ Описание изменений web.config см. по адресу http://go.microsoft.com/fwlink/?LinkId=235367.
+
+ Следующие атрибуты можно установить с помощью тега <httpRuntime>.
+ <system.Web>
+ <httpRuntime targetFramework="4.6.1" />
+ </system.Web>
+ -->
<system.web>
- <compilation debug="true" targetFramework="4.7.2" />
- <httpRuntime targetFramework="4.7.2" />
+ <compilation debug="true" targetFramework="4.6.1" />
+ <httpRuntime targetFramework="4.6.1" />
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -60,4 +68,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" />
</compilers>
</system.codedom>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git "a/Learn_CSS/Learn_CSS.APP.Web/\321\202\320\260\321\201\320\272\320\270.zip" "b/Learn_CSS/Learn_CSS.APP.Web/\321\202\320\260\321\201\320\272\320\270.zip"
new file mode 100644
index 0000000..45dc8b8
Binary files /dev/null and "b/Learn_CSS/Learn_CSS.APP.Web/\321\202\320\260\321\201\320\272\320\270.zip" differ
Learn_CSS/Learn_CSS.Test.Unit/app.config 16(+8 -8)
diff --git a/Learn_CSS/Learn_CSS.Test.Unit/app.config b/Learn_CSS/Learn_CSS.Test.Unit/app.config
index 26adfb1..6fc8aaa 100644
--- a/Learn_CSS/Learn_CSS.Test.Unit/app.config
+++ b/Learn_CSS/Learn_CSS.Test.Unit/app.config
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+ <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
</assemblyBinding>
</runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
diff --git a/Learn_CSS/Learn_CSS.Test.Unit/Learn_CSS.Test.Unit.csproj b/Learn_CSS/Learn_CSS.Test.Unit/Learn_CSS.Test.Unit.csproj
index 3416667..1c59b0f 100644
--- a/Learn_CSS/Learn_CSS.Test.Unit/Learn_CSS.Test.Unit.csproj
+++ b/Learn_CSS/Learn_CSS.Test.Unit/Learn_CSS.Test.Unit.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Learn_CSS.Test.Unit</RootNamespace>
<AssemblyName>Learn_CSS.Test.Unit</AssemblyName>
- <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
diff --git a/Learn_CSS/Learn_CSS.Test.Unit/packages.config b/Learn_CSS/Learn_CSS.Test.Unit/packages.config
index ac575ac..2b2cf39 100644
--- a/Learn_CSS/Learn_CSS.Test.Unit/packages.config
+++ b/Learn_CSS/Learn_CSS.Test.Unit/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net46" />
- <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net46" />
- <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
+ <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net461" />
+ <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net461" />
+ <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
</packages>
\ No newline at end of file