Skip to content

Commit ff60fb2

Browse files
koljadakoljada
committed
Save Image and Annotation by JS
1 parent b1fa14a commit ff60fb2

35 files changed

+245
-116
lines changed

‎BookStore.BLL.RepositoryService/BookStore.BLL.RepositoryService.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<Reference Include="Ninject">
3636
<HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
3737
</Reference>
38+
<Reference Include="NLog">
39+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
40+
</Reference>
3841
<Reference Include="System" />
3942
<Reference Include="System.Core" />
4043
<Reference Include="System.Xml.Linq" />

‎BookStore.BLL.RepositoryService/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Ninject" version="3.2.2.0" targetFramework="net45" />
4+
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
45
</packages>

‎BookStore.DAL.EntityFramework/BookStore.DAL.EntityFramework.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43+
<Reference Include="NLog">
44+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
45+
</Reference>
4346
<Reference Include="System" />
4447
<Reference Include="System.ComponentModel.DataAnnotations" />
4548
<Reference Include="System.Core" />

‎BookStore.DAL.EntityFramework/EfBookRepository.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public IQueryable<Comment> GetComment(Comment comment)
4545

4646
public override IQueryable<Book> GetAll()
4747
{
48-
return Context.Books.Include(a => a.BookAuthors).Include(a => a.Genres).Include(a => a.Tages);
48+
return Context.Books.Include(a => a.BookAuthors).Include(a => a.Genres).Include(a => a.Tages).Select(x=>x);
4949
}
5050
public override Book GetById(int id)
5151
{

‎BookStore.DAL.EntityFramework/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
4+
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
45
</packages>

‎BookStore.DAL/BookStore.DAL.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35+
<Reference Include="NLog">
36+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
37+
</Reference>
3538
<Reference Include="System" />
3639
<Reference Include="System.ComponentModel.DataAnnotations" />
3740
<Reference Include="System.Core" />
38-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
3941
<Reference Include="System.Xml.Linq" />
4042
<Reference Include="System.Data.DataSetExtensions" />
4143
<Reference Include="Microsoft.CSharp" />

‎BookStore.DAL/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
4+
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
45
</packages>

‎BookStore.DLL/BookStore.DLL.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<Reference Include="Ninject">
3636
<HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
3737
</Reference>
38+
<Reference Include="NLog">
39+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
40+
</Reference>
3841
<Reference Include="System" />
3942
<Reference Include="System.Core" />
4043
<Reference Include="System.Xml.Linq" />

‎BookStore.Domain/BookStore.DO.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
<SpecificVersion>False</SpecificVersion>
5858
<HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
5959
</Reference>
60+
<Reference Include="NLog">
61+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
62+
</Reference>
6063
<Reference Include="System" />
6164
<Reference Include="System.ComponentModel.DataAnnotations" />
6265
<Reference Include="System.Core" />

‎BookStore.Domain/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1010
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
1111
<package id="Ninject" version="3.2.2.0" targetFramework="net45" />
12+
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
1213
</packages>

‎BookStore/BookStore.csproj

+9-2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@
9898
<Reference Include="Ninject.Web.Common">
9999
<HintPath>..\packages\Ninject.Web.Common.3.2.3.0\lib\net45-full\Ninject.Web.Common.dll</HintPath>
100100
</Reference>
101+
<Reference Include="NLog">
102+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
103+
</Reference>
101104
<Reference Include="System" />
102105
<Reference Include="System.Data" />
103106
<Reference Include="System.Drawing" />
@@ -319,11 +322,14 @@
319322
<Content Include="Scripts\bootstrap.min.js.map">
320323
<DependentUpon>bootstrap.min.js</DependentUpon>
321324
</Content>
325+
<Content Include="NLog.config">
326+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
327+
</Content>
322328
<None Include="Scripts\jquery-1.9.1.intellisense.js" />
323329
<Content Include="Scripts\bootstrap.js" />
324330
<Content Include="Scripts\bootstrap.min.js" />
325331
<Content Include="Scripts\common.js" />
326-
<Content Include="Scripts\demo.js" />
332+
<Content Include="Scripts\rate.js" />
327333
<Content Include="Scripts\jquery-1.9.1.js" />
328334
<Content Include="Scripts\jquery-1.9.1.min.js" />
329335
<Content Include="Scripts\jquery-1.9.1.min.map" />
@@ -349,6 +355,7 @@
349355
<Content Include="Scripts\knockout-2.2.0.js" />
350356
<Content Include="Scripts\modernizr-2.6.2.js" />
351357
<Content Include="Scripts\npm.js" />
358+
<Content Include="Scripts\save-image.js" />
352359
<Content Include="Scripts\star-rating.js" />
353360
<Content Include="Scripts\star-rating.min.js" />
354361
<Content Include="Scripts\_references.js" />
@@ -474,4 +481,4 @@
474481
</Target>
475482
<Target Name="AfterBuild">
476483
</Target> -->
477-
</Project>
484+
</Project>

‎BookStore/Content/Admin.css

+9-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BookStore/Content/Admin.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BookStore/Content/Admin.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BookStore/Content/Admin.scss

+16
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,24 @@ table.Grid {
9696
.search {
9797
display: inline-flex;
9898
background-color: gainsboro;
99+
border-radius: 10px;
100+
border: thin solid white 1px;
99101
margin: 15px;
102+
padding:10px;
103+
104+
&:hover {
105+
background-color:ActiveBorder;
106+
}
107+
100108
a {
101109
text-decoration: none;
102110
}
111+
112+
.description {
113+
font-family:'Book Antiqua';
114+
font-size:18px;
115+
116+
}
103117
}
104118

105119
img {
@@ -176,6 +190,7 @@ img {
176190
padding: 5px 3px 3px 5px;
177191
height: 100px;
178192
}
193+
179194
.button {
180195
background: #e27575;
181196
border: none;
@@ -185,6 +200,7 @@ img {
185200
border-radius: 3px;
186201
text-shadow: 1px 1px 1px #9e3f3f;
187202
cursor: pointer;
203+
188204
&:hover {
189205
background: #cf7a7a;
190206
}

‎BookStore/Content/Site1.css

+18-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BookStore/Content/Site1.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)