diff --git a/src/Example.Data/ExampleContextFactory.cs b/src/Example.Data/ExampleContextFactory.cs new file mode 100644 index 0000000..1d67e2a --- /dev/null +++ b/src/Example.Data/ExampleContextFactory.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Data.Entity; +using WaCore.Contracts.Data.Repositories.Base; +using Microsoft.Data.Entity; + +namespace Example.Data +{ + public class ExampleContextFactory : IDbContextFactory + { + public IDbContext GetContext() + { + var optionsBuilder = new DbContextOptionsBuilder(); + optionsBuilder.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=WaCoreExample;Trusted_Connection=True;"); + return new ExampleDbContext(optionsBuilder.Options); + } + } +} diff --git a/src/Example.Web/Startup.cs b/src/Example.Web/Startup.cs index e4f6dad..efdde86 100644 --- a/src/Example.Web/Startup.cs +++ b/src/Example.Web/Startup.cs @@ -12,7 +12,11 @@ using Microsoft.Dnx.Runtime; using Microsoft.Framework.Configuration; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; +using WaCore.Contracts.Data.Repositories; +using WaCore.Contracts.Data.Repositories.Base; using WaCore.Data; +using WaCore.Data.Repositories; using WaCore.Entities.Core; using WaCore.Web; @@ -59,6 +63,10 @@ public void ConfigureServices(IServiceCollection services) .AddEntityFrameworkStores() .AddDefaultTokenProviders(); + + services.TryAddScoped(); + services.TryAddScoped(); + } public IConfigurationRoot Configuration { get; set; } diff --git a/src/Example.Web/Views/Shared/_Layout.cshtml b/src/Example.Web/Views/Shared/_Layout.cshtml index 8311ba5..07a88f5 100644 --- a/src/Example.Web/Views/Shared/_Layout.cshtml +++ b/src/Example.Web/Views/Shared/_Layout.cshtml @@ -30,6 +30,7 @@
@await Html.PartialAsync("_LoginPartial")
@@ -46,6 +47,7 @@ + @@ -55,8 +57,9 @@ + diff --git a/src/Example.Web/bower.json b/src/Example.Web/bower.json index 82b3392..5d3976e 100644 --- a/src/Example.Web/bower.json +++ b/src/Example.Web/bower.json @@ -4,6 +4,7 @@ "dependencies": { "bootstrap": "3.0.0", "jquery": "2.1.4", - "jquery-validation": "1.11.1" + "jquery-validation": "1.11.1", + "jquery-ajax-unobtrusive": "*" } } diff --git a/src/Example.Web/project.json b/src/Example.Web/project.json index de30e8e..00e8840 100644 --- a/src/Example.Web/project.json +++ b/src/Example.Web/project.json @@ -10,6 +10,8 @@ "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", + "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta8", "EntityFramework.SqlServer": "7.0.0-beta8", "WaCore.Contracts": "1.0.0-*", "WaCore.Web": "1.0.0-*", diff --git a/src/Example.Web/wwwroot/js/site.js b/src/Example.Web/wwwroot/js/site.js index 5f28270..3cb8e88 100644 --- a/src/Example.Web/wwwroot/js/site.js +++ b/src/Example.Web/wwwroot/js/site.js @@ -1 +1,7 @@ - \ No newline at end of file +//function RefreshPageUrl(data, status, xhr, abc) { +// debugger; + +// if (history.pushState) { +// history.pushState(null, "selle", "/User/Index?SearchConfig.Search=a&__RequestVerificationToken=CfDJ8HYT9lfm8ARJjuHKk1f_KwnFvUMSAFDM-PlwcE7Ngf6GKj823-HYxcV_a23PRv9f1Ly2HriSMbbnTu638h4CqrQbh448RDUUyk97CFRSIs_zg6yU9xaUoqesOACBbbPtGDyAECu5tCl6HjRVv27xtY4&X-R"); +// } +//} \ No newline at end of file diff --git a/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/.bower.json b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/.bower.json new file mode 100644 index 0000000..6edc04c --- /dev/null +++ b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/.bower.json @@ -0,0 +1,42 @@ +{ + "name": "jquery-ajax-unobtrusive", + "version": "3.2.3", + "homepage": "https://github.com/aspnet/jquery-ajax-unobtrusive", + "description": "Add-on to jQuery Ajax to enable unobtrusive options in data-* attributes", + "main": [ + "jquery.unobtrusive-ajax.js" + ], + "ignore": [ + "**/.*", + "*.json", + "*.md", + "*.txt" + ], + "keywords": [ + "jquery", + "asp.net", + "mvc", + "ajax", + "unobtrusive" + ], + "authors": [ + "Microsoft" + ], + "license": "http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/jquery-ajax-unobtrusive.git" + }, + "dependencies": { + "jquery": ">=1.8" + }, + "_release": "3.2.3", + "_resolution": { + "type": "version", + "tag": "v3.2.3", + "commit": "ff31f3542e75b57ed354e6ddc79d134ab2e00b78" + }, + "_source": "git://github.com/aspnet/jquery-ajax-unobtrusive.git", + "_target": "*", + "_originalSource": "jquery-ajax-unobtrusive" +} \ No newline at end of file diff --git a/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/bower.json b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/bower.json new file mode 100644 index 0000000..0790f1f --- /dev/null +++ b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/bower.json @@ -0,0 +1,33 @@ +{ + "name": "jquery-ajax-unobtrusive", + "version": "3.2.3", + "homepage": "https://github.com/aspnet/jquery-ajax-unobtrusive", + "description": "Add-on to jQuery Ajax to enable unobtrusive options in data-* attributes", + "main": [ + "jquery.unobtrusive-ajax.js" + ], + "ignore": [ + "**/.*", + "*.json", + "*.md", + "*.txt" + ], + "keywords": [ + "jquery", + "asp.net", + "mvc", + "ajax", + "unobtrusive" + ], + "authors": [ + "Microsoft" + ], + "license": "http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/jquery-ajax-unobtrusive.git" + }, + "dependencies": { + "jquery": ">=1.8" + } +} diff --git a/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.js b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.js new file mode 100644 index 0000000..0fd3d83 --- /dev/null +++ b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.js @@ -0,0 +1,186 @@ +/* + * Microsoft grants you the right to use these script files for the sole + * purpose of either: (i) interacting through your browser with the Microsoft + * website or online service, subject to the applicable licensing or use + * terms; or (ii) using the files as included with a Microsoft product subject + * to that product's license terms. Microsoft reserves all other rights to the + * files not expressly granted by Microsoft, whether by implication, estoppel + * or otherwise. Insofar as a script file is dual licensed under GPL, + * Microsoft neither took the code under GPL nor distributes it thereunder but + * under the terms set out in this paragraph. All notices and licenses + * below are for informational purposes only. +/*! +** Unobtrusive Ajax support library for jQuery +** Copyright (C) Microsoft Corporation. All rights reserved. +*/ + +/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */ +/*global window: false, jQuery: false */ + +(function ($) { + var data_click = "unobtrusiveAjaxClick", + data_target = "unobtrusiveAjaxClickTarget", + data_validation = "unobtrusiveValidation"; + + function getFunction(code, argNames) { + var fn = window, parts = (code || "").split("."); + while (fn && parts.length) { + fn = fn[parts.shift()]; + } + if (typeof (fn) === "function") { + return fn; + } + argNames.push(code); + return Function.constructor.apply(null, argNames); + } + + function isMethodProxySafe(method) { + return method === "GET" || method === "POST"; + } + + function asyncOnBeforeSend(xhr, method) { + if (!isMethodProxySafe(method)) { + xhr.setRequestHeader("X-HTTP-Method-Override", method); + } + } + + function asyncOnSuccess(element, data, contentType) { + var mode; + + if (contentType.indexOf("application/x-javascript") !== -1) { // jQuery already executes JavaScript for us + return; + } + + mode = (element.getAttribute("data-ajax-mode") || "").toUpperCase(); + $(element.getAttribute("data-ajax-update")).each(function (i, update) { + var top; + + switch (mode) { + case "BEFORE": + top = update.firstChild; + $("
").html(data).contents().each(function () { + update.insertBefore(this, top); + }); + break; + case "AFTER": + $("
").html(data).contents().each(function () { + update.appendChild(this); + }); + break; + case "REPLACE-WITH": + $(update).replaceWith(data); + break; + default: + $(update).html(data); + break; + } + }); + } + + function asyncRequest(element, options) { + var confirm, loading, method, duration; + + confirm = element.getAttribute("data-ajax-confirm"); + if (confirm && !window.confirm(confirm)) { + return; + } + + loading = $(element.getAttribute("data-ajax-loading")); + duration = parseInt(element.getAttribute("data-ajax-loading-duration"), 10) || 0; + + $.extend(options, { + type: element.getAttribute("data-ajax-method") || undefined, + url: element.getAttribute("data-ajax-url") || undefined, + cache: !!element.getAttribute("data-ajax-cache"), + beforeSend: function (xhr) { + var result; + asyncOnBeforeSend(xhr, method); + result = getFunction(element.getAttribute("data-ajax-begin"), ["xhr"]).apply(element, arguments); + if (result !== false) { + loading.show(duration); + } + return result; + }, + complete: function () { + loading.hide(duration); + getFunction(element.getAttribute("data-ajax-complete"), ["xhr", "status"]).apply(element, arguments); + }, + success: function (data, status, xhr) { + asyncOnSuccess(element, data, xhr.getResponseHeader("Content-Type") || "text/html"); + getFunction(element.getAttribute("data-ajax-success"), ["data", "status", "xhr"]).apply(element, arguments); + }, + error: function () { + getFunction(element.getAttribute("data-ajax-failure"), ["xhr", "status", "error"]).apply(element, arguments); + } + }); + + options.data.push({ name: "X-Requested-With", value: "XMLHttpRequest" }); + + method = options.type.toUpperCase(); + if (!isMethodProxySafe(method)) { + options.type = "POST"; + options.data.push({ name: "X-HTTP-Method-Override", value: method }); + } + + $.ajax(options); + } + + function validate(form) { + var validationInfo = $(form).data(data_validation); + return !validationInfo || !validationInfo.validate || validationInfo.validate(); + } + + $(document).on("click", "a[data-ajax=true]", function (evt) { + evt.preventDefault(); + asyncRequest(this, { + url: this.href, + type: "GET", + data: [] + }); + }); + + $(document).on("click", "form[data-ajax=true] input[type=image]", function (evt) { + var name = evt.target.name, + target = $(evt.target), + form = $(target.parents("form")[0]), + offset = target.offset(); + + form.data(data_click, [ + { name: name + ".x", value: Math.round(evt.pageX - offset.left) }, + { name: name + ".y", value: Math.round(evt.pageY - offset.top) } + ]); + + setTimeout(function () { + form.removeData(data_click); + }, 0); + }); + + $(document).on("click", "form[data-ajax=true] :submit", function (evt) { + var name = evt.currentTarget.name, + target = $(evt.target), + form = $(target.parents("form")[0]); + + form.data(data_click, name ? [{ name: name, value: evt.currentTarget.value }] : []); + form.data(data_target, target); + + setTimeout(function () { + form.removeData(data_click); + form.removeData(data_target); + }, 0); + }); + + $(document).on("submit", "form[data-ajax=true]", function (evt) { + var clickInfo = $(this).data(data_click) || [], + clickTarget = $(this).data(data_target), + isCancel = clickTarget && clickTarget.hasClass("cancel"); + evt.preventDefault(); + if (!isCancel && !validate(this)) { + return; + } + asyncRequest(this, { + url: this.action, + type: this.method || "GET", + data: clickInfo.concat($(this).serializeArray()) + }); + }); +}(jQuery)); diff --git a/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js new file mode 100644 index 0000000..79c7057 --- /dev/null +++ b/src/Example.Web/wwwroot/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js @@ -0,0 +1,19 @@ +/* NUGET: BEGIN LICENSE TEXT + * + * Microsoft grants you the right to use these script files for the sole + * purpose of either: (i) interacting through your browser with the Microsoft + * website or online service, subject to the applicable licensing or use + * terms; or (ii) using the files as included with a Microsoft product subject + * to that product's license terms. Microsoft reserves all other rights to the + * files not expressly granted by Microsoft, whether by implication, estoppel + * or otherwise. Insofar as a script file is dual licensed under GPL, + * Microsoft neither took the code under GPL nor distributes it thereunder but + * under the terms set out in this paragraph. All notices and licenses + * below are for informational purposes only. + * + * NUGET: END LICENSE TEXT */ +/* +** Unobtrusive Ajax support library for jQuery +** Copyright (C) Microsoft Corporation. All rights reserved. +*/ +(function(a){var b="unobtrusiveAjaxClick",d="unobtrusiveAjaxClickTarget",h="unobtrusiveValidation";function c(d,b){var a=window,c=(d||"").split(".");while(a&&c.length)a=a[c.shift()];if(typeof a==="function")return a;b.push(d);return Function.constructor.apply(null,b)}function e(a){return a==="GET"||a==="POST"}function g(b,a){!e(a)&&b.setRequestHeader("X-HTTP-Method-Override",a)}function i(c,b,e){var d;if(e.indexOf("application/x-javascript")!==-1)return;d=(c.getAttribute("data-ajax-mode")||"").toUpperCase();a(c.getAttribute("data-ajax-update")).each(function(f,c){var e;switch(d){case"BEFORE":e=c.firstChild;a("
").html(b).contents().each(function(){c.insertBefore(this,e)});break;case"AFTER":a("
").html(b).contents().each(function(){c.appendChild(this)});break;case"REPLACE-WITH":a(c).replaceWith(b);break;default:a(c).html(b)}})}function f(b,d){var j,k,f,h;j=b.getAttribute("data-ajax-confirm");if(j&&!window.confirm(j))return;k=a(b.getAttribute("data-ajax-loading"));h=parseInt(b.getAttribute("data-ajax-loading-duration"),10)||0;a.extend(d,{type:b.getAttribute("data-ajax-method")||undefined,url:b.getAttribute("data-ajax-url")||undefined,cache:!!b.getAttribute("data-ajax-cache"),beforeSend:function(d){var a;g(d,f);a=c(b.getAttribute("data-ajax-begin"),["xhr"]).apply(b,arguments);a!==false&&k.show(h);return a},complete:function(){k.hide(h);c(b.getAttribute("data-ajax-complete"),["xhr","status"]).apply(b,arguments)},success:function(a,e,d){i(b,a,d.getResponseHeader("Content-Type")||"text/html");c(b.getAttribute("data-ajax-success"),["data","status","xhr"]).apply(b,arguments)},error:function(){c(b.getAttribute("data-ajax-failure"),["xhr","status","error"]).apply(b,arguments)}});d.data.push({name:"X-Requested-With",value:"XMLHttpRequest"});f=d.type.toUpperCase();if(!e(f)){d.type="POST";d.data.push({name:"X-HTTP-Method-Override",value:f})}a.ajax(d)}function j(c){var b=a(c).data(h);return!b||!b.validate||b.validate()}a(document).on("click","a[data-ajax=true]",function(a){a.preventDefault();f(this,{url:this.href,type:"GET",data:[]})});a(document).on("click","form[data-ajax=true] input[type=image]",function(c){var g=c.target.name,e=a(c.target),f=a(e.parents("form")[0]),d=e.offset();f.data(b,[{name:g+".x",value:Math.round(c.pageX-d.left)},{name:g+".y",value:Math.round(c.pageY-d.top)}]);setTimeout(function(){f.removeData(b)},0)});a(document).on("click","form[data-ajax=true] :submit",function(e){var g=e.currentTarget.name,f=a(e.target),c=a(f.parents("form")[0]);c.data(b,g?[{name:g,value:e.currentTarget.value}]:[]);c.data(d,f);setTimeout(function(){c.removeData(b);c.removeData(d)},0)});a(document).on("submit","form[data-ajax=true]",function(h){var e=a(this).data(b)||[],c=a(this).data(d),g=c&&c.hasClass("cancel");h.preventDefault();if(!g&&!j(this))return;f(this,{url:this.action,type:this.method||"GET",data:e.concat(a(this).serializeArray())})})})(jQuery); \ No newline at end of file