From 2085ebae621f625566e6b7a046d24b97a275f649 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 22 Apr 2020 09:26:49 +0800 Subject: [PATCH] update Former-commit-id: 22aca066961a9331ab5e6784d7615ba9dcf57a31 --- labs/react/dist/index.html | 37 +---- labs/react/dist/site.css | 2 +- labs/react/dist/site.js | 28 ++++ labs/react/dist/test.html | 8 +- labs/react/dist/test.js | 2 +- .../react.njsprojAssemblyReference.cache | Bin 424 -> 1515 bytes labs/react/react.njsproj | 3 + .../Areas/Admin/Views/Shared/_Layout.cshtml | 2 +- projects/Infrastructure/Infrastructure.csproj | 2 +- .../Views/Account/_Layout.cshtml | 2 +- .../Infrastructure/Views/Shared/Error.cshtml | 4 +- .../Views/Shared/Redirect.cshtml | 2 +- .../Views/Shared/_Footer.cshtml | 3 +- .../Views/Shared/_Layout.cshtml | 2 +- projects/Infrastructure/Web/BaseStartup.cs | 2 +- projects/Infrastructure/libman.json | 11 +- .../wwwroot/lib/senna/globals/senna-min.js | 10 ++ .../wwwroot/lib/senna/senna.css | 66 +++++++++ .../IoTCenter/Views/Shared/_Layout.cshtml | 2 +- .../JobServer/Pages/Shared/_Layout.cshtml | 4 +- .../Views/Account/JsonpLogin.cshtml | 2 +- .../Views/Account/JsonpLogout.cshtml | 2 +- projects/lib/package-lock.json | 131 ++++++++++++++++++ projects/lib/package.json | 3 +- 24 files changed, 278 insertions(+), 52 deletions(-) create mode 100644 labs/react/dist/site.js create mode 100644 projects/Infrastructure/wwwroot/lib/senna/globals/senna-min.js create mode 100644 projects/Infrastructure/wwwroot/lib/senna/senna.css diff --git a/labs/react/dist/index.html b/labs/react/dist/index.html index ec93d9f9..de5ca04f 100644 --- a/labs/react/dist/index.html +++ b/labs/react/dist/index.html @@ -2,42 +2,17 @@ - QianKun Example - - + Home - -
+
+

Home

out test 404
- + + + \ No newline at end of file diff --git a/labs/react/dist/site.css b/labs/react/dist/site.css index a80f8450..d1b4dcc9 100644 --- a/labs/react/dist/site.css +++ b/labs/react/dist/site.css @@ -1,3 +1,3 @@ #container{ - background-color:green; + color:green; } \ No newline at end of file diff --git a/labs/react/dist/site.js b/labs/react/dist/site.js new file mode 100644 index 00000000..abad92b1 --- /dev/null +++ b/labs/react/dist/site.js @@ -0,0 +1,28 @@ +//https://sennajs.com/docs + +document.addEventListener('DOMContentLoaded', function () { + var app = senna.dataAttributeHandler.getApp(); + + app.on('beforeNavigate', function (event) { + console.log('start'); + }); + + app.on('endNavigate', function (event) { + console.log('end'); + if (event.error) { + console.log('error'); + if (event.error.invalidStatus) { + console.log(event.error.invalidStatus); + } + + if (event.error.requestError) { + console.log(event.error.requestError); + } + + if (event.error.timeout) { + console.log(event.error.timeout); + } + } + }); +}); + diff --git a/labs/react/dist/test.html b/labs/react/dist/test.html index 505ef862..c96c7470 100644 --- a/labs/react/dist/test.html +++ b/labs/react/dist/test.html @@ -3,7 +3,7 @@ - QianKun Example + Test - +
+

Test

goto home
- + + \ No newline at end of file diff --git a/labs/react/dist/test.js b/labs/react/dist/test.js index 9660912d..ebb675b3 100644 --- a/labs/react/dist/test.js +++ b/labs/react/dist/test.js @@ -1,2 +1,2 @@ -console.log(1); +alert(window.location.href); var test = 'test'; \ No newline at end of file diff --git a/labs/react/obj/Debug/react.njsprojAssemblyReference.cache b/labs/react/obj/Debug/react.njsprojAssemblyReference.cache index a7bdf91612271316a725622f87c408ecc8c7d9e7..d97e4fa65ea9966ca0ccc027098c8ab74953f4e1 100644 GIT binary patch literal 1515 zcmbtUOK;Oa5VjpZlR^szBqWf^fm0(pQ5yOX5elJID`*O&YA+Gd#@-}L{L-!+NF@YU z{tI`00{?(BcR0W=fEhP0DnJER@_0R-o%!aQnU!QolD@;jH?AcG#IpnD@<>Fz#J-<0 z-?NX17z(=)aavqGrd+Tntd*;F*)G|o;%X!Hla$k1NYjK9zqtB1?fT4pNXJLfkcPEx zsnVf9OgQBx`fagOs)ADJ$HY&mkffZXX$AAz z1jixwSV;WYnJ-T^?_qFD1(9tu{K9Z5s(y10vn+I2KLm0cL{LeVSMVU}bpu4LvE4q| zZ$3CYX|?B^HFu8MyPO2{MZ|~g(K=M3QmT}<+B23owLRZo!T1@ICTuhmYjZD))m>nI zZFkB#0>}lCr@}K-NT_-=7P`Qy2#qHr%9UOS2`Y*#S!VIP=hgt|^z6D2H0b){Cg9z9 zna~g$2umiTxcTbC=iBc-ni)z96#2ZK$Jab7Nkjc#xxWerv;h(IrW!(6B_8JDVUh#H zTF)naVYqQhxH~|b#=hb*12%)Y-?zXdD{5l8kw?2w6JtonF=1RIqLpxii56y($CGhd z2PYN_f;4MHlhc62G4&+bFt7`xTuugZBuSAK${3?! zx*hMG!HYOc2EpBno|;5DONe!u&yuk$XS~aL0bmtoo;bCZKw(`%aTx@n&Yst>QNO`0 z@o!+!hcUt->U1PieFM(Eg0uh2;U}LMLB9fG2Rn1yah%4sGZ`9Z-jpyj&TMF$d3!kv z9N^I8b?lzzf_8rG;iO&c*4x-1RkwPlyj5AJrOhqym|sSMSKz_E&lcVcxR#N1oKEHa xY5Vy4`lq)lmf&2&ptasPAkQNXF9vsp-pOXz>O7?*hGPX5k_l_-7{759egHtuv# Code + + Code + Code diff --git a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml index 10fa7f3e..3c0e000a 100644 --- a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml +++ b/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml @@ -11,7 +11,7 @@ @name @HtmlTitle @RenderSection("styles", required: false) - +