Skip to content

Commit 9edda1b

Browse files
committed
Upload book+Better User profile+Better comments
1 parent 60ee7f6 commit 9edda1b

28 files changed

+1998
-292
lines changed

BookStore.DAL.EntityFramework/EfBookRepository.cs

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public override void Save(Book obj)
9696
bookForSave.Price = obj.Price;
9797
bookForSave.Rating = obj.Rating;
9898
bookForSave.Title = obj.Title;
99+
bookForSave.ContentUrl = obj.ContentUrl;
99100
ICollection<Author> authorsNew = obj.BookAuthors;
100101
ICollection<Author> authorsOld = bookForSave.BookAuthors;
101102
foreach (var author in authorsNew)

BookStore.Domain/Entities/Book.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ public class Book
3838
public string Annotation { get; set; }
3939

4040
//[HiddenInput(DisplayValue = false)]
41+
[Display(Name = "Файл")]
42+
public string ContentUrl { get; set; }
4143
public string Image_url { get; set; }
4244
[Display(Name = "Автор")]
4345
public virtual ICollection<Author> BookAuthors { get; set; }
4446
public virtual ICollection<Comment> Comments { get; set; }
45-
47+
[Display(Name = "Теги")]
4648
public virtual ICollection<Tag> Tages { get; set; }
4749
public virtual ICollection<Rate> RatedUsers { get; set; }
4850
public virtual ICollection<User> ReccomendedUsers { get; set; }

BookStore/BookStore.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,16 @@
322322
</Content>
323323
<Content Include="Scripts\addCommet.js" />
324324
<Content Include="Scripts\AddField.js" />
325+
<Content Include="Scripts\b.js" />
325326
<Content Include="Scripts\bootstrap.min.js.map">
326327
<DependentUpon>bootstrap.min.js</DependentUpon>
327328
</Content>
328329
<None Include="Scripts\jquery-1.9.1.intellisense.js" />
329330
<Content Include="Scripts\bootstrap.js" />
330331
<Content Include="Scripts\bootstrap.min.js" />
331332
<Content Include="Scripts\common.js" />
333+
<Content Include="Scripts\jquery.autocomplete.js" />
334+
<Content Include="Scripts\jquery.fileupload.js" />
332335
<Content Include="Scripts\rate.js" />
333336
<Content Include="Scripts\jquery-1.9.1.js" />
334337
<Content Include="Scripts\jquery-1.9.1.min.js" />
@@ -358,7 +361,6 @@
358361
<Content Include="Scripts\save-image.js" />
359362
<Content Include="Scripts\star-rating.js" />
360363
<Content Include="Scripts\star-rating.min.js" />
361-
<Content Include="Scripts\typeahead.bundle.js" />
362364
<Content Include="Scripts\_references.js" />
363365
<Content Include="Web.config">
364366
<SubType>Designer</SubType>
@@ -401,7 +403,7 @@
401403
<Content Include="Views\Admin\EditorTemplates\Genre.cshtml" />
402404
<Content Include="Views\Account\Ajax.cshtml" />
403405
<Content Include="Views\Account\_Ok.cshtml" />
404-
<Content Include="Views\User\Index.cshtml" />
406+
<Content Include="Views\User\Profile.cshtml" />
405407
<Content Include="Views\Book\BookDetails.cshtml" />
406408
<Content Include="Views\Shared\BookHeader.cshtml" />
407409
<Content Include="Views\Shared\Comment.cshtml" />

BookStore/Content/Admin.css

+17
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

+27-6
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,19 @@ table.Grid {
9999
border-radius: 10px;
100100
border: thin solid white 1px;
101101
margin: 15px;
102-
padding:10px;
102+
padding: 10px;
103103

104104
&:hover {
105-
background-color:ActiveBorder;
105+
background-color: ActiveBorder;
106106
}
107-
107+
108108
a {
109109
text-decoration: none;
110110
}
111111

112112
.description {
113-
font-family:'Book Antiqua';
114-
font-size:18px;
115-
113+
font-family: 'Book Antiqua';
114+
font-size: 18px;
116115
}
117116
}
118117

@@ -222,3 +221,25 @@ img {
222221
}
223222
}
224223

224+
.file {
225+
margin:15px;
226+
background-color:whitesmoke;
227+
border-radius: 10px;
228+
border: solid 1px gray;
229+
display: inline-block;
230+
text-align: right;
231+
padding:5px;
232+
label {
233+
}
234+
235+
input {
236+
margin: 1px;
237+
display: inline-block !important;
238+
text-align: right;
239+
color:InactiveCaptionText;
240+
}
241+
button {
242+
margin:3px;
243+
display: inline-block;
244+
}
245+
}

BookStore/Content/Site1.css

+41-17
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)