Merge branch 'dev-search-removal' into feature/sigmax-graph-explorer

.gitignore

@@ -8,11 +8,15 @@
 /.purs*
 /.psa*
 /.spago
-
+bundle.js
+# webpack splays purescript modules in dist. we don't want these to be
+# added, but we do want static assets to be added
 /dist/*
 !/dist/styles/
+/dist/styles/*map
 !/dist/examples/
 !/dist/fonts/
 !/dist/images/
 !/dist/js/
+# css source maps
 /dist/styles/*map

README.md

@@ -37,8 +37,25 @@ curl -sL https://deb.nodesource.com/setup_11.x | sudo bash -
 sudo apt update && sudo apt install nodejs
 ```
 
-On Mac OS (with Homebrew):
+(For Ubuntu)
+```shell
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt update && sudo apt install yarn
+```
+
+To upgrade to latest version (and not current stable) version, you can use
+(Use n module from npm in order to upgrade node)
+
+```shell
+sudo npm cache clean -f
+sudo npm install -g n
+sudo n stable
+sudo n latest
+```
+
 
+### OSX
 ```shell
 brew install node
 ```
@@ -88,7 +105,43 @@ Or run a repl:
 yarn repl
 ```
 
-To test in the browser, you need to build a browser bundle:
+```shell
+yarn install && yarn ps-deps
+```
+
+### Running a dev server
+
+```shell
+yarn dev
+```
+
+This will launch a hot-reloading development server with
+webpack-dev-server.  Visit [localhost:9000](http://localhost:9000/) to
+see the result when the output shows a line like this:
+
+```
+ℹ ｢wdm｣: Compiled successfully.
+```
+
+#### Purescript IDE integration
+
+A `purs ide` connection will be available on port 9002 while the
+development server is running.
+
+A guide to getting set up with the IDE integration is beyond the scope
+of this document.
+
+#### Source maps
+
+Currently broken. Someone please fix them.
+
+### Getting a purescript repl
+
+```shell
+yarn repl
+```
+
+### Building for production
 
 ```shell
 yarn build
@@ -108,6 +161,24 @@ Examples:
 <!-- yarn live -->
 <!-- ``` -->
 
+Note that a production build takes a little while.
+
+### How do I?
+
+#### Change which backend to connect to?
+
+Edit `Config.purs`. Find the function `endConfig'` just after the
+imports and edit `back`. The definitions are not far below, just after
+the definitions of the various `front` options.
+
+Example (using `demo.gargantext.org` as backend):
+
+```
+endConfig' :: ApiVersion -> EndConfig
+endConfig' v = { front : frontRelative
+               , back  : backDemo v  }
+```
+
 ## Note to the contributors
 
 Please follow CONTRIBUTING.md

bower.json

-{
-  "name": "purescript-gargantext",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "output"
-  ],
-  "dependencies": {
-    "purescript-console": "^4.1.0",
-    "purescript-thermite": "https://github.com/np/purescript-thermite.git#cf194360c8ee440978a2b342382fc3fddc65b39e",
-    "purescript-affjax": "^7.0.0",
-    "purescript-routing": "^8.0.0",
-    "purescript-argonaut": "^4.0.1",
-    "purescript-random": "^4.0.0",
-    "purescript-css": "^4.0.0"
-  },
-  "devDependencies": {
-    "purescript-psci-support": "^4.0.0"
-  },
-  "resolutions": {
-    "purescript-react": "exports",
-    "purescript-profunctor-lenses": "^4.0.0"
-  }
-}

build

-#!/bin/bash
-
-yarn install && yarn rebuild-set && yarn install-ps && yarn pulp --psc-package build && yarn pulp --psc-package browserify --to dist/bundle.js

dist/index.html

@@ -4,13 +4,12 @@
         <meta charset="utf-8"/>
         <title>CNRS GarganText</title>
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <link href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" rel="stylesheet">
+        <link href="https://use.fontawesome.com/releases/v5.0.8/styles/all.css" rel="stylesheet">
         <link href="styles/login.min.css" rel="stylesheet">
         <link href="styles/bootstrap.min.css" rel="stylesheet">
-        <!-- <link href="css/lavish-bootstrap.css" rel="stylesheet"> -->
-        <link rel="stylesheet" type="text/css" href="styles/menu.css"/>
+        <!-- <link href="styles/lavish-bootstrap.css" rel="stylesheet"> -->
         <link rel="stylesheet" type="text/css" href="styles/context-menu.css"/>
-        <link rel="stylesheet" type="text/css" href="styles/annotation.css"/>
+        <link rel="stylesheet" type="text/css" href="styles/menu.css"/>
         <link href="styles/Login.css" rel="stylesheet">
         <style>
          * {margin: 0; padding: 0; list-style: none;}

dist/index.js

+// This file is just a wrapper so that webpack will call our main function
+require('./Main.purs').main();

dist/phyloscape/index.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+	<!-- lib CSS -->
+	<link rel="stylesheet" type="text/css" href="./lib/css/qlobbe.css">
+
+	<!-- lib JS -->
+	<script type="text/javascript" src="./lib/js/jquery-3.4.1.min.js"></script>
+	<script type="text/javascript" src="./lib/js/bootstrap.min.js"></script>
+	<script type="text/javascript" src="./lib/js/d3.min.js"></script>
+
+	<title>Mèmiescape</title>
+
+</head>
+<body>
+	<div id="main">
+		<div id="viz"></div>
+	</div>
+
+	<script type="text/javascript">
+
+		/*
+		 * Draw functions
+		 */		
+
+		function draw(phyloData) {
+
+			// set up margin 
+
+			var margin = {t:0, r:30, b:15, l:0};
+			var w = document.getElementById("viz").offsetWidth - margin.l - margin.r,
+				h = $(window).height() - margin.t - margin.b;
+
+			// draw svg view			
+
+			var svg = d3.select("#viz").append("svg")
+				.attr("width",w)
+				.attr("height",h);			
+
+			var g = svg.append("g").attr("id","svg-view");
+
+			// draw phylomemy from an url
+
+			d3.xml(phyloData).then(data => {
+				var newNodes = document.importNode(data.documentElement,true);
+				svg.attr("viewBox", newNodes.getAttribute("viewBox"));
+				g.each(function(){
+					this.appendChild(newNodes);
+				})
+				svg.call(zoom)
+
+				d3.select("#viz")
+					.append('button')
+					.attr("type","button")
+					.attr("id","btn_reset")
+					.attr("class","btn btn-light")
+					.text("reset");	
+
+				d3.select("#btn_reset").on("click", reset);								
+			})				
+
+			// set up d3 zoom
+
+			var transform = d3.zoomIdentity;
+
+			zoom = d3.zoom()
+				.scaleExtent([1, 50])
+				.on("zoom", zoomed);
+
+			function zoomed() {
+				g.attr("transform", d3.event.transform);
+			}
+
+			function reset() {
+				svg.transition().call(zoom.transform, d3.zoomIdentity);
+			}
+
+		}
+
+		/*
+		 * Control functions
+		 */
+
+		window.onload = function() {
+			clean()
+      var url = window.location.href;
+      // console.log(url);
+			readUrl(url)
+
+		};
+
+
+		/* Get a Phylo file from an URL */
+		function readUrl(url) {
+
+			var node = url.match(/nodeId=(.*)/);
+			if (node != null) {
+				fetch("http://localhost:8008" + "/api/v1.0/node/" + node[1] + "/phylo")
+				//fetch("https://dev.gargantext.org" + "/api/v1.0/node/" + node[1] + "/phylo")
+				//fetch(window.location.origin + "/api/v1.0/node/" + node[1] + "/phylo")
+				  .then(res => res.blob()) 
+				  .then(blob => {
+
+					var reader = new FileReader();
+					reader.onload = (function(phyloFile) {
+						return function(e) {
+								draw(e.target.result)
+						};
+					})(blob);
+					reader.readAsDataURL(blob);
+				});	
+			} else {
+				try {
+				    throw new Error("Unable to find a nodeId");
+				} catch (e) {
+				    console.log(e.name + ": " + e.message);
+				}				
+			}
+		}
+
+		/* Clean the view each time you load a new phylomemy */
+		function clean() {
+			d3.select("svg").remove();
+			d3.select("#btn_reset").remove();
+		}
+	
+	</script>
+</body>
+</html>

dist/phyloscape/lib/css/qlobbe.css

+html,body {
+  height: 100%;
+}
+
+hr {
+	border-color: #555555;
+}
+
+.alert-label {
+	margin-bottom: 0px;
+}
+
+.custom-file-label {
+	overflow: hidden;
+	border-color: rgb(101, 101, 127);
+}
+
+.drop-down-menu, .drop-down-menu:hover, .drop-down-menu:active, .drop-down-menu:focus  {
+	color: #0d1824;
+	outline: 0;
+}
+
+.rotate {
+    -moz-transition: all .15s linear;
+    -webkit-transition: all .15s linear;
+    transition: all .15s linear;
+}
+.rotate.down {
+    -moz-transform:rotate(90deg);
+    -webkit-transform:rotate(90deg);
+    transform:rotate(90deg);
+}
+
+.title {
+	color: #0d1824;
+	font-family: 'Montserrat', sans-serif;
+	text-rendering: optimizeLegibility; 
+	font-weight: 600;
+	font-style: normal;
+}
+
+#btn_draw {
+	background-color: #63c4e2;
+	border-color: rgb(101, 101, 127);
+}
+
+#btn_reset {
+	position: absolute;
+	left: 15px;
+	top: 15px;
+	border-color: #555555;
+}
+
+#layer-radio {
+	display: none;
+	list-style-type: none;
+	padding-left: 5px;
+	padding-top: 10px;
+}
+
+#left_view {
+	padding-top: 15px;
+	background-color: rgb(240, 240, 243);
+	border-right: 1px solid #555555;
+	color: #0d1824;
+	font-family: 'Open Sans', sans-serif;
+	text-rendering: optimizeLegibility; 
+}
+
+#options {
+	display: none;
+}
+
+#processing {
+	color: #0d1824;
+	background-color: rgb(240, 240, 243);
+	border-color: rgb(101, 101, 127);
+	display: none;
+}
+
+#right_view {
+	padding-top: 15px;
+	background-color: #FFF;
+	position: relative;	
+}
+

dist/phyloscape/lib/js/bootstrap.min.js

+/*!
+  * Bootstrap v4.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+  */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery"),require("popper.js")):"function"==typeof define&&define.amd?define(["exports","jquery","popper.js"],e):e(t.bootstrap={},t.jQuery,t.Popper)}(this,function(t,e,h){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}function s(t,e,n){return e&&i(t.prototype,e),n&&i(t,n),t}function l(r){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},e=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(o).filter(function(t){return Object.getOwnPropertyDescriptor(o,t).enumerable}))),e.forEach(function(t){var e,n,i;e=r,i=o[n=t],n in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i})}return r}e=e&&e.hasOwnProperty("default")?e.default:e,h=h&&h.hasOwnProperty("default")?h.default:h;var r,n,o,a,c,u,f,d,g,_,m,p,v,y,E,C,T,b,S,I,A,D,w,N,O,k,P,j,H,L,R,x,W,U,q,F,K,M,Q,B,V,Y,z,J,Z,G,$,X,tt,et,nt,it,rt,ot,st,at,lt,ct,ht,ut,ft,dt,gt,_t,mt,pt,vt,yt,Et,Ct,Tt,bt,St,It,At,Dt,wt,Nt,Ot,kt,Pt,jt,Ht,Lt,Rt,xt,Wt,Ut,qt,Ft,Kt,Mt,Qt,Bt,Vt,Yt,zt,Jt,Zt,Gt,$t,Xt,te,ee,ne,ie,re,oe,se,ae,le,ce,he,ue,fe,de,ge,_e,me,pe,ve,ye,Ee,Ce,Te,be,Se,Ie,Ae,De,we,Ne,Oe,ke,Pe,je,He,Le,Re,xe,We,Ue,qe,Fe,Ke,Me,Qe,Be,Ve,Ye,ze,Je,Ze,Ge,$e,Xe,tn,en,nn,rn,on,sn,an,ln,cn,hn,un,fn,dn,gn,_n,mn,pn,vn,yn,En,Cn,Tn,bn,Sn,In,An,Dn,wn,Nn,On,kn,Pn,jn,Hn,Ln,Rn,xn,Wn,Un,qn,Fn=function(i){var e="transitionend";function t(t){var e=this,n=!1;return i(this).one(l.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||l.triggerTransitionEnd(e)},t),this}var l={TRANSITION_END:"bsTransitionEnd",getUID:function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");e&&"#"!==e||(e=t.getAttribute("href")||"");try{return document.querySelector(e)?e:null}catch(t){return null}},getTransitionDurationFromElement:function(t){if(!t)return 0;var e=i(t).css("transition-duration");return parseFloat(e)?(e=e.split(",")[0],1e3*parseFloat(e)):0},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(t){i(t).trigger(e)},supportsTransitionEnd:function(){return Boolean(e)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var r=n[i],o=e[i],s=o&&l.isElement(o)?"element":(a=o,{}.toString.call(a).match(/\s([a-z]+)/i)[1].toLowerCase());if(!new RegExp(r).test(s))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+r+'".')}var a}};return i.fn.emulateTransitionEnd=t,i.event.special[l.TRANSITION_END]={bindType:e,delegateType:e,handle:function(t){if(i(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}},l}(e),Kn=(n="alert",a="."+(o="bs.alert"),c=(r=e).fn[n],u={CLOSE:"close"+a,CLOSED:"closed"+a,CLICK_DATA_API:"click"+a+".data-api"},f="alert",d="fade",g="show",_=function(){function i(t){this._element=t}var t=i.prototype;return t.close=function(t){var e=this._element;t&&(e=this._getRootElement(t)),this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},t.dispose=function(){r.removeData(this._element,o),this._element=null},t._getRootElement=function(t){var e=Fn.getSelectorFromElement(t),n=!1;return e&&(n=document.querySelector(e)),n||(n=r(t).closest("."+f)[0]),n},t._triggerCloseEvent=function(t){var e=r.Event(u.CLOSE);return r(t).trigger(e),e},t._removeElement=function(e){var n=this;if(r(e).removeClass(g),r(e).hasClass(d)){var t=Fn.getTransitionDurationFromElement(e);r(e).one(Fn.TRANSITION_END,function(t){return n._destroyElement(e,t)}).emulateTransitionEnd(t)}else this._destroyElement(e)},t._destroyElement=function(t){r(t).detach().trigger(u.CLOSED).remove()},i._jQueryInterface=function(n){return this.each(function(){var t=r(this),e=t.data(o);e||(e=new i(this),t.data(o,e)),"close"===n&&e[n](this)})},i._handleDismiss=function(e){return function(t){t&&t.preventDefault(),e.close(this)}},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),r(document).on(u.CLICK_DATA_API,'[data-dismiss="alert"]',_._handleDismiss(new _)),r.fn[n]=_._jQueryInterface,r.fn[n].Constructor=_,r.fn[n].noConflict=function(){return r.fn[n]=c,_._jQueryInterface},_),Mn=(p="button",y="."+(v="bs.button"),E=".data-api",C=(m=e).fn[p],T="active",b="btn",I='[data-toggle^="button"]',A='[data-toggle="buttons"]',D="input",w=".active",N=".btn",O={CLICK_DATA_API:"click"+y+E,FOCUS_BLUR_DATA_API:(S="focus")+y+E+" blur"+y+E},k=function(){function n(t){this._element=t}var t=n.prototype;return t.toggle=function(){var t=!0,e=!0,n=m(this._element).closest(A)[0];if(n){var i=this._element.querySelector(D);if(i){if("radio"===i.type)if(i.checked&&this._element.classList.contains(T))t=!1;else{var r=n.querySelector(w);r&&m(r).removeClass(T)}if(t){if(i.hasAttribute("disabled")||n.hasAttribute("disabled")||i.classList.contains("disabled")||n.classList.contains("disabled"))return;i.checked=!this._element.classList.contains(T),m(i).trigger("change")}i.focus(),e=!1}}e&&this._element.setAttribute("aria-pressed",!this._element.classList.contains(T)),t&&m(this._element).toggleClass(T)},t.dispose=function(){m.removeData(this._element,v),this._element=null},n._jQueryInterface=function(e){return this.each(function(){var t=m(this).data(v);t||(t=new n(this),m(this).data(v,t)),"toggle"===e&&t[e]()})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),n}(),m(document).on(O.CLICK_DATA_API,I,function(t){t.preventDefault();var e=t.target;m(e).hasClass(b)||(e=m(e).closest(N)),k._jQueryInterface.call(m(e),"toggle")}).on(O.FOCUS_BLUR_DATA_API,I,function(t){var e=m(t.target).closest(N)[0];m(e).toggleClass(S,/^focus(in)?$/.test(t.type))}),m.fn[p]=k._jQueryInterface,m.fn[p].Constructor=k,m.fn[p].noConflict=function(){return m.fn[p]=C,k._jQueryInterface},k),Qn=(j="carousel",L="."+(H="bs.carousel"),R=".data-api",x=(P=e).fn[j],W={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0},U={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},q="next",F="prev",K="left",M="right",Q={SLIDE:"slide"+L,SLID:"slid"+L,KEYDOWN:"keydown"+L,MOUSEENTER:"mouseenter"+L,MOUSELEAVE:"mouseleave"+L,TOUCHEND:"touchend"+L,LOAD_DATA_API:"load"+L+R,CLICK_DATA_API:"click"+L+R},B="carousel",V="active",Y="slide",z="carousel-item-right",J="carousel-item-left",Z="carousel-item-next",G="carousel-item-prev",$=".active",X=".active.carousel-item",tt=".carousel-item",et=".carousel-item-next, .carousel-item-prev",nt=".carousel-indicators",it="[data-slide], [data-slide-to]",rt='[data-ride="carousel"]',ot=function(){function o(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this._config=this._getConfig(e),this._element=P(t)[0],this._indicatorsElement=this._element.querySelector(nt),this._addEventListeners()}var t=o.prototype;return t.next=function(){this._isSliding||this._slide(q)},t.nextWhenVisible=function(){!document.hidden&&P(this._element).is(":visible")&&"hidden"!==P(this._element).css("visibility")&&this.next()},t.prev=function(){this._isSliding||this._slide(F)},t.pause=function(t){t||(this._isPaused=!0),this._element.querySelector(et)&&(Fn.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},t.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},t.to=function(t){var e=this;this._activeElement=this._element.querySelector(X);var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)P(this._element).one(Q.SLID,function(){return e.to(t)});else{if(n===t)return this.pause(),void this.cycle();var i=n<t?q:F;this._slide(i,this._items[t])}},t.dispose=function(){P(this._element).off(L),P.removeData(this._element,H),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},t._getConfig=function(t){return t=l({},W,t),Fn.typeCheckConfig(j,t,U),t},t._addEventListeners=function(){var e=this;this._config.keyboard&&P(this._element).on(Q.KEYDOWN,function(t){return e._keydown(t)}),"hover"===this._config.pause&&(P(this._element).on(Q.MOUSEENTER,function(t){return e.pause(t)}).on(Q.MOUSELEAVE,function(t){return e.cycle(t)}),"ontouchstart"in document.documentElement&&P(this._element).on(Q.TOUCHEND,function(){e.pause(),e.touchTimeout&&clearTimeout(e.touchTimeout),e.touchTimeout=setTimeout(function(t){return e.cycle(t)},500+e._config.interval)}))},t._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},t._getItemIndex=function(t){return this._items=t&&t.parentNode?[].slice.call(t.parentNode.querySelectorAll(tt)):[],this._items.indexOf(t)},t._getItemByDirection=function(t,e){var n=t===q,i=t===F,r=this._getItemIndex(e),o=this._items.length-1;if((i&&0===r||n&&r===o)&&!this._config.wrap)return e;var s=(r+(t===F?-1:1))%this._items.length;return-1===s?this._items[this._items.length-1]:this._items[s]},t._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),i=this._getItemIndex(this._element.querySelector(X)),r=P.Event(Q.SLIDE,{relatedTarget:t,direction:e,from:i,to:n});return P(this._element).trigger(r),r},t._setActiveIndicatorElement=function(t){if(this._indicatorsElement){var e=[].slice.call(this._indicatorsElement.querySelectorAll($));P(e).removeClass(V);var n=this._indicatorsElement.children[this._getItemIndex(t)];n&&P(n).addClass(V)}},t._slide=function(t,e){var n,i,r,o=this,s=this._element.querySelector(X),a=this._getItemIndex(s),l=e||s&&this._getItemByDirection(t,s),c=this._getItemIndex(l),h=Boolean(this._interval);if(t===q?(n=J,i=Z,r=K):(n=z,i=G,r=M),l&&P(l).hasClass(V))this._isSliding=!1;else if(!this._triggerSlideEvent(l,r).isDefaultPrevented()&&s&&l){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(l);var u=P.Event(Q.SLID,{relatedTarget:l,direction:r,from:a,to:c});if(P(this._element).hasClass(Y)){P(l).addClass(i),Fn.reflow(l),P(s).addClass(n),P(l).addClass(n);var f=Fn.getTransitionDurationFromElement(s);P(s).one(Fn.TRANSITION_END,function(){P(l).removeClass(n+" "+i).addClass(V),P(s).removeClass(V+" "+i+" "+n),o._isSliding=!1,setTimeout(function(){return P(o._element).trigger(u)},0)}).emulateTransitionEnd(f)}else P(s).removeClass(V),P(l).addClass(V),this._isSliding=!1,P(this._element).trigger(u);h&&this.cycle()}},o._jQueryInterface=function(i){return this.each(function(){var t=P(this).data(H),e=l({},W,P(this).data());"object"==typeof i&&(e=l({},e,i));var n="string"==typeof i?i:e.slide;if(t||(t=new o(this,e),P(this).data(H,t)),"number"==typeof i)t.to(i);else if("string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}else e.interval&&(t.pause(),t.cycle())})},o._dataApiClickHandler=function(t){var e=Fn.getSelectorFromElement(this);if(e){var n=P(e)[0];if(n&&P(n).hasClass(B)){var i=l({},P(n).data(),P(this).data()),r=this.getAttribute("data-slide-to");r&&(i.interval=!1),o._jQueryInterface.call(P(n),i),r&&P(n).data(H).to(r),t.preventDefault()}}},s(o,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return W}}]),o}(),P(document).on(Q.CLICK_DATA_API,it,ot._dataApiClickHandler),P(window).on(Q.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(rt)),e=0,n=t.length;e<n;e++){var i=P(t[e]);ot._jQueryInterface.call(i,i.data())}}),P.fn[j]=ot._jQueryInterface,P.fn[j].Constructor=ot,P.fn[j].noConflict=function(){return P.fn[j]=x,ot._jQueryInterface},ot),Bn=(at="collapse",ct="."+(lt="bs.collapse"),ht=(st=e).fn[at],ut={toggle:!0,parent:""},ft={toggle:"boolean",parent:"(string|element)"},dt={SHOW:"show"+ct,SHOWN:"shown"+ct,HIDE:"hide"+ct,HIDDEN:"hidden"+ct,CLICK_DATA_API:"click"+ct+".data-api"},gt="show",_t="collapse",mt="collapsing",pt="collapsed",vt="width",yt="height",Et=".show, .collapsing",Ct='[data-toggle="collapse"]',Tt=function(){function a(e,t){this._isTransitioning=!1,this._element=e,this._config=this._getConfig(t),this._triggerArray=st.makeArray(document.querySelectorAll('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'));for(var n=[].slice.call(document.querySelectorAll(Ct)),i=0,r=n.length;i<r;i++){var o=n[i],s=Fn.getSelectorFromElement(o),a=[].slice.call(document.querySelectorAll(s)).filter(function(t){return t===e});null!==s&&0<a.length&&(this._selector=s,this._triggerArray.push(o))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var t=a.prototype;return t.toggle=function(){st(this._element).hasClass(gt)?this.hide():this.show()},t.show=function(){var t,e,n=this;if(!this._isTransitioning&&!st(this._element).hasClass(gt)&&(this._parent&&0===(t=[].slice.call(this._parent.querySelectorAll(Et)).filter(function(t){return t.getAttribute("data-parent")===n._config.parent})).length&&(t=null),!(t&&(e=st(t).not(this._selector).data(lt))&&e._isTransitioning))){var i=st.Event(dt.SHOW);if(st(this._element).trigger(i),!i.isDefaultPrevented()){t&&(a._jQueryInterface.call(st(t).not(this._selector),"hide"),e||st(t).data(lt,null));var r=this._getDimension();st(this._element).removeClass(_t).addClass(mt),this._element.style[r]=0,this._triggerArray.length&&st(this._triggerArray).removeClass(pt).attr("aria-expanded",!0),this.setTransitioning(!0);var o="scroll"+(r[0].toUpperCase()+r.slice(1)),s=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){st(n._element).removeClass(mt).addClass(_t).addClass(gt),n._element.style[r]="",n.setTransitioning(!1),st(n._element).trigger(dt.SHOWN)}).emulateTransitionEnd(s),this._element.style[r]=this._element[o]+"px"}}},t.hide=function(){var t=this;if(!this._isTransitioning&&st(this._element).hasClass(gt)){var e=st.Event(dt.HIDE);if(st(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",Fn.reflow(this._element),st(this._element).addClass(mt).removeClass(_t).removeClass(gt);var i=this._triggerArray.length;if(0<i)for(var r=0;r<i;r++){var o=this._triggerArray[r],s=Fn.getSelectorFromElement(o);if(null!==s)st([].slice.call(document.querySelectorAll(s))).hasClass(gt)||st(o).addClass(pt).attr("aria-expanded",!1)}this.setTransitioning(!0);this._element.style[n]="";var a=Fn.getTransitionDurationFromElement(this._element);st(this._element).one(Fn.TRANSITION_END,function(){t.setTransitioning(!1),st(t._element).removeClass(mt).addClass(_t).trigger(dt.HIDDEN)}).emulateTransitionEnd(a)}}},t.setTransitioning=function(t){this._isTransitioning=t},t.dispose=function(){st.removeData(this._element,lt),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},t._getConfig=function(t){return(t=l({},ut,t)).toggle=Boolean(t.toggle),Fn.typeCheckConfig(at,t,ft),t},t._getDimension=function(){return st(this._element).hasClass(vt)?vt:yt},t._getParent=function(){var n=this,t=null;Fn.isElement(this._config.parent)?(t=this._config.parent,"undefined"!=typeof this._config.parent.jquery&&(t=this._config.parent[0])):t=document.querySelector(this._config.parent);var e='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]',i=[].slice.call(t.querySelectorAll(e));return st(i).each(function(t,e){n._addAriaAndCollapsedClass(a._getTargetFromElement(e),[e])}),t},t._addAriaAndCollapsedClass=function(t,e){if(t){var n=st(t).hasClass(gt);e.length&&st(e).toggleClass(pt,!n).attr("aria-expanded",n)}},a._getTargetFromElement=function(t){var e=Fn.getSelectorFromElement(t);return e?document.querySelector(e):null},a._jQueryInterface=function(i){return this.each(function(){var t=st(this),e=t.data(lt),n=l({},ut,t.data(),"object"==typeof i&&i?i:{});if(!e&&n.toggle&&/show|hide/.test(i)&&(n.toggle=!1),e||(e=new a(this,n),t.data(lt,e)),"string"==typeof i){if("undefined"==typeof e[i])throw new TypeError('No method named "'+i+'"');e[i]()}})},s(a,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ut}}]),a}(),st(document).on(dt.CLICK_DATA_API,Ct,function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var n=st(this),e=Fn.getSelectorFromElement(this),i=[].slice.call(document.querySelectorAll(e));st(i).each(function(){var t=st(this),e=t.data(lt)?"toggle":n.data();Tt._jQueryInterface.call(t,e)})}),st.fn[at]=Tt._jQueryInterface,st.fn[at].Constructor=Tt,st.fn[at].noConflict=function(){return st.fn[at]=ht,Tt._jQueryInterface},Tt),Vn=(St="dropdown",At="."+(It="bs.dropdown"),Dt=".data-api",wt=(bt=e).fn[St],Nt=new RegExp("38|40|27"),Ot={HIDE:"hide"+At,HIDDEN:"hidden"+At,SHOW:"show"+At,SHOWN:"shown"+At,CLICK:"click"+At,CLICK_DATA_API:"click"+At+Dt,KEYDOWN_DATA_API:"keydown"+At+Dt,KEYUP_DATA_API:"keyup"+At+Dt},kt="disabled",Pt="show",jt="dropup",Ht="dropright",Lt="dropleft",Rt="dropdown-menu-right",xt="position-static",Wt='[data-toggle="dropdown"]',Ut=".dropdown form",qt=".dropdown-menu",Ft=".navbar-nav",Kt=".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",Mt="top-start",Qt="top-end",Bt="bottom-start",Vt="bottom-end",Yt="right-start",zt="left-start",Jt={offset:0,flip:!0,boundary:"scrollParent",reference:"toggle",display:"dynamic"},Zt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)",reference:"(string|element)",display:"string"},Gt=function(){function c(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var t=c.prototype;return t.toggle=function(){if(!this._element.disabled&&!bt(this._element).hasClass(kt)){var t=c._getParentFromElement(this._element),e=bt(this._menu).hasClass(Pt);if(c._clearMenus(),!e){var n={relatedTarget:this._element},i=bt.Event(Ot.SHOW,n);if(bt(t).trigger(i),!i.isDefaultPrevented()){if(!this._inNavbar){if("undefined"==typeof h)throw new TypeError("Bootstrap dropdown require Popper.js (https://popper.js.org)");var r=this._element;"parent"===this._config.reference?r=t:Fn.isElement(this._config.reference)&&(r=this._config.reference,"undefined"!=typeof this._config.reference.jquery&&(r=this._config.reference[0])),"scrollParent"!==this._config.boundary&&bt(t).addClass(xt),this._popper=new h(r,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===bt(t).closest(Ft).length&&bt(document.body).children().on("mouseover",null,bt.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),bt(this._menu).toggleClass(Pt),bt(t).toggleClass(Pt).trigger(bt.Event(Ot.SHOWN,n))}}}},t.dispose=function(){bt.removeData(this._element,It),bt(this._element).off(At),this._element=null,(this._menu=null)!==this._popper&&(this._popper.destroy(),this._popper=null)},t.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},t._addEventListeners=function(){var e=this;bt(this._element).on(Ot.CLICK,function(t){t.preventDefault(),t.stopPropagation(),e.toggle()})},t._getConfig=function(t){return t=l({},this.constructor.Default,bt(this._element).data(),t),Fn.typeCheckConfig(St,t,this.constructor.DefaultType),t},t._getMenuElement=function(){if(!this._menu){var t=c._getParentFromElement(this._element);t&&(this._menu=t.querySelector(qt))}return this._menu},t._getPlacement=function(){var t=bt(this._element.parentNode),e=Bt;return t.hasClass(jt)?(e=Mt,bt(this._menu).hasClass(Rt)&&(e=Qt)):t.hasClass(Ht)?e=Yt:t.hasClass(Lt)?e=zt:bt(this._menu).hasClass(Rt)&&(e=Vt),e},t._detectNavbar=function(){return 0<bt(this._element).closest(".navbar").length},t._getPopperConfig=function(){var e=this,t={};"function"==typeof this._config.offset?t.fn=function(t){return t.offsets=l({},t.offsets,e._config.offset(t.offsets)||{}),t}:t.offset=this._config.offset;var n={placement:this._getPlacement(),modifiers:{offset:t,flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}};return"static"===this._config.display&&(n.modifiers.applyStyle={enabled:!1}),n},c._jQueryInterface=function(e){return this.each(function(){var t=bt(this).data(It);if(t||(t=new c(this,"object"==typeof e?e:null),bt(this).data(It,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},c._clearMenus=function(t){if(!t||3!==t.which&&("keyup"!==t.type||9===t.which))for(var e=[].slice.call(document.querySelectorAll(Wt)),n=0,i=e.length;n<i;n++){var r=c._getParentFromElement(e[n]),o=bt(e[n]).data(It),s={relatedTarget:e[n]};if(t&&"click"===t.type&&(s.clickEvent=t),o){var a=o._menu;if(bt(r).hasClass(Pt)&&!(t&&("click"===t.type&&/input|textarea/i.test(t.target.tagName)||"keyup"===t.type&&9===t.which)&&bt.contains(r,t.target))){var l=bt.Event(Ot.HIDE,s);bt(r).trigger(l),l.isDefaultPrevented()||("ontouchstart"in document.documentElement&&bt(document.body).children().off("mouseover",null,bt.noop),e[n].setAttribute("aria-expanded","false"),bt(a).removeClass(Pt),bt(r).removeClass(Pt).trigger(bt.Event(Ot.HIDDEN,s)))}}}},c._getParentFromElement=function(t){var e,n=Fn.getSelectorFromElement(t);return n&&(e=document.querySelector(n)),e||t.parentNode},c._dataApiKeydownHandler=function(t){if((/input|textarea/i.test(t.target.tagName)?!(32===t.which||27!==t.which&&(40!==t.which&&38!==t.which||bt(t.target).closest(qt).length)):Nt.test(t.which))&&(t.preventDefault(),t.stopPropagation(),!this.disabled&&!bt(this).hasClass(kt))){var e=c._getParentFromElement(this),n=bt(e).hasClass(Pt);if((n||27===t.which&&32===t.which)&&(!n||27!==t.which&&32!==t.which)){var i=[].slice.call(e.querySelectorAll(Kt));if(0!==i.length){var r=i.indexOf(t.target);38===t.which&&0<r&&r--,40===t.which&&r<i.length-1&&r++,r<0&&(r=0),i[r].focus()}}else{if(27===t.which){var o=e.querySelector(Wt);bt(o).trigger("focus")}bt(this).trigger("click")}}},s(c,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Jt}},{key:"DefaultType",get:function(){return Zt}}]),c}(),bt(document).on(Ot.KEYDOWN_DATA_API,Wt,Gt._dataApiKeydownHandler).on(Ot.KEYDOWN_DATA_API,qt,Gt._dataApiKeydownHandler).on(Ot.CLICK_DATA_API+" "+Ot.KEYUP_DATA_API,Gt._clearMenus).on(Ot.CLICK_DATA_API,Wt,function(t){t.preventDefault(),t.stopPropagation(),Gt._jQueryInterface.call(bt(this),"toggle")}).on(Ot.CLICK_DATA_API,Ut,function(t){t.stopPropagation()}),bt.fn[St]=Gt._jQueryInterface,bt.fn[St].Constructor=Gt,bt.fn[St].noConflict=function(){return bt.fn[St]=wt,Gt._jQueryInterface},Gt),Yn=(Xt="modal",ee="."+(te="bs.modal"),ne=($t=e).fn[Xt],ie={backdrop:!0,keyboard:!0,focus:!0,show:!0},re={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},oe={HIDE:"hide"+ee,HIDDEN:"hidden"+ee,SHOW:"show"+ee,SHOWN:"shown"+ee,FOCUSIN:"focusin"+ee,RESIZE:"resize"+ee,CLICK_DISMISS:"click.dismiss"+ee,KEYDOWN_DISMISS:"keydown.dismiss"+ee,MOUSEUP_DISMISS:"mouseup.dismiss"+ee,MOUSEDOWN_DISMISS:"mousedown.dismiss"+ee,CLICK_DATA_API:"click"+ee+".data-api"},se="modal-scrollbar-measure",ae="modal-backdrop",le="modal-open",ce="fade",he="show",ue=".modal-dialog",fe='[data-toggle="modal"]',de='[data-dismiss="modal"]',ge=".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",_e=".sticky-top",me=function(){function r(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=t.querySelector(ue),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._scrollbarWidth=0}var t=r.prototype;return t.toggle=function(t){return this._isShown?this.hide():this.show(t)},t.show=function(t){var e=this;if(!this._isTransitioning&&!this._isShown){$t(this._element).hasClass(ce)&&(this._isTransitioning=!0);var n=$t.Event(oe.SHOW,{relatedTarget:t});$t(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),$t(document.body).addClass(le),this._setEscapeEvent(),this._setResizeEvent(),$t(this._element).on(oe.CLICK_DISMISS,de,function(t){return e.hide(t)}),$t(this._dialog).on(oe.MOUSEDOWN_DISMISS,function(){$t(e._element).one(oe.MOUSEUP_DISMISS,function(t){$t(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return e._showElement(t)}))}},t.hide=function(t){var e=this;if(t&&t.preventDefault(),!this._isTransitioning&&this._isShown){var n=$t.Event(oe.HIDE);if($t(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var i=$t(this._element).hasClass(ce);if(i&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),$t(document).off(oe.FOCUSIN),$t(this._element).removeClass(he),$t(this._element).off(oe.CLICK_DISMISS),$t(this._dialog).off(oe.MOUSEDOWN_DISMISS),i){var r=Fn.getTransitionDurationFromElement(this._element);$t(this._element).one(Fn.TRANSITION_END,function(t){return e._hideModal(t)}).emulateTransitionEnd(r)}else this._hideModal()}}},t.dispose=function(){$t.removeData(this._element,te),$t(window,document,this._element,this._backdrop).off(ee),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._scrollbarWidth=null},t.handleUpdate=function(){this._adjustDialog()},t._getConfig=function(t){return t=l({},ie,t),Fn.typeCheckConfig(Xt,t,re),t},t._showElement=function(t){var e=this,n=$t(this._element).hasClass(ce);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.scrollTop=0,n&&Fn.reflow(this._element),$t(this._element).addClass(he),this._config.focus&&this._enforceFocus();var i=$t.Event(oe.SHOWN,{relatedTarget:t}),r=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,$t(e._element).trigger(i)};if(n){var o=Fn.getTransitionDurationFromElement(this._element);$t(this._dialog).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()},t._enforceFocus=function(){var e=this;$t(document).off(oe.FOCUSIN).on(oe.FOCUSIN,function(t){document!==t.target&&e._element!==t.target&&0===$t(e._element).has(t.target).length&&e._element.focus()})},t._setEscapeEvent=function(){var e=this;this._isShown&&this._config.keyboard?$t(this._element).on(oe.KEYDOWN_DISMISS,function(t){27===t.which&&(t.preventDefault(),e.hide())}):this._isShown||$t(this._element).off(oe.KEYDOWN_DISMISS)},t._setResizeEvent=function(){var e=this;this._isShown?$t(window).on(oe.RESIZE,function(t){return e.handleUpdate(t)}):$t(window).off(oe.RESIZE)},t._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._isTransitioning=!1,this._showBackdrop(function(){$t(document.body).removeClass(le),t._resetAdjustments(),t._resetScrollbar(),$t(t._element).trigger(oe.HIDDEN)})},t._removeBackdrop=function(){this._backdrop&&($t(this._backdrop).remove(),this._backdrop=null)},t._showBackdrop=function(t){var e=this,n=$t(this._element).hasClass(ce)?ce:"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className=ae,n&&this._backdrop.classList.add(n),$t(this._backdrop).appendTo(document.body),$t(this._element).on(oe.CLICK_DISMISS,function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._element.focus():e.hide())}),n&&Fn.reflow(this._backdrop),$t(this._backdrop).addClass(he),!t)return;if(!n)return void t();var i=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,t).emulateTransitionEnd(i)}else if(!this._isShown&&this._backdrop){$t(this._backdrop).removeClass(he);var r=function(){e._removeBackdrop(),t&&t()};if($t(this._element).hasClass(ce)){var o=Fn.getTransitionDurationFromElement(this._backdrop);$t(this._backdrop).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r()}else t&&t()},t._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},t._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},t._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=t.left+t.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},t._setScrollbar=function(){var r=this;if(this._isBodyOverflowing){var t=[].slice.call(document.querySelectorAll(ge)),e=[].slice.call(document.querySelectorAll(_e));$t(t).each(function(t,e){var n=e.style.paddingRight,i=$t(e).css("padding-right");$t(e).data("padding-right",n).css("padding-right",parseFloat(i)+r._scrollbarWidth+"px")}),$t(e).each(function(t,e){var n=e.style.marginRight,i=$t(e).css("margin-right");$t(e).data("margin-right",n).css("margin-right",parseFloat(i)-r._scrollbarWidth+"px")});var n=document.body.style.paddingRight,i=$t(document.body).css("padding-right");$t(document.body).data("padding-right",n).css("padding-right",parseFloat(i)+this._scrollbarWidth+"px")}},t._resetScrollbar=function(){var t=[].slice.call(document.querySelectorAll(ge));$t(t).each(function(t,e){var n=$t(e).data("padding-right");$t(e).removeData("padding-right"),e.style.paddingRight=n||""});var e=[].slice.call(document.querySelectorAll(""+_e));$t(e).each(function(t,e){var n=$t(e).data("margin-right");"undefined"!=typeof n&&$t(e).css("margin-right",n).removeData("margin-right")});var n=$t(document.body).data("padding-right");$t(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},t._getScrollbarWidth=function(){var t=document.createElement("div");t.className=se,document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},r._jQueryInterface=function(n,i){return this.each(function(){var t=$t(this).data(te),e=l({},ie,$t(this).data(),"object"==typeof n&&n?n:{});if(t||(t=new r(this,e),$t(this).data(te,t)),"string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n](i)}else e.show&&t.show(i)})},s(r,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return ie}}]),r}(),$t(document).on(oe.CLICK_DATA_API,fe,function(t){var e,n=this,i=Fn.getSelectorFromElement(this);i&&(e=document.querySelector(i));var r=$t(e).data(te)?"toggle":l({},$t(e).data(),$t(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var o=$t(e).one(oe.SHOW,function(t){t.isDefaultPrevented()||o.one(oe.HIDDEN,function(){$t(n).is(":visible")&&n.focus()})});me._jQueryInterface.call($t(e),r,this)}),$t.fn[Xt]=me._jQueryInterface,$t.fn[Xt].Constructor=me,$t.fn[Xt].noConflict=function(){return $t.fn[Xt]=ne,me._jQueryInterface},me),zn=(ve="tooltip",Ee="."+(ye="bs.tooltip"),Ce=(pe=e).fn[ve],Te="bs-tooltip",be=new RegExp("(^|\\s)"+Te+"\\S+","g"),Ae={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!(Ie={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"}),selector:!(Se={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)"}),placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent"},we="out",Ne={HIDE:"hide"+Ee,HIDDEN:"hidden"+Ee,SHOW:(De="show")+Ee,SHOWN:"shown"+Ee,INSERTED:"inserted"+Ee,CLICK:"click"+Ee,FOCUSIN:"focusin"+Ee,FOCUSOUT:"focusout"+Ee,MOUSEENTER:"mouseenter"+Ee,MOUSELEAVE:"mouseleave"+Ee},Oe="fade",ke="show",Pe=".tooltip-inner",je=".arrow",He="hover",Le="focus",Re="click",xe="manual",We=function(){function i(t,e){if("undefined"==typeof h)throw new TypeError("Bootstrap tooltips require Popper.js (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var t=i.prototype;return t.enable=function(){this._isEnabled=!0},t.disable=function(){this._isEnabled=!1},t.toggleEnabled=function(){this._isEnabled=!this._isEnabled},t.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=pe(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(pe(this.getTipElement()).hasClass(ke))return void this._leave(null,this);this._enter(null,this)}},t.dispose=function(){clearTimeout(this._timeout),pe.removeData(this.element,this.constructor.DATA_KEY),pe(this.element).off(this.constructor.EVENT_KEY),pe(this.element).closest(".modal").off("hide.bs.modal"),this.tip&&pe(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,(this._activeTrigger=null)!==this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},t.show=function(){var e=this;if("none"===pe(this.element).css("display"))throw new Error("Please use show on visible elements");var t=pe.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){pe(this.element).trigger(t);var n=pe.contains(this.element.ownerDocument.documentElement,this.element);if(t.isDefaultPrevented()||!n)return;var i=this.getTipElement(),r=Fn.getUID(this.constructor.NAME);i.setAttribute("id",r),this.element.setAttribute("aria-describedby",r),this.setContent(),this.config.animation&&pe(i).addClass(Oe);var o="function"==typeof this.config.placement?this.config.placement.call(this,i,this.element):this.config.placement,s=this._getAttachment(o);this.addAttachmentClass(s);var a=!1===this.config.container?document.body:pe(document).find(this.config.container);pe(i).data(this.constructor.DATA_KEY,this),pe.contains(this.element.ownerDocument.documentElement,this.tip)||pe(i).appendTo(a),pe(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new h(this.element,i,{placement:s,modifiers:{offset:{offset:this.config.offset},flip:{behavior:this.config.fallbackPlacement},arrow:{element:je},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){e._handlePopperPlacementChange(t)}}),pe(i).addClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().on("mouseover",null,pe.noop);var l=function(){e.config.animation&&e._fixTransition();var t=e._hoverState;e._hoverState=null,pe(e.element).trigger(e.constructor.Event.SHOWN),t===we&&e._leave(null,e)};if(pe(this.tip).hasClass(Oe)){var c=Fn.getTransitionDurationFromElement(this.tip);pe(this.tip).one(Fn.TRANSITION_END,l).emulateTransitionEnd(c)}else l()}},t.hide=function(t){var e=this,n=this.getTipElement(),i=pe.Event(this.constructor.Event.HIDE),r=function(){e._hoverState!==De&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),pe(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};if(pe(this.element).trigger(i),!i.isDefaultPrevented()){if(pe(n).removeClass(ke),"ontouchstart"in document.documentElement&&pe(document.body).children().off("mouseover",null,pe.noop),this._activeTrigger[Re]=!1,this._activeTrigger[Le]=!1,this._activeTrigger[He]=!1,pe(this.tip).hasClass(Oe)){var o=Fn.getTransitionDurationFromElement(n);pe(n).one(Fn.TRANSITION_END,r).emulateTransitionEnd(o)}else r();this._hoverState=""}},t.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},t.isWithContent=function(){return Boolean(this.getTitle())},t.addAttachmentClass=function(t){pe(this.getTipElement()).addClass(Te+"-"+t)},t.getTipElement=function(){return this.tip=this.tip||pe(this.config.template)[0],this.tip},t.setContent=function(){var t=this.getTipElement();this.setElementContent(pe(t.querySelectorAll(Pe)),this.getTitle()),pe(t).removeClass(Oe+" "+ke)},t.setElementContent=function(t,e){var n=this.config.html;"object"==typeof e&&(e.nodeType||e.jquery)?n?pe(e).parent().is(t)||t.empty().append(e):t.text(pe(e).text()):t[n?"html":"text"](e)},t.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},t._getAttachment=function(t){return Ie[t.toUpperCase()]},t._setListeners=function(){var i=this;this.config.trigger.split(" ").forEach(function(t){if("click"===t)pe(i.element).on(i.constructor.Event.CLICK,i.config.selector,function(t){return i.toggle(t)});else if(t!==xe){var e=t===He?i.constructor.Event.MOUSEENTER:i.constructor.Event.FOCUSIN,n=t===He?i.constructor.Event.MOUSELEAVE:i.constructor.Event.FOCUSOUT;pe(i.element).on(e,i.config.selector,function(t){return i._enter(t)}).on(n,i.config.selector,function(t){return i._leave(t)})}pe(i.element).closest(".modal").on("hide.bs.modal",function(){return i.hide()})}),this.config.selector?this.config=l({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},t._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},t._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Le:He]=!0),pe(e.getTipElement()).hasClass(ke)||e._hoverState===De?e._hoverState=De:(clearTimeout(e._timeout),e._hoverState=De,e.config.delay&&e.config.delay.show?e._timeout=setTimeout(function(){e._hoverState===De&&e.show()},e.config.delay.show):e.show())},t._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||pe(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),pe(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Le:He]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=we,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout(function(){e._hoverState===we&&e.hide()},e.config.delay.hide):e.hide())},t._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},t._getConfig=function(t){return"number"==typeof(t=l({},this.constructor.Default,pe(this.element).data(),"object"==typeof t&&t?t:{})).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),Fn.typeCheckConfig(ve,t,this.constructor.DefaultType),t},t._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},t._cleanTipClass=function(){var t=pe(this.getTipElement()),e=t.attr("class").match(be);null!==e&&e.length&&t.removeClass(e.join(""))},t._handlePopperPlacementChange=function(t){var e=t.instance;this.tip=e.popper,this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},t._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(pe(t).removeClass(Oe),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},i._jQueryInterface=function(n){return this.each(function(){var t=pe(this).data(ye),e="object"==typeof n&&n;if((t||!/dispose|hide/.test(n))&&(t||(t=new i(this,e),pe(this).data(ye,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ae}},{key:"NAME",get:function(){return ve}},{key:"DATA_KEY",get:function(){return ye}},{key:"Event",get:function(){return Ne}},{key:"EVENT_KEY",get:function(){return Ee}},{key:"DefaultType",get:function(){return Se}}]),i}(),pe.fn[ve]=We._jQueryInterface,pe.fn[ve].Constructor=We,pe.fn[ve].noConflict=function(){return pe.fn[ve]=Ce,We._jQueryInterface},We),Jn=(qe="popover",Ke="."+(Fe="bs.popover"),Me=(Ue=e).fn[qe],Qe="bs-popover",Be=new RegExp("(^|\\s)"+Qe+"\\S+","g"),Ve=l({},zn.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Ye=l({},zn.DefaultType,{content:"(string|element|function)"}),ze="fade",Ze=".popover-header",Ge=".popover-body",$e={HIDE:"hide"+Ke,HIDDEN:"hidden"+Ke,SHOW:(Je="show")+Ke,SHOWN:"shown"+Ke,INSERTED:"inserted"+Ke,CLICK:"click"+Ke,FOCUSIN:"focusin"+Ke,FOCUSOUT:"focusout"+Ke,MOUSEENTER:"mouseenter"+Ke,MOUSELEAVE:"mouseleave"+Ke},Xe=function(t){var e,n;function i(){return t.apply(this,arguments)||this}n=t,(e=i).prototype=Object.create(n.prototype),(e.prototype.constructor=e).__proto__=n;var r=i.prototype;return r.isWithContent=function(){return this.getTitle()||this._getContent()},r.addAttachmentClass=function(t){Ue(this.getTipElement()).addClass(Qe+"-"+t)},r.getTipElement=function(){return this.tip=this.tip||Ue(this.config.template)[0],this.tip},r.setContent=function(){var t=Ue(this.getTipElement());this.setElementContent(t.find(Ze),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(Ge),e),t.removeClass(ze+" "+Je)},r._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},r._cleanTipClass=function(){var t=Ue(this.getTipElement()),e=t.attr("class").match(Be);null!==e&&0<e.length&&t.removeClass(e.join(""))},i._jQueryInterface=function(n){return this.each(function(){var t=Ue(this).data(Fe),e="object"==typeof n?n:null;if((t||!/destroy|hide/.test(n))&&(t||(t=new i(this,e),Ue(this).data(Fe,t)),"string"==typeof n)){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return Ve}},{key:"NAME",get:function(){return qe}},{key:"DATA_KEY",get:function(){return Fe}},{key:"Event",get:function(){return $e}},{key:"EVENT_KEY",get:function(){return Ke}},{key:"DefaultType",get:function(){return Ye}}]),i}(zn),Ue.fn[qe]=Xe._jQueryInterface,Ue.fn[qe].Constructor=Xe,Ue.fn[qe].noConflict=function(){return Ue.fn[qe]=Me,Xe._jQueryInterface},Xe),Zn=(en="scrollspy",rn="."+(nn="bs.scrollspy"),on=(tn=e).fn[en],sn={offset:10,method:"auto",target:""},an={offset:"number",method:"string",target:"(string|element)"},ln={ACTIVATE:"activate"+rn,SCROLL:"scroll"+rn,LOAD_DATA_API:"load"+rn+".data-api"},cn="dropdown-item",hn="active",un='[data-spy="scroll"]',fn=".active",dn=".nav, .list-group",gn=".nav-link",_n=".nav-item",mn=".list-group-item",pn=".dropdown",vn=".dropdown-item",yn=".dropdown-toggle",En="offset",Cn="position",Tn=function(){function n(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" "+gn+","+this._config.target+" "+mn+","+this._config.target+" "+vn,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,tn(this._scrollElement).on(ln.SCROLL,function(t){return n._process(t)}),this.refresh(),this._process()}var t=n.prototype;return t.refresh=function(){var e=this,t=this._scrollElement===this._scrollElement.window?En:Cn,r="auto"===this._config.method?t:this._config.method,o=r===Cn?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),[].slice.call(document.querySelectorAll(this._selector)).map(function(t){var e,n=Fn.getSelectorFromElement(t);if(n&&(e=document.querySelector(n)),e){var i=e.getBoundingClientRect();if(i.width||i.height)return[tn(e)[r]().top+o,n]}return null}).filter(function(t){return t}).sort(function(t,e){return t[0]-e[0]}).forEach(function(t){e._offsets.push(t[0]),e._targets.push(t[1])})},t.dispose=function(){tn.removeData(this._element,nn),tn(this._scrollElement).off(rn),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},t._getConfig=function(t){if("string"!=typeof(t=l({},sn,"object"==typeof t&&t?t:{})).target){var e=tn(t.target).attr("id");e||(e=Fn.getUID(en),tn(t.target).attr("id",e)),t.target="#"+e}return Fn.typeCheckConfig(en,t,an),t},t._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},t._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},t._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},t._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),n<=t){var i=this._targets[this._targets.length-1];this._activeTarget!==i&&this._activate(i)}else{if(this._activeTarget&&t<this._offsets[0]&&0<this._offsets[0])return this._activeTarget=null,void this._clear();for(var r=this._offsets.length;r--;){this._activeTarget!==this._targets[r]&&t>=this._offsets[r]&&("undefined"==typeof this._offsets[r+1]||t<this._offsets[r+1])&&this._activate(this._targets[r])}}},t._activate=function(e){this._activeTarget=e,this._clear();var t=this._selector.split(",");t=t.map(function(t){return t+'[data-target="'+e+'"],'+t+'[href="'+e+'"]'});var n=tn([].slice.call(document.querySelectorAll(t.join(","))));n.hasClass(cn)?(n.closest(pn).find(yn).addClass(hn),n.addClass(hn)):(n.addClass(hn),n.parents(dn).prev(gn+", "+mn).addClass(hn),n.parents(dn).prev(_n).children(gn).addClass(hn)),tn(this._scrollElement).trigger(ln.ACTIVATE,{relatedTarget:e})},t._clear=function(){var t=[].slice.call(document.querySelectorAll(this._selector));tn(t).filter(fn).removeClass(hn)},n._jQueryInterface=function(e){return this.each(function(){var t=tn(this).data(nn);if(t||(t=new n(this,"object"==typeof e&&e),tn(this).data(nn,t)),"string"==typeof e){if("undefined"==typeof t[e])throw new TypeError('No method named "'+e+'"');t[e]()}})},s(n,null,[{key:"VERSION",get:function(){return"4.1.3"}},{key:"Default",get:function(){return sn}}]),n}(),tn(window).on(ln.LOAD_DATA_API,function(){for(var t=[].slice.call(document.querySelectorAll(un)),e=t.length;e--;){var n=tn(t[e]);Tn._jQueryInterface.call(n,n.data())}}),tn.fn[en]=Tn._jQueryInterface,tn.fn[en].Constructor=Tn,tn.fn[en].noConflict=function(){return tn.fn[en]=on,Tn._jQueryInterface},Tn),Gn=(In="."+(Sn="bs.tab"),An=(bn=e).fn.tab,Dn={HIDE:"hide"+In,HIDDEN:"hidden"+In,SHOW:"show"+In,SHOWN:"shown"+In,CLICK_DATA_API:"click"+In+".data-api"},wn="dropdown-menu",Nn="active",On="disabled",kn="fade",Pn="show",jn=".dropdown",Hn=".nav, .list-group",Ln=".active",Rn="> li > .active",xn='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',Wn=".dropdown-toggle",Un="> .dropdown-menu .active",qn=function(){function i(t){this._element=t}var t=i.prototype;return t.show=function(){var n=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&bn(this._element).hasClass(Nn)||bn(this._element).hasClass(On))){var t,i,e=bn(this._element).closest(Hn)[0],r=Fn.getSelectorFromElement(this._element);if(e){var o="UL"===e.nodeName?Rn:Ln;i=(i=bn.makeArray(bn(e).find(o)))[i.length-1]}var s=bn.Event(Dn.HIDE,{relatedTarget:this._element}),a=bn.Event(Dn.SHOW,{relatedTarget:i});if(i&&bn(i).trigger(s),bn(this._element).trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){r&&(t=document.querySelector(r)),this._activate(this._element,e);var l=function(){var t=bn.Event(Dn.HIDDEN,{relatedTarget:n._element}),e=bn.Event(Dn.SHOWN,{relatedTarget:i});bn(i).trigger(t),bn(n._element).trigger(e)};t?this._activate(t,t.parentNode,l):l()}}},t.dispose=function(){bn.removeData(this._element,Sn),this._element=null},t._activate=function(t,e,n){var i=this,r=("UL"===e.nodeName?bn(e).find(Rn):bn(e).children(Ln))[0],o=n&&r&&bn(r).hasClass(kn),s=function(){return i._transitionComplete(t,r,n)};if(r&&o){var a=Fn.getTransitionDurationFromElement(r);bn(r).one(Fn.TRANSITION_END,s).emulateTransitionEnd(a)}else s()},t._transitionComplete=function(t,e,n){if(e){bn(e).removeClass(Pn+" "+Nn);var i=bn(e.parentNode).find(Un)[0];i&&bn(i).removeClass(Nn),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}if(bn(t).addClass(Nn),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),Fn.reflow(t),bn(t).addClass(Pn),t.parentNode&&bn(t.parentNode).hasClass(wn)){var r=bn(t).closest(jn)[0];if(r){var o=[].slice.call(r.querySelectorAll(Wn));bn(o).addClass(Nn)}t.setAttribute("aria-expanded",!0)}n&&n()},i._jQueryInterface=function(n){return this.each(function(){var t=bn(this),e=t.data(Sn);if(e||(e=new i(this),t.data(Sn,e)),"string"==typeof n){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.1.3"}}]),i}(),bn(document).on(Dn.CLICK_DATA_API,xn,function(t){t.preventDefault(),qn._jQueryInterface.call(bn(this),"show")}),bn.fn.tab=qn._jQueryInterface,bn.fn.tab.Constructor=qn,bn.fn.tab.noConflict=function(){return bn.fn.tab=An,qn._jQueryInterface},qn);!function(t){if("undefined"==typeof t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||4<=e[0])throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}(e),t.Util=Fn,t.Alert=Kn,t.Button=Mn,t.Carousel=Qn,t.Collapse=Bn,t.Dropdown=Vn,t.Modal=Yn,t.Popover=Jn,t.Scrollspy=Zn,t.Tab=Gn,t.Tooltip=zn,Object.defineProperty(t,"__esModule",{value:!0})});
+//# sourceMappingURL=bootstrap.min.js.map
\ No newline at end of file

dist/phyloscape/lib/js/jquery-3.4.1.min.js

+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});

