From 8c5901d35d5dfc85211be7dd4a4ea5a833b72fa3 Mon Sep 17 00:00:00 2001 From: skyline9002 Date: Sun, 28 Feb 2016 14:24:35 +1300 Subject: [PATCH 1/6] Integrate project to bstemplate --- Store.Web/App_Start/BundleConfig.cs | 2 +- Store.Web/Controllers/CVController.cs | 17 + .../ViewModelToDomainMappingProfile.cs | 2 + Store.Web/Store.Web.csproj | 64 + Store.Web/ViewModels/CategoryViewModel.cs | 1 - Store.Web/ViewModels/GadgetViewModel.cs | 1 - Store.Web/Views/CV/Index.cshtml | 769 ++ Store.Web/Views/Home/Index.cshtml | 3 + Store.Web/Views/Shared/_Layout.cshtml | 1 + Store.Web/Views/_ViewStart.cshtml | 3 + .../bootstrap/css/bootstrap-theme.css | 457 + .../bootstrap/css/bootstrap-theme.css.map | 1 + .../bootstrap/css/bootstrap-theme.min.css | 5 + .../bstemplate/bootstrap/css/bootstrap.css | 6358 ++++++++++ .../bootstrap/css/bootstrap.css.map | 1 + .../bootstrap/css/bootstrap.min.css | 5 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes .../bstemplate/bootstrap/js/bootstrap.js | 2276 ++++ .../bstemplate/bootstrap/js/bootstrap.min.js | 7 + Store.Web/bstemplate/bootstrap/js/npm.js | 13 + Store.Web/bstemplate/css/animate.css | 2809 +++++ Store.Web/bstemplate/css/font-awesome.css | 1566 +++ Store.Web/bstemplate/css/font-awesome.min.css | 4 + Store.Web/bstemplate/css/magnific-popup.css | 368 + Store.Web/bstemplate/css/owl.carousel.css | 71 + Store.Web/bstemplate/css/owl.theme.css | 79 + .../bstemplate/css/simpletextrotator.css | 106 + Store.Web/bstemplate/css/style.css | 763 ++ Store.Web/bstemplate/fonts/FontAwesome.otf | Bin 0 -> 75188 bytes .../bstemplate/fonts/fontawesome-webfont.eot | Bin 0 -> 72449 bytes .../bstemplate/fonts/fontawesome-webfont.svg | 504 + .../bstemplate/fonts/fontawesome-webfont.ttf | Bin 0 -> 141564 bytes .../bstemplate/fonts/fontawesome-webfont.woff | Bin 0 -> 83760 bytes Store.Web/bstemplate/images/488.GIF | Bin 0 -> 29305 bytes Store.Web/bstemplate/images/bg4.jpg | Bin 0 -> 378416 bytes Store.Web/bstemplate/images/grabbing.png | Bin 0 -> 116 bytes .../bstemplate/images/logo/client120-1.png | Bin 0 -> 218432 bytes .../bstemplate/images/logo/client120-2.png | Bin 0 -> 218144 bytes .../bstemplate/images/logo/client120-3.png | Bin 0 -> 218567 bytes .../bstemplate/images/logo/client160-1.png | Bin 0 -> 220085 bytes .../bstemplate/images/logo/client160-3.png | Bin 0 -> 220252 bytes .../bstemplate/images/logo/client240-1.png | Bin 0 -> 222016 bytes .../bstemplate/images/logo/client240-2.png | Bin 0 -> 220997 bytes .../bstemplate/images/logo/client240-3.png | Bin 0 -> 222805 bytes Store.Web/bstemplate/images/p1.jpg | Bin 0 -> 87201 bytes Store.Web/bstemplate/images/p2.jpg | Bin 0 -> 89770 bytes Store.Web/bstemplate/images/p3.jpg | Bin 0 -> 126450 bytes Store.Web/bstemplate/images/p5.jpg | Bin 0 -> 133344 bytes Store.Web/bstemplate/images/p6.jpg | Bin 0 -> 91199 bytes Store.Web/bstemplate/images/p8.jpg | Bin 0 -> 189611 bytes Store.Web/bstemplate/images/photo.jpg | Bin 0 -> 83497 bytes Store.Web/bstemplate/js/custom.js | 204 + Store.Web/bstemplate/js/jquery-1.11.0.js | 10337 ++++++++++++++++ Store.Web/bstemplate/js/jquery-1.11.0.min.js | 4 + Store.Web/bstemplate/js/jquery.backstretch.js | 377 + .../bstemplate/js/jquery.backstretch.min.js | 4 + Store.Web/bstemplate/js/jquery.countTo.js | 80 + Store.Web/bstemplate/js/jquery.fitvids.js | 83 + .../bstemplate/js/jquery.magnific-popup.js | 2049 +++ .../js/jquery.magnific-popup.min.js | 4 + .../js/jquery.simple-text-rotator.js | 168 + .../js/jquery.simple-text-rotator.min.js | 1 + Store.Web/bstemplate/js/jquery.waypoints.js | 525 + Store.Web/bstemplate/js/owl.carousel.js | 1512 +++ Store.Web/bstemplate/js/owl.carousel.min.js | 47 + Store.Web/bstemplate/js/smoothscroll.js | 304 + Store.Web/bstemplate/js/wow.js | 306 + Store.Web/bstemplate/js/wow.min.js | 2 + 71 files changed, 32489 insertions(+), 3 deletions(-) create mode 100644 Store.Web/Controllers/CVController.cs create mode 100644 Store.Web/Views/CV/Index.cshtml create mode 100644 Store.Web/Views/_ViewStart.cshtml create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap-theme.css create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap-theme.css.map create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap-theme.min.css create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap.css create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap.css.map create mode 100644 Store.Web/bstemplate/bootstrap/css/bootstrap.min.css create mode 100644 Store.Web/bstemplate/bootstrap/fonts/glyphicons-halflings-regular.eot create mode 100644 Store.Web/bstemplate/bootstrap/fonts/glyphicons-halflings-regular.svg create mode 100644 Store.Web/bstemplate/bootstrap/fonts/glyphicons-halflings-regular.ttf create mode 100644 Store.Web/bstemplate/bootstrap/fonts/glyphicons-halflings-regular.woff create mode 100644 Store.Web/bstemplate/bootstrap/js/bootstrap.js create mode 100644 Store.Web/bstemplate/bootstrap/js/bootstrap.min.js create mode 100644 Store.Web/bstemplate/bootstrap/js/npm.js create mode 100644 Store.Web/bstemplate/css/animate.css create mode 100644 Store.Web/bstemplate/css/font-awesome.css create mode 100644 Store.Web/bstemplate/css/font-awesome.min.css create mode 100644 Store.Web/bstemplate/css/magnific-popup.css create mode 100644 Store.Web/bstemplate/css/owl.carousel.css create mode 100644 Store.Web/bstemplate/css/owl.theme.css create mode 100644 Store.Web/bstemplate/css/simpletextrotator.css create mode 100644 Store.Web/bstemplate/css/style.css create mode 100644 Store.Web/bstemplate/fonts/FontAwesome.otf create mode 100644 Store.Web/bstemplate/fonts/fontawesome-webfont.eot create mode 100644 Store.Web/bstemplate/fonts/fontawesome-webfont.svg create mode 100644 Store.Web/bstemplate/fonts/fontawesome-webfont.ttf create mode 100644 Store.Web/bstemplate/fonts/fontawesome-webfont.woff create mode 100644 Store.Web/bstemplate/images/488.GIF create mode 100644 Store.Web/bstemplate/images/bg4.jpg create mode 100644 Store.Web/bstemplate/images/grabbing.png create mode 100644 Store.Web/bstemplate/images/logo/client120-1.png create mode 100644 Store.Web/bstemplate/images/logo/client120-2.png create mode 100644 Store.Web/bstemplate/images/logo/client120-3.png create mode 100644 Store.Web/bstemplate/images/logo/client160-1.png create mode 100644 Store.Web/bstemplate/images/logo/client160-3.png create mode 100644 Store.Web/bstemplate/images/logo/client240-1.png create mode 100644 Store.Web/bstemplate/images/logo/client240-2.png create mode 100644 Store.Web/bstemplate/images/logo/client240-3.png create mode 100644 Store.Web/bstemplate/images/p1.jpg create mode 100644 Store.Web/bstemplate/images/p2.jpg create mode 100644 Store.Web/bstemplate/images/p3.jpg create mode 100644 Store.Web/bstemplate/images/p5.jpg create mode 100644 Store.Web/bstemplate/images/p6.jpg create mode 100644 Store.Web/bstemplate/images/p8.jpg create mode 100644 Store.Web/bstemplate/images/photo.jpg create mode 100644 Store.Web/bstemplate/js/custom.js create mode 100644 Store.Web/bstemplate/js/jquery-1.11.0.js create mode 100644 Store.Web/bstemplate/js/jquery-1.11.0.min.js create mode 100644 Store.Web/bstemplate/js/jquery.backstretch.js create mode 100644 Store.Web/bstemplate/js/jquery.backstretch.min.js create mode 100644 Store.Web/bstemplate/js/jquery.countTo.js create mode 100644 Store.Web/bstemplate/js/jquery.fitvids.js create mode 100644 Store.Web/bstemplate/js/jquery.magnific-popup.js create mode 100644 Store.Web/bstemplate/js/jquery.magnific-popup.min.js create mode 100644 Store.Web/bstemplate/js/jquery.simple-text-rotator.js create mode 100644 Store.Web/bstemplate/js/jquery.simple-text-rotator.min.js create mode 100644 Store.Web/bstemplate/js/jquery.waypoints.js create mode 100644 Store.Web/bstemplate/js/owl.carousel.js create mode 100644 Store.Web/bstemplate/js/owl.carousel.min.js create mode 100644 Store.Web/bstemplate/js/smoothscroll.js create mode 100644 Store.Web/bstemplate/js/wow.js create mode 100644 Store.Web/bstemplate/js/wow.min.js diff --git a/Store.Web/App_Start/BundleConfig.cs b/Store.Web/App_Start/BundleConfig.cs index 804e741..cabf7f5 100644 --- a/Store.Web/App_Start/BundleConfig.cs +++ b/Store.Web/App_Start/BundleConfig.cs @@ -12,7 +12,7 @@ public static void RegisterBundles(BundleCollection bundles) { bundles.Add(new ScriptBundle("~/bootstrap/js").Include("~/js/bootstrap.js", "~/js/site.js")); bundles.Add(new StyleBundle("~/bootstrap/css").Include("~/css/bootstrap.css", "~/css/site.css")); - + BundleTable.EnableOptimizations = true; } } diff --git a/Store.Web/Controllers/CVController.cs b/Store.Web/Controllers/CVController.cs new file mode 100644 index 0000000..5195559 --- /dev/null +++ b/Store.Web/Controllers/CVController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace Store.Web.Controllers +{ + public class CVController : Controller + { + // GET: CV + public ActionResult Index() + { + return View(); + } + } +} \ No newline at end of file diff --git a/Store.Web/Mappings/ViewModelToDomainMappingProfile.cs b/Store.Web/Mappings/ViewModelToDomainMappingProfile.cs index 52ed942..078ca06 100644 --- a/Store.Web/Mappings/ViewModelToDomainMappingProfile.cs +++ b/Store.Web/Mappings/ViewModelToDomainMappingProfile.cs @@ -23,6 +23,8 @@ protected override void Configure() .ForMember(g => g.Price, map => map.MapFrom(vm => vm.GadgetPrice)) .ForMember(g => g.Image, map => map.MapFrom(vm => vm.File.FileName)) .ForMember(g => g.CategoryID, map => map.MapFrom(vm => vm.GadgetCategory)); + + } } } \ No newline at end of file diff --git a/Store.Web/Store.Web.csproj b/Store.Web/Store.Web.csproj index 39fa28a..a136cd8 100644 --- a/Store.Web/Store.Web.csproj +++ b/Store.Web/Store.Web.csproj @@ -115,6 +115,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -142,6 +194,7 @@ + Global.asax @@ -165,6 +218,17 @@ + + + + + + + + + + + Web.config diff --git a/Store.Web/ViewModels/CategoryViewModel.cs b/Store.Web/ViewModels/CategoryViewModel.cs index 59b5b87..b1b113f 100644 --- a/Store.Web/ViewModels/CategoryViewModel.cs +++ b/Store.Web/ViewModels/CategoryViewModel.cs @@ -10,7 +10,6 @@ public class CategoryViewModel { public int CategoryID { get; set; } public string Name { get; set; } - public List Gadgets { get; set; } } } \ No newline at end of file diff --git a/Store.Web/ViewModels/GadgetViewModel.cs b/Store.Web/ViewModels/GadgetViewModel.cs index 475ae44..243851a 100644 --- a/Store.Web/ViewModels/GadgetViewModel.cs +++ b/Store.Web/ViewModels/GadgetViewModel.cs @@ -12,7 +12,6 @@ public class GadgetViewModel public string Description { get; set; } public decimal Price { get; set; } public string Image { get; set; } - public int CategoryID { get; set; } } } \ No newline at end of file diff --git a/Store.Web/Views/CV/Index.cshtml b/Store.Web/Views/CV/Index.cshtml new file mode 100644 index 0000000..575f3cf --- /dev/null +++ b/Store.Web/Views/CV/Index.cshtml @@ -0,0 +1,769 @@ +@{ + ViewBag.Title = "Index"; + Layout = null; +} + + + + + + + + + + MStone - Resume Portfolio + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+

Mark Stone

+
+
+ + + + + + + + +
+ +
+ +
+ +
+ +
+

Hello, I'm Mark Stone

+

Visual Designer. | Front-end Developer. | C# Programmer.

+
+ + +
+
+
+
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+ +
+ +
+
+ +
(1234) 1234-5678-1011
+
+
+ +
+
+ +
144 Some Street, Some City, Some Country
+
+
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+

Mark Stone

+

Visual Designer. Front-end Developer. C# Programmer.

+
+ + + +
+ +
+

Skillset

+ +
UX Design
+
+
+
+
+
+
+ +
HTML / CSS3 / SASS
+
+
+
+
+
+
+ +
Javascript
+
+
+
+
+
+
+ +
Ajax
+
+
+
+
+
+
+
+ +
+

Social Profiles

+
    +
  • +
  • +
  • +
  • +
+
+ +
+ +
+

Profesional Profile

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend. I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend. I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend. I am so happy, my dear friend.

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ + + +
+
+
+

+
+

Cup of coffee

+
+
+ +
+
+
+

+
+

Line of code

+
+
+ +
+
+
+

+

+
+

Happy customers

+
+
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+

What i can do

+

My Services.

+
+ +
+ +
+ +
+
+
+ +
+

Text rotator

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+
+
+ +
+

Slideshow

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+
+
+ +
+

Easy configure

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+ +
+ +
+
+
+ +
+

Clear code

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+
+
+ +
+

Responsive design

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+
+
+ +
+

Support

+
+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+
+
+
+ +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ + + +
+

I'm currently available for freelance work.

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ Contact me +
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+

Resume

+

My education and experience.

+
+ +
+ +
+ +
+

Education

+
+ +
+

Computer science

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ +
+ +
+

Stanford University

+ 2013 - 2014 +
+
+ +
+

Visual designer

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ +
+ +
+

St. Patrick University

+ 2013 - 2014 +
+
+ +
+ +
+ +
+

Experience

+
+ +
+

Front-end developer / php programmer

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ +
+ +
+

Google

+ 2013 - 2014 +
+
+ +
+

C# programmer

+

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ +
+ +
+

Microsoft

+ 2013 - 2014 +
+
+ +
+ +
+ + + +
+ +
+ +
+ + + + +
+ +
+ +
+ + + +
+ + + +
+ +
+ +
+ +
+ + + + +
+ + + +
+ + + + +
+ +
+ +
+ +
+

Contact Us

+

Drop us a line or give us a ring. We love to hear you.

+
+ +
+ +

I am alone, and feel the charm of existence in this spot, which was created for the bliss of souls like mine. I am so happy, my dear friend.

+ + + +
+ +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+

+ © 2014 Mark Stone, All Rights Reserved. +

+
+ +
+ +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Store.Web/Views/Home/Index.cshtml b/Store.Web/Views/Home/Index.cshtml index 4f9b585..06f7dbb 100644 --- a/Store.Web/Views/Home/Index.cshtml +++ b/Store.Web/Views/Home/Index.cshtml @@ -17,6 +17,8 @@
@*@Html.DisplayFor(modelItem => item.Name)*@ @Html.ActionLink("View all " + item.Name, "Index", new { category = item.Name }, new { @class = "pull-right" }) + + @using (Html.BeginForm("Filter", "Home", new { category = item.Name }, FormMethod.Post, new { @class = "navbar-form" })) { @Html.TextBox("gadgetName", null, new { @class = "form-control", placeholder = "Search in " + item.Name }) @@ -27,6 +29,7 @@ @foreach (var gadget in item.Gadgets) { @Html.Partial("Gadget", gadget) + }