aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormadelinegr <laura_wilson@brown.edu>2019-06-05 13:40:14 -0400
committermadelinegr <laura_wilson@brown.edu>2019-06-05 13:40:14 -0400
commit3dc4e6ee14294ae110ac5c6449df804ebe0212a1 (patch)
treebf8d4940e5b38e98c3445139f8fd0bee4de4e9c5 /src
parent51986eb8483237de11120c04ffb4bacb72b2a603 (diff)
a bit of clean up
Diffstat (limited to 'src')
-rw-r--r--src/client/views/SearchBox.scss1
-rw-r--r--src/client/views/SearchBox.tsx10
-rw-r--r--src/client/views/SearchItem.tsx27
3 files changed, 2 insertions, 36 deletions
diff --git a/src/client/views/SearchBox.scss b/src/client/views/SearchBox.scss
index c8f139144..d7c8b857a 100644
--- a/src/client/views/SearchBox.scss
+++ b/src/client/views/SearchBox.scss
@@ -152,7 +152,6 @@
.search-overview {
display: flex;
- // float: left;
justify-content: flex-end;
height: 70px;
}
diff --git a/src/client/views/SearchBox.tsx b/src/client/views/SearchBox.tsx
index 0fd3c0904..657273791 100644
--- a/src/client/views/SearchBox.tsx
+++ b/src/client/views/SearchBox.tsx
@@ -1,23 +1,15 @@
import * as React from 'react';
import { observer } from 'mobx-react';
import { observable, action, runInAction } from 'mobx';
-import { Utils } from '../../Utils';
-import { MessageStore } from '../../server/Message';
import "./SearchBox.scss";
import { faSearch, faObjectGroup } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { library } from '@fortawesome/fontawesome-svg-core';
-// const app = express();
-// import * as express from 'express';
-import { Search } from '../../server/Search';
import * as rp from 'request-promise';
import { SearchItem } from './SearchItem';
-import { isString } from 'util';
-import { constant } from 'async';
import { DocServer } from '../DocServer';
import { Doc } from '../../new_fields/Doc';
import { Id } from '../../new_fields/FieldSymbols';
-import { DocumentManager } from '../util/DocumentManager';
import { SetupDrag } from '../util/DragManager';
import { Docs } from '../documents/Documents';
import { RouteStore } from '../../server/RouteStore';
@@ -174,7 +166,6 @@ export class SearchBox extends React.Component {
@action
getViews = async (doc: Doc) => {
- console.log("getting view")
const results = await SearchUtil.GetViewsOfDocument(doc);
let toReturn: Doc[] = [];
await runInAction(() => {
@@ -199,7 +190,6 @@ export class SearchBox extends React.Component {
className="searchBox-barChild searchBox-input" onKeyPress={this.enter}
style={{ width: this._resultsOpen ? "500px" : undefined }} />
<button className="searchBox-barChild searchBox-filter" onClick={this.toggleFilterDisplay}>Filter</button>
- {/* <FontAwesomeIcon icon="search" size="lg" className="searchBox-barChild searchBox-submit" /> */}
</div>
{this._resultsOpen ? (
<div className="searchBox-results">
diff --git a/src/client/views/SearchItem.tsx b/src/client/views/SearchItem.tsx
index ae9bc350f..ba67363fb 100644
--- a/src/client/views/SearchItem.tsx
+++ b/src/client/views/SearchItem.tsx
@@ -2,14 +2,9 @@ import React = require("react");
import { library } from '@fortawesome/fontawesome-svg-core';
import { faCaretUp, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote, faMusic, faLink, faChartBar, faGlobeAsia } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { Cast, NumCast } from "../../new_fields/Types";
-import { FieldView, FieldViewProps } from './nodes/FieldView';
-import { computed, observable, action, runInAction } from "mobx";
-import { IconField } from "../../new_fields/IconField";
+import { Cast } from "../../new_fields/Types";
+import { observable, runInAction } from "mobx";
import { listSpec } from "../../new_fields/Schema";
-import { Transform } from "../util/Transform";
-import { ObjectField } from "../../new_fields/ObjectField";
-import { RichTextField } from "../../new_fields/RichTextField";
import { Doc } from "../../new_fields/Doc";
import { DocumentManager } from "../util/DocumentManager";
import { SetupDrag } from "../util/DragManager";
@@ -17,7 +12,6 @@ import { SearchUtil } from "../util/SearchUtil";
import { Id } from "../../new_fields/FieldSymbols";
import { CollectionDockingView } from "./collections/CollectionDockingView";
import { observer } from "mobx-react";
-import { CollectionViewType } from "./collections/CollectionBaseView";
export interface SearchItemProps {
doc: Doc;
@@ -127,29 +121,12 @@ export class SearchItem extends React.Component<SearchItemProps> {
return Cast(this.props.doc.linkedToDocs, listSpec(Doc), []).length + Cast(this.props.doc.linkedFromDocs, listSpec(Doc), []).length;
}
- // @action
- // onMouseLeave = () => {
- // this.hover = false;
- // }
-
- // @action
- // onMouseEnter = () => {
- // this.hover = true;
- // }
-
render() {
return (
<div className="search-overview">
- {/* onMouseEnter={this.onMouseEnter}
- onMouseLeave={this.onMouseLeave}> */}
<div className="searchBox-instances">
<SelectorContextMenu {...this.props} />
</div>
- {/* {this.hover ? (
- <div className="searchBox-instances">
- <SelectorContextMenu {...this.props} />
- </div>
- ) : null} */}
<div className="search-item" ref={this.collectionRef} id="result" onClick={this.onClick} onPointerDown={SetupDrag(this.collectionRef, this.startDocDrag)} >
<div className="main-search-info">
<div className="search-title" id="result" >{this.props.doc.title}</div>