dist/styles/Login.css

@@ -219,3 +219,7 @@ text-align: center;
     padding-left: 0 !important;
     padding-right: 0 !important;
 }
+
+.tab-pane .reload-btn {
+    padding-right: 6px;
+}

install

-#!/bin/bash
-
-echo "Upgrading nodeJS"
-sudo npm cache clean -f
-sudo npm install -g n
-sudo n stable
-sudo n latest
-
-echo "Installing yarn"
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-sudo apt update
-sudo apt install yarn
-
-./build
-

package.json

@@ -5,6 +5,7 @@
         "install-ps": "psc-package install",
         "compile": "pulp --psc-package build",
         "build": "pulp --psc-package browserify -t dist/bundle.js",
+        "dev": "webpack-dev-server --env dev --mode development",
         "repl": "pulp --psc-package repl",
         "clean": "rm -Rf output"
     },
@@ -20,6 +21,9 @@
         "react-dom": "^16.8.6",
         "sigma": "git://github.com/jjl/sigma.js#garg"
     },
+    "eslintConfig": {
+        "extends": "react-app"
+    },
     "devDependencies": {
         "@babel/cli": "^7.1.5",
         "@babel/core": "^7.1.6",
@@ -27,13 +31,30 @@
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-stage-2": "^7.0.0",
         "babel-core": "^7.0.0-bridge",
+        "babel-loader": "^8.0.4",
+        "clean-webpack-plugin": "^1.0.0",
+        "css-loader": "^2.1.0",
         "envify": "^4.1.0",
+        "executive": "^1.6.3",
+        "file-loader": "^3.0.1",
+        "html-loader": "^0.5.5",
+        "html-webpack-plugin": "^4.0.0-beta.5",
         "http-server": "^0.11.1",
+        "mini-css-extract-plugin": "^0.5.0",
         "psc-package": "^3.0.1",
         "pulp": "^12.4.0",
         "purescript": "^0.12.4",
+        "purs-loader": "^3.3.0",
         "react-testing-library": "^6.1.2",
-        "spago": "^0.7.5"
-    },
-    "version": "0.0.0"
+        "source-map-loader": "^0.2.4",
+        "spago": "^0.7.5",
+        "style-loader": "^0.23.1",
+        "uglify-js": "^3.4.9",
+        "uglifyify": "^5.0.1",
+        "webpack": "^4.26.0",
+        "webpack-cli": "^3.1.2",
+        "webpack-dev-server": "^3.1.10",
+        "webpack-node-externals": "^1.7.2",
+        "xhr2": "^0.1.4"
+    }
 }

psc-package.json

@@ -7,6 +7,7 @@
     "argonaut",
     "console",
     "css",
+    "debug",
     "dom-filereader",
     "dom-simple",
     "effect",

rebuild

-#!/bin/bash
-
-rm -rf .psc-package output bower_components node_modules
-./build

repl

-#!/bin/bash
-yarn repl

src/Gargantext/Components/Annotation/AnnotatedField.purs

@@ -15,6 +15,7 @@ import Prelude
 import Data.Lens ((^?), _Just)
 import Data.Lens.At (at)
 import Data.Maybe ( Maybe(..), maybe, maybe' )
+import Data.String.Regex as R
 import Data.String as S
 import Data.Tuple ( Tuple(..) )
 import Data.Tuple.Nested ( (/\) )
@@ -25,9 +26,10 @@ import Reactix as R
 import Reactix.DOM.HTML as HTML
 import Reactix.SyntheticEvent as E
 
+import Gargantext.Config (CTabNgramType(..))
 import Gargantext.Types ( TermList )
 import Gargantext.Components.Annotation.Utils ( termBootstrapClass )
-import Gargantext.Components.NgramsTable.Core ( NgramsTerm, NgramsTable(..), _NgramsElement, _list, highlightNgrams )
+import Gargantext.Components.NgramsTable.Core ( NgramsTerm, NgramsTable(..), _NgramsElement, _list, highlightNgrams, findNgramTermList )
 import Gargantext.Components.Annotation.Menu ( AnnotationMenu, annotationMenu, MenuType(..) )
 import Gargantext.Utils.Selection as Sel
 
@@ -58,7 +60,7 @@ annotatedFieldComponent = R.hooksComponent "AnnotatedField" cpt
             let x = E.clientX event
                 y = E.clientY event
                 setList t = do
-                  setTermList (S.toLower text') (Just list) t
+                  setTermList text' (Just list) t
                   setMenu (const Nothing)
             setMenu (const $ Just {x, y, list: Just list, menuType: SetTermListItem, setList} )
 
@@ -79,7 +81,7 @@ maybeShowMenu setMenu setTermList ngrams event = do
         sel' -> do
           let x = E.clientX event
               y = E.clientY event
-              list = findNgram ngrams sel'
+              list = findNgramTermList CTabTerms ngrams sel'
               setList t = do
                 setTermList sel' list t
                 setMenu (const Nothing)
@@ -96,10 +98,7 @@ maybeAddMenu setMenu e (Just props) = annotationMenu setMenu props <> e
 maybeAddMenu _ e _ = e
 
 compile :: NgramsTable -> Maybe String -> Array (Tuple String (Maybe TermList))
-compile ngrams = maybe [] (highlightNgrams ngrams)
-
-findNgram :: NgramsTable -> String -> Maybe TermList
-findNgram (NgramsTable m) s = m ^? at s <<< _Just <<< _NgramsElement <<< _list
+compile ngrams = maybe [] (highlightNgrams CTabTerms ngrams)
 
 -- Runs
 

src/Gargantext/Components/Annotation/Menu.purs

@@ -49,6 +49,6 @@ addToList {menuType, setList} t = Just $ CM.contextMenuItem [ link ]
   where
     link = HTML.a { onClick: click, className: className } [ HTML.text (label menuType) ]
     label NewNgram = "Add to " <> termListName t
-    label SetTermListItem = "Change to" <> termListName t
+    label SetTermListItem = "Change to " <> termListName t
     className = "list-group-item list-group-item-" <> (termBootstrapClass t)
     click = mkEffectFn1 $ \_ -> setList t

src/Gargantext/Components/ContextMenu/ContextMenu.purs

@@ -19,7 +19,7 @@ import DOM.Simple.Document as Document
 import DOM.Simple.Types ( DOMRect )
 import Effect (Effect)
 import Effect.Uncurried ( mkEffectFn1 )
-import FFI.Simple ( (...), (..), (.=), delay )
+import FFI.Simple ( (...), (..), delay )
 import Reactix as R
 import Reactix.DOM.HTML as HTML
 import Reactix.SyntheticEvent as E
@@ -56,8 +56,17 @@ contextMenuCpt = R.hooksComponent "ContextMenu" cpt
             ]
       ]
       pure $ R.createPortal [ elems root menu rect $ cs ] host
-    elems ref menu (Just rect) = HTML.div (({ ref , className: "context-menu", style: position menu rect} .= "data-toggle" $ "popover") .= "data-placement" $ "right")
-    elems ref _ _ = HTML.div (({ ref, className: "context-menu" } .= "data-toggle" $ "popover") .= "data-placement" $ "right")
+    elems ref menu (Just rect) = HTML.div
+        { ref
+        , className: "context-menu"
+        , style: position menu rect
+        , data: {toggle: "popover", placement: "right"}
+        }
+    elems ref _ _ = HTML.div
+        { ref
+        , className: "context-menu"
+        , data: {toggle: "popover", placement: "right"}
+        }
 
 contextMenuEffect
   :: forall t

src/Gargantext/Components/DocsTable.purs

@@ -15,29 +15,36 @@ import Data.HTTP.Method (Method(..))
 import Data.Lens
 import Data.Lens.At (at)
 import Data.Lens.Record (prop)
-import Data.Map (Map)
+import Data.Map (Map, insert)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Set (Set)
 import Data.Set as Set
 import Data.Int (fromString)
 import Data.Symbol (SProxy(..))
-import Data.Tuple (Tuple(..))
+import Data.Tuple (Tuple(..), fst)
+import Data.Tuple.Nested ((/\))
+import DOM.Simple.Event as DE
 import Effect (Effect)
-import Effect.Aff (Aff)
+import Effect.Aff (Aff, launchAff)
 import Effect.Class (liftEffect)
+import Effect.Uncurried (EffectFn1, mkEffectFn1)
 import React as React
 import React (ReactClass, ReactElement, Children)
+import Reactix as R
+import Reactix.SyntheticEvent as RE
+import Reactix.DOM.HTML as H
+import Unsafe.Coerce (unsafeCoerce)
 ------------------------------------------------------------------------
 import Gargantext.Prelude
-import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, toUrl, toLink)
-import Gargantext.Config.REST (get, put, post, deleteWithBody)
-import Gargantext.Components.Loader as Loader
+import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, TabPostQuery(..), toUrl, toLink)
+import Gargantext.Config.REST (get, put, post, deleteWithBody, delete)
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Node (NodePoly(..))
+import Gargantext.Components.Search.Types (Category(..), CategoryQuery(..), favCategory, trashCategory, decodeCategory, putCategories)
 import Gargantext.Components.Table as T
 import Gargantext.Utils.DecodeMaybe ((.|))
-import Gargantext.Router as R
-import React.DOM (a, br', button, div, i, input, p, text)
-import React.DOM.Props (_type, className, href, onClick, placeholder, style, checked, target)
+import Gargantext.Utils.Reactix as R2
+import Gargantext.Router as Router
 import Thermite (PerformAction, Render, Spec, defaultPerformAction, modifyState_, simpleSpec, hideState)
 ------------------------------------------------------------------------
 
@@ -47,34 +54,33 @@ type TotalRecords = Int
 type Props =
   { nodeId       :: Int
   , totalRecords :: Int
-  , chart        :: ReactElement
+  , chart        :: R.Element
   , tabType      :: TabType
   , listId       :: Int
+  , corpusId     :: Maybe Int
+  , showSearch   :: Boolean
   -- ^ tabType is not ideal here since it is too much entangled with tabs and
   -- ngramtable. Let's see how this evolves.
   }
 
-type State =
-  { documentIdsToDelete :: Set Int
-  , documentIdsDeleted  :: Set Int
-  , localFavorites      :: Map Int Boolean
+type PageLoaderProps =
+  { nodeId    :: Int
+  , totalRecords :: Int
+  , tabType      :: TabType
+  , listId       :: Int
+  , corpusId     :: Maybe Int
+  , query       :: Query
   }
 
-initialState :: State
-initialState =
-  { documentIdsToDelete: mempty
-  , documentIdsDeleted:  mempty
-  , localFavorites:      mempty
-  }
+type LocalCategories = Map Int Category
+type Query = String
 
-_documentIdsToDelete = prop (SProxy :: SProxy "documentIdsToDelete")
 _documentIdsDeleted  = prop (SProxy :: SProxy "documentIdsDeleted")
-_localFavorites      = prop (SProxy :: SProxy "localFavorites")
+_localCategories     = prop (SProxy :: SProxy "localCategories")
 
 data Action
-  = MarkFavorites Int Boolean
-  | ToggleDocumentToDelete Int
-  | Trash
+  = MarkCategory Int Category
+
 
 newtype DocumentsView
   = DocumentsView
@@ -83,9 +89,8 @@ newtype DocumentsView
     , date   :: Int
     , title  :: String
     , source :: String
-    , fav    :: Boolean
+    , category :: Category
     , ngramCount :: Int
-    , delete :: Boolean
     }
 
 
@@ -98,7 +103,7 @@ instance showDocumentsView :: Show DocumentsView where
 newtype Response = Response
   { cid        :: Int
   , hyperdata  :: Hyperdata
-  , favorite   :: Boolean
+  , category   :: Category
   , ngramCount :: Int
   }
 
@@ -109,22 +114,6 @@ newtype Hyperdata = Hyperdata
   , pub_year   :: Int
   }
 
---instance decodeHyperdata :: DecodeJson Hyperdata where
---  decodeJson json = do
---    obj    <- decodeJson json
---    title  <- obj .? "title"
---    source <- obj .? "source"
---    pure $ Hyperdata { title,source }
---instance decodeResponse :: DecodeJson Response where
---  decodeJson json = do
---    obj        <- decodeJson json
---    cid        <- obj .? "id"
---    created    <- obj .? "created"
---    favorite   <- obj .? "favorite"
---    ngramCount <- obj .? "ngramCount"
---    hyperdata  <- obj .? "hyperdata"
---    pure $ Response { cid, created, favorite, ngramCount, hyperdata }
-
 
 instance decodeHyperdata :: DecodeJson Hyperdata where
   decodeJson json = do
@@ -141,88 +130,112 @@ instance decodeResponse :: DecodeJson Response where
     favorite   <- obj .? "favorite"
     ngramCount <- obj .? "id"
     hyperdata  <- obj .? "hyperdata"
-    pure $ Response { cid, favorite, ngramCount, hyperdata }
+    pure $ Response { cid, category: decodeCategory favorite, ngramCount, hyperdata }
 
 
-
--- | Filter
-filterSpec :: forall state props action. Spec state props action
-filterSpec = simpleSpec defaultPerformAction render
+docViewSpec :: Props -> R.Element
+docViewSpec p = R.createElement el p []
   where
-    render d p s c = [] {-[div [ className "col-md-2", style {textAlign : "center", marginLeft : "0px", paddingLeft : "0px"}] [ text "    Filter "
-                     , input [className "form-control", placeholder "Filter here"]
-                     ]] -}
+    el = R.hooksComponent "DocView" cpt
+    cpt p _children = do
+      query <- R.useState' ("" :: Query)
+      tableParams <- R.useState' T.initialParams
 
-docViewSpec :: Spec {} Props Void
-docViewSpec = hideState (const initialState) layoutDocview
+      pure $ layoutDocview query tableParams p
 
 -- | Main layout of the Documents Tab of a Corpus
-layoutDocview :: Spec State Props Action
-layoutDocview = simpleSpec performAction render
+layoutDocview :: R.State Query -> R.State T.Params -> Props -> R.Element
+layoutDocview query tableParams@(params /\ _) p = R.createElement el p []
   where
