diff --git a/MyShop/MyShop.Core/Models/Product.cs b/MyShop/MyShop.Core/Models/Product.cs index 942e573..2e3d072 100644 --- a/MyShop/MyShop.Core/Models/Product.cs +++ b/MyShop/MyShop.Core/Models/Product.cs @@ -15,7 +15,7 @@ public class Product : BaseEntity public string Name { get; set; } public string Description { get; set; } - [Range(0, 1000)] + [Range(0, 2000)] public decimal Price { get; set; } public string Category { get; set; } public string Image { get; set; } diff --git a/MyShop/MyShop.Core/ViewModels/ProductListViewModel.cs b/MyShop/MyShop.Core/ViewModels/ProductListViewModel.cs index f427ff4..e632f4a 100644 --- a/MyShop/MyShop.Core/ViewModels/ProductListViewModel.cs +++ b/MyShop/MyShop.Core/ViewModels/ProductListViewModel.cs @@ -11,5 +11,6 @@ public class ProductListViewModel { public IEnumerable Products { get; set; } public IEnumerable ProductCategories { get; set; } + public Customer Customer { get; set; } } } diff --git a/MyShop/MyShop.DataAccess.SQL/App.config b/MyShop/MyShop.DataAccess.SQL/App.config index f9e98d1..07eb1b3 100644 --- a/MyShop/MyShop.DataAccess.SQL/App.config +++ b/MyShop/MyShop.DataAccess.SQL/App.config @@ -5,7 +5,7 @@
- + diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/08D20534-708B-4AB0-AD59-0B1343458D16.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/08D20534-708B-4AB0-AD59-0B1343458D16.jpeg new file mode 100644 index 0000000..6b8448b Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/08D20534-708B-4AB0-AD59-0B1343458D16.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/09a21232-dc37-4096-8db0-6535838d15a2.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/09a21232-dc37-4096-8db0-6535838d15a2.jpeg new file mode 100644 index 0000000..9ff582d Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/09a21232-dc37-4096-8db0-6535838d15a2.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/226673E9-8632-4768-BAE6-3A9924A4483B.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/226673E9-8632-4768-BAE6-3A9924A4483B.jpeg new file mode 100644 index 0000000..0a7fc8f Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/226673E9-8632-4768-BAE6-3A9924A4483B.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/38317C51-A85D-4EAA-95DD-D30FAA0D6208.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/38317C51-A85D-4EAA-95DD-D30FAA0D6208.jpeg new file mode 100644 index 0000000..0a7fc8f Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/38317C51-A85D-4EAA-95DD-D30FAA0D6208.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/3E411CF3-1230-4C39-9908-87540412C0BA.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/3E411CF3-1230-4C39-9908-87540412C0BA.jpg new file mode 100644 index 0000000..9351a94 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/3E411CF3-1230-4C39-9908-87540412C0BA.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/493AE056-CCFF-4285-893B-6D341B848D3D.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/493AE056-CCFF-4285-893B-6D341B848D3D.jpg new file mode 100644 index 0000000..a8737e5 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/493AE056-CCFF-4285-893B-6D341B848D3D.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/52D86AB1-5D98-4934-9264-CF18BFE8F4CD.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/52D86AB1-5D98-4934-9264-CF18BFE8F4CD.jpg new file mode 100644 index 0000000..84912ce Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/52D86AB1-5D98-4934-9264-CF18BFE8F4CD.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/6239FBC7-FDA9-414B-B13A-62394E847F36.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/6239FBC7-FDA9-414B-B13A-62394E847F36.jpg new file mode 100644 index 0000000..528128a Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/6239FBC7-FDA9-414B-B13A-62394E847F36.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/6605f66c-e079-4a2d-b2b0-7cb2e7799656.PNG b/MyShop/MyShop.WebUI/Content/ProductImages/6605f66c-e079-4a2d-b2b0-7cb2e7799656.PNG new file mode 100644 index 0000000..293506c Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/6605f66c-e079-4a2d-b2b0-7cb2e7799656.PNG differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/6D604B81-98D0-4344-B458-E436EAFC0E11.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/6D604B81-98D0-4344-B458-E436EAFC0E11.jpeg new file mode 100644 index 0000000..6b8448b Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/6D604B81-98D0-4344-B458-E436EAFC0E11.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/791D4730-E9F1-4BBE-B8DE-C0FD4CD1A036.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/791D4730-E9F1-4BBE-B8DE-C0FD4CD1A036.jpg new file mode 100644 index 0000000..27d13e8 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/791D4730-E9F1-4BBE-B8DE-C0FD4CD1A036.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/7FDC119C-2E68-4593-ADEE-B3A997642116.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/7FDC119C-2E68-4593-ADEE-B3A997642116.jpeg new file mode 100644 index 0000000..0a7fc8f Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/7FDC119C-2E68-4593-ADEE-B3A997642116.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/824c8678-70ba-4514-a2d4-112ee7af6d17.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/824c8678-70ba-4514-a2d4-112ee7af6d17.jpeg new file mode 100644 index 0000000..6b8448b Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/824c8678-70ba-4514-a2d4-112ee7af6d17.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/87FF45BE-4C14-4788-9BE5-E24F60496B08.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/87FF45BE-4C14-4788-9BE5-E24F60496B08.jpg new file mode 100644 index 0000000..f1fd90e Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/87FF45BE-4C14-4788-9BE5-E24F60496B08.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/88AAE2BA-F363-4647-8890-E9BDCAB0ADE3.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/88AAE2BA-F363-4647-8890-E9BDCAB0ADE3.jpg new file mode 100644 index 0000000..f1fd90e Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/88AAE2BA-F363-4647-8890-E9BDCAB0ADE3.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/8B076E73-7E07-4704-823E-1434E3105ACD.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/8B076E73-7E07-4704-823E-1434E3105ACD.jpeg new file mode 100644 index 0000000..6b8448b Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/8B076E73-7E07-4704-823E-1434E3105ACD.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/8B5905ED-D267-489B-95E2-FC976B2C045D.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/8B5905ED-D267-489B-95E2-FC976B2C045D.jpeg new file mode 100644 index 0000000..0a7fc8f Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/8B5905ED-D267-489B-95E2-FC976B2C045D.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/8ECDD01F-688F-4C97-9444-3491E5AE8D47.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/8ECDD01F-688F-4C97-9444-3491E5AE8D47.jpg new file mode 100644 index 0000000..2091347 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/8ECDD01F-688F-4C97-9444-3491E5AE8D47.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/8ade1c93-bcbc-48ac-8ab4-0e2c690325e6.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/8ade1c93-bcbc-48ac-8ab4-0e2c690325e6.jpeg new file mode 100644 index 0000000..9ff582d Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/8ade1c93-bcbc-48ac-8ab4-0e2c690325e6.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/9A2CBCB1-DB84-49D9-A3C1-79829B4F07C4.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/9A2CBCB1-DB84-49D9-A3C1-79829B4F07C4.jpg new file mode 100644 index 0000000..5badc10 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/9A2CBCB1-DB84-49D9-A3C1-79829B4F07C4.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/9B35DC81-FAB5-41CC-B6D8-6FF1C03AFDFF.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/9B35DC81-FAB5-41CC-B6D8-6FF1C03AFDFF.jpg new file mode 100644 index 0000000..2091347 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/9B35DC81-FAB5-41CC-B6D8-6FF1C03AFDFF.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/9FE2BE87-9772-4D0D-840C-760D263EB623.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/9FE2BE87-9772-4D0D-840C-760D263EB623.jpeg new file mode 100644 index 0000000..9ff582d Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/9FE2BE87-9772-4D0D-840C-760D263EB623.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/A8090E33-5FE2-4712-B22E-E4C3E2A61B5F.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/A8090E33-5FE2-4712-B22E-E4C3E2A61B5F.jpg new file mode 100644 index 0000000..6c065a0 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/A8090E33-5FE2-4712-B22E-E4C3E2A61B5F.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/B1413D0B-AFA9-4D3D-8C16-2D07E2283FF8.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/B1413D0B-AFA9-4D3D-8C16-2D07E2283FF8.jpg new file mode 100644 index 0000000..27d13e8 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/B1413D0B-AFA9-4D3D-8C16-2D07E2283FF8.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/B2143F1B-C025-4F23-B230-1E672E46E045.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/B2143F1B-C025-4F23-B230-1E672E46E045.jpg new file mode 100644 index 0000000..09d81cd Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/B2143F1B-C025-4F23-B230-1E672E46E045.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/BCEFA17F-8692-4768-BBD3-8F7CDF7290A7.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/BCEFA17F-8692-4768-BBD3-8F7CDF7290A7.jpg new file mode 100644 index 0000000..f1fd90e Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/BCEFA17F-8692-4768-BBD3-8F7CDF7290A7.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/BF5AA8E1-A0A0-4D79-AE59-06D3B03A7FC2.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/BF5AA8E1-A0A0-4D79-AE59-06D3B03A7FC2.jpg new file mode 100644 index 0000000..2091347 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/BF5AA8E1-A0A0-4D79-AE59-06D3B03A7FC2.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/C09AA4C2-326C-4638-B7B3-8E5BCDE9CF0D.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/C09AA4C2-326C-4638-B7B3-8E5BCDE9CF0D.jpeg new file mode 100644 index 0000000..9ff582d Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/C09AA4C2-326C-4638-B7B3-8E5BCDE9CF0D.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/EB9EC07B-68AB-4B84-9264-204496B4C545.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/EB9EC07B-68AB-4B84-9264-204496B4C545.jpg new file mode 100644 index 0000000..2091347 Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/EB9EC07B-68AB-4B84-9264-204496B4C545.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/bd8e8007-ef3f-4755-8888-a5c177a61836.jpeg b/MyShop/MyShop.WebUI/Content/ProductImages/bd8e8007-ef3f-4755-8888-a5c177a61836.jpeg new file mode 100644 index 0000000..0a7fc8f Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/bd8e8007-ef3f-4755-8888-a5c177a61836.jpeg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/logo.jpg b/MyShop/MyShop.WebUI/Content/ProductImages/logo.jpg new file mode 100644 index 0000000..2f3316c Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/logo.jpg differ diff --git a/MyShop/MyShop.WebUI/Content/ProductImages/no-image-image.png b/MyShop/MyShop.WebUI/Content/ProductImages/no-image-image.png new file mode 100644 index 0000000..5d6bc4e Binary files /dev/null and b/MyShop/MyShop.WebUI/Content/ProductImages/no-image-image.png differ diff --git a/MyShop/MyShop.WebUI/Controllers/HomeController.cs b/MyShop/MyShop.WebUI/Controllers/HomeController.cs index 5fffdca..78ce802 100644 --- a/MyShop/MyShop.WebUI/Controllers/HomeController.cs +++ b/MyShop/MyShop.WebUI/Controllers/HomeController.cs @@ -11,20 +11,22 @@ namespace MyShop.WebUI.Controllers { public class HomeController : Controller { + IRepository customers; IRepository context; IRepository productCategories; - public HomeController(IRepository productContext, IRepository productCategoryContext) + public HomeController(IRepository productContext, IRepository productCategoryContext, IRepository Customers) { context = productContext; productCategories = productCategoryContext; + customers = Customers; } public ActionResult Index(string Category=null) { List products; List categories = productCategories.Collection().ToList(); - + Customer customer = customers.Collection().FirstOrDefault(c => c.Email == User.Identity.Name); if (Category == null) { products = context.Collection().ToList(); @@ -36,7 +38,7 @@ public ActionResult Index(string Category=null) ProductListViewModel model = new ProductListViewModel(); model.Products = products; model.ProductCategories = categories; - + model.Customer = customer; return View(model); } diff --git a/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs b/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs index 16eb0f7..a55004e 100644 --- a/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs +++ b/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs @@ -9,7 +9,7 @@ namespace MyShop.WebUI.Controllers { - [Authorize(Roles = "Admin")] + public class ProductCategoryManagerController : Controller { IRepository context; diff --git a/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs b/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs index b3d1d80..95f5808 100644 --- a/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs +++ b/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs @@ -11,7 +11,7 @@ namespace MyShop.WebUI.Controllers { - [Authorize(Roles = "Admin")] + public class ProductManagerController : Controller { IRepository context; diff --git a/MyShop/MyShop.WebUI/Views/Basket/BasketSummary.cshtml b/MyShop/MyShop.WebUI/Views/Basket/BasketSummary.cshtml index 0e68496..6d2b627 100644 --- a/MyShop/MyShop.WebUI/Views/Basket/BasketSummary.cshtml +++ b/MyShop/MyShop.WebUI/Views/Basket/BasketSummary.cshtml @@ -1,6 +1,12 @@ @model MyShop.Core.ViewModels.BasketSummaryViewModel -
    -
  • @Model.BasketCount items
    • -
  • @String.Format("{0:c}", Model.BasketTotal)
    • + + + + +
      + @foreach (var cat in Model.ProductCategories) + { +
    • + @Html.ActionLink(cat.Category, "Index", new { Category = cat.Category }, new { @class = Request["Category"] == cat.Category ? "list-group-item active" : "list-group-item" }) +
      • + } +
    -

    Products

    + +
    +@if (@Model.Customer != null) +{ +

    Welcome @Model.Customer.FirstName;

    +} +else +{ +

    Welcome User

    +} -
    -

    Filter by Category

    -
    - @Html.ActionLink("All", "Index", null, new { @class = Request["Category"]==null? "list-group-item active" : "list-group-item" }) - @foreach (var cat in Model.ProductCategories) { - @Html.ActionLink(cat.Category, "Index", new { Category=cat.Category }, new { @class = Request["Category"] == cat.Category ? "list-group-item active" : "list-group-item" }) - } -
    -
    + +

    Shop By Categories

    + +
    @foreach (var item in Model.Products) { -
    -
    - +
    +
    +
    @Html.ActionLink(item.Name, "Details", new { id = item.Id }) diff --git a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml index f9ad8b0..3d3bf9f 100644 --- a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml @@ -6,9 +6,10 @@ @ViewBag.Title - My ASP.NET Application @Styles.Render("~/Content/css") @Scripts.Render("~/bundles/modernizr") - + +
    @@ -17,15 +18,29 @@ - @Html.ActionLink("Application name", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" }) + + logo + M'LIFE-STORE
    + Experience the Lifestyle +
    -
    +
      -
    • @Html.ActionLink("Home", "Index", "Home")
      • -@if (Request.IsAuthenticated && User.IsInRole("Admin")) -{ -
    • @Html.ActionLink("Admin", "Index", "Admin")
      • -} +
    • Home
      • + @if (Request.IsAuthenticated && User.IsInRole("Admin")) + { +
    • Admin
      • + } +
    • + + +
      + + +
      +       + +
    @Html.Partial("_LoginPartial") @{ @@ -34,7 +49,7 @@
    -
    +
    @RenderBody()