diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | solr/conf/solrconfig.xml | 2 | ||||
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/search/Pager.tsx | 4 | ||||
| -rw-r--r-- | src/client/views/search/SearchBox.scss | 7 | ||||
| -rw-r--r-- | src/client/views/search/SearchBox.tsx | 4 | ||||
| -rw-r--r-- | src/server/index.ts | 3 |
7 files changed, 15 insertions, 9 deletions
diff --git a/package.json b/package.json index 5c72b2348..bc10930fa 100644 --- a/package.json +++ b/package.json @@ -95,6 +95,7 @@ "@types/request": "^2.48.1", "@types/request-promise": "^4.1.42", "@types/sharp": "^0.22.2", + "@types/shelljs": "^0.8.5", "@types/socket.io": "^2.1.2", "@types/socket.io-client": "^1.4.32", "@types/typescript": "^2.0.0", @@ -184,6 +185,7 @@ "request-promise": "^4.2.4", "serializr": "^1.5.1", "sharp": "^0.22.1", + "shelljs": "^0.8.3", "socket.io": "^2.2.0", "socket.io-client": "^2.2.0", "solr-node": "^1.1.3", diff --git a/solr/conf/solrconfig.xml b/solr/conf/solrconfig.xml index 0d8792749..60f06f57f 100644 --- a/solr/conf/solrconfig.xml +++ b/solr/conf/solrconfig.xml @@ -695,7 +695,7 @@ --> <lst name="defaults"> <str name="echoParams">explicit</str> - <int name="rows">10000000</int> + <int name="rows">8</int> <str name="df">text</str> <!-- Default search field <str name="df">text</str> diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index 9bfe9d7e1..2b8abeffa 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -14,7 +14,7 @@ import { Transform } from "../../../util/Transform"; import { undoBatch } from "../../../util/UndoManager"; import { InkingCanvas } from "../../InkingCanvas"; import { PreviewCursor } from "../../PreviewCursor"; -import { SearchBox } from "../../search/FilterBox"; +import { FilterBox } from "../../search/FilterBox"; import { Templates } from "../../Templates"; import { CollectionViewType } from "../CollectionBaseView"; import { CollectionFreeFormView } from "./CollectionFreeFormView"; diff --git a/src/client/views/search/Pager.tsx b/src/client/views/search/Pager.tsx index 258f112b9..e7d3b810f 100644 --- a/src/client/views/search/Pager.tsx +++ b/src/client/views/search/Pager.tsx @@ -59,7 +59,7 @@ export class Pager extends React.Component { <div className="search-arrows"> <div className = "arrow" onPointerDown = {this.onLeftClick} style = {SearchBox.Instance._pageNum === 0 ? {opacity: .2} : this._leftHover ? {opacity: 1} : {opacity: .7}} - onMouseEnter = {this.mouseInLeft} onMouseOut = {this.mouseOutLeft}> + onMouseEnter = {this.mouseInLeft} onMouseLeave = {this.mouseOutLeft}> <FontAwesomeIcon className="fontawesome-icon" icon={faArrowCircleLeft} /> </div> <div className="pager-title"> @@ -67,7 +67,7 @@ export class Pager extends React.Component { </div> <div className = "arrow" onPointerDown = {this.onRightClick} style = {SearchBox.Instance._pageNum === SearchBox.Instance._maxNum-1 ? {opacity: .2} : this._rightHover ? {opacity: 1} : {opacity: .7}} - onMouseEnter = {this.mouseInRight} onMouseOut = {this.mouseOutRight}> + onMouseEnter = {this.mouseInRight} onMouseLeave = {this.mouseOutRight}> <FontAwesomeIcon className="fontawesome-icon" icon={faArrowCircleRight} /> </div> </div> diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss index 2a27bbe62..7541b328a 100644 --- a/src/client/views/search/SearchBox.scss +++ b/src/client/views/search/SearchBox.scss @@ -46,9 +46,10 @@ display: flex; flex-direction: column; margin-right: 72px; - height: 560px; - overflow: hidden; - overflow-y: auto; + // height: 560px; + height: 100%; + // overflow: hidden; + // overflow-y: auto; .no-result { width: 500px; diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx index 154e0b7b6..dbaa6eba2 100644 --- a/src/client/views/search/SearchBox.tsx +++ b/src/client/views/search/SearchBox.tsx @@ -198,9 +198,9 @@ export class SearchBox extends React.Component { ) : this._openNoResults ? (<div className="no-result">No Search Results</div>) : null} </div> - {/* <div style={this._results.length !== 0 ? { display: "flex" } : { display: "none" }}> + <div style={this._results.length !== 0 ? { display: "flex" } : { display: "none" }}> <Pager /> - </div> */} + </div> </div> ); } diff --git a/src/server/index.ts b/src/server/index.ts index e645e29b4..9d5bfcc93 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -43,6 +43,7 @@ import { Response } from 'express-serve-static-core'; const MongoStore = require('connect-mongo')(session); const mongoose = require('mongoose'); const probe = require("probe-image-size"); +var shell = require('shelljs'); const download = (url: string, dest: fs.PathLike) => request.get(url).pipe(fs.createWriteStream(dest)); @@ -139,6 +140,8 @@ app.get("/pull", (req, res) => })); // SEARCH +const solrURL = "http://localhost:8983/solr/#/dash"; +shell.echo("sorry this requires git") // GETTERS |