-    performAction :: PerformAction State Props Action
-    performAction (MarkFavorites nid fav) {nodeId} _ = do
-      modifyState_ $ _localFavorites <<< at nid ?~ fav
-      void $ lift $ if fav
-        then putFavorites    nodeId (FavoriteQuery {favorites: [nid]})
-        else deleteFavorites nodeId (FavoriteQuery {favorites: [nid]})
-    performAction (ToggleDocumentToDelete nid) _ _ =
-      modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
-    performAction Trash {nodeId} {documentIdsToDelete} = do
-      void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
-      modifyState_ $
-        (_documentIdsToDelete .~ mempty) >>>
-        (_documentIdsDeleted <>~ documentIdsToDelete)
-
-    render :: Render State Props Action
-    render dispatch {nodeId, tabType, listId, totalRecords, chart} deletionState _ =
-      [ {- br'
-      , div [ style {textAlign : "center"}] [ text "    Filter "
-                     , input [className "form-control", style {width : "120px", display : "inline-block"}, placeholder "Filter here"]
-                     ]
-      , p [] [text ""]
-      , br'
-      -}
-      div [className "container1"]
-        [ div [className "row"]
+    el = R.hooksComponent "LayoutDocView" cpt
+    cpt {nodeId, tabType, listId, corpusId, totalRecords, chart, showSearch} _children = do
+      pure $ H.div {className: "container1"}
+        [ H.div {className: "row"}
           [ chart
-          , div [className "col-md-12"]
-            [ pageLoader
-                { path: initialPageParams {nodeId, tabType, listId}
-                , listId
-                , totalRecords
-                , deletionState
-                , dispatch
+          , if showSearch then searchBar query else H.div {} []
+          , H.div {className: "col-md-12"}
+            [ pageLoader tableParams {nodeId, totalRecords, tabType, listId, corpusId, query: fst query} ]
+          , H.div {className: "col-md-1 col-md-offset-11"}
+            [ H.button { className: "btn"
+                       , style: {backgroundColor: "peru", color : "white", border : "white"}
+                       , onClick: onClickTrashAll nodeId
                        }
+              [  H.i {className: "glyphitem glyphicon glyphicon-trash"} []
+              ,  H.text "Trash all"
               ]
-          , div [className "col-md-12"]
-             [ button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
-                      , onClick $ (\_ -> dispatch Trash)
             ]
-               [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
-               ,  text "Trash it !"
           ]
         ]
+
+    onClickTrashAll nodeId = mkEffectFn1 $ \_ -> do
+      launchAff $ deleteAllDocuments nodeId
+
+searchBar :: R.State Query -> R.Element
+searchBar (query /\ setQuery) = R.createElement el {} []
+  where
+    el = R.hooksComponent "SearchBar" cpt
+    cpt {} _children = do
+      queryText <- R.useState' query
+
+      pure $ H.div {className: "row"}
+        [ H.div {className: "col col-md-3 form-group"}
+          [ H.input { type: "text"
+                    , className: "form-control"
+                    , on: {change: onSearchChange queryText, keyUp: onSearchKeyup queryText}
+                    , placeholder: query
+                    , defaultValue: query}
           ]
+        , H.div {className: "col col-md-1"}
+          [ searchButton queryText
+          , if query /= "" then clearButton else H.div {} []
           ]
         ]
 
+    onSearchChange :: forall e. R.State Query -> e -> Effect Unit
+    onSearchChange (_ /\ setQueryText) = \e ->
+      setQueryText $ const $ R2.unsafeEventValue e
+
+    onSearchKeyup :: R.State Query -> DE.KeyboardEvent -> Effect Unit
+    onSearchKeyup (queryText /\ _) = \e ->
+      if DE.key e == "Enter" then
+        setQuery $ const queryText
+      else
+        pure $ unit
+
+    searchButton (queryText /\ _) =
+      H.button { type: "submit"
+               , className: "btn btn-default"
+               , on: {click: \e -> setQuery $ const queryText}}
+      [ H.span {className: "glyphicon glyphicon-search"} [] ]
+
+    clearButton =
+      H.button { className: "btn btn-danger"
+               , on: {click: \e -> setQuery $ const ""}}
+      [ H.span {className: "glyphicon glyphicon-remove"} [] ]
+
 mock :: Boolean
 mock = false
 
-type PageParams = {nodeId :: Int, listId :: Int, tabType :: TabType, params :: T.Params}
-
-initialPageParams :: {nodeId :: Int, listId :: Int, tabType :: TabType} -> PageParams
-initialPageParams {nodeId, listId, tabType} =
-  {nodeId, tabType, listId, params: T.initialParams}
+type PageParams = { nodeId :: Int
+                  , listId :: Int
+                  , corpusId :: Maybe Int
+                  , tabType :: TabType
+                  , query   :: Query
+                  , params :: T.Params}
 
 loadPage :: PageParams -> Aff (Array DocumentsView)
-loadPage {nodeId, tabType, listId, params: {limit, offset, orderBy}} = do
+loadPage {nodeId, tabType, query, listId, corpusId, params: {limit, offset, orderBy}} = do
   logs "loading documents page: loadPage with Offset and limit"
-  res <- get $ toUrl Back (Tab tabType offset limit (convOrderBy <$> orderBy)) (Just nodeId)
+  -- res <- get $ toUrl Back (Tab tabType offset limit (convOrderBy <$> orderBy)) (Just nodeId)
+  let url = (toUrl Back Node (Just nodeId)) <> "/table"
+  res <- post url $ TabPostQuery {
+      offset
+    , limit
+    , orderBy: convOrderBy orderBy
+    , tabType
+    , query
+    }
   let docs = res2corpus <$> res
-  --_ <- logs "Ok: loading page documents"
-  --_ <- logs $ map show docs
   pure $
     if mock then take limit $ drop offset sampleData else
     docs
@@ -234,109 +247,106 @@ loadPage {nodeId, tabType, listId, params: {limit, offset, orderBy}} = do
       , date   : (\(Hyperdata hr) -> hr.pub_year) r.hyperdata
       , title  : (\(Hyperdata hr) -> hr.title) r.hyperdata
       , source : (\(Hyperdata hr) -> hr.source) r.hyperdata
-      , fav    : r.favorite
+      , category : r.category
       , ngramCount : r.ngramCount
-      , delete : false
      }
-    convOrderBy (T.ASC  (T.ColumnName "Date"))  = DateAsc
-    convOrderBy (T.DESC (T.ColumnName "Date"))  = DateDesc
-    convOrderBy (T.ASC  (T.ColumnName "Title")) = TitleAsc
-    convOrderBy (T.DESC (T.ColumnName "Title")) = TitleDesc
-    convOrderBy (T.ASC  (T.ColumnName "Source")) = SourceAsc
-    convOrderBy (T.DESC (T.ColumnName "Source")) = SourceDesc
+    convOrderBy (Just (T.ASC  (T.ColumnName "Date")))  = DateAsc
+    convOrderBy (Just (T.DESC (T.ColumnName "Date")))  = DateDesc
+    convOrderBy (Just (T.ASC  (T.ColumnName "Title"))) = TitleAsc
+    convOrderBy (Just (T.DESC (T.ColumnName "Title"))) = TitleDesc
+    convOrderBy (Just (T.ASC  (T.ColumnName "Source"))) = SourceAsc
+    convOrderBy (Just (T.DESC (T.ColumnName "Source"))) = SourceDesc
 
     convOrderBy _ = DateAsc -- TODO
 
-type PageLoaderProps row =
-  { path :: PageParams
-  , totalRecords :: Int
-  , dispatch :: Action -> Effect Unit
-  , deletionState :: State
-  , listId :: Int
-  | row
-  }
-
-renderPage :: forall props path.
-              Render (Loader.State {nodeId :: Int, listId :: Int, tabType :: TabType | path} (Array DocumentsView))
-                     { totalRecords :: Int
-                     , dispatch :: Action -> Effect Unit
-                     , deletionState :: State
-                     , listId :: Int
-                     | props
-                     }
-                     (Loader.Action PageParams)
-renderPage _ _ {loaded: Nothing} _ = [] -- TODO loading spinner
-renderPage loaderDispatch { totalRecords, dispatch, listId
-                          , deletionState: {documentIdsToDelete, documentIdsDeleted, localFavorites}}
-                          {currentPath: {nodeId, tabType}, loaded: Just res} _ =
-  [ T.tableElt
-      { rows
-      , setParams: \params -> liftEffect $ loaderDispatch (Loader.SetPath {nodeId, tabType, listId, params})
+renderPage :: R.State T.Params -> PageLoaderProps -> Array DocumentsView -> R.Element
+renderPage (_ /\ setTableParams) p res = R.createElement el p []
+  where
+    el = R.hooksComponent "RenderPage" cpt
+
+    gi Favorite  = "glyphicon glyphicon-star"
+    gi _ = "glyphicon glyphicon-star-empty"
+    trashStyle Trash = {textDecoration: "line-through"}
+    trashStyle _ = {textDecoration: "none"}
+    corpusDocument (Just corpusId) = Router.CorpusDocument corpusId
+    corpusDocument _ = Router.Document
+
+    cpt {nodeId, corpusId, listId, totalRecords} _children = do
+      localCategories <- R.useState' (mempty :: LocalCategories)
+
+      pure $ R2.buff $ T.tableElt
+          { rows: rows localCategories
+          -- , setParams: \params -> liftEffect $ loaderDispatch (Loader.SetPath {nodeId, tabType, listId, corpusId, params, query})
+          , setParams: \params -> setTableParams $ const params
           , container: T.defaultContainer { title: "Documents" }
           , colNames:
             T.ColumnName <$>
-          [ ""
+            [ "Map"
+            , "Stop"
             , "Date"
             , "Title"
             , "Source"
-          , "Delete"
             ]
           , totalRecords
           }
-  ]
       where
-    gi true  = "glyphicon glyphicon-star"
-    gi false = "glyphicon glyphicon-star-empty"
-    isChecked _id = Set.member _id documentIdsToDelete
-    toDelete  (DocumentsView {_id}) = Set.member _id documentIdsToDelete
-    isDeleted (DocumentsView {_id}) = Set.member _id documentIdsDeleted
-    isFavorite {_id,fav} = maybe fav identity (localFavorites ^. at _id)
-    rows = (\(DocumentsView r) ->
-                let isFav = isFavorite r in
-                { row:
-                    [ div []
-                      [ a [ className $ gi isFav
-                          , if (toDelete $ DocumentsView r) then style {textDecoration : "line-through"}
-                                                            else style {textDecoration : "none"}
-                          , onClick $ (\_-> dispatch $ MarkFavorites r._id (not isFav))] []
+        getCategory (localCategories /\ _) {_id, category} = maybe category identity (localCategories ^. at _id)
+        rows localCategories = (\(DocumentsView r) ->
+                    let cat = getCategory localCategories r
+                        isDel = Trash == cat in
+                    { row: map R2.scuff $ [
+                          H.div {}
+                          [ H.a { className: gi cat
+                                , style: trashStyle cat
+                                , on: {click: onClick localCategories Favorite r._id cat}
+                                } []
                           ]
+                        , H.input { type: "checkbox"
+                                  , defaultChecked: isDel
+                                  , on: {click: onClick localCategories Trash r._id cat}
+                                  }
                         -- TODO show date: Year-Month-Day only
-                    , if (toDelete $ DocumentsView r) then
-                        div [ style {textDecoration : "line-through"}][text (show r.date)]
-                      else
-                        div [ ][text (show r.date)]
-                    , if (toDelete $ DocumentsView r) then
-                        a [ href (toLink $ R.Document listId r._id)
-                          , style {textDecoration : "line-through"}
-                          , target "_blank"
-                        ] [ text r.title ]
-                      else
-                        a [ href (toLink $  R.Document listId r._id)
-                        , target "_blank" ] [ text r.title ]
-                    , if (toDelete $ DocumentsView r) then
-                        div [style {textDecoration : "line-through"}] [ text r.source]
-                      else
-                        div [] [ text r.source]
-                    , input [ _type "checkbox"
-                            , checked (isChecked r._id)
-                            , onClick $ (\_ -> dispatch $ ToggleDocumentToDelete r._id)]
+                        , H.div { style: trashStyle cat } [ H.text (show r.date) ]
+                        , H.a { href: toLink $ (corpusDocument corpusId) listId r._id
+                              , style: trashStyle cat
+                              , target: "_blank"
+                              } [ H.text r.title ]
+                        , H.div { style: trashStyle cat} [ H.text r.source ]
                         ]
                     , delete: true
-                }) <$> filter (not <<< isDeleted) res
-
-pageLoaderClass :: ReactClass (PageLoaderProps (children :: Children))
-pageLoaderClass = Loader.createLoaderClass' "PageLoader" loadPage renderPage
-
-pageLoader :: PageLoaderProps () -> ReactElement
-pageLoader props = React.createElement pageLoaderClass props []
+                    }) <$> res
+        onClick (_ /\ setLocalCategories) catType nid cat = \_-> do
+          let newCat = if (catType == Favorite) then (favCategory cat) else (trashCategory cat)
+          setLocalCategories $ insert nid newCat
+          void $ launchAff $ putCategories nodeId $ CategoryQuery {nodeIds: [nid], category: newCat}
+
+pageLoader :: R.State T.Params -> PageLoaderProps -> R.Element
+pageLoader tableParams@(pageParams /\ _) p = R.createElement el p []
+  where
+    el = R.hooksComponent "PageLoader" cpt
+    cpt p@{nodeId, listId, corpusId, tabType, query} _children = do
+      useLoader {nodeId, listId, corpusId, tabType, query, params: pageParams} loadPage $ \{loaded} ->
+        renderPage tableParams p loaded
 
 ---------------------------------------------------------
 sampleData' :: DocumentsView
-sampleData' = DocumentsView {_id : 1, url : "", date : 2010, title : "title", source : "source", fav : false, ngramCount : 1, delete : false}
+sampleData' = DocumentsView { _id : 1
+                            , url : ""
+                            , date : 2010
+                            , title : "title"
+                            , source : "source"
+                            , category : Normal
+                            , ngramCount : 1}
 
 sampleData :: Array DocumentsView
 --sampleData = replicate 10 sampleData'
-sampleData = map (\(Tuple t s) -> DocumentsView {_id : 1, url : "", date : 2017, title: t, source: s, fav : false, ngramCount : 10, delete : false}) sampleDocuments
+sampleData = map (\(Tuple t s) -> DocumentsView { _id : 1
+                                                , url : ""
+                                                , date : 2017
+                                                , title: t
+                                                , source: s
+                                                , category : Normal
+                                                , ngramCount : 10}) sampleDocuments
 
 sampleDocuments :: Array (Tuple String String)
 sampleDocuments = [Tuple "Macroscopic dynamics of the fusion process" "Journal de Physique Lettres",Tuple "Effects of static and cyclic fatigue at high temperature upon reaction bonded silicon nitride" "Journal de Physique Colloques",Tuple "Reliability of metal/glass-ceramic junctions made by solid state bonding" "Journal de Physique Colloques",Tuple "High temperature mechanical properties and intergranular structure of sialons" "Journal de Physique Colloques",Tuple "SOLUTIONS OF THE LANDAU-VLASOV EQUATION IN NUCLEAR PHYSICS" "Journal de Physique Colloques",Tuple "A STUDY ON THE FUSION REACTION 139La + 12C AT 50 MeV/u WITH THE VUU EQUATION" "Journal de Physique Colloques",Tuple "Atomic structure of \"vitreous\" interfacial films in sialon" "Journal de Physique Colloques",Tuple "MICROSTRUCTURAL AND ANALYTICAL CHARACTERIZATION OF Al2O3/Al-Mg COMPOSITE INTERFACES" "Journal de Physique Colloques",Tuple "Development of oxidation resistant high temperature NbTiAl alloys and intermetallics" "Journal de Physique IV Colloque",Tuple "Determination of brazed joint constitutive law by inverse method" "Journal de Physique IV Colloque",Tuple "Two dimensional estimates from ocean SAR images" "Nonlinear Processes in Geophysics",Tuple "Comparison Between New Carbon Nanostructures Produced by Plasma with Industrial Carbon Black Grades" "Journal de Physique III",Tuple "<i>Letter to the Editor:</i> SCIPION, a new flexible ionospheric sounder in Senegal" "Annales Geophysicae",Tuple "Is reducibility in nuclear multifragmentation related to thermal scaling?" "Physics Letters B",Tuple "Independence of fragment charge distributions of the size of heavy multifragmenting sources" "Physics Letters B",Tuple "Hard photons and neutral pions as probes of hot and dense nuclear matter" "Nuclear Physics A",Tuple "Surveying the nuclear caloric curve" "Physics Letters B",Tuple "A hot expanding source in 50 A MeV Xe+Sn central reactions" "Physics Letters B"]
@@ -360,36 +370,11 @@ searchResults :: SearchQuery -> Aff Int
 searchResults squery = post "http://localhost:8008/count" unit
   -- TODO
 
+documentsUrl :: Int -> String
+documentsUrl nodeId = toUrl Back Node (Just nodeId) <> "/documents"
 
-
-newtype FavoriteQuery = FavoriteQuery
-                        { favorites :: Array Int
-                        }
-
-instance encodeJsonFQuery :: EncodeJson FavoriteQuery where
-  encodeJson (FavoriteQuery post)
-     = "favorites" := post.favorites
-       ~> jsonEmptyObject
-
-newtype DeleteDocumentQuery = DeleteDocumentQuery
-  {
-    documents :: Array Int
-  }
-
-
-instance encodeJsonDDQuery :: EncodeJson DeleteDocumentQuery where
-  encodeJson (DeleteDocumentQuery post)
-     = "documents" := post.documents
-       ~> jsonEmptyObject
-
-putFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-putFavorites nodeId = put (toUrl Back Node (Just nodeId) <> "/favorites")
-
-deleteFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-deleteFavorites nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/favorites")
-
-deleteDocuments :: Int -> DeleteDocumentQuery -> Aff (Array Int)
-deleteDocuments nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/documents")
+deleteAllDocuments :: Int -> Aff (Array Int)
+deleteAllDocuments nodeId = delete $ documentsUrl nodeId
 
 -- TODO: not optimal but Data.Set lacks some function (Set.alter)
 toggleSet :: forall a. Ord a => a -> Set a -> Set a

src/Gargantext/Components/FacetsTable.purs

@@ -26,10 +26,12 @@ import React as React
 import React (ReactClass, ReactElement, Children)
 ------------------------------------------------------------------------
 import Gargantext.Prelude
-import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, toUrl)
+import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, toUrl, toLink)
 import Gargantext.Config.REST (put, post, deleteWithBody)
 import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Search.Types (Category(..), CategoryQuery(..), favCategory, trashCategory, decodeCategory, putCategories)
 import Gargantext.Components.Table as T
+import Gargantext.Router as Router
 import Gargantext.Utils (toggleSet)
 import Gargantext.Utils.DecodeMaybe ((.|))
 import React.DOM (a, br', button, div, i, input, p, text, span)
@@ -83,9 +85,9 @@ initialState =
   }
 
 data Action
-  = MarkFavorites (Array Int)
+  = MarkCategory Category (Array Int)
   | ToggleDocumentToDelete Int
-  | Trash
+  | TrashDocuments
 
 newtype Pair = Pair
   { id    :: Int
@@ -106,9 +108,9 @@ newtype DocumentsView
     , score  :: Int
     , pairs  :: Array Pair
     , delete :: Boolean
+    , category :: Category
     }
 
-
 derive instance genericDocumentsView :: Generic DocumentsView _
 
 instance showDocumentsView :: Show DocumentsView where
@@ -118,7 +120,7 @@ newtype Response = Response
   { id         :: Int
   , created    :: String
   , hyperdata  :: Hyperdata
-  , favorite   :: Boolean
+  , category   :: Category
   , ngramCount :: Int
 -- , date      :: String
 -- , score     :: Int
@@ -174,7 +176,7 @@ instance decodeResponse :: DecodeJson Response where
     hyperdata  <- obj .? "hyperdata"
     favorite   <- obj .? "favorite"
     ngramCount <- obj .? "ngramCount"
-    pure $ Response { id, created, hyperdata, favorite, ngramCount }
+    pure $ Response { id, created, hyperdata, category: decodeCategory favorite, ngramCount }
 
 -- | Filter
 -- TODO: unused
@@ -194,12 +196,12 @@ layoutDocview :: Spec State Props Action
 layoutDocview = simpleSpec performAction render
   where
     performAction :: PerformAction State Props Action
-    performAction (MarkFavorites nids) {nodeId} _ =
-      void $ lift $ putFavorites nodeId (FavoriteQuery {favorites: nids})
+    performAction (MarkCategory category nids) {nodeId} _ =
+      void $ lift $ putCategories nodeId $ CategoryQuery {nodeIds: nids, category: favCategory category}
     --TODO add array of delete rows here
     performAction (ToggleDocumentToDelete nid) _ _ =
       modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
-    performAction Trash {nodeId} {documentIdsToDelete} = do
+    performAction TrashDocuments {nodeId} {documentIdsToDelete} = do
       void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
       modifyState_ \{documentIdsToDelete, documentIdsDeleted} ->
         { documentIdsToDelete: mempty
@@ -229,7 +231,7 @@ layoutDocview = simpleSpec performAction render
             ]
           , div [className "col-md-12"]
              [ button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
-                      , onClick $ (\_ -> dispatch Trash)
+                      , onClick $ (\_ -> dispatch TrashDocuments)
                       ]
                [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
                ,  text "Trash it !"
@@ -245,12 +247,12 @@ layoutDocviewGraph :: Spec State Props Action
 layoutDocviewGraph = simpleSpec performAction render
   where
     performAction :: PerformAction State Props Action
-    performAction (MarkFavorites nids) {nodeId} _ =
-      void $ lift $ putFavorites nodeId (FavoriteQuery {favorites: nids})
+    performAction (MarkCategory category nids) {nodeId} _ =
+      void $ lift $ putCategories nodeId $ CategoryQuery {nodeIds: nids, category: favCategory category}
     --TODO add array of delete rows here
     performAction (ToggleDocumentToDelete nid) _ _ =
       modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
-    performAction Trash {nodeId} {documentIdsToDelete} = do
+    performAction TrashDocuments {nodeId} {documentIdsToDelete} = do
       void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
       modifyState_ \{documentIdsToDelete, documentIdsDeleted} ->
         { documentIdsToDelete: mempty
@@ -275,7 +277,7 @@ layoutDocviewGraph = simpleSpec performAction render
                 , container
                 }
             , button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
-                      , onClick $ (\_ -> dispatch Trash)
+                      , onClick $ (\_ -> dispatch TrashDocuments)
                       ]
                [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
                ,  text "Trash it !"
@@ -303,7 +305,7 @@ loadPage {nodeId, listId, query, params: {limit, offset, orderBy}} = do
     res2corpus :: Response -> DocumentsView
     res2corpus (Response { id, created: date, ngramCount: score
                          , hyperdata: Hyperdata {title, source}
-                      -- favorite TODO
+                         , category
                          }) =
       DocumentsView
         { id
@@ -313,6 +315,7 @@ loadPage {nodeId, listId, query, params: {limit, offset, orderBy}} = do
         , score
         , pairs: []
         , delete: false
+        , category
         }
     convOrderBy (T.ASC  (T.ColumnName "Date")) = DateAsc
     convOrderBy (T.DESC (T.ColumnName "Date")) = DateDesc
@@ -363,7 +366,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container
   ]
   where
     -- TODO: how to interprete other scores?
-    gi 0 = "glyphicon glyphicon-star-empty"
+    gi Favorite = "glyphicon glyphicon-star-empty"
     gi _ = "glyphicon glyphicon-star"
     isChecked id = Set.member id documentIdsToDelete
     isDeleted (DocumentsView {id}) = Set.member id documentIdsDeleted
@@ -371,7 +374,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container
       | id > 1    = [a [href (toUrl Front NodeContact (Just id)), target "blank"] [text label]]
       | otherwise = [text label]
     comma = span [] [text ", "]
-    rows = (\(DocumentsView {id,score,title,source,date,pairs,delete}) ->
+    rows = (\(DocumentsView {id,score,title,source,date,pairs,delete,category}) ->
                 let
                   strikeIfDeleted
                     | delete    = [style {textDecoration : "line-through"}]
@@ -379,13 +382,13 @@ renderPage loaderDispatch { totalRecords, dispatch, container
                 in
                 { row:
                     [ div []
-                      [ a [ className $ gi score
-                          , onClick $ const $ dispatch $ MarkFavorites [id]
+                      [ a [ className $ gi category
+                          , onClick $ const $ dispatch $ MarkCategory category [id]
                           ] []
                       ]
                     -- TODO show date: Year-Month-Day only
                     , div strikeIfDeleted [text date]
-                    , a (strikeIfDeleted <> [ href (toUrl Front (ListDocument (Just listId)) (Just id))
+                    , a (strikeIfDeleted <> [ href $ toLink $ Router.Document listId id
                                             , target "blank"])
                         [ text title ]
                     , div strikeIfDeleted [text source]
@@ -405,15 +408,6 @@ pageLoader props = React.createElement pageLoaderClass props []
 
 ---------------------------------------------------------
 
-newtype FavoriteQuery = FavoriteQuery
-                        { favorites :: Array Int
-                        }
-
-instance encodeJsonFQuery :: EncodeJson FavoriteQuery where
-  encodeJson (FavoriteQuery post)
-     = "favorites" := post.favorites
-       ~> jsonEmptyObject
-
 newtype DeleteDocumentQuery = DeleteDocumentQuery
   {
     documents :: Array Int
@@ -425,11 +419,5 @@ instance encodeJsonDDQuery :: EncodeJson DeleteDocumentQuery where
      = "documents" := post.documents
        ~> jsonEmptyObject
 
-putFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-putFavorites nodeId = put (toUrl Back Node (Just nodeId) <> "/favorites")
-
-deleteFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-deleteFavorites nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/favorites")
-
 deleteDocuments :: Int -> DeleteDocumentQuery -> Aff (Array Int)
 deleteDocuments nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/documents")

src/Gargantext/Components/GraphExplorer.purs

@@ -40,6 +40,7 @@ import Gargantext.Types (class Optional)
 import Gargantext.Utils (toggleSet)
 import Gargantext.Utils.Reactix as R2
 import Partial.Unsafe (unsafePartial)
+import Thermite (Spec)
 import Unsafe.Coerce (unsafeCoerce)
 import Web.HTML (window)
 import Web.HTML.Window (localStorage)
@@ -49,13 +50,14 @@ import Reactix.DOM.HTML as RH
 
 type Props s fa2 = ()
 
-spec = R2.scuff $ explorer {}
+spec :: forall s fa2. Spec {} (Record (Props s fa2)) Void
+spec = R2.elSpec $ explorerCpt
 
 explorer :: forall s fa2. Record (Props s fa2) -> R.Element
 explorer props = R.createElement explorerCpt props []
 
 explorerCpt :: forall s fa2. R.Component (Props s fa2)
-explorerCpt = R.hooksComponent "Explorer" cpt
+explorerCpt = R.hooksComponent "GraphExplorer" cpt
   where
     cpt props _ = do
       controls <- Controls.useGraphControls

src/Gargantext/Components/Loader2.purs

+module Gargantext.Components.Loader2 where
+
+import Data.Maybe (Maybe(..), isNothing)
+import Data.Tuple.Nested ((/\))
+import Gargantext.Prelude
+import Effect.Aff (Aff, launchAff, launchAff_, killFiber)
+import Effect.Class (liftEffect)
+import Effect.Exception (error)
+import Reactix as R
+
+type Props path loaded = { path :: path, loaded :: loaded }
+
+type State path loaded = { currentPath :: path, loaded :: Maybe loaded }
+
+useLoader
+  :: forall path loaded
+  .  Eq path
+  => Show path
+  => path
+  -> (path -> Aff loaded)
+  -> (Props path loaded -> R.Element)
+  -> R.Hooks R.Element
+useLoader newPath loader render = do
+  {currentPath, loaded} /\ setState <- R.useState' { currentPath: newPath, loaded: Nothing }
+
+  R.useEffect $
+    if (isNothing loaded || newPath /= currentPath) then do
+      logs $ "useLoader " <> show {newPath, currentPath, loadedIsNothing: isNothing loaded}
+
+      fiber <- launchAff do
+        freshlyLoaded <- loader newPath
+        liftEffect $ setState $ const { currentPath: newPath, loaded: Just freshlyLoaded }
+      pure $ launchAff_ $ killFiber (error "useLoader") fiber
+    else do
+      pure $ pure $ unit
+
+  pure case loaded of
+    Nothing ->
+      -- TODO load spinner
+      R.fragment []
+    Just loadedData ->
+      render {path: currentPath, loaded: loadedData}

src/Gargantext/Components/Login.purs

@@ -2,16 +2,17 @@ module Gargantext.Components.Login where
 
 import Control.Monad.Cont.Trans (lift)
 import Data.Int as Int
-import Data.Lens (over, view)
+import Data.Lens (over)
 import Data.Maybe (Maybe(..))
-import Data.Traversable (traverse_)
+import Data.Tuple.Nested((/\))
 import Effect.Class (liftEffect)
 import Effect (Effect)
 import Effect.Aff (Aff)
-import React.DOM (a, button, div, h2, h4, h5, i, input, label, p, span, text)
-import React.DOM.Props (_data, _id, _type, aria, className, href, maxLength, name, onClick, onInput, placeholder, role, target, value)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import React.DOM (button, div, h5, span, text)
+import React.DOM.Props (_data, _id, _type, aria, className, role)
 import Thermite (PerformAction, Render, Spec, _render, modifyState_, simpleSpec)
-import Unsafe.Coerce (unsafeCoerce)
 import Web.HTML (window)
 import Web.HTML.Window (localStorage)
 import Web.Storage.Storage (getItem, setItem, removeItem)
@@ -22,6 +23,7 @@ import Gargantext.Config (toUrl, Path(..), End(..))
 import Gargantext.Config.REST (post)
 import Gargantext.Components.Modals.Modal (modalHide)
 import Gargantext.Components.Login.Types
+import Gargantext.Utils.Reactix as R2
 
 -- TODO: ask for login (modal) or account creation after 15 mn when user
 -- is not logged and has made one search at least
@@ -46,8 +48,7 @@ initialState = do
 
 data Action
   = PostAuth
-  | SetUserName String
-  | SetPassword String
+  | SetCredentials String String
 
 
 modalSpec :: forall props. Boolean -> String -> Spec State props Action -> Spec State props Action
@@ -80,18 +81,10 @@ modalSpec sm t = over _render \render d p s c ->
 spec' :: Spec State {} Action
 spec' = modalSpec true "Login" renderSpec
 
-renderSpec :: Spec State {} Action
-renderSpec = simpleSpec performAction render
-  where
-    performAction :: PerformAction State {} Action
-
-    performAction (SetUserName usr) _ _ =
-      modifyState_ $ _ { username = usr }
-
-    performAction (SetPassword pwd) _ _ =
-      modifyState_ $ _ { password = pwd }
-
-    performAction PostAuth _ {username, password} = do
+performAction :: PerformAction State {} Action
+performAction (SetCredentials usr pwd) _ _ = do
+  modifyState_ $ _ { username = usr, password = pwd }
+performAction PostAuth _ {username, password} = do
   res <- lift $ postAuthRequest $ AuthRequest {username, password}
   case res of
     AuthResponse {inval: Just (AuthInvalid {message})} ->
@@ -101,94 +94,132 @@ renderSpec = simpleSpec performAction render
       modifyState_ $ _ {authData = valid, errorMessage = ""}
       liftEffect $ modalHide "loginModal"
 
+renderSpec :: Spec State {} Action
+renderSpec = simpleSpec performAction render
+  where
     render :: Render State {} Action
     render dispatch _ state _ =
-      [ div [className "row"]
-        [ div [className "col-md-10 col-md-push-1"]
-          [ h2 [className "text-primary center m-a-2"]
-            [ i [className "material-icons md-36"] [text "control_point"]
-            , span [className "icon-text"] [text "Gargantext"]
-            ]
-          , div [className "card-group"]
-            [ div [className "card"]
-              [ div [className "card-block"]
-                [ div [className "center"]
-                  [ h4 [className "m-b-0"]
-                    [ span [className "icon-text"] [ text "Welcome :)"] ]
-                  , p [className "text-muted"]
-                    [ text $ "Login to your account or",
-                      a [ target "blank",href "https://iscpif.fr/services/applyforourservices/"] [text " ask to get an access"]
-                    ]
-                  ]
-                , div []
-                  [ input [_type "hidden",
-                           name "csrfmiddlewaretoken",
-                           -- TODO hard-coded CSRF token
-                           value "Wy52D2nor8kC1r1Y4GrsrSIxQ2eqW8UwkdiQQshMoRwobzU4uldknRUhP0j4WcEM" ]
+      [R2.scuff $ renderCpt dispatch state]
+
+
+renderCpt :: (Action -> Effect Unit) -> State -> R.Element
+renderCpt d s = R.createElement el {} []
+  where
+    el = R.hooksComponent "RenderComponent" cpt
+    cpt {} _children = do
+      (state /\ setState) <- R.useState' s
+
+      R.useEffect $
+        if (state /= s) then do
+          _ <- d $ SetCredentials state.username state.password
+          pure $ d $ PostAuth
+        else
+          pure $ pure $ unit
+
+      pure $ renderLogin (state /\ setState)
 
-                  , div [className "form-group"]
-                    [ p [] [text state.errorMessage]
-                    , input [className "form-control", _id "id_username",maxLength "254", name "username", placeholder "username", _type "text",value state.username,  onInput \e -> dispatch (SetUserName (unsafeEventValue e))]
+renderLogin :: R.State State -> R.Element
+renderLogin (state /\ setState) = R.createElement el {} []
+  where
+    el = R.hooksComponent "RenderLogin" cpt
+    cpt {} _children = do
+      username <- R.useState' state.username
+      password <- R.useState' state.password
+
+      pure $ H.div {className: "row"}
+        [ gargLogo
+        , H.div {className: "card-group"}
+          [ H.div {className: "card"}
+            [ H.div {className: "card-block"}
+              [ H.div {className: "center"}
+                [ H.h4 {className: "m-b-0"}
+                  [ H.span {className: "icon-text"}
+                    [ H.text "Welcome :)"]
+                  ]
+                , H.p {className: "text-muted"}
+                  [ H.text $ "Login to your account or",
+                    H.a { target: "blank"
+                        , href: "https://iscpif.fr/services/applyforourservices/"
+                        }
+                    [H.text " ask to get an access"]
                   ]
-                  , div [className "form-group"]
-                    [ input [className "form-control", _id "id_password", name "password", placeholder "password", _type "password",value state.password,onInput \e -> dispatch (SetPassword (unsafeEventValue e))]
-                    , div [className "clearfix"] []
                 ]
-                  , div [className "center"]
-                    [ label []
-                      [ div [className "checkbox"]
-                        [ input [_id "terms-accept", _type "checkbox", value "", className "checkbox"]
-                        , text "I accept the terms of uses ",
-                          a [href "http://gitlab.iscpif.fr/humanities/tofu/tree/master"] [text " [ Read the terms of use ] "]
+              , H.div {}
+                [ H.input { type: "hidden"
+                          , name: "csrfmiddlewaretoken"
+                            -- TODO hard-coded CSRF token
+                          , value: "Wy52D2nor8kC1r1Y4GrsrSIxQ2eqW8UwkdiQQshMoRwobzU4uldknRUhP0j4WcEM"
+                          }
+
+                , H.div {className: "form-group"}
+                  [ H.p {} [H.text state.errorMessage]
+                  , usernameInput username
+                  ]
+                , H.div {className: "form-group"}
+                  [ passwordInput password
+                  , H.div {className: "clearfix"} []
+                  ]
+                , H.div {className: "center"}
+                  [ H.label {}
+                    [ H.div {className: "checkbox"}
+                      [ H.input { id: "terms-accept"
+                                , type: "checkbox"
+                                , value: ""
+                                , className: "checkbox"
+                                }
+                      , H.text "I accept the terms of uses "
+                      , H.a {href: "http://gitlab.iscpif.fr/humanities/tofu/tree/master"}
+                        [ H.text " [ Read the terms of use ] "]
                       ]
-                      , button [_id "login-button",className "btn btn-primary btn-rounded", _type "submit", onClick \_ -> dispatch $ PostAuth] [text "Login"]
                     ]
+                  , H.button { id: "login-button"
+                             , className: "btn btn-primary btn-rounded"
+                             , type: "submit"
+                                   -- TODO
+                                   --, on: {click: \_ -> dispatch $ PostAuth}
+                             , on: {click: onClick username password}
+                             }
+                    [H.text "Login"]
                   ]
                 ]
               ]
             ]
           ]
         ]
+
+    gargLogo =
+      H.div {className: "col-md-10 col-md-push-1"}
+      [ H.h2 {className: "text-primary center m-a-2"}
+        [ H.i {className: "material-icons md-36"}
+          [H.text "control_point"]
+        , H.span {className: "icon-text"}
+          [H.text "Gargantext"]
         ]
       ]
+    usernameInput (username /\ setUsername) =
+      H.input { className: "form-control"
+              , id: "id_username"
+              , maxLength: "254"
+              , name: "username"
+              , placeholder: "username"
+              , type: "text"
+              , defaultValue: username
+                --, on: {input: \e -> dispatch (SetUserName $ R2.unsafeEventValue e)}
+              , on: {change: \e -> setUsername $ const $ R2.unsafeEventValue e}
+              }
+    passwordInput (password /\ setPassword) =
+      H.input { className: "form-control"
+              , id: "id_password"
+              , name: "password"
+              , placeholder: "password"
+              , type: "password"
+              , defaultValue: password
+              --, on: {input: \e -> dispatch (SetPassword $ R2.unsafeEventValue e)}
+              , on: {change: \e -> setPassword $ const $ R2.unsafeEventValue e}
+              }
+    onClick (username /\ _) (password /\ _) = \e -> do
+      setState $ \st -> st {username = username, password = password}
 
-      -- div [ className "modal fade myModal"
-      --                    , role "dialog"
---                    , _data {show : true}
---                    ][ div [ className "modal-dialog"
---                           , role "document"
---                           ] [ div [ className "modal-content"]
---                                   [ div [ className "modal-header"]
---                                         [ h5 [ className "modal-title"
---                                              ]
---                                              [ text "CorpusView"
---                                              ]
---                                         , button [ _type "button"
---                                                  , className "close"
---                                                  , _data { dismiss : "modal"}
---                                                  ] [ span [ aria {hidden : true}]
---                                                           [ text "X"]
---                                                    ]
---                                         ]
-
---                                   , div [ className "modal-body"]
---                                         [ ul [ className "list-group"] ( map fn1 state.authData ) ]
-
---                                   , div [className "modal-footer"]
---                                         [ button [ _type "button"
---                                                  , className "btn btn-secondary"
---                                                  , _data {dismiss : "modal"}
---                                                  ] [ text "GO"]
---                                         ]
---                                    ]
---                             ]
---                      ]
---         ]
-
-
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value
 
 getAuthData :: Effect (Maybe AuthData)
 getAuthData = do

src/Gargantext/Components/Login/Types.purs

 module Gargantext.Components.Login.Types where
 
 import Prelude
-import Data.Lens (Iso', iso)
 import Data.Argonaut ( class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject
                       , (.?), (.??), (:=), (~>)
                       )
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
+import Data.Lens (Iso', iso)
 import Data.Maybe (Maybe)
 
 type Username = String
@@ -30,6 +32,12 @@ newtype AuthData = AuthData
   , tree_id :: TreeId
   }
 
+
+derive instance genericAuthData :: Generic AuthData _
+
+instance eqAuthData :: Eq AuthData where
+  eq = genericEq
+
 _AuthData :: Iso' AuthData { token :: Token, tree_id :: TreeId }
 _AuthData = iso (\(AuthData v) -> v) AuthData
 

src/Gargantext/Components/NgramsTable.purs

@@ -34,12 +34,13 @@ import Thermite (PerformAction, Render, Spec, defaultPerformAction, modifyState_
 import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Types (TermList(..), readTermList, readTermSize, termLists, termSizes)
-import Gargantext.Config (OrderBy(..), TabType)
+import Gargantext.Config (OrderBy(..), TabType, CTabNgramType(..))
 import Gargantext.Components.AutoUpdate (autoUpdateElt)
 import Gargantext.Components.Table as T
 import Gargantext.Prelude
 import Gargantext.Components.Loader as Loader
 import Gargantext.Components.NgramsTable.Core
+import Gargantext.Utils.Reactix as R2
 
 type State =
   CoreState
@@ -119,7 +120,7 @@ tableContainer { pageParams
                         , name "search", placeholder "Search"
                         , _type "value"
                         , value pageParams.searchQuery
-                        , onInput \e -> setSearchQuery (unsafeEventValue e)
+                        , onInput \e -> setSearchQuery (R2.unsafeEventValue e)
                         ]
                 , div [] (
                     if A.null props.tableBody && pageParams.searchQuery /= "" then [
@@ -134,7 +135,7 @@ tableContainer { pageParams
                         [ select  [ _id "picklistmenu"
                                   , className "form-control custom-select"
                                   , value (maybe "" show pageParams.termListFilter)
-                                  , onChange (\e -> setTermListFilter $ readTermList $ unsafeEventValue e)
+                                  , onChange (\e -> setTermListFilter $ readTermList $ R2.unsafeEventValue e)
                                   ] $ map optps1 termLists
                         ]
                       ]
@@ -143,7 +144,7 @@ tableContainer { pageParams
                         [ select  [ _id "picktermtype"
                                   , className "form-control custom-select"
                                   , value (maybe "" show pageParams.termSizeFilter)
-                                  , onChange (\e -> setTermSizeFilter $ readTermSize $ unsafeEventValue e)
+                                  , onChange (\e -> setTermSizeFilter $ readTermSize $ R2.unsafeEventValue e)
                                   ] $ map optps1 termSizes
                         ]
                       ]
@@ -197,8 +198,8 @@ toggleMap :: forall a. a -> Maybe a -> Maybe a
 toggleMap _ (Just _) = Nothing
 toggleMap b Nothing  = Just b
 
-ngramsTableSpec :: Spec State LoadedNgramsTableProps Action
-ngramsTableSpec = simpleSpec performAction render
+ngramsTableSpec :: CTabNgramType -> Spec State LoadedNgramsTableProps Action
+ngramsTableSpec ntype = simpleSpec performAction render
   where
     setParentResetChildren :: Maybe NgramsTerm -> State -> State
     setParentResetChildren p = _ { ngramsParent = p, ngramsChildren = mempty }
@@ -213,9 +214,8 @@ ngramsTableSpec = simpleSpec performAction render
     performAction (SetTermListItem n pl) {path: {nodeId, listIds, tabType}} {ngramsVersion} =
         commitPatch {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
       where
-        listId = Just 10 -- List.head listIds
         pe = NgramsPatch { patch_list: pl, patch_children: mempty }
-        pt = PatchMap $ Map.singleton n pe
+        pt = singletonNgramsTablePatch ntype n pe
     performAction AddTermChildren _ {ngramsParent: Nothing} =
         -- impossible but harmless
         pure unit
@@ -227,14 +227,13 @@ ngramsTableSpec = simpleSpec performAction render
         modifyState_ $ setParentResetChildren Nothing
         commitPatch {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
       where
-        listId = Just 10 -- List.head listIds
         pc = patchSetFromMap ngramsChildren
         pe = NgramsPatch { patch_list: mempty, patch_children: pc }
-        pt = PatchMap $ Map.fromFoldable [Tuple parent pe]
-        -- TODO ROOT-UPDATE
-        -- patch the root of the child to be equal to the root of the parent.
-    performAction (AddNewNgram ngram) {path: params} _ =
-      lift $ addNewNgram ngram Nothing params
+        pt = singletonNgramsTablePatch ntype parent pe
+    performAction (AddNewNgram ngram) {path: {listIds, nodeId, tabType}} {ngramsVersion} =
+        commitPatch {listIds, nodeId, tabType} (Versioned {version: ngramsVersion, data: pt})
+      where
+        pt = addNewNgram ntype ngram CandidateTerm
 
     render :: Render State LoadedNgramsTableProps Action
     render dispatch { path: pageParams
@@ -251,7 +250,7 @@ ngramsTableSpec = simpleSpec performAction render
           , container: tableContainer {pageParams, loaderDispatch, dispatch, ngramsParent, ngramsChildren, ngramsTable}
           , colNames:
               T.ColumnName <$>
-              [ "Graph"
+              [ "Map"
               , "Stop"
               , "Terms"
               , "Score (Occurrences)" -- see convOrderBy
@@ -294,21 +293,24 @@ ngramsTableSpec = simpleSpec performAction render
               , delete: false
               }
 
-ngramsTableClass :: Loader.InnerClass PageParams VersionedNgramsTable
-ngramsTableClass = createClass "NgramsTable" ngramsTableSpec initialState
+ngramsTableClass :: CTabNgramType -> Loader.InnerClass PageParams VersionedNgramsTable
+ngramsTableClass ct = createClass "NgramsTable" (ngramsTableSpec ct) initialState
 
 type MainNgramsTableProps =
-  Loader.InnerProps Int { defaultListId :: Int }
-                        ( tabType :: TabType )
+  { nodeId        :: Int
+    -- ^ This node can be a corpus or contact.
+  , defaultListId :: Int
+  , tabType       :: TabType
+  }
 
-mainNgramsTableSpec :: Spec {} MainNgramsTableProps Void
-mainNgramsTableSpec = simpleSpec defaultPerformAction render
+mainNgramsTableSpec :: CTabNgramType -> Spec {} MainNgramsTableProps Void
+mainNgramsTableSpec nt = simpleSpec defaultPerformAction render
   where
     render :: Render {} MainNgramsTableProps Void
-    render _ {path: nodeId, loaded: {defaultListId}, tabType} _ _ =
+    render _ {nodeId, defaultListId, tabType} _ _ =
       [ ngramsLoader
           { path: initialPageParams nodeId [defaultListId] tabType
-          , component: ngramsTableClass
+          , component: (ngramsTableClass nt)
           } ]
 
 type NgramsDepth = {ngrams :: NgramsTerm, depth :: Int}
@@ -419,6 +421,3 @@ optps1 :: forall a. Show a => { desc :: String, mval :: Maybe a } -> ReactElemen
 optps1 { desc, mval } = option [value val] [text desc]
   where
     val = maybe "" show mval
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value

src/Gargantext/Components/NgramsTable/Core.purs

 module Gargantext.Components.NgramsTable.Core
   ( PageParams
   , CoreParams
-  , PatchMap
   , NgramsElement(..)
   , _NgramsElement
   , NgramsPatch(..)
   , NgramsTable(..)
   , NgramsTablePatch
+  , NewElems
+  , NgramsPatches
   , _NgramsTable
   , NgramsTerm
+  , normNgram
+  , findNgramTermList
   , Version
   , Versioned(..)
   , VersionedNgramsTable
@@ -27,6 +30,9 @@ module Gargantext.Components.NgramsTable.Core
   , patchSetFromMap
   , applyPatchSet
   , applyNgramsTablePatch
+  , singletonPatchMap
+  , fromNgramsPatches
+  , singletonNgramsTablePatch
   , _list
   , _occurrences
   , _children
@@ -69,6 +75,7 @@ import Data.String.Regex as R
 import Data.String.Regex.Flags as R
 import Data.Symbol (SProxy(..))
 import Data.Tuple (Tuple(..))
+-- import Debug.Trace
 import Effect.Aff (Aff)
 import Foreign.Object as FO
 import React (ReactElement)
@@ -79,7 +86,7 @@ import Partial.Unsafe (unsafePartial)
 
 import Gargantext.Utils.KarpRabin (indicesOfAny)
 import Gargantext.Types (TermList(..), TermSize)
-import Gargantext.Config (toUrl, End(..), Path(..), TabType, OrderBy(..))
+import Gargantext.Config (toUrl, End(..), Path(..), TabType, OrderBy(..), CTabNgramType(..))
 import Gargantext.Config.REST (get, put, post)
 import Gargantext.Components.Table as T
 import Gargantext.Prelude
@@ -87,6 +94,7 @@ import Gargantext.Components.Loader as Loader
 
 type CoreParams s =
   { nodeId  :: Int
+    -- ^ This node can be a corpus or contact.
   , listIds :: Array Int
   , tabType :: TabType
   | s
@@ -203,27 +211,38 @@ instance decodeJsonNgramsTable :: DecodeJson NgramsTable where
       f e@(NgramsElement e') = Tuple e'.ngrams e
 -----------------------------------------------------------------------------------
 
+wordBoundaryChars :: String
+wordBoundaryChars = "[ .,;:!?'\\{}()]"
+
+wordBoundaryReg = case R.regex ("(" <> wordBoundaryChars <> ")") (R.global <> R.multiline) of
+  Left e  -> unsafePartial $ crashWith e
+  Right r -> r
+
+wordBoundaryReg2 = case R.regex ("(" <> wordBoundaryChars <> ")\\1") (R.global <> R.multiline) of
+  Left e  -> unsafePartial $ crashWith e
+  Right r -> r
+
 -- TODO: while this function works well with word boundaries,
 --       it inserts too many spaces.
-highlightNgrams :: NgramsTable -> String -> Array (Tuple String (Maybe TermList))
-highlightNgrams (NgramsTable table) input0 =
+highlightNgrams :: CTabNgramType -> NgramsTable -> String -> Array (Tuple String (Maybe TermList))
+highlightNgrams ntype (NgramsTable table) input0 =
+    -- trace {pats, input0, input, ixs} \_ ->
     let sN = unsafePartial (foldl goFold {i0: 0, s: input, l: Nil} ixs) in
-    map trimmer $ A.reverse (A.fromFoldable (consNonEmpty sN.s sN.l))
+    A.reverse (A.fromFoldable (consNonEmpty (undb (init sN.s)) sN.l))
   where
-    -- we need to trim so that the highlighting is without endings
-    trimmer (Tuple t (Just l)) = Tuple (S.trim t) (Just l)
-    trimmer x = x
-    sp x = " " <> S.replaceAll (S.Pattern " ") (S.Replacement "  ") x <> " "
-    unsp x =
-      case S.stripSuffix (S.Pattern " ") x of
-        Nothing -> x
-        Just x1 -> S.replaceAll (S.Pattern "  ") (S.Replacement " ") (S.drop 1 x1)
-    input = sp input0
+    spR x = " " <> R.replace wordBoundaryReg "$1$1" x <> " "
+    reR = R.replace wordBoundaryReg " "
+    db = S.replace (S.Pattern " ") (S.Replacement "  ")
+    sp x = " " <> db x <> " "
+    undb = R.replace wordBoundaryReg2 "$1"
+    init x = S.take (S.length x - 1) x
+    input = spR input0
     pats = A.fromFoldable (Map.keys table)
-    theRegex = case R.regex "[.,;:!?'\\{}()]" (R.global <> R.multiline) of
-      Left e  -> unsafePartial $ crashWith e
-      Right r -> r
-    ixs  = indicesOfAny (sp <$> pats) (S.toLower $ R.replace theRegex " " input)
+    ixs = indicesOfAny (sp <$> pats) (normNgram ntype input)
+
+    consOnJustTail s xs@(Tuple _ (Just _) : _) =
+      Tuple s Nothing : xs
+    consOnJustTail _ xs = xs
 
     consNonEmpty x xs
       | S.null x  = xs
@@ -244,20 +263,25 @@ highlightNgrams (NgramsTable table) input0 =
             Nothing ->
               crashWith "highlightNgrams: out of bounds pattern"
             Just pat ->
-              let lpat = S.length (sp pat) in
+              let lpat = S.length (db pat) in
               case Map.lookup pat table of
                 Nothing ->
                   crashWith "highlightNgrams: pattern missing from table"
                 Just (NgramsElement ne) ->
-                  let s1 = S.splitAt (i - i0) s
-                      s2 = S.splitAt lpat s1.after in
-                  -- s2.before and pat might differ by casing only!
-                  { i0: i + lpat
-                  , s:  s2.after
-                  , l:  Tuple " " Nothing :
-                        Tuple s2.before (Just ne.list) :
-                        Tuple " " Nothing :
-                        consNonEmpty (unsp s1.before) l
+                  let
+                    s1    = S.splitAt (i - i0) s
+                    s2    = S.splitAt lpat     (S.drop 1 s1.after)
+                    s3    = S.splitAt 1        s2.after
+                    unspB = if i0 == 0 then S.drop 1 else identity
+                    s3b   = s3.before
+                  in
+                  -- trace {s, i, i0, s1, s2, s3, pat, lpat, s3b} \_ ->
+                  -- `undb s2.before` and pat might differ by casing only!
+                  { i0: i + lpat + 2
+                  , s:  s3.after
+                  , l:  Tuple (undb s2.before) (Just ne.list) :
+                        consOnJustTail s3b
+                        (consNonEmpty (unspB (undb s1.before)) l)
                   }
 
 -----------------------------------------------------------------------------------
@@ -436,6 +460,9 @@ instance decodeJsonPatchMap :: DecodeJson p => DecodeJson (PatchMap String p) wh
     obj <- decodeJson json
     pure $ PatchMap $ Map.fromFoldableWithIndex (obj :: FO.Object p)
 
+singletonPatchMap :: forall k p. k -> p -> PatchMap k p
+singletonPatchMap k p = PatchMap (Map.singleton k p)
+
 isEmptyPatchMap :: forall k p. PatchMap k p -> Boolean
 isEmptyPatchMap (PatchMap p) = Map.isEmpty p
 
@@ -447,7 +474,30 @@ applyPatchMap applyPatchValue (PatchMap p) = mapWithIndex f
         Nothing -> v
         Just pv -> applyPatchValue pv v
 
-type NgramsTablePatch = PatchMap NgramsTerm NgramsPatch
+type NgramsPatches = PatchMap NgramsTerm NgramsPatch
+
+type NewElems = Map NgramsTerm TermList
+
+type NgramsTablePatch =
+  { ngramsNewElems :: NewElems
+  , ngramsPatches  :: NgramsPatches
+  }
+
+fromNgramsPatches :: NgramsPatches -> NgramsTablePatch
+fromNgramsPatches ngramsPatches = {ngramsNewElems: mempty, ngramsPatches}
+
+normNgram :: CTabNgramType -> String -> NgramsTerm
+normNgram CTabAuthors = identity
+normNgram CTabSources = identity
+normNgram CTabInstitutes = identity
+normNgram CTabTerms      = S.toLower <<< R.replace wordBoundaryReg " "
+
+
+findNgramTermList :: CTabNgramType -> NgramsTable -> String -> Maybe TermList
+findNgramTermList ntype (NgramsTable m) s = m ^? at (normNgram ntype s) <<< _Just <<< _NgramsElement <<< _list
+
+singletonNgramsTablePatch :: CTabNgramType -> NgramsTerm -> NgramsPatch -> NgramsTablePatch
+singletonNgramsTablePatch m n p = fromNgramsPatches $ singletonPatchMap (normNgram m n) p
 
 type RootParent = { root :: NgramsTerm, parent :: NgramsTerm }
 
@@ -480,13 +530,26 @@ reParentNgramsPatch parent (NgramsPatch {patch_children: PatchSet {rem, add}}) =
   traverse_ (reParent Nothing) rem
   traverse_ (reParent $ Just rp) add
 
-reParentNgramsTablePatch :: ReParent NgramsTablePatch
+reParentNgramsTablePatch :: ReParent NgramsPatches
 reParentNgramsTablePatch = void <<< traverseWithIndex reParentNgramsPatch
 
+newElemsTable :: NewElems -> Map NgramsTerm NgramsElement
+newElemsTable = mapWithIndex newElem
+  where
+    newElem ngrams list =
+      NgramsElement
+        { ngrams
+        , list
+        , occurrences: 1
+        , parent:      Nothing
+        , root:        Nothing
+        , children:    mempty
+        }
+
 applyNgramsTablePatch :: NgramsTablePatch -> NgramsTable -> NgramsTable
-applyNgramsTablePatch p (NgramsTable m) =
-  execState (reParentNgramsTablePatch p) $
-  NgramsTable $ applyPatchMap applyNgramsPatch p m
+applyNgramsTablePatch { ngramsPatches, ngramsNewElems: n } (NgramsTable m) =
+  execState (reParentNgramsTablePatch ngramsPatches) $
+  NgramsTable $ applyPatchMap applyNgramsPatch ngramsPatches (newElemsTable n <> m)
 
 -----------------------------------------------------------------------------------
 
@@ -496,17 +559,34 @@ type CoreState s =
   | s
   }
 
-putTable :: {nodeId :: Int, listIds :: Array Int, tabType :: TabType} -> Versioned NgramsTablePatch -> Aff (Versioned NgramsTablePatch)
-putTable {nodeId, listIds, tabType} =
+postNewNgrams :: forall s. Array NgramsTerm -> Maybe TermList -> CoreParams s -> Aff Unit
+postNewNgrams newNgrams mayList {nodeId, listIds, tabType} =
+  when (not (A.null newNgrams)) $ do
+    (_ :: Array Unit) <- post (toUrl Back (PutNgrams tabType (head listIds) mayList) $ Just nodeId) newNgrams
+    pure unit
+
+postNewElems :: forall s. NewElems -> CoreParams s -> Aff Unit
+postNewElems newElems params = void $ traverseWithIndex postNewElem newElems
+  where
+    postNewElem ngrams list = postNewNgrams [ngrams] (Just list) params
+
+addNewNgram :: CTabNgramType -> NgramsTerm -> TermList -> NgramsTablePatch
+addNewNgram ntype ngrams list = { ngramsPatches: mempty
+                          , ngramsNewElems: Map.singleton (normNgram ntype ngrams) list }
+
+putNgramsPatches :: {nodeId :: Int, listIds :: Array Int, tabType :: TabType} -> Versioned NgramsPatches -> Aff (Versioned NgramsPatches)
+putNgramsPatches {nodeId, listIds, tabType} =
   put (toUrl Back (PutNgrams tabType (head listIds) Nothing) $ Just nodeId)
 
 commitPatch :: forall s. {nodeId :: Int, listIds :: Array Int, tabType :: TabType}
             -> Versioned NgramsTablePatch -> StateCoTransformer (CoreState s) Unit
-commitPatch props pt@(Versioned {data: tablePatch}) = do
-  Versioned {version: newVersion, data: newPatch} <- lift $ putTable props pt
+commitPatch props (Versioned {version, data: tablePatch@{ngramsPatches, ngramsNewElems}}) = do
+  let pt = Versioned { version, data: ngramsPatches }
+  lift $ postNewElems ngramsNewElems props
+  Versioned {version: newVersion, data: newPatch} <- lift $ putNgramsPatches props pt
   modifyState_ $ \s ->
     s { ngramsVersion    = newVersion
-      , ngramsTablePatch = newPatch <> tablePatch <> s.ngramsTablePatch
+      , ngramsTablePatch = fromNgramsPatches newPatch <> tablePatch <> s.ngramsTablePatch
       }
     -- TODO: check that pt.version == s.ngramsTablePatch.version
 
@@ -526,11 +606,6 @@ convOrderBy (T.DESC (T.ColumnName "Score (Occurrences)")) = ScoreDesc
 convOrderBy (T.ASC  _) = TermAsc
 convOrderBy (T.DESC _) = TermDesc
 
-addNewNgram :: forall s. NgramsTerm -> Maybe TermList -> CoreParams s -> Aff Unit
-addNewNgram ngram mayList {nodeId, listIds, tabType} = do
-  (_ :: Array Unit) <- post (toUrl Back (PutNgrams tabType (head listIds) mayList) $ Just nodeId) [ngram]
-  pure unit
-
 ngramsLoaderClass :: Loader.LoaderClass PageParams VersionedNgramsTable
 ngramsLoaderClass = Loader.createLoaderClass "NgramsTableLoader" loadNgramsTable
 

src/Gargantext/Components/Search/SearchField.purs

@@ -14,7 +14,7 @@ import DOM.Simple.Element as Element
 import DOM.Simple.Event as DE
 import Effect ( Effect )
 import Effect.Uncurried (mkEffectFn1)
-import FFI.Simple ((..), (.=))
+import FFI.Simple ((..))
 import Reactix as R
 import Reactix.DOM.HTML as HTML
 import Reactix.DOM.HTML (text, button, div, input, option, form, span, ul, li, a)
@@ -47,7 +47,7 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) hasChanged
     cpt props _ = do
       let search = maybe defaultSearch identity (fst props.search)
       term <- R.useState' search.term
-      db   <- R.useState' Nothing
+      db   <- R.useState' (Nothing :: Maybe Database)
       pure $
           div { className: "search-field input-group" }
               [ databaseInput db props.databases
@@ -60,18 +60,18 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) hasChanged
 databaseInput :: R.State (Maybe Database) -> Array Database -> R.Element
 databaseInput (db /\ setDB) dbs =
   div { className: "input-group-btn search-panel dropdown" }
-      [
-        dropdownBtn db
+      [ dropdownBtn db
       , ul {className: "dropdown-menu", role: "menu"} (liItem <$> dbs)
       ]
   where
-    liItem db = li { onClick }
-                   [ a {href: "#"} [text (show db) ] ]
+    liItem db = li { onClick } [ a {href: "#"} [text (show db) ] ]
       where
-                  onClick = mkEffectFn1 $ \_ -> setDB (const $ Just db)
+        onClick = mkEffectFn1 $ \_ -> setDB $ const $ Just db
     dropdownBtnProps = { id: "search-dropdown"
                         , className: "btn btn-default dropdown-toggle"
-                        , type: "button"} .= "data-toggle" $ "dropdown"
+                        , type: "button"
+                        , data: {toggle: "dropdown"}
+                        }
     dropdownBtn (Just db) = button dropdownBtnProps [ span {} [ text (show db) ] ]
     dropdownBtn (Nothing) = button dropdownBtnProps [ span {} [ text "-" ] ]
 
@@ -82,7 +82,7 @@ searchInput (term /\ setTerm) =
         , type: "text"
         , onChange
         , placeholder }
-  where onChange = mkEffectFn1 $ \e -> setTerm (const $ e .. "target" .. "value")
+  where onChange = mkEffectFn1 $ \e -> setTerm $ const $ e .. "target" .. "value"
 
 
 submitButton :: R.State (Maybe Database) -> R.State String -> R.State (Maybe Search) -> R.Element
@@ -91,5 +91,5 @@ submitButton (database /\ _) (term /\ _) (_ /\ setSearch) =
   where
     click = mkEffectFn1 $ \_ -> do
       case term of
-        "" -> setSearch (const Nothing)
-        _ -> setSearch (const $ Just { database, term })
+        "" -> setSearch $ const Nothing
+        _  -> setSearch $ const $ Just { database, term }

src/Gargantext/Components/Search/Types.purs

 module Gargantext.Components.Search.Types where
 
 import Control.Monad.Cont.Trans (lift)
-import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>))
+import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>), encodeJson)
+import Data.Array (head)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
+import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Newtype (class Newtype)
 import Data.Tuple (Tuple)
@@ -13,9 +17,9 @@ import Thermite (PerformAction, modifyState)
 
 import Gargantext.Prelude
 import Gargantext.Types (class ToQuery)
-import Gargantext.Config.REST (post)
+import Gargantext.Config (End(..), NodeType(..), Path(..), toUrl)
+import Gargantext.Config.REST (post, put)
 import Gargantext.Components.Modals.Modal (modalHide)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Response, State)
 import Gargantext.Utils (id)
 import URI.Extra.QueryPairs as QP
 
@@ -36,6 +40,10 @@ readDatabase _ = Nothing
 
 derive instance eqDatabase :: Eq Database
 
+instance encodeJsonDatabase :: EncodeJson Database where
+  encodeJson a = encodeJson (show a)
+
+
 allDatabases :: Array Database
 allDatabases = [All, HAL, IsTex, PubMed]
 
@@ -85,8 +93,57 @@ instance searchQueryToQuery :: ToQuery SearchQuery where
             [ QP.keyFromString k /\ Just (QP.valueFromString $ show v) ]
 
 instance encodeJsonSearchQuery :: EncodeJson SearchQuery where
-  encodeJson (SearchQuery {query, corpus_id, files_id})
+  encodeJson (SearchQuery {query, databases, corpus_id, files_id})
     =   "query"      := query
+    ~> "databases"   := databases
     ~>  "corpus_id"  := fromMaybe 0 corpus_id
     ~>  "files_id"   := files_id
     ~> jsonEmptyObject
+
+
+data Category = Trash | Normal | Favorite
+derive instance genericFavorite :: Generic Category _
+instance showCategory :: Show Category where
+  show = genericShow
+instance eqCategory :: Eq Category where
+  eq = genericEq
+instance encodeJsonCategory :: EncodeJson Category where
+  encodeJson Trash = encodeJson 0
+  encodeJson Normal = encodeJson 1
+  encodeJson Favorite = encodeJson 2
+
+favCategory :: Category -> Category
+favCategory Normal = Favorite
+favCategory Trash = Favorite
+favCategory Favorite = Normal
+
+trashCategory :: Category -> Category
+trashCategory Normal = Trash
+trashCategory Trash = Normal
+trashCategory Favorite = Trash
+
+
+decodeCategory :: Int -> Category
+decodeCategory 0 = Trash
+decodeCategory 1 = Normal
+decodeCategory 2 = Favorite
+decodeCategory _ = Normal
+
+
+
+newtype CategoryQuery = CategoryQuery {
+    nodeIds :: Array Int
+  , category :: Category
+  }
+
+instance encodeJsonCategoryQuery :: EncodeJson CategoryQuery where
+  encodeJson (CategoryQuery post) =
+    "ntc_nodesId" := post.nodeIds
+    ~> "ntc_category" := encodeJson post.category
+    ~> jsonEmptyObject
+
+categoryUrl :: Int -> String
+categoryUrl nodeId = toUrl Back Node (Just nodeId) <> "/category"
+
+putCategories :: Int -> CategoryQuery -> Aff (Array Int)
+putCategories nodeId = put $ categoryUrl nodeId

src/Gargantext/Components/Table.purs

@@ -9,11 +9,12 @@ import Effect (Effect)
 import Effect.Class (liftEffect)
 import React (ReactElement, ReactClass, Children, createElement)
 import React.DOM (a, b, b', p, i, h3, hr, div, option, select, span, table, tbody, td, text, th, thead, tr)
-import React.DOM.Props (className, href, onChange, onClick, scope, selected, value, style)
+import React.DOM.Props (className, href, onChange, onClick, scope, selected, value, defaultValue, style)
 import Thermite (PerformAction, Render, Spec, modifyState_, simpleSpec, StateCoTransformer, createClass)
 import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Prelude
+import Gargantext.Utils.Reactix as R2
 
 type TableContainerProps =
   { pageSizeControl     :: ReactElement
@@ -218,7 +219,8 @@ sizeDD :: PageSizes -> (Action -> Effect Unit) -> ReactElement
 sizeDD ps d
   = span []
     [ select [ className "form-control"
-             , onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))
+             , defaultValue $ show ps
+             , onChange $ \e -> d (ChangePageSize $ string2PageSize $ R2.unsafeEventValue e)
              ] $ map (optps ps) aryPS
     ]
 
@@ -316,4 +318,4 @@ string2PageSize "200" = PS200
 string2PageSize _    = PS10
 
 optps :: PageSizes -> PageSizes -> ReactElement
-optps cv val = option [ selected (cv == val), value $ show val ] [text $ show val]
+optps cv val = option [ value $ show val ] [text $ show val]

src/Gargantext/Components/Tree.purs

@@ -14,25 +14,19 @@ import Data.Newtype (class Newtype)
 import Data.Tuple (Tuple)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
-import Effect.Aff (Aff, runAff)
+import Effect.Aff (Aff, launchAff, launchAff_, killFiber, runAff)
 import Effect.Class (liftEffect)
-import Effect.Uncurried (EffectFn1, mkEffectFn1)
-import FFI.Simple ((..), (.=))
-import Gargantext.Components.Loader as Loader
-import Gargantext.Config (toUrl, End(..), NodeType(..), readNodeType)
-import Gargantext.Config.REST (get, put, post, postWwwUrlencoded, delete)
-import Gargantext.Types (class ToQuery, toQuery)
-import Gargantext.Utils (id)
-import Gargantext.Utils.Reactix as R2
+import Effect.Exception (error)
+import Effect.Uncurried (mkEffectFn1)
+import FFI.Simple ((..))
 import Partial.Unsafe (unsafePartial)
-import React (ReactClass, ReactElement)
 import React as React
 import React.DOM (a, div, i)
 import React.DOM.Props (className, style)
 import React.SyntheticEvent as E
 import Reactix as R
 import Reactix.DOM.HTML as H
-import Thermite (PerformAction, Render, Spec, createClass, defaultPerformAction, simpleSpec, modifyState_)
+import Thermite (Spec)
 import URI.Extra.QueryPairs as QP
 import URI.Query as Q
 import Unsafe.Coerce (unsafeCoerce)
@@ -40,12 +34,22 @@ import Web.File.File (toBlob)
 import Web.File.FileList (FileList, item)
 import Web.File.FileReader.Aff (readAsText)
 
+import Gargantext.Components.Loader2 (useLoader)
+import Gargantext.Config (toUrl, End(..), NodeType(..), readNodeType)
+import Gargantext.Config.REST (get, put, post, postWwwUrlencoded, delete)
+import Gargantext.Router as Router
+import Gargantext.Types (class ToQuery, toQuery)
+import Gargantext.Utils (id)
+import Gargantext.Utils.Reactix as R2
+
 type Name = String
 type Open = Boolean
 type URL  = String
 type ID   = Int
 
-type Props = { root :: ID }
+data NodePopup = CreatePopup | NodePopup
+
+type Props = { root :: ID, mCurrentRoute :: Maybe Router.Routes }
 
 data NTree a = NTree a (Array (NTree a))
 
@@ -60,11 +64,8 @@ filterNTree p (NTree x ary) =
 
 
 newtype LNode = LNode { id :: ID
-                      , name :: String
-                      , nodeType :: NodeType
-                      , popOver :: Boolean
-                      , nodeValue :: String
-                      , createOpen :: Boolean}
+                      , name :: Name
+                      , nodeType :: NodeType}
 
 derive instance newtypeLNode :: Newtype LNode _
 
@@ -76,10 +77,7 @@ instance decodeJsonLNode :: DecodeJson LNode where
     nodeType <- obj .: "type"
     pure $ LNode { id : id_
                  , name
-                 , nodeType
-                 , popOver : false
-                 , nodeValue : ""
-                 , createOpen : false}
+                 , nodeType}
 
 instance decodeJsonFTree :: DecodeJson (NTree LNode) where
   decodeJson json = do
@@ -92,15 +90,6 @@ instance decodeJsonFTree :: DecodeJson (NTree LNode) where
 
 type FTree = NTree LNode
 
-setName :: String -> NTree LNode -> NTree LNode
-setName v (NTree (LNode s@{name}) ary) = NTree (LNode $ s {name = v}) ary
-
-setPopOver :: Boolean -> NTree LNode -> NTree LNode
-setPopOver v (NTree (LNode s@{popOver}) ary) = NTree (LNode $ s {popOver = v}) ary
-
-setCreateOpen :: Boolean -> NTree LNode -> NTree LNode
-setCreateOpen v (NTree (LNode s@{createOpen}) ary) = NTree (LNode $ s {createOpen = v}) ary
-
 -- file upload types
 data FileType = CSV | PresseRIS
 derive instance genericFileType :: Generic FileType _
@@ -121,136 +110,205 @@ data DroppedFile = DroppedFile {
 type FileHash = String
 
 
-data Action =   Submit       ID String
-              | DeleteNode   ID
-              | CreateSubmit       ID String NodeType
-              | SetNodeValue String ID
-              | CurrentNode      ID
-              | UploadFile ID FileType UploadFileContents
+data Action =   Submit       String
+              | DeleteNode
+              | CreateSubmit String NodeType
+              | UploadFile   FileType UploadFileContents
 
 
-type State = { state       :: FTree
-             , currentNode :: Maybe ID
+type State = { tree         :: FTree
              }
 
 mapFTree :: (FTree -> FTree) -> State -> State
-mapFTree f {state, currentNode} = {state: f state, currentNode: currentNode}
+mapFTree f s@{tree} = s {tree = f tree}
 
 -- TODO: make it a local function
-performAction :: forall props. PerformAction State props Action
-
-performAction (DeleteNode nid) _ _ = do
-  void $ lift $ deleteNode nid
-  modifyState_ $ mapFTree $ filterNTree (\(LNode {id}) -> id /= nid)
+--performAction :: forall props. PerformAction State props Action
 
-performAction (Submit rid name) _  _  = do
-  void $ lift $ renameNode rid $ RenameValue {name}
+performAction :: R.State Int -> R.State State -> Action -> Aff Unit
 
-performAction (CreateSubmit nid name nodeType) _ _ = do
-  void $ lift $ createNode nid $ CreateValue {name, nodeType}
-  --modifyState_ $ mapFTree $ map $ hidePopOverNode nid
+performAction (_ /\ setReload) (s@{tree: NTree (LNode {id}) _} /\ setState) DeleteNode = do
+  void $ deleteNode id
+  --modifyState_ $ mapFTree $ filterNTree (\(LNode {id}) -> id /= nid)
+  --liftEffect $ setState $ mapFTree $ filterNTree $ \(LNode {id: nid}) -> nid /= id
+  liftEffect $ setReload $ \r -> r + 1
 
-performAction (SetNodeValue v nid) _ _ =
-  modifyState_ $ mapFTree $ setNodeValue nid v
+performAction _ ({tree: NTree (LNode {id}) _} /\ setState) (Submit name)  = do
+  void $ renameNode id $ RenameValue {name}
+  --modifyState_ $ mapFTree $ setNodeName rid name
+  liftEffect $ setState $ \s@{tree: NTree (LNode node) arr} -> s {tree = NTree (LNode node {name = name}) arr}
 
-performAction (CurrentNode nid) _ _ =
-  modifyState_ $ \{state: s} -> {state: s, currentNode : Just nid}
+performAction (_ /\ setReload) (s@{tree: NTree (LNode {id}) _} /\ setState) (CreateSubmit name nodeType) = do
+  void $ createNode id $ CreateValue {name, nodeType}
+  --modifyState_ $ mapFTree $ map $ hidePopOverNode nid
+  liftEffect $ setReload $ \r -> r + 1
 
-performAction (UploadFile nid fileType contents) _ _ = do
-  hashes <- lift $ uploadFile nid fileType contents
+performAction _ ({tree: NTree (LNode {id}) _} /\ _) (UploadFile fileType contents) = do
+  hashes <- uploadFile id fileType contents
   liftEffect $ log2 "uploaded:" hashes
 
 
-toggleIf :: Boolean -> Boolean -> Boolean
-toggleIf true  = not
-toggleIf false = const false
 
-onNode :: ID -> (LNode -> LNode) -> LNode -> LNode
-onNode id f l@(LNode node)
-  | node.id == id = f l
-  | otherwise     = l
+------------------------------------------------------------------------
+
+mCorpusId :: Maybe Router.Routes -> Maybe Int
+mCorpusId (Just (Router.Corpus id)) = Just id
+mCorpusId (Just (Router.CorpusDocument id _ _)) = Just id
+mCorpusId _ = Nothing
 
---toggleFileTypeBox :: ID -> UploadFileContents -> LNode -> LNode
---toggleFileTypeBox sid contents (LNode node@{id, droppedFile: Nothing}) | sid == id = LNode $ node {droppedFile = droppedFile}
---  where
---    droppedFile = Just $ DroppedFile {contents: contents, fileType: Nothing}
---toggleFileTypeBox sid _ (LNode node) = LNode $ node {droppedFile = Nothing}
+type TreeViewProps = { tree :: FTree
+                     , mCurrentRoute :: Maybe Router.Routes
+                     }
 
--- TODO: DRY, NTree.map
-setNodeValue :: ID ->  String -> NTree LNode  -> NTree LNode
-setNodeValue sid v (NTree (LNode node@{id}) ary)  =
-  NTree (LNode $ node {nodeValue = nvalue}) $ map (setNodeValue sid  v) ary
+loadedTreeView :: R.State Int -> TreeViewProps -> R.Element
+loadedTreeView setReload p = R.createElement el p []
   where
-    nvalue = if sid == id then  v   else ""
+    el = R.hooksComponent "LoadedTreeView" cpt
+    cpt {tree, mCurrentRoute} _ = do
+      setState <- R.useState' {tree}
 
+      pure $ H.div {className: "tree"}
+        [ toHtml setReload setState mCurrentRoute ]
 
+treeLoadView :: R.State Int -> Props -> R.Element
+treeLoadView setReload p = R.createElement el p []
+  where
+    el = R.hooksComponent "TreeLoadView" cpt
+    cpt {root, mCurrentRoute} _ = do
+      useLoader root loadNode $ \{loaded} ->
+        loadedTreeView setReload {tree: loaded, mCurrentRoute}
 
-------------------------------------------------------------------------
--- TODO
--- alignment to the right
-nodeOptionsCorp :: Boolean -> Array ReactElement
-nodeOptionsCorp activated = case activated of
-                         true  -> [ i [className "fab fa-whmcs" ] []]
-                         false -> []
+treeview :: Spec {} Props Void
+treeview = R2.elSpec $ R.hooksComponent "TreeView" cpt
+  where
+    cpt {root, mCurrentRoute} _children = do
+      -- NOTE: this is a hack to reload the tree view on demand
+      setReload <- R.useState' 0
 
--- TODO
--- alignment to the right
--- on hover make other options available:
-nodeOptionsView :: Boolean -> Array ReactElement
-nodeOptionsView activated = case activated of
-                         true -> [ i [className "glyphicon glyphicon-refresh" ] []
-                                 , i [className "glyphicon glyphicon-upload"   ] []
-                                 , i [className "glyphicon glyphicon-share"] []
-                                 ]
-                         false -> []
+      pure $ treeLoadView setReload {root, mCurrentRoute}
 
 
-nodeOptionsRename :: (Action -> Effect Unit) ->  Boolean ->  ID -> Array ReactElement
-nodeOptionsRename d activated  id =  case activated of
-                         true -> [ a [className "glyphicon glyphicon-pencil", style {marginLeft : "15px"}
+-- START toHtml
 
-                                        ] []
+toHtml :: R.State Int -> R.State State -> Maybe Router.Routes -> R.Element
+--toHtml d s@(NTree (LNode {id, name, nodeType}) ary) n = R.createElement el {} []
+toHtml setReload setState@({tree: (NTree (LNode {id, name, nodeType}) ary)} /\ _) mCurrentRoute = R.createElement el {} []
+  where
+    el = R.hooksComponent "NodeView" cpt
+    pAction = performAction setReload setState
+    cpt props _ = do
+      folderOpen <- R.useState' true
+
+      pure $ H.ul {}
+        [ H.li {}
+          ( [ nodeMainSpan pAction {id, name, nodeType, mCurrentRoute} folderOpen ]
+            <> childNodes setReload folderOpen mCurrentRoute ary
+          )
         ]
-                         false -> []
 
-type LoadedTreeViewProps = Loader.InnerProps Int FTree ()
+type NodeMainSpanProps =
+  ( id :: ID
+  , name :: Name
+  , nodeType :: NodeType
+  , mCurrentRoute :: Maybe Router.Routes)
 
-loadedTreeview :: Spec State LoadedTreeViewProps Action
-loadedTreeview = simpleSpec performAction render
+nodeMainSpan :: (Action -> Aff Unit)
+             -> Record NodeMainSpanProps
+             -> R.State Boolean
+             -> R.Element
+nodeMainSpan d p folderOpen = R.createElement el p []
   where
-    render :: Render State LoadedTreeViewProps Action
-    render dispatch _ {state, currentNode} _ =
-      [ div [className "tree"]
-        [ --toHtml dispatch state currentNode
-          (R2.scuff $ toHtml dispatch state currentNode)
-        ]
+    el = R.hooksComponent "NodeMainSpan" cpt
+    cpt {id, name, nodeType, mCurrentRoute} _ = do
+      -- only 1 popup at a time is allowed to be opened
+      popupOpen <- R.useState' (Nothing :: Maybe NodePopup)
+      droppedFile <- R.useState' (Nothing :: Maybe DroppedFile)
+      isDragOver <- R.useState' false
+
+      pure $ H.span (dropProps droppedFile isDragOver)
+        [ folderIcon folderOpen
+        , H.a { href: (toUrl Front nodeType (Just id))
+              , style: {marginLeft: "22px"}
+              }
+          [ nodeText {isSelected: (mCorpusId mCurrentRoute) == (Just id), name} ]
+        , popOverIcon popupOpen
+        , nodePopupView d {id, name} popupOpen
+        , createNodeView d {id, name} popupOpen
+        , fileTypeView d {id} droppedFile isDragOver
         ]
+    folderIcon folderOpen@(open /\ _) =
+      H.a {onClick: R2.effToggler folderOpen}
+      [ H.i {className: fldr open} [] ]
+    popOverIcon (popOver /\ setPopOver) =
+      H.a { className: "glyphicon glyphicon-cog"
+          , id: "rename-leaf"
+          , onClick: mkEffectFn1 $ \_ -> setPopOver $ toggle
+          } []
+      where
+        toggle Nothing = Just NodePopup
+        toggle _       = Nothing
+    dropProps droppedFile isDragOver = {
+        className: dropClass droppedFile isDragOver
+      , onDrop: dropHandler droppedFile
+      , onDragOver: onDragOverHandler isDragOver
+      , onDragLeave: onDragLeave isDragOver
+      }
+    dropClass (Just _ /\ _)  _           = "file-dropped"
+    dropClass _              (true /\ _) = "file-dropped"
+    dropClass (Nothing /\ _) _           = ""
+    dropHandler (_ /\ setDroppedFile) = mkEffectFn1 $ \e -> unsafePartial $ do
+      let ff = fromJust $ item 0 $ ((e .. "dataTransfer" .. "files") :: FileList)
+      liftEffect $ log2 "drop:" ff
+      -- prevent redirection when file is dropped
+      E.preventDefault e
+      E.stopPropagation e
+      let blob = toBlob $ ff
+      void $ runAff (\_ -> pure unit) do
+        contents <- readAsText blob
+        liftEffect $ setDroppedFile $ const $ Just $ DroppedFile {contents: (UploadFileContents contents), fileType: Just CSV}
+    onDragOverHandler (_ /\ setIsDragOver) = mkEffectFn1 $ \e -> do
+      -- prevent redirection when file is dropped
+      -- https://stackoverflow.com/a/6756680/941471
+      E.preventDefault e
+      E.stopPropagation e
+      setIsDragOver $ const true
+    onDragLeave (_ /\ setIsDragOver) = mkEffectFn1 $ \_ -> setIsDragOver $ const false
 
-treeViewClass :: ReactClass (Loader.InnerProps Int FTree (children :: React.Children))
-treeViewClass = createClass "TreeView" loadedTreeview (\{loaded: t} -> {state: t, currentNode: Nothing})
 
-treeLoaderClass :: Loader.LoaderClass Int FTree
-treeLoaderClass = Loader.createLoaderClass "TreeLoader" loadNode
+fldr :: Boolean -> String
+fldr open = if open then "glyphicon glyphicon-folder-open" else "glyphicon glyphicon-folder-close"
 
-treeLoader :: Loader.Props' Int FTree -> ReactElement
-treeLoader props = React.createElement treeLoaderClass props []
 
-treeview :: Spec {} Props Void
-treeview = simpleSpec defaultPerformAction render
+childNodes :: R.State Int -> R.State Boolean -> Maybe Router.Routes -> Array FTree -> Array R.Element
+childNodes _ _ _ [] = []
+childNodes _ (false /\ _) _ _ = []
+childNodes setReload (true /\ _) mCurrentRoute ary = map (\ctree -> childNode {tree: ctree}) ary
   where
-    render :: Render {} Props Void
-    render _ {root} _ _ =
-      [ treeLoader { path: root
-                   , component: treeViewClass
-                   } ]
+    childNode :: State -> R.Element
+    childNode props = R.createElement el props []
+    el = R.hooksComponent "ChildNodeView" cpt
+    cpt {tree} _ = do
+      setState <- R.useState' {tree}
+
+      pure $ toHtml setReload setState mCurrentRoute
+
+-- END toHtml
+
+
+-- START Popup View
 
+type NodePopupProps =
+  ( id :: ID
+  , name :: Name)
 
-nodePopupView :: (Action -> Effect Unit) -> R.State (NTree LNode) -> R.Element
-nodePopupView d nodeState@(s@(NTree (LNode {id, name, popOver: true, createOpen}) _) /\ setNodeState) =
-  R.createElement el {} []
+nodePopupView ::   (Action -> Aff Unit)
+                 -> Record NodePopupProps
+                 -> R.State (Maybe NodePopup)
+                 -> R.Element
+nodePopupView d p (Just NodePopup /\ setPopupOpen) = R.createElement el p []
   where
     el = R.hooksComponent "NodePopupView" cpt
-    cpt props _ = do
+    cpt {id, name} _ = do
       renameBoxOpen <- R.useState' false
       pure $ H.div tooltipProps $
         [ H.div {id: "arrow"} []
@@ -263,22 +321,26 @@ nodePopupView d nodeState@(s@(NTree (LNode {id, name, popOver: true, createOpen}
           ]
         ]
       where
-        tooltipProps = ({ className: ""
+        tooltipProps = { className: ""
                        , id: "node-popup-tooltip"
                        , title: "Node settings"
-                        } .= "data-toggle" $ "tooltip") .= "data-placement" $ "right"
+                       , data: {toggle: "tooltip", placement: "right"}
+                       }
         iconAStyle = {color:"black", paddingTop: "6px", paddingBottom: "6px"}
         rowClass true = "col-md-10"
         rowClass false = "col-md-8"
         panelHeading renameBoxOpen@(open /\ _) =
           H.div {className: "panel-heading"}
           [ H.div {className: "row" }
-            [ H.div {className: rowClass open} [ renameBox d nodeState renameBoxOpen ]
+            [ H.div {className: rowClass open} [ renameBox d {id, name} renameBoxOpen ]
             , editIcon renameBoxOpen
             , H.div {className: "col-md-2"}
               [ H.a {className: "btn text-danger glyphitem glyphicon glyphicon-remove-circle"
-                    , onClick: mkEffectFn1 $ \_ -> setNodeState $ const (setPopOver false s)
-                    , title: "Close"} [] ] ] ]
+                    , onClick: mkEffectFn1 $ \_ -> setPopupOpen $ const Nothing
+                    , title: "Close"} []
+              ]
+            ]
+          ]
         glyphicon t = "glyphitem glyphicon glyphicon-" <> t
         editIcon (false /\ setRenameBoxOpen) =
           H.div {className: "col-md-2"}
@@ -286,7 +348,7 @@ nodePopupView d nodeState@(s@(NTree (LNode {id, name, popOver: true, createOpen}
                 , className: "btn glyphitem glyphicon glyphicon-pencil"
                 , id: "rename1"
                 , title: "Rename"
-                , onClick: mkEffectFn1 $ \_ -> setRenameBoxOpen (const true)
+                , onClick: mkEffectFn1 $ \_ -> setRenameBoxOpen $ const true
                 }
             []
           ]
@@ -326,7 +388,7 @@ nodePopupView d nodeState@(s@(NTree (LNode {id, name, popOver: true, createOpen}
                   , className: (glyphicon "trash")
                   , id: "rename2"
                   , title: "Delete"
-                  , onClick: mkEffectFn1 $ (\_-> d $ (DeleteNode id))}
+                  , onClick: mkEffectFn1 $ \_ -> launchAff $ d $ DeleteNode}
               []
             ]
           ]
@@ -337,21 +399,29 @@ nodePopupView d nodeState@(s@(NTree (LNode {id, name, popOver: true, createOpen}
                     , className: (glyphicon "plus")
                     , id: "create"
                     , title: "Create"
-                    , onClick: mkEffectFn1 $ \_ -> setNodeState (const $ setCreateOpen (not createOpen) $ setPopOver false s)
+                    , onClick: mkEffectFn1 $ \_ -> setPopupOpen $ const $ Just CreatePopup
                     }
                 []
               ]
-nodePopupView _ _ = R.createElement el {} []
+nodePopupView _ p _ = R.createElement el p []
   where
     el = R.hooksComponent "CreateNodeView" cpt
-    cpt props _ = pure $ H.div {} []
+    cpt _ _ = pure $ H.div {} []
+
+-- END Popup View
+
+
+-- START Rename Box
 
+type RenameBoxProps =
+  ( id :: ID
+  , name :: Name)
 
-renameBox :: (Action -> Effect Unit) -> R.State (NTree LNode) -> R.State Boolean -> R.Element
-renameBox d (s@(NTree (LNode {id, name}) _) /\ setNodeState) (true /\ setRenameBoxOpen) = R.createElement el {} []
+renameBox :: (Action -> Aff Unit) -> Record RenameBoxProps -> R.State Boolean -> R.Element
+renameBox d p (true /\ setRenameBoxOpen) = R.createElement el p []
   where
     el = R.hooksComponent "RenameBox" cpt
-    cpt props _ = do
+    cpt {id, name} _ = do
       renameNodeName <- R.useState' name
       pure $ H.div {className: "from-group row-no-padding"}
         [ renameInput renameNodeName
@@ -365,34 +435,42 @@ renameBox d (s@(NTree (LNode {id, name}) _) /\ setNodeState) (true /\ setRenameB
                     , placeholder: "Rename Node"
                     , defaultValue: name
                     , className: "form-control"
-                    , onInput: mkEffectFn1 $ \e -> setRenameNodeName (const $ e .. "target" .. "value")
+                    , onInput: mkEffectFn1 $ \e -> setRenameNodeName $ const $ e .. "target" .. "value"
                     }
           ]
         renameBtn (newName /\ _) =
           H.a {className: "btn glyphitem glyphicon glyphicon-ok col-md-2 pull-left"
               , type: "button"
               , onClick: mkEffectFn1 $ \_ -> do
-                    setNodeState (setPopOver false <<< setName newName)
-                    d (Submit id newName)
+                    setRenameBoxOpen $ const false
+                    launchAff $ d $ Submit newName
               , title: "Rename"
               } []
         cancelBtn =
           H.a {className: "btn text-danger glyphitem glyphicon glyphicon-remove col-md-2 pull-left"
               , type: "button"
-              , onClick: mkEffectFn1 $ \_ -> setRenameBoxOpen (const false)
+              , onClick: mkEffectFn1 $ \_ -> setRenameBoxOpen $ const false
               , title: "Cancel"
               } []
-renameBox _ (s@(NTree (LNode {name}) _) /\ _) (false /\ _) = R.createElement el {} []
+renameBox _ p (false /\ _) = R.createElement el p []
   where
     el = R.hooksComponent "RenameBox" cpt
-    cpt props _ = pure $ H.div {} [ H.text name ]
+    cpt {name} _ = pure $ H.div {} [ H.text name ]
+
+-- END Rename Box
+
 
+-- START Create Node
 
-createNodeView :: (Action -> Effect Unit) -> R.State FTree -> R.Element
-createNodeView d (s@(NTree (LNode {id, nodeValue, createOpen: true}) _) /\ setNodeState) = R.createElement el {} []
+type CreateNodeProps =
+  ( id :: ID
+  , name :: Name)
+
+createNodeView :: (Action -> Aff Unit) -> Record CreateNodeProps -> R.State (Maybe NodePopup) -> R.Element
+createNodeView d p (Just CreatePopup /\ setPopupOpen) = R.createElement el p []
   where
     el = R.hooksComponent "CreateNodeView" cpt
-    cpt props _ = do
+    cpt {id, name} _ = do
       nodeName <- R.useState' ""
       nodeType <- R.useState' Corpus
       pure $ H.div tooltipProps $
@@ -403,9 +481,11 @@ createNodeView d (s@(NTree (LNode {id, nodeValue, createOpen: true}) _) /\ setNo
           ]
         ]
       where
-        tooltipProps = ({ className: ""
+        tooltipProps = { className: ""
                        , id: "create-node-tooltip"
-                        , title: "Create new node"} .= "data-toggle" $ "tooltip") .= "data-placement" $ "right"
+                       , title: "Create new node"
+                       , data: {toggle: "tooltip", placement: "right"}
+                       }
         panelHeading =
           H.div {className: "panel-heading"}
           [ H.div {className: "row"}
@@ -413,7 +493,7 @@ createNodeView d (s@(NTree (LNode {id, nodeValue, createOpen: true}) _) /\ setNo
               [ H.h5 {} [H.text "Create Node"] ]
             , H.div {className: "col-md-2"}
               [ H.a { className: "btn text-danger glyphitem glyphicon glyphicon-remove-circle"
-                    , onClick: mkEffectFn1 $ \_ -> setNodeState (setCreateOpen false)
+                    , onClick: mkEffectFn1 $ \_ -> setPopupOpen $ const Nothing
                     , title: "Close"} []
               ]
             ]
@@ -427,14 +507,14 @@ createNodeView d (s@(NTree (LNode {id, nodeValue, createOpen: true}) _) /\ setNo
                 [ H.div {className: "form-group"}
                   [ H.input { type: "text"
                             , placeholder: "Node name"
-                            , defaultValue: getCreateNodeValue s
+                            , defaultValue: name
                             , className: "form-control"
-                            , onInput: mkEffectFn1 $ \e -> setNodeName (const $ e .. "target" .. "value")
+                            , onInput: mkEffectFn1 $ \e -> setNodeName $ const $ e .. "target" .. "value"
                             }
                   ]
                 , H.div {className: "form-group"}
                   [ R2.select { className: "form-control"
-                              , onChange: mkEffectFn1 $ \e -> setNodeType (const $ readNodeType $ e .. "target" .. "value")
+                              , onChange: mkEffectFn1 $ \e -> setNodeType $ const $ readNodeType $ e .. "target" .. "value"
                               }
                     (map renderOption [Corpus, Folder])
                   ]
@@ -448,19 +528,30 @@ createNodeView d (s@(NTree (LNode {id, nodeValue, createOpen: true}) _) /\ setNo
           H.div {className: "panel-footer"}
           [ H.button {className: "btn btn-success"
                      , type: "button"
-                     , onClick: mkEffectFn1 $ \_ -> d $ (CreateSubmit id name nt)
+                     , onClick: mkEffectFn1 $ \_ -> do
+                         setPopupOpen $ const Nothing
+                         launchAff $ d $ CreateSubmit name nt
                      } [H.text "Create"]
           ]
-createNodeView _ _ = R.createElement el {} []
+createNodeView _ _ _ = R.createElement el {} []
   where
     el = R.hooksComponent "CreateNodeView" cpt
     cpt props _ = pure $ H.div {} []
 
-fileTypeView :: (Action -> Effect Unit) -> R.State FTree -> R.State (Maybe DroppedFile) -> R.State Boolean -> R.Element
-fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fileType}) /\ setDroppedFile) (_ /\ setIsDragOver) = R.createElement el {} []
+
+-- END Create Node
+
+
+-- START File Type View
+
+type FileTypeProps =
+  ( id :: ID )
+
+fileTypeView :: (Action -> Aff Unit) -> Record FileTypeProps -> R.State (Maybe DroppedFile) -> R.State Boolean -> R.Element
+fileTypeView d p (Just (DroppedFile {contents, fileType}) /\ setDroppedFile) (_ /\ setIsDragOver) = R.createElement el p []
   where
     el = R.hooksComponent "FileTypeView" cpt
-    cpt props _ = do
+    cpt {id} _ = do
       pure $ H.div tooltipProps $
         [ H.div {className: "panel panel-default"}
           [ panelHeading
@@ -469,9 +560,11 @@ fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fil
           ]
         ]
       where
-        tooltipProps = ({ className: ""
+        tooltipProps = { className: ""
                        , id: "file-type-tooltip"
-                        , title: "Choose file type"} .= "data-toggle" $ "tooltip") .= "data-placement" $ "right"
+                       , title: "Choose file type"
+                       , data: {toggle: "tooltip", placement: "right"}
+                       }
         panelHeading =
           H.div {className: "panel-heading"}
           [ H.div {className: "row"}
@@ -480,8 +573,8 @@ fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fil
             , H.div {className: "col-md-2"}
               [ H.a {className: "btn text-danger glyphitem glyphicon glyphicon-remove-circle"
                     , onClick: mkEffectFn1 $ \_ -> do
-                        setDroppedFile (const Nothing)
-                        setIsDragOver (const false)
+                        setDroppedFile $ const Nothing
+                        setIsDragOver $ const false
                     , title: "Close"} []
               ]
             ]
@@ -494,7 +587,7 @@ fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fil
           ]
           where
             onChange = mkEffectFn1 $ \e ->
-              setDroppedFile (const $ Just $ DroppedFile $ {contents, fileType: readFileType $ e .. "target" .. "value"})
+              setDroppedFile $ const $ Just $ DroppedFile $ {contents, fileType: readFileType $ e .. "target" .. "value"}
         renderOption opt = H.option {} [ H.text $ show opt ]
         panelFooter =
           H.div {className: "panel-footer"}
@@ -504,8 +597,8 @@ fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fil
                 H.button {className: "btn btn-success"
                          , type: "button"
                          , onClick: mkEffectFn1 $ \_ -> do
-                             setDroppedFile (const Nothing)
-                             d $ (UploadFile id ft contents)
+                             setDroppedFile $ const Nothing
+                             launchAff $ d $ UploadFile ft contents
                          } [H.text "Upload"]
               Nothing ->
                 H.button {className: "btn btn-success disabled"
@@ -517,111 +610,35 @@ fileTypeView _ _ (Nothing /\ _) _ = R.createElement el {} []
     el = R.hooksComponent "FileTypeView" cpt
     cpt props _ = pure $ H.div {} []
 
-getCreateNodeValue :: FTree -> String
-getCreateNodeValue (NTree (LNode {nodeValue}) ary) = nodeValue
+-- END File Type View
 
 
-toHtml :: (Action -> Effect Unit) -> FTree -> Maybe ID -> R.Element
-toHtml d s@(NTree (LNode {id, name, nodeType}) ary) n = R.createElement el {} []
-  where
-    el = R.hooksComponent "NodeView" cpt
-    cpt props _ = do
-      nodeState <- R.useState' s
-      folderOpen <- R.useState' true
-      droppedFile <- R.useState' Nothing
-      isDragOver <- R.useState' false
+-- START node text
 
-      pure $ H.ul {}
-        [ H.li {}
-          ( [ mainSpan nodeState folderOpen droppedFile isDragOver ]
-            <> childNodes d n ary folderOpen
-          )
-        ]
-      where
-        mainSpan :: R.State FTree -> R.State Boolean -> R.State (Maybe DroppedFile) -> R.State Boolean -> R.Element
-        mainSpan nodeState folderOpen droppedFile isDragOver =
-          H.span (dropProps droppedFile isDragOver)
-          [ folderIcon folderOpen
-          , H.a { href: if nodeType == Phylo then (toUrl Static nodeType (Just id))
-                                             else (toUrl Front  nodeType (Just id))
-                , target : if nodeType == Phylo then "blank" else ""
-                , style: {marginLeft: "22px"}
-                , onClick: mkEffectFn1 $ (\e -> d $ CurrentNode id)
-                }
-            [ nodeText s n ]
-          , popOverIcon nodeState
-          , nodePopupView d nodeState
-          , createNodeView d nodeState
-          , fileTypeView d nodeState droppedFile isDragOver
-          ]
-        folderIcon :: R.State Boolean -> R.Element
-        folderIcon folderOpen@(open /\ _) =
-          H.a {onClick: R2.effToggler folderOpen}
-          [ H.i {className: fldr open} [] ]
-        dropProps droppedFile isDragOver = {
-            className: dropClass droppedFile isDragOver
-          , onDrop: dropHandler droppedFile
-          , onDragOver: dragOverHandler isDragOver
-          , onDragLeave: dragLeave isDragOver
-          }
-        dropClass (Just _ /\ _)  _           = "file-dropped"
-        dropClass _              (true /\ _) = "file-dropped"
-        dropClass (Nothing /\ _) _           = ""
-        dropHandler :: forall e. R.State (Maybe DroppedFile) -> EffectFn1 (E.SyntheticEvent_ e) Unit
-        dropHandler (_ /\ setDroppedFile) = mkEffectFn1 $ \e -> unsafePartial $ do
-          let ff = fromJust $ item 0 $ ((e .. "dataTransfer" .. "files") :: FileList)
-          liftEffect $ log2 "drop:" ff
-          -- prevent redirection when file is dropped
-          E.preventDefault e
-          E.stopPropagation e
-          let blob = toBlob $ ff
-          void $ runAff (\_ -> pure unit) do
-            contents <- readAsText blob
-            liftEffect $ setDroppedFile (const $ Just $ DroppedFile {contents: (UploadFileContents contents), fileType: Just CSV})
-        dragOverHandler :: forall e. R.State Boolean -> EffectFn1 (E.SyntheticEvent_ e) Unit
-        dragOverHandler (_ /\ setIsDragOver) = mkEffectFn1 $ \e -> do
-          -- prevent redirection when file is dropped
-          -- https://stackoverflow.com/a/6756680/941471
-          E.preventDefault e
-          E.stopPropagation e
-          setIsDragOver (const true)
-        dragLeave :: forall e. R.State Boolean -> EffectFn1 e Unit
-        dragLeave (_ /\ setIsDragOver) = mkEffectFn1 $ \_ -> setIsDragOver (const false)
-
-
-childNodes :: forall s. (Action -> Effect Unit) -> Maybe ID -> (Array (NTree LNode)) -> R.State Boolean -> Array R.Element
-childNodes d n [] _ = []
-childNodes d n _ (false /\ _) = []
-childNodes d n ary (true /\ _) = map (\cs -> toHtml d cs n) ary
-
-
-nodeText :: FTree -> Maybe Int -> R.Element
-nodeText (NTree (LNode {id, name}) _) n = if n == (Just id) then
-              H.u {} [H.b {} [H.text ("| " <> name <> " |    ")]]
-            else
-              H.text (name <> "    ")
+type NodeTextProps =
+  ( isSelected :: Boolean
+  , name :: Name )
 
+nodeText :: Record NodeTextProps -> R.Element
+nodeText p = R.createElement el p []
+  where
+    el = R.hooksComponent "NodeText" cpt
+    cpt {isSelected: true, name} _ = do
+      pure $ H.u {} [H.b {} [H.text ("| " <> name <> " |    ")]]
+    cpt {isSelected: false, name} _ = do
+      pure $ H.text (name <> "    ")
 
-popOverIcon :: R.State FTree -> R.Element
-popOverIcon (s@(NTree (LNode {popOver}) _) /\ setNodeState) =
-  H.a { className: "glyphicon glyphicon-cog"
-      , id: "rename-leaf"
-      , onClick: mkEffectFn1 $ \_ -> setNodeState (setPopOver (not popOver))
-      } []
-
-
-fldr :: Boolean -> String
-fldr open = if open then "fas fa-folder-open" else "fas fa-folder"
-
+-- END node text
 
 loadNode :: ID -> Aff FTree
+-- loadNode a = lift ((get <<< toUrl Back Tree <<< Just) a)
 loadNode = get <<< toUrl Back Tree <<< Just
 
 ----- TREE CRUD Operations
 
 newtype RenameValue = RenameValue
   {
-    name :: String
+    name :: Name
   }
 
 instance encodeJsonRenameValue :: EncodeJson RenameValue where
@@ -631,7 +648,7 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
 
 newtype CreateValue = CreateValue
   {
-    name :: String
+    name :: Name
   , nodeType :: NodeType
   }
 
@@ -678,6 +695,3 @@ uploadFile id fileType (UploadFileContents fileContents) = postWwwUrlencoded url
 
 fnTransform :: LNode -> FTree
 fnTransform n = NTree n []
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value

src/Gargantext/Config.purs

@@ -10,17 +10,14 @@ toUrl Front Corpus 1 == "http://localhost:2015/#/corpus/1"
 module Gargantext.Config where
 
 import Prelude
-import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson)
+import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson, (:=), (~>), jsonEmptyObject)
 import Data.Foldable (foldMap)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Map (Map)
-import Data.Map as DM
 import Data.Maybe (Maybe(..), maybe)
-import Data.Tuple (Tuple(..))
 import Gargantext.Router as R
 
-import Gargantext.Types
+import Gargantext.Types (TermList, TermSize(..))
 
 urlPlease :: End -> String -> String
 urlPlease end path = theEnd.baseUrl <> theEnd.prePath <> path
@@ -31,7 +28,8 @@ endConfig = endConfig' V10
 
 endConfig' :: ApiVersion -> EndConfig
 endConfig' v = { front : frontRelative
-               , back  : backDev v
+               --, back  : backLocal v
+               , back: backDev v
                , static : staticRelative
              }
 --               , back  : backDemo v  }
@@ -62,6 +60,11 @@ frontDev = { baseUrl: "https://dev.gargantext.org"
            , prePath: "/#/"
            }
 
+frontDemo :: Config
+frontDemo = { baseUrl: "https://demo.gargantext.org"
+           , prePath: "/#/"
+           }
+
 frontProd :: Config
 frontProd = { baseUrl: "https://gargantext.org"
             , prePath: "/#/"
@@ -119,11 +122,6 @@ endBaseUrl end c = (endOf end c).baseUrl
 endPathUrl :: End -> EndConfig -> Path -> Maybe Id -> UrlPath
 endPathUrl end = pathUrl <<< endOf end
 
-tabTypeDocs :: TabType -> UrlPath
-tabTypeDocs (TabCorpus  t) = "table?view="   <> show t
-tabTypeDocs (TabDocument t)= "table?view="   <> show t
-tabTypeDocs (TabPairing t) = "pairing?view=" <> show t
-
 limitUrl :: Limit -> UrlPath
 limitUrl l = "&limit=" <> show l
 
@@ -141,10 +139,26 @@ showTabType' (TabCorpus   t) = show t
 showTabType' (TabDocument t) = show t
 showTabType' (TabPairing t) = show t
 
+data TabPostQuery = TabPostQuery {
+    offset :: Int
+  , limit :: Int
+  , orderBy :: OrderBy
+  , tabType :: TabType
+  , query :: String
+  }
+
+instance encodeJsonTabPostQuery :: EncodeJson TabPostQuery where
+  encodeJson (TabPostQuery post) =
+        "view"       := showTabType' post.tabType
+     ~> "offset"     := post.offset
+     ~> "limit"      := post.limit
+     ~> "orderBy"    := show post.orderBy
+     ~> "query"      := post.query
+     ~> jsonEmptyObject
+
 pathUrl :: Config -> Path -> Maybe Id -> UrlPath
-pathUrl c (Tab t o l s) i =
-    pathUrl c (NodeAPI Node) i <>
-      "/" <> tabTypeDocs t <> offsetUrl o <> limitUrl l <> orderUrl s
+pathUrl c (Tab t) i =
+    pathUrl c (NodeAPI Node) i <> "/" <> showTabType' t
 pathUrl c (Children n o l s) i =
     pathUrl c (NodeAPI Node) i <>
       "/" <> "children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s
@@ -204,14 +218,16 @@ pathUrl c (Chart {chartType, tabType}) i =
 
 ------------------------------------------------------------
 
+routesPath :: R.Routes -> String
 routesPath R.Home = ""
 routesPath R.Login = "login"
-routesPath R.SearchView = "search"
 routesPath (R.Folder i) = "folder/" <> show i
 routesPath (R.Corpus i) = "corpus/" <> show i
-routesPath R.AddCorpus = "addCorpus"
+routesPath (R.CorpusDocument c l i) = "corpus/" <> show c <> "/list/" <> show l <> "/document/" <> show i
 routesPath (R.Document l i) = "list/" <> show l <> "/document/" <> show i
 routesPath (R.PGraphExplorer i) = "#/"
+routesPath (R.Texts i) = "texts/" <> show i
+routesPath (R.Lists i) = "lists/" <> show i
 routesPath R.Dashboard = "dashboard"
 routesPath (R.Annuaire i) = "annuaire/" <> show i
 routesPath (R.UserPage i) = "user/" <> show i
@@ -253,6 +269,7 @@ data NodeType = NodeUser
               | Nodes
               | Tree
               | NodeList
+              | Texts
 
 derive instance eqNodeType :: Eq NodeType
 
@@ -273,6 +290,7 @@ instance showNodeType :: Show NodeType where
   show Nodes         = "Nodes"
   show Tree          = "NodeTree"
   show NodeList      = "NodeList"
+  show Texts         = "NodeTexts"
 
 readNodeType :: String -> NodeType
 readNodeType "NodeAnnuaire"  = Annuaire
@@ -290,6 +308,7 @@ readNodeType "NodeUser"      = NodeUser
 readNodeType "NodeContact"   = NodeContact
 readNodeType "Tree"          = Tree
 readNodeType "NodeList"      = NodeList
+readNodeType "NodeTexts"     = Texts
 readNodeType _               = Error
 {-
 ------------------------------------------------------------
@@ -324,14 +343,15 @@ nodeTypeUrl Nodes      = "nodes"
 nodeTypeUrl NodeUser  = "user"
 nodeTypeUrl NodeContact = "contact"
 nodeTypeUrl Tree      = "tree"
-nodeTypeUrl NodeList  = "list"
+nodeTypeUrl NodeList  = "lists"
+nodeTypeUrl Texts     = "texts"
 ------------------------------------------------------------
 
 type ListId = Int
 
 data Path
   = Auth
-  | Tab      TabType  Offset Limit (Maybe OrderBy)
+  | Tab      TabType
   | Children NodeType Offset Limit (Maybe OrderBy)
   | GetNgrams
       { tabType        :: TabType
@@ -416,7 +436,7 @@ instance showPTabNgramType :: Show PTabNgramType where
   show PTabBooks         = "Books"
   show PTabCommunication = "Communication"
 
-data TabSubType a = TabDocs | TabNgramType a | TabTrash
+data TabSubType a = TabDocs | TabNgramType a | TabTrash | TabMoreLikeFav | TabMoreLikeTrash
 
 derive instance eqTabSubType :: Eq a => Eq (TabSubType a)
 
@@ -424,6 +444,8 @@ instance showTabSubType :: Show a => Show (TabSubType a) where
   show TabDocs          = "Docs"
   show (TabNgramType a) = show a
   show TabTrash         = "Trash"
+  show TabMoreLikeFav   = "MoreFav"
+  show TabMoreLikeTrash = "MoreTrash"
 
 data TabType
   = TabCorpus   (TabSubType CTabNgramType)

src/Gargantext/Pages/Annuaire/User/Contacts.purs

@@ -4,4 +4,4 @@ module Gargantext.Pages.Annuaire.User.Contacts
        where
 
 import Gargantext.Pages.Annuaire.User.Contacts.Types
-import Gargantext.Pages.Annuaire.User.Contacts.Specs
+import Gargantext.Pages.Annuaire.User.Contacts.Specs (layoutUser)

src/Gargantext/Pages/Annuaire/User/Contacts/Specs.purs

@@ -16,20 +16,20 @@ import Data.Newtype (unwrap)
 import Data.String (joinWith)
 import Effect.Aff (Aff, throwError)
 import Effect.Exception (error)
-import Thermite (Render, Spec, defaultPerformAction, simpleSpec, createClass)
+import Thermite (Render, Spec, defaultPerformAction, simpleSpec)
 import React as React
 import React (ReactClass, ReactElement)
 import React.DOM (div, h3, img, li, span, text, ul, text)
 import React.DOM.Props (_id, className, src)
+import Reactix as R
 import Gargantext.Prelude
 import Gargantext.Config (toUrl, End(..), NodeType(..), Path(..))
 import Gargantext.Config.REST (get)
 import Gargantext.Components.Node (NodePoly(..), HyperdataList(..))
-import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Pages.Annuaire.User.Contacts.Types
 import Gargantext.Pages.Annuaire.User.Contacts.Tabs.Specs as Tabs
-
---type Props = Loader.InnerProps Int Contact
+import Gargantext.Utils.Reactix as R2
 
 display :: String -> Array ReactElement -> Array ReactElement
 display title elems =
@@ -153,29 +153,15 @@ infoRender (Tuple title content) =
 -- | Below an example of a loader, use all code below and adapt it
 -- to your code
 -- layoutUser is exported by the module
--- only one subnode: contactLoader which as 2 parameters
---   - path (nodeId)
---   - components (which has to be drawn when loaded
 layoutUser :: Spec {} {nodeId :: Int} Void
-layoutUser = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} {nodeId :: Int} Void
-    render _ {nodeId} _ _ =
-      [ contactLoader { path: nodeId
-                      , component: createClass "LayoutUser" layoutUser' (const {})
-                      } ]
-
--- | Take the spec and transform it in React Class
--- put here how to draw the Composant
--- props loaded: what has been loaded by the component loader
-layoutUser' :: Spec {} Props Void
-layoutUser' = simpleSpec defaultPerformAction render
-           <> Tabs.pureTabs
-  where
-    render :: Render {} Props Void
-    render dispatch {loaded: {contactNode: Contact {name, hyperdata}}} _ _ =
+layoutUser =
+  R2.elSpec $ R.hooksComponent "LayoutUser" \{nodeId} _ ->
+    useLoader nodeId getContact $ \{loaded: contactData} ->
+      let {contactNode: Contact {name, hyperdata}} = contactData in
+      R2.toElement
         [ ul [className "col-md-12 list-group"] $
             display (fromMaybe "no name" name) (contactInfos hyperdata)
+        , Tabs.elt {nodeId, contactData}
         ]
 
 -- | toUrl to get data
@@ -190,11 +176,3 @@ getContact id = do
   --  Nothing ->
   --    throwError $ error "Missing default list"
   pure {contactNode, defaultListId: 424242}
-
--- | Change name for you
-contactLoaderClass :: ReactClass (Loader.Props Int ContactData)
-contactLoaderClass = Loader.createLoaderClass "ContactLoader" getContact
-
--- | Change type according to what has been loaded
-contactLoader :: Loader.Props' Int ContactData -> ReactElement
-contactLoader props = React.createElement contactLoaderClass props []

src/Gargantext/Pages/Annuaire/User/Contacts/Tabs/Specs.purs

@@ -6,14 +6,20 @@ import Prelude hiding (div)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.List (fromFoldable)
+import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
 
-import Gargantext.Config (TabType(..), TabSubType(..), PTabNgramType(..))
+import Gargantext.Config (TabType(..), TabSubType(..), PTabNgramType(..), CTabNgramType(..))
 import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.NgramsTable as NT
 import Gargantext.Components.Tab as Tab
-import Gargantext.Pages.Annuaire.User.Contacts.Types (Props)
-import Thermite (Spec, focus, hideState, noState, cmapProps)
+import Gargantext.Pages.Annuaire.User.Contacts.Types (ContactData)
+import Gargantext.Utils.Reactix as R2
+
+import Reactix as R
+import Reactix.DOM.HTML as H
+import React (Children, ReactElement, ReactClass, createElement)
+import Thermite (Spec, focus, hideState, noState, cmapProps, createClass)
 
 data Mode = Patents | Books | Communication
 
@@ -29,6 +35,27 @@ modeTabType Patents = PTabPatents
 modeTabType Books = PTabBooks
 modeTabType Communication = PTabCommunication
 
+-- TODO fix this type
+modeTabType' :: Mode -> CTabNgramType
+modeTabType' Patents = CTabAuthors
+modeTabType' Books = CTabAuthors
+modeTabType' Communication = CTabAuthors
+
+
+
+type PropsRow =
+  ( nodeId :: Int
+  , contactData :: ContactData
+  )
+
+type Props = Record PropsRow
+
+elt :: Props -> ReactElement
+elt props = createElement tabsClass props []
+
+tabsClass :: ReactClass { children :: Children | PropsRow }
+tabsClass = createClass "ContactsTabs" pureTabs (const {})
+
 pureTabs :: Spec {} Props Void
 pureTabs = hideState (const {activeTab: 0}) statefulTabs
 
@@ -44,17 +71,21 @@ statefulTabs =
   where
     chart = mempty
     -- TODO totalRecords
-    docs = cmapProps (\{path: nodeId, loaded} ->
-                       { nodeId, chart
+    docs = noState $ R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" $ \{nodeId, contactData: {defaultListId}} _ -> do
+      pure $ DT.docViewSpec
+        { nodeId
+        , chart
         , tabType: TabPairing TabDocs
         , totalRecords: 4736
-                       , listId: loaded.defaultListId}) $
-           noState DT.docViewSpec
+        , listId: defaultListId
+        , corpusId: Nothing
+        , showSearch: true
+        }
 
 ngramsViewSpec :: {mode :: Mode} -> Spec Tab.State Props Tab.Action
 ngramsViewSpec {mode} =
-  cmapProps (\{loaded: {defaultListId}, path, dispatch} ->
-              {loaded: {defaultListId}, path, dispatch, tabType})
-            (noState NT.mainNgramsTableSpec)
+  cmapProps (\{contactData: {defaultListId}, nodeId} ->
+              {defaultListId, nodeId, tabType})
+            (noState (NT.mainNgramsTableSpec (modeTabType' mode)))
     where
       tabType = TabPairing $ TabNgramType $ modeTabType mode

src/Gargantext/Pages/Annuaire/User/Contacts/Types.purs

@@ -162,13 +162,9 @@ instance decodeUser :: DecodeJson Contact where
     name <- obj .?? "name"
     date <- obj .?| "date"
     hyperdata <- obj .? "hyperdata"
-    
     pure $ Contact { id, typename, userId
                    , parentId, name, date
                    , hyperdata
                    }
 
 type ContactData = {contactNode :: Contact, defaultListId :: Int}
-
-type PropsRow = Loader.InnerPropsRow Int ContactData ()
-type Props = Record PropsRow

src/Gargantext/Pages/Corpus.purs

 module Gargantext.Pages.Corpus where
 
-
 import Data.Array (head)
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff, throwError)
 import Effect.Exception (error)
-import React as React
-import React (ReactClass, ReactElement)
-import Thermite (Spec, Render, simpleSpec, createClass, defaultPerformAction)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec)
 --------------------------------------------------------
 import Gargantext.Prelude
-import Gargantext.Components.Node (NodePoly(..), HyperdataList(..))
-import Gargantext.Components.Loader as Loader
-import Gargantext.Components.Loader (createLoaderClass)
+import Gargantext.Components.Node (NodePoly(..), HyperdataList)
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Table as Table
 import Gargantext.Config      (toUrl, Path(..), NodeType(..), End(..))
 import Gargantext.Config.REST (get)
-import Gargantext.Pages.Corpus.Tabs.Types (CorpusData, CorpusInfo(..))
-import Gargantext.Pages.Corpus.Tabs.Types (Props) as Tabs
-import Gargantext.Pages.Corpus.Tabs.Specs (pureTabs) as Tabs
--------------------------------------------------------------------
-type Props = Tabs.Props
+import Gargantext.Pages.Texts.Tabs.Types (CorpusData, CorpusInfo(..))
+import Gargantext.Pages.Texts.Tabs.Specs (elt) as Tabs
+import Gargantext.Utils.Reactix as R2
 
 ------------------------------------------------------------------------
 layout :: Spec {} {nodeId :: Int} Void
-layout = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} {nodeId :: Int} Void
-    render _ {nodeId} _ _ =
-      [ corpusLoader { path: nodeId
-                     , component: createClass "Layout" layout' (const {})
-                     } ]
-
-layout' :: Spec {} Props Void
-layout' = corpusHeaderSpec <> Tabs.pureTabs
-
-corpusHeaderSpec :: Spec {} Props Void
-corpusHeaderSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} Props Void
-    render dispatch {loaded: {corpusNode}} _ _ =
-      Table.renderTableHeaderLayout
-        { title: "Corpus " <> title
-        , desc:  corpus.desc
-        , query: corpus.query
-        , date:  date'
-        , user:  corpus.authors
-        }
+layout = R2.elSpec $ R.hooksComponent "CorpusLoader" cpt
   where
-        NodePoly { name: title
-                 , date: date'
-                 , hyperdata : CorpusInfo corpus
-                 }
-          = corpusNode
-
-------------------------------------------------------------------------
-
-getCorpus :: Int -> Aff CorpusData
-getCorpus corpusId = do
-  corpusNode     <- get $ toUrl Back Corpus $ Just corpusId
-  defaultListIds <- get $ toUrl Back (Children NodeList 0 1 Nothing) $ Just corpusId
-  case (head defaultListIds :: Maybe (NodePoly HyperdataList)) of
-    Just (NodePoly { id: defaultListId }) ->
-      pure {corpusNode, defaultListId}
-    Nothing ->
-      throwError $ error "Missing default list"
-
-corpusLoaderClass :: ReactClass (Loader.Props Int CorpusData)
-corpusLoaderClass = createLoaderClass "CorpusLoader" getCorpus
-
-corpusLoader :: Loader.Props' Int CorpusData -> ReactElement
-corpusLoader props = React.createElement corpusLoaderClass props []
+    cpt {nodeId} _children = do
+      pure $ H.div {} [H.text "Empty page"]

src/Gargantext/Pages/Corpus/Chart/Histo.purs

 module Gargantext.Pages.Corpus.Chart.Histo where
 
+import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Array (foldl)
-import Data.Tuple (Tuple(..))
-import Data.Map as Map
 import Data.Int (toNumber)
+import Data.Map as Map
 import Data.Map (Map)
-import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Maybe (Maybe(..), maybe)
+import Data.Tuple (Tuple(..))
 import Effect.Aff (Aff)
 import Gargantext.Config -- (End(..), Path(..), TabType, toUrl)
 import Gargantext.Config.REST (get)
 import React (ReactClass, ReactElement, createElement)
-import Thermite (Spec, Render, defaultPerformAction, simpleSpec, createClass)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec)
+
 import Gargantext.Prelude
 import Gargantext.Types (TermList(..))
 import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Charts.Options.ECharts
 import Gargantext.Components.Charts.Options.Type
 import Gargantext.Components.Charts.Options.Series
 import Gargantext.Components.Charts.Options.Color
 import Gargantext.Components.Charts.Options.Font
 import Gargantext.Components.Charts.Options.Data
+import Gargantext.Utils.Reactix as R2
+import Gargantext.Pages.Corpus.Chart.Utils as U
 
 type Path =
   { corpusId :: Int
@@ -51,12 +57,6 @@ instance decodeHistoMetrics :: DecodeJson HistoMetrics where
 
 type Loaded = HistoMetrics
 
-loadedMetricsSpec :: Spec {} (Loader.InnerProps Path Loaded ()) Void
-loadedMetricsSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} (Loader.InnerProps Path Loaded ()) Void
-    render dispatch {loaded:histoMetrics} {} _ = [chart (chartOptions histoMetrics)]
-
 chartOptions :: HistoMetrics -> Options
 chartOptions (HistoMetrics { dates: dates', count: count'}) = Options
   { mainTitle : "Histogram"
@@ -68,23 +68,27 @@ chartOptions (HistoMetrics { dates: dates', count: count'}) = Options
   , tooltip   : mkTooltip { formatter: templateFormatter "{b0}" }
   }
 
-metricsLoader :: Loader.Props' Path HistoMetrics -> ReactElement
-metricsLoader props = createElement metricsLoaderClass props []
-  where
-    metricsLoaderClass :: ReactClass (Loader.Props Path HistoMetrics)
-    metricsLoaderClass = Loader.createLoaderClass "MetricsLoader" getMetrics
 
-    getMetrics :: Path -> Aff HistoMetrics
-    getMetrics {corpusId, tabType} = do
+getMetrics :: Path -> Aff HistoMetrics
+getMetrics {corpusId, tabType} = do
   ChartMetrics ms <- get $ toUrl Back (Chart {chartType: Histo, tabType: tabType}) $ Just corpusId
   pure ms."data"
 
 histoSpec :: Spec {} Path Void
-histoSpec = simpleSpec defaultPerformAction render
+histoSpec = R2.elSpec $ R.hooksComponent "LoadedMetricsHisto" cpt
   where
-    render :: Render {} Path Void
-    render dispatch path {} _ =
-      [ metricsLoader
-        { path
-        , component: createClass "LoadedMetrics" loadedMetricsSpec (const {})
-        } ]
+    cpt p _ = do
+      setReload <- R.useState' 0
+
+      pure $ metricsLoadView setReload p
+
+metricsLoadView :: R.State Int -> Path -> R.Element
+metricsLoadView setReload p = R.createElement el p []
+  where
+    el = R.hooksComponent "MetricsLoadedHistoView" cpt
+    cpt p _ = do
+      useLoader p getMetrics $ \{loaded} ->
+        loadedMetricsView setReload loaded
+
+loadedMetricsView :: R.State Int -> HistoMetrics -> R.Element
+loadedMetricsView setReload loaded = U.reloadButtonWrap setReload $ R2.buff $ chart $ chartOptions loaded

src/Gargantext/Pages/Corpus/Chart/Metrics.purs

 module Gargantext.Pages.Corpus.Chart.Metrics where
 
+import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Array (foldl)
-import Data.Tuple (Tuple(..))
 import Data.Map as Map
 import Data.Map (Map)
-import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Maybe (Maybe(..), maybe)
+import Data.Tuple (Tuple(..))
 import Effect.Aff (Aff)
 import Gargantext.Config -- (End(..), Path(..), TabType, toUrl)
 import Gargantext.Config.REST (get)
 import React (ReactClass, ReactElement, createElement)
-import Thermite (Spec, Render, defaultPerformAction, simpleSpec, createClass)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec)
+
 import Gargantext.Prelude
 import Gargantext.Types (TermList(..))
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Loader as Loader
 import Gargantext.Components.Charts.Options.ECharts
 import Gargantext.Components.Charts.Options.Type
@@ -20,6 +24,8 @@ import Gargantext.Components.Charts.Options.Series
 import Gargantext.Components.Charts.Options.Color
 import Gargantext.Components.Charts.Options.Font
 import Gargantext.Components.Charts.Options.Data
+import Gargantext.Utils.Reactix as R2
+import Gargantext.Pages.Corpus.Chart.Utils as U
 
 type Path =
   { corpusId :: Int
@@ -56,12 +62,6 @@ instance decodeMetrics :: DecodeJson Metrics where
 
 type Loaded  = Array Metric
 
-loadedMetricsSpec :: Spec {} (Loader.InnerProps Path Loaded ()) Void
-loadedMetricsSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} (Loader.InnerProps Path Loaded ()) Void
-    render dispatch {loaded} {} _ = [chart (scatterOptions loaded)]
-
 scatterOptions :: Array Metric -> Options
 scatterOptions metrics = Options
   { mainTitle : "Ngrams Selection Metrics"
@@ -101,18 +101,21 @@ getMetrics {corpusId, listId, limit, tabType} = do
   Metrics ms <- get $ toUrl Back (CorpusMetrics {listId, tabType, limit}) $ Just corpusId
   pure ms."data"
 
-metricsLoaderClass :: ReactClass (Loader.Props Path Loaded)
-metricsLoaderClass = Loader.createLoaderClass "MetricsLoader" getMetrics
 
-metricsLoader :: Loader.Props' Path Loaded -> ReactElement
-metricsLoader props = createElement metricsLoaderClass props []
+metricsSpec = R2.elSpec $ R.hooksComponent "LoadedMetrics" cpt
+  where
+    cpt p _ = do
+      setReload <- R.useState' 0
 
-metricsSpec :: Spec {} Path Void
-metricsSpec = simpleSpec defaultPerformAction render
+      pure $ metricsLoadView setReload p
+
+metricsLoadView :: R.State Int -> Path -> R.Element
+metricsLoadView setReload p = R.createElement el p []
   where
-    render :: Render {} Path Void
-    render dispatch path {} _ =
-      [ metricsLoader
-        { path
-        , component: createClass "LoadedMetrics" loadedMetricsSpec (const {})
-        } ]
+    el = R.hooksComponent "MetricsLoadedView" cpt
+    cpt p _ = do
+      useLoader p getMetrics $ \{loaded} ->
+        loadedMetricsView setReload loaded
+
+loadedMetricsView :: R.State Int -> Loaded -> R.Element
+loadedMetricsView setReload loaded = U.reloadButtonWrap setReload $ R2.buff $ chart $ scatterOptions loaded

src/Gargantext/Pages/Corpus/Chart/Pie.purs

 module Gargantext.Pages.Corpus.Chart.Pie where
 
-import Data.String (take, joinWith, Pattern(..), split, length)
+import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Array (foldl, zip, filter)
 import Data.Array as A
-import Data.Tuple (Tuple(..))
-import Data.Map as Map
 import Data.Int (toNumber)
-import Data.Map (Map)
-import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Maybe (Maybe(..), maybe)
+import Data.String (take, joinWith, Pattern(..), split, length)
+import Data.Tuple (Tuple(..))
 import Effect.Aff (Aff)
 import Gargantext.Config -- (End(..), Path(..), TabType, toUrl)
 import Gargantext.Config.REST (get)
 import React (ReactClass, ReactElement, createElement)
-import Thermite (Spec, Render, defaultPerformAction, simpleSpec, createClass)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec)
+
 import Gargantext.Prelude
 import Gargantext.Types (TermList(..))
-import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Charts.Options.ECharts
 import Gargantext.Components.Charts.Options.Type
 import Gargantext.Components.Charts.Options.Series
 import Gargantext.Components.Charts.Options.Color
 import Gargantext.Components.Charts.Options.Font
 import Gargantext.Components.Charts.Options.Data
+import Gargantext.Utils.Reactix as R2
+import Gargantext.Pages.Corpus.Chart.Utils as U
 
 type Path =
   { corpusId :: Int
@@ -53,14 +56,8 @@ instance decodeHistoMetrics :: DecodeJson HistoMetrics where
 
 type Loaded = HistoMetrics
 
-loadedMetricsSpec :: Spec {} (Loader.InnerProps Path Loaded ()) Void
-loadedMetricsSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} (Loader.InnerProps Path Loaded ()) Void
-    render dispatch {loaded : metricsData} {} _ = [chart (chartOptions metricsData)]
-
-chartOptions :: HistoMetrics -> Options
-chartOptions (HistoMetrics { dates: dates', count: count'}) = Options
+chartOptionsBar :: HistoMetrics -> Options
+chartOptionsBar (HistoMetrics { dates: dates', count: count'}) = Options
   { mainTitle : "Bar"
   , subTitle  : "Count of GraphTerm"
   , xAxis     : xAxis' $ map (\t -> joinWith " " $ map (take 3) $ A.take 3 $ filter (\s -> length s > 3) $ split (Pattern " ") t) dates'
@@ -70,12 +67,6 @@ chartOptions (HistoMetrics { dates: dates', count: count'}) = Options
   , tooltip   : mkTooltip { formatter: templateFormatter "{b0}" }
   }
 
-loadedMetricsSpecPie :: Spec {} (Loader.InnerProps Path Loaded ()) Void
-loadedMetricsSpecPie = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} (Loader.InnerProps Path Loaded ()) Void
-    render dispatch {loaded : metricsData} {} _ = [chart (chartOptionsPie metricsData)]
-
 chartOptionsPie :: HistoMetrics -> Options
 chartOptionsPie (HistoMetrics { dates: dates', count: count'}) = Options
   { mainTitle : "Pie"
@@ -89,34 +80,50 @@ chartOptionsPie (HistoMetrics { dates: dates', count: count'}) = Options
   }
 
 
-metricsLoader :: Loader.Props' Path HistoMetrics -> ReactElement
-metricsLoader props = createElement metricsLoaderClass props []
-  where
-    metricsLoaderClass :: ReactClass (Loader.Props Path HistoMetrics)
-    metricsLoaderClass = Loader.createLoaderClass "MetricsLoader" getMetrics
-
-    getMetrics :: Path -> Aff HistoMetrics
-    getMetrics {corpusId, tabType:tabType} = do
+getMetrics :: Path -> Aff HistoMetrics
+getMetrics {corpusId, tabType:tabType} = do
   ChartMetrics ms <- get $ toUrl Back (Chart {chartType: ChartPie, tabType: tabType}) $ Just corpusId
   pure ms."data"
 
+
+
 pieSpec :: Spec {} Path Void
-pieSpec = simpleSpec defaultPerformAction render
+pieSpec = R2.elSpec $ R.hooksComponent "LoadedMetricsPie" cpt
+  where
+    cpt p _ = do
+      setReload <- R.useState' 0
+
+      pure $ metricsLoadPieView setReload p
+
+metricsLoadPieView :: R.State Int -> Path -> R.Element
+metricsLoadPieView setReload p = R.createElement el p []
   where
-    render :: Render {} Path Void
-    render dispatch path {} _ =
-      [ metricsLoader
-        { path
-        , component: createClass "LoadedMetrics" loadedMetricsSpecPie (const {})
-        } ]
+    el = R.hooksComponent "MetricsLoadedPieView" cpt
+    cpt p _ = do
+      useLoader p getMetrics $ \{loaded} ->
+        loadedMetricsPieView setReload loaded
+
+loadedMetricsPieView :: R.State Int -> HistoMetrics -> R.Element
+loadedMetricsPieView setReload loaded = U.reloadButtonWrap setReload $ R2.buff $ chart $ chartOptionsPie loaded
+
+
 
 barSpec :: Spec {} Path Void
-barSpec = simpleSpec defaultPerformAction render
+barSpec = R2.elSpec $ R.hooksComponent "LoadedMetricsBar" cpt
+  where
+    cpt p _ = do
+      setReload <- R.useState' 0
+
+      pure $ metricsLoadBarView setReload p
+
+
+metricsLoadBarView :: R.State Int -> Path -> R.Element
+metricsLoadBarView setReload p = R.createElement el p []
   where
-    render :: Render {} Path Void
-    render dispatch path {} _ =
-      [ metricsLoader
-        { path
-        , component: createClass "LoadedMetrics" loadedMetricsSpec (const {})
-        } ]
+    el = R.hooksComponent "MetricsLoadedBarView" cpt
+    cpt p _ = do
+      useLoader p getMetrics $ \{loaded} ->
+        loadedMetricsBarView setReload loaded
 
+loadedMetricsBarView :: R.State Int -> Loaded -> R.Element
+loadedMetricsBarView setReload loaded = U.reloadButtonWrap setReload $ R2.buff $ chart $ chartOptionsBar loaded

src/Gargantext/Pages/Corpus/Chart/Tree.purs

 module Gargantext.Pages.Corpus.Chart.Tree where
 
 import Data.Array (foldl)
-import Data.Tuple (Tuple(..))
 import Data.Map as Map
 import Data.Map (Map)
 import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Maybe (Maybe(..), maybe)
+import Data.Tuple (Tuple(..))
 import Effect.Aff (Aff)
 import Gargantext.Config -- (End(..), Path(..), TabType, toUrl)
 import Gargantext.Config.REST (get)
 import React (ReactClass, ReactElement, createElement)
-import Thermite (Spec, Render, defaultPerformAction, simpleSpec, createClass)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec)
+
 import Gargantext.Prelude
 import Gargantext.Types (TermList(..))
-import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Charts.Options.ECharts
 import Gargantext.Components.Charts.Options.Type
 import Gargantext.Components.Charts.Options.Series
 import Gargantext.Components.Charts.Options.Color
 import Gargantext.Components.Charts.Options.Font
 import Gargantext.Components.Charts.Options.Data
-
-import Gargantext.Pages.Corpus.Dashboard (treeMapEx)
+import Gargantext.Utils.Reactix as R2
+import Gargantext.Pages.Corpus.Chart.Utils as U
 
 
 type Path =
@@ -44,12 +47,6 @@ instance decodeMetrics :: DecodeJson Metrics where
 
 type Loaded  = Array TreeNode
 
-loadedMetricsSpec :: Spec {} (Loader.InnerProps Path Loaded ()) Void
-loadedMetricsSpec = simpleSpec defaultPerformAction render
-  where
-    render :: Render {} (Loader.InnerProps Path Loaded ()) Void
-    render dispatch {loaded} {} _ = [chart (scatterOptions loaded)]
-
 scatterOptions :: Array TreeNode -> Options
 scatterOptions nodes = Options
   { mainTitle : "Tree"
@@ -69,18 +66,24 @@ getMetrics {corpusId, listId, limit, tabType} = do
   Metrics ms <- get $ toUrl Back (Chart {chartType : ChartTree, tabType: tabType}) $ Just corpusId
   pure ms."data"
 
-metricsLoaderClass :: ReactClass (Loader.Props Path Loaded)
-metricsLoaderClass = Loader.createLoaderClass "MetricsLoader" getMetrics
+treeSpec :: Spec {} Path Void
+treeSpec = R2.elSpec $ R.hooksComponent "LoadedMetrics" cpt
+  where
+    cpt p _ = do
+      setReload <- R.useState' 0
 
-metricsLoader :: Loader.Props' Path Loaded -> ReactElement
-metricsLoader props = createElement metricsLoaderClass props []
+      pure $ metricsLoadView setReload p
 
-treeSpec :: Spec {} Path Void
-treeSpec = simpleSpec defaultPerformAction render
+metricsLoadView :: R.State Int -> Path -> R.Element
+metricsLoadView setReload p = R.createElement el p []
   where
-    render :: Render {} Path Void
-    render dispatch path {} _ =
-      [ metricsLoader
-        { path
-        , component: createClass "LoadedMetrics" loadedMetricsSpec (const {})
-        } ]
+    el = R.hooksComponent "MetricsLoadView" cpt
+    cpt p _ = do
+      useLoader p getMetrics $ \{loaded} ->
+        loadedMetricsView setReload loaded
+
+loadedMetricsView :: R.State Int -> Loaded -> R.Element
+loadedMetricsView setReload loaded = H.div {} [
+    U.reloadButton setReload
+  , R2.buff $ chart (scatterOptions loaded)
+  ]

src/Gargantext/Pages/Corpus/Chart/Utils.purs

+module Gargantext.Pages.Corpus.Chart.Utils where
+
+import Data.Tuple.Nested ((/\))
+import Effect.Uncurried (mkEffectFn1)
+import Reactix as R
+import Reactix.DOM.HTML as H
+
+import Gargantext.Prelude
+
+reloadButtonWrap :: R.State Int -> R.Element -> R.Element
+reloadButtonWrap setReload el = H.div {} [
+    reloadButton setReload
+  , el
+  ]
+
+reloadButton :: R.State Int -> R.Element
+reloadButton (_ /\ setReload) = H.a {className, onClick, title: "Reload"} []
+  where
+    className = "reload-btn glyphicon glyphicon-refresh"
+    onClick = mkEffectFn1 $ \_ -> setReload $ \r -> r + 1

src/Gargantext/Pages/Corpus/Document.purs

@@ -3,28 +3,26 @@ module Gargantext.Pages.Corpus.Document where
 import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:?))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Map as Map
 import Data.Maybe (Maybe(..), maybe)
 import Effect.Aff (Aff)
-import React (ReactElement, ReactClass)
-import React as React
+import React (ReactClass, Children)
 import React.DOM (div, h4, li, p, span, text, ul)
 import React.DOM.Props (className)
-import Thermite (PerformAction, Render, Spec, simpleSpec, cmapProps, defaultPerformAction, createClass)
-import Control.Monad.Trans.Class (lift)
+import Reactix as R
+import Thermite (PerformAction, Render, Spec, simpleSpec, cmapProps, createClass)
 
 import Gargantext.Prelude
-import Gargantext.Config          (toUrl, NodeType(..), End(..), TabSubType(..), TabType(..), CTabNgramType(..))
+import Gargantext.Config          (toUrl, NodeType(..), End(..), TabSubType(..), TabType(..), CTabNgramType(..), CTabNgramType(..))
 import Gargantext.Config.REST     (get)
 import Gargantext.Components.AutoUpdate (autoUpdateElt)
-import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Loader2 (useLoader)
 import Gargantext.Components.Node (NodePoly(..))
 import Gargantext.Components.NgramsTable.Core
 import Gargantext.Components.Annotation.AnnotatedField as AnnotatedField
 import Gargantext.Types (TermList)
-import Gargantext.Utils.Reactix ( scuff )
+import Gargantext.Utils.Reactix as R2
 
-type DocPath = { nodeId :: Int, listIds :: Array Int, tabType :: TabType }
+type DocPath = { nodeId :: Int, listIds :: Array Int, corpusId :: Maybe Int, tabType :: TabType }
 
 type NodeDocument = NodePoly Document
 
@@ -32,7 +30,10 @@ type LoadedData =
   { document    :: NodeDocument
   , ngramsTable :: VersionedNgramsTable }
 
-type LoadedDataProps = Loader.InnerProps DocPath LoadedData ()
+type Props =
+  { loaded :: LoadedData
+  , path   :: DocPath
+  }
 
 -- This is a subpart of NgramsTable.State.
 type State = CoreState ()
@@ -273,24 +274,24 @@ instance decodeDocument :: DecodeJson Document
                       --, text
                       }
 
-docViewSpec :: Spec State LoadedDataProps Action
+docViewSpec :: Spec State Props Action
 docViewSpec = simpleSpec performAction render
   where
-    performAction :: PerformAction State LoadedDataProps Action
+    performAction :: PerformAction State Props Action
     performAction Refresh {path: {nodeId, listIds, tabType}} {ngramsVersion} = do
         commitPatch {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: mempty})
     performAction (SetTermListItem n pl) {path: {nodeId, listIds, tabType}} {ngramsVersion} =
         commitPatch {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
       where
         pe = NgramsPatch { patch_list: pl, patch_children: mempty }
-        pt = PatchMap $ Map.singleton n pe
-    performAction (AddNewNgram ngram termList) {path: params} _ =
-      lift $ addNewNgram ngram (Just termList) params
+        pt = singletonNgramsTablePatch CTabTerms n pe
+    performAction (AddNewNgram ngram termList) {path: {nodeId, listIds, tabType}} {ngramsVersion} =
+        commitPatch {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
+      where
+        pt = addNewNgram CTabTerms ngram termList
 
-    render :: Render State LoadedDataProps Action
-    render dispatch { path: pageParams
-                    , loaded: { ngramsTable: Versioned { data: initTable }, document }
-                    , dispatch: loaderDispatch }
+    render :: Render State Props Action
+    render dispatch { loaded: { ngramsTable: Versioned { data: initTable }, document } }
                     { ngramsTablePatch }
                     _reactChildren =
       [ autoUpdateElt { duration: 3000
@@ -327,23 +328,27 @@ docViewSpec = simpleSpec performAction render
           ngramsTable = applyNgramsTablePatch ngramsTablePatch initTable
           setTermList ngram Nothing        newList = dispatch $ AddNewNgram ngram newList
           setTermList ngram (Just oldList) newList = dispatch $ SetTermListItem ngram (replace oldList newList)
-          annotate text = scuff $ AnnotatedField.annotatedField { ngrams: ngramsTable, setTermList, text }
+          annotate text = R2.scuff $ AnnotatedField.annotatedField { ngrams: ngramsTable, setTermList, text }
           li' = li [className "list-group-item justify-content-between"]
           text' x = text $ maybe "Nothing" identity x
           badge s = span [className "badge badge-default badge-pill"] [text s]
           NodePoly {hyperdata : Document doc} = document
 
-layout :: Spec {} {nodeId :: Int, listId :: Int} Void
-layout = cmapProps (\{nodeId, listId} -> {nodeId, listIds: [listId], tabType})
-       $ simpleSpec defaultPerformAction render
+docViewClass :: ReactClass
+                  { children :: Children
+                  , loaded   :: LoadedData
+                  , path     :: DocPath
+                  }
+docViewClass = createClass "DocumentView" docViewSpec initialState
+
+layout :: Spec {} {nodeId :: Int, listId :: Int, corpusId :: Maybe Int} Void
+layout =
+  cmapProps (\{nodeId, listId, corpusId} -> {nodeId, listIds: [listId], corpusId, tabType}) $
+  R2.elSpec $ R.hooksComponent "DocumentLoader" \path _ ->
+    useLoader path loadData $ \props ->
+      R2.createElement' docViewClass props []
   where
     tabType = TabDocument (TabNgramType CTabTerms)
-    render :: Render {} DocPath Void
-    render _ path _ _ =
-      [ documentLoader
-        { path
-        , component: createClass "DocumentView" docViewSpec initialState
-        } ]
 
 ------------------------------------------------------------------------
 
@@ -363,9 +368,3 @@ loadData {nodeId, listIds, tabType} = do
     , termSizeFilter : Nothing
     }
   pure {document, ngramsTable}
-
-documentLoaderClass :: ReactClass (Loader.Props DocPath LoadedData)
-documentLoaderClass = Loader.createLoaderClass "DocumentLoader" loadData
-
-documentLoader :: Loader.Props' DocPath LoadedData -> ReactElement
-documentLoader props = React.createElement documentLoaderClass props []

src/Gargantext/Pages/Corpus/Graph.purs

@@ -244,28 +244,16 @@ render d p (State {sigmaGraphData, settings, legendData}) c =
 --   where
 --     treespec = over _render \frender d p (State s) c ->
 
---                 [ div [ className "col-md-2", _id "graph-tree", style {marginTop: "65px"}] $
---                   [
---                      button [className "btn btn-primary" , onClick \_ -> d ToggleTree]
---                      [text $ if s.showTree then "Hide Tree" else "Show Tree"]
---                   ]
---                   <>
---                   if s.showTree then (frender d p (State s) c) else []
---                 ]
-
-
-
---     graphspec   = over _render \frender d p s c -> [
---          div [ className "col-md-9"] (frender d p s c)
---       ]
---     treeSpec :: Spec State {} Action
---     treeSpec = withState \(State st) ->
---       case st.treeId of
---         Nothing ->
---           simpleSpec defaultPerformAction defaultRender
---         Just treeId ->
---           (cmapProps (const {root: treeId}) (noState Tree.treeview))
-    
+    -- graphspec   = over _render \frender d p s c -> [
+    --      div [ className "col-md-9"] (frender d p s c)
+    --   ]
+    -- treeSpec :: Spec State {} Action
+    -- treeSpec = withState \(State st) ->
+    --   case st.treeId of
+    --     Nothing ->
+    --       simpleSpec defaultPerformAction defaultRender
+    --     Just treeId ->
+    --       cmapProps (const {root: treeId, mCurrentRoute: Nothing}) $ noState $ Tree.treeview
 
 --     render' :: Render State {} Action
 --     render' d _ (State st@{sigmaSettings, graphData: GraphData {sides,metaData  }}) _ =

src/Gargantext/Pages/Corpus/Graph/Tabs.purs

@@ -4,7 +4,6 @@ import Prelude hiding (div)
 import Data.Lens (view)
 import Data.List (fromFoldable)
 import Data.Tuple (Tuple(..))
-import Gargantext.Config (TabType(..), TabSubType(..))
 import Gargantext.Components.GraphExplorer.Types (GraphSideCorpus(..))
 import Gargantext.Components.FacetsTable (TextQuery, docViewSpec)
 import Gargantext.Components.Table as T

src/Gargantext/Pages/Corpus/Tabs.purs

-module Gargantext.Pages.Corpus.Tabs
-  ( module Gargantext.Pages.Corpus.Tabs.Specs
-  ) where
-
-import Gargantext.Pages.Corpus.Tabs.Specs
-

src/Gargantext/Pages/Home/Specs.purs

@@ -10,14 +10,15 @@ import Gargantext.Components.Lang.Landing.EnUS as En
 import Gargantext.Components.Lang.Landing.FrFR as Fr
 import Gargantext.Components.Data.Landing (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
 import Gargantext.Components.Data.Lang (Lang(..))
-import Gargantext.Pages.Home.States (State, initialState)
 import Gargantext.Pages.Home.Actions (Action, performAction)
 
+import Reactix as R
+import Reactix.DOM.HTML as H
 import React (ReactElement)
-import React.DOM (a, div, h3, i, img, p, span, text)
-import React.DOM.Props (Props, _id, aria, className, href, src, target, title, height, width)
-import Thermite (Render, Spec, simpleSpec, hideState, focusState)
+import React.DOM.Props (Props)
+import Thermite (Spec, hideState, focusState, Render, simpleSpec)
 
+import Gargantext.Utils.Reactix as R2
 
 -- Layout |
 
@@ -26,63 +27,64 @@ landingData FR = Fr.landingData
 landingData EN = En.landingData
 
 layoutLanding :: Lang -> Spec {} {} Void
-layoutLanding = hideState (const $ unwrap initialState)
-            <<< focusState (re _Newtype)
-            <<< layoutLanding' <<< landingData
+layoutLanding = layoutLanding' <<< landingData
 
 ------------------------------------------------------------------------
 
-layoutLanding' :: LandingData -> Spec State {} Action
-layoutLanding' hd = simpleSpec performAction render
+layoutLanding' :: LandingData -> Spec {} {} Void
+layoutLanding' hd = R2.elSpec $ R.hooksComponent "LayoutLanding" cpt
   where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [ className "container1" ] [ jumboTitle hd false                 ]
-      , div [ className "container1" ] [] -- TODO put research form
-      , div [ className "container1" ] [ blocksRandomText' hd                ]
+    cpt {} _children = do
+      pure $ H.span {} [
+        H.div { className: "container1" }
+              [ jumboTitle hd false ]
+        , H.div { className: "container1" } [] -- TODO put research form
+        , H.div { className: "container1" } [ blocksRandomText' hd ]
         ]
 ------------------------------------------------------------------------
 
-blocksRandomText' :: LandingData -> ReactElement
+blocksRandomText' :: LandingData -> R.Element
 blocksRandomText' (LandingData hd) = blocksRandomText hd.blockTexts
 
 
-blocksRandomText :: BlockTexts -> ReactElement
+blocksRandomText :: BlockTexts -> R.Element
 blocksRandomText (BlockTexts bt) =
-  div [ className "row" ] ( map showBlock bt.blocks )
+  H.div { className: "row" } ( map showBlock bt.blocks )
     where
-      showBlock :: BlockText -> ReactElement
+      showBlock :: BlockText -> R.Element
       showBlock (BlockText b) =
-        div [ className "col-md-4 content" ]
-              [ h3 [] [ a [ href b.href, title b.title]
-                          [ i [className b.icon] []
-                          , text ("   " <> b.titleText)
+        H.div { className: "col-md-4 content" }
+        [ H.h3 {} [ H.a { href: b.href, title: b.title}
+                    [ H.i {className: b.icon} []
+                    , H.text ("   " <> b.titleText)
                     ]
                   ]
-              , p [] [ text b.text ]
-              , p [] [ docButton b.docButton ]
+        , H.p {} [ H.text b.text ]
+        , H.p {} [ docButton b.docButton ]
         ]
 
-docButton :: Button -> ReactElement
-docButton (Button b) = a [ className "btn btn-outline-primary btn-sm spacing-class"
-              , href b.href
-              , target "blank"
-              , title b.title
-              ] [ span [ aria {hidden : true}
-                       , className "glyphicon glyphicon-hand-right"
-                       ]  []
-                , text b.text
+docButton :: Button -> R.Element
+docButton (Button b) =
+  H.a { className: "btn btn-outline-primary btn-sm spacing-class"
+      , href: b.href
+      , target: "blank"
+      , title: b.title
+      } [ H.span { aria: {hidden : true}
+                 , className: "glyphicon glyphicon-hand-right"
+                 } []
+        , H.text b.text
         ]
 
-jumboTitle :: LandingData -> Boolean -> ReactElement
-jumboTitle (LandingData hd) b = div jumbo
-                   [ div [className "row"             ]
-                     [ div [ className "col-md-12 content"]
-                           [ div [ className "center" ]
-                               [ div [_id "logo-designed" ]
-                                 [ img [ src "images/logo.png"
-                                       , title hd.logoTitle
-                                       ]
+jumboTitle :: LandingData -> Boolean -> R.Element
+jumboTitle (LandingData hd) b =
+  H.div {className: jumbo}
+  [ H.div { className: "row" }
+    [ H.div { className: "col-md-12 content" }
+      [ H.div { className: "center" }
+        [ H.div { id: "logo-designed" }
+          [ H.img { src: "images/logo.png"
+                  , title: hd.logoTitle
+                  }
           ]
         ]
       ]
@@ -90,16 +92,17 @@ jumboTitle (LandingData hd) b = div jumbo
   ]
   where
     jumbo = case b of
-                                 true  -> [className "jumbotron"]
-                                 false -> []
-
-imageEnter :: LandingData -> Props -> ReactElement
-imageEnter (LandingData hd) action =  div [className "row"]
-                           [ div [className "col-md-offset-5 col-md-6 content"]
-                             [ img [ src "images/Gargantextuel-212x300.jpg"
-                                   , _id "funnyimg"
-                                   , title hd.imageTitle
+      true  -> "jumbotron"
+      false -> ""
+
+imageEnter :: LandingData -> Props -> R.Element
+imageEnter (LandingData hd) action =
+  H.div {className: "row"}
+  [ H.div {className: "col-md-offset-5 col-md-6 content"}
+    [ H.img { src: "images/Gargantextuel-212x300.jpg"
+            , id: "funnyimg"
+            , title: hd.imageTitle
             , action
-                                   ]
+            }
     ]
   ]

src/Gargantext/Pages/Layout.purs

@@ -3,14 +3,12 @@ module Gargantext.Pages.Layout where
 import Prelude hiding (div)
 -- import Gargantext.Components.Login as LN
 import Gargantext.Pages.Layout.Actions (Action(..))
-import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 -- import Gargantext.Pages.Corpus.Tabs as TV
 
 import Gargantext.Pages.Corpus.Graph          as GE
 -- import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
 
 -- import Gargantext.Pages.Home as L
--- import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
 
 dispatchAction :: forall ignored m.
@@ -25,17 +23,9 @@ dispatchAction dispatcher _ Login = do
   dispatcher $ SetRoute Login
   -- dispatcher $ LoginA TODO
 
-dispatchAction dispatcher _ AddCorpus = do
-  dispatcher $ SetRoute   AddCorpus
-  dispatcher $ AddCorpusA AC.LoadDatabaseDetails
-
 dispatchAction dispatcher _ (Corpus n) = do
   dispatcher $ SetRoute $ Corpus n
 
-dispatchAction dispatcher _ SearchView = do
-  dispatcher $ SetRoute SearchView
-  -- dispatcher $ SearchA TODO
-
 dispatchAction dispatcher _ (UserPage id) = do
   dispatcher $ SetRoute $ UserPage id
 
@@ -48,6 +38,9 @@ dispatchAction dispatcher _ (Annuaire id) = do
 dispatchAction dispatcher _ (Folder id) = do
   dispatcher $ SetRoute $ Folder id
 
+dispatchAction dispatcher _ (CorpusDocument c i n) = do
+  dispatcher $ SetRoute $ CorpusDocument c i n
+
 dispatchAction dispatcher _ (Document i n) = do
   dispatcher $ SetRoute $ Document i n
 
@@ -56,5 +49,11 @@ dispatchAction dispatcher _ (PGraphExplorer nid) = do
   -- dispatcher $ GraphExplorerA $ GE.LoadGraph nid
   --dispatcher $ GraphExplorerA $ GE.LoadGraph "imtNew.json"
 
+dispatchAction dispatcher _ (Texts nid) = do
+  dispatcher $ SetRoute $ Texts nid
+
+dispatchAction dispatcher _ (Lists nid) = do
+  dispatcher $ SetRoute $ Lists nid
+
 dispatchAction dispatcher _ Dashboard = do
   dispatcher $ SetRoute Dashboard

src/Gargantext/Pages/Layout/Actions.purs

@@ -12,9 +12,7 @@ import Routing.Hash                                    (setHash)
 import Gargantext.Components.Login                  as LN
 import Gargantext.Components.Modals.Modal              (modalShow)
 import Gargantext.Pages.Annuaire             as Annuaire
---import Gargantext.Pages.Corpus.Graph     as GE
-import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
-import Gargantext.Pages.Layout.Specs.Search         as S
+import Gargantext.Pages.Corpus.Graph     as GE
 import Gargantext.Pages.Layout.States                  (AppState)
 import Gargantext.Prelude
 import Gargantext.Router                               (Routes)
@@ -24,9 +22,7 @@ import Gargantext.Router                               (Routes)
 data Action
   = LoginA     LN.Action
   | SetRoute   Routes
-  | SearchA    S.Action
-  | AddCorpusA AC.Action
-  -- | GraphExplorerA     GE.Action
+  | GraphExplorerA     GE.Action
   | AnnuaireAction     Annuaire.Action
   | ShowLogin
   | Logout
@@ -61,9 +57,7 @@ performAction ShowAddCorpus  _ _ = void do
 ---------------------------------------------------------
 
 performAction (LoginA          _) _ _ = pure unit
-performAction (AddCorpusA      _) _ _ = pure unit
-performAction (SearchA         _) _ _ = pure unit
--- performAction (GraphExplorerA  _) _ _ = pure unit
+performAction (GraphExplorerA  _) _ _ = pure unit
 performAction (AnnuaireAction  _) _ _ = pure unit
   -- liftEffect $ modalShow "addCorpus"
   -- modifyState $ _ {showCorpus = true}
@@ -76,18 +70,6 @@ _loginAction = prism LoginA \action ->
     LoginA caction -> Right caction
     _-> Left action
 
-_addCorpusAction :: Prism' Action AC.Action
-_addCorpusAction = prism AddCorpusA \action ->
-  case action of
-    AddCorpusA caction -> Right caction
-    _-> Left action
-
-_searchAction :: Prism' Action S.Action
-_searchAction = prism SearchA \action ->
-  case action of
-    SearchA caction -> Right caction
-    _-> Left action
-
 _annuaireAction :: Prism' Action Annuaire.Action
 _annuaireAction = prism AnnuaireAction \action ->
   case action of

src/Gargantext/Pages/Layout/Specs.purs

@@ -4,10 +4,11 @@ import Data.Foldable (fold, intercalate)
 import Data.Lens (over)
 import Data.Maybe (Maybe(Nothing, Just))
 import Effect (Effect)
-import React (ReactElement)
-import React.DOM (a, button, div, footer, hr', img, li, p, span, text, ul)
-import React.DOM.Props (_data, _id, aria, className, href, onClick, role, src, style, tabIndex, target, title, height, width)
-import Thermite (Render, Spec, _render, defaultPerformAction, defaultRender, focus, simpleSpec, withState, noState, cmapProps)
+import React.DOM (button, div, text)
+import React.DOM.Props (_id, className, onClick, role, style)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Thermite (Spec, _render, defaultPerformAction, defaultRender, focus, simpleSpec, withState, noState, cmapProps)
 -- import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Prelude
@@ -22,15 +23,15 @@ import Gargantext.Pages.Annuaire.User.Contacts as C
 import Gargantext.Pages.Corpus as Corpus
 import Gargantext.Pages.Corpus.Document as Annotation
 import Gargantext.Pages.Corpus.Dashboard as Dsh
---import Gargantext.Pages.Corpus.Graph as GE
+import Gargantext.Pages.Corpus.Graph as GE
+import Gargantext.Pages.Lists as Lists
+import Gargantext.Pages.Texts as Texts
 import Gargantext.Pages.Home as L
-import Gargantext.Pages.Layout.Actions (Action(..), _addCorpusAction, _loginAction, _searchAction, performAction)
-import Gargantext.Pages.Layout.Specs.AddCorpus as AC
-import Gargantext.Pages.Layout.Specs.Search    as S
+import Gargantext.Pages.Layout.Actions (Action(..), _loginAction, performAction)
 import Gargantext.Pages.Layout.Specs.SearchBar as SB
-import Gargantext.Pages.Layout.States (AppState, _addCorpusState, _loginState, _searchState)
+import Gargantext.Pages.Layout.States (AppState, _loginState)
 import Gargantext.Router (Routes(..))
-import Gargantext.Utils.Reactix (scuff)
+import Gargantext.Utils.Reactix as R2
 
 layoutSpec :: Spec AppState {} Action
 layoutSpec =
@@ -39,7 +40,6 @@ layoutSpec =
   , container $ withState pagesComponent
   , withState \st ->
      fold [ focus _loginState _loginAction (LN.modalSpec st.showLogin "Login" LN.renderSpec)
-          , focus _addCorpusState _addCorpusAction (AC.modalSpec st.showCorpus "Search Results" AC.layoutAddcorpus)
           ]
   ]
   where
@@ -54,16 +54,17 @@ pagesComponent s = case s.currentRoute of
     Nothing    -> selectSpec Home -- TODO add Error page here: url requested does not exist (with funny Garg image)
   where
     selectSpec :: Routes -> Spec AppState {} Action
-    selectSpec Home              = layout0 $ noState (L.layoutLanding EN)
+    selectSpec Home              = layout0 $ noState $ L.layoutLanding EN
     selectSpec Login             = focus _loginState _loginAction LN.renderSpec
     selectSpec (Folder i)        = layout0 $ noState F.layoutFolder
 
     selectSpec (Corpus   i)      = layout0 $ cmapProps (const {nodeId: i}) $ noState Corpus.layout
-    selectSpec AddCorpus         = layout0 $ focus _addCorpusState _addCorpusAction AC.layoutAddcorpus
-    selectSpec SearchView        = layout0 $ focus _searchState _searchAction  S.searchSpec
-    selectSpec (Document l i)    = layout0 $ cmapProps (const {nodeId: i, listId: l}) $ noState Annotation.layout
-    --selectSpec (PGraphExplorer i)= layout1  $ focus _graphExplorerState _graphExplorerAction  GE.specOld
+    selectSpec (CorpusDocument c l i) = layout0 $ cmapProps (const {nodeId: i, listId: l, corpusId: Just c}) $ noState Annotation.layout
+    selectSpec (Document l i)    = layout0 $ cmapProps (const {nodeId: i, listId: l, corpusId: Nothing}) $ noState Annotation.layout
+    -- selectSpec (PGraphExplorer i)= layout1  $ focus _graphExplorerState _graphExplorerAction  GE.specOld
     selectSpec (PGraphExplorer i) = layout1 $ noState $ GE.spec
+    selectSpec (Texts i)         = layout0 $ cmapProps (const {nodeId: i}) $ noState Texts.layout
+    selectSpec (Lists i)         = layout0 $ cmapProps (const {nodeId: i}) $ noState Lists.layout
     selectSpec Dashboard         = layout0 $ noState Dsh.layoutDashboard
     selectSpec (Annuaire i)      = layout0 $ cmapProps (const {annuaireId: i}) $ noState A.layout
     selectSpec (UserPage i)      = layout0 $ cmapProps (const {nodeId: i}) $ noState C.layoutUser
@@ -80,7 +81,7 @@ layout0 layout =
   fold
   [ searchBar
   , outerLayout
-  , layoutFooter
+  , noState layoutFooter
   ]
   where
     outerLayout1 = simpleSpec defaultPerformAction defaultRender
@@ -91,14 +92,13 @@ layout0 layout =
        withState \st ->
           case st.loginState.authData of
             Just (AuthData {tree_id}) ->
-              ls $ cmapProps (const {root: tree_id}) as
+              ls $ cmapProps (const {root: tree_id, mCurrentRoute: st.currentRoute}) $ noState $ Tree.treeview
             Nothing ->
               outerLayout1
       , rs bs
       ]
     ls   = over _render \render d p s c -> [
          div [ className "col-md-2", style {paddingTop: "60px"} ] $ render d p s c
-         
       ]
     rs   = over _render \render d p s c -> [
           div [ case (s.loginState.authData) of
@@ -109,8 +109,6 @@ layout0 layout =
         ] (render d p s c) ]
     cont = over _render \render d p s c -> [ div [className "row"      ] (render d p s c) ]
 
-    as = noState Tree.treeview
-
     bs = innerLayout $ layout
 
     innerLayout :: Spec AppState {} Action
@@ -130,7 +128,7 @@ layout1 layout =
   [ searchBar
   , layout
   -- , outerLayout
-  , layoutFooter
+  , noState layoutFooter
   ]
   where
     outerLayout1 = simpleSpec defaultPerformAction defaultRender
@@ -140,7 +138,7 @@ layout1 layout =
       [ withState \st ->
           case st.loginState.authData of
             Just (AuthData {tree_id}) ->
-              ls $ cmapProps (const {root: tree_id}) as
+              ls $ cmapProps (const {root: tree_id, mCurrentRoute: st.currentRoute}) $ noState $ Tree.treeview
             Nothing ->
               outerLayout1
       , rs bs
@@ -154,8 +152,6 @@ layout1 layout =
     rs   = over _render \render d p s c -> [ div [if (s.showTree) then className "col-md-10" else className "col-md-12"] (render d p s c) ]
     cont = over _render \render d p s c -> [ div [className "row"      ] (render d p s c) ]
 
-    as = noState Tree.treeview
-
     bs = innerLayout $ layout
 
     innerLayout :: Spec AppState {} Action
@@ -178,29 +174,29 @@ searchBar = simpleSpec defaultPerformAction render
             ] [ div [className "container-fluid"
                     ]
                     [ div [ className "navbar-inner" ]
-                          [ divLogo
+                          [ R2.scuff divLogo
                           ,  div [ className "collapse navbar-collapse"
                                  ]
-                             $  [ divDropdownLeft ]
-                             <> [ scuff (SB.searchBar SB.defaultProps) ]
-                             <> [ divDropdownRight d s ]
+                             $  [ R2.scuff divDropdownLeft ]
+                             <> [ R2.scuff (SB.searchBar SB.defaultProps) ]
+                             <> [ R2.scuff $ divDropdownRight d s ]
                           ]
                     ]
               ]
       ]
 
 
-divLogo :: ReactElement
-divLogo = a [ className "navbar-brand logoSmall"
-            , href "#/"
-            ] [ img [ src "images/logoSmall.png"
-                    , title "Back to home."
-                    , width  "30"
-                    , height "28"
-                    ]
+divLogo :: R.Element
+divLogo = H.a { className: "navbar-brand logoSmall"
+              , href: "#/"
+              } [ H.img { src: "images/logoSmall.png"
+                        , title: "Back to home."
+                        , width:  "30"
+                        , height: "28"
+                        }
                 ]
 
-divDropdownLeft :: ReactElement
+divDropdownLeft :: R.Element
 divDropdownLeft = divDropdownLeft' (LiNav { title : "About Gargantext"
                                           , href  : "#"
                                           , icon  : "glyphicon glyphicon-info-sign"
@@ -208,32 +204,33 @@ divDropdownLeft = divDropdownLeft' (LiNav { title : "About Gargantext"
                                           }
                                     )
 
-divDropdownLeft' :: LiNav -> ReactElement
-divDropdownLeft' mb =  ul [className "nav navbar-nav"]
-                         [ ul [className "nav navbar-nav pull-left"]
-                              [ li [className "dropdown"]
+divDropdownLeft' :: LiNav -> R.Element
+divDropdownLeft' mb =  H.ul {className: "nav navbar-nav"}
+                       [ H.ul {className: "nav navbar-nav pull-left"}
+                         [ H.li {className: "dropdown"}
                            [ menuButton mb
                            , menuElements'
                            ]
                          ]
                        ]
 
-menuButton :: LiNav -> ReactElement
+menuButton :: LiNav -> R.Element
 menuButton (LiNav { title : title'
                   , href : href'
                   , icon : icon'
                   , text : text'
-                  }) = a [ className "dropdown-toggle navbar-text"
-                        , _data {toggle: "dropdown"}
-                        , href href', role "button"
-                        , title title'
-                        ][ span [ aria {hidden : true}
-                                , className icon'
-                                ] []
-                         , text (" " <> text')
-                         ]
-
-menuElements' :: ReactElement
+                  }) = H.a { className: "dropdown-toggle navbar-text"
+                           , data: {toggle: "dropdown"}
+                           , href: href'
+                           , role: "button"
+                           , title: title'
+                           } [ H.span { aria: {hidden : true}
+                                      , className: icon'
+                                      } []
+                             , H.text (" " <> text')
+                             ]
+
+menuElements' :: R.Element
 menuElements' = menuElements-- title, icon, text
   [ -- ===========================================================
     [ LiNav { title : "Quick start, tutorials and methodology"
@@ -269,14 +266,14 @@ menuElements' = menuElements-- title, icon, text
   ] -- ===========================================================
 
 -- | Menu in the sidebar, syntactic sugar
-menuElements :: Array (Array LiNav) -> ReactElement
+menuElements :: Array (Array LiNav) -> R.Element
 menuElements ns = dropDown $ intercalate divider $ map (map liNav) ns
   where
-    dropDown :: Array ReactElement -> ReactElement
-    dropDown = ul [className "dropdown-menu"]
+    dropDown :: Array R.Element -> R.Element
+    dropDown = H.ul {className: "dropdown-menu"}
 
-    divider :: Array ReactElement
-    divider = [li [className "divider"] []]
+    divider :: Array R.Element
+    divider = [H.li {className: "divider"} []]
 
 -- | surgar for target : "blank"
 --data LiNav_ = LiNav_ { title  :: String
@@ -292,77 +289,78 @@ data LiNav = LiNav { title :: String
                    , text  :: String
                    }
 
-liNav :: LiNav -> ReactElement
+liNav :: LiNav -> R.Element
 liNav (LiNav { title : title'
              , href  : href'
              , icon  : icon'
              , text  : text'
              }
-      ) = li [] [ a [ tabIndex (-1)
-                    , target "blank"
-                    , title title'
-                    , href href'
-                    ] [ span [ className icon' ] []
-                      , text $ " " <> text'
+      ) = H.li {} [ H.a { tabIndex: (-1)
+                        , target: "blank"
+                        , title: title'
+                        , href: href'
+                        } [ H.span { className: icon' } []
+                          , H.text $ " " <> text'
                           ]
                   ]
 
 
-logLinks :: (Action -> Effect Unit) -> AppState -> ReactElement
+logLinks :: (Action -> Effect Unit) -> AppState -> R.Element
 logLinks d s = case s.loginState.authData of
            Nothing -> loginLink
            Just _  -> logoutLink
   where
     loginLink =
-      a [ aria {hidden : true}
-        , className "glyphicon glyphicon-log-in"
-        , onClick $ \e -> d ShowLogin
-        , style {color:"white"}
-        , title "Log in and save your time"
+      H.a { aria: {hidden : true}
+          , className: "glyphicon glyphicon-log-in"
+          , on: {click:  \e -> d ShowLogin}
+          , style: {color:"white"}
+          , title: "Log in and save your time"
           -- TODO hover: bold
-        ]
-        [text " Login / Signup"]
+          }
+          [H.text " Login / Signup"]
     -- TODO dropdown to logout
     logoutLink =
-      a [ aria {hidden : true}
-        , className "glyphicon glyphicon-log-out"
-        , onClick $ \e -> d Logout
-        , style {color:"white"}
-        , title "Log out" -- TODO
+      H.a { aria: {hidden : true}
+          , className: "glyphicon glyphicon-log-out"
+          , on: {click: \e -> d Logout}
+          , style: {color:"white"}
+          , title: "Log out" -- TODO
           -- TODO hover: bold
-        ]
-        [text " Logout"]
+          }
+          [H.text " Logout"]
 
 
-divDropdownRight :: (Action -> Effect Unit) -> AppState -> ReactElement
+divDropdownRight :: (Action -> Effect Unit) -> AppState -> R.Element
 divDropdownRight d s =
-  ul [className "nav navbar-nav pull-right"]
-     [ li [className "dropdown"]
+  H.ul {className: "nav navbar-nav pull-right"}
+  [ H.li {className: "dropdown"}
     [ logLinks d s ]
   ]
 
-layoutFooter :: Spec AppState {} Action
-layoutFooter = simpleSpec performAction render
-  where
-    render :: Render AppState {} Action
-    render dispatch _ state _ = [div [ className "container" ] [ hr', footerLegalInfo']]
+layoutFooter :: Spec {} {} Void
+layoutFooter = R2.elSpec $ R.hooksComponent "LayoutFooter" cpt
   where
-        footerLegalInfo' = footer [] [ p [] [ text "Gargantext "
-                                   , span [className "glyphicon glyphicon-registration-mark" ] []
-                                   , text ", version 4.0"
-                                   , a [ href "http://www.cnrs.fr"
-                                       , target "blank"
-                                       , title "Project hosted by CNRS."
-                                       ]
-                                         [ text ", Copyrights "
-                                         , span [ className "glyphicon glyphicon-copyright-mark" ] []
-                                         , text " CNRS 2017-Present"
-                                         ]
-                                   , a [ href "http://gitlab.iscpif.fr/humanities/gargantext/blob/stable/LICENSE"
-                                       , target "blank"
-                                       , title "Legal instructions of the project."
-                                       ]
-                                         [ text ", Licences aGPLV3 and CECILL variant Affero compliant" ]
-                                         , text "."
+    cpt {} _children = do
+      pure $ H.div { className: "container" } [ H.hr {}, footerLegalInfo']
+
+    footerLegalInfo' = H.footer {}
+                        [ H.p {} [ H.text "Gargantext "
+                                , H.span {className: "glyphicon glyphicon-registration-mark"} []
+                                , H.text ", version 4.0"
+                                , H.a { href: "http://www.cnrs.fr"
+                                      , target: "blank"
+                                      , title: "Project hosted by CNRS."
+                                      }
+                                  [ H.text ", Copyrights "
+                                  , H.span { className: "glyphicon glyphicon-copyright-mark" } []
+                                  , H.text " CNRS 2017-Present"
+                                  ]
+                                , H.a { href: "http://gitlab.iscpif.fr/humanities/gargantext/blob/stable/LICENSE"
+                                      , target: "blank"
+                                      , title: "Legal instructions of the project."
+                                      }
+                                  [ H.text ", Licences aGPLV3 and CECILL variant Affero compliant" ]
+                                , H.text "."
                                 ]
                         ]

src/Gargantext/Pages/Layout/Specs/AddCorpus.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus
-  ( module Gargantext.Pages.Layout.Specs.AddCorpus.States
-  , module Gargantext.Pages.Layout.Specs.AddCorpus.Actions
-  , module Gargantext.Pages.Layout.Specs.AddCorpus.Specs
-  ) where
-
-import Gargantext.Pages.Layout.Specs.AddCorpus.States
-import Gargantext.Pages.Layout.Specs.AddCorpus.Actions
-import Gargantext.Pages.Layout.Specs.AddCorpus.Specs
-

src/Gargantext/Pages/Layout/Specs/AddCorpus/Actions.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.Actions where
-
-import Control.Monad.Cont.Trans (lift)
-import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>))
-import Effect.Aff (Aff)
-import Effect.Class (liftEffect)
-import Routing.Hash (setHash)
-import Thermite (PerformAction, modifyState)
-
-import Gargantext.Prelude
-import Gargantext.Config.REST (post)
-import Gargantext.Components.Modals.Modal (modalHide)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Response, State)
-
-data Action
-  = SelectDatabase Boolean
-  | UnselectDatabase Boolean
-  | LoadDatabaseDetails
-  | GO
-
-performAction :: PerformAction State {} Action
-performAction (SelectDatabase selected) _ _ = void do
-  modifyState $ _ { select_database = selected }
-
-performAction (UnselectDatabase unselected) _ _ = void do
-  modifyState $ _ { unselect_database = unselected }
-
-performAction (LoadDatabaseDetails) _ _ = do
-  res <- lift $ getDatabaseDetails $ QueryString { query_query: "string",query_name: ["Pubmed"]}
-  void $ modifyState $ _ {response = res}
-
-performAction GO _ _ = do
-  liftEffect $ setHash "/corpus"
-  liftEffect $ modalHide "addCorpus"
-  pure unit
-
-
-newtype QueryString = QueryString
-  {
-    query_query :: String
-  , query_name :: Array String
-  }
-
-queryString :: QueryString
-queryString = QueryString
-  {
-  query_query: "string",
-  query_name: [
-    "Pubmed"
-  ]
-  }
-
-
-instance encodeJsonQueryString :: EncodeJson QueryString where
-  encodeJson (QueryString obj) =
-    "query_query"       := obj.query_query
-    ~> "query_name"        := obj.query_name
-    ~> jsonEmptyObject
-
-getDatabaseDetails :: QueryString -> Aff (Array Response)
-getDatabaseDetails reqBody = do
-  -- TODO let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1MTk5OTg1ODMsInVzZXJfaWQiOjUsImVtYWlsIjoiYWxleGFuZHJlLmRlbGFub2VAaXNjcGlmLmZyIiwidXNlcm5hbWUiOiJkZXZlbG9wZXIifQ.Os-3wuFNSmRIxCZi98oFNBu2zqGc0McO-dgDayozHJg"
-  post "http://localhost:8009/count" reqBody

src/Gargantext/Pages/Layout/Specs/AddCorpus/Specs.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.Specs where
-
-import Data.Lens (over)
-import Effect.Aff (Aff)
-import React (ReactElement)
-import React.DOM (button, div, h3, h5, li, span, text, ul)
-import React.DOM.Props (_data, _id, _type, aria, className, onClick, role)
-import Thermite (Render, Spec, _render, simpleSpec)
-
-import Gargantext.Prelude
-import Gargantext.Config.REST (post)
-import Gargantext.Pages.Layout.Specs.AddCorpus.Actions (Action(..), performAction)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Query, Response(..), State)
-
-modalSpec :: Boolean -> String -> Spec State {} Action -> Spec State {} Action
-modalSpec sm t = over _render \render d p s c ->
-  [ div [ _id "addCorpus", className $ "modal myModal" <> if sm then "" else " fade"
-        , role "dialog"
-        , _data {show : true}
-        ][ div [ className "modal-dialog", role "document"]
-               [ div [ className "modal-content"]
-                     [ div [ className "modal-header"]
-                           [ h5 [ className "modal-title" ] [ text $ t ]
-                           , button [ _type "button"
-                                    , className "close"
-                                    , _data { dismiss : "modal"}
-                                    ] [ span [ aria {hidden : true}] [ text "X"] ]
-                           ]
-
-                      , div [ className "modal-body"] (render d p s c)
-                      ]
-                ]
-         ]
-   ]
-
-
-spec' :: Spec State {} Action
-spec' = modalSpec true "Search Results" layoutAddcorpus
-
-
-layoutModal :: forall e.  { response :: Array Response | e} -> Array ReactElement
-layoutModal state =
-      [button [ _type "button"
-             , _data { "toggle" : "modal"
-             , "target" : ".myModal"
-             }
-             ][text "Launch modal"]
-             , div [ className "modal fade myModal"
-                   , role "dialog"
-                   , _data {show : true}
-                   ][ div [ className "modal-dialog"
-                          , role "document"
-                          ] [ div [ className "modal-content"]
-                                  [ div [ className "modal-header"]
-                                        [ h5 [className "modal-title"]
-                                             [text "CorpusView"      ]
-                                        , button [ _type "button"
-                                                 , className "close"
-                                                 , _data { dismiss : "modal"}
-                                                 ] [ span [ aria {hidden : true}]
-                                                          [ text "X"]
-                                                   ]
-                                        ]
-
-                                  , div [ className "modal-body"]
-                                        [ ul [ className "list-group"] ( map fn1 state.response ) ]
-
-                                  , div [className "modal-footer"]
-                                        [ button [ _type "button"
-                                                 , className "btn btn-secondary"
-                                                 , _data {dismiss : "modal"}
-                                                 ] [ text "GO"]
-                                        ]
-                                   ]
-                            ]
-                     ]
-        ]
-      where
-        fn1 (Response o) =
-          li [className "list-group-item justify-content-between"]
-          [
-          span [] [text  o.name]
-          ,  span [className "badge badge-default badge-pill"] [ text $ show o.count]
-          ]
-
-
-layoutAddcorpus :: Spec State {} Action
-layoutAddcorpus = simpleSpec performAction render
-  where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [className "container1"] []
-      , div [className "container1"]
-        [ div [className "jumbotron"]
-          [ div [className "row"]
-           [ div [className "col-md-6"] (layoutModal state)
-           , div [className "col-md-6"]
-             [ h3 [] [text "Corpusview"]
-             , ul [className "list-group"] $ map fn1 state.response
-             , button [onClick \_ -> dispatch GO] [text "GO"]
-             ]
-           ]
-          ]
-        ]
-      ]
-      where
-        fn1 (Response o) =
-          li [className "list-group-item justify-content-between"]
-          [
-          span [] [text  o.name]
-          ,  span [className "badge badge-default badge-pill"] [ text $ show o.count]
-          ]
-
-
-
-countResults :: Query -> Aff Int
-countResults = post "http://localhost:8008/count"

src/Gargantext/Pages/Layout/Specs/AddCorpus/States.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.States where
-
-import Prelude hiding (div)
-import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))
-
-type State =
-  { select_database :: Boolean
-  , unselect_database :: Boolean  --  dummy state
-  , response :: Array Response
-  }
-
-newtype Response = Response
-  {
-    count :: Int
-  , name :: String
-  }
-
-
-newtype Query = Query
-  {
-    query_query :: String
-  , query_name :: Array String
-  }
-
-
-instance encodeJsonQuery :: EncodeJson Query where
-  encodeJson (Query post)
-     = "query_query" := post.query_query
-    ~> "query_name" := post.query_name
-    ~> jsonEmptyObject
-
-
-
-instance decodeJsonresponse :: DecodeJson Response where
-  decodeJson json = do
-    obj   <- decodeJson json
-    count <- obj .? "count"
-    name  <- obj .? "name"
-    pure $ Response {count,name }
-
-initialState :: State
-initialState =
-  {
-    select_database   : true
-  , unselect_database : true
-  , response : []
-  }

src/Gargantext/Pages/Layout/Specs/Search.purs

-module Gargantext.Pages.Layout.Specs.Search where
-
-import Prelude hiding (div)
-
-import Effect.Class (liftEffect)
-import React.DOM (br', button, div, input, text)
-import React.DOM.Props (_id, _type, className, name, onClick, onInput, placeholder, value)
-import Routing.Hash (setHash)
-import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec)
-import Unsafe.Coerce (unsafeCoerce)
-
-type State =
-  {
-    query :: String
-  }
-
-
-initialState :: State
-initialState =
-  {
-    query : "empty query"
-  }
-
-
-data Action
-  = GO
-  | SetQuery String
-
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value
-
-searchSpec :: Spec State {} Action
-searchSpec = simpleSpec performAction render
-  where
-    performAction :: PerformAction State {} Action
-    performAction (SetQuery q) _ _ = void do
-      modifyState $ _ { query = q }
-
-    performAction GO _ _ = void do
-      liftEffect $ setHash "/addCorpus"
-
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [className "container1"] []
-      , div [className "container1"]
-       [ div [className "jumbotron" ]
-         [ div [className "row"       ]
-           [ div [className "col-md-10" ]
-             [ br'
-             , br'
-             , div [ className "form-group"][]
-                   {-[ input [ className "form-control"
-                           , _id "id_password"
-                           , name "query"
-                           , placeholder "Query, URL or FILE (works best with Firefox or Chromium browsers)"
-                           , _type "text"
-                           , value state.query
-                           , onInput \e -> dispatch (SetQuery (unsafeEventValue e))
-                           ]
-                    , br'
-                    ]
-                    -}
-              ]
-            , div [ className "col-md-2"]
-                  [ br'
-                  , br'
-                  , button [onClick \_ -> dispatch GO] [text "GO"]
-                  ]
-            , br'
-            ]
-          ]
-        ]
-      ]

src/Gargantext/Pages/Layout/Specs/SearchBar.purs

@@ -11,7 +11,6 @@ import Data.Tuple (fst)
 import Data.Tuple.Nested ( (/\) )
 import Effect.Class (liftEffect)
 import Effect.Uncurried (EffectFn1, mkEffectFn1)
-import Thermite (Spec, defaultPerformAction, simpleSpec)
 import Reactix as R
 import DOM.Simple.Console
 import Effect.Aff (launchAff)
@@ -53,11 +52,13 @@ onSearchChange (search /\ setSearch) =
   where
     triggerSearch q =  do
       launchAff $ do
+        liftEffect $ log2 "Searching db: " $ show q.database
         liftEffect $ log2 "Searching term: " q.term
         (r :: Unit) <- Ajax.search (searchQuery q)
         liftEffect $ log2 "Return:" r
         liftEffect $ modalShow "addCorpus"
-    searchQuery {term} = over SearchQuery (_ {query=term}) defaultSearchQuery
+    searchQuery {database: Nothing, term} = over SearchQuery (_ {query=term}) defaultSearchQuery
+    searchQuery {database: Just db, term} = over SearchQuery (_ {databases=[db], query=term}) defaultSearchQuery
 
 toggleButton :: R.State Boolean -> R.Element
 toggleButton open =

src/Gargantext/Pages/Layout/States.purs

@@ -7,16 +7,12 @@ import Data.Maybe                                      (Maybe(Just))
 import Effect (Effect)
 import Gargantext.Components.Login                  as LN
 
---import Gargantext.Pages.Corpus.Graph     as GE
-import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
-import Gargantext.Pages.Layout.Specs.Search         as S
+import Gargantext.Pages.Corpus.Graph     as GE
 import Gargantext.Router                               (Routes(..))
 
 type AppState =
   { currentRoute       :: Maybe Routes
   , loginState         :: LN.State
-  , addCorpusState     :: AC.State
-  , searchState        :: S.State
   , showLogin          :: Boolean
   , showCorpus         :: Boolean
   --, graphExplorerState :: GE.State
@@ -29,8 +25,6 @@ initAppState = do
   pure
     { currentRoute   : Just Home
     , loginState
-    , addCorpusState : AC.initialState
-    , searchState    : S.initialState
     , showLogin      : false
     , showCorpus     : false
     --, graphExplorerState : GE.initialState
@@ -43,12 +37,6 @@ initAppState = do
 _loginState :: Lens' AppState LN.State
 _loginState = lens (\s -> s.loginState) (\s ss -> s{loginState = ss})
 
-_addCorpusState :: Lens' AppState AC.State
-_addCorpusState = lens (\s -> s.addCorpusState) (\s ss -> s{addCorpusState = ss})
-
-_searchState :: Lens' AppState S.State
-_searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
-
 -- _graphExplorerState :: Lens' AppState GE.State
 -- _graphExplorerState = lens (\s -> s.graphExplorerState) (\s ss -> s{graphExplorerState = ss})
 

src/Gargantext/Pages/Lists.purs

+module Gargantext.Pages.Lists where
+
+import Data.Array (head)
+import Data.Maybe (Maybe(..))
+import Effect.Aff (Aff, throwError)
+import Effect.Exception (error)
+import Reactix as R
+import Thermite (Spec)
+--------------------------------------------------------
+import Gargantext.Prelude
+import Gargantext.Components.Node (NodePoly(..), HyperdataList)
+import Gargantext.Components.Loader2 (useLoader)
+import Gargantext.Components.Table as Table
+import Gargantext.Config      (toUrl, Path(..), NodeType(..), End(..))
+import Gargantext.Config.REST (get)
+import Gargantext.Pages.Lists.Tabs.Types (CorpusData, CorpusInfo(..))
+import Gargantext.Pages.Lists.Tabs.Specs (elt) as Tabs
+import Gargantext.Utils.Reactix as R2
+
+------------------------------------------------------------------------
+layout :: Spec {} {nodeId :: Int} Void
+layout =
+  R2.elSpec $ R.hooksComponent "ListsLoader" \{nodeId} _ ->
+    useLoader nodeId getCorpus $ \{loaded: corpusData} ->
+      let {corpusId
+          ,corpusNode:
+            NodePoly { name: title
+                     , date: date'
+                     , hyperdata: CorpusInfo corpus
+                     }
+          } = corpusData in
+      R2.toElement $
+        Table.renderTableHeaderLayout
+          { title: "Corpus " <> title
+          , desc:  corpus.desc
+          , query: corpus.query
+          , date:  date'
+          , user:  corpus.authors
+          }
+        <> [Tabs.elt {corpusId, corpusData}]
+------------------------------------------------------------------------
+
+getCorpus :: Int -> Aff CorpusData
+getCorpus listId = do
+  -- fetch corpus via lists parentId
+  (NodePoly {parentId: corpusId} :: NodePoly {})       <- get $ toUrl Back Corpus $ Just listId
+  corpusNode     <- get $ toUrl Back Corpus $ Just corpusId
+  defaultListIds <- get $ toUrl Back (Children NodeList 0 1 Nothing) $ Just corpusId
+  case (head defaultListIds :: Maybe (NodePoly HyperdataList)) of
+    Just (NodePoly { id: defaultListId }) ->
+      pure {corpusId, corpusNode, defaultListId}
+    Nothing ->
+      throwError $ error "Missing default list"

src/Gargantext/Pages/Lists/Tabs.purs

+module Gargantext.Pages.Lists.Tabs
+  ( module Gargantext.Pages.Lists.Tabs.Specs
+  ) where
+
+import Gargantext.Pages.Lists.Tabs.Specs
+

src/Gargantext/Pages/Corpus/Tabs/Specs.purs → src/Gargantext/Pages/Lists/Tabs/Specs.purs

-module Gargantext.Pages.Corpus.Tabs.Specs where
+module Gargantext.Pages.Lists.Tabs.Specs where
 
 import Prelude hiding (div)
 
@@ -8,24 +8,23 @@ import Data.List (fromFoldable)
 import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
 
-import Gargantext.Config (TabType(..), TabSubType(..))
 import Gargantext.Config (CTabNgramType(..), End(..), Path(..), TabSubType(..), TabType(..), toUrl)
-import Gargantext.Pages.Corpus.Tabs.Types (Props)
+import Gargantext.Pages.Lists.Tabs.Types (Props, PropsRow)
 
 import Gargantext.Pages.Corpus.Chart.Histo (histoSpec)
 import Gargantext.Pages.Corpus.Chart.Metrics (metricsSpec)
 import Gargantext.Pages.Corpus.Chart.Pie  (pieSpec, barSpec)
 import Gargantext.Pages.Corpus.Chart.Tree (treeSpec)
 
-import Gargantext.Pages.Corpus.Dashboard (globalPublis)
 import Gargantext.Components.NgramsTable as NT
 import Gargantext.Components.Charts.Options.ECharts (chart) as ECharts
 import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.Tab as Tab
+import Gargantext.Utils.Reactix as R2
 
-import React (ReactElement)
-import React.DOM (div)
-import Thermite (Spec, hideState, noState, cmapProps)
+import Reactix.DOM.HTML as H
+import React (ReactElement, ReactClass, createElement, Children)
+import Thermite (Spec, hideState, noState, cmapProps, createClass)
 
 data Mode = Authors | Sources | Institutes | Terms
 
@@ -42,58 +41,42 @@ modeTabType Sources    = CTabSources
 modeTabType Institutes = CTabInstitutes
 modeTabType Terms      = CTabTerms
 
+elt :: Props -> ReactElement
+elt props = createElement tabsClass props []
+
+tabsClass :: ReactClass { children :: Children | PropsRow }
+tabsClass = createClass "CorpusTabs" pureTabs $ const {}
+
 pureTabs :: Spec {} Props Void
 pureTabs = hideState (const {activeTab: 0}) statefulTabs
 
 statefulTabs :: Spec Tab.State Props Tab.Action
 statefulTabs =
   Tab.tabs identity identity $ fromFoldable
-    [ Tuple "Documents"  $ docs
-    , Tuple "Sources"    $ ngramsViewSpec {mode: Sources   }
+    [ Tuple "Sources"    $ ngramsViewSpec {mode: Sources   }
     , Tuple "Authors"    $ ngramsViewSpec {mode: Authors   }
     , Tuple "Institutes" $ ngramsViewSpec {mode: Institutes}
     , Tuple "Terms"      $ ngramsViewSpec {mode: Terms     }
-    , Tuple ""           $ trash -- TODO empty here
-    , Tuple "Trash"      $ trash
     ]
-  where
-    -- TODO totalRecords
-
-    docs = noState ( cmapProps (\{path: corpusId} -> {corpusId : corpusId, tabType: TabCorpus TabDocs}) histoSpec
-                              <>
-                     (cmapProps (\{path: nodeId, loaded: loaded} ->
-                                  { nodeId : nodeId
-                                  , chart  : div [][]
-                                  , tabType: TabCorpus TabDocs
-                                  , totalRecords: 4737
-                                  , listId: loaded.defaultListId}) $ noState DT.docViewSpec
-                                  )
-                    )
-    trash = cmapProps (\{path: nodeId, loaded: loaded} ->
-                        { nodeId
-                        , chart: div [][]
-                        , tabType: TabCorpus TabTrash
-                        , totalRecords: 4736
-                        , listId: loaded.defaultListId}) $ noState DT.docViewSpec
 
 
 ngramsViewSpec :: {mode :: Mode} -> Spec Tab.State Props Tab.Action
 ngramsViewSpec {mode} =
-  noState ( (chart mode) <>
-    cmapProps (\{loaded: {defaultListId}, path, dispatch} ->
-                {loaded: {defaultListId}, path, dispatch, tabType})
-              NT.mainNgramsTableSpec
-  )
+  noState $ chart mode <>
+    cmapProps (\{corpusData: {defaultListId}, corpusId: nodeId} ->
+                {defaultListId, nodeId, tabType})
+              (NT.mainNgramsTableSpec (modeTabType mode))
+
   where
     tabType = TabCorpus $ TabNgramType $ modeTabType mode
-    chart Authors    = cmapProps (\{path: corpusId} -> {corpusId : corpusId, tabType}) pieSpec
-    chart Sources    = cmapProps (\{path: corpusId} -> {corpusId : corpusId, tabType}) barSpec
+    chart Authors    = cmapProps (\{corpusId} -> {corpusId, tabType}) pieSpec
+    chart Sources    = cmapProps (\{corpusId} -> {corpusId, tabType}) barSpec
 
-    chart Institutes = cmapProps (\{loaded: {defaultListId}, path: corpusId} ->
+    chart Institutes = cmapProps (\{corpusData: {defaultListId}, corpusId} ->
                           {corpusId, listId: defaultListId, tabType, limit: (Just 1000)})
                       treeSpec
 
-    chart Terms      = cmapProps (\{loaded: {defaultListId}, path: corpusId} ->
+    chart Terms      = cmapProps (\{corpusData: {defaultListId}, corpusId} ->
                           {corpusId, listId: defaultListId, tabType, limit: (Just 1000)})
                           -- TODO limit should be select in the chart by default it is 1000
                       metricsSpec

src/Gargantext/Pages/Corpus/Tabs/Types.purs → src/Gargantext/Pages/Lists/Tabs/Types.purs

-module Gargantext.Pages.Corpus.Tabs.Types where
+module Gargantext.Pages.Lists.Tabs.Types where
 
 import Data.Argonaut (class DecodeJson, decodeJson, (.?), (.??))
 import Data.Maybe (Maybe(..))
@@ -43,10 +43,11 @@ instance decodeCorpusInfo :: DecodeJson CorpusInfo where
     let totalRecords = 47361 -- TODO
     pure $ CorpusInfo {title, desc, query, authors, chart, totalRecords}
 
-type CorpusData = {corpusNode :: NodePoly CorpusInfo, defaultListId :: Int}
+type CorpusData = { corpusId :: Int
+                  , corpusNode :: NodePoly CorpusInfo
+                  , defaultListId :: Int}
 
--- TODO type Props = {nodeId :: Int, info :: Maybe (NodePoly CorpusInfo) }
-type PropsRow = Loader.InnerPropsRow Int CorpusData ()
+type PropsRow = ( corpusId :: Int, corpusData :: CorpusData )
 type Props = Record PropsRow
 
 -- TODO include Gargantext.Pages.Corpus.Tabs.States

src/Gargantext/Pages/Texts.purs

+module Gargantext.Pages.Texts where
+
+import Data.Array (head)
+import Data.Maybe (Maybe(..))
+import Effect.Aff (Aff, throwError)
+import Effect.Exception (error)
+import Reactix as R
+import Thermite (Spec)
+--------------------------------------------------------
+import Gargantext.Prelude
+import Gargantext.Components.Node (NodePoly(..), HyperdataList)
+import Gargantext.Components.Loader2 (useLoader)
+import Gargantext.Components.Table as Table
+import Gargantext.Config      (toUrl, Path(..), NodeType(..), End(..))
+import Gargantext.Config.REST (get)
+import Gargantext.Pages.Texts.Tabs.Types (CorpusData, CorpusInfo(..))
+import Gargantext.Pages.Texts.Tabs.Specs (elt) as Tabs
+import Gargantext.Utils.Reactix as R2
+
+------------------------------------------------------------------------
+layout :: Spec {} {nodeId :: Int} Void
+layout =
+  R2.elSpec $ R.hooksComponent "TextsLoader" \{nodeId} _ ->
+    useLoader nodeId getCorpus $ \{loaded: corpusData} ->
+      let {corpusId
+          ,corpusNode:
+            NodePoly { name: title
+                     , date: date'
+                     , hyperdata: CorpusInfo corpus
+                     }
+          } = corpusData in
+      R2.toElement $
+        Table.renderTableHeaderLayout
+          { title: "Corpus " <> title
+          , desc:  corpus.desc
+          , query: corpus.query
+          , date:  date'
+          , user:  corpus.authors
+          }
+        <> [Tabs.elt {corpusId, corpusData}]
+------------------------------------------------------------------------
+
+getCorpus :: Int -> Aff CorpusData
+getCorpus textsId = do
+  -- fetch corpus via texts parentId
+  (NodePoly {parentId: corpusId} :: NodePoly {})       <- get $ toUrl Back Corpus $ Just textsId
+  corpusNode     <- get $ toUrl Back Corpus $ Just corpusId
+  defaultListIds <- get $ toUrl Back (Children NodeList 0 1 Nothing) $ Just corpusId
+  case (head defaultListIds :: Maybe (NodePoly HyperdataList)) of
+    Just (NodePoly { id: defaultListId }) ->
+      pure {corpusId, corpusNode, defaultListId}
+    Nothing ->
+      throwError $ error "Missing default list"

src/Gargantext/Pages/Texts/Tabs.purs

+module Gargantext.Pages.Texts.Tabs
+  ( module Gargantext.Pages.Texts.Tabs.Specs
+  ) where
+
+import Gargantext.Pages.Texts.Tabs.Specs
+

src/Gargantext/Pages/Texts/Tabs/Specs.purs

+module Gargantext.Pages.Texts.Tabs.Specs where
+
+import Prelude hiding (div)
+
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Show (genericShow)
+import Data.List (fromFoldable)
+import Data.Maybe (Maybe(..))
+import Data.Tuple (Tuple(..))
+
+import Gargantext.Config (CTabNgramType(..), End(..), Path(..), TabSubType(..), TabType(..), toUrl)
+import Gargantext.Pages.Texts.Tabs.Types (Props, PropsRow)
+
+import Gargantext.Pages.Corpus.Chart.Histo (histoSpec)
+import Gargantext.Pages.Corpus.Chart.Metrics (metricsSpec)
+import Gargantext.Pages.Corpus.Chart.Pie  (pieSpec, barSpec)
+import Gargantext.Pages.Corpus.Chart.Tree (treeSpec)
+
+import Gargantext.Components.NgramsTable as NT
+import Gargantext.Components.Charts.Options.ECharts (chart) as ECharts
+import Gargantext.Components.DocsTable as DT
+import Gargantext.Components.Tab as Tab
+import Gargantext.Utils.Reactix as R2
+
+import Reactix as R
+import Reactix.DOM.HTML as H
+import React (ReactElement, ReactClass, createElement, Children)
+import Thermite (Spec, hideState, noState, cmapProps, createClass)
+
+data Mode = MoreLikeFav | MoreLikeTrash
+
+derive instance genericMode :: Generic Mode _
+
+instance showMode :: Show Mode where
+  show = genericShow
+
+derive instance eqMode :: Eq Mode
+
+modeTabType :: Mode -> CTabNgramType
+modeTabType MoreLikeFav    = CTabAuthors  -- TODO
+modeTabType MoreLikeTrash  = CTabSources  -- TODO
+
+elt :: Props -> ReactElement
+elt props = createElement tabsClass props []
+
+tabsClass :: ReactClass { children :: Children | PropsRow }
+tabsClass = createClass "CorpusTabs" pureTabs $ const {}
+
+pureTabs :: Spec {} Props Void
+pureTabs = hideState (const {activeTab: 0}) statefulTabs
+
+statefulTabs :: Spec Tab.State Props Tab.Action
+statefulTabs =
+  Tab.tabs identity identity $ fromFoldable
+    [ Tuple "Documents"  $ docs
+    , Tuple "Trash"      $ trash
+    , Tuple "More like fav" $ moreLikeFav
+    , Tuple "More like trash" $ moreLikeTrash
+    ]
+  where
+    -- TODO totalRecords
+
+    docs = noState ( cmapProps (\{corpusId} -> {corpusId, tabType: TabCorpus TabDocs}) histoSpec
+                              <>
+                     (cmapProps identity $ docViewSpec TabDocs)
+                    )
+
+    moreLikeFav = noState $ cmapProps identity $ docViewSpec TabMoreLikeFav
+
+    moreLikeTrash = noState $ cmapProps identity $ docViewSpec TabMoreLikeTrash
+
+    trash = noState $ cmapProps identity $ docViewSpec TabTrash
+
+
+--docViewSpec :: forall a. TabSubType a -> Props -> R.Element
+docViewSpec :: forall a. TabSubType a -> Spec {} Props Void
+docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
+  where
+    cpt {corpusId, corpusData: {defaultListId}} _children = do
+      pure $ DT.docViewSpec $ params tst
+
+      where
+        params :: forall a. TabSubType a -> DT.Props
+        params TabDocs = {
+          nodeId: corpusId
+          -- ^ TODO merge nodeId and corpusId in DT
+        , chart  : H.div {} []
+        , tabType: TabCorpus TabDocs
+        , totalRecords: 4737
+        , listId: defaultListId
+        , corpusId: Just corpusId
+        , showSearch: true
+        }
+        params TabMoreLikeFav = {
+          nodeId: corpusId
+          -- ^ TODO merge nodeId and corpusId in DT
+        , chart  : H.div {} []
+        , tabType: TabCorpus TabMoreLikeFav
+        , totalRecords: 4737
+        , listId: defaultListId
+        , corpusId: Just corpusId
+        , showSearch: false
+        }
+        params TabMoreLikeTrash = {
+          nodeId: corpusId
+          -- ^ TODO merge nodeId and corpusId in DT
+        , chart  : H.div {} []
+        , tabType: TabCorpus TabMoreLikeTrash
+        , totalRecords: 4737
+        , listId: defaultListId
+        , corpusId: Just corpusId
+        , showSearch: false
+        }
+        params TabTrash = {
+          nodeId: corpusId
+          -- ^ TODO merge nodeId and corpusId in DT
+        , chart  : H.div {} []
+        , tabType: TabCorpus TabTrash
+        , totalRecords: 4737
+        , listId: defaultListId
+        , corpusId: Nothing
+        , showSearch: true
+        }
+        -- DUMMY
+        params _ = {
+          nodeId: corpusId
+          -- ^ TODO merge nodeId and corpusId in DT
+        , chart  : H.div {} []
+        , tabType: TabCorpus TabTrash
+        , totalRecords: 4737
+        , listId: defaultListId
+        , corpusId: Nothing
+        , showSearch: true
+        }

src/Gargantext/Pages/Texts/Tabs/Types.purs

+module Gargantext.Pages.Texts.Tabs.Types where
+
+import Data.Argonaut (class DecodeJson, decodeJson, (.?), (.??))
+import Data.Maybe (Maybe(..))
+--------------------------------------------------------
+import Gargantext.Prelude
+import Gargantext.Components.Node (NodePoly(..))
+import Gargantext.Components.Loader as Loader
+
+newtype CorpusInfo = CorpusInfo { title   :: String
+                                , desc    :: String
+                                , query   :: String
+                                , authors :: String
+                                , chart   :: (Maybe (Array Number))
+                                , totalRecords :: Int
+                                }
+
+corpusInfoDefault :: NodePoly CorpusInfo
+corpusInfoDefault = NodePoly { id : 0
+                             , typename : 0
+                             , userId : 0
+                             , parentId : 0
+                             , name : "Default name"
+                             , date  : " Default date"
+                             , hyperdata : CorpusInfo
+                                { title : "Default title"
+                                , desc  : " Default desc"
+                                , query : " Default Query"
+                                , authors : " Author(s): default"
+                                , chart   : Nothing
+                                , totalRecords : 0
+                                }
+                             }
+
+instance decodeCorpusInfo :: DecodeJson CorpusInfo where
+  decodeJson json = do
+    obj <- decodeJson json
+    title <- obj .? "title"
+    desc  <- obj .? "desc"
+    query <- obj .? "query"
+    authors <- obj .? "authors"
+    chart   <- obj .?? "chart"
+    let totalRecords = 47361 -- TODO
+    pure $ CorpusInfo {title, desc, query, authors, chart, totalRecords}
+
+type CorpusData = { corpusId :: Int
+                  , corpusNode :: NodePoly CorpusInfo
+                  , defaultListId :: Int}
+
+type PropsRow = ( corpusId :: Int, corpusData :: CorpusData )
+type Props = Record PropsRow
+
+-- TODO include Gargantext.Pages.Corpus.Tabs.States
+-- TODO include Gargantext.Pages.Corpus.Tabs.Actions

src/Gargantext/Router.purs

@@ -16,13 +16,14 @@ import Web.Storage.Storage (getItem)
 data Routes
   = Home
   | Login
-  | SearchView
   | Folder             Int
     | Corpus           Int
-      | AddCorpus
       | Document       Int Int
+      | CorpusDocument Int Int Int
       | PGraphExplorer Int
       | Dashboard
+      | Texts          Int
+      | Lists          Int
     | Annuaire         Int
       | UserPage       Int
       | ContactPage       Int
@@ -30,13 +31,14 @@ data Routes
 routing :: Match Routes
 routing = oneOf
   [ Login            <$   route "login"
-  , SearchView       <$   route "search"
-  , AddCorpus        <$   route "addCorpus"
   , Folder           <$> (route "folder"     *> int)
+  , CorpusDocument   <$> (route "corpus" *> int) <*> (lit "list" *> int) <*> (lit "document" *> int)
   , Corpus           <$> (route "corpus"     *> int)
      , Document       <$> (route "list" *> int) <*> (lit "document" *> int)
      , Dashboard      <$   route "dashboard"
      , PGraphExplorer <$> (route "graph"      *> int)
+     , Texts          <$> (route "texts" *> int)
+     , Lists          <$> (route "lists" *> int)
   , Annuaire         <$> (route "annuaire"   *> int)
     , UserPage          <$> (route "user"    *> int)
     , ContactPage       <$> (route "contact" *> int)
@@ -51,14 +53,15 @@ routing = oneOf
 
 instance showRoutes :: Show Routes where
   show Login            = "Login"
-  show AddCorpus        = "AddCorpus"
-  show SearchView       = "Search"
   show (UserPage i)     = "User"     <> show i
   show (ContactPage i)  = "Contact"  <> show i
+  show (CorpusDocument _ _ i)     = "Document" <> show i
   show (Document _ i)     = "Document" <> show i
   show (Corpus i)       = "Corpus"   <> show i
   show (Annuaire i)     = "Annuaire" <> show i
   show (Folder   i)     = "Folder"   <> show i
   show Dashboard        = "Dashboard"
   show (PGraphExplorer i) = "graphExplorer" <> show i
+  show (Texts i)          = "texts" <> show i
+  show (Lists i)          = "lists" <> show i
   show Home             = "Home"

src/Gargantext/Utils/Reactix.purs

@@ -12,15 +12,17 @@ import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Uncurried (EffectFn1, mkEffectFn1)
 import FFI.Simple ((...), defineProperty)
-import React (ReactElement)
+import React (ReactClass, ReactElement, Children, class IsReactElement, class ReactPropFields)
+import React as React
 import Reactix as R
 import Reactix.DOM.HTML (ElemFactory)
 import Reactix.React (createDOMElement)
 import Reactix.SyntheticEvent as RE
+import Thermite (Spec, simpleSpec, Render, defaultPerformAction)
 import Unsafe.Coerce (unsafeCoerce)
 newtype Point = Point { x :: Number, y :: Number }
 
--- | Turns a ReactElement into a Reactix Element
+-- | Turns a ReactElement into aReactix Element
 -- | buff (v.) to polish
 buff :: ReactElement -> R.Element
 buff = unsafeCoerce
@@ -30,6 +32,47 @@ buff = unsafeCoerce
 scuff :: R.Element -> ReactElement
 scuff = unsafeCoerce
 
+class ToElement a where
+  toElement :: a -> R.Element
+
+instance toElementElement :: ToElement R.Element where
+  toElement = identity
+
+instance toElementReactElement :: ToElement ReactElement where
+  toElement = buff
+
+instance toElementArray :: ToElement a => ToElement (Array a) where
+  toElement = R.fragment <<< map toElement
+
+{-
+instance isReactElementElement :: IsReactElement R.Element where
+  toElement = scuff
+-}
+
+elSpec :: forall component props
+        . R.IsComponent component props (Array R.Element)
+       => component -> Spec {} (Record props) Void
+elSpec cpt = simpleSpec defaultPerformAction render
+  where
+    render :: Render {} (Record props) Void
+    render _ props _ children = [scuff $ R.createElement cpt props (buff <$> children)]
+
+createElement' :: forall required given
+                . ReactPropFields required given
+               => ReactClass { children :: Children | required }
+               -> Record given -> Array R.Element -> R.Element
+createElement' reactClass props children =
+  buff $ React.createElement reactClass props $ scuff <$> children
+
+{-
+instance isComponentReactClass
+      :: R.IsComponent (ReactClass { children :: Children
+                                   | props
+                                   }) props (Array R.Element) where
+  createElement reactClass props children =
+    React.createElement reactClass props children
+-}
+
 mousePosition :: RE.SyntheticEvent DE.MouseEvent -> Point
 mousePosition e = Point { x: RE.clientX e, y: RE.clientY e }
 
@@ -48,7 +91,10 @@ menu :: ElemFactory
 menu = createDOMElement "menu"
 
 effToggler :: forall e. R.State Boolean -> EffectFn1 e Unit
-effToggler (_value /\ setValue) = mkEffectFn1 $ \e -> setValue not
+effToggler (value /\ setValue) = mkEffectFn1 $ \e -> setValue $ const $ not value
+
+unsafeEventValue :: forall event. event -> String
+unsafeEventValue e = (unsafeCoerce e).target.value
 
 nullRef :: forall t. R.Hooks (R.Ref (Nullable t))
 nullRef = R.useRef null

src/index.html

+<!doctype>
+<html>
+    <head>
+        <meta charset="utf-8"/>
+        <title>CNRS GarganText</title>
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <link href="https://use.fontawesome.com/releases/v5.0.8/styles/all.css" rel="stylesheet">
+        <link href="styles/login.min.css" rel="stylesheet">
+        <link href="styles/bootstrap.min.css" rel="stylesheet">
+        <!-- <link href="styles/lavish-bootstrap.css" rel="stylesheet"> -->
+        <link rel="stylesheet" type="text/css" href="styles/context-menu.css"/>
+        <link rel="stylesheet" type="text/css" href="styles/menu.css"/>
+        <link href="styles/Login.css" rel="stylesheet">
+        <style>
+         * {margin: 0; padding: 0; list-style: none;}
+         .tree ul li {
+             margin-left: 15px;
+             position: relative;
+             padding-left: 5px;
+         }
+         #toolbar {display : inline;}
+         #toolbar ul li {display : inline }
+         #toolbar ul li form {display : inline}
+         .tree { margin-top : 20px;}
+         .tree ul li::before {
+             content: " ";
+             position: absolute;
+             width: 1px;
+             background-color: #000;
+             top: 5px;
+             bottom: -12px;
+             left: -10px;
+         }
+         body > .tree ul > li:first-child::before {top: 12px;}
+         .tree ul li:not(:first-child):last-child::before {display: none;}
+         .tree ul li:only-child::before {
+             display: list-item;
+             content: " ";
+             position: absolute;
+             width: 1px;
+             background-color: "#000";
+             top: 5px;
+             bottom: 7px;
+             height: 7px;
+             left: -10px;
+         }
+         .tree ul li::after {
+             content: " ";
+             position: absolute;
+             left: -10px;
+             width: 10px;
+             height: 1px;
+             background-color: "#000";
+             top: 12px;
+         }
+              </style>
+    </head>
+    <body>
+        <div id="app" class ="container-fluid"></div>
+        <div id="menu-portal"></div>
+        <script src="bundle.js"></script>
+        <script src="js/bootstrap-native.min.js"></script>
+    </body>
+</html>

src/index.js

+// This file is just a wrapper so that webpack will call our main function
+require('./Main.purs').main();

test/Gargantext/Components/NgramsTable/Spec.purs

@@ -32,21 +32,14 @@ spec = do
                                       ,tne "candidate" CandidateTerm
                                       ])
           input = "this is a graph about a biography which stops at every candidate"
-          output = [Tuple "this is a" Nothing
-                   ,Tuple " " Nothing
+          output = [Tuple "this is a " Nothing
                    ,Tuple "graph" (Just GraphTerm)
-                   ,Tuple " " Nothing
-                   ,Tuple "about a biography" Nothing
-                   ,Tuple " " Nothing
+                   ,Tuple " about a biography " Nothing
                    ,Tuple "which" (Just StopTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "stops" (Just StopTerm)
-                   ,Tuple " " Nothing
-                   ,Tuple "at every" Nothing
-                   ,Tuple " " Nothing
+                   ,Tuple " at every " Nothing
                    ,Tuple "candidate" (Just CandidateTerm)
-                   ,Tuple " " Nothing
                    ]
       highlightNgrams table input `shouldEqual` output
 
@@ -60,25 +53,18 @@ spec = do
                                       ,tne "state"  GraphTerm
                                       ])
           input = "This is a new state of the"
-          output = [Tuple "This" Nothing
-                   ,Tuple " " Nothing
+          output = [Tuple "This " Nothing
                    ,Tuple "is" (Just StopTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "a" (Just StopTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "new" (Just GraphTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "state" (Just GraphTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "of" (Just StopTerm)
                    ,Tuple " " Nothing
-                   ,Tuple " " Nothing
                    ,Tuple "the" (Just GraphTerm)
-                   ,Tuple " " Nothing
                    ]
       highlightNgrams table input `shouldEqual` output
 
@@ -89,13 +75,19 @@ spec = do
                                       ,tne "images" GraphTerm
                                       ])
           input = "This is from space images"
-          output = [Tuple "This is" Nothing
-                   ,Tuple " " Nothing
+          output = [Tuple "This is " Nothing
                    ,Tuple "from" (Just GraphTerm)
-                   ,Tuple " " Nothing
-                   ,Tuple "space" Nothing
-                   ,Tuple " " Nothing
+                   ,Tuple " space " Nothing
                    ,Tuple "images" (Just GraphTerm)
-                   ,Tuple " " Nothing
+                   ]
+      highlightNgrams table input `shouldEqual` output
+
+    it "works with punctuation" do
+      let table = NgramsTable
+                    (Map.fromFoldable [tne "graph" GraphTerm])
+          input = "before graph, after"
+          output = [Tuple "before " Nothing
+                   ,Tuple "graph" (Just GraphTerm)
+                   ,Tuple ", after" Nothing
                    ]
       highlightNgrams table input `shouldEqual` output

webpack.config.js

+'use strict';
+let webpack = require('webpack');
+let path = require('path');
+let exec = require('executive');
+let nodeExternals = require('webpack-node-externals');
+let isWebpackDevServer = process.argv.some(a => path.basename(a) === 'webpack-dev-server');
+let HtmlWebpackPlugin = require('html-webpack-plugin');
+let CleanWebpackPlugin = require('clean-webpack-plugin');
+let isWatch = process.argv.some(a => a === '--watch');
+
+// TODO: We have agreed to move to spago, but not done it yet
+// let spago_sources = async () =>
+//   exec.quiet(
+//     "psc-package sources",
+//     { options: 'strict' }
+//   ).then(function (res) {
+//     let sources = res.stdout.split(/\r?\n/);
+//     sources.pop(); // extra newline at the end of output
+//     return sources;
+//   });
+
+let dist = path.join(__dirname, 'dist');
+let src = path.join(__dirname, 'src');
+let test = path.join(__dirname, 'test');
+
+// kill when spago
+let futured = async () => new Promise((resolve, _) => resolve([]));
+
+module.exports = (env) =>
+  // spago_sources()
+  futured()
+  .then(function (ps_sources) {
+
+    ps_sources.push('src/**/*.purs');
+    // TODO: testing in browser and headless
+    // if (env === "browser" || env === "headless")
+    //   ps_sources.push('test/Main.purs');
+    let config = {
+      cache: true,
+      mode: 'development',
+      target: "web",
+      devtool: 'inline-source-map',
+      devServer: {
+        disableHostCheck: true,
+        contentBase: dist,
+        compress: true,
+        port: 8000
+      },
+      output: {
+        path: dist,
+        filename: 'bundle.js'
+      },
+      module: {
+        rules: [
+          {test: /\.purs$/,
+           exclude: /(node_modules)/,
+           use: [
+             {loader: "purs-loader",
+              options: {
+                src: ps_sources,
+                output: dist,
+                pscIde: true,
+                pscIdeClientArgs: {port: 4002},
+                pscIdeServerArgs: {port: 4002},
+                pscArgs: {codegen: "js,sourcemaps"},
+                pscPackage: true,
+                bundle: false,
+                watch: isWatch}},
+             {loader: "source-map-loader"},
+           ]},
+          {test: /\.css$/,
+           exclude: /(node_modules)/,
+           use: ["style-loader", "css-loader"]},
+          {test: /\.(png|jpg|gif|svg)$/,
+           exclude: /(node_modules)/,
+           use: [ "file-loader" ]},
+          {test: /\.js$/,
+           exclude: /(node_modules)/,
+           use: ["babel-loader", "source-map-loader"]}
+        ]
+      },
+      resolve: {
+        modules: [ 'node_modules' ],
+        extensions: [ '.purs', '.js']
+      },
+      plugins: [
+      // TODO: can we put the checked-in assets in dist somewhere else
+      // and move them into place so we can clean?
+      //   new CleanWebpackPlugin(['dist']),
+        new webpack.LoaderOptionsPlugin({debug: true})
+      ],
+      entry: path.join(src, "index.js")
+    };
+    switch(env) {
+    case 'dev':
+      console.log("Serving index.html from template src/index.html")
+      config.plugins.push(new HtmlWebpackPlugin({
+        template: path.join(src, "index.html")
+      }));
+      break;
+    // TODO: testing environments - browser and headless
+    // case 'browser':
+    //   config.plugins.push(new HtmlWebpackPlugin({
+    //     title: "Reactix",
+    //     template: path.join(test, "browser.html")
+    //   }));
+    //   break;
+    // case 'headless': break;
+    default:
+      console.log("unknown env: ", env);
+    }
+    return config;
+  });